[WASM] Run the VerifyNormalizedUnits at the end of the modular pipe…

…line. PiperOrigin-RevId: 718027604
google · Jan 21, 2025 · 3db6fd0 · 3db6fd0
1 parent 7356037
commit 3db6fd0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/transpiler/java/com/google/j2cl/transpiler/backend/Backend.java b/transpiler/java/com/google/j2cl/transpiler/backend/Backend.java
@@ -674,11 +674,8 @@ public ImmutableList<Supplier<NormalizationPass>> getPassFactories(BackendOption
           // Post-verifications
           VerifySingleAstReference::new,
           VerifyParamAndArgCounts::new,
-          VerifyReferenceScoping::new
-
-          // TODO(b/283154833): Add the invariants for modular_wasm
-          // () -> new VerifyNormalizedUnits(/* verifyForWasm= **/ true)
-          );
+          VerifyReferenceScoping::new,
+          () -> new VerifyNormalizedUnits(/* verifyForWasm= **/ true));
     }
 
     @Override

diff --git a/transpiler/java/com/google/j2cl/transpiler/passes/VerifyNormalizedUnits.java b/transpiler/java/com/google/j2cl/transpiler/passes/VerifyNormalizedUnits.java
@@ -309,8 +309,10 @@ public void exitSwitchExpression(SwitchExpression switchExpression) {
 
           @Override
           public void exitYieldStatement(YieldStatement yieldStatement) {
-            // Yield statements are expected to be normalized away.
-            throw new IllegalStateException();
+            if (!verifyForWasm) {
+              // Yield statements are expected to be normalized away.
+              throw new IllegalStateException();
+            }
           }
 
           @Override