# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1427116712 -3600
# Node ID 0e7bb9cced6b6a4d36aad5683be9adb226dad169
# Parent  e8a0a61526b2ad3702aae226c8fa2fe38fe04619
ignore forced MethodSubstitutions during graph builder inlining (it breaks economy compiler configuration)

diff -r e8a0a61526b2 -r 0e7bb9cced6b graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java
--- a/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Mon Mar 23 13:36:04 2015 +0100
+++ b/graal/com.oracle.graal.replacements/src/com/oracle/graal/replacements/ReplacementsImpl.java	Mon Mar 23 14:18:32 2015 +0100
@@ -97,7 +97,7 @@
     public InlineInfo getInlineInfo(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args, JavaType returnType) {
         ResolvedJavaMethod subst = getMethodSubstitutionMethod(method);
         if (subst != null) {
-            if (b.parsingReplacement() || InlineDuringParsing.getValue() || isForcedSubstitution(method)) {
+            if (b.parsingReplacement() || InlineDuringParsing.getValue()) {
                 // Forced inlining of intrinsics
                 return new InlineInfo(subst, true, true);
             }