commit | 969f33faaa4de1957ee59323d17ab5244e9e678f | [log] [tgz] |
---|---|---|
author | Christoffer Quist Adamsen <christofferqa@google.com> | Tue Mar 19 17:13:40 2019 +0100 |
committer | Christoffer Quist Adamsen <christofferqa@google.com> | Tue Mar 19 17:13:40 2019 +0100 |
tree | 2e8f2e70fe9c1f3e417814d0c97ce0e17b1312ea | |
parent | fd9fcdf19cb6600145852215dd45f7ecbb949255 [diff] |
Version 1.4.76 Cherry pick: Prevent NPE in enqueueHolderIfDependentNonStaticMember CL: https://r8-review.googlesource.com/c/r8/+/36006 Bug: 128813358 Change-Id: If0b5f43160aabf02c05c6a65a1f9422238117105
diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java index 3f82b47..cbefea3 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 = "1.4.75"; + public static final String LABEL = "1.4.76"; 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 37a83bf..7a38519 100644 --- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java +++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -399,6 +399,10 @@ continue; } DexDefinition dependentDefinition = appInfo.definitionFor(dependentItem); + if (dependentDefinition == null) { + assert false; + continue; + } if (!dependentDefinition.isStaticMember()) { enqueueRootItem(holder, entry.getValue()); // Enough to enqueue the known holder once.