Fix compile errors for records with custom constructors, update JDT

Author: zbynek

.github/workflows/full-check.yml

@@ -33,8 +33,9 @@ jobs:
       - name: Checkout GWT tools into a sibling directory
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
         with:
-          repository: 'gwtproject/tools'
+          repository: 'zbynek/tools'
           path: 'tools'
+          ref: 'jdt'
       - name: Set up JDK ${{ matrix.java-version }}
         # GWT requires Java 17+ to build
         uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 #v5.4.0

.github/workflows/quick-check.yml

@@ -20,8 +20,9 @@ jobs:
       - name: Checkout GWT tools into a sibling directory
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
         with:
-          repository: 'gwtproject/tools'
+          repository: 'zbynek/tools'
           path: 'tools'
+          ref: 'jdt'
       - name: Set up JDK ${{ matrix.java-version }}
         # GWT presently requires Java 17+ to build
         uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 #v5.4.0

dev/build.xml

@@ -63,7 +63,7 @@
           <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/3.33.0/*.jar"/>
+          <include name="eclipse/3.37.0/*.jar"/>
           <include name="objectweb/asm-9.10.1/asm-9.10.1.jar"/>
           <include name="objectweb/asm-9.10.1/asm-commons-9.10.1.jar"/>
           <include name="objectweb/asm-9.10.1/asm-util-9.10.1.jar"/>
@@ -125,7 +125,7 @@
           <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"/>
-          <zipgroupfileset dir="${gwt.tools.lib}/eclipse/3.33.0">
+          <zipgroupfileset dir="${gwt.tools.lib}/eclipse/3.37.0">
             <include name="**/*.jar"/>
           </zipgroupfileset>
           <zipfileset src="${gwt.tools.lib}/guava/guava-33.0/guava-33.0.0-jre-rebased.jar"/>
@@ -222,7 +222,7 @@
         <pathelement location="${gwt.tools.lib}/objectweb/asm-9.10.1/asm-util-9.10.1.jar"/>
         <pathelement
             location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.2.jar"/>
-        <fileset dir="${gwt.tools.lib}/eclipse/3.33.0">
+        <fileset dir="${gwt.tools.lib}/eclipse/3.37.0">
           <include name="**/*.jar"/>
         </fileset>
         <pathelement

dev/core/src/com/google/gwt/dev/javac/testing/impl/JavaResourceBase.java

@@ -248,6 +248,54 @@ public class JavaResourceBase {
           "package java.util;",
           "public interface Map<K,V> { }");
 
+  public static final MockJavaResource METHOD_HANDLE =
+      createMockJavaResource("java.lang.invoke.MethodHandle",
+          """
+          package java.lang.invoke;
+          public abstract class MethodHandle { }
+          """);
+
+  public static final MockJavaResource METHOD_HANDLES =
+      createMockJavaResource("java.lang.invoke.MethodHandles",
+          """
+          package java.lang.invoke;
+          public class MethodHandles {
+            public static final class Lookup {
+              public MethodHandle findVirtual(Class<?> refc, String name,
+                                              MethodType type) {
+                return null;
+              }
+          
+              public MethodHandle findStatic(Class<?> refc, String name,
+                                             MethodType type) {
+                return null;
+              }
+            }
+          
+            public static Lookup lookup() {
+              return null;
+            }
+          }
+          """);
+
+  public static final MockJavaResource METHOD_TYPE =
+      createMockJavaResource("java.lang.invoke.MethodType",
+          """
+          package java.lang.invoke;
+          public final class MethodType {
+            public static MethodType methodType(Class<?> rtype, Class<?> ptype0,
+                Class<?>... ptypes) {
+              return null;
+            }
+            public static MethodType methodType(Class<?> rtype) {
+              return null;
+            }
+            public static MethodType genericMethodType(int objectArgCount) {
+              return null;
+            }
+          }
+          """);
+
   public static final MockJavaResource NO_CLASS_DEF_FOUND_ERROR =
       createMockJavaResource("java.lang.NoClassDefFoundError",
           "package java.lang;",
@@ -364,6 +412,13 @@ public class JavaResourceBase {
           "public final class StringBuilder {",
           "}");
 
+  public static final MockJavaResource STRING_CONCAT_FACTORY =
+      createMockJavaResource("java.lang.invoke.StringConcatFactory",
+          """
+          package java.lang.invoke;
+          public final class StringConcatFactory {}
+          """);
+
   public static final MockJavaResource SUPPRESS_WARNINGS =
       createMockJavaResource("java.lang.SuppressWarnings",
           "package java.lang;",
@@ -467,7 +522,8 @@ public static MockJavaResource[] getStandardResources() {
         AUTOCLOSEABLE, ANNOTATION, ARRAY_LIST, BYTE, BOOLEAN, CHARACTER, CHAR_SEQUENCE, CLASS,
         CLASS_NOT_FOUND_EXCEPTION, CLONEABLE, COLLECTION, COMPARABLE, DOUBLE, ENUM, EXCEPTION,
         ERROR, FUNCTIONALINTERFACE, FLOAT, INTEGER, IS_SERIALIZABLE, JAVASCRIPTEXCEPTION,
-        JAVASCRIPTOBJECT, LIST, LONG, MAP, NO_CLASS_DEF_FOUND_ERROR, NUMBER, OBJECT, OBJECTMETHODS,
+        JAVASCRIPTOBJECT, LIST, LONG, MAP, METHOD_HANDLES, NO_CLASS_DEF_FOUND_ERROR,
+        NUMBER, OBJECT, OBJECTMETHODS, METHOD_HANDLE, METHOD_TYPE, STRING_CONCAT_FACTORY,
         OBJECTS, RECORD, RUNTIME_EXCEPTION, SERIALIZABLE, SHORT, STRING, STRING_BUILDER,
         SUPPRESS_WARNINGS, SYSTEM, THROWABLE, SPECIALIZE_METHOD, DO_NOT_AUTOBOX, JSTYPE,
         JSCONSTRUCTOR, JSPACKAGE, JSPROPERTY, JSMETHOD, JSIGNORE, JSFUNCTION, JSOVERLAY,

dev/core/src/com/google/gwt/dev/jjs/impl/GwtAstBuilder.java

@@ -114,6 +114,7 @@
 import com.google.gwt.dev.js.ast.JsNode;
 import com.google.gwt.dev.js.ast.JsParameter;
 import com.google.gwt.dev.util.StringInterner;
+import com.google.gwt.dev.util.collect.HashSet;
 import com.google.gwt.dev.util.collect.Stack;
 import com.google.gwt.thirdparty.guava.common.base.Function;
 import com.google.gwt.thirdparty.guava.common.base.Joiner;
@@ -711,6 +712,9 @@ private TypeBinding getFirstNonObjectInIntersection(IntersectionTypeBinding18 re
 
     @Override
     public void endVisit(ConstructorDeclaration x, ClassScope scope) {
+      if (skippedConstructors.contains(x)) {
+        return;
+      }
       try {
         List<JStatement> statements = pop(x.statements);
         JStatement constructorCall = pop(x.constructorCall);
@@ -2596,6 +2600,9 @@ public boolean visit(Block x, BlockScope scope) {
 
     @Override
     public boolean visit(ConstructorDeclaration x, ClassScope scope) {
+      if (skippedConstructors.contains(x)) {
+        return false;
+      }
       try {
         JConstructor method = (JConstructor) typeMap.get(x.binding);
         assert !method.isExternal();
@@ -4131,6 +4138,7 @@ private boolean isBinaryBinding(ReferenceBinding binding) {
   private boolean generateJsInteropExports;
 
   private WhitelistRegexFilter jsInteropExportFilter;
+  private final Set<AbstractMethodDeclaration> skippedConstructors = new HashSet<>();
 
   /**
    * Externalized class and method form for Exceptions.safeClose() to provide support
@@ -4331,6 +4339,10 @@ private void createMembers(TypeDeclaration x) {
 
       if (x.methods != null) {
         for (AbstractMethodDeclaration method : x.methods) {
+          if (method.binding == null && x.binding.isRecord() && method.isConstructor()) {
+            skippedConstructors.add(method);
+            continue;
+          }
           createMethod(method);
         }
       }
@@ -4400,6 +4412,9 @@ private void createMethod(AbstractMethodDeclaration x) {
     if (x instanceof Clinit) {
       return;
     }
+    if (x.binding == null) {
+      throw new IllegalArgumentException("Missing method binding for " + x);
+    }
     SourceInfo info = makeSourceInfo(x);
     MethodBinding b = x.binding;
     ReferenceBinding declaringClass = (ReferenceBinding) b.declaringClass.erasure();
@@ -4630,7 +4645,7 @@ private void createTypes(TypeDeclaration x) {
       }
     } catch (Throwable e) {
       InternalCompilerException ice = translateException(null, e);
-      StringBuffer sb = new StringBuffer();
+      StringBuilder sb = new StringBuilder();
       x.printHeader(0, sb);
       ice.addNode(x.getClass().getName(), sb.toString(), info);
       throw ice;
@@ -4679,7 +4694,7 @@ private void resolveTypeRefs(TypeDeclaration x) {
   private InternalCompilerException getInternalCompilerException(TypeDeclaration x, Throwable e) {
     JDeclaredType type = (JDeclaredType) typeMap.get(x.binding);
     InternalCompilerException ice = translateException(null, e);
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     x.printHeader(0, sb);
     ice.addNode(x.getClass().getName(), sb.toString(), type.getSourceInfo());
     return ice;

dev/core/test/com/google/gwt/dev/jjs/impl/SampleBytecodeOnlyMarkerAnnotation.java

@@ -13,8 +13,12 @@
  */
 package com.google.gwt.dev.jjs.impl;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
 /**
  * Annotation with no bytecode for GWT, and no members.
  */
+@Target({ElementType.METHOD, ElementType.TYPE_USE})
 public @interface SampleBytecodeOnlyMarkerAnnotation {
 }

dev/core/test/com/google/gwt/dev/jjs/impl/SampleBytecodeOnlyNormalAnnotation.java

@@ -13,9 +13,13 @@
  */
 package com.google.gwt.dev.jjs.impl;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
 /**
  * Annotation with no bytecode for GWT, and multiple members.
  */
+@Target({ElementType.METHOD, ElementType.TYPE_USE})
 public @interface SampleBytecodeOnlyNormalAnnotation {
   int a();
   int b();

dev/core/test/com/google/gwt/dev/jjs/impl/SampleBytecodeOnlySingleMemberAnnotation.java

@@ -13,9 +13,13 @@
  */
 package com.google.gwt.dev.jjs.impl;
 
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
 /**
  * Annotation with no bytecode for GWT, and a single member.
  */
+@Target({ElementType.METHOD, ElementType.TYPE_USE})
 public @interface SampleBytecodeOnlySingleMemberAnnotation {
   String value();
 }

maven/poms/gwt/pom-template.xml

@@ -267,7 +267,7 @@
             <dependency>
                 <groupId>org.eclipse.jdt</groupId>
                 <artifactId>org.eclipse.jdt.core</artifactId>
-                <version>3.33.0</version>
+                <version>3.37.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

user/test-super/com/google/gwt/dev/jjs/super/com/google/gwt/dev/jjs/test/Java17Test.java

@@ -20,6 +20,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;
@@ -140,6 +141,18 @@ record RecordWithStaticField() {
     public static String foo = "bar";
   }
 
+  record RecordWithDefaultConstructor(String foo) {
+    public RecordWithDefaultConstructor {
+      Objects.requireNonNull(foo);
+    }
+  }
+
+  record RecordWithExtraConstructor(String foo) {
+    RecordWithExtraConstructor(int fooInt) {
+      this(fooInt + "");
+    }
+  }
+
   /**
    * Record type that takes a record as a component
    */
@@ -207,6 +220,17 @@ public String toString() {
     assertFalse(new TopLevelRecord(null, 3).equals(new TopLevelRecord("abc", 3)));
   }
 
+  public void testRecordConstructors() {
+    assertEquals("7", new RecordWithExtraConstructor(7).foo());
+    assertEquals("7", new RecordWithDefaultConstructor("7").foo());
+    try {
+      new RecordWithDefaultConstructor(null).foo();
+      fail("Should have thrown NPE");
+    } catch (RuntimeException expected) {
+      // expected
+    }
+  }
+
   /**
    * Simple record with one property accessor, one default method accessor
    */