commit 50d846ce1dfb89870212ed43a1f2131aab7cfead
author Mikael Peltier <mikaelpeltier@google.com> Mon Aug 28 11:27:37 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 28 11:27:37 2017 +0000
tree c8a95deb3248ddefd0beada4acb814a4af15316a
parent 72c0f502c0a05e7ec4ff6b3e46be7fb5c0b91706
parent f35f1cefcfa6c6c2dcc0dc8f25b15775bf37a6bf

Merge "Add assert when reading invokespecial method handle"

src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java b/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java
index fdc4743..31201a2 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/JarSourceCode.java
@@ -2669,8 +2669,10 @@
       case Opcodes.H_PUTSTATIC:
         return MethodHandleType.STATIC_PUT;
       case Opcodes.H_INVOKESPECIAL:
+        assert !handle.getName().equals(Constants.INSTANCE_INITIALIZER_NAME);
+        assert !handle.getName().equals(Constants.CLASS_INITIALIZER_NAME);
         DexType owner = application.getTypeFromName(handle.getOwner());
-        if (owner == clazz || handle.getName().equals(Constants.INSTANCE_INITIALIZER_NAME)) {
+        if (owner == clazz) {
           return MethodHandleType.INVOKE_DIRECT;
         } else {
           return MethodHandleType.INVOKE_SUPER;