Mercurial > hg > graal-compiler

changeset 22815:eb1a8652f8e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle: take CompilerOptions from RootNode, not ExecutionContext
author Andreas Woess <andreas.woess@oracle.com>
date Wed, 14 Oct 2015 18:07:15 +0200
parents 42c3911e6993
children 4b3b2ce716be
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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"})