commit 98459da53afea00b67cd72106c86e65b89c42263
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Aug 19 16:17:22 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Aug 19 16:17:22 2019 +0200
tree f0f26634cbad7455f98dcebd14c38737dfa4b499
parent c8785efaf448967838de4b1b6a0afea7d4ea5b74

Fix incorrect assertion in vertical class merger

Change-Id: I9a5b79514c06fd9f66eccfb34956ad09173a7b57

src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java

diff --git a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
index b9ac49b..cf89715 100644
--- a/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
+++ b/src/main/java/com/android/tools/r8/shaking/VerticalClassMerger.java
@@ -697,7 +697,8 @@
           // can be mapped to the implementation method.
           DexMethod implementationMethod =
               ((SynthesizedBridgeCode) encodedMethod.getCode()).invocationTarget;
-          DexMethod originalImplementationMethod = graphLense.getOriginalMethodSignature(method);
+          DexMethod originalImplementationMethod =
+              graphLense.getOriginalMethodSignature(implementationMethod);
           assert originalMethod == originalImplementationMethod;
           assert implementationMethod == renamedMethod;
         } else {