Index: src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java,v retrieving revision 1.109 diff -u -r1.109 AnnotationTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java 7 Jul 2005 10:43:28 -0000 1.109 +++ src/org/eclipse/jdt/core/tests/compiler/regression/AnnotationTest.java 25 Jul 2005 14:28:01 -0000 @@ -2983,10 +2983,10 @@ String expectedOutput = " Inner classes:\n" + - " [inner class info: #30 X$MyAnon, outer class info: #2 X\n" + + " [inner class info: #29 X$MyAnon, outer class info: #1 X\n" + " inner name: #68 MyAnon, accessflags: 9737 public abstract static ],\n" + - " [inner class info: #70 X$I, outer class info: #2 X\n" + - " inner name: #71 I, accessflags: 1545 public abstract static ]"; + " [inner class info: #69 X$I, outer class info: #1 X\n" + + " inner name: #71 I, accessflags: 1545 public abstract static ]\n"; int index = actualOutput.indexOf(expectedOutput); if (index == -1 || expectedOutput.length() == 0) { Index: src/org/eclipse/jdt/core/tests/compiler/regression/ArrayTest.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ArrayTest.java,v retrieving revision 1.11 diff -u -r1.11 ArrayTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/ArrayTest.java 31 May 2005 15:34:05 -0000 1.11 +++ src/org/eclipse/jdt/core/tests/compiler/regression/ArrayTest.java 25 Jul 2005 14:28:01 -0000 @@ -124,8 +124,8 @@ String expectedOutput = " static {};\n" + " 0 iconst_2\n" + - " 1 anewarray java.lang.Object [4]\n" + - " 4 putstatic X.X : java.lang.Object[] [10]\n" + + " 1 anewarray java.lang.Object [3]\n" + + " 4 putstatic X.X : java.lang.Object[] [9]\n" + " 7 return\n" + " Line numbers:\n" + " [pc: 0, line: 2]\n" + Index: src/org/eclipse/jdt/core/tests/compiler/regression/AutoBoxingTest.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AutoBoxingTest.java,v retrieving revision 1.79 diff -u -r1.79 AutoBoxingTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/AutoBoxingTest.java 7 Jul 2005 10:43:28 -0000 1.79 +++ src/org/eclipse/jdt/core/tests/compiler/regression/AutoBoxingTest.java 25 Jul 2005 14:28:02 -0000 @@ -1055,20 +1055,20 @@ " // Method descriptor #15 ([Ljava/lang/String;)V\n" + " // Stack: 4, Locals: 1\n" + " public static void main(String[] s);\n" + - " 0 new java.lang.Integer [17]\n" + + " 0 new java.lang.Integer [16]\n" + " 3 dup\n" + " 4 iconst_1\n" + - " 5 invokespecial java.lang.Integer(int) [20]\n" + - " 8 new java.lang.Integer [17]\n" + + " 5 invokespecial java.lang.Integer(int) [18]\n" + + " 8 new java.lang.Integer [16]\n" + " 11 dup\n" + " 12 iconst_0\n" + - " 13 invokespecial java.lang.Integer(int) [20]\n" + + " 13 invokespecial java.lang.Integer(int) [18]\n" + " 16 if_acmpne 25\n" + - " 19 getstatic java.lang.System.out : java.io.PrintStream [26]\n" + - " 22 invokevirtual java.io.PrintStream.println() : void [31]\n" + - " 25 getstatic java.lang.System.out : java.io.PrintStream [26]\n" + - " 28 ldc [33]\n" + - " 30 invokevirtual java.io.PrintStream.print(java.lang.String) : void [37]\n" + + " 19 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 22 invokevirtual java.io.PrintStream.println() : void [27]\n" + + " 25 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 28 ldc [32]\n" + + " 30 invokevirtual java.io.PrintStream.print(java.lang.String) : void [34]\n" + " 33 return\n"; int index = actualOutput.indexOf(expectedOutput); Index: src/org/eclipse/jdt/core/tests/compiler/regression/CastTest.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/CastTest.java,v retrieving revision 1.28 diff -u -r1.28 CastTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/CastTest.java 7 Jul 2005 10:43:28 -0000 1.28 +++ src/org/eclipse/jdt/core/tests/compiler/regression/CastTest.java 25 Jul 2005 14:28:02 -0000 @@ -81,9 +81,9 @@ " 3 astore_1 [c1]\n" + " 4 aload_1 [c1]\n" + " 5 astore_2 [c2]\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 ldc [23]\n" + - " 11 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 ldc [22]\n" + + " 11 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1297,15 +1297,15 @@ " // Method descriptor #15 ([Ljava/lang/String;)V\n" + " // Stack: 2, Locals: 4\n" + " public static void main(String[] args);\n" + - " 0 new java.util.ArrayList [17]\n" + + " 0 new java.util.ArrayList [16]\n" + " 3 dup\n" + " 4 invokespecial java.util.ArrayList() [18]\n" + " 7 astore_1 [list]\n" + - " 8 new java.util.ArrayList [17]\n" + + " 8 new java.util.ArrayList [16]\n" + " 11 dup\n" + " 12 invokespecial java.util.ArrayList() [18]\n" + " 15 astore_1 [list]\n" + - " 16 new java.util.ArrayList [17]\n" + + " 16 new java.util.ArrayList [16]\n" + " 19 dup\n" + " 20 invokespecial java.util.ArrayList() [18]\n" + " 23 astore_2 [alist]\n" + @@ -1313,9 +1313,9 @@ " 25 astore_3 [list2]\n" + " 26 aload_2 [alist]\n" + " 27 astore_3 [list2]\n" + - " 28 getstatic java.lang.System.out : java.io.PrintStream [24]\n" + - " 31 ldc [26]\n" + - " 33 invokevirtual java.io.PrintStream.println(java.lang.String) : void [32]\n" + + " 28 getstatic java.lang.System.out : java.io.PrintStream [19]\n" + + " 31 ldc [25]\n" + + " 33 invokevirtual java.io.PrintStream.println(java.lang.String) : void [27]\n" + " 36 return\n" + " Line numbers:\n" + " [pc: 0, line: 6]\n" + Index: src/org/eclipse/jdt/core/tests/compiler/regression/ClassFileReaderTest.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ClassFileReaderTest.java,v retrieving revision 1.36 diff -u -r1.36 ClassFileReaderTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/ClassFileReaderTest.java 31 May 2005 15:34:03 -0000 1.36 +++ src/org/eclipse/jdt/core/tests/compiler/regression/ClassFileReaderTest.java 25 Jul 2005 14:28:02 -0000 @@ -159,11 +159,11 @@ " // Method descriptor #19 ()I\n" + " // Stack: 3, Locals: 1\n" + " public int foo();\n" + - " 0 new A001$1$A [21]\n" + + " 0 new A001$1$A [20]\n" + " 3 dup\n" + " 4 aload_0 [this]\n" + - " 5 invokespecial A001$1$A(A001) [24]\n" + - " 8 invokevirtual A001$1$A.get() : int [27]\n" + + " 5 invokespecial A001$1$A(A001) [22]\n" + + " 8 invokevirtual A001$1$A.get() : int [25]\n" + " 11 ireturn\n" + " Line numbers:\n" + " [pc: 0, line: 9]\n" + @@ -187,10 +187,10 @@ " // Method descriptor #15 ([Ljava/lang/String;)V\n" + " // Stack: 1, Locals: 1\n" + " public static void main(String[] args);\n" + - " 0 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 3 invokevirtual java.io.PrintStream.println() : void [26]\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 0 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 3 invokevirtual java.io.PrintStream.println() : void [22]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 12 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -230,10 +230,10 @@ " // Method descriptor #6 ()V\n" + " // Stack: 2, Locals: 1\n" + " public void foo();\n" + - " 0 getstatic java.lang.System.out : java.io.PrintStream [22]\n" + + " 0 getstatic java.lang.System.out : java.io.PrintStream [17]\n" + " 3 aload_0 [this]\n" + - " 4 invokevirtual A003.bar() : int [24]\n" + - " 7 invokevirtual java.io.PrintStream.println(int) : void [30]\n" + + " 4 invokevirtual A003.bar() : int [23]\n" + + " 7 invokevirtual java.io.PrintStream.println(int) : void [25]\n" + " 10 return\n" + " Line numbers:\n" + " [pc: 0, line: 8]\n" + @@ -271,9 +271,9 @@ " 8 if_icmpne 22\n" + " 11 iload_1 [b]\n" + " 12 ifne 22\n" + - " 15 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 15 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 18 iload_2 [i]\n" + - " 19 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 19 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 22 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -312,9 +312,9 @@ " 3 iload_1 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpne 16\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 12 iload_1 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -379,8 +379,8 @@ " 1 istore_1 [b]\n" + " 2 iload_1 [b]\n" + " 3 ifne 12\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 12 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -451,9 +451,9 @@ " 8 if_icmpeq 15\n" + " 11 iload_1 [b]\n" + " 12 ifne 22\n" + - " 15 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 15 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 18 iload_2 [i]\n" + - " 19 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 19 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 22 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -492,9 +492,9 @@ " 3 iload_1 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpeq 9\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 12 iload_1 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -530,9 +530,9 @@ " 3 iload_1 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpne 16\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 12 iload_1 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -565,8 +565,8 @@ " public static void main(String[] args);\n" + " 0 iconst_0\n" + " 1 istore_1 [b]\n" + - " 2 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 5 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 2 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 5 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 8 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -600,8 +600,8 @@ " 1 istore_1 [b]\n" + " 2 iload_1 [b]\n" + " 3 ifne 12\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 12 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -649,9 +649,9 @@ " 21 goto 25\n" + " 24 iconst_1\n" + " 25 if_icmpne 35\n" + - " 28 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 28 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 31 iload_2 [i]\n" + - " 32 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 32 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 35 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -690,9 +690,9 @@ " 3 iload_1 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpne 16\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 12 iload_1 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -728,9 +728,9 @@ " 3 iload_1 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpeq 16\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 12 iload_1 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -765,8 +765,8 @@ " 1 istore_1 [b]\n" + " 2 iload_1 [b]\n" + " 3 ifne 12\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 12 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -801,8 +801,8 @@ " 1 istore_1 [b]\n" + " 2 iload_1 [b]\n" + " 3 ifeq 12\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 12 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -847,9 +847,9 @@ " 14 goto 21\n" + " 17 iload_1 [b]\n" + " 18 ifne 28\n" + - " 21 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 21 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 24 iload_2 [i]\n" + - " 25 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 25 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 28 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -888,9 +888,9 @@ " 3 iload_1 [i]\n" + " 4 iconst_5\n" + " 5 if_icmplt 15\n" + - " 8 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 8 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 11 iload_1 [i]\n" + - " 12 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 12 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 15 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -926,9 +926,9 @@ " 2 istore_1 [i]\n" + " 3 iload_1 [i]\n" + " 4 iflt 14\n" + - " 7 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 7 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 10 iload_1 [i]\n" + - " 11 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 11 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -963,9 +963,9 @@ " 2 istore_1 [i]\n" + " 3 iload_1 [i]\n" + " 4 ifgt 14\n" + - " 7 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 7 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 10 iload_1 [i]\n" + - " 11 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 11 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1000,9 +1000,9 @@ " 2 istore_1 [i]\n" + " 3 iload_1 [i]\n" + " 4 ifle 14\n" + - " 7 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 7 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 10 iload_1 [i]\n" + - " 11 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 11 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1037,9 +1037,9 @@ " 2 istore_1 [i]\n" + " 3 iload_1 [i]\n" + " 4 ifge 14\n" + - " 7 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 7 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 10 iload_1 [i]\n" + - " 11 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 11 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1075,9 +1075,9 @@ " 3 iload_1 [i]\n" + " 4 iconst_5\n" + " 5 if_icmple 15\n" + - " 8 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 8 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 11 iload_1 [i]\n" + - " 12 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 12 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 15 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1114,9 +1114,9 @@ " 2 istore_1 [i]\n" + " 3 iload_1 [i]\n" + " 4 ifge 14\n" + - " 7 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 7 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 10 iload_1 [i]\n" + - " 11 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 11 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1152,9 +1152,9 @@ " 2 istore_1 [i]\n" + " 3 iload_1 [i]\n" + " 4 ifle 14\n" + - " 7 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 7 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 10 iload_1 [i]\n" + - " 11 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 11 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1190,9 +1190,9 @@ " 3 iload_1 [i]\n" + " 4 iconst_5\n" + " 5 if_icmpge 15\n" + - " 8 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 8 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 11 iload_1 [i]\n" + - " 12 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 12 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 15 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1228,9 +1228,9 @@ " 2 istore_1 [i]\n" + " 3 iload_1 [i]\n" + " 4 ifgt 14\n" + - " 7 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 7 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 10 iload_1 [i]\n" + - " 11 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 11 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1266,9 +1266,9 @@ " 2 istore_1 [i]\n" + " 3 iload_1 [i]\n" + " 4 iflt 14\n" + - " 7 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 7 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 10 iload_1 [i]\n" + - " 11 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 11 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1304,9 +1304,9 @@ " 3 iload_1 [i]\n" + " 4 iconst_5\n" + " 5 if_icmpgt 15\n" + - " 8 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 8 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 11 iload_1 [i]\n" + - " 12 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 12 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 15 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1343,9 +1343,9 @@ " 3 iload_1 [i]\n" + " 4 iconst_5\n" + " 5 if_icmpgt 15\n" + - " 8 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 8 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 11 iload_1 [i]\n" + - " 12 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 12 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 15 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1395,9 +1395,9 @@ " 24 iconst_1\n" + " 25 iand\n" + " 26 ifeq 36\n" + - " 29 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 29 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 32 iload_2 [i]\n" + - " 33 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 33 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 36 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1436,9 +1436,9 @@ " 3 iload_1 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpne 16\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 12 iload_1 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1503,8 +1503,8 @@ " 1 istore_1 [b]\n" + " 2 iload_1 [b]\n" + " 3 ifne 12\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 12 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1583,9 +1583,9 @@ " 24 iconst_1\n" + " 25 ior\n" + " 26 ifeq 36\n" + - " 29 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 29 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 32 iload_2 [i]\n" + - " 33 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 33 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 36 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1621,9 +1621,9 @@ " public static void main(String[] args);\n" + " 0 bipush 6\n" + " 2 istore_1 [i]\n" + - " 3 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 3 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 6 iload_1 [i]\n" + - " 7 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 7 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 10 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1658,9 +1658,9 @@ " 3 iload_1 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpne 16\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 12 iload_1 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1693,8 +1693,8 @@ " public static void main(String[] args);\n" + " 0 iconst_0\n" + " 1 istore_1 [b]\n" + - " 2 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 5 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 2 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 5 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 8 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1728,8 +1728,8 @@ " 1 istore_1 [b]\n" + " 2 iload_1 [b]\n" + " 3 ifne 12\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 12 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1778,9 +1778,9 @@ " 24 iconst_1\n" + " 25 ixor\n" + " 26 ifeq 36\n" + - " 29 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 29 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 32 iload_2 [i]\n" + - " 33 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 33 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 36 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1819,9 +1819,9 @@ " 3 iload_1 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpeq 16\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 12 iload_1 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1857,9 +1857,9 @@ " 3 iload_1 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpne 16\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 12 iload_1 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1894,8 +1894,8 @@ " 1 istore_1 [b]\n" + " 2 iload_1 [b]\n" + " 3 ifeq 12\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 12 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1930,8 +1930,8 @@ " 1 istore_1 [b]\n" + " 2 iload_1 [b]\n" + " 3 ifne 12\n" + - " 6 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 9 invokevirtual java.io.PrintStream.println() : void [26]\n" + + " 6 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 9 invokevirtual java.io.PrintStream.println() : void [22]\n" + " 12 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -2057,9 +2057,9 @@ " 2 iload_0 [i]\n" + " 3 bipush 6\n" + " 5 if_icmpne 8\n" + - " 8 getstatic java.lang.System.out : java.io.PrintStream [26]\n" + + " 8 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + " 11 iload_0 [i]\n" + - " 12 invokevirtual java.io.PrintStream.println(int) : void [32]\n" + + " 12 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + " 15 return\n" + " Line numbers:\n" + " [pc: 0, line: 6]\n" + @@ -2122,9 +2122,9 @@ " 3 iload_0 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpeq 9\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [26]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + " 12 iload_0 [i]\n" + - " 13 invokevirtual java.io.PrintStream.println(int) : void [32]\n" + + " 13 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 6]\n" + @@ -2161,7 +2161,7 @@ " 2 iload_0 [i]\n" + " 3 bipush 6\n" + " 5 if_icmpne 12\n" + - " 8 invokestatic X.boom() : boolean [27]\n" + + " 8 invokestatic X.boom() : boolean [26]\n" + " 11 pop\n" + " 12 return\n" + " Line numbers:\n" + @@ -2199,11 +2199,11 @@ " 2 iload_0 [i]\n" + " 3 bipush 6\n" + " 5 if_icmpne 14\n" + - " 8 invokestatic X.boom() : boolean [27]\n" + + " 8 invokestatic X.boom() : boolean [26]\n" + " 11 ifeq 14\n" + - " 14 getstatic java.lang.System.out : java.io.PrintStream [33]\n" + + " 14 getstatic java.lang.System.out : java.io.PrintStream [28]\n" + " 17 iload_0 [i]\n" + - " 18 invokevirtual java.io.PrintStream.println(int) : void [39]\n" + + " 18 invokevirtual java.io.PrintStream.println(int) : void [34]\n" + " 21 return\n" + " Line numbers:\n" + " [pc: 0, line: 9]\n" + @@ -2241,7 +2241,7 @@ " 3 iload_0 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpeq 13\n" + - " 9 invokestatic X.boom() : boolean [27]\n" + + " 9 invokestatic X.boom() : boolean [26]\n" + " 12 pop\n" + " 13 return\n" + " Line numbers:\n" + @@ -2278,11 +2278,11 @@ " 3 iload_0 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpeq 15\n" + - " 9 invokestatic X.boom() : boolean [27]\n" + + " 9 invokestatic X.boom() : boolean [26]\n" + " 12 ifne 15\n" + - " 15 getstatic java.lang.System.out : java.io.PrintStream [33]\n" + + " 15 getstatic java.lang.System.out : java.io.PrintStream [28]\n" + " 18 iload_0 [i]\n" + - " 19 invokevirtual java.io.PrintStream.println(int) : void [39]\n" + + " 19 invokevirtual java.io.PrintStream.println(int) : void [34]\n" + " 22 return\n" + " Line numbers:\n" + " [pc: 0, line: 9]\n" + @@ -2342,9 +2342,9 @@ " static void foo3();\n" + " 0 iconst_5\n" + " 1 istore_0 [i]\n" + - " 2 getstatic java.lang.System.out : java.io.PrintStream [26]\n" + + " 2 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + " 5 iload_0 [i]\n" + - " 6 invokevirtual java.io.PrintStream.println(int) : void [32]\n" + + " 6 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + " 9 return\n" + " Line numbers:\n" + " [pc: 0, line: 6]\n" + @@ -2403,9 +2403,9 @@ " static void bar3();\n" + " 0 bipush 6\n" + " 2 istore_0 [i]\n" + - " 3 getstatic java.lang.System.out : java.io.PrintStream [26]\n" + + " 3 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + " 6 iload_0 [i]\n" + - " 7 invokevirtual java.io.PrintStream.println(int) : void [32]\n" + + " 7 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + " 10 return\n" + " Line numbers:\n" + " [pc: 0, line: 6]\n" + @@ -2470,9 +2470,9 @@ " static void foo4();\n" + " 0 iconst_5\n" + " 1 istore_0 [i]\n" + - " 2 getstatic java.lang.System.out : java.io.PrintStream [31]\n" + + " 2 getstatic java.lang.System.out : java.io.PrintStream [26]\n" + " 5 iload_0 [i]\n" + - " 6 invokevirtual java.io.PrintStream.println(int) : void [37]\n" + + " 6 invokevirtual java.io.PrintStream.println(int) : void [32]\n" + " 9 return\n" + " Line numbers:\n" + " [pc: 0, line: 9]\n" + @@ -2537,9 +2537,9 @@ " static void bar4();\n" + " 0 bipush 6\n" + " 2 istore_0 [i]\n" + - " 3 getstatic java.lang.System.out : java.io.PrintStream [31]\n" + + " 3 getstatic java.lang.System.out : java.io.PrintStream [26]\n" + " 6 iload_0 [i]\n" + - " 7 invokevirtual java.io.PrintStream.println(int) : void [37]\n" + + " 7 invokevirtual java.io.PrintStream.println(int) : void [32]\n" + " 10 return\n" + " Line numbers:\n" + " [pc: 0, line: 9]\n" + @@ -2575,7 +2575,7 @@ " 2 iload_0 [i]\n" + " 3 bipush 6\n" + " 5 if_icmpne 12\n" + - " 8 invokestatic X.boom() : boolean [27]\n" + + " 8 invokestatic X.boom() : boolean [26]\n" + " 11 pop\n" + " 12 return\n" + " Line numbers:\n" + @@ -2613,11 +2613,11 @@ " 2 iload_0 [i]\n" + " 3 bipush 6\n" + " 5 if_icmpne 14\n" + - " 8 invokestatic X.boom() : boolean [27]\n" + + " 8 invokestatic X.boom() : boolean [26]\n" + " 11 ifeq 14\n" + - " 14 getstatic java.lang.System.out : java.io.PrintStream [33]\n" + + " 14 getstatic java.lang.System.out : java.io.PrintStream [28]\n" + " 17 iload_0 [i]\n" + - " 18 invokevirtual java.io.PrintStream.println(int) : void [39]\n" + + " 18 invokevirtual java.io.PrintStream.println(int) : void [34]\n" + " 21 return\n" + " Line numbers:\n" + " [pc: 0, line: 9]\n" + @@ -2655,7 +2655,7 @@ " 3 iload_0 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpeq 13\n" + - " 9 invokestatic X.boom() : boolean [27]\n" + + " 9 invokestatic X.boom() : boolean [26]\n" + " 12 pop\n" + " 13 return\n" + " Line numbers:\n" + @@ -2692,11 +2692,11 @@ " 3 iload_0 [i]\n" + " 4 bipush 6\n" + " 6 if_icmpeq 15\n" + - " 9 invokestatic X.boom() : boolean [27]\n" + + " 9 invokestatic X.boom() : boolean [26]\n" + " 12 ifne 15\n" + - " 15 getstatic java.lang.System.out : java.io.PrintStream [33]\n" + + " 15 getstatic java.lang.System.out : java.io.PrintStream [28]\n" + " 18 iload_0 [i]\n" + - " 19 invokevirtual java.io.PrintStream.println(int) : void [39]\n" + + " 19 invokevirtual java.io.PrintStream.println(int) : void [34]\n" + " 22 return\n" + " Line numbers:\n" + " [pc: 0, line: 9]\n" + @@ -2719,10 +2719,10 @@ "// Compiled from I.java (version 1.2 : 46.0, no super bit)\n" + "public abstract interface I extends java.lang.Object {\n" + " Constant pool:\n" + - " constant #1 utf8: I\n" + - " constant #2 class: #1 I\n" + - " constant #3 utf8: java/lang/Object\n" + - " constant #4 class: #3 java/lang/Object\n" + + " constant #1 class: #2 I\n" + + " constant #2 utf8: I\n" + + " constant #3 class: #4 java/lang/Object\n" + + " constant #4 utf8: java/lang/Object\n" + " constant #5 utf8: SourceFile\n" + " constant #6 utf8: I.java\n" + "}"; @@ -2775,14 +2775,14 @@ " 0 iconst_0\n" + " 1 newarray long [11]\n" + " 3 astore_1 [tab]\n" + - " 4 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 4 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 7 aload_1 [tab]\n" + - " 8 invokevirtual long[].clone() : java.lang.Object [27]\n" + - " 11 invokevirtual java.io.PrintStream.println(java.lang.Object) : void [33]\n" + - " 14 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 8 invokevirtual long[].clone() : java.lang.Object [22]\n" + + " 11 invokevirtual java.io.PrintStream.println(java.lang.Object) : void [28]\n" + + " 14 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 17 aload_1 [tab]\n" + - " 18 invokevirtual long[].clone() : java.lang.Object [27]\n" + - " 21 invokevirtual java.io.PrintStream.println(java.lang.Object) : void [33]\n" + + " 18 invokevirtual long[].clone() : java.lang.Object [22]\n" + + " 21 invokevirtual java.io.PrintStream.println(java.lang.Object) : void [28]\n" + " 24 return\n"; checkClassFile("1.5", "X", source, expectedOutput); } Index: src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_3.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_3.java,v retrieving revision 1.66 diff -u -r1.66 Compliance_1_3.java --- src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_3.java 31 May 2005 15:34:05 -0000 1.66 +++ src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_3.java 25 Jul 2005 14:28:02 -0000 @@ -1642,7 +1642,7 @@ } String expectedOutput = - " 1 invokevirtual java.lang.Object.clone() : java.lang.Object [19]\n"; + " 1 invokevirtual java.lang.Object.clone() : java.lang.Object [16]\n"; int index = actualOutput.indexOf(expectedOutput); if (index == -1 || expectedOutput.length() == 0) { Index: src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_4.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_4.java,v retrieving revision 1.67 diff -u -r1.67 Compliance_1_4.java --- src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_4.java 31 May 2005 15:34:05 -0000 1.67 +++ src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_4.java 25 Jul 2005 14:28:02 -0000 @@ -1640,7 +1640,7 @@ } String expectedOutput = - " 1 invokevirtual java.lang.String[].clone() : java.lang.Object [21]\n"; + " 1 invokevirtual java.lang.String[].clone() : java.lang.Object [16]\n"; int index = actualOutput.indexOf(expectedOutput); if (index == -1 || expectedOutput.length() == 0) { Index: src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_5.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_5.java,v retrieving revision 1.37 diff -u -r1.37 Compliance_1_5.java --- src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_5.java 31 May 2005 15:34:05 -0000 1.37 +++ src/org/eclipse/jdt/core/tests/compiler/regression/Compliance_1_5.java 25 Jul 2005 14:28:02 -0000 @@ -1649,7 +1649,7 @@ } String expectedOutput = - " 1 invokevirtual java.lang.String[].clone() : java.lang.Object [21]\n"; + " 1 invokevirtual java.lang.String[].clone() : java.lang.Object [16]\n"; int index = actualOutput.indexOf(expectedOutput); if (index == -1 || expectedOutput.length() == 0) { Index: src/org/eclipse/jdt/core/tests/compiler/regression/ConstantTest.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ConstantTest.java,v retrieving revision 1.14 diff -u -r1.14 ConstantTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/ConstantTest.java 31 May 2005 15:34:05 -0000 1.14 +++ src/org/eclipse/jdt/core/tests/compiler/regression/ConstantTest.java 25 Jul 2005 14:28:02 -0000 @@ -358,9 +358,9 @@ " // Method descriptor #15 ([Ljava/lang/String;)V\n" + " // Stack: 3, Locals: 4\n" + " public static void main(String[] args);\n" + - " 0 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 3 ldc [23]\n" + - " 5 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 0 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 3 ldc [22]\n" + + " 5 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 8 aconst_null\n" + " 9 goto 13\n" + " 12 aconst_null\n" + @@ -368,39 +368,39 @@ " 14 goto 18\n" + " 17 aconst_null\n" + " 18 if_acmpne 29\n" + - " 21 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 24 ldc [31]\n" + - " 26 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + - " 29 new java.lang.StringBuffer [33]\n" + + " 21 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 24 ldc [30]\n" + + " 26 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + + " 29 new java.lang.StringBuffer [32]\n" + " 32 dup\n" + - " 33 ldc [35]\n" + - " 35 invokespecial java.lang.StringBuffer(java.lang.String) [37]\n" + + " 33 ldc [34]\n" + + " 35 invokespecial java.lang.StringBuffer(java.lang.String) [36]\n" + " 38 aconst_null\n" + - " 39 invokevirtual java.lang.StringBuffer.append(java.lang.Object) : java.lang.StringBuffer [41]\n" + - " 42 ldc [43]\n" + - " 44 invokevirtual java.lang.StringBuffer.append(java.lang.String) : java.lang.StringBuffer [46]\n" + - " 47 invokevirtual java.lang.StringBuffer.toString() : java.lang.String [50]\n" + - " 50 ldc [52]\n" + + " 39 invokevirtual java.lang.StringBuffer.append(java.lang.Object) : java.lang.StringBuffer [38]\n" + + " 42 ldc [42]\n" + + " 44 invokevirtual java.lang.StringBuffer.append(java.lang.String) : java.lang.StringBuffer [44]\n" + + " 47 invokevirtual java.lang.StringBuffer.toString() : java.lang.String [47]\n" + + " 50 ldc [51]\n" + " 52 if_acmpne 59\n" + " 55 iconst_1\n" + " 56 goto 60\n" + " 59 iconst_0\n" + " 60 istore_1 [b]\n" + - " 61 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 64 ldc [54]\n" + - " 66 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 61 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 64 ldc [53]\n" + + " 66 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 69 aconst_null\n" + " 70 astore_2 [s]\n" + " 71 aload_2 [s]\n" + " 72 ifnonnull 83\n" + - " 75 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 78 ldc [56]\n" + - " 80 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + - " 83 ldc [58]\n" + + " 75 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 78 ldc [55]\n" + + " 80 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + + " 83 ldc [57]\n" + " 85 astore_3 [s2]\n" + - " 86 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 89 ldc [60]\n" + - " 91 invokevirtual java.io.PrintStream.println(java.lang.String) : void [63]\n" + + " 86 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 89 ldc [59]\n" + + " 91 invokevirtual java.io.PrintStream.println(java.lang.String) : void [61]\n" + " 94 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -423,9 +423,9 @@ " // Method descriptor #15 ([Ljava/lang/String;)V\n" + " // Stack: 3, Locals: 4\n" + " public static void main(String[] args);\n" + - " 0 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 3 ldc [23]\n" + - " 5 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 0 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 3 ldc [22]\n" + + " 5 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 8 aconst_null\n" + " 9 goto 13\n" + " 12 aconst_null\n" + @@ -433,39 +433,39 @@ " 14 goto 18\n" + " 17 aconst_null\n" + " 18 if_acmpne 29\n" + - " 21 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 24 ldc [31]\n" + - " 26 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + - " 29 new java.lang.StringBuilder [33]\n" + + " 21 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 24 ldc [30]\n" + + " 26 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + + " 29 new java.lang.StringBuilder [32]\n" + " 32 dup\n" + - " 33 ldc [35]\n" + - " 35 invokespecial java.lang.StringBuilder(java.lang.String) [37]\n" + + " 33 ldc [34]\n" + + " 35 invokespecial java.lang.StringBuilder(java.lang.String) [36]\n" + " 38 aconst_null\n" + - " 39 invokevirtual java.lang.StringBuilder.append(java.lang.Object) : java.lang.StringBuilder [41]\n" + - " 42 ldc [43]\n" + - " 44 invokevirtual java.lang.StringBuilder.append(java.lang.String) : java.lang.StringBuilder [46]\n" + - " 47 invokevirtual java.lang.StringBuilder.toString() : java.lang.String [50]\n" + - " 50 ldc [52]\n" + + " 39 invokevirtual java.lang.StringBuilder.append(java.lang.Object) : java.lang.StringBuilder [38]\n" + + " 42 ldc [42]\n" + + " 44 invokevirtual java.lang.StringBuilder.append(java.lang.String) : java.lang.StringBuilder [44]\n" + + " 47 invokevirtual java.lang.StringBuilder.toString() : java.lang.String [47]\n" + + " 50 ldc [51]\n" + " 52 if_acmpne 59\n" + " 55 iconst_1\n" + " 56 goto 60\n" + " 59 iconst_0\n" + " 60 istore_1 [b]\n" + - " 61 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 64 ldc [54]\n" + - " 66 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 61 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 64 ldc [53]\n" + + " 66 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 69 aconst_null\n" + " 70 astore_2 [s]\n" + " 71 aload_2 [s]\n" + " 72 ifnonnull 83\n" + - " 75 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 78 ldc [56]\n" + - " 80 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + - " 83 ldc [58]\n" + + " 75 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 78 ldc [55]\n" + + " 80 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + + " 83 ldc [57]\n" + " 85 astore_3 [s2]\n" + - " 86 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 89 ldc [60]\n" + - " 91 invokevirtual java.io.PrintStream.println(java.lang.String) : void [63]\n" + + " 86 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 89 ldc [59]\n" + + " 91 invokevirtual java.io.PrintStream.println(java.lang.String) : void [61]\n" + " 94 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -542,13 +542,13 @@ " // Method descriptor #15 ([Ljava/lang/String;)V\n" + " // Stack: 2, Locals: 1\n" + " public static void main(String[] args);\n" + - " 0 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 3 ldc [23]\n" + - " 5 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 0 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 3 ldc [22]\n" + + " 5 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 8 return\n" + - " 9 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 12 ldc [31]\n" + - " 14 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 9 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 12 ldc [30]\n" + + " 14 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 17 return\n" + " Line numbers:\n" + " [pc: 0, line: 4]\n" + Index: src/org/eclipse/jdt/core/tests/compiler/regression/EnumTest.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/EnumTest.java,v retrieving revision 1.79 diff -u -r1.79 EnumTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/EnumTest.java 19 Jul 2005 16:20:43 -0000 1.79 +++ src/org/eclipse/jdt/core/tests/compiler/regression/EnumTest.java 25 Jul 2005 14:28:02 -0000 @@ -2004,7 +2004,7 @@ "" ); String expectedOutput = - " // Method descriptor #16 (Ljava/lang/String;I)V\n" + + " // Method descriptor #18 (Ljava/lang/String;I)V\n" + " // Stack: 3, Locals: 3\n" + " private X(String arg, int arg);\n" + " 0 aload_0 [this]\n" + @@ -2628,7 +2628,7 @@ } String expectedOutput = - " // Method descriptor #18 (Ljava/lang/String;I)V\n" + + " // Method descriptor #20 (Ljava/lang/String;I)V\n" + " // Stack: 3, Locals: 3\n" + " private X(String arg, int arg);\n"; @@ -2889,7 +2889,7 @@ " 0 aload_0 [this]\n" + " 1 aload_1\n" + " 2 iload_2\n" + - " 3 invokespecial java.lang.Enum(java.lang.String, int) [11]\n" + + " 3 invokespecial java.lang.Enum(java.lang.String, int) [10]\n" + " 6 return\n" + " Line numbers:\n" + " [pc: 0, line: 1]\n" + @@ -2899,7 +2899,7 @@ " // Method descriptor #17 ()[LX;\n" + " // Stack: 5, Locals: 3\n" + " public static final X[] values();\n" + - " 0 getstatic X.ENUM$VALUES : X[] [19]\n" + + " 0 getstatic X.ENUM$VALUES : X[] [18]\n" + " 3 dup\n" + " 4 astore_0\n" + " 5 iconst_0\n" + @@ -2907,12 +2907,12 @@ " 7 arraylength\n" + " 8 dup\n" + " 9 istore_1\n" + - " 10 anewarray X [2]\n" + + " 10 anewarray X [1]\n" + " 13 dup\n" + " 14 astore_2\n" + " 15 iconst_0\n" + " 16 iload_1\n" + - " 17 invokestatic java.lang.System.arraycopy(java.lang.Object, int, java.lang.Object, int, int) : void [25]\n" + + " 17 invokestatic java.lang.System.arraycopy(java.lang.Object, int, java.lang.Object, int, int) : void [20]\n" + " 20 aload_2\n" + " 21 areturn\n" + " Line numbers:\n" + @@ -2921,7 +2921,7 @@ " // Method descriptor #27 (Ljava/lang/String;)LX;\n" + " // Stack: 3, Locals: 4\n" + " public static final X valueOf(String arg);\n" + - " 0 getstatic X.ENUM$VALUES : X[] [19]\n" + + " 0 getstatic X.ENUM$VALUES : X[] [18]\n" + " 3 dup\n" + " 4 astore_1\n" + " 5 arraylength\n" + @@ -2933,18 +2933,18 @@ " 13 aaload\n" + " 14 dup\n" + " 15 astore_3\n" + - " 16 invokevirtual X.name() : java.lang.String [31]\n" + - " 19 invokevirtual java.lang.String.equals(java.lang.Object) : boolean [37]\n" + + " 16 invokevirtual X.name() : java.lang.String [28]\n" + + " 19 invokevirtual java.lang.String.equals(java.lang.Object) : boolean [32]\n" + " 22 ifeq 27\n" + " 25 aload_3\n" + " 26 areturn\n" + " 27 iinc 2 -1\n" + " 30 iload_2\n" + " 31 ifge 10\n" + - " 34 new java.lang.IllegalArgumentException [39]\n" + + " 34 new java.lang.IllegalArgumentException [38]\n" + " 37 dup\n" + " 38 aload_0\n" + - " 39 invokespecial java.lang.IllegalArgumentException(java.lang.String) [42]\n" + + " 39 invokespecial java.lang.IllegalArgumentException(java.lang.String) [40]\n" + " 42 athrow\n" + " Line numbers:\n" + " [pc: 0, line: 1]\n" + Index: src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java,v retrieving revision 1.15 diff -u -r1.15 ForeachStatementTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java 31 May 2005 15:34:05 -0000 1.15 +++ src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java 25 Jul 2005 14:28:02 -0000 @@ -276,9 +276,9 @@ " 73 iload 4\n" + " 75 iload 5\n" + " 77 if_icmplt 62\n" + - " 80 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 83 ldc [23]\n" + - " 85 invokevirtual java.io.PrintStream.println(java.lang.String) : void [29]\n" + + " 80 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 83 ldc [22]\n" + + " 85 invokevirtual java.io.PrintStream.println(java.lang.String) : void [24]\n" + " 88 return\n" + " Line numbers:\n" + " [pc: 0, line: 5]\n" + @@ -473,9 +473,9 @@ " 5 iconst_1\n" + " 6 iastore\n" + " 7 astore_1 [tab]\n" + - " 8 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 11 ldc [23]\n" + - " 13 invokevirtual java.io.PrintStream.println(java.lang.String) : void [29]\n" + + " 8 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 11 ldc [22]\n" + + " 13 invokevirtual java.io.PrintStream.println(java.lang.String) : void [24]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 4]\n" + @@ -532,9 +532,9 @@ " 5 iconst_1\n" + " 6 iastore\n" + " 7 astore_1 [tab]\n" + - " 8 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 11 ldc [23]\n" + - " 13 invokevirtual java.io.PrintStream.println(java.lang.String) : void [29]\n" + + " 8 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 11 ldc [22]\n" + + " 13 invokevirtual java.io.PrintStream.println(java.lang.String) : void [24]\n" + " 16 return\n" + " Line numbers:\n" + " [pc: 0, line: 4]\n" + @@ -604,9 +604,9 @@ " 23 iload_2\n" + " 24 iload_3\n" + " 25 if_icmplt 20\n" + - " 28 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 31 ldc [23]\n" + - " 33 invokevirtual java.io.PrintStream.println(java.lang.String) : void [29]\n" + + " 28 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 31 ldc [22]\n" + + " 33 invokevirtual java.io.PrintStream.println(java.lang.String) : void [24]\n" + " 36 return\n" + " Line numbers:\n" + " [pc: 0, line: 4]\n" + @@ -696,9 +696,9 @@ " 23 iload_3\n" + " 24 iaload\n" + " 25 istore_2 [e]\n" + - " 26 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 26 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 29 iload_2 [e]\n" + - " 30 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 30 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 33 goto 42\n" + " 36 iload_3\n" + " 37 iload 4\n" + @@ -763,9 +763,9 @@ " 0 iconst_0\n" + " 1 newarray int [10]\n" + " 3 astore_1 [tab]\n" + - " 4 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 7 ldc [23]\n" + - " 9 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 4 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 7 ldc [22]\n" + + " 9 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 12 aload_1 [tab]\n" + " 13 astore 4\n" + " 15 iconst_0\n" + @@ -774,16 +774,16 @@ " 19 arraylength\n" + " 20 istore_3\n" + " 21 goto 35\n" + - " 24 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 27 ldc [31]\n" + - " 29 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 24 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 27 ldc [30]\n" + + " 29 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 32 goto 40\n" + " 35 iload_2\n" + " 36 iload_3\n" + " 37 if_icmplt 24\n" + - " 40 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 43 ldc [33]\n" + - " 45 invokevirtual java.io.PrintStream.println(java.lang.String) : void [36]\n" + + " 40 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 43 ldc [32]\n" + + " 45 invokevirtual java.io.PrintStream.println(java.lang.String) : void [34]\n" + " 48 return\n" + " Line numbers:\n" + " [pc: 0, line: 4]\n" + @@ -845,9 +845,9 @@ " 0 iconst_0\n" + " 1 newarray int [10]\n" + " 3 astore_1 [tab]\n" + - " 4 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 7 ldc [23]\n" + - " 9 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 4 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 7 ldc [22]\n" + + " 9 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 12 aload_1 [tab]\n" + " 13 astore 4\n" + " 15 iconst_0\n" + @@ -856,16 +856,16 @@ " 19 arraylength\n" + " 20 istore_3\n" + " 21 goto 35\n" + - " 24 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 27 ldc [31]\n" + - " 29 invokevirtual java.io.PrintStream.print(java.lang.String) : void [29]\n" + + " 24 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 27 ldc [30]\n" + + " 29 invokevirtual java.io.PrintStream.print(java.lang.String) : void [24]\n" + " 32 iinc 2 1\n" + " 35 iload_2\n" + " 36 iload_3\n" + " 37 if_icmplt 24\n" + - " 40 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 43 ldc [33]\n" + - " 45 invokevirtual java.io.PrintStream.println(java.lang.String) : void [36]\n" + + " 40 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 43 ldc [32]\n" + + " 45 invokevirtual java.io.PrintStream.println(java.lang.String) : void [34]\n" + " 48 return\n" + " Line numbers:\n" + " [pc: 0, line: 4]\n" + @@ -1002,9 +1002,9 @@ " 103 iload 6\n" + " 105 if_icmplt 69\n" + " 108 goto 52\n" + - " 111 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 111 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 114 iload_2 [sum]\n" + - " 115 invokevirtual java.io.PrintStream.println(int) : void [27]\n" + + " 115 invokevirtual java.io.PrintStream.println(int) : void [22]\n" + " 118 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1072,7 +1072,7 @@ " // Method descriptor #15 ([Ljava/lang/String;)V\n" + " // Stack: 4, Locals: 5\n" + " public static void main(String[] args);\n" + - " 0 new java.util.ArrayList [17]\n" + + " 0 new java.util.ArrayList [16]\n" + " 3 dup\n" + " 4 invokespecial java.util.ArrayList() [18]\n" + " 7 astore_1 [arrayList]\n" + @@ -1080,11 +1080,11 @@ " 9 istore_2 [i]\n" + " 10 goto 29\n" + " 13 aload_1 [arrayList]\n" + - " 14 new java.lang.Integer [20]\n" + + " 14 new java.lang.Integer [19]\n" + " 17 dup\n" + " 18 iload_2 [i]\n" + - " 19 invokespecial java.lang.Integer(int) [23]\n" + - " 22 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [27]\n" + + " 19 invokespecial java.lang.Integer(int) [21]\n" + + " 22 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [24]\n" + " 25 pop\n" + " 26 iinc 2 1 [i]\n" + " 29 iload_2 [i]\n" + @@ -1093,24 +1093,24 @@ " 35 iconst_0\n" + " 36 istore_2 [sum]\n" + " 37 aload_1 [arrayList]\n" + - " 38 invokevirtual java.util.ArrayList.iterator() : java.util.Iterator [31]\n" + + " 38 invokevirtual java.util.ArrayList.iterator() : java.util.Iterator [28]\n" + " 41 astore 4\n" + " 43 goto 64\n" + " 46 aload 4\n" + - " 48 invokeinterface java.util.Iterator.next() : java.lang.Object [37] [nargs: 1]\n" + - " 53 checkcast java.lang.Integer [20]\n" + + " 48 invokeinterface java.util.Iterator.next() : java.lang.Object [32] [nargs: 1]\n" + + " 53 checkcast java.lang.Integer [19]\n" + " 56 astore_3 [e]\n" + " 57 iload_2 [sum]\n" + " 58 aload_3 [e]\n" + - " 59 invokevirtual java.lang.Integer.intValue() : int [41]\n" + + " 59 invokevirtual java.lang.Integer.intValue() : int [38]\n" + " 62 iadd\n" + " 63 istore_2 [sum]\n" + " 64 aload 4\n" + - " 66 invokeinterface java.util.Iterator.hasNext() : boolean [45] [nargs: 1]\n" + + " 66 invokeinterface java.util.Iterator.hasNext() : boolean [42] [nargs: 1]\n" + " 71 ifne 46\n" + - " 74 getstatic java.lang.System.out : java.io.PrintStream [51]\n" + + " 74 getstatic java.lang.System.out : java.io.PrintStream [46]\n" + " 77 iload_2 [sum]\n" + - " 78 invokevirtual java.io.PrintStream.println(int) : void [56]\n" + + " 78 invokevirtual java.io.PrintStream.println(int) : void [52]\n" + " 81 return\n" + " Line numbers:\n" + " [pc: 0, line: 5]\n" + @@ -1208,13 +1208,13 @@ " // Stack: 4, Locals: 7\n" + " public static void main(String[] args);\n" + " 0 iconst_1\n" + - " 1 anewarray java.lang.String [17]\n" + + " 1 anewarray java.lang.String [16]\n" + " 4 dup\n" + " 5 iconst_0\n" + - " 6 ldc [19]\n" + + " 6 ldc [18]\n" + " 8 aastore\n" + " 9 astore_1 [tab]\n" + - " 10 new java.util.ArrayList [21]\n" + + " 10 new java.util.ArrayList [20]\n" + " 13 dup\n" + " 14 invokespecial java.util.ArrayList() [22]\n" + " 17 astore_2 [list]\n" + @@ -1232,24 +1232,24 @@ " 37 astore_3 [arg]\n" + " 38 aload_2 [list]\n" + " 39 aload_3 [arg]\n" + - " 40 invokeinterface java.util.List.add(java.lang.Object) : boolean [28] [nargs: 2]\n" + + " 40 invokeinterface java.util.List.add(java.lang.Object) : boolean [23] [nargs: 2]\n" + " 45 pop\n" + " 46 iinc 4 1\n" + " 49 iload 4\n" + " 51 iload 5\n" + " 53 if_icmplt 32\n" + " 56 aload_2 [list]\n" + - " 57 invokeinterface java.util.List.iterator() : java.util.Iterator [32] [nargs: 1]\n" + + " 57 invokeinterface java.util.List.iterator() : java.util.Iterator [29] [nargs: 1]\n" + " 62 astore 4\n" + " 64 goto 82\n" + " 67 aload 4\n" + - " 69 invokeinterface java.util.Iterator.next() : java.lang.Object [38] [nargs: 1]\n" + + " 69 invokeinterface java.util.Iterator.next() : java.lang.Object [33] [nargs: 1]\n" + " 74 astore_3 [arg]\n" + - " 75 getstatic java.lang.System.out : java.io.PrintStream [44]\n" + + " 75 getstatic java.lang.System.out : java.io.PrintStream [39]\n" + " 78 aload_3 [arg]\n" + - " 79 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [50]\n" + + " 79 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [45]\n" + " 82 aload 4\n" + - " 84 invokeinterface java.util.Iterator.hasNext() : boolean [54] [nargs: 1]\n" + + " 84 invokeinterface java.util.Iterator.hasNext() : boolean [51] [nargs: 1]\n" + " 89 ifne 67\n" + " 92 return\n" + " Line numbers:\n" + @@ -1361,7 +1361,7 @@ " // Stack: 2, Locals: 5\n" + " public static void main(String[] args);\n" + " 0 iconst_0\n" + - " 1 anewarray java.lang.Object [4]\n" + + " 1 anewarray java.lang.Object [3]\n" + " 4 astore_1 [array]\n" + " 5 aload_1 [array]\n" + " 6 astore 4\n" + @@ -1380,9 +1380,9 @@ " 27 iload_2\n" + " 28 iload_3\n" + " 29 if_icmplt 17\n" + - " 32 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 35 ldc [23]\n" + - " 37 invokevirtual java.io.PrintStream.println(java.lang.String) : void [29]\n" + + " 32 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 35 ldc [22]\n" + + " 37 invokevirtual java.io.PrintStream.println(java.lang.String) : void [24]\n" + " 40 return\n" + " Line numbers:\n" + " [pc: 0, line: 3]\n" + @@ -1453,88 +1453,88 @@ " // Method descriptor #15 ([Ljava/lang/String;)V\n" + " // Stack: 3, Locals: 5\n" + " public static void main(String[] args);\n" + - " 0 new java.util.ArrayList [17]\n" + + " 0 new java.util.ArrayList [16]\n" + " 3 dup\n" + " 4 invokespecial java.util.ArrayList() [18]\n" + " 7 astore_1 [slist]\n" + " 8 aload_1 [slist]\n" + - " 9 new java.util.ArrayList [17]\n" + + " 9 new java.util.ArrayList [16]\n" + " 12 dup\n" + " 13 invokespecial java.util.ArrayList() [18]\n" + - " 16 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [22]\n" + + " 16 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [19]\n" + " 19 pop\n" + " 20 aload_1 [slist]\n" + " 21 iconst_0\n" + - " 22 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [26]\n" + - " 25 checkcast java.util.ArrayList [17]\n" + - " 28 ldc [28]\n" + - " 30 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [22]\n" + + " 22 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [23]\n" + + " 25 checkcast java.util.ArrayList [16]\n" + + " 28 ldc [27]\n" + + " 30 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [19]\n" + " 33 pop\n" + " 34 aload_1 [slist]\n" + " 35 iconst_0\n" + - " 36 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [26]\n" + - " 39 checkcast java.util.ArrayList [17]\n" + - " 42 ldc [30]\n" + - " 44 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [22]\n" + + " 36 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [23]\n" + + " 39 checkcast java.util.ArrayList [16]\n" + + " 42 ldc [29]\n" + + " 44 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [19]\n" + " 47 pop\n" + " 48 aload_1 [slist]\n" + " 49 iconst_0\n" + - " 50 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [26]\n" + - " 53 checkcast java.util.ArrayList [17]\n" + - " 56 ldc [30]\n" + - " 58 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [22]\n" + + " 50 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [23]\n" + + " 53 checkcast java.util.ArrayList [16]\n" + + " 56 ldc [29]\n" + + " 58 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [19]\n" + " 61 pop\n" + " 62 aload_1 [slist]\n" + - " 63 new java.util.ArrayList [17]\n" + + " 63 new java.util.ArrayList [16]\n" + " 66 dup\n" + " 67 invokespecial java.util.ArrayList() [18]\n" + - " 70 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [22]\n" + + " 70 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [19]\n" + " 73 pop\n" + " 74 aload_1 [slist]\n" + " 75 iconst_1\n" + - " 76 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [26]\n" + - " 79 checkcast java.util.ArrayList [17]\n" + - " 82 ldc [32]\n" + - " 84 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [22]\n" + + " 76 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [23]\n" + + " 79 checkcast java.util.ArrayList [16]\n" + + " 82 ldc [31]\n" + + " 84 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [19]\n" + " 87 pop\n" + " 88 aload_1 [slist]\n" + " 89 iconst_1\n" + - " 90 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [26]\n" + - " 93 checkcast java.util.ArrayList [17]\n" + - " 96 ldc [34]\n" + - " 98 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [22]\n" + + " 90 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [23]\n" + + " 93 checkcast java.util.ArrayList [16]\n" + + " 96 ldc [33]\n" + + " 98 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [19]\n" + " 101 pop\n" + " 102 aload_1 [slist]\n" + " 103 iconst_1\n" + - " 104 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [26]\n" + - " 107 checkcast java.util.ArrayList [17]\n" + - " 110 ldc [34]\n" + - " 112 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [22]\n" + + " 104 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [23]\n" + + " 107 checkcast java.util.ArrayList [16]\n" + + " 110 ldc [33]\n" + + " 112 invokevirtual java.util.ArrayList.add(java.lang.Object) : boolean [19]\n" + " 115 pop\n" + " 116 iconst_0\n" + " 117 istore_2 [i]\n" + " 118 goto 168\n" + " 121 aload_1 [slist]\n" + " 122 iload_2 [i]\n" + - " 123 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [26]\n" + - " 126 checkcast java.util.ArrayList [17]\n" + - " 129 invokevirtual java.util.ArrayList.iterator() : java.util.Iterator [38]\n" + + " 123 invokevirtual java.util.ArrayList.get(int) : java.lang.Object [23]\n" + + " 126 checkcast java.util.ArrayList [16]\n" + + " 129 invokevirtual java.util.ArrayList.iterator() : java.util.Iterator [35]\n" + " 132 astore 4\n" + " 134 goto 155\n" + " 137 aload 4\n" + - " 139 invokeinterface java.util.Iterator.next() : java.lang.Object [44] [nargs: 1]\n" + - " 144 checkcast java.lang.String [46]\n" + + " 139 invokeinterface java.util.Iterator.next() : java.lang.Object [39] [nargs: 1]\n" + + " 144 checkcast java.lang.String [45]\n" + " 147 astore_3 [s]\n" + - " 148 getstatic java.lang.System.out : java.io.PrintStream [52]\n" + + " 148 getstatic java.lang.System.out : java.io.PrintStream [47]\n" + " 151 aload_3 [s]\n" + - " 152 invokevirtual java.io.PrintStream.print(java.lang.String) : void [58]\n" + + " 152 invokevirtual java.io.PrintStream.print(java.lang.String) : void [53]\n" + " 155 aload 4\n" + - " 157 invokeinterface java.util.Iterator.hasNext() : boolean [62] [nargs: 1]\n" + + " 157 invokeinterface java.util.Iterator.hasNext() : boolean [59] [nargs: 1]\n" + " 162 ifne 137\n" + " 165 iinc 2 1 [i]\n" + " 168 iload_2 [i]\n" + " 169 aload_1 [slist]\n" + - " 170 invokevirtual java.util.ArrayList.size() : int [66]\n" + + " 170 invokevirtual java.util.ArrayList.size() : int [63]\n" + " 173 if_icmplt 121\n" + " 176 return\n" + " Line numbers:\n" + Index: src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java,v retrieving revision 1.331 diff -u -r1.331 GenericTypeTest.java --- src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java 23 Jul 2005 23:53:23 -0000 1.331 +++ src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java 25 Jul 2005 14:28:03 -0000 @@ -2873,23 +2873,23 @@ " // Method descriptor #25 ([Ljava/lang/String;)V\n" + " // Stack: 4, Locals: 2\n" + " public static void main(String[] args);\n" + - " 0 new X [2]\n" + + " 0 new X [1]\n" + " 3 dup\n" + - " 4 new BX [27]\n" + + " 4 new BX [26]\n" + " 7 dup\n" + " 8 invokespecial BX() [28]\n" + - " 11 invokespecial X(AX) [30]\n" + + " 11 invokespecial X(AX) [29]\n" + " 14 astore_1 [x]\n" + " 15 aload_1 [x]\n" + - " 16 getfield X.t : AX [17]\n" + - " 19 checkcast BX [27]\n" + - " 22 ldc [32]\n" + - " 24 invokevirtual BX.foo(java.lang.Object) : void [36]\n" + + " 16 getfield X.t : AX [16]\n" + + " 19 checkcast BX [26]\n" + + " 22 ldc [31]\n" + + " 24 invokevirtual BX.foo(java.lang.Object) : void [33]\n" + " 27 aload_1 [x]\n" + - " 28 getfield X.t : AX [17]\n" + - " 31 checkcast BX [27]\n" + - " 34 ldc [38]\n" + - " 36 invokevirtual BX.bar(java.lang.Object) : void [41]\n" + + " 28 getfield X.t : AX [16]\n" + + " 31 checkcast BX [26]\n" + + " 34 ldc [37]\n" + + " 36 invokevirtual BX.bar(java.lang.Object) : void [39]\n" + " 39 return\n" + " Line numbers:\n" + " [pc: 0, line: 7]\n" + @@ -5824,12 +5824,12 @@ " 5 astore_1 [i]\n" + " 6 goto 10\n" + " 9 return\n" + - " 10 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + + " 10 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + " 13 aload_1 [i]\n" + - " 14 invokevirtual java.io.PrintStream.println(java.lang.Object) : void [27]\n" + - " 17 getstatic java.lang.System.out : java.io.PrintStream [21]\n" + - " 20 ldc [29]\n" + - " 22 invokevirtual java.io.PrintStream.println(java.lang.String) : void [32]\n" + + " 14 invokevirtual java.io.PrintStream.println(java.lang.Object) : void [22]\n" + + " 17 getstatic java.lang.System.out : java.io.PrintStream [16]\n" + + " 20 ldc [28]\n" + + " 22 invokevirtual java.io.PrintStream.println(java.lang.String) : void [30]\n" + " 25 return\n" + " Line numbers:\n" + " [pc: 0, line: 5]\n" + @@ -13842,25 +13842,25 @@ " // Method descriptor #25 ([Ljava/lang/String;)V\n" + " // Stack: 4, Locals: 2\n" + " public static void main(String[] args);\n" + - " 0 new X [2]\n" + + " 0 new X [1]\n" + " 3 dup\n" + - " 4 new BX [27]\n" + + " 4 new BX [26]\n" + " 7 dup\n" + " 8 invokespecial BX() [28]\n" + - " 11 invokespecial X(AX) [30]\n" + + " 11 invokespecial X(AX) [29]\n" + " 14 astore_1 [x]\n" + - " 15 getstatic java.lang.System.out : java.io.PrintStream [36]\n" + + " 15 getstatic java.lang.System.out : java.io.PrintStream [31]\n" + " 18 aload_1 [x]\n" + - " 19 getfield X.t : AX [17]\n" + - " 22 checkcast BX [27]\n" + - " 25 getfield BX.ax : java.lang.Object [40]\n" + - " 28 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [46]\n" + - " 31 getstatic java.lang.System.out : java.io.PrintStream [36]\n" + + " 19 getfield X.t : AX [16]\n" + + " 22 checkcast BX [26]\n" + + " 25 getfield BX.ax : java.lang.Object [37]\n" + + " 28 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [41]\n" + + " 31 getstatic java.lang.System.out : java.io.PrintStream [31]\n" + " 34 aload_1 [x]\n" + - " 35 getfield X.t : AX [17]\n" + - " 38 checkcast BX [27]\n" + - " 41 getfield BX.bx : java.lang.Object [49]\n" + - " 44 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [46]\n" + + " 35 getfield X.t : AX [16]\n" + + " 38 checkcast BX [26]\n" + + " 41 getfield BX.bx : java.lang.Object [47]\n" + + " 44 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [41]\n" + " 47 return\n" + " Line numbers:\n" + " [pc: 0, line: 7]\n" + @@ -13924,27 +13924,27 @@ " // Method descriptor #25 ([Ljava/lang/String;)V\n" + " // Stack: 4, Locals: 2\n" + " public static void main(String[] args);\n" + - " 0 new X [2]\n" + + " 0 new X [1]\n" + " 3 dup\n" + - " 4 new BX [27]\n" + + " 4 new BX [26]\n" + " 7 dup\n" + " 8 invokespecial BX() [28]\n" + - " 11 invokespecial X(AX) [30]\n" + + " 11 invokespecial X(AX) [29]\n" + " 14 astore_1 [x]\n" + - " 15 getstatic java.lang.System.out : java.io.PrintStream [36]\n" + + " 15 getstatic java.lang.System.out : java.io.PrintStream [31]\n" + " 18 aload_1 [x]\n" + - " 19 invokevirtual X.self() : X [40]\n" + - " 22 getfield X.t : AX [17]\n" + - " 25 checkcast BX [27]\n" + - " 28 getfield BX.ax : java.lang.Object [44]\n" + - " 31 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [50]\n" + - " 34 getstatic java.lang.System.out : java.io.PrintStream [36]\n" + + " 19 invokevirtual X.self() : X [37]\n" + + " 22 getfield X.t : AX [16]\n" + + " 25 checkcast BX [26]\n" + + " 28 getfield BX.ax : java.lang.Object [41]\n" + + " 31 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [45]\n" + + " 34 getstatic java.lang.System.out : java.io.PrintStream [31]\n" + " 37 aload_1 [x]\n" + - " 38 invokevirtual X.self() : X [40]\n" + - " 41 getfield X.t : AX [17]\n" + - " 44 checkcast BX [27]\n" + - " 47 getfield BX.bx : java.lang.Object [53]\n" + - " 50 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [50]\n" + + " 38 invokevirtual X.self() : X [37]\n" + + " 41 getfield X.t : AX [16]\n" + + " 44 checkcast BX [26]\n" + + " 47 getfield BX.bx : java.lang.Object [51]\n" + + " 50 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [45]\n" + " 53 return\n" + " Line numbers:\n" + " [pc: 0, line: 7]\n" + @@ -14011,7 +14011,7 @@ " // Stack: 1, Locals: 1\n" + " public X();\n" + " 0 aload_0 [this]\n" + - " 1 invokespecial java.lang.Object() [13]\n" + + " 1 invokespecial java.lang.Object() [12]\n" + " 4 return\n" + " Line numbers:\n" + " [pc: 0, line: 7]\n" + @@ -14023,18 +14023,18 @@ " // Method descriptor #21 ([Ljava/lang/String;)V\n" + " // Stack: 3, Locals: 1\n" + " public static void main(String[] args);\n" + - " 0 getstatic java.lang.System.out : java.io.PrintStream [27]\n" + - " 3 new X [2]\n" + + " 0 getstatic java.lang.System.out : java.io.PrintStream [22]\n" + + " 3 new X [1]\n" + " 6 dup\n" + " 7 invokespecial X() [28]\n" + - " 10 getfield X.e : XA [30]\n" + + " 10 getfield X.e : XA [29]\n" + " 13 pop\n" + - " 14 getstatic XAB.CONST : XB [36]\n" + - " 17 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [42]\n" + - " 20 new X [2]\n" + + " 14 getstatic XAB.CONST : XB [31]\n" + + " 17 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [37]\n" + + " 20 new X [1]\n" + " 23 dup\n" + " 24 invokespecial X() [28]\n" + - " 27 invokevirtual X.foo() : void [45]\n" + + " 27 invokevirtual X.foo() : void [43]\n" + " 30 return\n" + " Line numbers:\n" + " [pc: 0, line: 10]\n" + @@ -14046,12 +14046,12 @@ " // Method descriptor #10 ()V\n" + " // Stack: 2, Locals: 1\n" + " public void foo();\n" + - " 0 getstatic java.lang.System.out : java.io.PrintStream [27]\n" + + " 0 getstatic java.lang.System.out : java.io.PrintStream [22]\n" + " 3 aload_0 [this]\n" + - " 4 getfield X.e : XA [30]\n" + + " 4 getfield X.e : XA [29]\n" + " 7 pop\n" + - " 8 getstatic XB.CONST : XB [50]\n" + - " 11 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [42]\n" + + " 8 getstatic XB.CONST : XB [48]\n" + + " 11 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [37]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 14]\n" + @@ -14112,7 +14112,7 @@ " // Stack: 1, Locals: 1\n" + " public X();\n" + " 0 aload_0 [this]\n" + - " 1 invokespecial java.lang.Object() [9]\n" + + " 1 invokespecial java.lang.Object() [8]\n" + " 4 return\n" + " Line numbers:\n" + " [pc: 0, line: 7]\n" + @@ -14137,18 +14137,18 @@ " // Method descriptor #21 ([Ljava/lang/String;)V\n" + " // Stack: 3, Locals: 1\n" + " public static void main(String[] args);\n" + - " 0 getstatic java.lang.System.out : java.io.PrintStream [27]\n" + - " 3 new X [2]\n" + + " 0 getstatic java.lang.System.out : java.io.PrintStream [22]\n" + + " 3 new X [1]\n" + " 6 dup\n" + " 7 invokespecial X() [28]\n" + - " 10 invokevirtual X.e() : XA [30]\n" + + " 10 invokevirtual X.e() : XA [29]\n" + " 13 pop\n" + - " 14 getstatic XAB.CONST : XB [36]\n" + - " 17 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [42]\n" + - " 20 new X [2]\n" + + " 14 getstatic XAB.CONST : XB [31]\n" + + " 17 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [37]\n" + + " 20 new X [1]\n" + " 23 dup\n" + " 24 invokespecial X() [28]\n" + - " 27 invokevirtual X.foo() : void [45]\n" + + " 27 invokevirtual X.foo() : void [43]\n" + " 30 return\n" + " Line numbers:\n" + " [pc: 0, line: 10]\n" + @@ -14160,12 +14160,12 @@ " // Method descriptor #6 ()V\n" + " // Stack: 2, Locals: 1\n" + " public void foo();\n" + - " 0 getstatic java.lang.System.out : java.io.PrintStream [27]\n" + + " 0 getstatic java.lang.System.out : java.io.PrintStream [22]\n" + " 3 aload_0 [this]\n" + - " 4 invokevirtual X.e() : XA [30]\n" + + " 4 invokevirtual X.e() : XA [29]\n" + " 7 pop\n" + - " 8 getstatic XB.CONST : XB [50]\n" + - " 11 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [42]\n" + + " 8 getstatic XB.CONST : XB [48]\n" + + " 11 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [37]\n" + " 14 return\n" + " Line numbers:\n" + " [pc: 0, line: 14]\n" + @@ -14234,7 +14234,7 @@ " // Stack: 1, Locals: 1\n" + " public X();\n" + " 0 aload_0 [this]\n" + - " 1 invokespecial java.lang.Object() [13]\n" + + " 1 invokespecial java.lang.Object() [12]\n" + " 4 return\n" + " Line numbers:\n" + " [pc: 0, line: 7]\n" + @@ -14246,10 +14246,10 @@ " // Method descriptor #21 ([Ljava/lang/String;)V\n" + " // Stack: 2, Locals: 1\n" + " public static void main(String[] args);\n" + - " 0 new X [2]\n" + + " 0 new X [1]\n" + " 3 dup\n" + " 4 invokespecial X() [22]\n" + - " 7 invokevirtual X.foo() : void [25]\n" + + " 7 invokevirtual X.foo() : void [23]\n" + " 10 return\n" + " Line numbers:\n" + " [pc: 0, line: 10]\n" + @@ -14260,17 +14260,17 @@ " // Method descriptor #10 ()V\n" + " // Stack: 3, Locals: 1\n" + " public void foo();\n" + - " 0 new X$1 [29]\n" + + " 0 new X$1 [28]\n" + " 3 dup\n" + " 4 aload_0 [this]\n" + - " 5 invokespecial X$1(X) [32]\n" + - " 8 invokevirtual X$1.run() : void [35]\n" + - " 11 getstatic java.lang.System.out : java.io.PrintStream [41]\n" + + " 5 invokespecial X$1(X) [30]\n" + + " 8 invokevirtual X$1.run() : void [33]\n" + + " 11 getstatic java.lang.System.out : java.io.PrintStream [36]\n" + " 14 aload_0 [this]\n" + - " 15 getfield X.e : XA [43]\n" + + " 15 getfield X.e : XA [42]\n" + " 18 pop\n" + - " 19 getstatic XB.CONST : XB [49]\n" + - " 22 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [55]\n" + + " 19 getstatic XB.CONST : XB [44]\n" + + " 22 invokevirtual java.io.PrintStream.print(java.lang.Object) : void [50]\n" + " 25 return\n" + " Line numbers:\n" + " [pc: 0, line: 13]\n" + @@ -14283,7 +14283,7 @@ " [pc: 0, pc: 26] local: this index: 0 type: X\n" + "\n" + " Inner classes:\n" + - " [inner class info: #29 X$1, outer class info: #0\n" + + " [inner class info: #28 X$1, outer class info: #0\n" + " inner name: #0, accessflags: 18 private final ]\n" + "}"; @@ -22239,7 +22239,7 @@ " // Stack: 1, Locals: 1\n" + " public bridge synthetic Object getIt();\n" + " 0 aload_0\n" + - " 1 invokevirtual FooImpl.getIt() : java.lang.String [20]\n" + + " 1 invokevirtual FooImpl.getIt() : java.lang.String [19]\n" + " 4 areturn\n" + " Line numbers:\n" + " [pc: 0, line: 1]\n"; @@ -22301,7 +22301,7 @@ " // Stack: 1, Locals: 1\n" + " public bridge synthetic Exception getIt() throws java.lang.Exception;\n" + " 0 aload_0\n" + - " 1 invokevirtual FooImpl.getIt() : java.lang.NullPointerException [23]\n" + + " 1 invokevirtual FooImpl.getIt() : java.lang.NullPointerException [22]\n" + " 4 areturn\n" + " Line numbers:\n" + " [pc: 0, line: 1]\n"; @@ -22559,15 +22559,15 @@ "SUCCESS"); String expectedOutput = - " // Method descriptor #29 (I)Ljava/lang/Object;\n" + - " // Stack: 2, Locals: 2\n" + - " public bridge synthetic Object get(int arg);\n" + - " 0 aload_0\n" + - " 1 iload_1\n" + - " 2 invokevirtual X$1.get(int) : java.lang.String [37]\n" + - " 5 areturn\n" + - " Line numbers:\n" + - " [pc: 0, line: 1]\n"; + " // Method descriptor #31 (I)Ljava/lang/Object;\n" + + " // Stack: 2, Locals: 2\n" + + " public bridge synthetic Object get(int arg);\n" + + " 0 aload_0\n" + + " 1 iload_1\n" + + " 2 invokevirtual X$1.get(int) : java.lang.String [36]\n" + + " 5 areturn\n" + + " Line numbers:\n" + + " [pc: 0, line: 1]\n"; // check no unnecessary checkcast on bridge method for X$1 try {