commit cfd6dac527582b4cff778e7aad764757a600bc02
author Mikaël Peltier <mikaelpeltier@google.com> Tue Oct 10 13:45:55 2017 +0200
committer Mikaël Peltier <mikaelpeltier@google.com> Tue Oct 10 13:45:55 2017 +0200
tree 65eb2efa045144bbab27d1f94a619a431d64c639
parent 4a6ba29e652971baecd8db7fe7b38f2879b1a4fb

Add const-method-type support

Bug: 64891562
Change-Id: I889bf673cc942c0710dd9847b2074375690c96a6

src/test/examplesAndroidP/invokecustom/InvokeCustom.java

diff --git a/src/test/examplesAndroidP/invokecustom/InvokeCustom.java b/src/test/examplesAndroidP/invokecustom/InvokeCustom.java
index 282b5ae..e8447a3 100644
--- a/src/test/examplesAndroidP/invokecustom/InvokeCustom.java
+++ b/src/test/examplesAndroidP/invokecustom/InvokeCustom.java
@@ -24,11 +24,15 @@
     System.out.println(mhGetStatic.invoke());
   }
 
+  private static void targetMethodTest3(MethodType mt)
+      throws Throwable {
+    System.out.println("MethodType: " + mt.toString());
+  }
+
   public static CallSite bsmLookupStatic(MethodHandles.Lookup caller, String name, MethodType type)
       throws NoSuchMethodException, IllegalAccessException {
     final MethodHandles.Lookup lookup = MethodHandles.lookup();
     final MethodHandle targetMH = lookup.findStatic(lookup.lookupClass(), name, type);
     return new ConstantCallSite(targetMH.asType(type));
   }
-
 }

src/test/examplesAndroidP/invokecustom/TestGenerator.java

diff --git a/src/test/examplesAndroidP/invokecustom/TestGenerator.java b/src/test/examplesAndroidP/invokecustom/TestGenerator.java
index b9a5126..375dc34 100644
--- a/src/test/examplesAndroidP/invokecustom/TestGenerator.java
+++ b/src/test/examplesAndroidP/invokecustom/TestGenerator.java
@@ -43,6 +43,7 @@
           @Override
           public void visitEnd() {
             generateMethodTest1(cw);
+            generateMethodTest2(cw);
             generateMethodMain(cw);
             super.visitEnd();
           }
@@ -56,6 +57,8 @@
             Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC, "main", "([Ljava/lang/String;)V", null, null);
     mv.visitMethodInsn(
         Opcodes.INVOKESTATIC, Type.getInternalName(InvokeCustom.class), "test1", "()V", false);
+    mv.visitMethodInsn(
+        Opcodes.INVOKESTATIC, Type.getInternalName(InvokeCustom.class), "test2", "()V", false);
     mv.visitInsn(Opcodes.RETURN);
     mv.visitMaxs(-1, -1);
   }
@@ -81,4 +84,22 @@
     mv.visitInsn(Opcodes.RETURN);
     mv.visitMaxs(-1, -1);
   }
+
+  /**
+   *  Generate test with an invokedynamic, a static bootstrap method without extra args and
+   *  args to the target method.
+   */
+  private void generateMethodTest2(ClassVisitor cv) {
+    MethodVisitor mv = cv.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_STATIC, "test2", "()V",
+        null, null);
+    MethodType mt = MethodType.methodType(
+        CallSite.class, MethodHandles.Lookup.class, String.class, MethodType.class);
+    Handle bootstrap = new Handle( Opcodes.H_INVOKESTATIC, Type.getInternalName(InvokeCustom.class),
+        "bsmLookupStatic", mt.toMethodDescriptorString(), false);
+    mv.visitLdcInsn(Type.getMethodType("(ZBSCIFJDLjava/lang/String;)Ljava/lang/Object;"));
+    mv.visitInvokeDynamicInsn("targetMethodTest3", "(Ljava/lang/invoke/MethodType;)V",
+        bootstrap);
+    mv.visitInsn(Opcodes.RETURN);
+    mv.visitMaxs(-1, -1);
+  }
 }