231396: refactoring AspectJ: Due to PMD reported problem in Utility - had to change expected code

1 files changed, 82 insertions, 82 deletions

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;