Compute canonical path for native libs and C exts

(cherry picked from commit fa8c8af)

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java

@@ -47,6 +47,7 @@
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.nio.file.LinkOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -539,7 +540,7 @@ public static CApiContext ensureCapiWasLoaded(Node node, PythonContext context,
             TruffleFile homePath = env.getInternalTruffleFile(context.getCAPIHome().toJavaStringUncached());
             // e.g. "libpython-native.so"
             String libName = context.getLLVMSupportExt("python");
-            TruffleFile capiFile = homePath.resolve(libName);
+            TruffleFile capiFile = homePath.resolve(libName).getCanonicalFile(LinkOption.NOFOLLOW_LINKS);
             try {
                 SourceBuilder capiSrcBuilder;
                 final boolean useNative;
@@ -558,7 +559,7 @@ public static CApiContext ensureCapiWasLoaded(Node node, PythonContext context,
                     if (!env.getInternalLanguages().containsKey(J_NFI_LANGUAGE)) {
                         throw PRaiseNode.raiseUncached(node, PythonBuiltinClassType.SystemError, ErrorMessages.NFI_NOT_AVAILABLE, "NativeModules", "true");
                     }
-                    capiSrcBuilder = Source.newBuilder(J_NFI_LANGUAGE, "load(RTLD_GLOBAL) \"" + capiFile.getAbsoluteFile().getPath() + "\"", "<libpython>");
+                    capiSrcBuilder = Source.newBuilder(J_NFI_LANGUAGE, "load(RTLD_GLOBAL) \"" + capiFile.getPath() + "\"", "<libpython>");
                 } else {
                     if (!env.getInternalLanguages().containsKey(J_LLVM_LANGUAGE)) {
                         throw PRaiseNode.raiseUncached(node, PythonBuiltinClassType.SystemError, ErrorMessages.LLVM_NOT_AVAILABLE);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java

@@ -52,7 +52,9 @@
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
 import java.io.IOException;
+import java.nio.file.LinkOption;
 
+import com.oracle.truffle.api.TruffleFile;
 import org.graalvm.shadowed.com.ibm.icu.impl.Punycode;
 import org.graalvm.shadowed.com.ibm.icu.text.StringPrepParseException;
 
@@ -319,10 +321,12 @@ public static Object loadCExtModule(Node location, PythonContext context, Module
         CApiContext cApiContext = CApiContext.ensureCapiWasLoaded(location, context, spec.name, spec.path);
         Object library = null;
 
+
         if (cApiContext.useNativeBackend) {
             GraalHPyJNIContext.loadJNIBackend();
-            getLogger().config("loading module " + spec.path + " as native");
-            String loadExpr = String.format("load(%s) \"%s\"", dlopenFlagsToString(context.getDlopenFlags()), spec.path);
+            TruffleFile realPath = context.getPublicTruffleFileRelaxed(spec.path, context.getSoAbi()).getCanonicalFile(LinkOption.NOFOLLOW_LINKS);
+            getLogger().config(String.format("loading module %s (real path: %s) as native", spec.path, realPath));
+            String loadExpr = String.format("load(%s) \"%s\"", dlopenFlagsToString(context.getDlopenFlags()), realPath);
             if (PythonOptions.UsePanama.getValue(context.getEnv().getOptions())) {
                 loadExpr = "with panama " + loadExpr;
             }
@@ -359,7 +363,8 @@ public static Object loadLLVMLibrary(Node location, PythonContext context, Truff
         Env env = context.getEnv();
         try {
             TruffleString extSuffix = context.getSoAbi();
-            CallTarget callTarget = env.parseInternal(Source.newBuilder(J_LLVM_LANGUAGE, context.getPublicTruffleFileRelaxed(path, extSuffix)).build());
+            TruffleFile realPath = context.getPublicTruffleFileRelaxed(path, extSuffix).getCanonicalFile(LinkOption.NOFOLLOW_LINKS);
+            CallTarget callTarget = env.parseInternal(Source.newBuilder(J_LLVM_LANGUAGE, realPath).build());
             return callTarget.call();
         } catch (SecurityException e) {
             throw new ImportException(CExtContext.wrapJavaException(e, location), name, path, ErrorMessages.CANNOT_LOAD_M, path, e);

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

@@ -56,7 +56,8 @@
 import static com.oracle.graal.python.util.PythonUtils.toTruffleStringUncached;
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
-import java.nio.file.Paths;
+import java.io.IOException;
+import java.nio.file.LinkOption;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -353,9 +354,10 @@ protected void initNativeFastPaths() {
 
     public static void loadJNIBackend() {
         if (!(ImageInfo.inImageBuildtimeCode() || jniBackendLoaded)) {
-            String pythonJNIPath = getJNILibrary();
-            LOGGER.fine("Loading HPy JNI backend from " + pythonJNIPath);
+            String pythonJNIPath;
+            pythonJNIPath = getJNILibrary();
             try {
+                LOGGER.fine("Loading HPy JNI backend from " + pythonJNIPath);
                 System.load(pythonJNIPath);
                 jniBackendLoaded = true;
             } catch (NullPointerException | UnsatisfiedLinkError e) {
@@ -367,7 +369,14 @@ public static void loadJNIBackend() {
 
     public static String getJNILibrary() {
         CompilerAsserts.neverPartOfCompilation();
-        return Paths.get(PythonContext.get(null).getJNIHome().toJavaStringUncached(), PythonContext.J_PYTHON_JNI_LIBRARY_NAME).toString();
+        PythonContext context = PythonContext.get(null);
+        TruffleFile libPath = context.getPublicTruffleFileRelaxed(context.getJNIHome()).resolve(PythonContext.J_PYTHON_JNI_LIBRARY_NAME).getAbsoluteFile();
+        try {
+            return libPath.getCanonicalFile(LinkOption.NOFOLLOW_LINKS).toString();
+        } catch (IOException e) {
+            LOGGER.severe(String.format("Cannot determine canonical path for %s: %s", libPath, e));
+            throw new IllegalStateException(e);
+        }
     }
 
     @Override