Do not initialize sulong when loading C extensions with NFI

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextBuiltins.java

@@ -77,6 +77,7 @@
 import static com.oracle.graal.python.nodes.ErrorMessages.NATIVE_S_SUBTYPES_NOT_IMPLEMENTED;
 import static com.oracle.graal.python.nodes.StringLiterals.J_LLVM_LANGUAGE;
 import static com.oracle.graal.python.nodes.StringLiterals.J_NFI_LANGUAGE;
+import static com.oracle.graal.python.nodes.StringLiterals.J_NATIVE;
 import static com.oracle.graal.python.util.PythonUtils.EMPTY_OBJECT_ARRAY;
 import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
 import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
@@ -1707,10 +1708,14 @@ int doIt(Object object) {
                 }
                 return 1;
             }
-            Env env = getContext().getEnv();
-            LanguageInfo llvmInfo = env.getInternalLanguages().get(J_LLVM_LANGUAGE);
-            Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
-            if ("native".equals(toolchain.getIdentifier())) {
+            if (!getContext().getOption(PythonOptions.NativeModules)) {
+                Env env = getContext().getEnv();
+                LanguageInfo llvmInfo = env.getInternalLanguages().get(J_LLVM_LANGUAGE);
+                Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
+                if (J_NATIVE.equals(toolchain.getIdentifier())) {
+                    InteropLibrary.getUncached().toNative(object);
+                }
+            } else {
                 InteropLibrary.getUncached().toNative(object);
             }
             return 0;

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

@@ -2514,14 +2514,16 @@ public long getDeserializationId(TruffleString fileName) {
 
     @TruffleBoundary
     public String getLLVMSupportExt(String libName) {
-        LanguageInfo llvmInfo = env.getInternalLanguages().get(J_LLVM_LANGUAGE);
-        Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
-        String toolchainIdentifier = toolchain.getIdentifier();
-        if (J_NATIVE.equals(toolchainIdentifier)) {
-            return PythonContext.getSupportLibName(libName + '-' + J_NATIVE);
-        }
-        // if not native, we always assume a Linux-like system
-        return PythonContext.getSupportLibName(PythonOS.PLATFORM_LINUX, libName + '-' + toolchainIdentifier);
+        if (!getOption(PythonOptions.NativeModules)) {
+            LanguageInfo llvmInfo = env.getInternalLanguages().get(J_LLVM_LANGUAGE);
+            Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
+            String toolchainIdentifier = toolchain.getIdentifier();
+            if (!J_NATIVE.equals(toolchainIdentifier)) {
+                // if not native, we always assume a Linux-like system
+                return PythonContext.getSupportLibName(PythonOS.PLATFORM_LINUX, libName + '-' + toolchainIdentifier);
+            }
+        }
+        return PythonContext.getSupportLibName(libName + '-' + J_NATIVE);
     }
 
     @TruffleBoundary