aboutsummaryrefslogtreecommitdiffstats
path: root/weaver
diff options
context:
space:
mode:
Diffstat (limited to 'weaver')
-rw-r--r--weaver/testdata/StaticEnclosingTjpBeforeHelloWorld.txt4
-rw-r--r--weaver/testdata/StaticTjpBeforeHelloWorld.txt8
-rw-r--r--weaver/testdata/TjpAround2HelloWorld.txt8
-rw-r--r--weaver/testdata/TjpAroundHelloWorld.txt8
-rw-r--r--weaver/testdata/TjpBeforeHelloWorld.txt8
-rw-r--r--weaver/testdata/TraceJarHello.txt20
-rw-r--r--weaver/testdata/dummyAspect.jarbin594 -> 613 bytes
-rw-r--r--weaver/testdata/megatrace.jarbin4933 -> 3777 bytes
-rw-r--r--weaver/testdata/megatrace0easy.jarbin2895 -> 3039 bytes
-rw-r--r--weaver/testdata/megatrace0hard.jarbin2795 -> 2940 bytes
-rw-r--r--weaver/testdata/megatraceNoweave.jarbin2734 -> 2832 bytes
-rw-r--r--weaver/testdata/tracing.jarbin2301 -> 2406 bytes
-rw-r--r--weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java6
-rw-r--r--weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java2
14 files changed, 33 insertions, 31 deletions
diff --git a/weaver/testdata/StaticEnclosingTjpBeforeHelloWorld.txt b/weaver/testdata/StaticEnclosingTjpBeforeHelloWorld.txt
index 985dca28a..da186fc4f 100644
--- a/weaver/testdata/StaticEnclosingTjpBeforeHelloWorld.txt
+++ b/weaver/testdata/StaticEnclosingTjpBeforeHelloWorld.txt
@@ -1,6 +1,6 @@
public class HelloWorld extends java.lang.Object:
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
public void <init>():
ALOAD_0 // HelloWorld this (line 5)
INVOKESPECIAL java.lang.Object.<init> ()V
diff --git a/weaver/testdata/StaticTjpBeforeHelloWorld.txt b/weaver/testdata/StaticTjpBeforeHelloWorld.txt
index 70ad24125..84bc0a284 100644
--- a/weaver/testdata/StaticTjpBeforeHelloWorld.txt
+++ b/weaver/testdata/StaticTjpBeforeHelloWorld.txt
@@ -1,8 +1,8 @@
public class HelloWorld extends java.lang.Object:
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_2
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_3
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_2
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_3
public void <init>():
ALOAD_0 // HelloWorld this (line 5)
INVOKESPECIAL java.lang.Object.<init> ()V
diff --git a/weaver/testdata/TjpAround2HelloWorld.txt b/weaver/testdata/TjpAround2HelloWorld.txt
index 3531db917..355f5cbbd 100644
--- a/weaver/testdata/TjpAround2HelloWorld.txt
+++ b/weaver/testdata/TjpAround2HelloWorld.txt
@@ -1,8 +1,8 @@
public class HelloWorld extends java.lang.Object:
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_2
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_3
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_2
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_3
public void <init>():
ALOAD_0 // HelloWorld this (line 5)
INVOKESPECIAL java.lang.Object.<init> ()V
diff --git a/weaver/testdata/TjpAroundHelloWorld.txt b/weaver/testdata/TjpAroundHelloWorld.txt
index 65ca8bc5e..6cb565f84 100644
--- a/weaver/testdata/TjpAroundHelloWorld.txt
+++ b/weaver/testdata/TjpAroundHelloWorld.txt
@@ -1,8 +1,8 @@
public class HelloWorld extends java.lang.Object:
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_2
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_3
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_2
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_3
public void <init>():
ALOAD_0 // HelloWorld this (line 5)
INVOKESPECIAL java.lang.Object.<init> ()V
diff --git a/weaver/testdata/TjpBeforeHelloWorld.txt b/weaver/testdata/TjpBeforeHelloWorld.txt
index ce462ec68..47fdec6bc 100644
--- a/weaver/testdata/TjpBeforeHelloWorld.txt
+++ b/weaver/testdata/TjpBeforeHelloWorld.txt
@@ -1,8 +1,8 @@
public class HelloWorld extends java.lang.Object:
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_2
- public static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_3
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_0
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_1
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_2
+ private static final org.aspectj.lang.JoinPoint$StaticPart ajc$tjp_3
public void <init>():
ALOAD_0 // HelloWorld this (line 5)
INVOKESPECIAL java.lang.Object.<init> ()V
diff --git a/weaver/testdata/TraceJarHello.txt b/weaver/testdata/TraceJarHello.txt
index 6be336249..f4e9cb084 100644
--- a/weaver/testdata/TraceJarHello.txt
+++ b/weaver/testdata/TraceJarHello.txt
@@ -44,7 +44,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List))
| INVOKESTATIC MyTrace.aspectOf ()LMyTrace;
| ALOAD_0
- | INVOKEVIRTUAL Trace.ajc$before$Trace$51 (Ljava/lang/Object;)V
+ | INVOKEVIRTUAL Trace.ajc$before$Trace$1$26352be2 (Ljava/lang/Object;)V
| ALOAD_0
| ALOAD_3
| ALOAD 4
@@ -58,12 +58,12 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
| INVOKESTATIC MyTrace.aspectOf ()LMyTrace;
| ALOAD_0
| ALOAD 5
- | INVOKEVIRTUAL MyTrace.ajc$afterReturning$MyTrace$6e (Ljava/lang/Object;Ljava/lang/Object;)V
+ | INVOKEVIRTUAL MyTrace.ajc$afterReturning$MyTrace$1$2b31dfa3 (Ljava/lang/Object;Ljava/lang/Object;)V
| ARETURN
method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List))
end String doit(String, java.util.List)
- static final String doit_aroundBody0(DynamicHelloWorld, String, java.util.List):
+ private static final String doit_aroundBody0(DynamicHelloWorld, String, java.util.List):
ALOAD_2 (line 21)
ALOAD_1
INVOKEINTERFACE java.util.List.add (Ljava/lang/Object;)Z
@@ -71,9 +71,9 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
ALOAD_2 (line 22)
INVOKEVIRTUAL java.lang.Object.toString ()Ljava/lang/String;
ARETURN
- end static final String doit_aroundBody0(DynamicHelloWorld, String, java.util.List)
+ end private static final String doit_aroundBody0(DynamicHelloWorld, String, java.util.List)
- static final Object doit_aroundBody1$advice(DynamicHelloWorld, String, java.util.List, Trace, Object, org.aspectj.runtime.internal.AroundClosure):
+ private static final Object doit_aroundBody1$advice(DynamicHelloWorld, String, java.util.List, Trace, Object, org.aspectj.runtime.internal.AroundClosure):
GETSTATIC java.lang.System.out Ljava/io/PrintStream; (line 17)
NEW java.lang.StringBuffer
DUP
@@ -104,9 +104,9 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
INVOKEVIRTUAL java.io.PrintStream.println (Ljava/lang/String;)V
ALOAD 6 (line 20)
ARETURN
- end static final Object doit_aroundBody1$advice(DynamicHelloWorld, String, java.util.List, Trace, Object, org.aspectj.runtime.internal.AroundClosure)
+ end private static final Object doit_aroundBody1$advice(DynamicHelloWorld, String, java.util.List, Trace, Object, org.aspectj.runtime.internal.AroundClosure)
- static final String doit_aroundBody2(DynamicHelloWorld, String, java.util.List):
+ private static final String doit_aroundBody2(DynamicHelloWorld, String, java.util.List):
ALOAD_0
ALOAD_1
ALOAD_2
@@ -116,9 +116,9 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
INVOKESTATIC DynamicHelloWorld.doit_aroundBody1$advice (LDynamicHelloWorld;Ljava/lang/String;Ljava/util/List;LTrace;Ljava/lang/Object;Lorg/aspectj/runtime/internal/AroundClosure;)Ljava/lang/Object;
CHECKCAST java.lang.String
ARETURN
- end static final String doit_aroundBody2(DynamicHelloWorld, String, java.util.List)
+ end private static final String doit_aroundBody2(DynamicHelloWorld, String, java.util.List)
- static final Object doit_aroundBody3$advice(DynamicHelloWorld, String, java.util.List, Trace, org.aspectj.runtime.internal.AroundClosure):
+ private static final Object doit_aroundBody3$advice(DynamicHelloWorld, String, java.util.List, Trace, org.aspectj.runtime.internal.AroundClosure):
LDC "Hi" (line 9)
ASTORE 5
GETSTATIC java.lang.System.out Ljava/io/PrintStream; (line 10)
@@ -148,5 +148,5 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
INVOKEVIRTUAL java.io.PrintStream.println (Ljava/lang/String;)V
ALOAD 6 (line 13)
ARETURN
- end static final Object doit_aroundBody3$advice(DynamicHelloWorld, String, java.util.List, Trace, org.aspectj.runtime.internal.AroundClosure)
+ end private static final Object doit_aroundBody3$advice(DynamicHelloWorld, String, java.util.List, Trace, org.aspectj.runtime.internal.AroundClosure)
end public class DynamicHelloWorld
diff --git a/weaver/testdata/dummyAspect.jar b/weaver/testdata/dummyAspect.jar
index 032cf2662..321efc4e4 100644
--- a/weaver/testdata/dummyAspect.jar
+++ b/weaver/testdata/dummyAspect.jar
Binary files differ
diff --git a/weaver/testdata/megatrace.jar b/weaver/testdata/megatrace.jar
index daf8d6029..31c8d0dc2 100644
--- a/weaver/testdata/megatrace.jar
+++ b/weaver/testdata/megatrace.jar
Binary files differ
diff --git a/weaver/testdata/megatrace0easy.jar b/weaver/testdata/megatrace0easy.jar
index 2589a616a..a7499e84d 100644
--- a/weaver/testdata/megatrace0easy.jar
+++ b/weaver/testdata/megatrace0easy.jar
Binary files differ
diff --git a/weaver/testdata/megatrace0hard.jar b/weaver/testdata/megatrace0hard.jar
index 0d65a46b4..114217106 100644
--- a/weaver/testdata/megatrace0hard.jar
+++ b/weaver/testdata/megatrace0hard.jar
Binary files differ
diff --git a/weaver/testdata/megatraceNoweave.jar b/weaver/testdata/megatraceNoweave.jar
index f44894c27..f51ebb94f 100644
--- a/weaver/testdata/megatraceNoweave.jar
+++ b/weaver/testdata/megatraceNoweave.jar
Binary files differ
diff --git a/weaver/testdata/tracing.jar b/weaver/testdata/tracing.jar
index a72e3c5be..93f0d578a 100644
--- a/weaver/testdata/tracing.jar
+++ b/weaver/testdata/tracing.jar
Binary files differ
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java
index 4e51ed2ad..955a893cd 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/MoveInstructionsWeaveTestCase.java
@@ -36,7 +36,9 @@ public class MoveInstructionsWeaveTestCase extends WeaveTestCase {
BcelShadow shadow = (BcelShadow) s;
LazyMethodGen newMethod =
shadow.extractMethod(
- shadow.getSignature().getExtractableName() + "_extracted");
+ shadow.getSignature().getExtractableName() + "_extracted",
+ 0,
+ this);
shadow.getRange().append(shadow.makeCallToCallback(newMethod));
if (!shadow.isFallsThrough()) {
@@ -58,7 +60,7 @@ public class MoveInstructionsWeaveTestCase extends WeaveTestCase {
}
public void implementOn(Shadow s) {
BcelShadow shadow = (BcelShadow) s;
- LazyMethodGen newMethod = shadow.extractMethod(shadow.getSignature().getExtractableName() + "_extracted" + counter++);
+ LazyMethodGen newMethod = shadow.extractMethod(shadow.getSignature().getExtractableName() + "_extracted" + counter++, 0, this);
shadow.getRange().append(shadow.makeCallToCallback(newMethod));
if (! shadow.isFallsThrough()) {
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
index 9048a9afc..64171b9ac 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveTestCase.java
@@ -154,7 +154,7 @@ public abstract class WeaveTestCase extends TestCase {
}
void realCheckClass(LazyClassGen gen, String outDir, String expectedFile) throws IOException {
- TestUtil.assertMultiLineStringEquals("classes",
+ TestUtil.assertMultiLineStringEquals(expectedFile/*"classes"*/,
FileUtil.readAsString(new File(TESTDATA_DIR, expectedFile)),
gen.toLongString());
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 18:26:40 +0000