changeset 22333:1801b7f11c64

Using TruffleOptions.AOT rather than accessing the system property directly.
author Jaroslav Tulach <jaroslav.tulach@oracle.com>
date Mon, 02 Nov 2015 08:58:45 +0100
parents fdc687bad5d4
children c12a7960bd7b
files truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/LanguageCache.java truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/LanguageCache.java	Wed Oct 28 14:04:33 2015 +0100
+++ b/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/LanguageCache.java	Mon Nov 02 08:58:45 2015 +0100
@@ -25,6 +25,7 @@
 package com.oracle.truffle.api.vm;
 
 import com.oracle.truffle.api.TruffleLanguage;
+import com.oracle.truffle.api.TruffleOptions;
 import static com.oracle.truffle.api.vm.PolyglotEngine.LOG;
 import java.io.IOException;
 import java.io.InputStream;
@@ -39,8 +40,8 @@
 import java.util.logging.Level;
 
 /**
- * Ahead-of-time initialization. If the JVM is started with -Dcom.oracle.truffle.aot=true, it
- * populates cache with languages found in application classloader.
+ * Ahead-of-time initialization. If the JVM is started with {@link TruffleOptions#AOT}, it populates
+ * cache with languages found in application classloader.
  */
 final class LanguageCache {
     static final boolean PRELOAD;
@@ -53,7 +54,7 @@
 
     static {
         Map<String, LanguageCache> map = null;
-        if (Boolean.getBoolean("com.oracle.truffle.aot")) { // NOI18N
+        if (TruffleOptions.AOT) {
             map = languages();
             for (LanguageCache info : map.values()) {
                 info.getImpl(true);
--- a/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java	Wed Oct 28 14:04:33 2015 +0100
+++ b/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java	Mon Nov 02 08:58:45 2015 +0100
@@ -49,6 +49,7 @@
 import com.oracle.truffle.api.TruffleLanguage;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.TruffleLanguage.Registration;
+import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.debug.Debugger;
 import com.oracle.truffle.api.debug.ExecutionEvent;
 import com.oracle.truffle.api.debug.SuspendedEvent;
@@ -101,7 +102,7 @@
  */
 @SuppressWarnings("rawtypes")
 public class PolyglotEngine {
-    static final boolean JAVA_INTEROP_ENABLED = !Boolean.getBoolean("com.oracle.truffle.aot");
+    static final boolean JAVA_INTEROP_ENABLED = !TruffleOptions.AOT;
     private static final Executor DIRECT_EXECUTOR = new Executor() {
         @Override
         public void execute(Runnable command) {