commit ece649e4779abfa8a60514ace91678f934f9865d
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Sep 13 10:49:47 2022 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Tue Sep 13 08:50:11 2022 +0000
tree 79e4d920df63db6ad6e2071f3c87d219153b6b12
parent a7df8feb9bc792e7defdc58d00aaa0799f0cd731

[Retrace] Check if mapper is null before looking up signature

Change-Id: I0ef113da9909acc2b7e3038da122e716f8f63e48

src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java

diff --git a/src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java b/src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java
index 83f4cac..1b2be6a 100644
--- a/src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java
+++ b/src/main/java/com/android/tools/r8/retrace/internal/RetraceClassResultImpl.java
@@ -81,7 +81,7 @@
 
   private static MethodSignature getSignature(
       ClassNamingForNameMapper mapper, MethodDefinition definition) {
-    if (definition.isFullMethodDefinition()) {
+    if (mapper != null && definition.isFullMethodDefinition()) {
       MemberNaming lookup =
           mapper.lookup(
               MethodSignature.fromMethodReference(
@@ -95,7 +95,7 @@
 
   private static FieldSignature getSignature(
       ClassNamingForNameMapper mapper, FieldDefinition definition) {
-    if (definition.isFullFieldDefinition()) {
+    if (mapper != null && definition.isFullFieldDefinition()) {
       MemberNaming lookup =
           mapper.lookup(
               FieldSignature.fromFieldReference(