Version 2.2.37
Bug: 171289133
Change-Id: Ibab624d79862b10e1d1096dec41fc893013303c3
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index 916fc91..8230c5f 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
// This field is accessed from release scripts using simple pattern matching.
// Therefore, changing this field could break our release scripts.
- public static final String LABEL = "2.2.35";
+ public static final String LABEL = "2.2.37";
private Version() {
}
diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 5cf69c1..589f1bd 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -3384,8 +3384,11 @@
}
DexMember<?, ?> member = reference.asDexMember();
DexProgramClass holder = DexProgramClass.asProgramClassOrNull(definitionFor(member.holder));
- ProgramMember<?, ?> programMember = member.lookupOnProgramClass(holder);
- return programMember != null && isMemberLive(programMember.getDefinition());
+ if (holder == null) {
+ return false;
+ }
+ DexEncodedMember<?, ?> programMember = holder.lookupMember(member);
+ return programMember != null && isMemberLive(programMember);
}
private ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges() {