Point to the latest JDT and asm

Update build scripts to point to the latest compatible JDT [3.32.0.v20221108-1853]/[4.26] and the latest asm 9.6 fix #9871 related to #9869
gwtproject · Jan 2, 2024 · 9b37765 · 9b37765
1 parent f439c5e
commit 9b37765
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 25 deletions.
diff --git a/dev/build.xml b/dev/build.xml
@@ -77,11 +77,11 @@
           <include name="apache/tapestry-util-text-4.0.2.jar"/>
           <include name="apache/ant-zipscanner/ant-zipscanner-1.6.5-1-rebased.jar"/>
           <include name="colt/colt-1.2.jar"/>
-          <include name="eclipse/org.eclipse.jdt.core_3.17.0.v20190306-2240.jar"/>
-          <include name="eclipse/jdtCompilerAdapter_3.17.0.v20190306-2240.jar"/>
-          <include name="objectweb/asm-9.2/asm-9.2.jar"/>
-          <include name="objectweb/asm-9.2/asm-commons-9.2.jar"/>
-          <include name="objectweb/asm-9.2/asm-util-9.2.jar"/>
+          <include name="eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
+          <include name="eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
+          <include name="objectweb/asm-9.6/asm-9.6.jar"/>
+          <include name="objectweb/asm-9.6/asm-commons-9.6.jar"/>
+          <include name="objectweb/asm-9.6/asm-util-9.6.jar"/>
           <include name="guava/guava-19.0/guava-19.0-rebased.jar"/>
           <include name="icu4j/63.1/icu4j.jar"/>
           <include name="jetty/jetty-9.4.44.v20210927/jetty-all-9.4.44.v20210927.jar"/>
@@ -133,16 +133,16 @@
             <provider classname="org.eclipse.jetty.websocket.jsr356.server.deploy.WebSocketServerContainerInitializer"/>
             <provider classname="org.eclipse.jetty.apache.jsp.JettyJasperInitializer"/>
           </service>
-          <zipfileset src="${gwt.tools.lib}/objectweb/asm-9.2/asm-9.2.jar"/>
-          <zipfileset src="${gwt.tools.lib}/objectweb/asm-9.2/asm-commons-9.2.jar"/>
-          <zipfileset src="${gwt.tools.lib}/objectweb/asm-9.2/asm-util-9.2.jar"/>
+          <zipfileset src="${gwt.tools.lib}/objectweb/asm-9.6/asm-9.6.jar"/>
+          <zipfileset src="${gwt.tools.lib}/objectweb/asm-9.6/asm-commons-9.6.jar"/>
+          <zipfileset src="${gwt.tools.lib}/objectweb/asm-9.6/asm-util-9.6.jar"/>
           <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar"/>
           <zipfileset src="${gwt.tools.lib}/apache/ant-zipscanner/ant-zipscanner-1.6.5-1-rebased.jar"/>
           <zipfileset src="${gwt.tools.lib}/colt/colt-1.2.jar"/>
           <zipfileset
-              src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.17.0.v20190306-2240.jar"/>
+              src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
           <zipfileset
-              src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.17.0.v20190306-2240.jar"/>
+              src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
           <zipfileset src="${gwt.tools.lib}/guava/guava-19.0/guava-19.0-rebased.jar"/>
           <zipfileset src="${gwt.tools.lib}/icu4j/63.1/icu4j.jar"/>
           <zipfileset
@@ -236,15 +236,15 @@
       <classpath>
         <pathelement location="${gwt.tools.lib}/apache/ant-zipscanner/ant-zipscanner-1.6.5-1-rebased.jar"/>
         <pathelement location="${gwt.tools.lib}/colt/colt-1.2.jar"/>
-        <pathelement location="${gwt.tools.lib}/objectweb/asm-9.2/asm-9.2.jar"/>
-        <pathelement location="${gwt.tools.lib}/objectweb/asm-9.2/asm-commons-9.2.jar"/>
-        <pathelement location="${gwt.tools.lib}/objectweb/asm-9.2/asm-util-9.2.jar"/>
+        <pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-9.6.jar"/>
+        <pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-commons-9.6.jar"/>
+        <pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-util-9.6.jar"/>
         <pathelement
             location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.2.jar"/>
         <pathelement
-            location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.17.0.v20190306-2240.jar"/>
+            location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.32.0.v20221108-1853.jar"/>
         <pathelement
-            location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.17.0.v20190306-2240.jar"/>
+            location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.32.0.v20221108-1853.jar"/>
         <pathelement
             location="${gwt.tools.lib}/guava/guava-19.0/guava-19.0-rebased.jar"/>
         <pathelement location="${gwt.tools.lib}/gson/gson-2.6.2.jar"/>

diff --git a/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java b/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
@@ -787,7 +787,8 @@ private static void resolveRecursive(ReferenceBinding outerType) {
           SourceLevel.JAVA8, ClassFileConstants.JDK1_8,
           SourceLevel.JAVA9, ClassFileConstants.JDK9,
           SourceLevel.JAVA10, ClassFileConstants.JDK10,
-          SourceLevel.JAVA11, ClassFileConstants.JDK11);
+          SourceLevel.JAVA11, ClassFileConstants.JDK11,
+          SourceLevel.JAVA17, ClassFileConstants.JDK17);
 
   public JdtCompiler(CompilerContext compilerContext, UnitProcessor processor) {
     this.compilerContext = compilerContext;

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java
@@ -537,13 +537,20 @@ public void endVisit(BreakStatement x, BlockScope scope) {
 
     @Override
     public void endVisit(CaseStatement x, BlockScope scope) {
+      assert x.isExpr == false : "Switch expressions not yet supported";
       try {
         SourceInfo info = makeSourceInfo(x);
-        JExpression caseExpression = pop(x.constantExpression);
-        if (caseExpression != null && x.constantExpression.resolvedType.isEnum()) {
-          caseExpression = synthesizeCallToOrdinal(scope, info, caseExpression);
+        if (x.constantExpressions == null) {
+          push(new JCaseStatement(info, null));
+        } else {
+          for (Expression constantExpression : x.constantExpressions) {
+            JExpression caseExpression = pop(constantExpression);
+            if (caseExpression != null && caseExpression.getType().isEnumOrSubclass() != null) {
+              caseExpression = synthesizeCallToOrdinal(scope, info, caseExpression);
+            }
+            push(new JCaseStatement(info, caseExpression));
+          }
         }
-        push(new JCaseStatement(info, caseExpression));
       } catch (Throwable e) {
         throw translateException(x, e);
       }

diff --git a/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java b/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java
@@ -26,7 +26,8 @@ public enum SourceLevel {
   JAVA8("1.8", "8"),
   JAVA9("9", "1.9"),
   JAVA10("10", "1.10"),
-  JAVA11("11", "1.11");
+  JAVA11("11", "1.11"),
+  JAVA17("17", "1.17");
 
   /**
    * The default java sourceLevel.

diff --git a/maven/google-poms/gwt/pom-template.xml b/maven/google-poms/gwt/pom-template.xml
@@ -22,7 +22,7 @@
     </licenses>
     <properties>
         <jetty.version>9.4.44.v20210927</jetty.version>
-        <asm.version>9.2</asm.version>
+        <asm.version>9.6</asm.version>
     </properties>
     <dependencyManagement>
         <dependencies>

diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml
@@ -22,7 +22,7 @@
     </licenses>
     <properties>
       <jetty.version>9.4.44.v20210927</jetty.version>
-      <asm.version>9.2</asm.version>
+      <asm.version>9.6</asm.version>
     </properties>
     <dependencyManagement>
         <dependencies>

diff --git a/user/build.xml b/user/build.xml
@@ -73,8 +73,8 @@
     <pathelement location="${gwt.tools.lib}/cglib/cglib-3.1.jar"/>
     <pathelement location="${gwt.tools.lib}/mockito/1.9.5/mockito-all-1.9.5.jar"/>
     <pathelement location="${gwt.tools.lib}/objenesis/objenesis-1.2.jar"/>
-    <pathelement location="${gwt.tools.lib}/objectweb/asm-9.2/asm-9.2.jar"/>
-    <pathelement location="${gwt.tools.lib}/objectweb/asm-9.2/asm-commons-9.2.jar"/>
+    <pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-9.6.jar"/>
+    <pathelement location="${gwt.tools.lib}/objectweb/asm-9.6/asm-commons-9.6.jar"/>
     <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/>
     <pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
     <pathelement