Revert "codegen: Use copies of error_variable of catch-clauses for nested usage"

This reverts commit 765c39c73c3096dd1de984db023763ec13448ef5.

Fixes https://gitlab.gnome.org/GNOME/vala/issues/741

diff --git a/codegen/valagerrormodule.vala b/codegen/valagerrormodule.vala
index c10826218b42d579887e843f5a2f4f92c4ce3ae5..d29d09ca10d0f307e56f8432d101bbae48ca86ec 100644 (file)
--- a/codegen/valagerrormodule.vala
+++ b/codegen/valagerrormodule.vala
@@ -353,12 +353,8 @@ public class Vala.GErrorModule : CCodeDelegateModule {
                ccode.open_block ();
 
                if (clause.error_variable != null) {
-                       // use a copy for possible nested usage
-                       var error_variable = new LocalVariable (clause.error_type.copy (), clause.variable_name);
-                       error_variable.active = true;
-                       error_variable.checked = true;
-                       visit_local_variable (error_variable);
-                       ccode.add_assignment (get_variable_cexpression (get_local_cname (error_variable)), get_variable_cexpression ("_inner_error_"));
+                       visit_local_variable (clause.error_variable);
+                       ccode.add_assignment (get_variable_cexpression (get_local_cname (clause.error_variable)), get_variable_cexpression ("_inner_error_"));
                } else {
                        // error object is not used within catch statement, clear it
                        var cclear = new CCodeFunctionCall (new CCodeIdentifier ("g_clear_error"));