changeset 17313:d6e4c9031ff6

Truffle: fixed OptimizedCallTarget.callDirect was marked as not inlinable even if context sensitive inlining was not used.
author Christian Humer <christian.humer@gmail.com>
date Thu, 02 Oct 2014 10:36:12 +0200
parents b1fc1ad0439e
children 3b6759c384a9
files graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Wed Oct 01 23:20:10 2014 +0200
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java	Thu Oct 02 10:36:12 2014 +0200
@@ -95,7 +95,9 @@
     }
 
     private static void installOptimizedCallTargetCallDirect() {
-        ((HotSpotResolvedJavaMethod) getGraalProviders().getMetaAccess().lookupJavaMethod(OptimizedCallTarget.getCallDirectMethod())).setNotInlineable();
+        if (TruffleCompilerOptions.TruffleContextSensitiveInlining.getValue()) {
+            ((HotSpotResolvedJavaMethod) getGraalProviders().getMetaAccess().lookupJavaMethod(OptimizedCallTarget.getCallDirectMethod())).setNotInlineable();
+        }
     }
 
     @Override