changeset 19110:9e07d5219944

Further restructuring in the PartialEvaluator.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 04 Feb 2015 00:55:08 +0100
parents 61c772f6d8eb
children 0b15114268c8
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Wed Feb 04 00:41:25 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Wed Feb 04 00:55:08 2015 +0100
@@ -109,8 +109,6 @@
 
         try (Scope s = Debug.scope("CreateGraph", graph); Indent indent = Debug.logAndIndent("createGraph %s", graph)) {
 
-            createRootGraph(graph);
-
             Map<ResolvedJavaMethod, StructuredGraph> graphCache = null;
             if (CacheGraphs.getValue()) {
                 graphCache = new HashMap<>();
@@ -121,6 +119,7 @@
             if (TruffleCompilerOptions.FastPE.getValue()) {
                 fastPartialEvaluation(callTarget, assumptions, graph, baseContext, tierContext);
             } else {
+                createRootGraph(graph);
                 partialEvaluation(callTarget, assumptions, graph, baseContext, tierContext);
             }
 
@@ -143,6 +142,8 @@
 
     @SuppressWarnings("unused")
     private void fastPartialEvaluation(OptimizedCallTarget callTarget, Assumptions assumptions, StructuredGraph graph, PhaseContext baseContext, HighTierContext tierContext) {
+        new GraphBuilderPhase.Instance(providers.getMetaAccess(), providers.getStampProvider(), new Assumptions(false), configForRoot, TruffleCompilerImpl.Optimizations).apply(graph);
+        Debug.dump(graph, "After FastPE");
     }
 
     private void partialEvaluation(final OptimizedCallTarget callTarget, final Assumptions assumptions, final StructuredGraph graph, PhaseContext baseContext, HighTierContext tierContext) {