codegen: Open block for try statements

Fixes bug 651145.

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index b4efc50087a6706a84a32053743c24d1baffdacc..2445bc722c1cf872d59dffbfc984d75413dfa97c 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -1669,7 +1669,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
 
                var local_vars = b.get_local_variables ();
 
-               if (b.parent_node is Block || b.parent_node is SwitchStatement) {
+               if (b.parent_node is Block || b.parent_node is SwitchStatement || b.parent_node is TryStatement) {
                        ccode.open_block ();
                }
 
@@ -1954,7 +1954,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
                        ccode.add_assignment (get_variable_cexpression ("_data%d_".printf (block_id)), new CCodeConstant ("NULL"));
                }
 
-               if (b.parent_node is Block || b.parent_node is SwitchStatement) {
+               if (b.parent_node is Block || b.parent_node is SwitchStatement || b.parent_node is TryStatement) {
                        ccode.close ();
                }
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 422571e0d408e71a48eb6c1510f7765dd0dc5252..a990d9c9e90da4a418cacd2d37d301d37b533ecc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -88,6 +88,7 @@ TESTS = \
        errors/bug596228.vala \
        errors/bug623049.vala \
        errors/bug639589.vala \
+       errors/bug651145.vala \
        asynchronous/bug595735.vala \
        asynchronous/bug595755.vala \
        asynchronous/bug596177.vala \

diff --git a/tests/errors/bug651145.vala b/tests/errors/bug651145.vala
new file mode 100644 (file)
index 0000000..06fa14a
--- /dev/null
+++ b/tests/errors/bug651145.vala
@@ -0,0 +1,8 @@
+void main () {
+       try {
+               string foo;
+       } finally {}
+       try {
+               string foo;
+       } finally {}
+}