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

14 files changed, 27 insertions, 14 deletions

diff --git a/weaver/testdata/AddNotResidueDynamicHelloWorld.txt b/weaver/testdata/AddNotResidueDynamicHelloWorld.txt
index 48a5bfd77..674db3af5 100644
--- 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 16f438647..a990db62b 100644
--- 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 f0c96df34..8a3862c4b 100644
--- 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 0c2881392..56ef15d8b 100644
--- 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 cb71eca4b..722fe93c2 100644
--- 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 a2a9d3cc0..206a668aa 100644
--- 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 fd6bfd650..6f3061d6b 100644
--- 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 9ae90cc05..9fb9172e9 100644
--- 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 5155ab6d7..c4ad70f94 100644
--- 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 7da847852..1b62d4c68 100644
--- 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 55cc92c3e..b5e01bee0 100644
--- 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 ff1add1d2..e3bacfd97 100644
--- 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 8fb78655d..61e882ea5 100644
--- 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 6c361581f..db3b1504c 100644
--- 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