[vala/0.54] vala: Catch and throw possible inner error of lock statements

[Rico Tzschichholz <ricotz src gnome org>]

commit 4af3e7bf4cb40d3ec06d870a0a71a135b15d1453
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Thu Feb 10 18:07:56 2022 +0100

    vala: Catch and throw possible inner error of lock statements
    
    See 40c1dbfbfedb6c4a6b88df045eb1c2e7bdd38d93
    
    Fixes https://gitlab.gnome.org/GNOME/vala/issues/83

 tests/Makefile.am                           |   1 +
 tests/control-flow/lock-if-throw.c-expected | 372 ++++++++++++++++++++++++++++
 tests/control-flow/lock-if-throw.vala       |  24 ++
 vala/valalockstatement.vala                 |  16 +-
 4 files changed, 411 insertions(+), 2 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c05686a01..6f14a582a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -279,6 +279,7 @@ TESTS = \
        control-flow/foreach.vala \
        control-flow/gptrarray-foreach-variable.test \
        control-flow/local-clash-with-implicit-this.vala \
+       control-flow/lock-if-throw.vala \
        control-flow/missing-break.test \
        control-flow/missing-return.test \
        control-flow/nested-conditional.vala \
diff --git a/tests/control-flow/lock-if-throw.c-expected b/tests/control-flow/lock-if-throw.c-expected
new file mode 100644
index 000000000..7d96df05e
--- /dev/null
+++ b/tests/control-flow/lock-if-throw.c-expected
@@ -0,0 +1,372 @@
+/* control_flow_lock_if_throw.c generated by valac, the Vala compiler
+ * generated from control_flow_lock_if_throw.vala, do not modify */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gobject/gvaluecollector.h>
+
+#if !defined(VALA_EXTERN)
+#if defined(_MSC_VER)
+#define VALA_EXTERN __declspec(dllexport) extern
+#elif __GNUC__ >= 4
+#define VALA_EXTERN __attribute__((visibility("default"))) extern
+#else
+#define VALA_EXTERN extern
+#endif
+#endif
+
+#define TYPE_FOO (foo_get_type ())
+#define FOO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FOO, Foo))
+#define FOO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FOO, FooClass))
+#define IS_FOO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FOO))
+#define IS_FOO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_FOO))
+#define FOO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_FOO, FooClass))
+
+typedef struct _Foo Foo;
+typedef struct _FooClass FooClass;
+typedef struct _FooPrivate FooPrivate;
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+typedef struct _ParamSpecFoo ParamSpecFoo;
+
+typedef enum  {
+       FOO_ERROR_FAIL
+} FooError;
+#define FOO_ERROR foo_error_quark ()
+struct _Foo {
+       GTypeInstance parent_instance;
+       volatile int ref_count;
+       FooPrivate * priv;
+};
+
+struct _FooClass {
+       GTypeClass parent_class;
+       void (*finalize) (Foo *self);
+};
+
+struct _FooPrivate {
+       gboolean manam;
+       GRecMutex __lock_manam;
+};
+
+struct _ParamSpecFoo {
+       GParamSpec parent_instance;
+};
+
+static gint Foo_private_offset;
+static gpointer foo_parent_class = NULL;
+
+VALA_EXTERN GQuark foo_error_quark (void);
+VALA_EXTERN gpointer foo_ref (gpointer instance);
+VALA_EXTERN void foo_unref (gpointer instance);
+VALA_EXTERN GParamSpec* param_spec_foo (const gchar* name,
+                            const gchar* nick,
+                            const gchar* blurb,
+                            GType object_type,
+                            GParamFlags flags);
+VALA_EXTERN void value_set_foo (GValue* value,
+                    gpointer v_object);
+VALA_EXTERN void value_take_foo (GValue* value,
+                     gpointer v_object);
+VALA_EXTERN gpointer value_get_foo (const GValue* value);
+VALA_EXTERN GType foo_get_type (void) G_GNUC_CONST ;
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, foo_unref)
+VALA_EXTERN gboolean foo_bar (Foo* self,
+                  GError** error);
+VALA_EXTERN Foo* foo_new (void);
+VALA_EXTERN Foo* foo_construct (GType object_type);
+static void foo_finalize (Foo * obj);
+static GType foo_get_type_once (void);
+static void _vala_main (void);
+
+GQuark
+foo_error_quark (void)
+{
+       return g_quark_from_static_string ("foo-error-quark");
+}
+
+static inline gpointer
+foo_get_instance_private (Foo* self)
+{
+       return G_STRUCT_MEMBER_P (self, Foo_private_offset);
+}
+
+gboolean
+foo_bar (Foo* self,
+         GError** error)
+{
+       gboolean _result_ = FALSE;
+       GError* _inner_error0_ = NULL;
+       gboolean result = FALSE;
+       g_return_val_if_fail (IS_FOO (self), FALSE);
+       {
+               g_rec_mutex_lock (&self->priv->__lock_manam);
+               {
+                       if (self->priv->manam) {
+                               GError* _tmp0_;
+                               _tmp0_ = g_error_new_literal (FOO_ERROR, FOO_ERROR_FAIL, "foo");
+                               _inner_error0_ = _tmp0_;
+                               goto __catch0_g_error;
+                       } else {
+                               _result_ = TRUE;
+                       }
+               }
+               goto __finally0;
+               __catch0_g_error:
+               {
+                       GError* _lock_error_ = NULL;
+                       GError* _tmp1_;
+                       _lock_error_ = _inner_error0_;
+                       _inner_error0_ = NULL;
+                       _tmp1_ = _lock_error_;
+                       _lock_error_ = NULL;
+                       _inner_error0_ = _tmp1_;
+                       _g_error_free0 (_lock_error_);
+                       goto __finally0;
+               }
+               __finally0:
+               {
+                       GError* _inner_error1_ = NULL;
+                       g_rec_mutex_unlock (&self->priv->__lock_manam);
+               }
+               if (G_UNLIKELY (_inner_error0_ != NULL)) {
+                       gboolean _tmp2_ = FALSE;
+                       g_propagate_error (error, _inner_error0_);
+                       return _tmp2_;
+               }
+       }
+       result = _result_;
+       return result;
+}
+
+Foo*
+foo_construct (GType object_type)
+{
+       Foo* self = NULL;
+       self = (Foo*) g_type_create_instance (object_type);
+       return self;
+}
+
+Foo*
+foo_new (void)
+{
+       return foo_construct (TYPE_FOO);
+}
+
+static void
+value_foo_init (GValue* value)
+{
+       value->data[0].v_pointer = NULL;
+}
+
+static void
+value_foo_free_value (GValue* value)
+{
+       if (value->data[0].v_pointer) {
+               foo_unref (value->data[0].v_pointer);
+       }
+}
+
+static void
+value_foo_copy_value (const GValue* src_value,
+                      GValue* dest_value)
+{
+       if (src_value->data[0].v_pointer) {
+               dest_value->data[0].v_pointer = foo_ref (src_value->data[0].v_pointer);
+       } else {
+               dest_value->data[0].v_pointer = NULL;
+       }
+}
+
+static gpointer
+value_foo_peek_pointer (const GValue* value)
+{
+       return value->data[0].v_pointer;
+}
+
+static gchar*
+value_foo_collect_value (GValue* value,
+                         guint n_collect_values,
+                         GTypeCValue* collect_values,
+                         guint collect_flags)
+{
+       if (collect_values[0].v_pointer) {
+               Foo * object;
+               object = collect_values[0].v_pointer;
+               if (object->parent_instance.g_class == NULL) {
+                       return g_strconcat ("invalid unclassed object pointer for value type `", 
G_VALUE_TYPE_NAME (value), "'", NULL);
+               } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+                       return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE 
(object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+               }
+               value->data[0].v_pointer = foo_ref (object);
+       } else {
+               value->data[0].v_pointer = NULL;
+       }
+       return NULL;
+}
+
+static gchar*
+value_foo_lcopy_value (const GValue* value,
+                       guint n_collect_values,
+                       GTypeCValue* collect_values,
+                       guint collect_flags)
+{
+       Foo ** object_p;
+       object_p = collect_values[0].v_pointer;
+       if (!object_p) {
+               return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+       }
+       if (!value->data[0].v_pointer) {
+               *object_p = NULL;
+       } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+               *object_p = value->data[0].v_pointer;
+       } else {
+               *object_p = foo_ref (value->data[0].v_pointer);
+       }
+       return NULL;
+}
+
+GParamSpec*
+param_spec_foo (const gchar* name,
+                const gchar* nick,
+                const gchar* blurb,
+                GType object_type,
+                GParamFlags flags)
+{
+       ParamSpecFoo* spec;
+       g_return_val_if_fail (g_type_is_a (object_type, TYPE_FOO), NULL);
+       spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+       G_PARAM_SPEC (spec)->value_type = object_type;
+       return G_PARAM_SPEC (spec);
+}
+
+gpointer
+value_get_foo (const GValue* value)
+{
+       g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FOO), NULL);
+       return value->data[0].v_pointer;
+}
+
+void
+value_set_foo (GValue* value,
+               gpointer v_object)
+{
+       Foo * old;
+       g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FOO));
+       old = value->data[0].v_pointer;
+       if (v_object) {
+               g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_FOO));
+               g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE 
(value)));
+               value->data[0].v_pointer = v_object;
+               foo_ref (value->data[0].v_pointer);
+       } else {
+               value->data[0].v_pointer = NULL;
+       }
+       if (old) {
+               foo_unref (old);
+       }
+}
+
+void
+value_take_foo (GValue* value,
+                gpointer v_object)
+{
+       Foo * old;
+       g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_FOO));
+       old = value->data[0].v_pointer;
+       if (v_object) {
+               g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_FOO));
+               g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE 
(value)));
+               value->data[0].v_pointer = v_object;
+       } else {
+               value->data[0].v_pointer = NULL;
+       }
+       if (old) {
+               foo_unref (old);
+       }
+}
+
+static void
+foo_class_init (FooClass * klass,
+                gpointer klass_data)
+{
+       foo_parent_class = g_type_class_peek_parent (klass);
+       ((FooClass *) klass)->finalize = foo_finalize;
+       g_type_class_adjust_private_offset (klass, &Foo_private_offset);
+}
+
+static void
+foo_instance_init (Foo * self,
+                   gpointer klass)
+{
+       self->priv = foo_get_instance_private (self);
+       g_rec_mutex_init (&self->priv->__lock_manam);
+       self->priv->manam = TRUE;
+       self->ref_count = 1;
+}
+
+static void
+foo_finalize (Foo * obj)
+{
+       Foo * self;
+       self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FOO, Foo);
+       g_signal_handlers_destroy (self);
+       g_rec_mutex_clear (&self->priv->__lock_manam);
+}
+
+static GType
+foo_get_type_once (void)
+{
+       static const GTypeValueTable g_define_type_value_table = { value_foo_init, value_foo_free_value, 
value_foo_copy_value, value_foo_peek_pointer, "p", value_foo_collect_value, "p", value_foo_lcopy_value };
+       static const GTypeInfo g_define_type_info = { sizeof (FooClass), (GBaseInitFunc) NULL, 
(GBaseFinalizeFunc) NULL, (GClassInitFunc) foo_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (Foo), 0, 
(GInstanceInitFunc) foo_instance_init, &g_define_type_value_table };
+       static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | 
G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+       GType foo_type_id;
+       foo_type_id = g_type_register_fundamental (g_type_fundamental_next (), "Foo", &g_define_type_info, 
&g_define_type_fundamental_info, 0);
+       Foo_private_offset = g_type_add_instance_private (foo_type_id, sizeof (FooPrivate));
+       return foo_type_id;
+}
+
+GType
+foo_get_type (void)
+{
+       static volatile gsize foo_type_id__volatile = 0;
+       if (g_once_init_enter (&foo_type_id__volatile)) {
+               GType foo_type_id;
+               foo_type_id = foo_get_type_once ();
+               g_once_init_leave (&foo_type_id__volatile, foo_type_id);
+       }
+       return foo_type_id__volatile;
+}
+
+gpointer
+foo_ref (gpointer instance)
+{
+       Foo * self;
+       self = instance;
+       g_atomic_int_inc (&self->ref_count);
+       return instance;
+}
+
+void
+foo_unref (gpointer instance)
+{
+       Foo * self;
+       self = instance;
+       if (g_atomic_int_dec_and_test (&self->ref_count)) {
+               FOO_GET_CLASS (self)->finalize (self);
+               g_type_free_instance ((GTypeInstance *) self);
+       }
+}
+
+static void
+_vala_main (void)
+{
+}
+
+int
+main (int argc,
+      char ** argv)
+{
+       _vala_main ();
+       return 0;
+}
+
diff --git a/tests/control-flow/lock-if-throw.vala b/tests/control-flow/lock-if-throw.vala
new file mode 100644
index 000000000..22747c560
--- /dev/null
+++ b/tests/control-flow/lock-if-throw.vala
@@ -0,0 +1,24 @@
+errordomain FooError {
+       FAIL;
+}
+
+class Foo {
+       bool manam = true;
+
+       public bool bar () throws Error {
+               bool result;
+
+               lock (manam) {
+                       if (manam) {
+                               throw new FooError.FAIL ("foo");
+                       } else {
+                               result = true;
+                       }
+               }
+
+               return result;
+       }
+}
+
+void main () {
+}
diff --git a/vala/valalockstatement.vala b/vala/valalockstatement.vala
index 65c579be6..557123525 100644
--- a/vala/valalockstatement.vala
+++ b/vala/valalockstatement.vala
@@ -84,14 +84,26 @@ public class Vala.LockStatement : CodeNode, Statement {
 
        public override bool check (CodeContext context) {
                if (body != null) {
-                       // if the statement isn't empty, it is converted into a try statement
+                       if (!body.check (context)) {
+                               return false;
+                       }
 
+                       // if the statement isn't empty, it is converted into a try statement
                        var fin_body = new Block (source_reference);
                        fin_body.add_statement (new UnlockStatement (resource, source_reference));
 
+                       var try_stmt = new TryStatement (body, fin_body, source_reference);
+                       if (body.tree_can_fail) {
+                               var catch_body = new Block (source_reference);
+                               catch_body.add_statement (new ThrowStatement (new ReferenceTransferExpression 
(new MemberAccess.simple ("_lock_error_")), source_reference));
+                               var catch_clause = new CatchClause (new ErrorType (null, null), 
"_lock_error_", catch_body, source_reference);
+                               catch_clause.error_type.value_owned = true;
+                               try_stmt.add_catch_clause (catch_clause);
+                       }
+
                        var block = new Block (source_reference);
                        block.add_statement (new LockStatement (resource, null, source_reference));
-                       block.add_statement (new TryStatement (body, fin_body, source_reference));
+                       block.add_statement (try_stmt);
 
                        var parent_block = (Block) parent_node;
                        parent_block.replace_statement (this, block);