# HG changeset patch
# User Andreas Woess <andreas.woess@oracle.com>
# Date 1424083902 -3600
# Node ID c46d8322ef9850f02d154ab4ea183fe409125fc7
# Parent  aff26d9a9fb6bb88332bc724a72f1791265c6df9
Truffle: also apply method substitutions after FastPE

diff -r aff26d9a9fb6 -r c46d8322ef98 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Sun Feb 15 23:42:49 2015 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/PartialEvaluator.java	Mon Feb 16 11:51:42 2015 +0100
@@ -265,6 +265,11 @@
             Class<? extends FixedWithNextNode> macroSubstitution = providers.getReplacements().getMacroSubstitution(methodCallTargetNode.targetMethod());
             if (macroSubstitution != null) {
                 InliningUtil.inlineMacroNode(methodCallTargetNode.invoke(), methodCallTargetNode.targetMethod(), macroSubstitution);
+            } else {
+                StructuredGraph inlineGraph = providers.getReplacements().getMethodSubstitution(methodCallTargetNode.targetMethod());
+                if (inlineGraph != null) {
+                    InliningUtil.inline(methodCallTargetNode.invoke(), inlineGraph, true, null);
+                }
             }
         }