Mercurial > hg > truffle

changeset 20987:c8c0944ce10d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copy all plugins in TruffleCompilerImpl (instead of selected ones)
author Lukas Stadler <lukas.stadler@oracle.com>
date Thu, 16 Apr 2015 11:55:50 +0200
parents ec91b758ebc7
children 658db9861109
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java	Thu Apr 16 11:17:36 2015 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java	Thu Apr 16 11:55:50 2015 +0200
@@ -95,14 +95,9 @@
         ResolvedJavaType[] skippedExceptionTypes = getSkippedExceptionTypes(providers.getMetaAccess());
 
         GraphBuilderPhase phase = (GraphBuilderPhase) backend.getSuites().getDefaultGraphBuilderSuite().findPhase(GraphBuilderPhase.class).previous();
-        Plugins graalPlugins = phase.getGraphBuilderConfig().getPlugins();
-        InvocationPlugins invocationPlugins = new InvocationPlugins(graalPlugins.getInvocationPlugins());
-        Plugins plugins = new Plugins(invocationPlugins);
+        // copy all plugins from the host
+        Plugins plugins = new Plugins(phase.getGraphBuilderConfig().getPlugins());
         this.config = GraphBuilderConfiguration.getDefault(plugins).withSkippedExceptionTypes(skippedExceptionTypes);
-        // Since invocationPlugins may include MethodSubstitutionPlugins, we
-        // need to copy the GenericInvocationPlugins so that @NodeIntrinsics
-        // and Word methods in method substitutions are handled correctly.
-        plugins.setGenericInvocationPlugin(graalPlugins.getGenericInvocationPlugin());
 
         this.partialEvaluator = new PartialEvaluator(providers, config, Graal.getRequiredCapability(SnippetReflectionProvider.class));