commit 2915431fa9edd32d92a8d8736b18fc942c9ddb0a
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Jan 27 12:07:12 2021 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Jan 27 11:42:25 2021 +0000
tree 70c954530fb04e721225ab51ff89c80b478008e8
parent 3f55d20964d9091b1cd1d0d814b3527339a45a61

Fix NPE from missing class in hierarchy during merging

Change-Id: I9d0647cf51ddba76e03f01f9e8d7d93675f39bcc

src/main/java/com/android/tools/r8/horizontalclassmerging/policies/PreventMethodImplementation.java

diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/policies/PreventMethodImplementation.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/policies/PreventMethodImplementation.java
index dcbd291..c7c57c8 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/policies/PreventMethodImplementation.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/policies/PreventMethodImplementation.java
@@ -79,7 +79,7 @@
 
     DexMethodSignatureSet getOrComputeSignatures(DexType type) {
       DexClass clazz = appView.definitionFor(type);
-      return clazz != null ? getOrComputeSignatures(clazz) : null;
+      return clazz != null ? getOrComputeSignatures(clazz) : DexMethodSignatureSet.create();
     }
   }