changeset 22960:20e85d1dd9a5

Merge.
author Chris Seaton <chris.seaton@oracle.com>
date Sun, 08 Nov 2015 20:41:58 +0000
parents 267fb5779338 (diff) 91a0b42ea9ed (current diff)
children 09d0f549f05e
files
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Fri Nov 06 14:19:06 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Sun Nov 08 20:41:58 2015 +0000
@@ -454,7 +454,7 @@
 
         // Do single partial escape and canonicalization pass.
         try (Scope pe = Debug.scope("TrufflePartialEscape", graph)) {
-            new PartialEscapePhase(false, canonicalizer).apply(graph, tierContext);
+            new PartialEscapePhase(TruffleCompilerOptions.TruffleIterativePartialEscape.getValue(), canonicalizer).apply(graph, tierContext);
         } catch (Throwable t) {
             Debug.handle(t);
         }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java	Fri Nov 06 14:19:06 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java	Sun Nov 08 20:41:58 2015 +0000
@@ -179,5 +179,9 @@
 
     @Option(help = "Enable support for simple infopoints in truffle partial evaluations.", type = OptionType.Expert)
     public static final OptionValue<Boolean> TruffleEnableInfopoints = new OptionValue<>(false);
+
+    @Option(help = "Enable support for simple infopoints in truffle partial evaluations.", type = OptionType.Debug)
+    public static final OptionValue<Boolean> TruffleIterativePartialEscape = new OptionValue<>(false);
+
     // @formatter:on
 }