Move interface method desugarings to the R8 enqueuer.
Bug: 183998768
Bug: 197613376
Fixes: 167345026
Fixes: 167535447
Fixes: 187377562
Fixes: 168697955
Fixes: 159987443
Fixes: 196345511
Fixes: 197851381
Change-Id: I5e605297e24aa20dbc04547a60807a93f646a630
diff --git a/src/test/examplesAndroidO/invokecustom/TestGenerator.java b/src/test/examplesAndroidO/invokecustom/TestGenerator.java
index 9964ed0..a4cd89a 100644
--- a/src/test/examplesAndroidO/invokecustom/TestGenerator.java
+++ b/src/test/examplesAndroidO/invokecustom/TestGenerator.java
@@ -21,6 +21,8 @@
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
+// TODO(b/167145686): Migrate these tests to the new setup ala
+// InvokeDynamicVirtualDispatchToDefaultInterfaceMethodTest
public class TestGenerator {
private final Path classNamePath;
@@ -52,7 +54,6 @@
generateMethodTest6(cw);
generateMethodTest7(cw);
generateMethodTest8(cw);
- generateMethodTest9(cw);
generateMethodTest10(cw);
generateMethodTest11(cw);
generateMethodTest12(cw);
@@ -89,8 +90,6 @@
mv.visitMethodInsn(
Opcodes.INVOKESTATIC, Type.getInternalName(InvokeCustom.class), "test8", "()V", false);
mv.visitMethodInsn(
- Opcodes.INVOKESTATIC, Type.getInternalName(InvokeCustom.class), "test9", "()V", false);
- mv.visitMethodInsn(
Opcodes.INVOKESTATIC, Type.getInternalName(InvokeCustom.class), "test10", "()V", false);
mv.visitMethodInsn(
Opcodes.INVOKESTATIC, Type.getInternalName(InvokeCustom.class), "test11", "()V", false);
@@ -280,29 +279,6 @@
/**
* Generate test with an invokedynamic, a static bootstrap method with an extra arg that is a
- * MethodHandle of kind invoke virtual. The target method is a method into a class implementing
- * an abstract method and that shadows a default method from an interface.
- */
- private void generateMethodTest9(ClassVisitor cv) {
- MethodVisitor mv = cv.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC, "test9", "()V",
- null, null);
- MethodType mt = MethodType.methodType(CallSite.class, MethodHandles.Lookup.class, String.class,
- MethodType.class, MethodHandle.class);
- Handle bootstrap = new Handle(Opcodes.H_INVOKESTATIC, Type.getInternalName(InvokeCustom.class),
- "bsmCreateCallSite", mt.toMethodDescriptorString(), false);
- mv.visitTypeInsn(Opcodes.NEW, Type.getInternalName(InvokeCustom.class));
- mv.visitInsn(Opcodes.DUP);
- mv.visitMethodInsn(
- Opcodes.INVOKESPECIAL, Type.getInternalName(InvokeCustom.class), "<init>", "()V", false);
- mv.visitInvokeDynamicInsn("targetMethodTest10", "(Linvokecustom/InvokeCustom;)V", bootstrap,
- new Handle(Opcodes.H_INVOKEVIRTUAL, Type.getInternalName(InvokeCustom.class),
- "targetMethodTest10", "()V", false));
- mv.visitInsn(Opcodes.RETURN);
- mv.visitMaxs(-1, -1);
- }
-
- /**
- * Generate test with an invokedynamic, a static bootstrap method with an extra arg that is a
* MethodHandle of kind get static. The method handle read a static field from a class.
*/
private void generateMethodTest10(ClassVisitor cv) {
