Add the call to preserve field for the autovalue optimization to the primary constructor instead of the last one.

rluble · copybara-github · commit f798bde50a77 · 2026-01-30T13:49:20.000-08:00
PiperOrigin-RevId: 863377837
diff --git a/transpiler/java/com/google/j2cl/transpiler/ast/Type.java b/transpiler/java/com/google/j2cl/transpiler/ast/Type.java
@@ -18,6 +18,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.base.Predicates.not;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 
 import com.google.common.base.Predicates;
@@ -314,6 +315,14 @@ public Method getDefaultConstructor() {
         .orElse(null);
   }
 
+  /** Returns the primary constructor if the the type has one. */
+  @Nullable
+  public Method getPrimaryConstructor() {
+    var superDelegatingConstructors =
+        getConstructors().stream().filter(not(AstUtils::hasThisCall)).collect(toImmutableList());
+    return superDelegatingConstructors.size() != 1 ? null : superDelegatingConstructors.getFirst();
+  }
+
   @Override
   public String getSimpleJsName() {
     return typeDeclaration.getSimpleJsName();
diff --git a/transpiler/java/com/google/j2cl/transpiler/passes/JsInteropRestrictionsChecker.java b/transpiler/java/com/google/j2cl/transpiler/passes/JsInteropRestrictionsChecker.java
@@ -17,7 +17,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.j2cl.transpiler.ast.TypeDescriptors.isJavaLangRecord;
@@ -2102,13 +2101,8 @@ private static MethodDescriptor getPrimaryConstructorDescriptor(final Type type)
           .collect(onlyElement());
     }
 
-    ImmutableList<Method> superDelegatingConstructors =
-        type.getConstructors().stream()
-            .filter(Predicates.not(AstUtils::hasThisCall))
-            .collect(toImmutableList());
-    return superDelegatingConstructors.size() != 1
-        ? null
-        : superDelegatingConstructors.getFirst().getDescriptor();
+    var primaryConstructor = type.getPrimaryConstructor();
+    return primaryConstructor != null ? primaryConstructor.getDescriptor() : null;
   }
 
   private void checkJsConstructorSubtype(Type type) {
diff --git a/transpiler/java/com/google/j2cl/transpiler/passes/OptimizeAutoValue.java b/transpiler/java/com/google/j2cl/transpiler/passes/OptimizeAutoValue.java
@@ -535,8 +535,9 @@ private static void preserveFields(Type type, Collection<FieldDescriptor> exclud
             .build()
             .makeStatement(SourcePosition.NONE);
 
-    // Hack: Using the last constructor here since AutoValue constructor is appended to end.
-    Iterables.getLast(type.getConstructors()).getBody().getStatements().add(preserveCall);
+    // Add the call to preserve fields in the primary constructor since all other constructors
+    // will delegate to it.
+    type.getPrimaryConstructor().getBody().getStatements().add(preserveCall);
   }
 
   private static void addExcludedFieldsDeclaration(
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_closure/AutoValueJsType.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_closure/AutoValueJsType.impl.java.js.txt
@@ -22,6 +22,7 @@ class AutoValueJsType extends ValueType {
  /** @nodts */
  $ctor__autovalue_AutoValueJsType__void() {
   this.$ctor__javaemul_internal_ValueType__void();
+  $J2CL_PRESERVE$(this.f_field__autovalue_AutoValue_AutoValueJsType_, this.f_withJsMethod__autovalue_AutoValue_AutoValueJsType_);
  }
  /** @nodts @return {!AutoValueJsType} */
  static $create__int__int(/** number */ field, /** number */ withJsMethod) {
@@ -35,7 +36,6 @@ class AutoValueJsType extends ValueType {
   this.$ctor__autovalue_AutoValueJsType__void();
   this.f_field__autovalue_AutoValue_AutoValueJsType_ = field;
   this.f_withJsMethod__autovalue_AutoValue_AutoValueJsType_ = withJsMethod;
-  $J2CL_PRESERVE$(this.f_field__autovalue_AutoValue_AutoValueJsType_, this.f_withJsMethod__autovalue_AutoValue_AutoValueJsType_);
  }
  /** @return {number} */
  getField() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_closure/DefaultConstructorAutoValue.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_closure/DefaultConstructorAutoValue.impl.java.js.txt
@@ -22,6 +22,7 @@ class DefaultConstructorAutoValue extends ValueType {
  /** @nodts */
  $ctor__autovalue_DefaultConstructorAutoValue__void() {
   this.$ctor__javaemul_internal_ValueType__void();
+  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_DefaultConstructorAutoValue_);
  }
  /** @nodts @return {DefaultConstructorAutoValue} */
  static m_create__autovalue_DefaultConstructorAutoValue() {
@@ -39,7 +40,6 @@ class DefaultConstructorAutoValue extends ValueType {
  $ctor__autovalue_DefaultConstructorAutoValue__boolean__void(/** boolean */ booleanField) {
   this.$ctor__autovalue_DefaultConstructorAutoValue__void();
   this.f_booleanField__autovalue_AutoValue_DefaultConstructorAutoValue_ = booleanField;
-  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_DefaultConstructorAutoValue_);
  }
  /** @nodts @return {boolean} */
  m_getBooleanField__boolean() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_closure/DefaultNonEmptyConstructorAutoValue.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_closure/DefaultNonEmptyConstructorAutoValue.impl.java.js.txt
@@ -26,6 +26,7 @@ class DefaultNonEmptyConstructorAutoValue extends ValueType {
  $ctor__autovalue_DefaultNonEmptyConstructorAutoValue__void() {
   this.$ctor__javaemul_internal_ValueType__void();
   this.f_field__autovalue_DefaultNonEmptyConstructorAutoValue_ = 1;
+  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_DefaultNonEmptyConstructorAutoValue_);
  }
  /** @nodts @return {DefaultNonEmptyConstructorAutoValue} */
  static m_create__autovalue_DefaultNonEmptyConstructorAutoValue() {
@@ -43,7 +44,6 @@ class DefaultNonEmptyConstructorAutoValue extends ValueType {
  $ctor__autovalue_DefaultNonEmptyConstructorAutoValue__boolean__void(/** boolean */ booleanField) {
   this.$ctor__autovalue_DefaultNonEmptyConstructorAutoValue__void();
   this.f_booleanField__autovalue_AutoValue_DefaultNonEmptyConstructorAutoValue_ = booleanField;
-  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_DefaultNonEmptyConstructorAutoValue_);
  }
  /** @nodts @return {boolean} */
  m_getBooleanField__boolean() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueJsType.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueJsType.impl.java.js.txt
@@ -22,6 +22,7 @@ class AutoValueJsType extends ValueType {
  /** @nodts */
  $ctor__autovalue_AutoValueJsType__void() {
   this.$ctor__javaemul_internal_ValueType__void();
+  $J2CL_PRESERVE$(this.f_field__autovalue_AutoValue_AutoValueJsType_, this.f_withJsMethod__autovalue_AutoValue_AutoValueJsType_);
  }
  /** @nodts @return {!AutoValueJsType} */
  static $create__int__int(/** number */ field, /** number */ withJsMethod) {
@@ -35,7 +36,6 @@ class AutoValueJsType extends ValueType {
   this.$ctor__autovalue_AutoValueJsType__void();
   this.f_field__autovalue_AutoValue_AutoValueJsType_ = field;
   this.f_withJsMethod__autovalue_AutoValue_AutoValueJsType_ = withJsMethod;
-  $J2CL_PRESERVE$(this.f_field__autovalue_AutoValue_AutoValueJsType_, this.f_withJsMethod__autovalue_AutoValue_AutoValueJsType_);
  }
  /** @return {number} */
  getField() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueWithBuilder.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueWithBuilder.impl.java.js.txt
@@ -24,6 +24,7 @@ class AutoValueWithBuilder extends ValueType {
  /** @nodts */
  $ctor__autovalue_AutoValueWithBuilder__void() {
   this.$ctor__javaemul_internal_ValueType__void();
+  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_AutoValueWithBuilder_, this.f_nullableField__autovalue_AutoValue_AutoValueWithBuilder_);
  }
  /** @nodts @return {AutoValueWithBuilder} */
  static m_create_pp_autovalue__autovalue_AutoValueWithBuilder() {
@@ -42,7 +43,6 @@ class AutoValueWithBuilder extends ValueType {
   this.$ctor__autovalue_AutoValueWithBuilder__void();
   this.f_booleanField__autovalue_AutoValue_AutoValueWithBuilder_ = booleanField;
   this.f_nullableField__autovalue_AutoValue_AutoValueWithBuilder_ = nullableField;
-  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_AutoValueWithBuilder_, this.f_nullableField__autovalue_AutoValue_AutoValueWithBuilder_);
  }
  /** @nodts @return {boolean} */
  m_getBooleanField__boolean() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueWithExtensions.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueWithExtensions.impl.java.js.txt
@@ -21,6 +21,7 @@ class AutoValueWithExtensions extends ValueType {
  /** @nodts */
  $ctor__autovalue_AutoValueWithExtensions__void() {
   this.$ctor__javaemul_internal_ValueType__void();
+  $J2CL_PRESERVE$(this.f_intField__autovalue____AutoValue_AutoValueWithExtensions_, this.f_stringField__autovalue____AutoValue_AutoValueWithExtensions_);
  }
  /** @abstract @nodts @return {?string} */
  m_toPrettyString_pp_autovalue__java_lang_String() {}
@@ -35,7 +36,6 @@ class AutoValueWithExtensions extends ValueType {
   this.f_intField__autovalue____AutoValue_AutoValueWithExtensions_ = intField;
   Objects.m_requireNonNull__java_lang_Object__java_lang_Object(stringField);
   this.f_stringField__autovalue____AutoValue_AutoValueWithExtensions_ = stringField;
-  $J2CL_PRESERVE$(this.f_intField__autovalue____AutoValue_AutoValueWithExtensions_, this.f_stringField__autovalue____AutoValue_AutoValueWithExtensions_);
  }
  /** @nodts @return {number} */
  m_getIntField__int() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueWithFields.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueWithFields.impl.java.js.txt
@@ -29,6 +29,7 @@ class AutoValueWithFields extends Parent {
  /** @nodts */
  $ctor__autovalue_AutoValueWithFields__void() {
   this.$ctor__autovalue_Parent__void();
+  $J2CL_PRESERVE$(this.f_intField__autovalue_AutoValue_AutoValueWithFields_);
  }
  /** @nodts @return {!AutoValueWithFields} */
  static $create__int(/** number */ intField) {
@@ -41,7 +42,6 @@ class AutoValueWithFields extends Parent {
  $ctor__autovalue_AutoValueWithFields__int__void(/** number */ intField) {
   this.$ctor__autovalue_AutoValueWithFields__void();
   this.f_intField__autovalue_AutoValue_AutoValueWithFields_ = intField;
-  $J2CL_PRESERVE$(this.f_intField__autovalue_AutoValue_AutoValueWithFields_);
  }
  /** @nodts @return {number} */
  m_getIntField__int() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueWithGenerics.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/AutoValueWithGenerics.impl.java.js.txt
@@ -23,6 +23,7 @@ class AutoValueWithGenerics extends ValueType {
  /** @nodts */
  $ctor__autovalue_AutoValueWithGenerics__void() {
   this.$ctor__javaemul_internal_ValueType__void();
+  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_AutoValueWithGenerics_);
  }
  /** @nodts @template T_1 @return {AutoValueWithGenerics<T_1>} */
  static m_create_pp_autovalue__autovalue_AutoValueWithGenerics() {
@@ -40,7 +41,6 @@ class AutoValueWithGenerics extends ValueType {
  $ctor__autovalue_AutoValueWithGenerics__boolean__void(/** boolean */ booleanField) {
   this.$ctor__autovalue_AutoValueWithGenerics__void();
   this.f_booleanField__autovalue_AutoValue_AutoValueWithGenerics_ = booleanField;
-  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_AutoValueWithGenerics_);
  }
  /** @nodts @return {boolean} */
  m_getBooleanField__boolean() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/DefaultConstructorAutoValue.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/DefaultConstructorAutoValue.impl.java.js.txt
@@ -22,6 +22,7 @@ class DefaultConstructorAutoValue extends ValueType {
  /** @nodts */
  $ctor__autovalue_DefaultConstructorAutoValue__void() {
   this.$ctor__javaemul_internal_ValueType__void();
+  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_DefaultConstructorAutoValue_);
  }
  /** @nodts @return {DefaultConstructorAutoValue} */
  static m_create_pp_autovalue__autovalue_DefaultConstructorAutoValue() {
@@ -39,7 +40,6 @@ class DefaultConstructorAutoValue extends ValueType {
  $ctor__autovalue_DefaultConstructorAutoValue__boolean__void(/** boolean */ booleanField) {
   this.$ctor__autovalue_DefaultConstructorAutoValue__void();
   this.f_booleanField__autovalue_AutoValue_DefaultConstructorAutoValue_ = booleanField;
-  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_DefaultConstructorAutoValue_);
  }
  /** @nodts @return {boolean} */
  m_getBooleanField__boolean() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/DefaultNonEmptyConstructorAutoValue.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/DefaultNonEmptyConstructorAutoValue.impl.java.js.txt
@@ -26,6 +26,7 @@ class DefaultNonEmptyConstructorAutoValue extends ValueType {
  $ctor__autovalue_DefaultNonEmptyConstructorAutoValue__void() {
   this.$ctor__javaemul_internal_ValueType__void();
   this.f_field__autovalue_DefaultNonEmptyConstructorAutoValue_ = 1;
+  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_DefaultNonEmptyConstructorAutoValue_);
  }
  /** @nodts @return {DefaultNonEmptyConstructorAutoValue} */
  static m_create_pp_autovalue__autovalue_DefaultNonEmptyConstructorAutoValue() {
@@ -43,7 +44,6 @@ class DefaultNonEmptyConstructorAutoValue extends ValueType {
  $ctor__autovalue_DefaultNonEmptyConstructorAutoValue__boolean__void(/** boolean */ booleanField) {
   this.$ctor__autovalue_DefaultNonEmptyConstructorAutoValue__void();
   this.f_booleanField__autovalue_AutoValue_DefaultNonEmptyConstructorAutoValue_ = booleanField;
-  $J2CL_PRESERVE$(this.f_booleanField__autovalue_AutoValue_DefaultNonEmptyConstructorAutoValue_);
  }
  /** @nodts @return {boolean} */
  m_getBooleanField__boolean() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/ExtendingAutoValue.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/ExtendingAutoValue.impl.java.js.txt
@@ -27,6 +27,7 @@ class ExtendingAutoValue extends BaseClass {
  /** @nodts */
  $ctor__autovalue_ExtendingAutoValue__void() {
   this.$ctor__autovalue_BaseClass__void();
+  $J2CL_PRESERVE$(this.f_baseField__autovalue_AutoValue_ExtendingAutoValue_, this.f_booleanField__autovalue_AutoValue_ExtendingAutoValue_, this.f_stringField__autovalue_AutoValue_ExtendingAutoValue_);
  }
  /** @nodts @return {!ExtendingAutoValue} */
  static $create__int__boolean__java_lang_String(/** number */ baseField, /** boolean */ booleanField, /** ?string */ stringField) {
@@ -42,7 +43,6 @@ class ExtendingAutoValue extends BaseClass {
   this.f_booleanField__autovalue_AutoValue_ExtendingAutoValue_ = booleanField;
   Objects.m_requireNonNull__java_lang_Object__java_lang_Object(stringField);
   this.f_stringField__autovalue_AutoValue_ExtendingAutoValue_ = stringField;
-  $J2CL_PRESERVE$(this.f_baseField__autovalue_AutoValue_ExtendingAutoValue_, this.f_booleanField__autovalue_AutoValue_ExtendingAutoValue_, this.f_stringField__autovalue_AutoValue_ExtendingAutoValue_);
  }
  /** @override @nodts @return {number} */
  m_getBaseField__int() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/ImplementingAutoValue.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/ImplementingAutoValue.impl.java.js.txt
@@ -26,6 +26,7 @@ class ImplementingAutoValue extends ValueType {
  /** @nodts */
  $ctor__autovalue_ImplementingAutoValue__void() {
   this.$ctor__javaemul_internal_ValueType__void();
+  $J2CL_PRESERVE$(this.f_foo__autovalue_AutoValue_ImplementingAutoValue_);
  }
  /** @nodts @return {!ImplementingAutoValue} */
  static $create__java_lang_String(/** ?string */ foo) {
@@ -39,7 +40,6 @@ class ImplementingAutoValue extends ValueType {
   this.$ctor__autovalue_ImplementingAutoValue__void();
   Objects.m_requireNonNull__java_lang_Object__java_lang_Object(foo);
   this.f_foo__autovalue_AutoValue_ImplementingAutoValue_ = foo;
-  $J2CL_PRESERVE$(this.f_foo__autovalue_AutoValue_ImplementingAutoValue_);
  }
  /** @override @return {?string} */
  getFoo() {
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/SimpleAutoValue.impl.java.js.txt b/transpiler/javatests/com/google/j2cl/readable/java/autovalue/output_j2kt_web/SimpleAutoValue.impl.java.js.txt
@@ -43,6 +43,7 @@ class SimpleAutoValue extends ValueType {
  $ctor__autovalue_SimpleAutoValue__void() {
   this.$ctor__javaemul_internal_ValueType__void();
   this.f_field2__autovalue_SimpleAutoValue_ = InternalPreconditions.m_checkNotNull__java_lang_Object__java_lang_Object(Builder.$create__().m_build__autovalue_EmptyAutoValue());
+  $J2CL_PRESERVE$(this.f_intField__autovalue_AutoValue_SimpleAutoValue_, this.f_booleanField__autovalue_AutoValue_SimpleAutoValue_, this.f_stringField__autovalue_AutoValue_SimpleAutoValue_, this.f_doubleField__autovalue_AutoValue_SimpleAutoValue_, this.f_nullableField__autovalue_AutoValue_SimpleAutoValue_);
  }
  /** @nodts @return {SimpleAutoValue} */
  static m_create_pp_autovalue__autovalue_SimpleAutoValue() {
@@ -71,7 +72,6 @@ class SimpleAutoValue extends ValueType {
   Objects.m_requireNonNull__java_lang_Object__java_lang_Object(doubleField);
   this.f_doubleField__autovalue_AutoValue_SimpleAutoValue_ = doubleField;
   this.f_nullableField__autovalue_AutoValue_SimpleAutoValue_ = nullableField;
-  $J2CL_PRESERVE$(this.f_intField__autovalue_AutoValue_SimpleAutoValue_, this.f_booleanField__autovalue_AutoValue_SimpleAutoValue_, this.f_stringField__autovalue_AutoValue_SimpleAutoValue_, this.f_doubleField__autovalue_AutoValue_SimpleAutoValue_, this.f_nullableField__autovalue_AutoValue_SimpleAutoValue_);
  }
  /** @nodts @return {number} */
  m_getIntField__int() {
