Allow switch expr's type to be replaced when merging compilationunits

gwtproject · Oct 18, 2024 · a98a418 · a98a418
1 parent 9c0955f
commit a98a418
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JSwitchExpression.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JSwitchExpression.java
@@ -45,6 +45,10 @@ public boolean hasSideEffects() {
     return true;
   }
 
+  public void setType(JType type) {
+    this.type = type;
+  }
+
   @Override
   public void traverse(JVisitor visitor, Context ctx) {
     if (visitor.visit(this, ctx)) {

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java b/dev/core/src/com/google/gwt/dev/jjs/impl/UnifyAst.java
@@ -64,6 +64,7 @@
 import com.google.gwt.dev.jjs.ast.JProgram;
 import com.google.gwt.dev.jjs.ast.JReferenceType;
 import com.google.gwt.dev.jjs.ast.JStringLiteral;
+import com.google.gwt.dev.jjs.ast.JSwitchExpression;
 import com.google.gwt.dev.jjs.ast.JThisRef;
 import com.google.gwt.dev.jjs.ast.JTryStatement;
 import com.google.gwt.dev.jjs.ast.JType;
@@ -342,6 +343,11 @@ public void endVisit(JStringLiteral x, Context ctx) {
       instantiate(stringType);
     }
 
+    @Override
+    public void endVisit(JSwitchExpression x, Context ctx) {
+      x.setType(translate(x.getType()));
+    }
+
     @Override
     public void endVisit(JThisRef x, Context ctx) {
       assert !x.getType().isExternal();

diff --git a/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java17Test.java b/user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java17Test.java
@@ -459,11 +459,23 @@ public static final int pick(HasSwitchMethod whichSwitch) {
           case ZERO -> 5;
         };
       }
+      public static final String select(HasSwitchMethod whichSwitch) {
+        if (Math.random() > 2) {
+          return "none";
+        }
+        return switch(whichSwitch) {
+          case A -> "1";
+          case RED -> "2";
+          case SUNDAY, JANUARY -> "4";
+          case ZERO -> "5";
+        };
+      }
     }
 
     HasSwitchMethod uninlinedValue = Math.random() > 2 ? HasSwitchMethod.A : HasSwitchMethod.RED;
     assertEquals(2, HasSwitchMethod.which(uninlinedValue));
     assertEquals(4, HasSwitchMethod.pick(uninlinedValue));
+    assertEquals("hello 2", "hello " + HasSwitchMethod.select(uninlinedValue));
   }
 
   private static final String ONE = "1";