Mercurial > hg > truffle

changeset 19457:e66b3cc0c27a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
substitutions must always be inlined if +InlineDuringParing
author Doug Simon <doug.simon@oracle.com>
date Tue, 17 Feb 2015 15:21:44 +0100
parents dd8989d5547f
children a58dacb6ad9a
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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;