commit cce35cd61db5108b63854edcd3f1f83c0109c023
author Jinseong Jeon <jsjeon@google.com> Sun Feb 10 17:46:18 2019 -0800
committer Jinseong Jeon <jsjeon@google.com> Sun Feb 10 17:46:18 2019 -0800
tree 251152eb00735b43160874a4ba195ade17eee7d7
parent 3f99ae761be27337dcca7b00098b01680499a667

Prevent NPE in GraphLense#verifyIsBridgeMethod.

Change-Id: Ia50c585a52d586a4e878e73decfea3abbbb42bdc

src/main/java/com/android/tools/r8/graph/GraphLense.java

diff --git a/src/main/java/com/android/tools/r8/graph/GraphLense.java b/src/main/java/com/android/tools/r8/graph/GraphLense.java
index bac74f6..5fd473f 100644
--- a/src/main/java/com/android/tools/r8/graph/GraphLense.java
+++ b/src/main/java/com/android/tools/r8/graph/GraphLense.java
@@ -724,6 +724,10 @@
       if (originalMethods.contains(targetMethod)) {
         return true;
       }
+      // Stop traversing upwards if we reach the Object.
+      if (holder == dexItemFactory.objectType) {
+        continue;
+      }
       DexClass clazz = originalApplication.definitionFor(holder);
       if (clazz != null) {
         worklist.add(clazz.superType);