# HG changeset patch # User Miguel Garcia # Date 1400583623 -7200 # Node ID 5394a8f1d1de9bae1afd2ae8db4d50155d815a84 # Parent 4df5d01bd8b6850f07e26bdbbe1b8590f6bec257 [inlining-7] InlineableGraph takes care of setup chores during construction diff -r 4df5d01bd8b6 -r 5394a8f1d1de graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/info/elem/InlineableGraph.java --- 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; diff -r 4df5d01bd8b6 -r 5394a8f1d1de graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/inlining/walker/DepthSearchUtil.java --- 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); } }