[GR-64454] Handle deleted IfNode in OutlineRuntimeChecksPhase.

PullRequest: graal/20592

Author: woess

vm/mx.vm/suite.py

@@ -33,7 +33,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "59e25d376c8bb2803be3e0c1ba19d70819d3e1da",
+                "version": "20cf920b900b643c6e8ab05cd0a5e66e2ba4e687",
                 "urls" : [
                     {"url" : "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]
@@ -42,7 +42,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "59e25d376c8bb2803be3e0c1ba19d70819d3e1da",
+                "version": "20cf920b900b643c6e8ab05cd0a5e66e2ba4e687",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind" : "git"},
                 ]

web-image/mx.web-image/suite.py

@@ -16,7 +16,7 @@
                 "name": "graal-nodejs",
                 "subdir": True,
                 "dynamic": True,
-                "version": "cffe4d4e341425200ec28f079eb6dca0c098d04b",
+                "version": "20cf920b900b643c6e8ab05cd0a5e66e2ba4e687",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind": "git"},
                 ],
@@ -25,7 +25,7 @@
                 "name": "graal-js",
                 "subdir": True,
                 "dynamic": True,
-                "version": "cffe4d4e341425200ec28f079eb6dca0c098d04b",
+                "version": "20cf920b900b643c6e8ab05cd0a5e66e2ba4e687",
                 "urls": [
                     {"url": "https://github.com/graalvm/graaljs.git", "kind": "git"},
                 ],

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/codegen/phase/OutlineRuntimeChecksPhase.java

@@ -28,8 +28,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.oracle.svm.webimage.functionintrinsics.ImplicitExceptions;
 import com.oracle.svm.core.graal.nodes.ThrowBytecodeExceptionNode;
+import com.oracle.svm.webimage.functionintrinsics.ImplicitExceptions;
 
 import jdk.graal.compiler.core.common.spi.ForeignCallDescriptor;
 import jdk.graal.compiler.graph.Node;
@@ -203,6 +203,16 @@ private static class ArrayBoundCheckPattern extends Pattern {
          */
         @Override
         void replace(CoreProviders providers) {
+            if (ifNode.isDeleted()) {
+                /*
+                 * This case can happen when both branches of an if node throw a bytecode exception;
+                 * e.g. if (array == null) where the true successor throws a NullPointerException,
+                 * and the other throws an ArrayIndexOutOfBoundsException, which is then replaced
+                 * with checkNullPointer(array) followed by ThrowBytecodeException(OUT_OF_BOUNDS).
+                 */
+                return;
+            }
+
             StructuredGraph graph = ifNode.graph();
 
             /*