# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1424182904 -3600
# Node ID e66b3cc0c27a353eafb063dafeb2b4f174181aae
# Parent  dd8989d5547f02f5ac542c19584dc140c58b70a9
substitutions must always be inlined if +InlineDuringParing

diff -r dd8989d5547f -r e66b3cc0c27a graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java	Tue Feb 17 14:49:05 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java	Tue Feb 17 15:21:44 2015 +0100
@@ -25,7 +25,6 @@
 import static com.oracle.graal.compiler.common.GraalOptions.*;
 
 import com.oracle.graal.api.meta.*;
-import com.oracle.graal.api.replacements.*;
 import com.oracle.graal.hotspot.*;
 import com.oracle.graal.hotspot.bridge.*;
 import com.oracle.graal.hotspot.phases.*;
@@ -124,13 +123,9 @@
             });
             config.setInlineInvokePlugin(new InlineInvokePlugin() {
                 public ResolvedJavaMethod getInlinedMethod(GraphBuilderContext builder, ResolvedJavaMethod method, ValueNode[] args, JavaType returnType, int depth) {
-                    if (builder.parsingReplacement()) {
-                        if (method.getAnnotation(MethodSubstitution.class) != null) {
-                            ResolvedJavaMethod subst = replacements.getMethodSubstitutionMethod(method);
-                            if (subst != null) {
-                                return subst;
-                            }
-                        }
+                    ResolvedJavaMethod subst = replacements.getMethodSubstitutionMethod(method);
+                    if (subst != null) {
+                        return subst;
                     }
                     if (method.hasBytecodes() && method.getCode().length <= TrivialInliningSize.getValue() && depth < InlineDuringParsingMaxDepth.getValue()) {
                         return method;