# HG changeset patch # User Christian Humer # Date 1412238972 -7200 # Node ID d6e4c9031ff6fa325dcecbd42c1298a1978d7e80 # Parent b1fc1ad0439e3def346fbdd96aac602aa42415d5 Truffle: fixed OptimizedCallTarget.callDirect was marked as not inlinable even if context sensitive inlining was not used. diff -r b1fc1ad0439e -r d6e4c9031ff6 graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java --- 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