Small refactoring of PythonEngineOptions.

Author: ppisl

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -223,7 +223,7 @@ List<WeakReference<Thread>> getOwners() {
     // compat
     private final ThreadLocal<ArrayDeque<String>> currentImport = new ThreadLocal<>();
 
-    private PythonEngineOptions engineOptions;
+    @CompilationFinal private PythonEngineOptions engineOptions;
 
     public PythonContext(PythonLanguage language, TruffleLanguage.Env env, PythonCore core) {
         this.language = language;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonEngineOptions.java

@@ -48,15 +48,20 @@
 public class PythonEngineOptions {
     @CompilationFinal private OptionValues optionValues;
 
-    @CompilationFinal private int builtinsInliningMaxCallerSize;
-    @CompilationFinal private boolean catchAllExceptions;
-    @CompilationFinal private boolean emulatedJython;
-    @CompilationFinal private boolean exposeInternalSources;
-    @CompilationFinal private boolean withThread;
+    private final int builtinsInliningMaxCallerSize;
+    private final boolean catchAllExceptions;
+    private final boolean emulatedJython;
+    private final boolean exposeInternalSources;
+    private final boolean withThread;
 
     PythonEngineOptions(OptionValues optionValues) {
+        CompilerAsserts.neverPartOfCompilation();
         this.optionValues = optionValues;
-        setOptionValues(optionValues);
+        this.builtinsInliningMaxCallerSize = readIntegerOption(PythonOptions.BuiltinsInliningMaxCallerSize);
+        this.catchAllExceptions = readBooleanOption(PythonOptions.CatchAllExceptions);
+        this.emulatedJython = readBooleanOption(PythonOptions.EmulateJython);
+        this.exposeInternalSources = readBooleanOption(PythonOptions.ExposeInternalSources);
+        this.withThread = readBooleanOption(PythonOptions.WithThread);
     }
 
     public static PythonEngineOptions fromOptionValues(OptionValues optionValues) {
@@ -71,20 +76,6 @@ private int readIntegerOption(OptionKey<Integer> key) {
         return key.getValue(optionValues);
     }
 
-    public void setOptionValues(OptionValues newOptions) {
-        CompilerAsserts.neverPartOfCompilation();
-        optionValues = newOptions;
-        cacheOptions();
-    }
-
-    private void cacheOptions() {
-        this.builtinsInliningMaxCallerSize = readIntegerOption(PythonOptions.BuiltinsInliningMaxCallerSize);
-        this.catchAllExceptions = readBooleanOption(PythonOptions.CatchAllExceptions);
-        this.emulatedJython = readBooleanOption(PythonOptions.EmulateJython);
-        this.exposeInternalSources = readBooleanOption(PythonOptions.ExposeInternalSources);
-        this.withThread = readBooleanOption(PythonOptions.WithThread);
-    }
-
     public boolean areInternalSourcesExposed() {
         return this.exposeInternalSources;
     }