From: Andy Clement Date: Mon, 19 Mar 2012 21:06:19 +0000 (-0700) Subject: additional test to show all joinpoints in code using indy X-Git-Tag: V1_7_0RC1~21 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5408b2446e12432486800cf5a35795ab8d942de3;p=aspectj.git additional test to show all joinpoints in code using indy --- diff --git a/tests/indy/four/Asp.java b/tests/indy/four/Asp.java new file mode 100644 index 000000000..78f86a302 --- /dev/null +++ b/tests/indy/four/Asp.java @@ -0,0 +1,6 @@ +aspect Aspect { + + before(): within(Code1) { + System.out.println(thisJoinPointStaticPart); + } +} diff --git a/tests/indy/four/Code1.java b/tests/indy/four/Code1.java new file mode 100644 index 000000000..2899340d2 --- /dev/null +++ b/tests/indy/four/Code1.java @@ -0,0 +1,21 @@ +import java.lang.invoke.CallSite; +import java.lang.invoke.ConstantCallSite; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; + +public class Code1 { + + // Called via invokedynamic from a generated class + private static void foo() { + System.out.println("foo() is running"); + } + + public static CallSite bootstrap(MethodHandles.Lookup caller, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException { + MethodHandles.Lookup lookup = MethodHandles.lookup(); + Class thisClass = lookup.lookupClass(); + MethodHandle mh = lookup.findStatic(thisClass, name, type); + return new ConstantCallSite(mh);//mh.asType(type)); + } + +} \ No newline at end of file diff --git a/tests/indy/four/Generator.java b/tests/indy/four/Generator.java new file mode 100644 index 000000000..77f1e1807 --- /dev/null +++ b/tests/indy/four/Generator.java @@ -0,0 +1,101 @@ + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.lang.invoke.CallSite; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; + +import org.objectweb.asm.*; + +public class Generator implements Opcodes { + + private String generatedRunnerTypename,linkClassName,dynMethodName,dynMethodDescriptor; + private byte[] bytes; + + /** + * Main entry point generates a default thing, in this case a class called 'Invoker' that will use the bootstrap method on Code1 to run 'foo()' + * @param args + * @throws Throwable + */ + public static void main(String[] args) throws Throwable { + Generator g = new Generator("Invoker","Code1","foo","()V"); + g.dump(); + } + + public byte[] getBytes() { + return bytes; + } + + public Generator(String generatedRunnerTypename, String linkClassName, String dynMethodName, String dynMethodDescriptor) { + this.generatedRunnerTypename = generatedRunnerTypename; + this.linkClassName = linkClassName; + this.dynMethodName = dynMethodName; + this.dynMethodDescriptor = dynMethodDescriptor; + this.bytes = generateClass(); + } + + public void dump() { + try { + FileOutputStream fos + = new FileOutputStream(new File(generatedRunnerTypename+".class")); + fos.write(bytes); + fos.close(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public byte[] generateClass() { + ClassWriter cw = new ClassWriter(0); + cw.visit(V1_7, ACC_PUBLIC + ACC_SUPER, generatedRunnerTypename, null, "java/lang/Object", null); + createConstructor(cw); + createMain(cw); + cw.visitEnd(); + return cw.toByteArray(); + } + + private void createMain(ClassWriter cw) { + MethodVisitor mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "main", "([Ljava/lang/String;)V", null, null); + mv.visitCode(); + MethodType mt = MethodType.methodType(CallSite.class, MethodHandles.Lookup.class, String.class, + MethodType.class); + Handle bootstrap = new Handle(Opcodes.H_INVOKESTATIC, this.linkClassName, "bootstrap", + mt.toMethodDescriptorString()); + int maxStackSize = 0;//addMethodParameters(mv); + mv.visitInvokeDynamicInsn(dynMethodName, dynMethodDescriptor, bootstrap); + mv.visitInsn(RETURN); + mv.visitMaxs(maxStackSize, 1); + mv.visitEnd(); + } + +// public byte[] dump(String dynamicInvokerClassName, String dynamicLinkageClassName, String bootstrapMethodName, String targetMethodDescriptor) +// throws Exception { +// ClassWriter cw = new ClassWriter(0); +// cw.visit(V1_7, ACC_PUBLIC + ACC_SUPER, dynamicInvokerClassName, null, "java/lang/Object", null); +// createConstructor(cw); +// createMain(dynamicLinkageClassName, bootstrapMethodName, targetMethodDescriptor, cw); +// cw.visitEnd(); +// return cw.toByteArray(); +// } + + + +// protected int addMethodParameters(MethodVisitor mv) { +// return 0; +// } + + + private void createConstructor(ClassWriter cw) { + MethodVisitor mv = cw.visitMethod(ACC_PUBLIC, "", "()V", null, null); + mv.visitCode(); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "", "()V"); + mv.visitInsn(RETURN); + mv.visitMaxs(1, 1); + mv.visitEnd(); + } +} \ No newline at end of file diff --git a/tests/indy/four/indy.jar b/tests/indy/four/indy.jar new file mode 100644 index 000000000..d6ec561f4 Binary files /dev/null and b/tests/indy/four/indy.jar differ diff --git a/tests/src/org/aspectj/systemtest/ajc170/IndyTests.java b/tests/src/org/aspectj/systemtest/ajc170/IndyTests.java index b967657ae..5846a66fd 100644 --- a/tests/src/org/aspectj/systemtest/ajc170/IndyTests.java +++ b/tests/src/org/aspectj/systemtest/ajc170/IndyTests.java @@ -36,6 +36,11 @@ public class IndyTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testInvokeDynamic_call() throws IOException { runTest("indy - 3"); } + + // within(Code1) on same bytecode + public void testInvokeDynamic_target() throws IOException { + runTest("indy - 4"); + } // --- diff --git a/tests/src/org/aspectj/systemtest/ajc170/indy.xml b/tests/src/org/aspectj/systemtest/ajc170/indy.xml index 3bb18608f..0c4bbe580 100644 --- a/tests/src/org/aspectj/systemtest/ajc170/indy.xml +++ b/tests/src/org/aspectj/systemtest/ajc170/indy.xml @@ -37,5 +37,23 @@ + + + + + + + + + + + + + + + + + +