fix graal_python_executable_list uses

Author: timfel

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

@@ -61,6 +61,7 @@
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.nodes.SpecialAttributeNames;
 import com.oracle.graal.python.nodes.expression.CastToBooleanNode;
 import com.oracle.graal.python.nodes.expression.CastToListNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -120,7 +121,7 @@ synchronized int forkExec(PList args, @SuppressWarnings("unused") PList execList
             // builder
             PythonModule sysModule = getCore().lookupBuiltinModule("sys");
             if (!TruffleOptions.AOT && !argStrings.isEmpty() && argStrings.get(0).equals(sysModule.getAttribute("executable"))) {
-                PList exec_list = (PList) sysModule.getAttribute("executable_list");
+                PList exec_list = (PList) sysModule.getAttribute(SpecialAttributeNames.GRAAL_PYTHON_EXECUTABLE_LIST);
                 Object[] internalArray = exec_list.getSequenceStorage().getCopyOfInternalArray();
                 argStrings.remove(0);
                 for (int i = internalArray.length - 1; i >= 0; i--) {

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

@@ -60,6 +60,7 @@
 import com.oracle.graal.python.builtins.objects.exception.PBaseException;
 import com.oracle.graal.python.builtins.objects.ints.PInt;
 import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.nodes.SpecialAttributeNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode.NoAttributeHandler;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
@@ -114,12 +115,11 @@ public void initialize(PythonCore core) {
         builtinConstants.put("dont_write_bytecode", true);
 
         String executable = PythonOptions.getOption(core.getContext(), PythonOptions.ExecutablePath);
-        if (!executable.isEmpty() && core.getContext().isExecutableAccessAllowed()) {
-            builtinConstants.put("executable", executable);
-        } else if (TruffleOptions.AOT || !core.getContext().isExecutableAccessAllowed()) {
+        if (TruffleOptions.AOT || !core.getContext().isExecutableAccessAllowed()) {
             // cannot set the path at this time since the binary is not yet known; will be patched
             // in the context
             builtinConstants.put("executable", PNone.NONE);
+            builtinConstants.put(SpecialAttributeNames.GRAAL_PYTHON_EXECUTABLE_LIST, PNone.NONE);
         } else {
             StringBuilder sb = new StringBuilder();
             ArrayList<String> exec_list = new ArrayList<>();
@@ -142,7 +142,12 @@ public void initialize(PythonCore core) {
             sb.append("com.oracle.graal.python.shell.GraalPythonMain");
             exec_list.add("com.oracle.graal.python.shell.GraalPythonMain");
             builtinConstants.put("executable", sb.toString());
-            builtinConstants.put("executable_list", core.factory().createList(exec_list.toArray()));
+            builtinConstants.put(SpecialAttributeNames.GRAAL_PYTHON_EXECUTABLE_LIST, core.factory().createList(exec_list.toArray()));
+        }
+
+        String executable = PythonOptions.getOption(core.getContext(), PythonOptions.ExecutablePath);
+        if (!executable.isEmpty() && core.getContext().isExecutableAccessAllowed()) {
+            builtinConstants.put("executable", executable);
         }
 
         builtinConstants.put("modules", core.factory().createDict());

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

@@ -72,4 +72,7 @@ public abstract class SpecialAttributeNames {
     public static final String __DICTOFFSET__ = "__dictoffset__";
     public static final String __ITEMSIZE__ = "__itemsize__";
     public static final String __WEAKREF__ = "__weakref__";
+
+    // GraalPython specific
+    public static final String GRAAL_PYTHON_EXECUTABLE_LIST = "graal_python_executable_list";
 }

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

@@ -47,6 +47,7 @@
 import com.oracle.graal.python.builtins.objects.common.HashingStorage;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
+import com.oracle.graal.python.nodes.SpecialAttributeNames;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CallTarget;
@@ -241,6 +242,7 @@ private void setupRuntimeInformation() {
             if (sysModule.getAttribute("executable") == PNone.NONE) {
                 sysModule.setAttribute("executable", ProcessProperties.getExecutableName());
             }
+            sysModule.setAttribute(SpecialAttributeNames.GRAAL_PYTHON_EXECUTABLE_LIST, core.factory().createList(new Object[]{ProcessProperties.getExecutableName()}));
         }
         sysModules = (PDict) sysModule.getAttribute("modules");
         builtinsModule = (PythonModule) sysModules.getItem("builtins");