changeset 16032:8beba154719b

[inliner] moved helper method to CallsiteHolder
author Miguel Garcia <miguel.m.garcia@oracle.com>
date Tue, 03 Jun 2014 11:27:08 +0200
parents cd2209d3af46
children 4408391d34a1
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java	Thu Jun 05 11:08:13 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/CallsiteHolder.java	Tue Jun 03 11:27:08 2014 +0200
@@ -107,6 +107,15 @@
         remainingInvokes.push(invoke);
     }
 
+    public boolean containsInvoke(Invoke invoke) {
+        for (Invoke i : graph().getInvokes()) {
+            if (i == invoke) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     public void computeProbabilities() {
         computeInliningRelevance.compute();
     }
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java	Thu Jun 05 11:08:13 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/InliningData.java	Tue Jun 03 11:27:08 2014 +0200
@@ -380,7 +380,7 @@
      */
     private boolean tryToInline(CallsiteHolder callerCallsiteHolder, MethodInvocation calleeInvocation, MethodInvocation parentInvocation, int inliningDepth) {
         InlineInfo calleeInfo = calleeInvocation.callee();
-        assert iterContains(callerCallsiteHolder.graph().getInvokes(), calleeInfo.invoke());
+        assert callerCallsiteHolder.containsInvoke(calleeInfo.invoke());
         Assumptions callerAssumptions = parentInvocation.assumptions();
         metricInliningConsidered.increment();
 
@@ -396,15 +396,6 @@
         return false;
     }
 
-    private static <T> boolean iterContains(Iterable<T> in, T elem) {
-        for (T i : in) {
-            if (i == elem) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * Process the next invoke and enqueue all its graphs for processing.
      */