src/hotspot/share/code/compiledIC.cpp

*** 536,547 ****
      //     it looks vanilla but is optimized. Code in is_call_to_interpreted
      //     is aware of this and weakens its asserts.
      if (is_optimized) {
        entry      = caller_is_c1 ? method_code->verified_value_entry_point() : method_code->verified_entry_point();
      } else {
!     //assert(!(caller_is_c1 && method->has_scalarized_args()), "FIXME - what to do with c1 caller??");
!       entry      = method_code->entry_point();
      }
    }
    bool far_c2a = entry != NULL && caller_is_nmethod && method_code->is_far_code();
    if (entry != NULL && !far_c2a) {
      // Call to near compiled code (nmethod or aot).
--- 536,546 ----
      //     it looks vanilla but is optimized. Code in is_call_to_interpreted
      //     is aware of this and weakens its asserts.
      if (is_optimized) {
        entry      = caller_is_c1 ? method_code->verified_value_entry_point() : method_code->verified_entry_point();
      } else {
!       entry      = caller_is_c1 ? method_code->value_entry_point() : method_code->entry_point();
      }
    }
    bool far_c2a = entry != NULL && caller_is_nmethod && method_code->is_far_code();
    if (entry != NULL && !far_c2a) {
      // Call to near compiled code (nmethod or aot).
*** 558,569 ****
        }
      } else {
        // Use icholder entry
        assert(method_code == NULL || method_code->is_compiled(), "must be compiled");
        CompiledICHolder* holder = new CompiledICHolder(method(), receiver_klass);
!     //assert(!(caller_is_c1 && method->has_scalarized_args()), "FIXME - what to do with c1 caller??");
!       info.set_icholder_entry(method()->get_c2i_unverified_entry(), holder);
      }
    }
    assert(info.is_optimized() == is_optimized, "must agree");
  }
  
--- 557,568 ----
        }
      } else {
        // Use icholder entry
        assert(method_code == NULL || method_code->is_compiled(), "must be compiled");
        CompiledICHolder* holder = new CompiledICHolder(method(), receiver_klass);
!       entry = (caller_is_c1)? method()->get_c2i_unverified_value_entry() : method()->get_c2i_unverified_entry();
!       info.set_icholder_entry(entry, holder);
      }
    }
    assert(info.is_optimized() == is_optimized, "must agree");
  }