changeset 15802:5394a8f1d1de

[inlining-7] InlineableGraph takes care of setup chores during construction
author Miguel Garcia <miguel.m.garcia@oracle.com>
date Tue, 20 May 2014 13:00:23 +0200
parents 4df5d01bd8b6
children f6942501f010
files graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/DepthSearchUtil.java
diffstat 2 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/info/elem/InlineableGraph.java	Tue May 20 12:15:55 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java	Tue May 20 13:00:23 2014 +0200
@@ -39,11 +39,11 @@
 
     private final StructuredGraph graph;
 
-    public InlineableGraph(StructuredGraph graph) {
-        this.graph = graph;
+    public InlineableGraph(final ResolvedJavaMethod method, final Invoke invoke, final HighTierContext context, CanonicalizerPhase canonicalizer) {
+        this.graph = buildGraph(method, invoke, context, canonicalizer);
     }
 
-    public static StructuredGraph buildGraph(final ResolvedJavaMethod method, final Invoke invoke, final HighTierContext context, CanonicalizerPhase canonicalizer) {
+    private static StructuredGraph buildGraph(final ResolvedJavaMethod method, final Invoke invoke, final HighTierContext context, CanonicalizerPhase canonicalizer) {
         final StructuredGraph newGraph;
         final boolean parseBytecodes;
 
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/DepthSearchUtil.java	Tue May 20 12:15:55 2014 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/DepthSearchUtil.java	Tue May 20 13:00:23 2014 +0200
@@ -46,7 +46,7 @@
         if (macroNodeClass != null) {
             return new InlineableMacroNode(macroNodeClass);
         } else {
-            return new InlineableGraph(InlineableGraph.buildGraph(method, invoke, context, canonicalizer));
+            return new InlineableGraph(method, invoke, context, canonicalizer);
         }
     }