Index: vts/vm/src/test/vm/jvms/instructions/reftypes/newarray/newarray08/newarray0801/newarray0801p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/reftypes/newarray/newarray08/newarray0801/newarray0801p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/reftypes/newarray/newarray08/newarray0801/newarray0801p.j (working copy) @@ -34,9 +34,12 @@ .method public test([Ljava/lang/String;)I .limit stack 2 .limit locals 2 + .catch java/lang/OutOfMemoryError from L1 to L2 using L3 +L1: ldc 50555555 ; push 50555555 into the stack newarray boolean +L2: arraylength ldc 50555555 @@ -49,6 +52,10 @@ ; test failed sipush 105 ireturn +L3: + sipush 104 + ireturn + .end method ; Index: vts/vm/src/test/vm/jvms/instructions/arithm/iinc/iinc06/iinc0601/iinc0601p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/arithm/iinc/iinc06/iinc0601/iinc0601p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/arithm/iinc/iinc06/iinc0601/iinc0601p.j (working copy) @@ -64,12 +64,19 @@ .limit stack 2 .limit locals 2 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/arithm/iinc/iinc06/iinc0601/iinc0601p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/arithm/iinc/iinc06/iinc0601/iinc0601p/()V aload_0 - invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/arithm/iinc/iinc06/iinc0601/iinc0601p/test([Ljava/lang/String;)I + invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/arithm/iinc/iinc06/iinc0601/iinc0601p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/branching/ret_w/ret_w01/ret_w0101/ret_w0101p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/branching/ret_w/ret_w01/ret_w0101/ret_w0101p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/branching/ret_w/ret_w01/ret_w0101/ret_w0101p.j (working copy) @@ -48,14 +48,20 @@ ; standard main function .method public static main([Ljava/lang/String;)V .limit stack 3 - .limit locals 2 + .limit locals 2 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/branching/ret_w/ret_w01/ret_w0101/ret_w0101p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/branching/ret_w/ret_w01/ret_w0101/ret_w0101p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/branching/ret_w/ret_w01/ret_w0101/ret_w0101p/test([Ljava/lang/String;)I - + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/dstore/dstore12/dstore1201/dstore1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/dstore/dstore12/dstore1201/dstore1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/dstore/dstore12/dstore1201/dstore1201p.j (working copy) @@ -64,11 +64,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/dstore/dstore12/dstore1201/dstore1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/dstore/dstore12/dstore1201/dstore1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/dstore/dstore12/dstore1201/dstore1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/lstore/lstore12/lstore1201/lstore1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/lstore/lstore12/lstore1201/lstore1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/lstore/lstore12/lstore1201/lstore1201p.j (working copy) @@ -65,11 +65,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/lstore/lstore12/lstore1201/lstore1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/lstore/lstore12/lstore1201/lstore1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/lstore/lstore12/lstore1201/lstore1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/astore/astore03/astore0301/astore0301p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/astore/astore03/astore0301/astore0301p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/astore/astore03/astore0301/astore0301p.j (working copy) @@ -60,11 +60,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/astore/astore03/astore0301/astore0301p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/astore/astore03/astore0301/astore0301p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/astore/astore03/astore0301/astore0301p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/astore/astore12/astore1201/astore1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/astore/astore12/astore1201/astore1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/astore/astore12/astore1201/astore1201p.j (working copy) @@ -63,11 +63,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/astore/astore12/astore1201/astore1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/astore/astore12/astore1201/astore1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/astore/astore12/astore1201/astore1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/istore/istore12/istore1201/istore1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/istore/istore12/istore1201/istore1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/istore/istore12/istore1201/istore1201p.j (working copy) @@ -62,11 +62,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/istore/istore12/istore1201/istore1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/istore/istore12/istore1201/istore1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/istore/istore12/istore1201/istore1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/fstore/fstore12/fstore1201/fstore1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/fstore/fstore12/fstore1201/fstore1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/fstore/fstore12/fstore1201/fstore1201p.j (working copy) @@ -64,11 +64,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/fstore/fstore12/fstore1201/fstore1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/fstore/fstore12/fstore1201/fstore1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/fstore/fstore12/fstore1201/fstore1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/aload/aload12/aload1201/aload1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/aload/aload12/aload1201/aload1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/aload/aload12/aload1201/aload1201p.j (working copy) @@ -63,11 +63,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/aload/aload12/aload1201/aload1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/aload/aload12/aload1201/aload1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/aload/aload12/aload1201/aload1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/dload/dload12/dload1201/dload1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/dload/dload12/dload1201/dload1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/dload/dload12/dload1201/dload1201p.j (working copy) @@ -64,11 +64,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/dload/dload12/dload1201/dload1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/dload/dload12/dload1201/dload1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/dload/dload12/dload1201/dload1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/fload/fload12/fload1201/fload1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/fload/fload12/fload1201/fload1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/fload/fload12/fload1201/fload1201p.j (working copy) @@ -64,11 +64,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/fload/fload12/fload1201/fload1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/fload/fload12/fload1201/fload1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/fload/fload12/fload1201/fload1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/iload/iload12/iload1201/iload1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/iload/iload12/iload1201/iload1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/iload/iload12/iload1201/iload1201p.j (working copy) @@ -62,11 +62,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/iload/iload12/iload1201/iload1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/iload/iload12/iload1201/iload1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/iload/iload12/iload1201/iload1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/instructions/loadStore/lload/lload12/lload1201/lload1201p.j =================================================================== --- vts/vm/src/test/vm/jvms/instructions/loadStore/lload/lload12/lload1201/lload1201p.j (revision 551545) +++ vts/vm/src/test/vm/jvms/instructions/loadStore/lload/lload12/lload1201/lload1201p.j (working copy) @@ -64,11 +64,18 @@ .limit stack 2 .limit locals 1 + .catch java/lang/StackOverflowError from L1 to L2 using L2 +L1: new org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/lload/lload12/lload1201/lload1201p dup invokespecial org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/lload/lload12/lload1201/lload1201p/()V aload_0 invokevirtual org/apache/harmony/vts/test/vm/jvms/instructions/loadStore/lload/lload12/lload1201/lload1201p/test([Ljava/lang/String;)I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V return Index: vts/vm/src/test/vm/jvms/classFile/limitations/variables/variables01/Variables01.j =================================================================== --- vts/vm/src/test/vm/jvms/classFile/limitations/variables/variables01/Variables01.j (revision 551545) +++ vts/vm/src/test/vm/jvms/classFile/limitations/variables/variables01/Variables01.j (working copy) @@ -37,15 +37,21 @@ .method public static main([Ljava/lang/String;)V .limit stack 2 .limit locals 1 -.var 0 is arg0 [Ljava/lang/String; from Label0 to Label1 +.var 0 is arg0 [Ljava/lang/String; from L1 to L4 +.catch java/lang/StackOverflowError from L1 to L2 using L2 -Label0: +L1: new org/apache/harmony/vts/test/vm/jvms/classFile/limitations/variables/variables01/Variables01 dup invokespecial org/apache/harmony/vts/test/vm/jvms/classFile/limitations/variables/variables01/Variables01/()V invokevirtual org/apache/harmony/vts/test/vm/jvms/classFile/limitations/variables/variables01/Variables01/test()I + goto L3 +L2: + pop + sipush 104 +L3: invokestatic java/lang/System/exit(I)V -Label1: +L4: return .end method