Revert "remove _JAVA_OPTIONS and JAVA_TOOL_OPTIONS from our environment"

This reverts commit 36d2969be337bd87bc5cb7b80ccf67829f53372d.

Author: timfel

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

@@ -82,8 +82,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.graalvm.nativeimage.ImageInfo;
-
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
@@ -280,18 +278,6 @@ public void postInitialize(PythonCore core) {
         Map<String, String> getenv = System.getenv();
         PDict environ = core.factory().createDict();
         for (Entry<String, String> entry : getenv.entrySet()) {
-            if (!ImageInfo.inImageCode()) {
-                // both _JAVA_OPTIONS and JAVA_TOOL_OPTIONS are adeed during JVM
-                // startup automatically. We do not want to repeat these, they
-                // are already in our ExecutableList if we're running on the
-                // JVM. OTOH, some script may set these explicitly later on. So
-                // whatever they are right now, we'll empty them, so that any
-                // subprocess launched later will not inherit them.
-                if ("_JAVA_OPTIONS".equals(entry.getKey()) || "JAVA_TOOL_OPTIONS".equals(entry.getKey())) {
-                    continue;
-                }
-            }
-
             String value;
             if ("__PYVENV_LAUNCHER__".equals(entry.getKey())) {
                 // On Mac, the CPython launcher uses this env variable to specify the real Python
@@ -364,7 +350,6 @@ Object doExecuteInternal(PythonModule thisModule, String path, PSequence args) t
             PDict environ = (PDict) thisModule.getAttribute("environ");
             ProcessBuilder builder = new ProcessBuilder(cmd);
             Map<String, String> environment = builder.environment();
-            environment.clear();
             environ.entries().forEach(entry -> {
                 environment.put(new String(toBytes.execute(null, entry.key)), new String(toBytes.execute(null, entry.value)));
             });
@@ -1496,12 +1481,11 @@ PTuple waitpidFallback(VirtualFrame frame, Object pid, Object options,
         }
     }
 
-    @Builtin(name = "system", minNumOfPositionalArgs = 1, declaresExplicitSelf = true)
+    @Builtin(name = "system", minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     @TypeSystemReference(PythonArithmeticTypes.class)
     abstract static class SystemNode extends PythonBuiltinNode {
         private static final TruffleLogger LOGGER = PythonLanguage.getLogger(SystemNode.class);
-        @Child private BytesNodes.ToBytesNode toBytes = BytesNodes.ToBytesNode.create();
 
         static final String[] shell;
         static {
@@ -1552,7 +1536,7 @@ public void finish() {
 
         @TruffleBoundary
         @Specialization
-        int system(PythonModule thisModule, String cmd) {
+        int system(String cmd) {
             PythonContext context = getContext();
             if (!context.isExecutableAccessAllowed()) {
                 return -1;
@@ -1562,13 +1546,6 @@ int system(PythonModule thisModule, String cmd) {
             Env env = context.getEnv();
             try {
                 ProcessBuilder pb = new ProcessBuilder(command);
-                PDict environ = (PDict) thisModule.getAttribute("environ");
-                ProcessBuilder builder = new ProcessBuilder(cmd);
-                Map<String, String> environment = pb.environment();
-                environment.clear();
-                environ.entries().forEach(entry -> {
-                    environment.put(new String(toBytes.execute(null, entry.key)), new String(toBytes.execute(null, entry.value)));
-                });
                 pb.directory(new File(env.getCurrentWorkingDirectory().getPath()));
                 PipePump stdout = null, stderr = null;
                 boolean stdsArePipes = !terminalIsInteractive(context);

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

@@ -59,7 +59,6 @@
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
-import com.oracle.graal.python.builtins.objects.dict.PDict;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.list.PList;
 import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
@@ -183,7 +182,6 @@ private synchronized int forkExec(PList args, @SuppressWarnings("unused") PList
             }
 
             Map<String, String> environment = pb.environment();
-            environment.clear();
             for (Object keyValue : env.getSequenceStorage().getInternalArray()) {
                 if (keyValue instanceof PBytes) {
                     // NOTE: passing 'null' frame means we took care of the global state in the
@@ -231,20 +229,6 @@ private synchronized int forkExec(PList args, @SuppressWarnings("unused") PList
             }
         }
 
-        @TruffleBoundary
-        private PList createEnvList() {
-            PDict environ = (PDict) getContext().getCore().lookupBuiltinModule("posix").getAttribute("environ");
-            ArrayList<Object> envList = new ArrayList<>();
-            environ.entries().forEach(entry -> {
-                StringBuilder sb = new StringBuilder();
-                sb.append(new String(toBytes.execute(null, entry.key)));
-                sb.append("=");
-                sb.append(new String(toBytes.execute(null, entry.value)));
-                envList.add(factory().createBytes(sb.toString().getBytes()));
-            });
-            return factory().createList(envList.toArray());
-        }
-
         @Specialization(replaces = "forkExec")
         int forkExecDefault(VirtualFrame frame, Object args, Object executable_list, Object close_fds,
                         Object fdsToKeep, Object cwd, Object env,
@@ -267,7 +251,7 @@ int forkExecDefault(VirtualFrame frame, Object args, Object executable_list, Obj
 
             PList actualEnv;
             if (env instanceof PNone) {
-                actualEnv = createEnvList();
+                actualEnv = factory().createList();
             } else {
                 actualEnv = castEnv.execute(frame, env);
             }