src/hotspot/share/ci/ciTypeFlow.cpp

*** 930,943 ****
      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();
--- 930,941 ----
*** 946,956 ****
    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;
--- 944,953 ----
*** 966,976 ****
          push_object(ciArrayKlass::make(element_klass));
        }
        break;
      }
    case Bytecodes::_areturn:
-   case Bytecodes::_vreturn:
    case Bytecodes::_ifnonnull:
    case Bytecodes::_ifnull:
      {
        pop_object();
        break;
--- 963,972 ----
*** 992,1002 ****
      {
        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;
--- 988,997 ----
*** 1495,1506 ****
  
    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::_newarray: do_newarray(str);                      break;
  
    case Bytecodes::_pop:
      {
--- 1490,1501 ----
  
    case Bytecodes::_multianewarray: do_multianewarray(str);          break;
  
    case Bytecodes::_new:      do_new(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,1544 ****
        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();
--- 1520,1530 ----
        ciType* value2 = pop_value();
        push(value1);
        push(value2);
        break;
      }
! 
    case Bytecodes::_wide:
    default:
      {
        // The iterator should skip this.
        ShouldNotReachHere();
*** 1824,1834 ****
        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;
--- 1810,1819 ----
*** 2262,2272 ****
      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:
--- 2247,2256 ----