Mercurial > hg > truffle

changeset 19245:03444c54a267

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out of changeset 19244:957fcb7fb14d
author Doug Simon <doug.simon@oracle.com>
date Wed, 11 Feb 2015 00:25:34 +0100
parents 957fcb7fb14d
children d3e835fa6bbf
files graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java	Tue Feb 10 21:15:02 2015 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java	Wed Feb 11 00:25:34 2015 +0100
@@ -53,6 +53,8 @@
                 new UnboxPlugin(kind).register(metaAccess, plugins);
             }
         }
+
+        GraalDirectivePlugins.registerPlugins(metaAccess, plugins);
     }
 
     static class BoxPlugin implements InvocationPlugin {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Tue Feb 10 21:15:02 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Wed Feb 11 00:25:34 2015 +0100
@@ -215,7 +215,6 @@
         newConfig.setLoopExplosionPlugin(new LoopExplosionPlugin());
         DefaultGraphBuilderPlugins plugins = graalPlugins == null ? new DefaultGraphBuilderPlugins() : graalPlugins.copy();
         TruffleGraphBuilderPlugins.registerPlugins(providers.getMetaAccess(), plugins);
-        GraalDirectivePlugins.registerPlugins(providers.getMetaAccess(), plugins);
         long ms = System.currentTimeMillis();
         new GraphBuilderPhase.Instance(providers.getMetaAccess(), providers.getStampProvider(), new Assumptions(true), this.snippetReflection, providers.getConstantReflection(), newConfig, plugins,
                         TruffleCompilerImpl.Optimizations).apply(graph);