[GR-69420] Fix OutlineRuntimeChecksPhase NPE check detection

PullRequest: graal/22045

Author: patrick96

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

@@ -149,12 +149,15 @@ void replace(CoreProviders providers) {
          * {@link ThrowBytecodeExceptionNode}.
          *
          * @param node A {@link BytecodeExceptionNode} followed immediately by an {@link UnwindNode}
-         *            or a {@link ThrowBytecodeExceptionNode}
+         *            or just a {@link ThrowBytecodeExceptionNode}
          */
         static void find(FixedNode node, List<Pattern> patterns) {
-            boolean isNullCheck = node.predecessor() instanceof BeginNode;
-            isNullCheck = isNullCheck && node.predecessor().predecessor() instanceof IfNode;
-            isNullCheck = isNullCheck && singleInput(node.predecessor().predecessor()) instanceof IsNullNode;
+            Node predecessor = node.predecessor();
+            boolean isNullCheck = predecessor instanceof BeginNode;
+            Node secondPredecessor = predecessor.predecessor();
+            // It has to be an if node where the NPE is thrown in the true-successor
+            isNullCheck = isNullCheck && secondPredecessor instanceof IfNode ifNode && ifNode.trueSuccessor() == predecessor;
+            isNullCheck = isNullCheck && singleInput(secondPredecessor) instanceof IsNullNode;
 
             if (isNullCheck) {
                 NullCheckPattern pattern = new NullCheckPattern(node);

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/wasmgc/phases/WebImageWasmGCLowTier.java

@@ -25,7 +25,6 @@
 
 package com.oracle.svm.hosted.webimage.wasmgc.phases;
 
-import com.oracle.svm.hosted.webimage.codegen.phase.OutlineRuntimeChecksPhase;
 import com.oracle.svm.hosted.webimage.codegen.phase.ReconstructionVerificationPhase;
 import com.oracle.svm.hosted.webimage.codegen.phase.WebImageLowTier;
 import com.oracle.svm.hosted.webimage.codegen.reconstruction.stackifier.StackifierReconstructionPhase;
@@ -66,8 +65,6 @@ public WebImageWasmGCLowTier(OptionValues options) {
 
         // TODO GR-59392 temporarily disable this because it fails some tests.
         removePhase(ReconstructionVerificationPhase.class);
-
-        removePhase(OutlineRuntimeChecksPhase.class);
     }
 
     @Override