Replace option HPyUseNativeFastPaths by HPyEnableJNIFastPaths

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContext.java

@@ -740,9 +740,8 @@ public static GraalHPyNativeSymbol getGetterFunctionName(LLVMType llvmType) {
     @CompilationFinal private long wcharSize = -1;
 
     /**
-     * The value of this field is computed using
-     * {@link PythonOptions#isHPyUseNativeFastPaths(PythonLanguage)}. We store it in this final
-     * field because the value is also used in non-PE code paths.
+     * This field mirrors value of {@link PythonOptions#HPyEnableJNIFastPaths}. We store it in this
+     * final field because the value is also used in non-PE code paths.
      */
     private final boolean useNativeFastPaths;
 
@@ -766,7 +765,7 @@ public static GraalHPyNativeSymbol getGetterFunctionName(LLVMType llvmType) {
     public GraalHPyContext(PythonContext context, Object hpyLibrary) {
         super(context, hpyLibrary, GraalHPyConversionNodeSupplier.HANDLE);
         this.hpyContextMembers = createMembers(context, getName());
-        this.useNativeFastPaths = PythonOptions.isHPyUseNativeFastPaths(context.getLanguage());
+        this.useNativeFastPaths = context.getLanguage().getEngineOption(PythonOptions.HPyEnableJNIFastPaths);
     }
 
     protected String getName() {

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

@@ -52,7 +52,6 @@
 import com.oracle.truffle.api.Option;
 import com.oracle.truffle.api.TruffleLanguage.Env;
 import com.oracle.truffle.api.nodes.ExplodeLoop;
-import com.oracle.truffle.api.utilities.TriState;
 
 /**
  * The options for Python. Note that some options have an effect on the AST structure, and thus must
@@ -76,16 +75,6 @@ public enum HPyBackendMode {
         }
     });
 
-    static final OptionType<TriState> TRI_STATE_OPTION_TYPE = new OptionType<>("TriState",
-                    s -> {
-                        if (TriState.TRUE.name().equalsIgnoreCase(s)) {
-                            return TriState.TRUE;
-                        } else if (TriState.FALSE.name().equalsIgnoreCase(s)) {
-                            return TriState.FALSE;
-                        }
-                        throw new IllegalArgumentException("Backend can be one of: " + Arrays.toString(HPyBackendMode.values()));
-                    });
-
     private PythonOptions() {
         // no instances
     }
@@ -183,7 +172,7 @@ private PythonOptions() {
 
     @EngineOption @Option(category = OptionCategory.INTERNAL, help = "If {@code true}, code is enabled that tries to reduce expensive upcalls into the runtime" +
                     "when HPy API functions are used. This is achieved by mirroring data in native memory.", stability = OptionStability.EXPERIMENTAL) //
-    public static final OptionKey<TriState> HPyUseNativeFastPaths = new OptionKey<>(TriState.UNDEFINED, TRI_STATE_OPTION_TYPE);
+    public static final OptionKey<Boolean> HPyEnableJNIFastPaths = new OptionKey<>(true);
 
     @Option(category = OptionCategory.INTERNAL, help = "Specify the directory where the JNI library is located.", stability = OptionStability.EXPERIMENTAL) //
     public static final OptionKey<String> JNIHome = new OptionKey<>("");
@@ -418,24 +407,6 @@ public static boolean isPExceptionWithJavaStacktrace(PythonLanguage language) {
         return language.getEngineOption(WithJavaStacktrace) > 1;
     }
 
-    /**
-     * Determines if native fast paths should be used for HPy extensions in ABI mode. Either the
-     * option is specified explicitly by the user, then this value is taken. If not, fast paths will
-     * only be used for HPy backend {@link HPyBackendMode#JNI}.
-     */
-    public static boolean isHPyUseNativeFastPaths(PythonLanguage language) {
-        TriState value = language.getEngineOption(HPyUseNativeFastPaths);
-        switch (value) {
-            case TRUE:
-                return true;
-            case FALSE:
-                return false;
-            case UNDEFINED:
-                return language.getEngineOption(HPyBackend) == HPyBackendMode.JNI;
-        }
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
     @TruffleBoundary
     public static String[] getExecutableList(PythonContext context) {
         String option = context.getOption(ExecutableList);