fix IndexOutOfBoundsException when waiting for child of a particular process group

Author: timfel

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

@@ -1487,7 +1487,7 @@ PTuple waitpid(VirtualFrame frame, int pid, int options) {
                 } else {
                     throw raise(PythonBuiltinClassType.NotImplementedError, "Only 0 or WNOHANG are supported for waitpid");
                 }
-            } catch (ArrayIndexOutOfBoundsException e) {
+            } catch (IndexOutOfBoundsException e) {
                 throw raiseOSError(frame, OSErrorEnum.ESRCH.getNumber());
             } catch (InterruptedException e) {
                 throw raiseOSError(frame, OSErrorEnum.EINTR.getNumber());
@@ -1969,7 +1969,7 @@ PNone kill(VirtualFrame frame, int pid, int signal,
                 if (isNode.execute(signal, value)) {
                     try {
                         context.getResources().sigterm(pid);
-                    } catch (ArrayIndexOutOfBoundsException e) {
+                    } catch (IndexOutOfBoundsException e) {
                         throw raiseOSError(frame, OSErrorEnum.ESRCH.getNumber());
                     }
                     return PNone.NONE;
@@ -1980,7 +1980,7 @@ PNone kill(VirtualFrame frame, int pid, int signal,
                 if (isNode.execute(signal, value)) {
                     try {
                         context.getResources().sigkill(pid);
-                    } catch (ArrayIndexOutOfBoundsException e) {
+                    } catch (IndexOutOfBoundsException e) {
                         throw raiseOSError(frame, OSErrorEnum.ESRCH.getNumber());
                     }
                     return PNone.NONE;
@@ -1990,7 +1990,7 @@ PNone kill(VirtualFrame frame, int pid, int signal,
             if (isNode.execute(signal, dfl)) {
                 try {
                     context.getResources().sigdfl(pid);
-                } catch (ArrayIndexOutOfBoundsException e) {
+                } catch (IndexOutOfBoundsException e) {
                     throw raiseOSError(frame, OSErrorEnum.ESRCH.getNumber());
                 }
                 return PNone.NONE;

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

@@ -393,34 +393,42 @@ private int nextFreePid() {
         }
     }
 
+    private Process getChild(int pid) throws IndexOutOfBoundsException {
+        if (pid < 0) {
+            return children.get(0); // we do not support process groups
+        } else {
+            return children.get(pid);
+        }
+    }
+
     @TruffleBoundary(allowInlining = true)
-    public void sigdfl(int pid) throws ArrayIndexOutOfBoundsException {
-        children.get(pid); // just for the side-effect
+    public void sigdfl(int pid) throws IndexOutOfBoundsException {
+        getChild(pid); // just for the side-effect
     }
 
     @TruffleBoundary(allowInlining = true)
-    public void sigterm(int pid) throws ArrayIndexOutOfBoundsException {
-        Process process = children.get(pid);
+    public void sigterm(int pid) throws IndexOutOfBoundsException {
+        Process process = getChild(pid);
         process.destroy();
     }
 
     @TruffleBoundary(allowInlining = true)
-    public void sigkill(int pid) throws ArrayIndexOutOfBoundsException {
-        Process process = children.get(pid);
+    public void sigkill(int pid) throws IndexOutOfBoundsException {
+        Process process = getChild(pid);
         process.destroyForcibly();
     }
 
     @TruffleBoundary(allowInlining = true)
-    public int waitpid(int pid) throws ArrayIndexOutOfBoundsException, InterruptedException {
-        Process process = children.get(pid);
+    public int waitpid(int pid) throws IndexOutOfBoundsException, InterruptedException {
+        Process process = getChild(pid);
         int exitStatus = process.waitFor();
         children.set(pid, null);
         return exitStatus;
     }
 
     @TruffleBoundary(allowInlining = true)
-    public int exitStatus(int pid) throws ArrayIndexOutOfBoundsException {
-        Process process = children.get(pid);
+    public int exitStatus(int pid) throws IndexOutOfBoundsException {
+        Process process = getChild(pid);
         if (process.isAlive()) {
             return Integer.MIN_VALUE;
         } else {