Mercurial > hg > truffle

changeset 19841:834e5392ac05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inline intrinsics during bytecode paring only if -G:+Inline or -G:+InlineDuringParsing
author Doug Simon <doug.simon@oracle.com>
date Sat, 14 Mar 2015 00:23:48 +0100
parents cd6821e84e59
children a9fbe23a602b
files graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInlineInvokePlugin.java
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInlineInvokePlugin.java	Fri Mar 13 23:46:12 2015 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInlineInvokePlugin.java	Sat Mar 14 00:23:48 2015 +0100
@@ -48,8 +48,10 @@
     public InlineInfo getInlineInfo(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args, JavaType returnType) {
         ResolvedJavaMethod subst = replacements.getMethodSubstitutionMethod(method);
         if (subst != null) {
-            // Forced inlining of intrinsics
-            return new InlineInfo(subst, true, true);
+            if (b.parsingReplacement() || InlineDuringParsing.getValue()) {
+                // Forced inlining of intrinsics
+                return new InlineInfo(subst, true, true);
+            }
         }
         if (b.parsingReplacement()) {
             assert nodeIntrinsification.getIntrinsic(method) == null && method.getAnnotation(Word.Operation.class) == null && method.getAnnotation(HotSpotOperation.class) == null &&