*** old/src/share/vm/opto/doCall.cpp	Thu May 15 17:09:28 2014
--- new/src/share/vm/opto/doCall.cpp	Thu May 15 17:09:27 2014

*** 594,604 ****
--- 594,604 ----
            if (ctype->is_loaded()) {
              const TypeOopPtr* arg_type = TypeOopPtr::make_from_klass(rtype->as_klass());
              const Type*       sig_type = TypeOopPtr::make_from_klass(ctype->as_klass());
              if (arg_type != NULL && !arg_type->higher_equal(sig_type)) {
                Node* retnode = pop();
-               Node* cast_obj = _gvn.transform(new (C) CheckCastPPNode(control(), retnode, sig_type));
                push(cast_obj);
              }
            }
          } else {
            assert(rt == ct, err_msg_res("unexpected mismatch: rt=%s, ct=%s", type2name(rt), type2name(ct)));

*** 687,715 ****
--- 687,715 ----
      bcis->append(h_bci);
      extypes->append(h_extype);
    }
  
    int len = bcis->length();
-   CatchNode *cn = new (C) CatchNode(control(), i_o, len+1);
    Node *catch_ = _gvn.transform(cn);
  
    // now branch with the exception state to each of the (potential)
    // handlers
    for(int i=0; i < len; i++) {
      // Setup JVM state to enter the handler.
      PreserveJVMState pjvms(this);
      // Locals are just copied from before the call.
      // Get control from the CatchNode.
      int handler_bci = bcis->at(i);
-     Node* ctrl = _gvn.transform( new (C) CatchProjNode(catch_, i+1,handler_bci));
      // This handler cannot happen?
      if (ctrl == top())  continue;
      set_control(ctrl);
  
      // Create exception oop
      const TypeInstPtr* extype = extypes->at(i)->is_instptr();
-     Node *ex_oop = _gvn.transform(new (C) CreateExNode(extypes->at(i), ctrl, i_o));
  
      // Handle unloaded exception classes.
      if (saw_unloaded->contains(handler_bci)) {
        // An unloaded exception type is coming here.  Do an uncommon trap.
  #ifndef PRODUCT

*** 744,754 ****
--- 744,754 ----
      }
    }
  
    // The first CatchProj is for the normal return.
    // (Note:  If this is a call to rethrow_Java, this node goes dead.)
-   set_control(_gvn.transform( new (C) CatchProjNode(catch_, CatchProjNode::fall_through_index, CatchProjNode::no_handler_bci)));
  }
  
  
  //----------------------------catch_inline_exceptions--------------------------
  // Handle all exceptions thrown by an inlined method or individual bytecode.

*** 795,805 ****
--- 795,805 ----
      // However, if the ex_node is a PhiNode, I'm going to do a LoadKlass for
      // each arm of the Phi.  If I know something clever about the exceptions
      // I'm loading the class from, I can replace the LoadKlass with the
      // klass constant for the exception oop.
      if( ex_node->is_Phi() ) {
-       ex_klass_node = new (C) PhiNode( ex_node->in(0), TypeKlassPtr::OBJECT );
        for( uint i = 1; i < ex_node->req(); i++ ) {
          Node* p = basic_plus_adr( ex_node->in(i), ex_node->in(i), oopDesc::klass_offset_in_bytes() );
          Node* k = _gvn.transform( LoadKlassNode::make(_gvn, immutable_memory(), p, TypeInstPtr::KLASS, TypeKlassPtr::OBJECT) );
          ex_klass_node->init_req( i, k );
        }

*** 861,871 ****
--- 861,871 ----
      Node* not_subtype_ctrl = gen_subtype_check(ex_klass_node, con);
      if (!stopped()) {
        PreserveJVMState pjvms(this);
        const TypeInstPtr* tinst = TypeOopPtr::make_from_klass_unique(klass)->cast_to_ptr_type(TypePtr::NotNull)->is_instptr();
        assert(klass->has_subklass() || tinst->klass_is_exact(), "lost exactness");
-       Node* ex_oop = _gvn.transform(new (C) CheckCastPPNode(control(), ex_node, tinst));
        push_ex_oop(ex_oop);      // Push exception oop for handler
  #ifndef PRODUCT
        if (PrintOpto && WizardMode) {
          tty->print("  Catching inline exception bci:%d -> handler_bci:%d -- ", bci(), handler_bci);
          klass->print_name();