call TruffleFile.getCanonicalFile() with FOLLOW_LINKS, we need to trigger an eventual file extraction from VFS

Author: tomasstupka

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

@@ -53,7 +53,6 @@
 import java.io.PrintStream;
 import java.lang.invoke.VarHandle;
 import java.lang.ref.WeakReference;
-import java.nio.file.LinkOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -819,7 +818,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).getCanonicalFile(LinkOption.NOFOLLOW_LINKS);
+            TruffleFile capiFile = homePath.resolve(libName).getCanonicalFile();
             try {
                 SourceBuilder capiSrcBuilder;
                 final boolean useNative = PythonOptions.NativeModules.getValue(env.getOptions());

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

@@ -52,7 +52,6 @@
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
 import java.io.IOException;
-import java.nio.file.LinkOption;
 import java.util.Set;
 import java.util.logging.Level;
 
@@ -320,7 +319,7 @@ public static Object loadCExtModule(Node location, PythonContext context, Module
         InteropLibrary interopLib;
 
         if (cApiContext.useNativeBackend) {
-            TruffleFile realPath = context.getPublicTruffleFileRelaxed(spec.path, context.getSoAbi()).getCanonicalFile(LinkOption.NOFOLLOW_LINKS);
+            TruffleFile realPath = context.getPublicTruffleFileRelaxed(spec.path, context.getSoAbi()).getCanonicalFile();
             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())) {
@@ -366,7 +365,7 @@ public static Object loadLLVMLibrary(Node location, PythonContext context, Truff
         Env env = context.getEnv();
         try {
             TruffleString extSuffix = context.getSoAbi();
-            TruffleFile realPath = context.getPublicTruffleFileRelaxed(path, extSuffix).getCanonicalFile(LinkOption.NOFOLLOW_LINKS);
+            TruffleFile realPath = context.getPublicTruffleFileRelaxed(path, extSuffix).getCanonicalFile();
             CallTarget callTarget = env.parseInternal(Source.newBuilder(J_LLVM_LANGUAGE, realPath).build());
             return callTarget.call();
         } catch (SecurityException e) {

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

@@ -57,7 +57,6 @@
 import static com.oracle.graal.python.util.PythonUtils.tsLiteral;
 
 import java.io.IOException;
-import java.nio.file.LinkOption;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
@@ -461,7 +460,7 @@ public static String getJNILibrary() {
         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();
+            return libPath.getCanonicalFile().toString();
         } catch (IOException e) {
             LOGGER.severe(String.format("Cannot determine canonical path for %s: %s", libPath, e));
             throw new IllegalStateException(e);