Pull support lib file ext out of getLibPath

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/StringLiterals.java

@@ -162,8 +162,12 @@ public abstract class StringLiterals {
     public static final String J_TYPE_ID = "_typeid";
     public static final TruffleString T_TYPE_ID = tsLiteral(J_TYPE_ID);
 
-    public static final TruffleString T_EXT_SO = tsLiteral(".so");
-    public static final TruffleString T_EXT_PYD = tsLiteral(".pyd");
+    public static final String J_EXT_SO = ".so";
+    public static final TruffleString T_EXT_SO = tsLiteral(J_EXT_SO);
+    public static final String J_EXT_PYD = ".pyd";
+    public static final TruffleString T_EXT_PYD = tsLiteral(J_EXT_PYD);
+    public static final String J_EXT_DYLIB = ".dylib";
+    public static final TruffleString T_EXT_DYLIB = tsLiteral(J_EXT_DYLIB);
 
     public static final TruffleString T_NATIVE = tsLiteral("native");
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -155,7 +155,7 @@ public String signature() {
     private NFIBz2Support(PythonContext context, NativeLibrary.NFIBackend backend, String noNativeAccessHelp) {
         if (context.isNativeAccessAllowed()) {
             this.pythonContext = context;
-            this.typedNativeLib = NativeLibrary.create(SUPPORTING_NATIVE_LIB_NAME, Bz2NativeFunctions.values(),
+            this.typedNativeLib = NativeLibrary.create(SUPPORTING_NATIVE_LIB_NAME + context.getSoAbi().toJavaStringUncached(), Bz2NativeFunctions.values(),
                             backend, noNativeAccessHelp, false);
             this.available = true;
         } else {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -295,7 +295,7 @@ public String signature() {
     private NFILZMASupport(PythonContext context, NativeLibrary.NFIBackend backend, String noNativeAccessHelp) {
         if (context.isNativeAccessAllowed()) {
             this.pythonContext = context;
-            this.typedNativeLib = NativeLibrary.create(SUPPORTING_NATIVE_LIB_NAME, LZMANativeFunctions.values(),
+            this.typedNativeLib = NativeLibrary.create(SUPPORTING_NATIVE_LIB_NAME + context.getSoAbi().toJavaStringUncached(), LZMANativeFunctions.values(),
                             backend, noNativeAccessHelp, true);
             this.available = true;
         } else {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -268,8 +268,8 @@ public String signature() {
     private NFIZlibSupport(PythonContext context, NativeLibrary.NFIBackend backend, String noNativeAccessHelp) {
         if (context.isNativeAccessAllowed()) {
             this.pythonContext = context;
-            this.typedNativeLib = NativeLibrary.create(SUPPORTING_NATIVE_LIB_NAME, ZlibNativeFunctions.values(),
-                            backend, noNativeAccessHelp, true);
+            this.typedNativeLib = NativeLibrary.create(SUPPORTING_NATIVE_LIB_NAME + PythonContext.getSupportExt(),
+                            ZlibNativeFunctions.values(), backend, noNativeAccessHelp, true);
             this.available = true;
         } else {
             this.pythonContext = null;

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

@@ -258,7 +258,7 @@ private Object loadLibrary(PythonContext context) {
     private static String getLibPath(PythonContext context, String name) {
         CompilerAsserts.neverPartOfCompilation();
         TruffleFile homePath = context.getEnv().getInternalTruffleFile(context.getCAPIHome().toJavaStringUncached());
-        TruffleFile file = homePath.resolve(name + context.getSoAbi().toJavaStringUncached());
+        TruffleFile file = homePath.resolve(name);
         return file.getPath();
     }
 

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

@@ -39,6 +39,9 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___ANNOTATIONS__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___FILE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T_INSERT;
+import static com.oracle.graal.python.nodes.StringLiterals.J_EXT_DYLIB;
+import static com.oracle.graal.python.nodes.StringLiterals.J_EXT_PYD;
+import static com.oracle.graal.python.nodes.StringLiterals.J_EXT_SO;
 import static com.oracle.graal.python.nodes.StringLiterals.J_LLVM_LANGUAGE;
 import static com.oracle.graal.python.nodes.StringLiterals.T_DASH;
 import static com.oracle.graal.python.nodes.StringLiterals.T_DOT;
@@ -2476,6 +2479,15 @@ public long getDeserializationId(TruffleString fileName) {
         return deserializationId.computeIfAbsent(fileName, f -> new AtomicLong()).incrementAndGet();
     }
 
+    @TruffleBoundary
+    public static String getSupportExt() {
+        return switch (getPythonOS()) {
+            case PLATFORM_DARWIN -> J_EXT_DYLIB;
+            case PLATFORM_WIN32 -> J_EXT_PYD;
+            default -> J_EXT_SO;
+        };
+    }
+
     @TruffleBoundary
     public TruffleString getSoAbi() {
         if (soABI == null) {