# HG changeset patch
# User Andreas Woess <andreas.woess@oracle.com>
# Date 1444838835 -7200
# Node ID eb1a8652f8e63897943016398ada1fe9bbebd8ed
# Parent  42c3911e6993ee47904aa457b821ca70699d2ea7
Truffle: take CompilerOptions from RootNode, not ExecutionContext

diff -r 42c3911e6993 -r eb1a8652f8e6 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Wed Oct 14 18:02:30 2015 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Wed Oct 14 18:07:15 2015 +0200
@@ -55,7 +55,6 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerOptions;
-import com.oracle.truffle.api.ExecutionContext;
 import com.oracle.truffle.api.LoopCountReceiver;
 import com.oracle.truffle.api.OptimizationFailedException;
 import com.oracle.truffle.api.ReplaceObserver;
@@ -572,13 +571,11 @@
     }
 
     private CompilerOptions getCompilerOptions() {
-        final ExecutionContext context = rootNode.getExecutionContext();
-
-        if (context == null) {
-            return DefaultCompilerOptions.INSTANCE;
+        final CompilerOptions options = rootNode.getCompilerOptions();
+        if (options != null) {
+            return options;
         }
-
-        return context.getCompilerOptions();
+        return DefaultCompilerOptions.INSTANCE;
     }
 
     @SuppressWarnings({"unchecked", "unused"})