src/hotspot/share/ci/ciTypeFlow.cpp

@@ -930,14 +930,12 @@
     tty->print_cr(">> Interpreting bytecode %d:%s", str->cur_bci(),
                   Bytecodes::name(str->cur_bc()));
   }
 
   switch(str->cur_bc()) {
-  case Bytecodes::_vaload:
   case Bytecodes::_aaload: do_aload(str);                           break;
 
-  case Bytecodes::_vastore:
   case Bytecodes::_aastore:
     {
       pop_object();
       pop_int();
       pop_objOrValueArray();

@@ -946,11 +944,10 @@
   case Bytecodes::_aconst_null:
     {
       push_null();
       break;
     }
-  case Bytecodes::_vload:
   case Bytecodes::_aload:   load_local_object(str->get_index());    break;
   case Bytecodes::_aload_0: load_local_object(0);                   break;
   case Bytecodes::_aload_1: load_local_object(1);                   break;
   case Bytecodes::_aload_2: load_local_object(2);                   break;
   case Bytecodes::_aload_3: load_local_object(3);                   break;

@@ -966,11 +963,10 @@
         push_object(ciArrayKlass::make(element_klass));
       }
       break;
     }
   case Bytecodes::_areturn:
-  case Bytecodes::_vreturn:
   case Bytecodes::_ifnonnull:
   case Bytecodes::_ifnull:
     {
       pop_object();
       break;

@@ -992,11 +988,10 @@
     {
       pop_array();
       push_int();
       break;
     }
-  case Bytecodes::_vstore:
   case Bytecodes::_astore:   store_local_object(str->get_index());  break;
   case Bytecodes::_astore_0: store_local_object(0);                 break;
   case Bytecodes::_astore_1: store_local_object(1);                 break;
   case Bytecodes::_astore_2: store_local_object(2);                 break;
   case Bytecodes::_astore_3: store_local_object(3);                 break;

@@ -1495,12 +1490,12 @@
 
   case Bytecodes::_multianewarray: do_multianewarray(str);          break;
 
   case Bytecodes::_new:      do_new(str);                           break;
 
-  case Bytecodes::_vdefault: do_vdefault(str);                      break;
-  case Bytecodes::_vwithfield: do_vwithfield(str);                  break;
+  case Bytecodes::_defaultvalue: do_vdefault(str);                  break;
+  case Bytecodes::_withfield: do_vwithfield(str);                   break;
 
   case Bytecodes::_newarray: do_newarray(str);                      break;
 
   case Bytecodes::_pop:
     {

@@ -1525,20 +1520,11 @@
       ciType* value2 = pop_value();
       push(value1);
       push(value2);
       break;
     }
-  case Bytecodes::_vunbox:
-     {
-       do_vunbox(str);
-       break;
-     }
-     case Bytecodes::_vbox:
-     {
-       do_vbox(str);
-       break;
-     }
+
   case Bytecodes::_wide:
   default:
     {
       // The iterator should skip this.
       ShouldNotReachHere();

@@ -1824,11 +1810,10 @@
       case Bytecodes::_ireturn:
       case Bytecodes::_lreturn:
       case Bytecodes::_freturn:
       case Bytecodes::_dreturn:
       case Bytecodes::_areturn:
-      case Bytecodes::_vreturn:
       case Bytecodes::_return:
         _successors =
           new (arena) GrowableArray<Block*>(arena, 1, 0, NULL);
         // No successors
         break;

@@ -2262,11 +2247,10 @@
     case Bytecodes::_ireturn:
     case Bytecodes::_lreturn:
     case Bytecodes::_freturn:
     case Bytecodes::_dreturn:
     case Bytecodes::_areturn:
-    case Bytecodes::_vreturn:
     case Bytecodes::_return:
       // We can assume the monitor stack is empty in this analysis.
       return false;
 
     case Bytecodes::_monitorexit: