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

Is this fixed? I'm still seeing this issue with AGP 8.1.0-beta01 + Gradle 8.1

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

The fix has not been landed.

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

Due to this bug in CI we hit configuration cache invalidation 100% of the time. Can we make sure the fix lands soon? And especially before 8.1.0 stable.

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

I cc'ed you on the CL which should be landed this week.

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

Aurimas, is this 8.1 blocking for Androidx? If not, feel free to remove the "Blocking release" label.

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

cherry pick to G is landed.

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

This was still broken when running lint, but that is fixed here, which will be included in AGP 8.2.0-alpha10.

TBD if it will be included in 8.1.0 and/or 8.1.1

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

Reassigning to Xav to review CP to 8.1 branch

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

Scott, do we have a cherry-pick ready for the lint fix?

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

Marked as fixed.

Yes, Change-Id: I994677cebb63de5472bb8ea561bdad0336c72f55

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

Saurabh, it looks like Xav is OOO until after the deadline for patch 1 check-ins.

Can you or someone else give DrNo approval for ag/I994677cebb63de5472bb8ea561bdad0336c72f55?

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

Hey Saurabh, ag/I994677cebb63de5472bb8ea561bdad0336c72f55 still needs DrNo approval. Can you give approval, or can you reassign to someone who can?