src/hotspot/share/compiler/methodLiveness.cpp

@@ -345,11 +345,10 @@
       case Bytecodes::_ireturn:
       case Bytecodes::_lreturn:
       case Bytecodes::_freturn:
       case Bytecodes::_dreturn:
       case Bytecodes::_areturn:
-      case Bytecodes::_vreturn:
       case Bytecodes::_return:
         // These opcodes are  not the normal predecessors of any other opcodes.
         break;
       case Bytecodes::_ret:
         // We will patch up jsr/rets in a subsequent pass.

@@ -641,12 +640,12 @@
     case Bytecodes::_nop:
     case Bytecodes::_goto:
     case Bytecodes::_goto_w:
     case Bytecodes::_aconst_null:
     case Bytecodes::_new:
-    case Bytecodes::_vdefault:
-    case Bytecodes::_vwithfield:
+    case Bytecodes::_defaultvalue:
+    case Bytecodes::_withfield:
     case Bytecodes::_iconst_m1:
     case Bytecodes::_iconst_0:
     case Bytecodes::_iconst_1:
     case Bytecodes::_iconst_2:
     case Bytecodes::_iconst_3:

@@ -669,20 +668,18 @@
     case Bytecodes::_baload:
     case Bytecodes::_caload:
     case Bytecodes::_saload:
     case Bytecodes::_laload:
     case Bytecodes::_daload:
-    case Bytecodes::_vaload:
     case Bytecodes::_aaload:
     case Bytecodes::_iastore:
     case Bytecodes::_fastore:
     case Bytecodes::_bastore:
     case Bytecodes::_castore:
     case Bytecodes::_sastore:
     case Bytecodes::_lastore:
     case Bytecodes::_dastore:
-    case Bytecodes::_vastore:
     case Bytecodes::_aastore:
     case Bytecodes::_pop:
     case Bytecodes::_pop2:
     case Bytecodes::_dup:
     case Bytecodes::_dup_x1:

@@ -782,19 +779,16 @@
     case Bytecodes::_checkcast:
     case Bytecodes::_arraylength:
     case Bytecodes::_instanceof:
     case Bytecodes::_athrow:
     case Bytecodes::_areturn:
-    case Bytecodes::_vreturn:
     case Bytecodes::_monitorenter:
     case Bytecodes::_monitorexit:
     case Bytecodes::_ifnull:
     case Bytecodes::_ifnonnull:
     case Bytecodes::_multianewarray:
     case Bytecodes::_lookupswitch:
-    case Bytecodes::_vbox:
-    case Bytecodes::_vunbox:
       // These bytecodes have no effect on the method's locals.
       break;
 
     case Bytecodes::_return:
       if (instruction->method()->intrinsic_id() == vmIntrinsics::_Object_init) {

@@ -832,11 +826,10 @@
 
     case Bytecodes::_iload:
     case Bytecodes::_iinc:
     case Bytecodes::_fload:
     case Bytecodes::_aload:
-    case Bytecodes::_vload:
     case Bytecodes::_ret:
       load_one(instruction->get_index());
       break;
 
     case Bytecodes::_iload_0:

@@ -889,11 +882,10 @@
       break;
 
     case Bytecodes::_istore:
     case Bytecodes::_fstore:
     case Bytecodes::_astore:
-    case Bytecodes::_vstore:
       store_one(instruction->get_index());
       break;
 
     case Bytecodes::_istore_0:
     case Bytecodes::_fstore_0: