# HG changeset patch
# User Miguel Garcia <miguel.m.garcia@oracle.com>
# Date 1402679568 -7200
# Node ID f75c23a505e1b3d58fcc45b4f3c589736967323c
# Parent  9b27e69f7cec3f1c37ad4737202dca1a5d3682ed
[inliner] moved determineNodeCount() to InlineInfo

diff -r 9b27e69f7cec -r f75c23a505e1 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AbstractInlineInfo.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AbstractInlineInfo.java	Thu Jun 19 23:42:25 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/AbstractInlineInfo.java	Fri Jun 13 19:12:48 2014 +0200
@@ -103,4 +103,15 @@
             return CallsiteHolderDummy.DUMMY_CALLSITE_HOLDER;
         }
     }
+
+    public final int determineNodeCount() {
+        int nodes = 0;
+        for (int i = 0; i < numberOfMethods(); i++) {
+            Inlineable elem = inlineableElementAt(i);
+            if (elem != null) {
+                nodes += elem.getNodeCount();
+            }
+        }
+        return nodes;
+    }
 }
diff -r 9b27e69f7cec -r f75c23a505e1 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/InlineInfo.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/InlineInfo.java	Thu Jun 19 23:42:25 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/InlineInfo.java	Fri Jun 13 19:12:48 2014 +0200
@@ -89,4 +89,6 @@
     void populateInlinableElements(HighTierContext context, Assumptions calleeAssumptions, CanonicalizerPhase canonicalizer);
 
     CallsiteHolder buildCallsiteHolderForElement(int index, double invokeProbability, double invokeRelevance);
+
+    int determineNodeCount();
 }
diff -r 9b27e69f7cec -r f75c23a505e1 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java	Thu Jun 19 23:42:25 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/AbstractInliningPolicy.java	Fri Jun 13 19:12:48 2014 +0200
@@ -100,17 +100,6 @@
         return size;
     }
 
-    protected static int determineNodeCount(InlineInfo info) {
-        int nodes = 0;
-        for (int i = 0; i < info.numberOfMethods(); i++) {
-            Inlineable elem = info.inlineableElementAt(i);
-            if (elem != null) {
-                nodes += elem.getNodeCount();
-            }
-        }
-        return nodes;
-    }
-
     protected static double determineInvokeProbability(ToDoubleFunction<FixedNode> probabilities, InlineInfo info) {
         double invokeProbability = 0;
         for (int i = 0; i < info.numberOfMethods(); i++) {
diff -r 9b27e69f7cec -r f75c23a505e1 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/GreedyInliningPolicy.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/GreedyInliningPolicy.java	Thu Jun 19 23:42:25 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/policy/GreedyInliningPolicy.java	Fri Jun 13 19:12:48 2014 +0200
@@ -72,7 +72,7 @@
         }
 
         double inliningBonus = getInliningBonus(info);
-        int nodes = determineNodeCount(info);
+        int nodes = info.determineNodeCount();
         int lowLevelGraphSize = previousLowLevelGraphSize(info);
 
         if (SmallCompiledLowLevelGraphSize.getValue() > 0 && lowLevelGraphSize > SmallCompiledLowLevelGraphSize.getValue() * inliningBonus) {