local variable information is different than before (not better or worse, just differ...

diff --git a/weaver/testdata/AddNotResidueDynamicHelloWorld.txt b/weaver/testdata/AddNotResidueDynamicHelloWorld.txt
index 48a5bfd77d7c3dc8f12449551af2ef393bef3388..674db3af5aaee4e937cc281bea5092ebfa808771 100644 (file)
--- a/weaver/testdata/AddNotResidueDynamicHelloWorld.txt
+++ b/weaver/testdata/AddNotResidueDynamicHelloWorld.txt
@@ -59,7 +59,7 @@ 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 arg0
+    |               ALOAD_1     // java.lang.String s
     |               ASTORE_3
     |               ASTORE 4
     | method-call(boolean java.util.List.add(java.lang.Object))
@@ -79,4 +79,5 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
     |               ARETURN
     method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List))
   end String doit(String, java.util.List)
+
 end public class DynamicHelloWorld

diff --git a/weaver/testdata/AddResidueDynamicHelloWorld.txt b/weaver/testdata/AddResidueDynamicHelloWorld.txt
index 16f43864732cc7ce87d529cd8e2bda0d446f7d57..a990db62b13f7e385e09ee21c694e755035b263e 100644 (file)
--- a/weaver/testdata/AddResidueDynamicHelloWorld.txt
+++ b/weaver/testdata/AddResidueDynamicHelloWorld.txt
@@ -59,7 +59,7 @@ 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 arg0
+    |               ALOAD_1     // java.lang.String s
     |               ASTORE_3
     |               ASTORE 4
     | method-call(boolean java.util.List.add(java.lang.Object))
@@ -79,4 +79,5 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
     |               ARETURN
     method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List))
   end String doit(String, java.util.List)
+
 end public class DynamicHelloWorld

diff --git a/weaver/testdata/AddStateResidueDynamicHelloWorld.txt b/weaver/testdata/AddStateResidueDynamicHelloWorld.txt
index f0c96df341dc6d08d88139b75ffbf8a5b3af8d8e..8a3862c4b50e4c23e1dea7aca66a08e84b0f9269 100644 (file)
--- a/weaver/testdata/AddStateResidueDynamicHelloWorld.txt
+++ b/weaver/testdata/AddStateResidueDynamicHelloWorld.txt
@@ -59,7 +59,7 @@ 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 arg0
+    |               ALOAD_1     // java.lang.String s
     |               ASTORE_3
     |               ASTORE 4
     | method-call(boolean java.util.List.add(java.lang.Object))
@@ -81,4 +81,5 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
     |               ARETURN
     method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List))
   end String doit(String, java.util.List)
+
 end public class DynamicHelloWorld

diff --git a/weaver/testdata/AroundArgsDynamicHelloWorld.txt b/weaver/testdata/AroundArgsDynamicHelloWorld.txt
index 0c2881392f1cdb1d7775d46a9c11c2a8664d252b..56ef15d8bcfc41aa7346d0dfcbf257b3e3c08641 100644 (file)
--- a/weaver/testdata/AroundArgsDynamicHelloWorld.txt
+++ b/weaver/testdata/AroundArgsDynamicHelloWorld.txt
@@ -59,7 +59,7 @@ 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 arg0
+    |               ALOAD_1     // java.lang.String s
     |               ASTORE_3
     |               ASTORE 4
     | method-call(boolean java.util.List.add(java.lang.Object))

diff --git a/weaver/testdata/CflowNonStaticBeforeFancyHelloWorld.txt b/weaver/testdata/CflowNonStaticBeforeFancyHelloWorld.txt
index cb71eca4b07df4318543e7b83f63de6247e13865..722fe93c2a62474d6f15eaf4719b48e480b38e41 100644 (file)
--- a/weaver/testdata/CflowNonStaticBeforeFancyHelloWorld.txt
+++ b/weaver/testdata/CflowNonStaticBeforeFancyHelloWorld.txt
@@ -89,4 +89,5 @@ public abstract class FancyHelloWorld extends java.lang.Object:
     |               ARETURN
     method-execution(java.lang.String FancyHelloWorld.getName())
   end public static String getName()
+
 end public abstract class FancyHelloWorld

diff --git a/weaver/testdata/CflowNonStaticBeforeHelloWorld.txt b/weaver/testdata/CflowNonStaticBeforeHelloWorld.txt
index a2a9d3cc0d3c1cae55bde2b862ccd87d34f49e3f..206a668aa226f1c5692b9a9a25ab1e5e1799c0d7 100644 (file)
--- a/weaver/testdata/CflowNonStaticBeforeHelloWorld.txt
+++ b/weaver/testdata/CflowNonStaticBeforeHelloWorld.txt
@@ -34,4 +34,5 @@ public class HelloWorld extends java.lang.Object:
     |               RETURN
     method-execution(void HelloWorld.main(java.lang.String[]))
   end public static void main(String[])
+
 end public class HelloWorld

diff --git a/weaver/testdata/CflowStateResidueDynamicHelloWorld.txt b/weaver/testdata/CflowStateResidueDynamicHelloWorld.txt
index fd6bfd6501184065ef58c6312f96646d5f99b56b..6f3061d6b38dd5e98819e4b3f67b25be11fe3049 100644 (file)
--- a/weaver/testdata/CflowStateResidueDynamicHelloWorld.txt
+++ b/weaver/testdata/CflowStateResidueDynamicHelloWorld.txt
@@ -67,7 +67,7 @@ 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 arg0
+    |               ALOAD_1     // java.lang.String s
     |               ASTORE_3
     |               ASTORE 4
     | method-call(boolean java.util.List.add(java.lang.Object))
@@ -116,4 +116,5 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
     |               ARETURN
     method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List))
   end String doit(String, java.util.List)
+
 end public class DynamicHelloWorld

diff --git a/weaver/testdata/NoResidueDynamicHelloWorld.txt b/weaver/testdata/NoResidueDynamicHelloWorld.txt
index 9ae90cc05dd3478feb016e35aa86882c52f89efc..9fb9172e9f7b88974df1cb4afb54bca9761808e2 100644 (file)
--- a/weaver/testdata/NoResidueDynamicHelloWorld.txt
+++ b/weaver/testdata/NoResidueDynamicHelloWorld.txt
@@ -59,7 +59,7 @@ 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 arg0
+    |               ALOAD_1     // java.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
@@ -72,4 +72,5 @@ public class DynamicHelloWorld extends java.lang.Object implements java.io.Seria
     |               ARETURN
     method-execution(java.lang.String DynamicHelloWorld.doit(java.lang.String, java.util.List))
   end String doit(String, java.util.List)
+
 end public class DynamicHelloWorld

diff --git a/weaver/testdata/PerThisNonStaticBeforeFancyHelloWorld.txt b/weaver/testdata/PerThisNonStaticBeforeFancyHelloWorld.txt
index 5155ab6d7f3f6508f325c87391f60b0fd66007f1..c4ad70f94ca7f739dd42ef81d96d8230ad40ce53 100644 (file)
--- a/weaver/testdata/PerThisNonStaticBeforeFancyHelloWorld.txt
+++ b/weaver/testdata/PerThisNonStaticBeforeFancyHelloWorld.txt
@@ -110,4 +110,5 @@ public abstract class FancyHelloWorld extends java.lang.Object:
     |               ARETURN
     method-execution(java.lang.String FancyHelloWorld.getName())
   end public static String getName()
+
 end public abstract class FancyHelloWorld

diff --git a/weaver/testdata/PerThisNonStaticBeforeHelloWorld.txt b/weaver/testdata/PerThisNonStaticBeforeHelloWorld.txt
index 7da8478529310e18fec964f980e1c631f2894ee1..1b62d4c68b7788802819e34d5af4473f86bfcd91 100644 (file)
--- a/weaver/testdata/PerThisNonStaticBeforeHelloWorld.txt
+++ b/weaver/testdata/PerThisNonStaticBeforeHelloWorld.txt
@@ -31,4 +31,5 @@ public class HelloWorld extends java.lang.Object:
     |               RETURN   (line 11)
     method-execution(void HelloWorld.main(java.lang.String[]))
   end public static void main(String[])
+
 end public class HelloWorld

diff --git a/weaver/testdata/StateResidueMultiArgHelloWorld.txt b/weaver/testdata/StateResidueMultiArgHelloWorld.txt
index 55cc92c3e71f49beadc8fc4d30fc5ccc1abf6332..b5e01bee0c3698b6fa34db8fe6329b55f490638f 100644 (file)
--- a/weaver/testdata/StateResidueMultiArgHelloWorld.txt
+++ b/weaver/testdata/StateResidueMultiArgHelloWorld.txt
@@ -38,7 +38,7 @@ public class MultiArgHelloWorld extends java.lang.Object:
     | constructor-call(void java.lang.StringBuffer.<init>())
     | |             INVOKESPECIAL java.lang.StringBuffer.<init> ()V
     | constructor-call(void java.lang.StringBuffer.<init>())
-    |               ALOAD_0     // java.lang.Object arg0
+    |               ALOAD_0     // java.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))
@@ -46,7 +46,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     // java.lang.Object arg1
     | 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))
@@ -59,4 +59,5 @@ public class MultiArgHelloWorld extends java.lang.Object:
     |               RETURN   (line 11)
     method-execution(void MultiArgHelloWorld.foo(java.lang.Object, java.lang.Object))
   end static void foo(Object, Object)
+
 end public class MultiArgHelloWorld

diff --git a/weaver/testdata/StringResidue1MultiArgHelloWorld.txt b/weaver/testdata/StringResidue1MultiArgHelloWorld.txt
index ff1add1d2fde17b15e95c24bce49f7697f97dee6..e3bacfd97c21ebad3defe9119514388453dfb349 100644 (file)
--- a/weaver/testdata/StringResidue1MultiArgHelloWorld.txt
+++ b/weaver/testdata/StringResidue1MultiArgHelloWorld.txt
@@ -39,7 +39,7 @@ public class MultiArgHelloWorld extends java.lang.Object:
     | constructor-call(void java.lang.StringBuffer.<init>())
     | |             INVOKESPECIAL java.lang.StringBuffer.<init> ()V
     | constructor-call(void java.lang.StringBuffer.<init>())
-    |               ALOAD_0     // java.lang.Object arg0
+    |               ALOAD_0     // java.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))
@@ -47,7 +47,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     // java.lang.Object arg1
     | 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))
@@ -60,4 +60,5 @@ public class MultiArgHelloWorld extends java.lang.Object:
     |               RETURN   (line 11)
     method-execution(void MultiArgHelloWorld.foo(java.lang.Object, java.lang.Object))
   end static void foo(Object, Object)
+
 end public class MultiArgHelloWorld

diff --git a/weaver/testdata/StringResidue2MultiArgHelloWorld.txt b/weaver/testdata/StringResidue2MultiArgHelloWorld.txt
index 8fb78655dbf586a8ea76c4ae1f345e055f115b52..61e882ea54f0cf58f7d1320f32f1f7cd71531a3e 100644 (file)
--- a/weaver/testdata/StringResidue2MultiArgHelloWorld.txt
+++ b/weaver/testdata/StringResidue2MultiArgHelloWorld.txt
@@ -36,7 +36,7 @@ public class MultiArgHelloWorld extends java.lang.Object:
     | constructor-call(void java.lang.StringBuffer.<init>())
     | |             INVOKESPECIAL java.lang.StringBuffer.<init> ()V
     | constructor-call(void java.lang.StringBuffer.<init>())
-    |               ALOAD_0     // java.lang.Object arg0
+    |               ALOAD_0     // java.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))
@@ -44,7 +44,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     // java.lang.Object arg1
     | 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))
@@ -57,4 +57,5 @@ public class MultiArgHelloWorld extends java.lang.Object:
     |               RETURN   (line 11)
     method-execution(void MultiArgHelloWorld.foo(java.lang.Object, java.lang.Object))
   end static void foo(Object, Object)
+
 end public class MultiArgHelloWorld

diff --git a/weaver/testdata/StringResidue3MultiArgHelloWorld.txt b/weaver/testdata/StringResidue3MultiArgHelloWorld.txt
index 6c361581f9ec462960f9cd2a3cfe937c1319fa4a..db3b1504cf139ce9fcb610dba4a518c62b4c6a6e 100644 (file)
--- a/weaver/testdata/StringResidue3MultiArgHelloWorld.txt
+++ b/weaver/testdata/StringResidue3MultiArgHelloWorld.txt
@@ -36,7 +36,7 @@ public class MultiArgHelloWorld extends java.lang.Object:
     | constructor-call(void java.lang.StringBuffer.<init>())
     | |             INVOKESPECIAL java.lang.StringBuffer.<init> ()V
     | constructor-call(void java.lang.StringBuffer.<init>())
-    |               ALOAD_0     // java.lang.Object arg0
+    |               ALOAD_0     // java.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))
@@ -44,7 +44,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     // java.lang.Object arg1
     | 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))
@@ -57,4 +57,5 @@ public class MultiArgHelloWorld extends java.lang.Object:
     |               RETURN   (line 11)
     method-execution(void MultiArgHelloWorld.foo(java.lang.Object, java.lang.Object))
   end static void foo(Object, Object)
+
 end public class MultiArgHelloWorld