Mercurial > hg > truffle
changeset 19177:1a7b33c96c0d
Fixes for TruffleGraphBuilderPluginsProvider.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 06 Feb 2015 16:49:34 +0100 |
parents | 938a290903f3 |
children | c8091ec0fdc0 637ca4d37bca |
files | graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPluginsProvider.java |
diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Fri Feb 06 14:42:44 2015 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Fri Feb 06 16:49:34 2015 +0100 @@ -58,6 +58,7 @@ import com.oracle.graal.truffle.nodes.frame.*; import com.oracle.graal.truffle.nodes.frame.NewFrameNode.VirtualOnlyInstanceNode; import com.oracle.graal.truffle.phases.*; +import com.oracle.graal.truffle.substitutions.*; import com.oracle.graal.virtual.phases.ea.*; import com.oracle.truffle.api.*; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; @@ -217,6 +218,7 @@ for (GraphBuilderPluginsProvider p : sl) { p.registerPlugins(providers.getMetaAccess(), plugins); } + new TruffleGraphBuilderPluginsProvider().registerPlugins(providers.getMetaAccess(), plugins); new GraphBuilderPhase.Instance(providers.getMetaAccess(), providers.getStampProvider(), new Assumptions(false), providers.getConstantReflection(), newConfig, plugins, TruffleCompilerImpl.Optimizations).apply(graph); Debug.dump(graph, "After FastPE");
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPluginsProvider.java Fri Feb 06 14:42:44 2015 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPluginsProvider.java Fri Feb 06 16:49:34 2015 +0100 @@ -26,7 +26,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.api.runtime.*; import com.oracle.graal.compiler.common.type.*; import com.oracle.graal.java.*; import com.oracle.graal.java.GraphBuilderPlugins.InvocationPlugin; @@ -41,7 +40,6 @@ /** * Provider of {@link GraphBuilderPlugin}s for Truffle classes. */ -@ServiceProvider(GraphBuilderPluginsProvider.class) public class TruffleGraphBuilderPluginsProvider implements GraphBuilderPluginsProvider { public void registerPlugins(MetaAccessProvider metaAccess, GraphBuilderPlugins plugins) { @@ -56,13 +54,13 @@ Registration r = new Registration(plugins, metaAccess, CompilerDirectives.class); r.register0("inInterpreter", new InvocationPlugin() { public boolean apply(GraphBuilderContext builder) { - builder.push(Kind.Boolean, builder.append(ConstantNode.forBoolean(false))); + builder.push(Kind.Boolean.getStackKind(), builder.append(ConstantNode.forBoolean(false))); return true; } }); r.register0("inCompiledCode", new InvocationPlugin() { public boolean apply(GraphBuilderContext builder) { - builder.push(Kind.Boolean, builder.append(ConstantNode.forBoolean(true))); + builder.push(Kind.Boolean.getStackKind(), builder.append(ConstantNode.forBoolean(true))); return true; } }); @@ -105,7 +103,7 @@ r.register1("isCompilationConstant", Object.class, new InvocationPlugin() { public boolean apply(GraphBuilderContext builder, ValueNode value) { if ((value instanceof BoxNode ? ((BoxNode) value).getValue() : value).isConstant()) { - builder.push(Kind.Boolean, builder.append(ConstantNode.forBoolean(true))); + builder.push(Kind.Boolean.getStackKind(), builder.append(ConstantNode.forBoolean(true))); return true; } return false;