[GR-47608] Always exclude the __graalpython__.list_files builtin when building without platform access

timfel · timfel · commit c0112a13d08f · 2023-07-29T09:02:10.000Z
PullRequest: graalpython/2900
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/GraalPythonModuleBuiltins.java
@@ -256,7 +256,7 @@ public void postInitialize(Python3Core core) {
             mod.setAttribute(tsLiteral("dump_heap"), PNone.NO_VALUE);
             mod.setAttribute(tsLiteral("is_native_object"), PNone.NO_VALUE);
         }
-        if (!context.getOption(PythonOptions.RunViaLauncher)) {
+        if (PythonOptions.WITHOUT_PLATFORM_ACCESS || !context.getOption(PythonOptions.RunViaLauncher)) {
             mod.setAttribute(tsLiteral("list_files"), PNone.NO_VALUE);
         }
     }
@@ -959,6 +959,9 @@ abstract static class ListFiles extends PythonBinaryBuiltinNode {
         @TruffleBoundary
         @Specialization
         Object list(TruffleString dirPath, TruffleString filesListPath) {
+            if (PythonOptions.WITHOUT_PLATFORM_ACCESS) {
+                throw CompilerDirectives.shouldNotReachHere();
+            }
             print(getContext().getStandardOut(), String.format("listing files from '%s' to '%s'\n", dirPath, filesListPath));
 
             TruffleFile dir = getContext().getPublicTruffleFileRelaxed(dirPath);

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ public void postInitialize(Python3Core core) {`
`256`	`256`	`mod.setAttribute(tsLiteral("dump_heap"), PNone.NO_VALUE);`
`257`	`257`	`mod.setAttribute(tsLiteral("is_native_object"), PNone.NO_VALUE);`
`258`	`258`	`}`
`259`		`- if (!context.getOption(PythonOptions.RunViaLauncher)) {`
	`259`	`+ if (PythonOptions.WITHOUT_PLATFORM_ACCESS \|\| !context.getOption(PythonOptions.RunViaLauncher)) {`
`260`	`260`	`mod.setAttribute(tsLiteral("list_files"), PNone.NO_VALUE);`
`261`	`261`	`}`
`262`	`262`	`}`
`@@ -959,6 +959,9 @@ abstract static class ListFiles extends PythonBinaryBuiltinNode {`
`959`	`959`	`@TruffleBoundary`
`960`	`960`	`@Specialization`
`961`	`961`	`Object list(TruffleString dirPath, TruffleString filesListPath) {`
	`962`	`+ if (PythonOptions.WITHOUT_PLATFORM_ACCESS) {`
	`963`	`+ throw CompilerDirectives.shouldNotReachHere();`
	`964`	`+ }`
`962`	`965`	`print(getContext().getStandardOut(), String.format("listing files from '%s' to '%s'\n", dirPath, filesListPath));`
`963`	`966`
`964`	`967`	`TruffleFile dir = getContext().getPublicTruffleFileRelaxed(dirPath);`