diff options
| author | aclement <aclement> | 2008-06-04 21:27:36 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2008-06-04 21:27:36 +0000 |
| commit | 5dd6c0eb63ad669253e64fcb969beac8b47794c0 (patch) | |
| tree | f4515ad31cee882974554bdc0976071da5e5c828 /weaver/testdata | |
| parent | 9c2055688d87b9d38c5705ce26334f4794ae84f2 (diff) | |
| download | aspectj-5dd6c0eb63ad669253e64fcb969beac8b47794c0.tar.gz aspectj-5dd6c0eb63ad669253e64fcb969beac8b47794c0.zip | |
231396: refactoring AspectJ: Due to PMD reported problem in Utility - had to change expected code
Diffstat (limited to 'weaver/testdata')
24 files changed, 367 insertions, 367 deletions
diff --git a/weaver/testdata/AddNotResidueDynamicHelloWorld.txt b/weaver/testdata/AddNotResidueDynamicHelloWorld.txt index ee151b164..d5aca544f 100644 --- a/weaver/testdata/AddNotResidueDynamicHelloWorld.txt +++ b/weaver/testdata/AddNotResidueDynamicHelloWorld.txt @@ -1,6 +1,6 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Serializable: public void <init>(): - ALOAD_0 // DynamicHelloWorld this (line 8) + ALOAD_0 // LDynamicHelloWorld; this (line 8) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void DynamicHelloWorld.<init>()) | RETURN @@ -27,7 +27,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | DUP | LDC "expected and caught: " | INVOKESPECIAL java.lang.StringBuffer.<init> (Ljava/lang/String;)V - | ALOAD_1 // java.lang.UnsupportedOperationException t + | ALOAD_1 // Ljava/lang/UnsupportedOperationException; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -48,8 +48,8 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria String doit(String, java.util.List): method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List)) - | ALOAD_2 // java.util.List l (line 21) - | ALOAD_1 // java.lang.String s + | ALOAD_2 // Ljava/util/List; l (line 21) + | ALOAD_1 // Ljava/lang/String; s | ASTORE_3 | ASTORE 4 | method-call(boolean java.util.List.add(java.lang.Object)) @@ -62,7 +62,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | | INVOKEINTERFACE java.util.List.add (Ljava/lang/Object;)Z | method-call(boolean java.util.List.add(java.lang.Object)) | POP - | ALOAD_2 // java.util.List l (line 22) + | ALOAD_2 // Ljava/util/List; l (line 22) | method-call(java.lang.String java.lang.Object.toString()) | | INVOKEVIRTUAL java.lang.Object.toString ()Ljava/lang/String; | method-call(java.lang.String java.lang.Object.toString()) diff --git a/weaver/testdata/AddResidueDynamicHelloWorld.txt b/weaver/testdata/AddResidueDynamicHelloWorld.txt index 0a8caefcf..7868251c6 100644 --- a/weaver/testdata/AddResidueDynamicHelloWorld.txt +++ b/weaver/testdata/AddResidueDynamicHelloWorld.txt @@ -1,6 +1,6 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Serializable: public void <init>(): - ALOAD_0 // DynamicHelloWorld this (line 8) + ALOAD_0 // LDynamicHelloWorld; this (line 8) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void DynamicHelloWorld.<init>()) | RETURN @@ -27,7 +27,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | DUP | LDC "expected and caught: " | INVOKESPECIAL java.lang.StringBuffer.<init> (Ljava/lang/String;)V - | ALOAD_1 // java.lang.UnsupportedOperationException t + | ALOAD_1 // Ljava/lang/UnsupportedOperationException; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -48,8 +48,8 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria String doit(String, java.util.List): method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List)) - | ALOAD_2 // java.util.List l (line 21) - | ALOAD_1 // java.lang.String s + | ALOAD_2 // Ljava/util/List; l (line 21) + | ALOAD_1 // Ljava/lang/String; s | ASTORE_3 | ASTORE 4 | method-call(boolean java.util.List.add(java.lang.Object)) @@ -62,7 +62,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | | INVOKEINTERFACE java.util.List.add (Ljava/lang/Object;)Z | method-call(boolean java.util.List.add(java.lang.Object)) | POP - | ALOAD_2 // java.util.List l (line 22) + | ALOAD_2 // Ljava/util/List; l (line 22) | method-call(java.lang.String java.lang.Object.toString()) | | INVOKEVIRTUAL java.lang.Object.toString ()Ljava/lang/String; | method-call(java.lang.String java.lang.Object.toString()) diff --git a/weaver/testdata/AddStateResidueDynamicHelloWorld.txt b/weaver/testdata/AddStateResidueDynamicHelloWorld.txt index 6bc8e2154..74a2ac059 100644 --- a/weaver/testdata/AddStateResidueDynamicHelloWorld.txt +++ b/weaver/testdata/AddStateResidueDynamicHelloWorld.txt @@ -1,6 +1,6 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Serializable: public void <init>(): - ALOAD_0 // DynamicHelloWorld this (line 8) + ALOAD_0 // LDynamicHelloWorld; this (line 8) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void DynamicHelloWorld.<init>()) | RETURN @@ -27,7 +27,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | DUP | LDC "expected and caught: " | INVOKESPECIAL java.lang.StringBuffer.<init> (Ljava/lang/String;)V - | ALOAD_1 // java.lang.UnsupportedOperationException t + | ALOAD_1 // Ljava/lang/UnsupportedOperationException; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -48,8 +48,8 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria String doit(String, java.util.List): method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List)) - | ALOAD_2 // java.util.List l (line 21) - | ALOAD_1 // java.lang.String s + | ALOAD_2 // Ljava/util/List; l (line 21) + | ALOAD_1 // Ljava/lang/String; s | ASTORE_3 | ASTORE 4 | method-call(boolean java.util.List.add(java.lang.Object)) @@ -64,7 +64,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | | INVOKEINTERFACE java.util.List.add (Ljava/lang/Object;)Z | method-call(boolean java.util.List.add(java.lang.Object)) | POP - | ALOAD_2 // java.util.List l (line 22) + | ALOAD_2 // Ljava/util/List; l (line 22) | method-call(java.lang.String java.lang.Object.toString()) | | INVOKEVIRTUAL java.lang.Object.toString ()Ljava/lang/String; | method-call(java.lang.String java.lang.Object.toString()) diff --git a/weaver/testdata/AroundAllAndOthersFancyHelloWorld.txt b/weaver/testdata/AroundAllAndOthersFancyHelloWorld.txt index dea1d2c63..6619dc2b8 100644 --- a/weaver/testdata/AroundAllAndOthersFancyHelloWorld.txt +++ b/weaver/testdata/AroundAllAndOthersFancyHelloWorld.txt @@ -1,14 +1,14 @@ public abstract class FancyHelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // FancyHelloWorld this (line 7) + ALOAD_0 // LFancyHelloWorld; this (line 7) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void FancyHelloWorld.<init>()) | INVOKESTATIC Aspect.ajc_before_constructor_execution ()V - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE_2 | ALOAD_2 - | BIPUSH 0 + | ICONST_0 | ALOAD_0 | AASTORE | NEW FancyHelloWorld$AjcClosure3 @@ -26,11 +26,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: ASTORE 19 method-execution(void FancyHelloWorld.main(java.lang.String[])) | INVOKESTATIC Aspect.ajc_before_method_execution ()V (line 9) - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 21 | ALOAD 21 - | BIPUSH 0 + | ICONST_0 | ALOAD 19 | AASTORE | NEW FancyHelloWorld$AjcClosure23 @@ -46,7 +46,7 @@ public abstract class FancyHelloWorld extends java.lang.Object: public static String getName(): method-execution(java.lang.String FancyHelloWorld.getName()) | INVOKESTATIC Aspect.ajc_before_method_execution ()V (line 20) - | BIPUSH 0 + | ICONST_0 | ANEWARRAY java.lang.Object | ASTORE 15 | NEW FancyHelloWorld$AjcClosure43 @@ -65,11 +65,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void init$_aroundBody2(FancyHelloWorld): INVOKESTATIC Aspect.ajc_before_constructor_execution ()V - BIPUSH 1 + ICONST_1 ANEWARRAY java.lang.Object ASTORE_1 ALOAD_1 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE NEW FancyHelloWorld$AjcClosure1 @@ -88,7 +88,7 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final java.io.PrintStream out_aroundBody6(): INVOKESTATIC Aspect.ajc_before_field_get ()V - BIPUSH 0 + ICONST_0 ANEWARRAY java.lang.Object ASTORE_0 NEW FancyHelloWorld$AjcClosure5 @@ -109,15 +109,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void println_aroundBody10(java.io.PrintStream, String): INVOKESTATIC Aspect.ajc_before_method_call ()V - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW FancyHelloWorld$AjcClosure9 @@ -138,15 +138,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void println_aroundBody14(java.io.PrintStream, Object): INVOKESTATIC Aspect.ajc_before_method_call ()V - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW FancyHelloWorld$AjcClosure13 @@ -167,15 +167,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void println_aroundBody18(java.io.PrintStream, String): INVOKESTATIC Aspect.ajc_before_method_call ()V - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW FancyHelloWorld$AjcClosure17 @@ -190,7 +190,7 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void main_aroundBody20(String[]): field-get(java.io.PrintStream java.lang.System.out) | INVOKESTATIC Aspect.ajc_before_field_get ()V - | BIPUSH 0 + | ICONST_0 | ANEWARRAY java.lang.Object | ASTORE_1 | NEW FancyHelloWorld$AjcClosure7 @@ -203,21 +203,21 @@ public abstract class FancyHelloWorld extends java.lang.Object: ASTORE_3 (line 9) finally -> E1 | catch java.lang.Exception -> E0 - | | ALOAD_3 // java.io.PrintStream out (line 11) + | | ALOAD_3 // Ljava/io/PrintStream; out (line 11) | | LDC "bye" | | ASTORE 5 | | ASTORE 7 | | method-call(void java.io.PrintStream.println(java.lang.String)) | | | INVOKESTATIC Aspect.ajc_before_method_call ()V - | | | BIPUSH 2 + | | | ICONST_2 | | | ANEWARRAY java.lang.Object | | | ASTORE 9 | | | ALOAD 9 - | | | BIPUSH 0 + | | | ICONST_0 | | | ALOAD 7 | | | AASTORE | | | ALOAD 9 - | | | BIPUSH 1 + | | | ICONST_1 | | | ALOAD 5 | | | AASTORE | | | NEW FancyHelloWorld$AjcClosure11 @@ -230,21 +230,21 @@ public abstract class FancyHelloWorld extends java.lang.Object: | | GOTO L0 | catch java.lang.Exception -> E0 | E0: ASTORE 11 (line 12) - | ALOAD_3 // java.io.PrintStream out (line 13) - | ALOAD 11 // java.lang.Exception e + | ALOAD_3 // Ljava/io/PrintStream; out (line 13) + | ALOAD 11 // Ljava/lang/Exception; e | ASTORE 13 | ASTORE 15 | method-call(void java.io.PrintStream.println(java.lang.Object)) | | INVOKESTATIC Aspect.ajc_before_method_call ()V - | | BIPUSH 2 + | | ICONST_2 | | ANEWARRAY java.lang.Object | | ASTORE 17 | | ALOAD 17 - | | BIPUSH 0 + | | ICONST_0 | | ALOAD 15 | | AASTORE | | ALOAD 17 - | | BIPUSH 1 + | | ICONST_1 | | ALOAD 13 | | AASTORE | | NEW FancyHelloWorld$AjcClosure15 @@ -263,21 +263,21 @@ public abstract class FancyHelloWorld extends java.lang.Object: L0: JSR L1 GOTO L2 L1: ASTORE 21 - ALOAD_3 // java.io.PrintStream out (line 15) + ALOAD_3 // Ljava/io/PrintStream; out (line 15) LDC "finally" ASTORE 23 ASTORE 25 method-call(void java.io.PrintStream.println(java.lang.String)) | INVOKESTATIC Aspect.ajc_before_method_call ()V - | BIPUSH 2 + | ICONST_2 | ANEWARRAY java.lang.Object | ASTORE 27 | ALOAD 27 - | BIPUSH 0 + | ICONST_0 | ALOAD 25 | AASTORE | ALOAD 27 - | BIPUSH 1 + | ICONST_1 | ALOAD 23 | AASTORE | NEW FancyHelloWorld$AjcClosure19 @@ -293,11 +293,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void main_aroundBody22(String[]): INVOKESTATIC Aspect.ajc_before_method_execution ()V (line 9) - BIPUSH 1 + ICONST_1 ANEWARRAY java.lang.Object ASTORE_1 ALOAD_1 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE NEW FancyHelloWorld$AjcClosure21 @@ -317,11 +317,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final int hashCode_aroundBody26(String): INVOKESTATIC Aspect.ajc_before_method_call ()V - BIPUSH 1 + ICONST_1 ANEWARRAY java.lang.Object ASTORE_1 ALOAD_1 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE NEW FancyHelloWorld$AjcClosure25 @@ -343,11 +343,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final StringBuffer init$_aroundBody30(String): INVOKESTATIC Aspect.ajc_before_constructor_call ()V - BIPUSH 1 + ICONST_1 ANEWARRAY java.lang.Object ASTORE_1 ALOAD_1 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE NEW FancyHelloWorld$AjcClosure29 @@ -368,15 +368,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final StringBuffer append_aroundBody34(StringBuffer, int): INVOKESTATIC Aspect.ajc_before_method_call ()V - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ILOAD_1 INVOKESTATIC org.aspectj.runtime.internal.Conversions.intObject (I)Ljava/lang/Object; AASTORE @@ -397,11 +397,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final String toString_aroundBody38(StringBuffer): INVOKESTATIC Aspect.ajc_before_method_call ()V - BIPUSH 1 + ICONST_1 ANEWARRAY java.lang.Object ASTORE_1 ALOAD_1 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE NEW FancyHelloWorld$AjcClosure37 @@ -416,16 +416,16 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final String getName_aroundBody40(): ICONST_0 (line 20) ISTORE_0 - ILOAD_0 // int x (line 21) + ILOAD_0 // I x (line 21) LDC "name" ASTORE_2 method-call(int java.lang.String.hashCode()) | INVOKESTATIC Aspect.ajc_before_method_call ()V - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 4 | ALOAD 4 - | BIPUSH 0 + | ICONST_0 | ALOAD_2 | AASTORE | NEW FancyHelloWorld$AjcClosure27 @@ -436,16 +436,16 @@ public abstract class FancyHelloWorld extends java.lang.Object: | INVOKESTATIC org.aspectj.runtime.internal.Conversions.intValue (Ljava/lang/Object;)I method-call(int java.lang.String.hashCode()) IADD - ISTORE_0 // int x + ISTORE_0 // I x LDC "name" (line 22) ASTORE 6 constructor-call(void java.lang.StringBuffer.<init>(java.lang.String)) | INVOKESTATIC Aspect.ajc_before_constructor_call ()V - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 8 | ALOAD 8 - | BIPUSH 0 + | ICONST_0 | ALOAD 6 | AASTORE | NEW FancyHelloWorld$AjcClosure31 @@ -455,20 +455,20 @@ public abstract class FancyHelloWorld extends java.lang.Object: | INVOKESTATIC Aspect.ajc_around (Lorg/aspectj/runtime/internal/AroundClosure;)Ljava/lang/Object; | CHECKCAST java.lang.StringBuffer constructor-call(void java.lang.StringBuffer.<init>(java.lang.String)) - ILOAD_0 // int x + ILOAD_0 // I x ISTORE 10 ASTORE 12 method-call(java.lang.StringBuffer java.lang.StringBuffer.append(int)) | INVOKESTATIC Aspect.ajc_before_method_call ()V - | BIPUSH 2 + | ICONST_2 | ANEWARRAY java.lang.Object | ASTORE 14 | ALOAD 14 - | BIPUSH 0 + | ICONST_0 | ALOAD 12 | AASTORE | ALOAD 14 - | BIPUSH 1 + | ICONST_1 | ILOAD 10 | INVOKESTATIC org.aspectj.runtime.internal.Conversions.intObject (I)Ljava/lang/Object; | AASTORE @@ -482,11 +482,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: ASTORE 16 method-call(java.lang.String java.lang.StringBuffer.toString()) | INVOKESTATIC Aspect.ajc_before_method_call ()V - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 18 | ALOAD 18 - | BIPUSH 0 + | ICONST_0 | ALOAD 16 | AASTORE | NEW FancyHelloWorld$AjcClosure39 @@ -501,7 +501,7 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final String getName_aroundBody42(): INVOKESTATIC Aspect.ajc_before_method_execution ()V (line 20) - BIPUSH 0 + ICONST_0 ANEWARRAY java.lang.Object ASTORE_0 NEW FancyHelloWorld$AjcClosure41 @@ -527,7 +527,7 @@ public class FancyHelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST FancyHelloWorld INVOKESTATIC FancyHelloWorld.init$_aroundBody0 (LFancyHelloWorld;)V @@ -549,7 +549,7 @@ public class FancyHelloWorld$AjcClosure3 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST FancyHelloWorld INVOKESTATIC FancyHelloWorld.init$_aroundBody2 (LFancyHelloWorld;)V @@ -605,11 +605,11 @@ public class FancyHelloWorld$AjcClosure9 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody8 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -631,11 +631,11 @@ public class FancyHelloWorld$AjcClosure11 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody10 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -657,11 +657,11 @@ public class FancyHelloWorld$AjcClosure13 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD INVOKESTATIC FancyHelloWorld.println_aroundBody12 (Ljava/io/PrintStream;Ljava/lang/Object;)V ACONST_NULL @@ -682,11 +682,11 @@ public class FancyHelloWorld$AjcClosure15 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD INVOKESTATIC FancyHelloWorld.println_aroundBody14 (Ljava/io/PrintStream;Ljava/lang/Object;)V ACONST_NULL @@ -707,11 +707,11 @@ public class FancyHelloWorld$AjcClosure17 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody16 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -733,11 +733,11 @@ public class FancyHelloWorld$AjcClosure19 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody18 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -759,7 +759,7 @@ public class FancyHelloWorld$AjcClosure21 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST [Ljava.lang.String; INVOKESTATIC FancyHelloWorld.main_aroundBody20 ([Ljava/lang/String;)V @@ -781,7 +781,7 @@ public class FancyHelloWorld$AjcClosure23 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST [Ljava.lang.String; INVOKESTATIC FancyHelloWorld.main_aroundBody22 ([Ljava/lang/String;)V @@ -803,7 +803,7 @@ public class FancyHelloWorld$AjcClosure25 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.hashCode_aroundBody24 (Ljava/lang/String;)I @@ -825,7 +825,7 @@ public class FancyHelloWorld$AjcClosure27 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.hashCode_aroundBody26 (Ljava/lang/String;)I @@ -847,7 +847,7 @@ public class FancyHelloWorld$AjcClosure29 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.init$_aroundBody28 (Ljava/lang/String;)Ljava/lang/StringBuffer; @@ -868,7 +868,7 @@ public class FancyHelloWorld$AjcClosure31 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.init$_aroundBody30 (Ljava/lang/String;)Ljava/lang/StringBuffer; @@ -889,11 +889,11 @@ public class FancyHelloWorld$AjcClosure33 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.StringBuffer ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD INVOKESTATIC org.aspectj.runtime.internal.Conversions.intValue (Ljava/lang/Object;)I INVOKESTATIC FancyHelloWorld.append_aroundBody32 (Ljava/lang/StringBuffer;I)Ljava/lang/StringBuffer; @@ -914,11 +914,11 @@ public class FancyHelloWorld$AjcClosure35 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.StringBuffer ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD INVOKESTATIC org.aspectj.runtime.internal.Conversions.intValue (Ljava/lang/Object;)I INVOKESTATIC FancyHelloWorld.append_aroundBody34 (Ljava/lang/StringBuffer;I)Ljava/lang/StringBuffer; @@ -939,7 +939,7 @@ public class FancyHelloWorld$AjcClosure37 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.StringBuffer INVOKESTATIC FancyHelloWorld.toString_aroundBody36 (Ljava/lang/StringBuffer;)Ljava/lang/String; @@ -960,7 +960,7 @@ public class FancyHelloWorld$AjcClosure39 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.StringBuffer INVOKESTATIC FancyHelloWorld.toString_aroundBody38 (Ljava/lang/StringBuffer;)Ljava/lang/String; diff --git a/weaver/testdata/AroundAllAndOthersHelloWorld.txt b/weaver/testdata/AroundAllAndOthersHelloWorld.txt index b3d0b28fb..241d22d75 100644 --- a/weaver/testdata/AroundAllAndOthersHelloWorld.txt +++ b/weaver/testdata/AroundAllAndOthersHelloWorld.txt @@ -1,14 +1,14 @@ public class HelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // HelloWorld this (line 5) + ALOAD_0 // LHelloWorld; this (line 5) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void HelloWorld.<init>()) | INVOKESTATIC Aspect.ajc_before_constructor_execution ()V - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE_2 | ALOAD_2 - | BIPUSH 0 + | ICONST_0 | ALOAD_0 | AASTORE | NEW HelloWorld$AjcClosure3 @@ -26,11 +26,11 @@ public class HelloWorld extends java.lang.Object: ASTORE 7 method-execution(void HelloWorld.main(java.lang.String[])) | INVOKESTATIC Aspect.ajc_before_method_execution ()V (line 8) - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 9 | ALOAD 9 - | BIPUSH 0 + | ICONST_0 | ALOAD 7 | AASTORE | NEW HelloWorld$AjcClosure15 @@ -49,11 +49,11 @@ public class HelloWorld extends java.lang.Object: static final void init$_aroundBody2(HelloWorld): INVOKESTATIC Aspect.ajc_before_constructor_execution ()V - BIPUSH 1 + ICONST_1 ANEWARRAY java.lang.Object ASTORE_1 ALOAD_1 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE NEW HelloWorld$AjcClosure1 @@ -72,7 +72,7 @@ public class HelloWorld extends java.lang.Object: static final java.io.PrintStream out_aroundBody6(): INVOKESTATIC Aspect.ajc_before_field_get ()V - BIPUSH 0 + ICONST_0 ANEWARRAY java.lang.Object ASTORE_0 NEW HelloWorld$AjcClosure5 @@ -93,15 +93,15 @@ public class HelloWorld extends java.lang.Object: static final void println_aroundBody10(java.io.PrintStream, String): INVOKESTATIC Aspect.ajc_before_method_call ()V - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW HelloWorld$AjcClosure9 @@ -116,7 +116,7 @@ public class HelloWorld extends java.lang.Object: static final void main_aroundBody12(String[]): field-get(java.io.PrintStream java.lang.System.out) | INVOKESTATIC Aspect.ajc_before_field_get ()V - | BIPUSH 0 + | ICONST_0 | ANEWARRAY java.lang.Object | ASTORE_1 | NEW HelloWorld$AjcClosure7 @@ -131,15 +131,15 @@ public class HelloWorld extends java.lang.Object: ASTORE 5 method-call(void java.io.PrintStream.println(java.lang.String)) | INVOKESTATIC Aspect.ajc_before_method_call ()V - | BIPUSH 2 + | ICONST_2 | ANEWARRAY java.lang.Object | ASTORE 7 | ALOAD 7 - | BIPUSH 0 + | ICONST_0 | ALOAD 5 | AASTORE | ALOAD 7 - | BIPUSH 1 + | ICONST_1 | ALOAD_3 | AASTORE | NEW HelloWorld$AjcClosure11 @@ -154,11 +154,11 @@ public class HelloWorld extends java.lang.Object: static final void main_aroundBody14(String[]): INVOKESTATIC Aspect.ajc_before_method_execution ()V (line 8) - BIPUSH 1 + ICONST_1 ANEWARRAY java.lang.Object ASTORE_1 ALOAD_1 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE NEW HelloWorld$AjcClosure13 @@ -184,7 +184,7 @@ public class HelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST HelloWorld INVOKESTATIC HelloWorld.init$_aroundBody0 (LHelloWorld;)V @@ -206,7 +206,7 @@ public class HelloWorld$AjcClosure3 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST HelloWorld INVOKESTATIC HelloWorld.init$_aroundBody2 (LHelloWorld;)V @@ -262,11 +262,11 @@ public class HelloWorld$AjcClosure9 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC HelloWorld.println_aroundBody8 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -288,11 +288,11 @@ public class HelloWorld$AjcClosure11 extends org.aspectj.runtime.internal.Around GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC HelloWorld.println_aroundBody10 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -314,7 +314,7 @@ public class HelloWorld$AjcClosure13 extends org.aspectj.runtime.internal.Around GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST [Ljava.lang.String; INVOKESTATIC HelloWorld.main_aroundBody12 ([Ljava/lang/String;)V @@ -336,7 +336,7 @@ public class HelloWorld$AjcClosure15 extends org.aspectj.runtime.internal.Around GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST [Ljava.lang.String; INVOKESTATIC HelloWorld.main_aroundBody14 ([Ljava/lang/String;)V diff --git a/weaver/testdata/AroundAllFancyHelloWorld.txt b/weaver/testdata/AroundAllFancyHelloWorld.txt index d1f593c67..b13f9060d 100644 --- a/weaver/testdata/AroundAllFancyHelloWorld.txt +++ b/weaver/testdata/AroundAllFancyHelloWorld.txt @@ -3,11 +3,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: ALOAD_0 // LFancyHelloWorld; this (line 7) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void FancyHelloWorld.<init>()) - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE_1 | ALOAD_1 - | BIPUSH 0 + | ICONST_0 | ALOAD_0 | AASTORE | NEW FancyHelloWorld$AjcClosure1 @@ -24,11 +24,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: ALOAD_0 ASTORE 15 method-execution(void FancyHelloWorld.main(java.lang.String[])) - | BIPUSH 1 (line 9) + | ICONST_1 (line 9) | ANEWARRAY java.lang.Object | ASTORE 16 | ALOAD 16 - | BIPUSH 0 + | ICONST_0 | ALOAD 15 | AASTORE | NEW FancyHelloWorld$AjcClosure11 @@ -43,7 +43,7 @@ public abstract class FancyHelloWorld extends java.lang.Object: public static String getName(): method-execution(java.lang.String FancyHelloWorld.getName()) - | BIPUSH 0 (line 20) + | ICONST_0 (line 20) | ANEWARRAY java.lang.Object | ASTORE 10 | NEW FancyHelloWorld$AjcClosure21 @@ -88,7 +88,7 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void main_aroundBody10(String[]): field-get(java.io.PrintStream java.lang.System.out) - | BIPUSH 0 + | ICONST_0 | ANEWARRAY java.lang.Object | ASTORE_1 | NEW FancyHelloWorld$AjcClosure3 @@ -106,15 +106,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: | | ASTORE 5 | | ASTORE 7 | | method-call(void java.io.PrintStream.println(java.lang.String)) - | | | BIPUSH 2 + | | | ICONST_2 | | | ANEWARRAY java.lang.Object | | | ASTORE 9 | | | ALOAD 9 - | | | BIPUSH 0 + | | | ICONST_0 | | | ALOAD 7 | | | AASTORE | | | ALOAD 9 - | | | BIPUSH 1 + | | | ICONST_1 | | | ALOAD 5 | | | AASTORE | | | NEW FancyHelloWorld$AjcClosure5 @@ -132,15 +132,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: | ASTORE 13 | ASTORE 15 | method-call(void java.io.PrintStream.println(java.lang.Object)) - | | BIPUSH 2 + | | ICONST_2 | | ANEWARRAY java.lang.Object | | ASTORE 17 | | ALOAD 17 - | | BIPUSH 0 + | | ICONST_0 | | ALOAD 15 | | AASTORE | | ALOAD 17 - | | BIPUSH 1 + | | ICONST_1 | | ALOAD 13 | | AASTORE | | NEW FancyHelloWorld$AjcClosure7 @@ -164,15 +164,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: ASTORE 23 ASTORE 25 method-call(void java.io.PrintStream.println(java.lang.String)) - | BIPUSH 2 + | ICONST_2 | ANEWARRAY java.lang.Object | ASTORE 27 | ALOAD 27 - | BIPUSH 0 + | ICONST_0 | ALOAD 25 | AASTORE | ALOAD 27 - | BIPUSH 1 + | ICONST_1 | ALOAD 23 | AASTORE | NEW FancyHelloWorld$AjcClosure9 @@ -220,11 +220,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: LDC "name" ASTORE_2 method-call(int java.lang.String.hashCode()) - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 4 | ALOAD 4 - | BIPUSH 0 + | ICONST_0 | ALOAD_2 | AASTORE | NEW FancyHelloWorld$AjcClosure13 @@ -239,11 +239,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: LDC "name" (line 22) ASTORE 6 constructor-call(void java.lang.StringBuffer.<init>(java.lang.String)) - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 8 | ALOAD 8 - | BIPUSH 0 + | ICONST_0 | ALOAD 6 | AASTORE | NEW FancyHelloWorld$AjcClosure15 @@ -257,15 +257,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: ISTORE 10 ASTORE 12 method-call(java.lang.StringBuffer java.lang.StringBuffer.append(int)) - | BIPUSH 2 + | ICONST_2 | ANEWARRAY java.lang.Object | ASTORE 14 | ALOAD 14 - | BIPUSH 0 + | ICONST_0 | ALOAD 12 | AASTORE | ALOAD 14 - | BIPUSH 1 + | ICONST_1 | ILOAD 10 | INVOKESTATIC org.aspectj.runtime.internal.Conversions.intObject (I)Ljava/lang/Object; | AASTORE @@ -278,11 +278,11 @@ public abstract class FancyHelloWorld extends java.lang.Object: method-call(java.lang.StringBuffer java.lang.StringBuffer.append(int)) ASTORE 16 method-call(java.lang.String java.lang.StringBuffer.toString()) - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 18 | ALOAD 18 - | BIPUSH 0 + | ICONST_0 | ALOAD 16 | AASTORE | NEW FancyHelloWorld$AjcClosure19 @@ -309,7 +309,7 @@ public class FancyHelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST FancyHelloWorld INVOKESTATIC FancyHelloWorld.init$_aroundBody0 (LFancyHelloWorld;)V @@ -348,11 +348,11 @@ public class FancyHelloWorld$AjcClosure5 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody4 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -374,11 +374,11 @@ public class FancyHelloWorld$AjcClosure7 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD INVOKESTATIC FancyHelloWorld.println_aroundBody6 (Ljava/io/PrintStream;Ljava/lang/Object;)V ACONST_NULL @@ -399,11 +399,11 @@ public class FancyHelloWorld$AjcClosure9 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody8 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -425,7 +425,7 @@ public class FancyHelloWorld$AjcClosure11 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST [Ljava.lang.String; INVOKESTATIC FancyHelloWorld.main_aroundBody10 ([Ljava/lang/String;)V @@ -447,7 +447,7 @@ public class FancyHelloWorld$AjcClosure13 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.hashCode_aroundBody12 (Ljava/lang/String;)I @@ -469,7 +469,7 @@ public class FancyHelloWorld$AjcClosure15 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.init$_aroundBody14 (Ljava/lang/String;)Ljava/lang/StringBuffer; @@ -490,11 +490,11 @@ public class FancyHelloWorld$AjcClosure17 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.StringBuffer ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD INVOKESTATIC org.aspectj.runtime.internal.Conversions.intValue (Ljava/lang/Object;)I INVOKESTATIC FancyHelloWorld.append_aroundBody16 (Ljava/lang/StringBuffer;I)Ljava/lang/StringBuffer; @@ -515,7 +515,7 @@ public class FancyHelloWorld$AjcClosure19 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.lang.StringBuffer INVOKESTATIC FancyHelloWorld.toString_aroundBody18 (Ljava/lang/StringBuffer;)Ljava/lang/String; diff --git a/weaver/testdata/AroundAllHelloWorld.txt b/weaver/testdata/AroundAllHelloWorld.txt index 7adbca1f3..09c8bf700 100644 --- a/weaver/testdata/AroundAllHelloWorld.txt +++ b/weaver/testdata/AroundAllHelloWorld.txt @@ -3,11 +3,11 @@ public class HelloWorld extends java.lang.Object: ALOAD_0 // LHelloWorld; this (line 5) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void HelloWorld.<init>()) - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE_1 | ALOAD_1 - | BIPUSH 0 + | ICONST_0 | ALOAD_0 | AASTORE | NEW HelloWorld$AjcClosure1 @@ -24,11 +24,11 @@ public class HelloWorld extends java.lang.Object: ALOAD_0 ASTORE 5 method-execution(void HelloWorld.main(java.lang.String[])) - | BIPUSH 1 (line 8) + | ICONST_1 (line 8) | ANEWARRAY java.lang.Object | ASTORE 6 | ALOAD 6 - | BIPUSH 0 + | ICONST_0 | ALOAD 5 | AASTORE | NEW HelloWorld$AjcClosure7 @@ -59,7 +59,7 @@ public class HelloWorld extends java.lang.Object: static final void main_aroundBody6(String[]): field-get(java.io.PrintStream java.lang.System.out) - | BIPUSH 0 + | ICONST_0 | ANEWARRAY java.lang.Object | ASTORE_1 | NEW HelloWorld$AjcClosure3 @@ -73,15 +73,15 @@ public class HelloWorld extends java.lang.Object: ASTORE_3 ASTORE 5 method-call(void java.io.PrintStream.println(java.lang.String)) - | BIPUSH 2 + | ICONST_2 | ANEWARRAY java.lang.Object | ASTORE 7 | ALOAD 7 - | BIPUSH 0 + | ICONST_0 | ALOAD 5 | AASTORE | ALOAD 7 - | BIPUSH 1 + | ICONST_1 | ALOAD_3 | AASTORE | NEW HelloWorld$AjcClosure5 @@ -108,7 +108,7 @@ public class HelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST HelloWorld INVOKESTATIC HelloWorld.init$_aroundBody0 (LHelloWorld;)V @@ -147,11 +147,11 @@ public class HelloWorld$AjcClosure5 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC HelloWorld.println_aroundBody4 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -173,7 +173,7 @@ public class HelloWorld$AjcClosure7 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST [Ljava.lang.String; INVOKESTATIC HelloWorld.main_aroundBody6 ([Ljava/lang/String;)V diff --git a/weaver/testdata/AroundAndOthersFancyHelloWorld.txt b/weaver/testdata/AroundAndOthersFancyHelloWorld.txt index b12b45120..b8a0ced36 100644 --- a/weaver/testdata/AroundAndOthersFancyHelloWorld.txt +++ b/weaver/testdata/AroundAndOthersFancyHelloWorld.txt @@ -1,6 +1,6 @@ public abstract class FancyHelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // FancyHelloWorld this (line 7) + ALOAD_0 // LFancyHelloWorld; this (line 7) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void FancyHelloWorld.<init>()) | RETURN @@ -13,21 +13,21 @@ public abstract class FancyHelloWorld extends java.lang.Object: | ASTORE_1 | finally -> E1 | | catch java.lang.Exception -> E0 - | | | ALOAD_1 // java.io.PrintStream out (line 11) + | | | ALOAD_1 // Ljava/io/PrintStream; out (line 11) | | | LDC "bye" | | | ASTORE 5 | | | ASTORE 6 | | | method-call(void java.io.PrintStream.println(java.lang.String)) | | | | INVOKESTATIC Aspect.ajc_before_method_execution ()V - | | | | BIPUSH 2 + | | | | ICONST_2 | | | | ANEWARRAY java.lang.Object | | | | ASTORE 8 | | | | ALOAD 8 - | | | | BIPUSH 0 + | | | | ICONST_0 | | | | ALOAD 6 | | | | AASTORE | | | | ALOAD 8 - | | | | BIPUSH 1 + | | | | ICONST_1 | | | | ALOAD 5 | | | | AASTORE | | | | NEW FancyHelloWorld$AjcClosure3 @@ -40,21 +40,21 @@ public abstract class FancyHelloWorld extends java.lang.Object: | | | GOTO L0 | | catch java.lang.Exception -> E0 | | E0: ASTORE_2 (line 12) - | | ALOAD_1 // java.io.PrintStream out (line 13) - | | ALOAD_2 // java.lang.Exception e + | | ALOAD_1 // Ljava/io/PrintStream; out (line 13) + | | ALOAD_2 // Ljava/lang/Exception; e | | ASTORE 9 | | ASTORE 10 | | method-call(void java.io.PrintStream.println(java.lang.Object)) | | | INVOKESTATIC Aspect.ajc_before_method_execution ()V - | | | BIPUSH 2 + | | | ICONST_2 | | | ANEWARRAY java.lang.Object | | | ASTORE 12 | | | ALOAD 12 - | | | BIPUSH 0 + | | | ICONST_0 | | | ALOAD 10 | | | AASTORE | | | ALOAD 12 - | | | BIPUSH 1 + | | | ICONST_1 | | | ALOAD 9 | | | AASTORE | | | NEW FancyHelloWorld$AjcClosure7 @@ -73,21 +73,21 @@ public abstract class FancyHelloWorld extends java.lang.Object: | L0: JSR L1 | GOTO L2 | L1: ASTORE_3 - | ALOAD_1 // java.io.PrintStream out (line 15) + | ALOAD_1 // Ljava/io/PrintStream; out (line 15) | LDC "finally" | ASTORE 13 | ASTORE 14 | method-call(void java.io.PrintStream.println(java.lang.String)) | | INVOKESTATIC Aspect.ajc_before_method_execution ()V - | | BIPUSH 2 + | | ICONST_2 | | ANEWARRAY java.lang.Object | | ASTORE 16 | | ALOAD 16 - | | BIPUSH 0 + | | ICONST_0 | | ALOAD 14 | | AASTORE | | ALOAD 16 - | | BIPUSH 1 + | | ICONST_1 | | ALOAD 13 | | AASTORE | | NEW FancyHelloWorld$AjcClosure11 @@ -106,18 +106,18 @@ public abstract class FancyHelloWorld extends java.lang.Object: method-execution(java.lang.String FancyHelloWorld.getName()) | ICONST_0 (line 20) | ISTORE_0 - | ILOAD_0 // int x (line 21) + | ILOAD_0 // I x (line 21) | LDC "name" | method-call(int java.lang.String.hashCode()) | | INVOKEVIRTUAL java.lang.String.hashCode ()I | method-call(int java.lang.String.hashCode()) | IADD - | ISTORE_0 // int x + | ISTORE_0 // I x | NEW java.lang.StringBuffer (line 22) | DUP | LDC "name" | INVOKESPECIAL java.lang.StringBuffer.<init> (Ljava/lang/String;)V - | ILOAD_0 // int x + | ILOAD_0 // I x | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(int)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (I)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(int)) @@ -137,15 +137,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void println_aroundBody2(java.io.PrintStream, String): INVOKESTATIC Aspect.ajc_before_method_execution ()V - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW FancyHelloWorld$AjcClosure1 @@ -166,15 +166,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void println_aroundBody6(java.io.PrintStream, Object): INVOKESTATIC Aspect.ajc_before_method_execution ()V - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW FancyHelloWorld$AjcClosure5 @@ -195,15 +195,15 @@ public abstract class FancyHelloWorld extends java.lang.Object: static final void println_aroundBody10(java.io.PrintStream, String): INVOKESTATIC Aspect.ajc_before_method_execution ()V - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW FancyHelloWorld$AjcClosure9 @@ -229,11 +229,11 @@ public class FancyHelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody0 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -255,11 +255,11 @@ public class FancyHelloWorld$AjcClosure3 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody2 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -281,11 +281,11 @@ public class FancyHelloWorld$AjcClosure5 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD INVOKESTATIC FancyHelloWorld.println_aroundBody4 (Ljava/io/PrintStream;Ljava/lang/Object;)V ACONST_NULL @@ -306,11 +306,11 @@ public class FancyHelloWorld$AjcClosure7 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD INVOKESTATIC FancyHelloWorld.println_aroundBody6 (Ljava/io/PrintStream;Ljava/lang/Object;)V ACONST_NULL @@ -331,11 +331,11 @@ public class FancyHelloWorld$AjcClosure9 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody8 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -357,11 +357,11 @@ public class FancyHelloWorld$AjcClosure11 extends org.aspectj.runtime.internal.A GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody10 (Ljava/io/PrintStream;Ljava/lang/String;)V diff --git a/weaver/testdata/AroundAndOthersHelloWorld.txt b/weaver/testdata/AroundAndOthersHelloWorld.txt index ba9460b69..483a00f4c 100644 --- a/weaver/testdata/AroundAndOthersHelloWorld.txt +++ b/weaver/testdata/AroundAndOthersHelloWorld.txt @@ -1,6 +1,6 @@ public class HelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // HelloWorld this (line 5) + ALOAD_0 // LHelloWorld; this (line 5) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void HelloWorld.<init>()) | RETURN @@ -15,15 +15,15 @@ public class HelloWorld extends java.lang.Object: | ASTORE_2 | method-call(void java.io.PrintStream.println(java.lang.String)) | | INVOKESTATIC Aspect.ajc_before_method_execution ()V - | | BIPUSH 2 + | | ICONST_2 | | ANEWARRAY java.lang.Object | | ASTORE 4 | | ALOAD 4 - | | BIPUSH 0 + | | ICONST_0 | | ALOAD_2 | | AASTORE | | ALOAD 4 - | | BIPUSH 1 + | | ICONST_1 | | ALOAD_1 | | AASTORE | | NEW HelloWorld$AjcClosure3 @@ -46,15 +46,15 @@ public class HelloWorld extends java.lang.Object: static final void println_aroundBody2(java.io.PrintStream, String): INVOKESTATIC Aspect.ajc_before_method_execution ()V - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW HelloWorld$AjcClosure1 @@ -80,11 +80,11 @@ public class HelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC HelloWorld.println_aroundBody0 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -106,11 +106,11 @@ public class HelloWorld$AjcClosure3 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC HelloWorld.println_aroundBody2 (Ljava/io/PrintStream;Ljava/lang/String;)V diff --git a/weaver/testdata/AroundArgsDynamicHelloWorld.txt b/weaver/testdata/AroundArgsDynamicHelloWorld.txt index 0ca60f059..0053c3e57 100644 --- a/weaver/testdata/AroundArgsDynamicHelloWorld.txt +++ b/weaver/testdata/AroundArgsDynamicHelloWorld.txt @@ -1,6 +1,6 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Serializable: public void <init>(): - ALOAD_0 // DynamicHelloWorld this (line 8) + ALOAD_0 // LDynamicHelloWorld; this (line 8) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void DynamicHelloWorld.<init>()) | RETURN @@ -27,7 +27,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | DUP | LDC "expected and caught: " | INVOKESPECIAL java.lang.StringBuffer.<init> (Ljava/lang/String;)V - | ALOAD_1 // java.lang.UnsupportedOperationException t + | ALOAD_1 // Ljava/lang/UnsupportedOperationException; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -48,8 +48,8 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria String doit(String, java.util.List): method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List)) - | ALOAD_2 // java.util.List l (line 21) - | ALOAD_1 // java.lang.String s + | ALOAD_2 // Ljava/util/List; l (line 21) + | ALOAD_1 // Ljava/lang/String; s | ASTORE_3 | ASTORE 4 | method-call(boolean java.util.List.add(java.lang.Object)) @@ -58,19 +58,19 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | | IFEQ L0 | | ALOAD 4 | | CHECKCAST java.util.ArrayList - | | BIPUSH 3 + | | ICONST_3 | | ANEWARRAY java.lang.Object | | ASTORE 5 | | ALOAD 5 - | | BIPUSH 0 + | | ICONST_0 | | ALOAD_0 | | AASTORE | | ALOAD 5 - | | BIPUSH 1 + | | ICONST_1 | | ALOAD 4 | | AASTORE | | ALOAD 5 - | | BIPUSH 2 + | | ICONST_2 | | ALOAD_3 | | AASTORE | | NEW DynamicHelloWorld$AjcClosure1 @@ -86,7 +86,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | | L1: NOP | method-call(boolean java.util.List.add(java.lang.Object)) | POP - | ALOAD_2 // java.util.List l (line 22) + | ALOAD_2 // Ljava/util/List; l (line 22) | method-call(java.lang.String java.lang.Object.toString()) | | INVOKEVIRTUAL java.lang.Object.toString ()Ljava/lang/String; | method-call(java.lang.String java.lang.Object.toString()) @@ -115,15 +115,15 @@ public class DynamicHelloWorld$AjcClosure1 extends org.aspectj.runtime.internal. GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST DynamicHelloWorld ALOAD_1 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.util.List ALOAD_2 - BIPUSH 2 + ICONST_2 AALOAD INVOKESTATIC DynamicHelloWorld.add_aroundBody0 (LDynamicHelloWorld;Ljava/util/List;Ljava/lang/Object;)Z INVOKESTATIC org.aspectj.runtime.internal.Conversions.booleanObject (Z)Ljava/lang/Object; diff --git a/weaver/testdata/AroundFancyHelloWorld.txt b/weaver/testdata/AroundFancyHelloWorld.txt index e37bf0223..258722991 100644 --- a/weaver/testdata/AroundFancyHelloWorld.txt +++ b/weaver/testdata/AroundFancyHelloWorld.txt @@ -1,6 +1,6 @@ public abstract class FancyHelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // FancyHelloWorld this (line 7) + ALOAD_0 // LFancyHelloWorld; this (line 7) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void FancyHelloWorld.<init>()) | RETURN @@ -13,20 +13,20 @@ public abstract class FancyHelloWorld extends java.lang.Object: | ASTORE_1 | finally -> E1 | | catch java.lang.Exception -> E0 - | | | ALOAD_1 // java.io.PrintStream out (line 11) + | | | ALOAD_1 // Ljava/io/PrintStream; out (line 11) | | | LDC "bye" | | | ASTORE 5 | | | ASTORE 6 | | | method-call(void java.io.PrintStream.println(java.lang.String)) - | | | | BIPUSH 2 + | | | | ICONST_2 | | | | ANEWARRAY java.lang.Object | | | | ASTORE 7 | | | | ALOAD 7 - | | | | BIPUSH 0 + | | | | ICONST_0 | | | | ALOAD 6 | | | | AASTORE | | | | ALOAD 7 - | | | | BIPUSH 1 + | | | | ICONST_1 | | | | ALOAD 5 | | | | AASTORE | | | | NEW FancyHelloWorld$AjcClosure1 @@ -39,20 +39,20 @@ public abstract class FancyHelloWorld extends java.lang.Object: | | | GOTO L0 | | catch java.lang.Exception -> E0 | | E0: ASTORE_2 (line 12) - | | ALOAD_1 // java.io.PrintStream out (line 13) - | | ALOAD_2 // java.lang.Exception e + | | ALOAD_1 // Ljava/io/PrintStream; out (line 13) + | | ALOAD_2 // Ljava/lang/Exception; e | | ASTORE 8 | | ASTORE 9 | | method-call(void java.io.PrintStream.println(java.lang.Object)) - | | | BIPUSH 2 + | | | ICONST_2 | | | ANEWARRAY java.lang.Object | | | ASTORE 10 | | | ALOAD 10 - | | | BIPUSH 0 + | | | ICONST_0 | | | ALOAD 9 | | | AASTORE | | | ALOAD 10 - | | | BIPUSH 1 + | | | ICONST_1 | | | ALOAD 8 | | | AASTORE | | | NEW FancyHelloWorld$AjcClosure3 @@ -71,20 +71,20 @@ public abstract class FancyHelloWorld extends java.lang.Object: | L0: JSR L1 | GOTO L2 | L1: ASTORE_3 - | ALOAD_1 // java.io.PrintStream out (line 15) + | ALOAD_1 // Ljava/io/PrintStream; out (line 15) | LDC "finally" | ASTORE 11 | ASTORE 12 | method-call(void java.io.PrintStream.println(java.lang.String)) - | | BIPUSH 2 + | | ICONST_2 | | ANEWARRAY java.lang.Object | | ASTORE 13 | | ALOAD 13 - | | BIPUSH 0 + | | ICONST_0 | | ALOAD 12 | | AASTORE | | ALOAD 13 - | | BIPUSH 1 + | | ICONST_1 | | ALOAD 11 | | AASTORE | | NEW FancyHelloWorld$AjcClosure5 @@ -103,18 +103,18 @@ public abstract class FancyHelloWorld extends java.lang.Object: method-execution(java.lang.String FancyHelloWorld.getName()) | ICONST_0 (line 20) | ISTORE_0 - | ILOAD_0 // int x (line 21) + | ILOAD_0 // I x (line 21) | LDC "name" | method-call(int java.lang.String.hashCode()) | | INVOKEVIRTUAL java.lang.String.hashCode ()I | method-call(int java.lang.String.hashCode()) | IADD - | ISTORE_0 // int x + | ISTORE_0 // I x | NEW java.lang.StringBuffer (line 22) | DUP | LDC "name" | INVOKESPECIAL java.lang.StringBuffer.<init> (Ljava/lang/String;)V - | ILOAD_0 // int x + | ILOAD_0 // I x | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(int)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (I)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(int)) @@ -160,11 +160,11 @@ public class FancyHelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody0 (Ljava/io/PrintStream;Ljava/lang/String;)V @@ -186,11 +186,11 @@ public class FancyHelloWorld$AjcClosure3 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD INVOKESTATIC FancyHelloWorld.println_aroundBody2 (Ljava/io/PrintStream;Ljava/lang/Object;)V ACONST_NULL @@ -211,11 +211,11 @@ public class FancyHelloWorld$AjcClosure5 extends org.aspectj.runtime.internal.Ar GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC FancyHelloWorld.println_aroundBody4 (Ljava/io/PrintStream;Ljava/lang/String;)V diff --git a/weaver/testdata/AroundHelloWorld.txt b/weaver/testdata/AroundHelloWorld.txt index 919f74b9a..584103387 100644 --- a/weaver/testdata/AroundHelloWorld.txt +++ b/weaver/testdata/AroundHelloWorld.txt @@ -1,6 +1,6 @@ public class HelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // HelloWorld this (line 5) + ALOAD_0 // LHelloWorld; this (line 5) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void HelloWorld.<init>()) | RETURN @@ -14,15 +14,15 @@ public class HelloWorld extends java.lang.Object: | ASTORE_1 | ASTORE_2 | method-call(void java.io.PrintStream.println(java.lang.String)) - | | BIPUSH 2 + | | ICONST_2 | | ANEWARRAY java.lang.Object | | ASTORE_3 | | ALOAD_3 - | | BIPUSH 0 + | | ICONST_0 | | ALOAD_2 | | AASTORE | | ALOAD_3 - | | BIPUSH 1 + | | ICONST_1 | | ALOAD_1 | | AASTORE | | NEW HelloWorld$AjcClosure1 @@ -57,11 +57,11 @@ public class HelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String INVOKESTATIC HelloWorld.println_aroundBody0 (Ljava/io/PrintStream;Ljava/lang/String;)V diff --git a/weaver/testdata/CflowStateResidueDynamicHelloWorld.txt b/weaver/testdata/CflowStateResidueDynamicHelloWorld.txt index 4d3b2775d..1d363e118 100644 --- a/weaver/testdata/CflowStateResidueDynamicHelloWorld.txt +++ b/weaver/testdata/CflowStateResidueDynamicHelloWorld.txt @@ -1,6 +1,6 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Serializable: public void <init>(): - ALOAD_0 // DynamicHelloWorld this (line 8) + ALOAD_0 // LDynamicHelloWorld; this (line 8) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void DynamicHelloWorld.<init>()) | RETURN @@ -13,7 +13,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | INVOKEVIRTUAL org.aspectj.runtime.internal.CFlowStack.isValid ()Z | IFEQ L0 | GETSTATIC Aspect.ajc$cflowStack$0 Lorg/aspectj/runtime/internal/CFlowStack; - | BIPUSH 0 + | ICONST_0 | INVOKEVIRTUAL org.aspectj.runtime.internal.CFlowStack.get (I)Ljava/lang/Object; | CHECKCAST java.util.ArrayList | INVOKESTATIC Aspect.ajc_before_0 (Ljava/util/ArrayList;)V @@ -35,7 +35,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | DUP | LDC "expected and caught: " | INVOKESPECIAL java.lang.StringBuffer.<init> (Ljava/lang/String;)V - | ALOAD_1 // java.lang.UnsupportedOperationException t + | ALOAD_1 // Ljava/lang/UnsupportedOperationException; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -56,23 +56,23 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria String doit(String, java.util.List): method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List)) - | ALOAD_2 // java.util.List l (line 21) - | ALOAD_1 // java.lang.String s + | ALOAD_2 // Ljava/util/List; l (line 21) + | ALOAD_1 // Ljava/lang/String; s | ASTORE_3 | ASTORE 4 | method-call(boolean java.util.List.add(java.lang.Object)) - | | BIPUSH 0 + | | ICONST_0 | | ISTORE 5 | | ALOAD 4 | | INSTANCEOF java.util.ArrayList | | IFEQ L0 - | | BIPUSH 1 + | | ICONST_1 | | ISTORE 5 - | | BIPUSH 1 + | | ICONST_1 | | ANEWARRAY java.lang.Object | | ASTORE 6 | | ALOAD 6 - | | BIPUSH 0 + | | ICONST_0 | | ALOAD 4 | | AASTORE | | GETSTATIC Aspect.ajc$cflowStack$0 Lorg/aspectj/runtime/internal/CFlowStack; @@ -99,7 +99,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | | L3: NOP | method-call(boolean java.util.List.add(java.lang.Object)) | POP - | ALOAD_2 // java.util.List l (line 22) + | ALOAD_2 // Ljava/util/List; l (line 22) | method-call(java.lang.String java.lang.Object.toString()) | | INVOKEVIRTUAL java.lang.Object.toString ()Ljava/lang/String; | method-call(java.lang.String java.lang.Object.toString()) diff --git a/weaver/testdata/NoResidueDynamicHelloWorld.txt b/weaver/testdata/NoResidueDynamicHelloWorld.txt index b81c0801d..715d86779 100644 --- a/weaver/testdata/NoResidueDynamicHelloWorld.txt +++ b/weaver/testdata/NoResidueDynamicHelloWorld.txt @@ -1,6 +1,6 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Serializable: public void <init>(): - ALOAD_0 // DynamicHelloWorld this (line 8) + ALOAD_0 // LDynamicHelloWorld; this (line 8) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void DynamicHelloWorld.<init>()) | RETURN @@ -27,7 +27,7 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | DUP | LDC "expected and caught: " | INVOKESPECIAL java.lang.StringBuffer.<init> (Ljava/lang/String;)V - | ALOAD_1 // java.lang.UnsupportedOperationException t + | ALOAD_1 // Ljava/lang/UnsupportedOperationException; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -48,14 +48,14 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria String doit(String, java.util.List): method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List)) - | ALOAD_2 // java.util.List l (line 21) - | ALOAD_1 // java.lang.String s + | ALOAD_2 // Ljava/util/List; l (line 21) + | ALOAD_1 // Ljava/lang/String; s | method-call(boolean java.util.List.add(java.lang.Object)) | | INVOKESTATIC Aspect.ajc_before_0 ()V | | INVOKEINTERFACE java.util.List.add (Ljava/lang/Object;)Z | method-call(boolean java.util.List.add(java.lang.Object)) | POP - | ALOAD_2 // java.util.List l (line 22) + | ALOAD_2 // Ljava/util/List; l (line 22) | method-call(java.lang.String java.lang.Object.toString()) | | INVOKEVIRTUAL java.lang.Object.toString ()Ljava/lang/String; | method-call(java.lang.String java.lang.Object.toString()) diff --git a/weaver/testdata/StateResidueMultiArgHelloWorld.txt b/weaver/testdata/StateResidueMultiArgHelloWorld.txt index 8e7f5481c..d81c0dde9 100644 --- a/weaver/testdata/StateResidueMultiArgHelloWorld.txt +++ b/weaver/testdata/StateResidueMultiArgHelloWorld.txt @@ -1,6 +1,6 @@ public class MultiArgHelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // MultiArgHelloWorld this (line 3) + ALOAD_0 // LMultiArgHelloWorld; this (line 3) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void MultiArgHelloWorld.<init>()) | RETURN @@ -34,7 +34,7 @@ public class MultiArgHelloWorld extends java.lang.Object: | NEW java.lang.StringBuffer | DUP | INVOKESPECIAL java.lang.StringBuffer.<init> ()V - | ALOAD_0 // java.lang.Object s + | ALOAD_0 // Ljava/lang/Object; s | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -42,7 +42,7 @@ public class MultiArgHelloWorld extends java.lang.Object: | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/String;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)) - | ALOAD_1 // java.lang.Object t + | ALOAD_1 // Ljava/lang/Object; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) diff --git a/weaver/testdata/StaticEnclosingTjpBeforeHelloWorld.txt b/weaver/testdata/StaticEnclosingTjpBeforeHelloWorld.txt index fed62e3c7..0db61ae96 100644 --- a/weaver/testdata/StaticEnclosingTjpBeforeHelloWorld.txt +++ b/weaver/testdata/StaticEnclosingTjpBeforeHelloWorld.txt @@ -47,7 +47,7 @@ public class HelloWorld extends java.lang.Object: LDC "" LDC "" INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeConstructorSig (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/aspectj/lang/reflect/ConstructorSignature; - BIPUSH 5 + ICONST_5 INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeESJP (Ljava/lang/String;Lorg/aspectj/lang/Signature;I)Lorg/aspectj/lang/JoinPoint$EnclosingStaticPart; PUTSTATIC HelloWorld.ajc$tjp_0 Lorg/aspectj/lang/JoinPoint$EnclosingStaticPart; ALOAD_0 diff --git a/weaver/testdata/StaticTjpBeforeHelloWorld.txt b/weaver/testdata/StaticTjpBeforeHelloWorld.txt index dcb25de15..e5ecb63f3 100644 --- a/weaver/testdata/StaticTjpBeforeHelloWorld.txt +++ b/weaver/testdata/StaticTjpBeforeHelloWorld.txt @@ -49,7 +49,7 @@ public class HelloWorld extends java.lang.Object: LDC "" LDC "" INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeConstructorSig (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/aspectj/lang/reflect/ConstructorSignature; - BIPUSH 5 + ICONST_5 INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeSJP (Ljava/lang/String;Lorg/aspectj/lang/Signature;I)Lorg/aspectj/lang/JoinPoint$StaticPart; PUTSTATIC HelloWorld.ajc$tjp_0 Lorg/aspectj/lang/JoinPoint$StaticPart; ALOAD_0 diff --git a/weaver/testdata/StringResidue1MultiArgHelloWorld.txt b/weaver/testdata/StringResidue1MultiArgHelloWorld.txt index a07e2539c..61521438e 100644 --- a/weaver/testdata/StringResidue1MultiArgHelloWorld.txt +++ b/weaver/testdata/StringResidue1MultiArgHelloWorld.txt @@ -1,6 +1,6 @@ public class MultiArgHelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // MultiArgHelloWorld this (line 3) + ALOAD_0 // LMultiArgHelloWorld; this (line 3) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void MultiArgHelloWorld.<init>()) | RETURN @@ -35,7 +35,7 @@ public class MultiArgHelloWorld extends java.lang.Object: | NEW java.lang.StringBuffer | DUP | INVOKESPECIAL java.lang.StringBuffer.<init> ()V - | ALOAD_0 // java.lang.Object s + | ALOAD_0 // Ljava/lang/Object; s | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -43,7 +43,7 @@ public class MultiArgHelloWorld extends java.lang.Object: | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/String;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)) - | ALOAD_1 // java.lang.Object t + | ALOAD_1 // Ljava/lang/Object; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) diff --git a/weaver/testdata/StringResidue2MultiArgHelloWorld.txt b/weaver/testdata/StringResidue2MultiArgHelloWorld.txt index db000a60e..aced4a1d3 100644 --- a/weaver/testdata/StringResidue2MultiArgHelloWorld.txt +++ b/weaver/testdata/StringResidue2MultiArgHelloWorld.txt @@ -1,6 +1,6 @@ public class MultiArgHelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // MultiArgHelloWorld this (line 3) + ALOAD_0 // LMultiArgHelloWorld; this (line 3) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void MultiArgHelloWorld.<init>()) | RETURN @@ -32,7 +32,7 @@ public class MultiArgHelloWorld extends java.lang.Object: | NEW java.lang.StringBuffer | DUP | INVOKESPECIAL java.lang.StringBuffer.<init> ()V - | ALOAD_0 // java.lang.Object s + | ALOAD_0 // Ljava/lang/Object; s | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -40,7 +40,7 @@ public class MultiArgHelloWorld extends java.lang.Object: | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/String;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)) - | ALOAD_1 // java.lang.Object t + | ALOAD_1 // Ljava/lang/Object; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) diff --git a/weaver/testdata/StringResidue3MultiArgHelloWorld.txt b/weaver/testdata/StringResidue3MultiArgHelloWorld.txt index f59804e69..dbf9f438e 100644 --- a/weaver/testdata/StringResidue3MultiArgHelloWorld.txt +++ b/weaver/testdata/StringResidue3MultiArgHelloWorld.txt @@ -1,6 +1,6 @@ public class MultiArgHelloWorld extends java.lang.Object: public void <init>(): - ALOAD_0 // MultiArgHelloWorld this (line 3) + ALOAD_0 // LMultiArgHelloWorld; this (line 3) INVOKESPECIAL java.lang.Object.<init> ()V constructor-execution(void MultiArgHelloWorld.<init>()) | RETURN @@ -32,7 +32,7 @@ public class MultiArgHelloWorld extends java.lang.Object: | NEW java.lang.StringBuffer | DUP | INVOKESPECIAL java.lang.StringBuffer.<init> ()V - | ALOAD_0 // java.lang.Object s + | ALOAD_0 // Ljava/lang/Object; s | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) @@ -40,7 +40,7 @@ public class MultiArgHelloWorld extends java.lang.Object: | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/String;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.String)) - | ALOAD_1 // java.lang.Object t + | ALOAD_1 // Ljava/lang/Object; t | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) | | INVOKEVIRTUAL java.lang.StringBuffer.append (Ljava/lang/Object;)Ljava/lang/StringBuffer; | method-call(java.lang.StringBuffer java.lang.StringBuffer.append(java.lang.Object)) diff --git a/weaver/testdata/TjpAround2HelloWorld.txt b/weaver/testdata/TjpAround2HelloWorld.txt index ab1a100f8..2e10054fc 100644 --- a/weaver/testdata/TjpAround2HelloWorld.txt +++ b/weaver/testdata/TjpAround2HelloWorld.txt @@ -12,15 +12,15 @@ public class HelloWorld extends java.lang.Object: INVOKESTATIC org.aspectj.runtime.reflect.Factory.makeJP (Lorg/aspectj/lang/JoinPoint$StaticPart;Ljava/lang/Object;Ljava/lang/Object;)Lorg/aspectj/lang/JoinPoint; ASTORE_1 constructor-execution(void HelloWorld.<init>()) - | BIPUSH 2 + | ICONST_2 | ANEWARRAY java.lang.Object | ASTORE_3 | ALOAD_3 - | BIPUSH 0 + | ICONST_0 | ALOAD_0 | AASTORE | ALOAD_3 - | BIPUSH 1 + | ICONST_1 | ALOAD_1 | AASTORE | NEW HelloWorld$AjcClosure3 @@ -44,15 +44,15 @@ public class HelloWorld extends java.lang.Object: INVOKESTATIC org.aspectj.runtime.reflect.Factory.makeJP (Lorg/aspectj/lang/JoinPoint$StaticPart;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/aspectj/lang/JoinPoint; ASTORE 10 method-execution(void HelloWorld.main(java.lang.String[])) - | BIPUSH 2 (line 8) + | ICONST_2 (line 8) | ANEWARRAY java.lang.Object | ASTORE 12 | ALOAD 12 - | BIPUSH 0 + | ICONST_0 | ALOAD 9 | AASTORE | ALOAD 12 - | BIPUSH 1 + | ICONST_1 | ALOAD 10 | AASTORE | NEW HelloWorld$AjcClosure15 @@ -83,7 +83,7 @@ public class HelloWorld extends java.lang.Object: LDC "" LDC "" INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeConstructorSig (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/aspectj/lang/reflect/ConstructorSignature; - BIPUSH 5 + ICONST_5 INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeSJP (Ljava/lang/String;Lorg/aspectj/lang/Signature;I)Lorg/aspectj/lang/JoinPoint$StaticPart; PUTSTATIC HelloWorld.ajc$tjp_0 Lorg/aspectj/lang/JoinPoint$StaticPart; ALOAD_0 @@ -135,15 +135,15 @@ public class HelloWorld extends java.lang.Object: end static final void init$_aroundBody0(HelloWorld, org.aspectj.lang.JoinPoint) static final void init$_aroundBody2(HelloWorld, org.aspectj.lang.JoinPoint): - BIPUSH 2 + ICONST_2 ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW HelloWorld$AjcClosure1 @@ -162,11 +162,11 @@ public class HelloWorld extends java.lang.Object: end static final java.io.PrintStream out_aroundBody4(org.aspectj.lang.JoinPoint) static final java.io.PrintStream out_aroundBody6(org.aspectj.lang.JoinPoint): - BIPUSH 1 + ICONST_1 ANEWARRAY java.lang.Object ASTORE_1 ALOAD_1 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE NEW HelloWorld$AjcClosure5 @@ -187,19 +187,19 @@ public class HelloWorld extends java.lang.Object: end static final void println_aroundBody8(java.io.PrintStream, String, org.aspectj.lang.JoinPoint) static final void println_aroundBody10(java.io.PrintStream, String, org.aspectj.lang.JoinPoint): - BIPUSH 3 + ICONST_3 ANEWARRAY java.lang.Object ASTORE_3 ALOAD_3 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_3 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE ALOAD_3 - BIPUSH 2 + ICONST_2 ALOAD_2 AASTORE NEW HelloWorld$AjcClosure9 @@ -219,11 +219,11 @@ public class HelloWorld extends java.lang.Object: INVOKESTATIC org.aspectj.runtime.reflect.Factory.makeJP (Lorg/aspectj/lang/JoinPoint$StaticPart;Ljava/lang/Object;Ljava/lang/Object;)Lorg/aspectj/lang/JoinPoint; ASTORE_2 field-get(java.io.PrintStream java.lang.System.out) - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 4 | ALOAD 4 - | BIPUSH 0 + | ICONST_0 | ALOAD_2 | AASTORE | NEW HelloWorld$AjcClosure7 @@ -244,19 +244,19 @@ public class HelloWorld extends java.lang.Object: INVOKESTATIC org.aspectj.runtime.reflect.Factory.makeJP (Lorg/aspectj/lang/JoinPoint$StaticPart;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/aspectj/lang/JoinPoint; ASTORE 10 method-call(void java.io.PrintStream.println(java.lang.String)) - | BIPUSH 3 + | ICONST_3 | ANEWARRAY java.lang.Object | ASTORE 12 | ALOAD 12 - | BIPUSH 0 + | ICONST_0 | ALOAD 8 | AASTORE | ALOAD 12 - | BIPUSH 1 + | ICONST_1 | ALOAD 6 | AASTORE | ALOAD 12 - | BIPUSH 2 + | ICONST_2 | ALOAD 10 | AASTORE | NEW HelloWorld$AjcClosure11 @@ -271,15 +271,15 @@ public class HelloWorld extends java.lang.Object: end static final void main_aroundBody12(String[], org.aspectj.lang.JoinPoint) static final void main_aroundBody14(String[], org.aspectj.lang.JoinPoint): - BIPUSH 2 (line 8) + ICONST_2 (line 8) ANEWARRAY java.lang.Object ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_2 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE NEW HelloWorld$AjcClosure13 @@ -306,11 +306,11 @@ public class HelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST HelloWorld ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.init$_aroundBody0 (LHelloWorld;Lorg/aspectj/lang/JoinPoint;)V @@ -332,11 +332,11 @@ public class HelloWorld$AjcClosure3 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST HelloWorld ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.init$_aroundBody2 (LHelloWorld;Lorg/aspectj/lang/JoinPoint;)V @@ -358,7 +358,7 @@ public class HelloWorld$AjcClosure5 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.out_aroundBody4 (Lorg/aspectj/lang/JoinPoint;)Ljava/io/PrintStream; @@ -379,7 +379,7 @@ public class HelloWorld$AjcClosure7 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.out_aroundBody6 (Lorg/aspectj/lang/JoinPoint;)Ljava/io/PrintStream; @@ -400,15 +400,15 @@ public class HelloWorld$AjcClosure9 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String ALOAD_2 - BIPUSH 2 + ICONST_2 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.println_aroundBody8 (Ljava/io/PrintStream;Ljava/lang/String;Lorg/aspectj/lang/JoinPoint;)V @@ -430,15 +430,15 @@ public class HelloWorld$AjcClosure11 extends org.aspectj.runtime.internal.Around GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String ALOAD_2 - BIPUSH 2 + ICONST_2 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.println_aroundBody10 (Ljava/io/PrintStream;Ljava/lang/String;Lorg/aspectj/lang/JoinPoint;)V @@ -460,11 +460,11 @@ public class HelloWorld$AjcClosure13 extends org.aspectj.runtime.internal.Around GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST [Ljava.lang.String; ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.main_aroundBody12 ([Ljava/lang/String;Lorg/aspectj/lang/JoinPoint;)V @@ -486,11 +486,11 @@ public class HelloWorld$AjcClosure15 extends org.aspectj.runtime.internal.Around GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST [Ljava.lang.String; ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.main_aroundBody14 ([Ljava/lang/String;Lorg/aspectj/lang/JoinPoint;)V diff --git a/weaver/testdata/TjpAroundHelloWorld.txt b/weaver/testdata/TjpAroundHelloWorld.txt index 92065df50..2a32f83f6 100644 --- a/weaver/testdata/TjpAroundHelloWorld.txt +++ b/weaver/testdata/TjpAroundHelloWorld.txt @@ -12,15 +12,15 @@ public class HelloWorld extends java.lang.Object: INVOKESTATIC org.aspectj.runtime.reflect.Factory.makeJP (Lorg/aspectj/lang/JoinPoint$StaticPart;Ljava/lang/Object;Ljava/lang/Object;)Lorg/aspectj/lang/JoinPoint; ASTORE_1 constructor-execution(void HelloWorld.<init>()) - | BIPUSH 2 + | ICONST_2 | ANEWARRAY java.lang.Object | ASTORE_2 | ALOAD_2 - | BIPUSH 0 + | ICONST_0 | ALOAD_0 | AASTORE | ALOAD_2 - | BIPUSH 1 + | ICONST_1 | ALOAD_1 | AASTORE | NEW HelloWorld$AjcClosure1 @@ -44,15 +44,15 @@ public class HelloWorld extends java.lang.Object: INVOKESTATIC org.aspectj.runtime.reflect.Factory.makeJP (Lorg/aspectj/lang/JoinPoint$StaticPart;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/aspectj/lang/JoinPoint; ASTORE 8 method-execution(void HelloWorld.main(java.lang.String[])) - | BIPUSH 2 (line 8) + | ICONST_2 (line 8) | ANEWARRAY java.lang.Object | ASTORE 9 | ALOAD 9 - | BIPUSH 0 + | ICONST_0 | ALOAD 7 | AASTORE | ALOAD 9 - | BIPUSH 1 + | ICONST_1 | ALOAD 8 | AASTORE | NEW HelloWorld$AjcClosure7 @@ -83,7 +83,7 @@ public class HelloWorld extends java.lang.Object: LDC "" LDC "" INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeConstructorSig (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/aspectj/lang/reflect/ConstructorSignature; - BIPUSH 5 + ICONST_5 INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeSJP (Ljava/lang/String;Lorg/aspectj/lang/Signature;I)Lorg/aspectj/lang/JoinPoint$StaticPart; PUTSTATIC HelloWorld.ajc$tjp_0 Lorg/aspectj/lang/JoinPoint$StaticPart; ALOAD_0 @@ -153,11 +153,11 @@ public class HelloWorld extends java.lang.Object: INVOKESTATIC org.aspectj.runtime.reflect.Factory.makeJP (Lorg/aspectj/lang/JoinPoint$StaticPart;Ljava/lang/Object;Ljava/lang/Object;)Lorg/aspectj/lang/JoinPoint; ASTORE_2 field-get(java.io.PrintStream java.lang.System.out) - | BIPUSH 1 + | ICONST_1 | ANEWARRAY java.lang.Object | ASTORE 4 | ALOAD 4 - | BIPUSH 0 + | ICONST_0 | ALOAD_2 | AASTORE | NEW HelloWorld$AjcClosure3 @@ -178,19 +178,19 @@ public class HelloWorld extends java.lang.Object: INVOKESTATIC org.aspectj.runtime.reflect.Factory.makeJP (Lorg/aspectj/lang/JoinPoint$StaticPart;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Lorg/aspectj/lang/JoinPoint; ASTORE 10 method-call(void java.io.PrintStream.println(java.lang.String)) - | BIPUSH 3 + | ICONST_3 | ANEWARRAY java.lang.Object | ASTORE 12 | ALOAD 12 - | BIPUSH 0 + | ICONST_0 | ALOAD 8 | AASTORE | ALOAD 12 - | BIPUSH 1 + | ICONST_1 | ALOAD 6 | AASTORE | ALOAD 12 - | BIPUSH 2 + | ICONST_2 | ALOAD 10 | AASTORE | NEW HelloWorld$AjcClosure5 @@ -218,11 +218,11 @@ public class HelloWorld$AjcClosure1 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST HelloWorld ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.init$_aroundBody0 (LHelloWorld;Lorg/aspectj/lang/JoinPoint;)V @@ -244,7 +244,7 @@ public class HelloWorld$AjcClosure3 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.out_aroundBody2 (Lorg/aspectj/lang/JoinPoint;)Ljava/io/PrintStream; @@ -265,15 +265,15 @@ public class HelloWorld$AjcClosure5 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST java.io.PrintStream ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String ALOAD_2 - BIPUSH 2 + ICONST_2 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.println_aroundBody4 (Ljava/io/PrintStream;Ljava/lang/String;Lorg/aspectj/lang/JoinPoint;)V @@ -295,11 +295,11 @@ public class HelloWorld$AjcClosure7 extends org.aspectj.runtime.internal.AroundC GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST [Ljava.lang.String; ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST org.aspectj.lang.JoinPoint INVOKESTATIC HelloWorld.main_aroundBody6 ([Ljava/lang/String;Lorg/aspectj/lang/JoinPoint;)V diff --git a/weaver/testdata/TjpBeforeHelloWorld.txt b/weaver/testdata/TjpBeforeHelloWorld.txt index cf1eb20f8..13a84c274 100644 --- a/weaver/testdata/TjpBeforeHelloWorld.txt +++ b/weaver/testdata/TjpBeforeHelloWorld.txt @@ -77,7 +77,7 @@ public class HelloWorld extends java.lang.Object: LDC "" LDC "" INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeConstructorSig (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/aspectj/lang/reflect/ConstructorSignature; - BIPUSH 5 + ICONST_5 INVOKEVIRTUAL org.aspectj.runtime.reflect.Factory.makeSJP (Ljava/lang/String;Lorg/aspectj/lang/Signature;I)Lorg/aspectj/lang/JoinPoint$StaticPart; PUTSTATIC HelloWorld.ajc$tjp_0 Lorg/aspectj/lang/JoinPoint$StaticPart; ALOAD_0 diff --git a/weaver/testdata/TraceJarHello.txt b/weaver/testdata/TraceJarHello.txt index 8589536d6..235adb924 100644 --- a/weaver/testdata/TraceJarHello.txt +++ b/weaver/testdata/TraceJarHello.txt @@ -46,19 +46,19 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria | ALOAD_0 | INVOKEVIRTUAL Trace.ajc$before$Trace$1$26352be2 (Ljava/lang/Object;)V | INVOKESTATIC MyTrace.aspectOf ()LMyTrace; - | BIPUSH 3 + | ICONST_3 | ANEWARRAY java.lang.Object | ASTORE 6 | ALOAD 6 - | BIPUSH 0 + | ICONST_0 | ALOAD_0 | AASTORE | ALOAD 6 - | BIPUSH 1 + | ICONST_1 | ALOAD_3 | AASTORE | ALOAD 6 - | BIPUSH 2 + | ICONST_2 | ALOAD 4 | AASTORE | NEW DynamicHelloWorld$AjcClosure3 @@ -93,19 +93,19 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria static final String doit_aroundBody2(DynamicHelloWorld, String, java.util.List): INVOKESTATIC MyTrace.aspectOf ()LMyTrace; (line 21) ALOAD_0 - BIPUSH 3 + ICONST_3 ANEWARRAY java.lang.Object ASTORE_3 ALOAD_3 - BIPUSH 0 + ICONST_0 ALOAD_0 AASTORE ALOAD_3 - BIPUSH 1 + ICONST_1 ALOAD_1 AASTORE ALOAD_3 - BIPUSH 2 + ICONST_2 ALOAD_2 AASTORE NEW DynamicHelloWorld$AjcClosure1 @@ -131,15 +131,15 @@ public class DynamicHelloWorld$AjcClosure1 extends org.aspectj.runtime.internal. GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_1 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST DynamicHelloWorld ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String ALOAD_2 - BIPUSH 2 + ICONST_2 AALOAD CHECKCAST java.util.List INVOKESTATIC DynamicHelloWorld.doit_aroundBody0 (LDynamicHelloWorld;Ljava/lang/String;Ljava/util/List;)Ljava/lang/String; @@ -160,15 +160,15 @@ public class DynamicHelloWorld$AjcClosure3 extends org.aspectj.runtime.internal. GETFIELD org.aspectj.runtime.internal.AroundClosure.state [Ljava/lang/Object; ASTORE_2 ALOAD_2 - BIPUSH 0 + ICONST_0 AALOAD CHECKCAST DynamicHelloWorld ALOAD_2 - BIPUSH 1 + ICONST_1 AALOAD CHECKCAST java.lang.String ALOAD_2 - BIPUSH 2 + ICONST_2 AALOAD CHECKCAST java.util.List INVOKESTATIC DynamicHelloWorld.doit_aroundBody2 (LDynamicHelloWorld;Ljava/lang/String;Ljava/util/List;)Ljava/lang/String; |