Mercurial > hg > truffle
changeset 19244:957fcb7fb14d
GraalDirectivePlugins are only used for Truffle fast partial evaluation, not normal Graal compilations
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Tue, 10 Feb 2015 21:15:02 +0100 |
| parents | 006e321d592b |
| children | 03444c54a267 |
| 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, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 {
--- 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);