Mercurial > hg > truffle
changeset 15675:ac62e3a72e02
[inlining] preparing to extract loop body from InliningPhase.run to InliningData
author | Miguel Garcia <miguel.m.garcia@oracle.com> |
---|---|
date | Thu, 15 May 2014 14:32:37 +0200 |
parents | 9e5730b9cbe5 |
children | 7ce628bae4a5 |
files | graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java Thu May 15 13:46:33 2014 +0200 +++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/InliningPhase.java Thu May 15 14:32:37 2014 +0200 @@ -36,7 +36,6 @@ import com.oracle.graal.graph.*; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.java.*; -import com.oracle.graal.nodes.spi.*; import com.oracle.graal.options.*; import com.oracle.graal.phases.common.*; import com.oracle.graal.phases.common.inlining.info.InlineInfo; @@ -197,14 +196,15 @@ Assumptions callerAssumptions = parentInvocation.assumptions(); if (inliningPolicy.isWorthInlining(probabilities, context.getReplacements(), callee, inliningDepth, calleeInfo.probability(), calleeInfo.relevance(), true)) { - doInline(callerCallsiteHolder, calleeInfo, callerAssumptions, context); + doInline(callerCallsiteHolder, calleeInfo, callerAssumptions, context, canonicalizer); + inliningCount++; } else if (context.getOptimisticOptimizations().devirtualizeInvokes()) { callee.tryToDevirtualizeInvoke(context.getMetaAccess(), callerAssumptions); } metricInliningConsidered.increment(); } - private void doInline(CallsiteHolder callerCallsiteHolder, MethodInvocation calleeInfo, Assumptions callerAssumptions, HighTierContext context) { + private static void doInline(CallsiteHolder callerCallsiteHolder, MethodInvocation calleeInfo, Assumptions callerAssumptions, HighTierContext context, CanonicalizerPhase canonicalizer) { StructuredGraph callerGraph = callerCallsiteHolder.graph(); Mark markBeforeInlining = callerGraph.getMark(); InlineInfo callee = calleeInfo.callee(); @@ -230,7 +230,6 @@ callerCallsiteHolder.computeProbabilities(); - inliningCount++; metricInliningPerformed.increment(); } } catch (BailoutException bailout) {