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

Any update on this? This is a major blocker as we cannot run any androidTest under library projects/modules

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

Hi there, thank you for your patience.
Could you please attach a sample project that shows this issue? Or please explain where and how the resource is defined and referenced.

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

Sample project is linked in #1, along with a repro step. Is anything still missing?

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

Ah I missed that, thanks for pointing it out. I'll check it out and keep you updated.

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

Hi, any update on this issue?

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

I understand that this is an old issue and I am just starting to investigate this. Is this still a problem?

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

I've just updated sample project dependencies to the latest AGP and Gradle versions and problem still occurs with additional StackOverflow issue.

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

Thanks for reporting this. Data binding base class generation was broken for library modules with android test that had views. This is now fixed in the main branch and the fix will be available in 8.0 beta1.

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