src/share/vm/opto/graphKit.cpp

*** 1249,1259 ****
        chk = new CmpPNode( value, null() );
        break;
      }
  
      default:
!       fatal(err_msg_res("unexpected type: %s", type2name(type)));
    }
    assert(chk != NULL, "sanity check");
    chk = _gvn.transform(chk);
  
    BoolTest::mask btest = assert_null ? BoolTest::eq : BoolTest::ne;
--- 1249,1259 ----
        chk = new CmpPNode( value, null() );
        break;
      }
  
      default:
!       fatal("unexpected type: %s", type2name(type));
    }
    assert(chk != NULL, "sanity check");
    chk = _gvn.transform(chk);
  
    BoolTest::mask btest = assert_null ? BoolTest::eq : BoolTest::ne;
*** 1948,1959 ****
    if (!must_throw) {
      // Make sure the stack has at least enough depth to execute
      // the current bytecode.
      int inputs, ignored_depth;
      if (compute_stack_effects(inputs, ignored_depth)) {
!       assert(sp() >= inputs, err_msg_res("must have enough JVMS stack to execute %s: sp=%d, inputs=%d",
!              Bytecodes::name(java_bc()), sp(), inputs));
      }
    }
  #endif
  
    Deoptimization::DeoptReason reason = Deoptimization::trap_request_reason(trap_request);
--- 1948,1959 ----
    if (!must_throw) {
      // Make sure the stack has at least enough depth to execute
      // the current bytecode.
      int inputs, ignored_depth;
      if (compute_stack_effects(inputs, ignored_depth)) {
!       assert(sp() >= inputs, "must have enough JVMS stack to execute %s: sp=%d, inputs=%d",
!              Bytecodes::name(java_bc()), sp(), inputs);
      }
    }
  #endif
  
    Deoptimization::DeoptReason reason = Deoptimization::trap_request_reason(trap_request);
*** 1985,1995 ****
  #ifdef ASSERT
    case Deoptimization::Action_none:
    case Deoptimization::Action_make_not_compilable:
      break;
    default:
!     fatal(err_msg_res("unknown action %d: %s", action, Deoptimization::trap_action_name(action)));
      break;
  #endif
    }
  
    if (TraceOptoParse) {
--- 1985,1995 ----
  #ifdef ASSERT
    case Deoptimization::Action_none:
    case Deoptimization::Action_make_not_compilable:
      break;
    default:
!     fatal("unknown action %d: %s", action, Deoptimization::trap_action_name(action));
      break;
  #endif
    }
  
    if (TraceOptoParse) {
*** 2507,2517 ****
  static IfNode* gen_subtype_check_compare(Node* ctrl, Node* in1, Node* in2, BoolTest::mask test, float p, PhaseGVN* gvn, BasicType bt) {
    Node* cmp = NULL;
    switch(bt) {
    case T_INT: cmp = new CmpINode(in1, in2); break;
    case T_ADDRESS: cmp = new CmpPNode(in1, in2); break;
!   default: fatal(err_msg("unexpected comparison type %s", type2name(bt)));
    }
    gvn->transform(cmp);
    Node* bol = gvn->transform(new BoolNode(cmp, test));
    IfNode* iff = new IfNode(ctrl, bol, p, COUNT_UNKNOWN);
    gvn->transform(iff);
--- 2507,2517 ----
  static IfNode* gen_subtype_check_compare(Node* ctrl, Node* in1, Node* in2, BoolTest::mask test, float p, PhaseGVN* gvn, BasicType bt) {
    Node* cmp = NULL;
    switch(bt) {
    case T_INT: cmp = new CmpINode(in1, in2); break;
    case T_ADDRESS: cmp = new CmpPNode(in1, in2); break;
!   default: fatal("unexpected comparison type %s", type2name(bt));
    }
    gvn->transform(cmp);
    Node* bol = gvn->transform(new BoolNode(cmp, test));
    IfNode* iff = new IfNode(ctrl, bol, p, COUNT_UNKNOWN);
    gvn->transform(iff);