From 5e86980fa0248cd94012416eda7fee581245f52a Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Fri, 20 Oct 2017 12:33:19 -0700 Subject: rebuilt internal dependencies --- bcel-builder/testsrc/Play.java | 84 --------------------- .../testsrc/org/aspectj/apache/bcel/util/Play.java | 84 +++++++++++++++++++++ lib/asm/asm-6.0_BETA.renamed.jar | Bin 58333 -> 58155 bytes lib/asm/build.xml | 2 +- lib/bcel/bcel-verifier.jar | Bin 166985 -> 166985 bytes lib/bcel/bcel.jar | Bin 319621 -> 319691 bytes lib/build/build.jar | Bin 163040 -> 163031 bytes lib/test/aspectjrt.jar | Bin 118776 -> 118779 bytes tests/bugs190/modules/aaa/com/foo1/C1.java | 3 + tests/bugs190/modules/aaa/module-info.java | 3 + tests/bugs190/modules/bbb/aaa/bbb/A.java | 7 ++ tests/bugs190/modules/bbb/module-info.java | 3 + tests/bugs190/modules/ccc/InvokeA.java | 6 ++ tests/bugs190/modules/ccc/aaa/bbb/A.java | 7 ++ tests/bugs190/modules/ccc/module-info.java | 3 + tests/bugs190/modules/ddd/InvokeA.java | 6 ++ tests/bugs190/modules/ddd/aaa/bbb/A.java | 7 ++ tests/bugs190/modules/ddd/module-info.java | 2 + tests/bugs190/modules/eee/Azpect.java | 7 ++ tests/bugs190/modules/eee/aaa/bbb/A.java | 7 ++ tests/bugs190/modules/eee/module-info.java | 3 + tests/bugs190/modules/fff/aspects.jar | Bin 0 -> 1512 bytes tests/bugs190/modules/fff/demo.jar | Bin 0 -> 2394 bytes tests/bugs190/modules/fff/extra/AnotherAzpect.java | 7 ++ tests/bugs190/modules/fff/module-info.java | 4 + tests/bugs190/modules/fff/newdemo.jar | Bin 0 -> 2455 bytes tests/bugs190/modules/fff/otherpkg/Azpect.java | 7 ++ tests/bugs190/modules/fff/pkg/Demo.java | 6 ++ tests/bugs190/modules/module1/a/b/c/Code.class | Bin 425 -> 0 bytes tests/bugs190/modules/module1/module-info.class | Bin 124 -> 0 bytes 30 files changed, 173 insertions(+), 85 deletions(-) delete mode 100644 bcel-builder/testsrc/Play.java create mode 100644 bcel-builder/testsrc/org/aspectj/apache/bcel/util/Play.java create mode 100644 tests/bugs190/modules/aaa/com/foo1/C1.java create mode 100644 tests/bugs190/modules/aaa/module-info.java create mode 100644 tests/bugs190/modules/bbb/aaa/bbb/A.java create mode 100644 tests/bugs190/modules/bbb/module-info.java create mode 100644 tests/bugs190/modules/ccc/InvokeA.java create mode 100644 tests/bugs190/modules/ccc/aaa/bbb/A.java create mode 100644 tests/bugs190/modules/ccc/module-info.java create mode 100644 tests/bugs190/modules/ddd/InvokeA.java create mode 100644 tests/bugs190/modules/ddd/aaa/bbb/A.java create mode 100644 tests/bugs190/modules/ddd/module-info.java create mode 100644 tests/bugs190/modules/eee/Azpect.java create mode 100644 tests/bugs190/modules/eee/aaa/bbb/A.java create mode 100644 tests/bugs190/modules/eee/module-info.java create mode 100644 tests/bugs190/modules/fff/aspects.jar create mode 100644 tests/bugs190/modules/fff/demo.jar create mode 100644 tests/bugs190/modules/fff/extra/AnotherAzpect.java create mode 100644 tests/bugs190/modules/fff/module-info.java create mode 100644 tests/bugs190/modules/fff/newdemo.jar create mode 100644 tests/bugs190/modules/fff/otherpkg/Azpect.java create mode 100644 tests/bugs190/modules/fff/pkg/Demo.java delete mode 100644 tests/bugs190/modules/module1/a/b/c/Code.class delete mode 100644 tests/bugs190/modules/module1/module-info.class diff --git a/bcel-builder/testsrc/Play.java b/bcel-builder/testsrc/Play.java deleted file mode 100644 index 9fef2fa6c..000000000 --- a/bcel-builder/testsrc/Play.java +++ /dev/null @@ -1,84 +0,0 @@ -import java.io.File; -import java.io.FileInputStream; - -import org.aspectj.apache.bcel.classfile.Attribute; -import org.aspectj.apache.bcel.classfile.ClassParser; -import org.aspectj.apache.bcel.classfile.Field; -import org.aspectj.apache.bcel.classfile.JavaClass; -import org.aspectj.apache.bcel.classfile.Method; -import org.aspectj.apache.bcel.classfile.Unknown; -import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnos; - - -public class Play { - - public static void printBytes(byte[] bs) { - StringBuilder sb = new StringBuilder("Bytes:"+bs.length+"["); - for (int i=0;i0) sb.append(" "); - sb.append(bs[i]); - } - sb.append("]"); - System.out.println(sb); - } - - public static void main(String[] args) throws Exception { - if (args==null || args.length==0 ) { - System.out.println("Specify a file"); - return; - } - if (!args[0].endsWith(".class")) { - args[0] = args[0]+".class"; - } - FileInputStream fis = new FileInputStream(new File(args[0])); - ClassParser cp = new ClassParser(fis,args[0]); - JavaClass jc = cp.parse(); - Attribute[] attributes = jc.getAttributes(); - printUsefulAttributes(attributes); - System.out.println("Fields"); - Field[] fs = jc.getFields(); - if (fs!=null) { - for (Field f: fs) { - System.out.println(f); - printUsefulAttributes(f.getAttributes()); - } - } - System.out.println("Methods"); - Method[] ms = jc.getMethods(); - if (ms!=null) { - for (Method m: ms) { - System.out.println(m); - printUsefulAttributes(m.getAttributes()); - System.out.println("Code attributes:"); - printUsefulAttributes(m.getCode().getAttributes()); - } - } -// Method[] ms = jc.getMethods(); -// for (Method m: ms) { -// System.out.println("=========="); -// System.out.println("Method: "+m.getName()+" modifiers=0x"+Integer.toHexString(m.getModifiers())); -// Attribute[] as = m.getAttributes(); -// for (Attribute a: as) { -// if (a.getName().toLowerCase().contains("synthetic")) { -// System.out.println("> "+a.getName()); -// } -// } -// } - } - - private static void printUsefulAttributes(Attribute[] attributes) throws Exception { - for (Attribute attribute: attributes) { - String n = attribute.getName(); - if (n.equals("RuntimeInvisibleAnnotations") || - n.equals("RuntimeVisibleAnnotations")) { - RuntimeAnnos ra = (RuntimeAnnos)attribute; - // private byte[] annotation_data; - java.lang.reflect.Field f = RuntimeAnnos.class.getDeclaredField("annotation_data"); - f.setAccessible(true); - byte[] bs = (byte[])f.get(ra); -// byte[] bs = unknown.getBytes(); - printBytes(bs); - } - } - } -} diff --git a/bcel-builder/testsrc/org/aspectj/apache/bcel/util/Play.java b/bcel-builder/testsrc/org/aspectj/apache/bcel/util/Play.java new file mode 100644 index 000000000..9fef2fa6c --- /dev/null +++ b/bcel-builder/testsrc/org/aspectj/apache/bcel/util/Play.java @@ -0,0 +1,84 @@ +import java.io.File; +import java.io.FileInputStream; + +import org.aspectj.apache.bcel.classfile.Attribute; +import org.aspectj.apache.bcel.classfile.ClassParser; +import org.aspectj.apache.bcel.classfile.Field; +import org.aspectj.apache.bcel.classfile.JavaClass; +import org.aspectj.apache.bcel.classfile.Method; +import org.aspectj.apache.bcel.classfile.Unknown; +import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnos; + + +public class Play { + + public static void printBytes(byte[] bs) { + StringBuilder sb = new StringBuilder("Bytes:"+bs.length+"["); + for (int i=0;i0) sb.append(" "); + sb.append(bs[i]); + } + sb.append("]"); + System.out.println(sb); + } + + public static void main(String[] args) throws Exception { + if (args==null || args.length==0 ) { + System.out.println("Specify a file"); + return; + } + if (!args[0].endsWith(".class")) { + args[0] = args[0]+".class"; + } + FileInputStream fis = new FileInputStream(new File(args[0])); + ClassParser cp = new ClassParser(fis,args[0]); + JavaClass jc = cp.parse(); + Attribute[] attributes = jc.getAttributes(); + printUsefulAttributes(attributes); + System.out.println("Fields"); + Field[] fs = jc.getFields(); + if (fs!=null) { + for (Field f: fs) { + System.out.println(f); + printUsefulAttributes(f.getAttributes()); + } + } + System.out.println("Methods"); + Method[] ms = jc.getMethods(); + if (ms!=null) { + for (Method m: ms) { + System.out.println(m); + printUsefulAttributes(m.getAttributes()); + System.out.println("Code attributes:"); + printUsefulAttributes(m.getCode().getAttributes()); + } + } +// Method[] ms = jc.getMethods(); +// for (Method m: ms) { +// System.out.println("=========="); +// System.out.println("Method: "+m.getName()+" modifiers=0x"+Integer.toHexString(m.getModifiers())); +// Attribute[] as = m.getAttributes(); +// for (Attribute a: as) { +// if (a.getName().toLowerCase().contains("synthetic")) { +// System.out.println("> "+a.getName()); +// } +// } +// } + } + + private static void printUsefulAttributes(Attribute[] attributes) throws Exception { + for (Attribute attribute: attributes) { + String n = attribute.getName(); + if (n.equals("RuntimeInvisibleAnnotations") || + n.equals("RuntimeVisibleAnnotations")) { + RuntimeAnnos ra = (RuntimeAnnos)attribute; + // private byte[] annotation_data; + java.lang.reflect.Field f = RuntimeAnnos.class.getDeclaredField("annotation_data"); + f.setAccessible(true); + byte[] bs = (byte[])f.get(ra); +// byte[] bs = unknown.getBytes(); + printBytes(bs); + } + } + } +} diff --git a/lib/asm/asm-6.0_BETA.renamed.jar b/lib/asm/asm-6.0_BETA.renamed.jar index 9fbae494b..680ab7733 100644 Binary files a/lib/asm/asm-6.0_BETA.renamed.jar and b/lib/asm/asm-6.0_BETA.renamed.jar differ diff --git a/lib/asm/build.xml b/lib/asm/build.xml index 07a5e9863..5f9693b56 100644 --- a/lib/asm/build.xml +++ b/lib/asm/build.xml @@ -5,7 +5,7 @@ - + diff --git a/lib/bcel/bcel-verifier.jar b/lib/bcel/bcel-verifier.jar index 724cb9b99..0153468a9 100644 Binary files a/lib/bcel/bcel-verifier.jar and b/lib/bcel/bcel-verifier.jar differ diff --git a/lib/bcel/bcel.jar b/lib/bcel/bcel.jar index 38ecbc51f..acadafd3e 100644 Binary files a/lib/bcel/bcel.jar and b/lib/bcel/bcel.jar differ diff --git a/lib/build/build.jar b/lib/build/build.jar index 8a6f93714..a203ada4c 100644 Binary files a/lib/build/build.jar and b/lib/build/build.jar differ diff --git a/lib/test/aspectjrt.jar b/lib/test/aspectjrt.jar index ef06aa7fd..f0c7d5f7c 100644 Binary files a/lib/test/aspectjrt.jar and b/lib/test/aspectjrt.jar differ diff --git a/tests/bugs190/modules/aaa/com/foo1/C1.java b/tests/bugs190/modules/aaa/com/foo1/C1.java new file mode 100644 index 000000000..eb087840d --- /dev/null +++ b/tests/bugs190/modules/aaa/com/foo1/C1.java @@ -0,0 +1,3 @@ +package com.foo1; + +public class C1 {} diff --git a/tests/bugs190/modules/aaa/module-info.java b/tests/bugs190/modules/aaa/module-info.java new file mode 100644 index 000000000..b6bd69405 --- /dev/null +++ b/tests/bugs190/modules/aaa/module-info.java @@ -0,0 +1,3 @@ +module e.f.g { + exports com.foo1; +} diff --git a/tests/bugs190/modules/bbb/aaa/bbb/A.java b/tests/bugs190/modules/bbb/aaa/bbb/A.java new file mode 100644 index 000000000..09935dc54 --- /dev/null +++ b/tests/bugs190/modules/bbb/aaa/bbb/A.java @@ -0,0 +1,7 @@ +package aaa.bbb; + +public class A { + public static void main(String []argv) { + System.out.println("A running"); + } +} diff --git a/tests/bugs190/modules/bbb/module-info.java b/tests/bugs190/modules/bbb/module-info.java new file mode 100644 index 000000000..60e9fdc99 --- /dev/null +++ b/tests/bugs190/modules/bbb/module-info.java @@ -0,0 +1,3 @@ +module my.module { + exports aaa.bbb; +} diff --git a/tests/bugs190/modules/ccc/InvokeA.java b/tests/bugs190/modules/ccc/InvokeA.java new file mode 100644 index 000000000..5c07384e9 --- /dev/null +++ b/tests/bugs190/modules/ccc/InvokeA.java @@ -0,0 +1,6 @@ +import aaa.bbb.A; +public class InvokeA { + public static void main(String[] argv) { + A.main(argv); + } +} diff --git a/tests/bugs190/modules/ccc/aaa/bbb/A.java b/tests/bugs190/modules/ccc/aaa/bbb/A.java new file mode 100644 index 000000000..09935dc54 --- /dev/null +++ b/tests/bugs190/modules/ccc/aaa/bbb/A.java @@ -0,0 +1,7 @@ +package aaa.bbb; + +public class A { + public static void main(String []argv) { + System.out.println("A running"); + } +} diff --git a/tests/bugs190/modules/ccc/module-info.java b/tests/bugs190/modules/ccc/module-info.java new file mode 100644 index 000000000..60e9fdc99 --- /dev/null +++ b/tests/bugs190/modules/ccc/module-info.java @@ -0,0 +1,3 @@ +module my.module { + exports aaa.bbb; +} diff --git a/tests/bugs190/modules/ddd/InvokeA.java b/tests/bugs190/modules/ddd/InvokeA.java new file mode 100644 index 000000000..5c07384e9 --- /dev/null +++ b/tests/bugs190/modules/ddd/InvokeA.java @@ -0,0 +1,6 @@ +import aaa.bbb.A; +public class InvokeA { + public static void main(String[] argv) { + A.main(argv); + } +} diff --git a/tests/bugs190/modules/ddd/aaa/bbb/A.java b/tests/bugs190/modules/ddd/aaa/bbb/A.java new file mode 100644 index 000000000..09935dc54 --- /dev/null +++ b/tests/bugs190/modules/ddd/aaa/bbb/A.java @@ -0,0 +1,7 @@ +package aaa.bbb; + +public class A { + public static void main(String []argv) { + System.out.println("A running"); + } +} diff --git a/tests/bugs190/modules/ddd/module-info.java b/tests/bugs190/modules/ddd/module-info.java new file mode 100644 index 000000000..57dd04566 --- /dev/null +++ b/tests/bugs190/modules/ddd/module-info.java @@ -0,0 +1,2 @@ +module my.module { +} diff --git a/tests/bugs190/modules/eee/Azpect.java b/tests/bugs190/modules/eee/Azpect.java new file mode 100644 index 000000000..5dd4aa342 --- /dev/null +++ b/tests/bugs190/modules/eee/Azpect.java @@ -0,0 +1,7 @@ +package aspects; + +public aspect Azpect { + before(): execution(* main(..)) { + System.out.println("Azpect running"); + } +} diff --git a/tests/bugs190/modules/eee/aaa/bbb/A.java b/tests/bugs190/modules/eee/aaa/bbb/A.java new file mode 100644 index 000000000..09935dc54 --- /dev/null +++ b/tests/bugs190/modules/eee/aaa/bbb/A.java @@ -0,0 +1,7 @@ +package aaa.bbb; + +public class A { + public static void main(String []argv) { + System.out.println("A running"); + } +} diff --git a/tests/bugs190/modules/eee/module-info.java b/tests/bugs190/modules/eee/module-info.java new file mode 100644 index 000000000..60e9fdc99 --- /dev/null +++ b/tests/bugs190/modules/eee/module-info.java @@ -0,0 +1,3 @@ +module my.module { + exports aaa.bbb; +} diff --git a/tests/bugs190/modules/fff/aspects.jar b/tests/bugs190/modules/fff/aspects.jar new file mode 100644 index 000000000..246cab5f5 Binary files /dev/null and b/tests/bugs190/modules/fff/aspects.jar differ diff --git a/tests/bugs190/modules/fff/demo.jar b/tests/bugs190/modules/fff/demo.jar new file mode 100644 index 000000000..f00e0337d Binary files /dev/null and b/tests/bugs190/modules/fff/demo.jar differ diff --git a/tests/bugs190/modules/fff/extra/AnotherAzpect.java b/tests/bugs190/modules/fff/extra/AnotherAzpect.java new file mode 100644 index 000000000..16b8c16d6 --- /dev/null +++ b/tests/bugs190/modules/fff/extra/AnotherAzpect.java @@ -0,0 +1,7 @@ +package extra; + +public aspect AnotherAzpect { + before(): execution(* *(..)) && !within(*Azpect) { + System.out.println("AnotherAzpect running"); + } +} diff --git a/tests/bugs190/modules/fff/module-info.java b/tests/bugs190/modules/fff/module-info.java new file mode 100644 index 000000000..6f03752e8 --- /dev/null +++ b/tests/bugs190/modules/fff/module-info.java @@ -0,0 +1,4 @@ +module demo { + exports pkg; + requires org.aspectj.runtime; +} diff --git a/tests/bugs190/modules/fff/newdemo.jar b/tests/bugs190/modules/fff/newdemo.jar new file mode 100644 index 000000000..c32ca378a Binary files /dev/null and b/tests/bugs190/modules/fff/newdemo.jar differ diff --git a/tests/bugs190/modules/fff/otherpkg/Azpect.java b/tests/bugs190/modules/fff/otherpkg/Azpect.java new file mode 100644 index 000000000..af53fdf49 --- /dev/null +++ b/tests/bugs190/modules/fff/otherpkg/Azpect.java @@ -0,0 +1,7 @@ +package otherpkg; + +public aspect Azpect { + before(): execution(* *(..)) && !within(Azpect) { + System.out.println("Azpect running"); + } +} diff --git a/tests/bugs190/modules/fff/pkg/Demo.java b/tests/bugs190/modules/fff/pkg/Demo.java new file mode 100644 index 000000000..694595053 --- /dev/null +++ b/tests/bugs190/modules/fff/pkg/Demo.java @@ -0,0 +1,6 @@ +package pkg; +public class Demo { + public static void main(String[] argv) { + System.out.println("Demo running"); + } +} diff --git a/tests/bugs190/modules/module1/a/b/c/Code.class b/tests/bugs190/modules/module1/a/b/c/Code.class deleted file mode 100644 index 5d5e514b8..000000000 Binary files a/tests/bugs190/modules/module1/a/b/c/Code.class and /dev/null differ diff --git a/tests/bugs190/modules/module1/module-info.class b/tests/bugs190/modules/module1/module-info.class deleted file mode 100644 index 0088bd13a..000000000 Binary files a/tests/bugs190/modules/module1/module-info.class and /dev/null differ -- cgit v1.2.3