# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1426289028 -3600
# Node ID 834e5392ac05026c2d74864bbb5cba5ca126d317
# Parent  cd6821e84e5923795159ef615e00bb217fdf990c
inline intrinsics during bytecode paring only if -G:+Inline or -G:+InlineDuringParsing

diff -r cd6821e84e59 -r 834e5392ac05 graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotInlineInvokePlugin.java
--- 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 &&