src/share/vm/opto/callGenerator.cpp

*** 134,144 ****
  
    if (kit.C->log() != NULL) {
      kit.C->log()->elem("direct_call bci='%d'", jvms->bci());
    }
  
!   CallStaticJavaNode *call = new (kit.C) CallStaticJavaNode(kit.C, tf(), target, method(), kit.bci());
    _call_node = call;  // Save the call node in case we need it later
    if (!is_static) {
      // Make an explicit receiver null_check as part of this call.
      // Since we share a map with the caller, his JVMS gets adjusted.
      kit.null_check_receiver_before_call(method());
--- 134,144 ----
  
    if (kit.C->log() != NULL) {
      kit.C->log()->elem("direct_call bci='%d'", jvms->bci());
    }
  
!   CallStaticJavaNode *call = new CallStaticJavaNode(kit.C, tf(), target, method(), kit.bci());
    _call_node = call;  // Save the call node in case we need it later
    if (!is_static) {
      // Make an explicit receiver null_check as part of this call.
      // Since we share a map with the caller, his JVMS gets adjusted.
      kit.null_check_receiver_before_call(method());
*** 223,233 ****
    assert(!method()->is_private(), "virtual call should not be to private");
    assert(_vtable_index == Method::invalid_vtable_index || !UseInlineCaches,
           "no vtable calls if +UseInlineCaches ");
    address target = SharedRuntime::get_resolve_virtual_call_stub();
    // Normal inline cache used for call
!   CallDynamicJavaNode *call = new (kit.C) CallDynamicJavaNode(tf(), target, method(), _vtable_index, kit.bci());
    kit.set_arguments_for_java_call(call);
    kit.set_edges_for_java_call(call);
    Node* ret = kit.set_results_for_java_call(call);
    kit.push_node(method()->return_type()->basic_type(), ret);
  
--- 223,233 ----
    assert(!method()->is_private(), "virtual call should not be to private");
    assert(_vtable_index == Method::invalid_vtable_index || !UseInlineCaches,
           "no vtable calls if +UseInlineCaches ");
    address target = SharedRuntime::get_resolve_virtual_call_stub();
    // Normal inline cache used for call
!   CallDynamicJavaNode *call = new CallDynamicJavaNode(tf(), target, method(), _vtable_index, kit.bci());
    kit.set_arguments_for_java_call(call);
    kit.set_edges_for_java_call(call);
    Node* ret = kit.set_results_for_java_call(call);
    kit.push_node(method()->return_type()->basic_type(), ret);
  
*** 348,358 ****
  
    // Make a clone of the JVMState that appropriate to use for driving a parse
    JVMState* old_jvms = call->jvms();
    JVMState* jvms = old_jvms->clone_shallow(C);
    uint size = call->req();
!   SafePointNode* map = new (C) SafePointNode(size, jvms);
    for (uint i1 = 0; i1 < size; i1++) {
      map->init_req(i1, call->in(i1));
    }
  
    // Make sure the state is a MergeMem for parsing.
--- 348,358 ----
  
    // Make a clone of the JVMState that appropriate to use for driving a parse
    JVMState* old_jvms = call->jvms();
    JVMState* jvms = old_jvms->clone_shallow(C);
    uint size = call->req();
!   SafePointNode* map = new SafePointNode(size, jvms);
    for (uint i1 = 0; i1 < size; i1++) {
      map->init_req(i1, call->in(i1));
    }
  
    // Make sure the state is a MergeMem for parsing.
*** 715,725 ****
      return kit.transfer_exceptions_into_jvms();
    }
  
    // Finish the diamond.
    kit.C->set_has_split_ifs(true); // Has chance for split-if optimization
!   RegionNode* region = new (kit.C) RegionNode(3);
    region->init_req(1, kit.control());
    region->init_req(2, slow_map->control());
    kit.set_control(gvn.transform(region));
    Node* iophi = PhiNode::make(region, kit.i_o(), Type::ABIO);
    iophi->set_req(2, slow_map->i_o());
--- 715,725 ----
      return kit.transfer_exceptions_into_jvms();
    }
  
    // Finish the diamond.
    kit.C->set_has_split_ifs(true); // Has chance for split-if optimization
!   RegionNode* region = new RegionNode(3);
    region->init_req(1, kit.control());
    region->init_req(2, slow_map->control());
    kit.set_control(gvn.transform(region));
    Node* iophi = PhiNode::make(region, kit.i_o(), Type::ABIO);
    iophi->set_req(2, slow_map->i_o());
*** 823,833 ****
          if (!target->is_static()) {
            Node* arg = kit.argument(0);
            const TypeOopPtr* arg_type = arg->bottom_type()->isa_oopptr();
            const Type*       sig_type = TypeOopPtr::make_from_klass(signature->accessing_klass());
            if (arg_type != NULL && !arg_type->higher_equal(sig_type)) {
!             Node* cast_obj = gvn.transform(new (C) CheckCastPPNode(kit.control(), arg, sig_type));
              kit.set_argument(0, cast_obj);
            }
          }
          // Cast reference arguments to its type.
          for (int i = 0; i < signature->count(); i++) {
--- 823,833 ----
          if (!target->is_static()) {
            Node* arg = kit.argument(0);
            const TypeOopPtr* arg_type = arg->bottom_type()->isa_oopptr();
            const Type*       sig_type = TypeOopPtr::make_from_klass(signature->accessing_klass());
            if (arg_type != NULL && !arg_type->higher_equal(sig_type)) {
!             Node* cast_obj = gvn.transform(new CheckCastPPNode(kit.control(), arg, sig_type));
              kit.set_argument(0, cast_obj);
            }
          }
          // Cast reference arguments to its type.
          for (int i = 0; i < signature->count(); i++) {
*** 835,845 ****
            if (t->is_klass()) {
              Node* arg = kit.argument(receiver_skip + i);
              const TypeOopPtr* arg_type = arg->bottom_type()->isa_oopptr();
              const Type*       sig_type = TypeOopPtr::make_from_klass(t->as_klass());
              if (arg_type != NULL && !arg_type->higher_equal(sig_type)) {
!               Node* cast_obj = gvn.transform(new (C) CheckCastPPNode(kit.control(), arg, sig_type));
                kit.set_argument(receiver_skip + i, cast_obj);
              }
            }
          }
  
--- 835,845 ----
            if (t->is_klass()) {
              Node* arg = kit.argument(receiver_skip + i);
              const TypeOopPtr* arg_type = arg->bottom_type()->isa_oopptr();
              const Type*       sig_type = TypeOopPtr::make_from_klass(t->as_klass());
              if (arg_type != NULL && !arg_type->higher_equal(sig_type)) {
!               Node* cast_obj = gvn.transform(new CheckCastPPNode(kit.control(), arg, sig_type));
                kit.set_argument(receiver_skip + i, cast_obj);
              }
            }
          }
  
*** 976,986 ****
      return kit.transfer_exceptions_into_jvms();
    }
  
    // Finish the diamond.
    kit.C->set_has_split_ifs(true); // Has chance for split-if optimization
!   RegionNode* region = new (kit.C) RegionNode(3);
    region->init_req(1, kit.control());
    region->init_req(2, slow_map->control());
    kit.set_control(gvn.transform(region));
    Node* iophi = PhiNode::make(region, kit.i_o(), Type::ABIO);
    iophi->set_req(2, slow_map->i_o());
--- 976,986 ----
      return kit.transfer_exceptions_into_jvms();
    }
  
    // Finish the diamond.
    kit.C->set_has_split_ifs(true); // Has chance for split-if optimization
!   RegionNode* region = new RegionNode(3);
    region->init_req(1, kit.control());
    region->init_req(2, slow_map->control());
    kit.set_control(gvn.transform(region));
    Node* iophi = PhiNode::make(region, kit.i_o(), Type::ABIO);
    iophi->set_req(2, slow_map->i_o());