changeset 21752:14011021636e

GraphPE: force inlining in replacements when parsing cached graphs
author Andreas Woess <andreas.woess@oracle.com>
date Fri, 05 Jun 2015 18:38:24 +0200
parents 1524f4f7894d
children 70990d30ace3
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Fri Jun 05 17:59:05 2015 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Fri Jun 05 18:38:24 2015 +0200
@@ -302,8 +302,10 @@
 
         newConfig.setUseProfiling(false);
         Plugins plugins = newConfig.getPlugins();
+        ReplacementsImpl replacements = (ReplacementsImpl) providers.getReplacements();
         plugins.clearInlineInvokePlugins();
-        plugins.appendInlineInvokePlugin(new ParsingInlineInvokePlugin((ReplacementsImpl) providers.getReplacements(), parsingInvocationPlugins, loopExplosionPlugin));
+        plugins.appendInlineInvokePlugin(replacements);
+        plugins.appendInlineInvokePlugin(new ParsingInlineInvokePlugin(replacements, parsingInvocationPlugins, loopExplosionPlugin));
         if (!PrintTruffleExpansionHistogram.getValue()) {
             plugins.appendInlineInvokePlugin(new InlineDuringParsingPlugin());
         }