1.1 --- a/src/share/vm/opto/doCall.cpp Fri Jan 24 09:31:53 2014 +0100
1.2 +++ b/src/share/vm/opto/doCall.cpp Fri Jan 24 15:26:56 2014 +0400
1.3 @@ -161,19 +161,8 @@
1.4
1.5 // Try inlining a bytecoded method:
1.6 if (!call_does_dispatch) {
1.7 - InlineTree* ilt;
1.8 - if (UseOldInlining) {
1.9 - ilt = InlineTree::find_subtree_from_root(this->ilt(), jvms->caller(), jvms->method());
1.10 - } else {
1.11 - // Make a disembodied, stateless ILT.
1.12 - // TO DO: When UseOldInlining is removed, copy the ILT code elsewhere.
1.13 - float site_invoke_ratio = prof_factor;
1.14 - // Note: ilt is for the root of this parse, not the present call site.
1.15 - ilt = new InlineTree(this, jvms->method(), jvms->caller(), site_invoke_ratio, MaxInlineLevel);
1.16 - }
1.17 + InlineTree* ilt = InlineTree::find_subtree_from_root(this->ilt(), jvms->caller(), jvms->method());
1.18 WarmCallInfo scratch_ci;
1.19 - if (!UseOldInlining)
1.20 - scratch_ci.init(jvms, callee, profile, prof_factor);
1.21 bool should_delay = false;
1.22 WarmCallInfo* ci = ilt->ok_to_inline(callee, jvms, profile, &scratch_ci, should_delay);
1.23 assert(ci != &scratch_ci, "do not let this pointer escape");
