truffle: src/share/vm/opto/doCall.cpp comparison

comparison src/share/vm/opto/doCall.cpp @ 7478:5698813d45eb

8005418: JSR 292: virtual dispatch bug in 292 impl Reviewed-by: jrose, kvn

author	twisti
date	Wed, 09 Jan 2013 15:37:23 -0800
parents	d092d1b31229
children	f1de9dbc914e

comparison

equal deleted inserted replaced

-:038dd2875b94
+:5698813d45eb
 out->print(ss.as_string());
 out->cr();
 }
 }
-CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool call_is_virtual,
+CallGenerator* Compile::call_generator(ciMethod* callee, int vtable_index, bool call_does_dispatch,
 JVMState* jvms, bool allow_inline,
 float prof_factor, bool allow_intrinsics, bool delayed_forbidden) {
 ciMethod*       caller   = jvms->method();
 int             bci      = jvms->bci();
 Bytecodes::Code bytecode = caller->java_code_at_bci(bci);
 ciCallProfile profile = caller->call_profile_at_bci(bci);
 // See how many times this site has been invoked.
 int site_count = profile.count();
 int receiver_count = -1;
-if (call_is_virtual && UseTypeProfile && profile.has_receiver(0)) {
+if (call_does_dispatch && UseTypeProfile && profile.has_receiver(0)) {
 // Receivers in the profile structure are ordered by call counts
 // so that the most called (major) receiver is profile.receiver(0).
 receiver_count = profile.receiver_count(0);
 }
 if (log != NULL) {
 int rid = (receiver_count >= 0)? log->identify(profile.receiver(0)): -1;
 int r2id = (rid != -1 && profile.has_receiver(1))? log->identify(profile.receiver(1)):-1;
 log->begin_elem("call method='%d' count='%d' prof_factor='%g'",
 log->identify(callee), site_count, prof_factor);
-if (call_is_virtual)  log->print(" virtual='1'");
+if (call_does_dispatch)  log->print(" virtual='1'");
 if (allow_inline)     log->print(" inline='1'");
 if (receiver_count >= 0) {
 log->print(" receiver='%d' receiver_count='%d'", rid, receiver_count);
 if (profile.has_receiver(1)) {
 log->print(" receiver2='%d' receiver2_count='%d'", r2id, profile.receiver_count(1));
 // methods.  If these methods are replaced with specialized code,
 // then we return it as the inlined version of the call.
 // We do this before the strict f.p. check below because the
 // intrinsics handle strict f.p. correctly.
 if (allow_inline && allow_intrinsics) {
-CallGenerator* cg = find_intrinsic(callee, call_is_virtual);
+CallGenerator* cg = find_intrinsic(callee, call_does_dispatch);
 if (cg != NULL) {
 if (cg->is_predicted()) {
 // Code without intrinsic but, hopefully, inlined.
 CallGenerator* inline_cg = this->call_generator(callee,
-vtable_index, call_is_virtual, jvms, allow_inline, prof_factor, false);
+vtable_index, call_does_dispatch, jvms, allow_inline, prof_factor, false);
 if (inline_cg != NULL) {
 cg = CallGenerator::for_predicted_intrinsic(cg, inline_cg);
 }
 }
 return cg;
 // NOTE: This must happen before normal inlining logic below since
 // MethodHandle.invoke* are native methods which obviously don't
 // have bytecodes and so normal inlining fails.
 if (callee->is_method_handle_intrinsic()) {
 CallGenerator* cg = CallGenerator::for_method_handle_call(jvms, caller, callee, delayed_forbidden);
-assert (cg == NULL || !delayed_forbidden || !cg->is_late_inline() || cg->is_mh_late_inline(), "unexpected CallGenerator");
+assert(cg == NULL || !delayed_forbidden || !cg->is_late_inline() || cg->is_mh_late_inline(), "unexpected CallGenerator");
 return cg;
 }
 // Do not inline strict fp into non-strict code, or the reverse
 if (caller->is_strict() ^ callee->is_strict()) {
 float past_uses = jvms->method()->scale_count(site_count, prof_factor);
 // This is the number of times we expect the call code to be used.
 float expected_uses = past_uses;
 // Try inlining a bytecoded method:
-if (!call_is_virtual) {
+if (!call_does_dispatch) {
 InlineTree* ilt;
 if (UseOldInlining) {
 ilt = InlineTree::find_subtree_from_root(this->ilt(), jvms->caller(), jvms->method());
 } else {
 // Make a disembodied, stateless ILT.
 if (cg == NULL || should_delay) {
 // Fall through.
 } else if (require_inline || !InlineWarmCalls) {
 return cg;
 } else {
-CallGenerator* cold_cg = call_generator(callee, vtable_index, call_is_virtual, jvms, false, prof_factor);
+CallGenerator* cold_cg = call_generator(callee, vtable_index, call_does_dispatch, jvms, false, prof_factor);
 return CallGenerator::for_warm_call(ci, cold_cg, cg);
 }
 }
 }
 // Try using the type profile.
-if (call_is_virtual && site_count > 0 && receiver_count > 0) {
+if (call_does_dispatch && site_count > 0 && receiver_count > 0) {
 // The major receiver's count >= TypeProfileMajorReceiverPercent of site_count.
 bool have_major_receiver = (100.*profile.receiver_prob(0) >= (float)TypeProfileMajorReceiverPercent);
 ciMethod* receiver_method = NULL;
 if (have_major_receiver || profile.morphism() == 1 ||
 (profile.morphism() == 2 && UseBimorphicInlining)) {
 profile.receiver(0));
 }
 if (receiver_method != NULL) {
 // The single majority receiver sufficiently outweighs the minority.
 CallGenerator* hit_cg = this->call_generator(receiver_method,
-vtable_index, !call_is_virtual, jvms, allow_inline, prof_factor);
+vtable_index, !call_does_dispatch, jvms, allow_inline, prof_factor);
 if (hit_cg != NULL) {
 // Look up second receiver.
 CallGenerator* next_hit_cg = NULL;
 ciMethod* next_receiver_method = NULL;
 if (profile.morphism() == 2 && UseBimorphicInlining) {
 next_receiver_method = callee->resolve_invoke(jvms->method()->holder(),
 profile.receiver(1));
 if (next_receiver_method != NULL) {
 next_hit_cg = this->call_generator(next_receiver_method,
-vtable_index, !call_is_virtual, jvms,
+vtable_index, !call_does_dispatch, jvms,
 allow_inline, prof_factor);
 if (next_hit_cg != NULL && !next_hit_cg->is_inline() &&
 have_major_receiver && UseOnlyInlinedBimorphic) {
 // Skip if we can't inline second receiver's method
 next_hit_cg = NULL;
 }
 }
 // There was no special inlining tactic, or it bailed out.
 // Use a more generic tactic, like a simple call.
-if (call_is_virtual) {
+if (call_does_dispatch) {
 return CallGenerator::for_virtual_call(callee, vtable_index);
 } else {
 // Class Hierarchy Analysis or Type Profile reveals a unique target,
 // or it is a static or special call.
 return CallGenerator::for_direct_call(callee, should_delay_inlining(callee, jvms));
 // an invokevirtual directly on an interface method I.m if K implements I.
 // orig_callee is the resolved callee which's signature includes the
 // appendix argument.
 const int nargs = orig_callee->arg_size();
+const bool is_signature_polymorphic = MethodHandles::is_signature_polymorphic(orig_callee->intrinsic_id());
 // Push appendix argument (MethodType, CallSite, etc.), if one.
 if (iter().has_appendix()) {
 ciObject* appendix_arg = iter().get_appendix();
 const TypeOopPtr* appendix_arg_type = TypeOopPtr::make_from_constant(appendix_arg);
 // Then we may inline or make a static call, but become dependent on there being only 1 target.
 // Does the call-site type profile reveal only one receiver?
 // Then we may introduce a run-time check and inline on the path where it succeeds.
 // The other path may uncommon_trap, check for another receiver, or do a v-call.
-// Choose call strategy.
-bool call_is_virtual = is_virtual_or_interface;
-int vtable_index = Method::invalid_vtable_index;
-ciMethod* callee = orig_callee;
 // Try to get the most accurate receiver type
+ciMethod* callee             = orig_callee;
+int       vtable_index       = Method::invalid_vtable_index;
+bool      call_does_dispatch = false;
 if (is_virtual_or_interface) {
 Node*             receiver_node = stack(sp() - nargs);
 const TypeOopPtr* receiver_type = _gvn.type(receiver_node)->isa_oopptr();
-ciMethod* optimized_virtual_method = optimize_inlining(method(), bci(), klass, orig_callee, receiver_type);
+// call_does_dispatch and vtable_index are out-parameters.  They might be changed.
+callee = C->optimize_virtual_call(method(), bci(), klass, orig_callee, receiver_type,
-// Have the call been sufficiently improved such that it is no longer a virtual?
+is_virtual,
-if (optimized_virtual_method != NULL) {
+call_does_dispatch, vtable_index);  // out-parameters
-callee          = optimized_virtual_method;
-call_is_virtual = false;
-} else if (!UseInlineCaches && is_virtual && callee->is_loaded()) {
-// We can make a vtable call at this site
-vtable_index = callee->resolve_vtable_index(method()->holder(), klass);
-}
 }
 // Note:  It's OK to try to inline a virtual call.
 // The call generator will not attempt to inline a polymorphic call
 // unless it knows how to optimize the receiver dispatch.
 // ---------------------
 // Decide call tactic.
 // This call checks with CHA, the interpreter profile, intrinsics table, etc.
 // It decides whether inlining is desirable or not.
-CallGenerator* cg = C->call_generator(callee, vtable_index, call_is_virtual, jvms, try_inline, prof_factor());
+CallGenerator* cg = C->call_generator(callee, vtable_index, call_does_dispatch, jvms, try_inline, prof_factor());
 // NOTE:  Don't use orig_callee and callee after this point!  Use cg->method() instead.
 orig_callee = callee = NULL;
 // ---------------------
 // This can happen if a library intrinsic is available, but refuses
 // the call site, perhaps because it did not match a pattern the
 // intrinsic was expecting to optimize. Should always be possible to
 // get a normal java call that may inline in that case
-cg = C->call_generator(cg->method(), vtable_index, call_is_virtual, jvms, try_inline, prof_factor(), /* allow_intrinsics= */ false);
+cg = C->call_generator(cg->method(), vtable_index, call_does_dispatch, jvms, try_inline, prof_factor(), /* allow_intrinsics= */ false);
 if ((new_jvms = cg->generate(jvms)) == NULL) {
 guarantee(failing(), "call failed to generate:  calls should work");
 return;
 }
 }
 // Round double result after a call from strict to non-strict code
 round_double_result(cg->method());
 ciType* rtype = cg->method()->return_type();
-if (Bytecodes::has_optional_appendix(iter().cur_bc_raw())) {
+ciType* ctype = declared_signature->return_type();
+if (Bytecodes::has_optional_appendix(iter().cur_bc_raw()) || is_signature_polymorphic) {
 // Be careful here with return types.
-ciType* ctype = declared_signature->return_type();
 if (ctype != rtype) {
 BasicType rt = rtype->basic_type();
 BasicType ct = ctype->basic_type();
-Node* retnode = peek();
 if (ct == T_VOID) {
 // It's OK for a method  to return a value that is discarded.
 // The discarding does not require any special action from the caller.
 // The Java code knows this, at VerifyType.isNullConversion.
 pop_node(rt);  // whatever it was, pop it
-retnode = top();
 } else if (rt == T_INT || is_subword_type(rt)) {
-// FIXME: This logic should be factored out.
+// Nothing.  These cases are handled in lambda form bytecode.
-if (ct == T_BOOLEAN) {
+assert(ct == T_INT || is_subword_type(ct), err_msg_res("must match: rt=%s, ct=%s", type2name(rt), type2name(ct)));
-retnode = _gvn.transform( new (C) AndINode(retnode, intcon(0x1)) );
-} else if (ct == T_CHAR) {
-retnode = _gvn.transform( new (C) AndINode(retnode, intcon(0xFFFF)) );
-} else if (ct == T_BYTE) {
-retnode = _gvn.transform( new (C) LShiftINode(retnode, intcon(24)) );
-retnode = _gvn.transform( new (C) RShiftINode(retnode, intcon(24)) );
-} else if (ct == T_SHORT) {
-retnode = _gvn.transform( new (C) LShiftINode(retnode, intcon(16)) );
-retnode = _gvn.transform( new (C) RShiftINode(retnode, intcon(16)) );
-} else {
-assert(ct == T_INT, err_msg_res("rt=%s, ct=%s", type2name(rt), type2name(ct)));
-}
 } else if (rt == T_OBJECT || rt == T_ARRAY) {
 assert(ct == T_OBJECT || ct == T_ARRAY, err_msg_res("rt=%s, ct=%s", type2name(rt), type2name(ct)));
 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));
-pop();
 push(cast_obj);
 }
 }
 } else {
-assert(ct == rt, err_msg("unexpected mismatch rt=%d, ct=%d", rt, ct));
+assert(rt == ct, err_msg_res("unexpected mismatch: rt=%s, ct=%s", type2name(rt), type2name(ct)));
 // push a zero; it's better than getting an oop/int mismatch
-retnode = pop_node(rt);
+pop_node(rt);
-retnode = zerocon(ct);
+Node* retnode = zerocon(ct);
 push_node(ct, retnode);
 }
 // Now that the value is well-behaved, continue with the call-site type.
 rtype = ctype;
 }
+} else {
+assert(rtype == ctype, "mismatched return types");  // symbolic resolution enforces this
 }
 // If the return type of the method is not loaded, assert that the
 // value we got is a null.  Otherwise, we need to recompile.
 if (!rtype->is_loaded()) {
 }
 }
 #endif //PRODUCT
+ciMethod* Compile::optimize_virtual_call(ciMethod* caller, int bci, ciInstanceKlass* klass,
+ciMethod* callee, const TypeOopPtr* receiver_type,
+bool is_virtual,
+bool& call_does_dispatch, int& vtable_index) {
+// Set default values for out-parameters.
+call_does_dispatch = true;
+vtable_index       = Method::invalid_vtable_index;
+// Choose call strategy.
+ciMethod* optimized_virtual_method = optimize_inlining(caller, bci, klass, callee, receiver_type);
+// Have the call been sufficiently improved such that it is no longer a virtual?
+if (optimized_virtual_method != NULL) {
+callee             = optimized_virtual_method;
+call_does_dispatch = false;
+} else if (!UseInlineCaches && is_virtual && callee->is_loaded()) {
+// We can make a vtable call at this site
+vtable_index = callee->resolve_vtable_index(caller->holder(), klass);
+}
+return callee;
+}
 // Identify possible target method and inlining style
-ciMethod* Parse::optimize_inlining(ciMethod* caller, int bci, ciInstanceKlass* klass,
+ciMethod* Compile::optimize_inlining(ciMethod* caller, int bci, ciInstanceKlass* klass,
-ciMethod *dest_method, const TypeOopPtr* receiver_type) {
+ciMethod* callee, const TypeOopPtr* receiver_type) {
 // only use for virtual or interface calls
 // If it is obviously final, do not bother to call find_monomorphic_target,
 // because the class hierarchy checks are not needed, and may fail due to
 // incompletely loaded classes.  Since we do our own class loading checks
 // in this module, we may confidently bind to any method.
-if (dest_method->can_be_statically_bound()) {
+if (callee->can_be_statically_bound()) {
-return dest_method;
+return callee;
 }
 // Attempt to improve the receiver
 bool actual_receiver_is_exact = false;
 ciInstanceKlass* actual_receiver = klass;
 if (receiver_type != NULL) {
 // Array methods are all inherited from Object, and are monomorphic.
 if (receiver_type->isa_aryptr() &&
-dest_method->holder() == env()->Object_klass()) {
+callee->holder() == env()->Object_klass()) {
-return dest_method;
+return callee;
 }
 // All other interesting cases are instance klasses.
 if (!receiver_type->isa_instptr()) {
 return NULL;
 actual_receiver_is_exact = receiver_type->klass_is_exact();
 }
 }
 ciInstanceKlass*   calling_klass = caller->holder();
-ciMethod* cha_monomorphic_target = dest_method->find_monomorphic_target(calling_klass, klass, actual_receiver);
+ciMethod* cha_monomorphic_target = callee->find_monomorphic_target(calling_klass, klass, actual_receiver);
 if (cha_monomorphic_target != NULL) {
 assert(!cha_monomorphic_target->is_abstract(), "");
 // Look at the method-receiver type.  Does it add "too much information"?
 ciKlass*    mr_klass = cha_monomorphic_target->holder();
 const Type* mr_type  = TypeInstPtr::make(TypePtr::BotPTR, mr_klass);
 tty->print_cr("found unique CHA method, but could not cast up");
 tty->print("  method  = ");
 cha_monomorphic_target->print();
 tty->cr();
 }
-if (C->log() != NULL) {
+if (log() != NULL) {
-C->log()->elem("missed_CHA_opportunity klass='%d' method='%d'",
+log()->elem("missed_CHA_opportunity klass='%d' method='%d'",
-C->log()->identify(klass),
+log()->identify(klass),
-C->log()->identify(cha_monomorphic_target));
+log()->identify(cha_monomorphic_target));
 }
 cha_monomorphic_target = NULL;
 }
 }
 if (cha_monomorphic_target != NULL) {
 // If we inlined because CHA revealed only a single target method,
 // then we are dependent on that target method not getting overridden
 // by dynamic class loading.  Be sure to test the "static" receiver
 // dest_method here, as opposed to the actual receiver, which may
 // falsely lead us to believe that the receiver is final or private.
-C->dependencies()->assert_unique_concrete_method(actual_receiver, cha_monomorphic_target);
+dependencies()->assert_unique_concrete_method(actual_receiver, cha_monomorphic_target);
 return cha_monomorphic_target;
 }
 // If the type is exact, we can still bind the method w/o a vcall.
 // (This case comes after CHA so we can see how much extra work it does.)
 if (actual_receiver_is_exact) {
 // In case of evolution, there is a dependence on every inlined method, since each
 // such method can be changed when its class is redefined.
-ciMethod* exact_method = dest_method->resolve_invoke(calling_klass, actual_receiver);
+ciMethod* exact_method = callee->resolve_invoke(calling_klass, actual_receiver);
 if (exact_method != NULL) {
 #ifndef PRODUCT
 if (PrintOpto) {
 tty->print("  Calling method via exact type @%d --- ", bci);
 exact_method->print_name();

Mercurial > hg > truffle

comparison src/share/vm/opto/doCall.cpp @ 7478:5698813d45eb