# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1423599302 -3600
# Node ID 957fcb7fb14d08df456e1f6d8db54782e5bfb213
# Parent  006e321d592bd1049b7dbd5d8d72ca462fa63c2d
GraalDirectivePlugins are only used for Truffle fast partial evaluation, not normal Graal compilations

diff -r 006e321d592b -r 957fcb7fb14d graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java	Tue Feb 10 21:11:43 2015 +0100
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java	Tue Feb 10 21:15:02 2015 +0100
@@ -53,8 +53,6 @@
                 new UnboxPlugin(kind).register(metaAccess, plugins);
             }
         }
-
-        GraalDirectivePlugins.registerPlugins(metaAccess, plugins);
     }
 
     static class BoxPlugin implements InvocationPlugin {
diff -r 006e321d592b -r 957fcb7fb14d graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Tue Feb 10 21:11:43 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Tue Feb 10 21:15:02 2015 +0100
@@ -215,6 +215,7 @@
         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);