Including source file information with residual names that overlap input names is not correctly represented [279702361]

Fixed

Bug

Status Update

No update yet.

Description

ze...@google.com

created issue #1

Apr 26, 2023 07:56AM

Implementing b/214018111 shows an issue found in ClassNameMinifierOriginalClassNameTest.

Here the expected encoding of the mapping would become:

com.android.tools.r8.naming.testclasses.A -> com.android.tools.r8.naming.testclasses.A:
# {"id":"sourceFile","fileName":"A.java"}

com.android.tools.r8.naming.testclasses.B -> com.android.tools.r8.naming.testclasses.A:
    1:1:void com.android.tools.r8.naming.testclasses.A.<init>():0:0 -> <init>
    1:1:void <init>():0 -> <init>
    void foo() -> a

But the overlap in residual name A causes the map to be clobbered. The source for original type A is needed, but it has no residual output so the mapping should be something like:

com.android.tools.r8.naming.testclasses.A -> removed:
# {"id":"sourceFile","fileName":"A.java"}

com.android.tools.r8.naming.testclasses.B -> com.android.tools.r8.naming.testclasses.A:
    1:1:void com.android.tools.r8.naming.testclasses.A.<init>():0:0 -> <init>
    1:1:void <init>():0 -> <init>
    void foo() -> a

Comments

ap...@google.com <ap...@google.com> #2Apr 26, 2023 09:08AM

Fixed by https://cs.android.com/android-studio/platform/tools/base/+/125598ae3efac36da61631ad2e87a010ee064df5 for 8.1/Giraffe.

ap...@google.com <ap...@google.com> #3Apr 26, 2023 09:08AM

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 Giraffe Canary 1 (2022.3.1.1)
Android Gradle Plugin 8.1.0

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!

ap...@google.com <ap...@google.com> #4Apr 27, 2023 07:37AM

Project: r8
Branch: main

commit dd87fb3beef3f8c585a2a6626ad2ca0ab256e374
Author: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Thu Apr 27 09:33:55 2023

Fix clobbering in mapping when recording sourcefile for pruned classes

Bug:

b/279702361

Change-Id: Ia2895fa2597ba5264ee420c2a09a5eacc37f7509

M src/main/java/com/android/tools/r8/naming/ClassNameMapper.java
M src/main/java/com/android/tools/r8/naming/SeedMapper.java
M src/main/java/com/android/tools/r8/utils/positions/MappedPositionToClassNameMapperBuilder.java
M src/test/java/com/android/tools/r8/naming/ClassNameMinifierOriginalClassNameTest.java
M src/test/java/com/android/tools/r8/naming/PackageNamingTest.java
M src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificMultiplePathsSuccessTest.java
M src/test/java/com/android/tools/r8/resolution/duplicatedefinitions/MaximallySpecificSingleProgramPartialTest.java
M src/test/java/com/android/tools/r8/utils/codeinspector/CodeInspector.java

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

ap...@google.com <ap...@google.com> #5May 1, 2023 12:08PM

Project: r8
Branch: 8.1

commit f2410fdb0e99af32784f95204db5a7311165095e
Author: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Mon May 01 11:35:19 2023

Version 8.1.42

Bug:

b/279702361

Change-Id: I413a69b06210eec60125c22423467e6b0f42bb59

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

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

ap...@google.com <ap...@google.com> #6May 1, 2023 12:08PM

Project: r8
Branch: 8.1

commit 5d818f36738012e7a46db7676ec8cfb9ca5d815c
Author: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Mon May 01 11:35:07 2023

Fix clobbering in mapping when recording sourcefile for pruned classes

Bug:

b/279702361

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

ap...@google.com <ap...@google.com> #7May 1, 2023 12:08PM

Project: r8
Branch: 8.0

commit e618130423e5c0da4cc604da7573778cde6169e3
Author: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Mon May 01 12:35:39 2023

Version 8.0.42

Bug:

b/279702361

Change-Id: Id12e4caa6fae3c482a59e2f93a2db2c9c97c02a8

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

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

ap...@google.com <ap...@google.com> #8May 1, 2023 12:08PM

Project: r8
Branch: 8.0

commit e16a8b582254fb3db39d194d6826316ddd35f737
Author: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Mon May 01 12:35:28 2023

Fix clobbering in mapping when recording sourcefile for pruned classes

Bug:

b/279702361

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

ap...@google.com <ap...@google.com> #9May 1, 2023 12:10PM

b/279702361

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

ap...@google.com <ap...@google.com> #10May 2, 2023 08:41AM

Project: r8
Branch: 8.0

commit d2a07998920bb56d3e6f401affc6e6e79120879b
Author: Morten Krogh-Jespersen <mkroghj@google.com>
Date: Tue May 02 09:01:36 2023

Version 8.0.43

This applies the CLs from

b/270137541

to resolve status changes introduced by cherry-picking

b/279702361

.

Bug:

b/279702361

Change-Id: I91b4946fda02f1ca2b3c2287bf4dc07bfe121ae1

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

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

sg...@google.com <sg...@google.com> #11May 8, 2023 04:22PM

Marked as fixed.

Landed with 8.1.43 in Studio Giraffe.

gr...@gmail.com <gr...@gmail.com> #12Mar 9, 2024 09:40AM

Mendarat dengan 8.1.43 di Studio Giraffe.

gr...@gmail.com <gr...@gmail.com> #13Mar 9, 2024 09:41AM

Proyek: r8 Cabang: 8.0 commit e16a8b582254fb3db39d194d6826316ddd35f737 Penulis: Morten Krogh-Jespersen mkroghj@google.com Tanggal: Sen 01 Mei 12:35:28 2023 Memperbaiki gangguan dalam pemetaan saat merekam file sumber untuk kelas yang dipangkas Bug: b/279702361 Ubah-Id : Ia2895fa2597ba5264ee420c2a09a5eacc37f7509 M src/main/java/com/android/tools/r8/naming/ClassNameMapper.java M src/main/java/com/android/tools/r8/naming/SeedMapper.java M src/main/java/com /android/tools/r8/utils/positions/MappedPositionToClassNameMapperBuilder.java M src/test/java/com/android/tools/r8/naming/PackageNamingTest.java M src/test/java/com/android/tools/r8/utils /codeinspector/CodeInspector.java https://r8-review.googlesource.com/78881

Issue 279702361

Description

Issue summary

Comments

ap...@google.com <ap...@google.com> #2Apr 26, 2023 09:08AM

ap...@google.com <ap...@google.com> #3Apr 26, 2023 09:08AM

ap...@google.com <ap...@google.com> #4Apr 27, 2023 07:37AM

ap...@google.com <ap...@google.com> #5May 1, 2023 12:08PM

ap...@google.com <ap...@google.com> #6May 1, 2023 12:08PM

ap...@google.com <ap...@google.com> #7May 1, 2023 12:08PM

ap...@google.com <ap...@google.com> #8May 1, 2023 12:08PM

ap...@google.com <ap...@google.com> #9May 1, 2023 12:10PM

ap...@google.com <ap...@google.com> #10May 2, 2023 08:41AM

sg...@google.com <sg...@google.com> #11May 8, 2023 04:22PM

gr...@gmail.com <gr...@gmail.com> #12Mar 9, 2024 09:40AM

gr...@gmail.com <gr...@gmail.com> #13Mar 9, 2024 09:41AM

Add comment

Issue metadata