[GR-23877] Always check for userdirectories in image heap

PullRequest: graalpython/1112

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java

@@ -133,6 +133,8 @@ public void postInitialize(PythonCore core) {
         if (!ImageInfo.inImageBuildtimeCode()) {
             mod.setAttribute("home", language.getHome());
         }
+        mod.setAttribute("in_image_buildtime", ImageInfo.inImageBuildtimeCode());
+        mod.setAttribute("in_image", ImageInfo.inImageCode());
         String coreHome = context.getCoreHome();
         String stdlibHome = context.getStdlibHome();
         String capiHome = context.getCAPIHome();

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

@@ -534,24 +534,27 @@ public void initializeHomeAndPrefixPaths(Env newEnv, String languageHome) {
                     }
                 } catch (SecurityException | IOException e) {
                 }
-            } else {
-                TruffleFile f = newEnv.getInternalTruffleFile(stdLibHome);
-                if (!f.isAbsolute()) {
-                    try {
-                        // we need to get absolute path due to the caching code, where the filepath
-                        // is the key for caching.
-                        stdLibHome = f.getCanonicalFile().getPath();
-                    } catch (IOException e) {
-                        // if the file does not exists, then it fails during reading.
-                    }
-                }
             }
 
             if (capiHome.isEmpty()) {
                 capiHome = coreHome;
             }
         }
 
+        if (ImageInfo.inImageBuildtimeCode()) {
+            // use relative paths at buildtime to avoid freezing buildsystem paths
+            TruffleFile base = newEnv.getInternalTruffleFile(basePrefix).getAbsoluteFile();
+            newEnv.setCurrentWorkingDirectory(base);
+            basePrefix = ".";
+            sysPrefix = base.relativize(newEnv.getInternalTruffleFile(sysPrefix)).getPath();
+            if (sysPrefix.isEmpty()) {
+                sysPrefix = ".";
+            }
+            coreHome = base.relativize(newEnv.getInternalTruffleFile(coreHome)).getPath();
+            stdLibHome = base.relativize(newEnv.getInternalTruffleFile(stdLibHome)).getPath();
+            capiHome = base.relativize(newEnv.getInternalTruffleFile(capiHome)).getPath();
+        }
+
         PythonCore.writeInfo(() -> MessageFormat.format("Updated locations:" +
                         "\n\tLanguage home: {0}" +
                         "\n\tSysPrefix: {1}" +

mx.graalpython/mx_graalpython.py

@@ -1318,7 +1318,10 @@ def verify_ci(dest_suite, common_ci_dir="ci_common", args=None, ext=('.jsonnet',
             jar_distributions=['graalpython:GRAALPYTHON-LAUNCHER'],
             main_class='com.oracle.graal.python.shell.GraalPythonMain',
             # build_args=['-H:+RemoveSaturatedTypeFlows'],
-            build_args=['-H:+TruffleCheckBlackListedMethods'],
+            build_args=[
+                '-H:+TruffleCheckBlackListedMethods',
+                '-H:+DetectUserDirectoriesInImageHeap',
+            ],
             language='python',
         )
     ],