Enable native record and sealed classes when dexing for min-api 34 and above [293592205]

Fixed

Bug

Status Update

No update yet.

Description

sg...@google.com

created issue #1

Jul 28, 2023 02:49PM

This should happen before the branch to 8.3, as 8.2 goes into Hedgehog / AGP 8.2, the first official version supporting Android U.

Comments

ze...@google.com <ze...@google.com> Jul 31, 2023 08:28AM

Reassigned to sg...@google.com.

ap...@google.com <ap...@google.com> #2Jul 31, 2023 01:51PM

Marked as fixed.

Project: r8
Branch: main

commit 37b9a76bf701211c9579f97dcebdba145b0c8ef3
Author: Søren Gjesse <sgjesse@google.com>
Date: Mon Jul 31 15:39:15 2023

Android U supports records and sealed classes

For API level is 34 and above generate code for native support of
records and sealed classes.

Fixes:

b/293592205

Bug:

b/293591931

Change-Id: Ic36f9d2a22ea4e9db2a1b97ad9181cad3e1e2a34

M src/main/java/com/android/tools/r8/graph/DexAnnotation.java
M src/main/java/com/android/tools/r8/utils/InternalOptions.java
M src/test/java/com/android/tools/r8/desugar/records/RecordComponentAnnotationsTest.java
M src/test/java/com/android/tools/r8/desugar/records/RecordComponentSignatureTest.java
M src/test/java/com/android/tools/r8/desugar/sealed/PermittedSubclassesAttributeInDexTest.java

https://r8-review.googlesource.com/81721

ap...@google.com <ap...@google.com> #3Jul 31, 2023 05:03PM

Project: r8
Branch: main

commit b2c65396524b6f1c579458f1c1c549cc8fa0648c
Author: Søren Gjesse <sgjesse@google.com>
Date: Mon Jul 31 18:33:09 2023

Revert "Android U supports records and sealed classes"

This reverts commit 37b9a76bf701211c9579f97dcebdba145b0c8ef3.

Reason for revert: Test failures.

Bug:

b/293592205

Change-Id: Idadbb43556a9306ffe15fe1c8ed09af7439ec38c

M src/main/java/com/android/tools/r8/graph/DexAnnotation.java
M src/main/java/com/android/tools/r8/utils/InternalOptions.java
M src/test/java/com/android/tools/r8/desugar/records/RecordComponentAnnotationsTest.java
M src/test/java/com/android/tools/r8/desugar/records/RecordComponentSignatureTest.java
M src/test/java/com/android/tools/r8/desugar/sealed/PermittedSubclassesAttributeInDexTest.java

https://r8-review.googlesource.com/81803

ap...@google.com <ap...@google.com> #4Sep 8, 2023 07:36AM

Project: r8
Branch: main

commit bc078d1c4db4f658a44f232e7293d3ebd4e9e615
Author: Søren Gjesse <sgjesse@google.com>
Date: Thu Sep 07 14:34:09 2023

Remove recordModeling flag

Was always true with no flags to turn it off.

Bug:

b/293592205

Change-Id: Ib159bc29f79be361205d341c06d23af1d73c4bfb

M src/main/java/com/android/tools/r8/R8.java
M src/main/java/com/android/tools/r8/ir/desugar/records/RecordCfToCfRewriter.java
M src/main/java/com/android/tools/r8/ir/desugar/records/RecordDesugaring.java
M src/main/java/com/android/tools/r8/ir/desugar/records/RecordFieldValuesRewriter.java
M src/main/java/com/android/tools/r8/ir/synthetic/RecordCfCodeProvider.java
M src/main/java/com/android/tools/r8/shaking/DefaultEnqueuerUseRegistry.java
M src/main/java/com/android/tools/r8/utils/InternalOptions.java

https://r8-review.googlesource.com/83664

ap...@google.com <ap...@google.com> #5Sep 8, 2023 12:11PM

Project: r8
Branch: main

commit 9c736445345d33ca5d41e70c5766415f6ea2feab
Author: Søren Gjesse <sgjesse@google.com>
Date: Fri Sep 08 14:10:18 2023

Split rewriting of record invokedynamic from DexItemBasedXXXString

Bug:

b/293592205

Change-Id: I8c0136b093874d77602624454e3bb8bf005696b5

M src/main/java/com/android/tools/r8/R8.java
M src/main/java/com/android/tools/r8/naming/IdentifierMinifier.java
M src/main/java/com/android/tools/r8/naming/Minifier.java
M src/main/java/com/android/tools/r8/naming/ProguardMapMinifier.java
A src/main/java/com/android/tools/r8/naming/RecordInvokeDynamicRewriter.java

https://r8-review.googlesource.com/83628

ap...@google.com <ap...@google.com> #6Sep 11, 2023 08:38AM

Project: r8
Branch: main

commit 12a989276f78838bd3613ea4c11087bc2495fabf
Author: Søren Gjesse <sgjesse@google.com>
Date: Mon Sep 11 10:24:49 2023

Reapply "Android U supports records and sealed classes"

This reverts commit b2c65396524b6f1c579458f1c1c549cc8fa0648c.

Original commit message:

Android U supports records and sealed classes

For API level is 34 and above generate code for native support of
records and sealed classes.

Fixes:

b/293592205

Fixes:

b/293987311

Bug:

b/293591931

Change-Id: I62680cf074368a0d906446a2abbf8321da172d65

M src/main/java/com/android/tools/r8/R8.java
M src/main/java/com/android/tools/r8/graph/DexAnnotation.java
M src/main/java/com/android/tools/r8/horizontalclassmerging/PolicyScheduler.java
A src/main/java/com/android/tools/r8/horizontalclassmerging/policies/NoRecords.java
M src/main/java/com/android/tools/r8/ir/code/InvokeCustom.java
D src/main/java/com/android/tools/r8/ir/desugar/records/RecordCfToCfRewriter.java
A src/main/java/com/android/tools/r8/ir/desugar/records/RecordRewriter.java
M src/main/java/com/android/tools/r8/ir/desugar/records/RecordRewriterHelper.java
M src/main/java/com/android/tools/r8/naming/Minifier.java
M src/main/java/com/android/tools/r8/naming/ProguardMapMinifier.java
A src/main/java/com/android/tools/r8/naming/RecordInvokeDynamicInvokeCustomRewriter.java
D src/main/java/com/android/tools/r8/naming/RecordInvokeDynamicRewriter.java
M src/main/java/com/android/tools/r8/utils/InternalOptions.java
M src/main/java/com/android/tools/r8/utils/ZipUtils.java
M src/test/java/com/android/tools/r8/TestBase.java
M src/test/java/com/android/tools/r8/TestParameters.java
M src/test/java/com/android/tools/r8/TestRuntime.java
M src/test/java/com/android/tools/r8/ToolHelper.java
M src/test/java/com/android/tools/r8/desugar/records/EmptyRecordAnnotationTest.java
M src/test/java/com/android/tools/r8/desugar/records/RecordBlogTest.java
M src/test/java/com/android/tools/r8/desugar/records/RecordComponentAnnotationsTest.java
M src/test/java/com/android/tools/r8/desugar/records/RecordComponentSignatureTest.java
M src/test/java/com/android/tools/r8/desugar/records/RecordInterfaceTest.java
M src/test/java/com/android/tools/r8/desugar/records/RecordInvokeCustomSplitDesugaringTest.java
M src/test/java/com/android/tools/r8/desugar/records/RecordMergeTest.java
M src/test/java/com/android/tools/r8/desugar/records/RecordWithNonMaterializableConstClassTest.java
M src/test/java/com/android/tools/r8/desugar/records/SimpleRecordTest.java
M src/test/java/com/android/tools/r8/desugar/sealed/PermittedSubclassesAttributeInDexTest.java
M src/test/java/com/android/tools/r8/profile/art/completeness/RecordProfileRewritingTest.java

https://r8-review.googlesource.com/82140

ap...@google.com <ap...@google.com> #7Sep 12, 2023 02:51PM

Project: r8
Branch: 8.2

commit b98f1fe481cf64b1bddcd3e46286b1f239284635
Author: Søren Gjesse <sgjesse@google.com>
Date: Tue Sep 12 11:24:44 2023

Remove recordModeling flag

Was always true with no flags to turn it off.

Bug:

b/293592205

https://r8-review.googlesource.com/83840

ap...@google.com <ap...@google.com> #8Sep 12, 2023 02:51PM

Project: r8
Branch: 8.2

commit 226975ebf279ecfe34b5b9bd7b5bf350029c2b6f
Author: Søren Gjesse <sgjesse@google.com>
Date: Tue Sep 12 14:52:47 2023

Reapply "Android U supports records and sealed classes"

This reverts commit b2c65396524b6f1c579458f1c1c549cc8fa0648c.

Original commit message:

Android U supports records and sealed classes

For API level is 34 and above generate code for native support of
records and sealed classes.

Fixes:

b/293592205

Fixes:

b/293987311

Bug:

b/293591931

https://r8-review.googlesource.com/83806

ap...@google.com <ap...@google.com> #9Sep 12, 2023 02:51PM

Project: r8
Branch: 8.2

commit b9c6a503fec02920ce801cc886c748552851b6f3
Author: Søren Gjesse <sgjesse@google.com>
Date: Tue Sep 12 14:54:30 2023

Version 8.2.33

Bug:

b/293592205

Bug:

b/299446046

Change-Id: Ie9e70edb6c266b6f3e753b728fda4915863a53ab

M src/main/java/com/android/tools/r8/Version.java

https://r8-review.googlesource.com/83843

ap...@google.com <ap...@google.com> #10Sep 12, 2023 02:51PM

Project: r8
Branch: 8.2

commit e3c0fb30261ba2c882bee6d5c7c7a7fc78222d93
Author: Søren Gjesse <sgjesse@google.com>
Date: Tue Sep 12 11:26:59 2023

Split rewriting of record invokedynamic from DexItemBasedXXXString

Bug:

b/293592205

https://r8-review.googlesource.com/83841

an...@google.com <an...@google.com> #11Sep 21, 2023 04:00PM

Thank you for your patience while our engineering team worked to resolve this issue. A fix for this issue is now available in:

Android Studio Hedgehog | 2023.1.1 Beta 5
Android Gradle Plugin 8.2.0-beta05

We encourage you to try the latest update.

If you notice further issues or have questions, please file a new bug report.

Thank you for taking the time to submit feedback — we really appreciate it!

Issue 293592205

Description

Issue summary

Comments

ze...@google.com <ze...@google.com> Jul 31, 2023 08:28AM

ap...@google.com <ap...@google.com> #2Jul 31, 2023 01:51PM

ap...@google.com <ap...@google.com> #3Jul 31, 2023 05:03PM

ap...@google.com <ap...@google.com> #4Sep 8, 2023 07:36AM

ap...@google.com <ap...@google.com> #5Sep 8, 2023 12:11PM

ap...@google.com <ap...@google.com> #6Sep 11, 2023 08:38AM

ap...@google.com <ap...@google.com> #7Sep 12, 2023 02:51PM

ap...@google.com <ap...@google.com> #8Sep 12, 2023 02:51PM

ap...@google.com <ap...@google.com> #9Sep 12, 2023 02:51PM

ap...@google.com <ap...@google.com> #10Sep 12, 2023 02:51PM

an...@google.com <an...@google.com> #11Sep 21, 2023 04:00PM

Add comment

Issue metadata