Complete dex/isInvoke with InvokeCustom and InvokeCustomRange.
Change-Id: Iea8c24b86f3f0084e4f7b915b1a513337d60658f
diff --git a/src/main/java/com/android/tools/r8/ir/conversion/DexSourceCode.java b/src/main/java/com/android/tools/r8/ir/conversion/DexSourceCode.java
index 373949e..53750d6 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/DexSourceCode.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/DexSourceCode.java
@@ -9,6 +9,8 @@
import com.android.tools.r8.code.FilledNewArray;
import com.android.tools.r8.code.FilledNewArrayRange;
import com.android.tools.r8.code.Instruction;
+import com.android.tools.r8.code.InvokeCustom;
+import com.android.tools.r8.code.InvokeCustomRange;
import com.android.tools.r8.code.InvokeDirect;
import com.android.tools.r8.code.InvokeDirectRange;
import com.android.tools.r8.code.InvokeInterface;
@@ -330,7 +332,9 @@
}
private boolean isInvoke(Instruction dex) {
- return dex instanceof InvokeDirect
+ return dex instanceof InvokeCustom
+ || dex instanceof InvokeCustomRange
+ || dex instanceof InvokeDirect
|| dex instanceof InvokeDirectRange
|| dex instanceof InvokeVirtual
|| dex instanceof InvokeVirtualRange