changeset 15810:64deb577ff5c

[inline-info] step 2, simpler inter-procedural communication
author Miguel Garcia <miguel.m.garcia@oracle.com>
date Tue, 20 May 2014 14:53:29 +0200
parents d475c2841f09
children f5934280f47c
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java	Tue May 20 14:48:46 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java	Tue May 20 14:53:29 2014 +0200
@@ -409,7 +409,8 @@
             double invokeProbability = callsiteHolder.invokeProbability(invoke);
             double invokeRelevance = callsiteHolder.invokeRelevance(invoke);
             Assumptions calleeAssumptions = new Assumptions(parentAssumptions.useOptimisticAssumptions());
-            pushInvocation(info, calleeAssumptions, invokeProbability, invokeRelevance);
+            MethodInvocation methodInvocation = new MethodInvocation(info, calleeAssumptions, invokeProbability, invokeRelevance);
+            pushInvocation(methodInvocation);
 
             for (int i = 0; i < info.numberOfMethods(); i++) {
                 Inlineable elem = Inlineable.getInlineableElement(info.methodAt(i), info.invoke(), context.replaceAssumptions(calleeAssumptions), canonicalizer);
@@ -485,10 +486,9 @@
         return invocationQueue.peekFirst();
     }
 
-    private void pushInvocation(InlineInfo info, Assumptions calleeAssumptions, double probability, double relevance) {
-        MethodInvocation methodInvocation = new MethodInvocation(info, calleeAssumptions, probability, relevance);
+    private void pushInvocation(MethodInvocation methodInvocation) {
         invocationQueue.addFirst(methodInvocation);
-        maxGraphs += info.numberOfMethods();
+        maxGraphs += methodInvocation.callee().numberOfMethods();
         assert graphQueue.size() <= maxGraphs;
     }