changeset 13503:b5d418c12ed5

Re-use buildInitialGraph to ensure the same phases are run when inlining the original method
author Christian Wimmer <christian.wimmer@oracle.com>
date Fri, 03 Jan 2014 11:55:58 -0800
parents 89a9d3f5bc17
children 5aaae6e76a2a
files graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java
diffstat 1 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Fri Jan 03 11:55:14 2014 -0800
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Fri Jan 03 11:55:58 2014 -0800
@@ -413,13 +413,7 @@
                 for (MethodCallTargetNode callTarget : graph.getNodes(MethodCallTargetNode.class)) {
                     ResolvedJavaMethod callee = callTarget.targetMethod();
                     if (callee == method) {
-                        final StructuredGraph originalGraph = new StructuredGraph(original);
-                        MetaAccessProvider metaAccess = providers.getMetaAccess();
-                        ForeignCallsProvider foreignCalls = providers.getForeignCalls();
-                        new GraphBuilderPhase(metaAccess, foreignCalls, GraphBuilderConfiguration.getSnippetDefault(), OptimisticOptimizations.NONE).apply(originalGraph);
-                        new WordTypeVerificationPhase(metaAccess, target.wordKind).apply(graph);
-                        new WordTypeRewriterPhase(metaAccess, target.wordKind).apply(graph);
-
+                        final StructuredGraph originalGraph = buildInitialGraph(original);
                         InliningUtil.inline(callTarget.invoke(), originalGraph, true);
 
                         Debug.dump(graph, "after inlining %s", callee);