src/hotspot/share/opto/graphKit.cpp

*** 585,595 ****
        break;
      case Deoptimization::Reason_range_check:
        ex_obj = env()->ArrayIndexOutOfBoundsException_instance();
        break;
      case Deoptimization::Reason_class_check:
!       if (java_bc() == Bytecodes::_aastore || java_bc() == Bytecodes::_vastore) {
          ex_obj = env()->ArrayStoreException_instance();
        } else {
          ex_obj = env()->ClassCastException_instance();
        }
        break;
--- 585,595 ----
        break;
      case Deoptimization::Reason_range_check:
        ex_obj = env()->ArrayIndexOutOfBoundsException_instance();
        break;
      case Deoptimization::Reason_class_check:
!       if (java_bc() == Bytecodes::_aastore) {
          ex_obj = env()->ArrayStoreException_instance();
        } else {
          ex_obj = env()->ClassCastException_instance();
        }
        break;
*** 1084,1094 ****
        assert(rsize == 1, "");
        depth = rsize - inputs;
      }
      break;
  
!   case Bytecodes::_vwithfield: {
      bool ignored_will_link;
      ciField* field = method()->get_field_at_bci(bci(), ignored_will_link);
      int      size  = field->type()->size();
      inputs = size+1;
      depth = rsize - inputs;
--- 1084,1094 ----
        assert(rsize == 1, "");
        depth = rsize - inputs;
      }
      break;
  
!   case Bytecodes::_withfield: {
      bool ignored_will_link;
      ciField* field = method()->get_field_at_bci(bci(), ignored_will_link);
      int      size  = field->type()->size();
      inputs = size+1;
      depth = rsize - inputs;
*** 1098,1108 ****
    case Bytecodes::_ireturn:
    case Bytecodes::_lreturn:
    case Bytecodes::_freturn:
    case Bytecodes::_dreturn:
    case Bytecodes::_areturn:
-   case Bytecodes::_vreturn:
      assert(rsize == -depth, "");
      inputs = rsize;
      break;
  
    case Bytecodes::_jsr:
--- 1098,1107 ----