Mercurial > hg > truffle
changeset 19407:40deedbc4f9b
rename: registerPlugins -> registerInvocationPlugins
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 16 Feb 2015 13:50:40 +0100 |
parents | 07f2edacfd3f |
children | 7345e1a7069f |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java graal/com.oracle.graal.java/src/com/oracle/graal/java/GraalDirectivePlugins.java graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java |
diffstat | 6 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Mon Feb 16 13:41:30 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotHostBackend.java Mon Feb 16 13:50:40 2015 +0100 @@ -69,7 +69,7 @@ try (InitTimer st = timer("graphBuilderPlugins.initialize")) { GraphBuilderPhase phase = (GraphBuilderPhase) providers.getSuites().getDefaultGraphBuilderSuite().findPhase(GraphBuilderPhase.class).previous(); InvocationPlugins plugins = phase.getGraphBuilderConfig().getInvocationPlugins(); - registerGraphBuilderPlugins(providers.getMetaAccess(), plugins); + registerInvocationPlugins(providers.getMetaAccess(), plugins); } try (InitTimer st = timer("foreignCalls.initialize")) { @@ -101,8 +101,8 @@ } } - protected void registerGraphBuilderPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { - StandardGraphBuilderPlugins.registerPlugins(metaAccess, plugins); - HotSpotGraphBuilderPlugins.registerPlugins(metaAccess, plugins); + protected void registerInvocationPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { + StandardGraphBuilderPlugins.registerInvocationPlugins(metaAccess, plugins); + HotSpotGraphBuilderPlugins.registerInvocationPlugins(metaAccess, plugins); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Mon Feb 16 13:41:30 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java Mon Feb 16 13:50:40 2015 +0100 @@ -39,10 +39,10 @@ import com.oracle.graal.options.*; /** - * Provider of HotSpot specific {@link GraphBuilderPlugin}s. + * Provides HotSpot specific {@link InvocationPlugin}s. */ public class HotSpotGraphBuilderPlugins { - public static void registerPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { + public static void registerInvocationPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { // Object.class Registration r = new Registration(plugins, metaAccess, Object.class); r.register1("getClass", Receiver.class, new InvocationPlugin() {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraalDirectivePlugins.java Mon Feb 16 13:41:30 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/GraalDirectivePlugins.java Mon Feb 16 13:50:40 2015 +0100 @@ -32,7 +32,7 @@ public class GraalDirectivePlugins { - public static void registerPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { + public static void registerInvocationPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { Registration r = new Registration(plugins, metaAccess, GraalDirectives.class); r.register0("deoptimize", new InvocationPlugin() { public boolean apply(GraphBuilderContext builder) {
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java Mon Feb 16 13:41:30 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/StandardGraphBuilderPlugins.java Mon Feb 16 13:50:40 2015 +0100 @@ -34,10 +34,10 @@ import com.oracle.graal.nodes.java.*; /** - * Provider of non-runtime specific {@link GraphBuilderPlugin}s. + * Provides non-runtime specific {@link InvocationPlugin}s. */ public class StandardGraphBuilderPlugins { - public static void registerPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { + public static void registerInvocationPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { Registration r = new Registration(plugins, metaAccess, Object.class); r.register1("<init>", Receiver.class, new InvocationPlugin() { public boolean apply(GraphBuilderContext builder, ValueNode object) { @@ -75,7 +75,7 @@ } } - GraalDirectivePlugins.registerPlugins(metaAccess, plugins); + GraalDirectivePlugins.registerInvocationPlugins(metaAccess, plugins); } static class BoxPlugin implements InvocationPlugin {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Mon Feb 16 13:41:30 2015 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java Mon Feb 16 13:50:40 2015 +0100 @@ -254,7 +254,7 @@ callTarget.setInlining(new TruffleInlining(callTarget, new DefaultInliningPolicy())); newConfig.setInlineInvokePlugin(new InlineInvokePlugin(callTarget.getInlining())); newConfig.setLoopExplosionPlugin(new LoopExplosionPlugin()); - TruffleGraphBuilderPlugins.registerPlugins(providers.getMetaAccess(), newConfig.getInvocationPlugins()); + TruffleGraphBuilderPlugins.registerInvocationPlugins(providers.getMetaAccess(), newConfig.getInvocationPlugins()); long ms = System.currentTimeMillis(); new GraphBuilderPhase.Instance(providers.getMetaAccess(), providers.getStampProvider(), this.snippetReflection, providers.getReplacements(), providers.getConstantReflection(), newConfig, TruffleCompilerImpl.Optimizations).apply(graph);
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java Mon Feb 16 13:41:30 2015 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java Mon Feb 16 13:50:40 2015 +0100 @@ -47,10 +47,10 @@ import com.oracle.truffle.api.frame.*; /** - * Provider of {@link GraphBuilderPlugin}s for Truffle classes. + * Provides {@link InvocationPlugin}s for Truffle classes. */ public class TruffleGraphBuilderPlugins { - public static void registerPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { + public static void registerInvocationPlugins(MetaAccessProvider metaAccess, InvocationPlugins plugins) { // OptimizedAssumption.class Registration r = new Registration(plugins, metaAccess, OptimizedAssumption.class);