* tests/regression/jasmin/test_verify_fail_jsr_merge_subroutines_via_stack.j:

New test.

* tests/regression/jasmin/Makefile.am: Added new test.

diff --git a/tests/regression/jasmin/Makefile.am b/tests/regression/jasmin/Makefile.am
index c1c2496c6fa20c7a8c8e6937917ffd95c839e58b..357ed544ea3d2af91ac6a492c9200522a70bdc04 100644 (file)
--- a/tests/regression/jasmin/Makefile.am
+++ b/tests/regression/jasmin/Makefile.am
@@ -73,6 +73,7 @@ JASMIN_TESTS = \
        $(srcdir)/test_verify_fail_jsr_exceptions.j \
        $(srcdir)/test_verify_fail_jsr_handler_in_sub.j \
        $(srcdir)/test_verify_fail_jsr_merge_subroutines.j \
+       $(srcdir)/test_verify_fail_jsr_merge_subroutines_via_stack.j \
        $(srcdir)/test_verify_fail_jsr_polymorphic_pop.j \
        $(srcdir)/test_verify_fail_load_wrong_type.j \
        $(srcdir)/test_verify_fail_load_wrong_type_within_block.j \

diff --git a/tests/regression/jasmin/test_verify_fail_jsr_merge_subroutines_via_stack.j b/tests/regression/jasmin/test_verify_fail_jsr_merge_subroutines_via_stack.j
new file mode 100644 (file)
index 0000000..da371a1
--- /dev/null
+++ b/tests/regression/jasmin/test_verify_fail_jsr_merge_subroutines_via_stack.j
@@ -0,0 +1,66 @@
+.class public test_verify_fail_jsr_merge_subroutines_via_stack
+.super java/lang/Object
+
+; ======================================================================
+
+.method public <init>()V
+   aload_0
+   invokenonvirtual java/lang/Object/<init>()V
+   return
+.end method
+
+; ======================================================================
+
+.method public static check(I)V
+       .limit locals 1
+       .limit stack 10
+       getstatic java/lang/System/out Ljava/io/PrintStream;
+       iload_0
+       invokevirtual java/io/PrintStream/println(I)V
+       return
+.end method
+
+; ======================================================================
+
+.method public static main([Ljava/lang/String;)V
+       .limit stack 2
+       .limit locals 3
+
+       ldc 35
+       istore 1
+
+       aload 0
+       ifnull force_basic_block_boundary
+
+       ; --------------------------------------------------
+
+       jsr sbr_1
+
+       jsr sbr_2
+
+       ; --------------------------------------------------
+
+force_basic_block_boundary:
+
+       iload 1
+       invokestatic test_verify_fail_jsr_merge_subroutines_via_stack/check(I)V
+
+       return
+
+sbr_1:
+       iload 1
+       invokestatic test_verify_fail_jsr_merge_subroutines_via_stack/check(I)V
+       goto common_ret
+       ; ERROR: VerifyError
+
+sbr_2:
+       ldc 42
+       invokestatic test_verify_fail_jsr_merge_subroutines_via_stack/check(I)V
+
+common_ret:
+       astore 2
+       iinc 1 1
+       ret 2
+
+.end method
+