codegen: Fix uncaught errors in constructors and destructors

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 9a53fc21f85e8625eb5d2f357e3ac974e1f0ba9c..e37416fc48e13ed64a76c8d83700e344d8dbb975 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -130,7 +130,7 @@ public class Vala.CCodeBaseModule : CodeGenerator {
                }
        }
 
-       bool is_in_constructor () {
+       public bool is_in_constructor () {
                var sym = current_symbol;
                while (sym != null) {
                        if (sym is Constructor) {
@@ -141,7 +141,7 @@ public class Vala.CCodeBaseModule : CodeGenerator {
                return false;
        }
 
-       bool is_in_destructor () {
+       public bool is_in_destructor () {
                var sym = current_symbol;
                while (sym != null) {
                        if (sym is Destructor) {

diff --git a/codegen/valagerrormodule.vala b/codegen/valagerrormodule.vala
index b7b4436adeef1b2e83a5d176c9de908877dadec6..3ccc68f3425be8551ca9644aace3df5455bef06a 100644 (file)
--- a/codegen/valagerrormodule.vala
+++ b/codegen/valagerrormodule.vala
@@ -135,7 +135,9 @@ public class Vala.GErrorModule : CCodeDelegateModule {
                ccode.add_expression (ccritical);
                ccode.add_expression (cclear);
 
-               if (current_method is CreationMethod) {
+               if (is_in_constructor () || is_in_destructor ()) {
+                       // just print critical, do not return prematurely
+               } else if (current_method is CreationMethod) {
                        if (current_method.parent_symbol is Struct) {
                                ccode.add_return ();
                        } else {