commit 1d24bb2ce75cebffc11f8a72e434acc4c857fe0b
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Feb 02 14:50:24 2023 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Feb 02 15:31:44 2023 +0000
tree 79c6ace523ed4d170d2c7268bbc90bded8ab3e2d
parent 0ea3f2997d8d9f9f04c3db89a986fc154a7fcb6f

[Retrace] Use signature kind instead of class for type equality check

Change-Id: Ice68bd2a535be2380c97d2e1d2f2989a2e05ee7b

src/main/java/com/android/tools/r8/naming/ProguardMapReader.java

diff --git a/src/main/java/com/android/tools/r8/naming/ProguardMapReader.java b/src/main/java/com/android/tools/r8/naming/ProguardMapReader.java
index 749f1ea..14a6a22 100644
--- a/src/main/java/com/android/tools/r8/naming/ProguardMapReader.java
+++ b/src/main/java/com/android/tools/r8/naming/ProguardMapReader.java
@@ -590,7 +590,7 @@
   private Signature getResidualSignatureForMemberNaming(
       Box<Signature> residualSignature, Signature originalSignature, String renamedName) {
     if (residualSignature.isSet()) {
-      if (residualSignature.get().getClass() != originalSignature.getClass()) {
+      if (residualSignature.get().kind() != originalSignature.kind()) {
         diagnosticsHandler.warning(
             MappingInformationDiagnostics.invalidResidualSignatureType(
                 residualSignature.get().toString(), lineNo));