From: Rico Tzschichholz Date: Fri, 26 Jan 2024 07:13:03 +0000 (+0100) Subject: codegen: Correctly return FALSE on uncaught error in async ctor X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d5afc9a9c7f4a4bbf78e906b83dad7c277eea3c;p=thirdparty%2Fvala.git codegen: Correctly return FALSE on uncaught error in async ctor Found by -Werror=int-conversion --- diff --git a/codegen/valagerrormodule.vala b/codegen/valagerrormodule.vala index ec74ac025..9f194a630 100644 --- a/codegen/valagerrormodule.vala +++ b/codegen/valagerrormodule.vala @@ -178,7 +178,12 @@ public class Vala.GErrorModule : CCodeDelegateModule { ccode.add_expression (ccritical); ccode.add_expression (cclear); - if (is_in_constructor () || is_in_destructor ()) { + if (is_in_coroutine ()) { + var unref = new CCodeFunctionCall (new CCodeIdentifier ("g_object_unref")); + unref.add_argument (get_variable_cexpression ("_async_result")); + ccode.add_expression (unref); + ccode.add_return (new CCodeConstant ("FALSE")); + } else 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) { @@ -186,11 +191,6 @@ public class Vala.GErrorModule : CCodeDelegateModule { } else { ccode.add_return (new CCodeConstant ("NULL")); } - } else if (is_in_coroutine ()) { - var unref = new CCodeFunctionCall (new CCodeIdentifier ("g_object_unref")); - unref.add_argument (get_variable_cexpression ("_async_result")); - ccode.add_expression (unref); - ccode.add_return (new CCodeConstant ("FALSE")); } else if (current_return_type != null) { return_default_value (current_return_type, true); } diff --git a/tests/Makefile.am b/tests/Makefile.am index 36c582eac..034311adb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -782,6 +782,7 @@ TESTS = \ asynchronous/captured-fixed-array.vala \ asynchronous/catch-error-scope.vala \ asynchronous/catch-in-finally.vala \ + asynchronous/creation-method-uncaught.vala \ asynchronous/creation-missing-yield.test \ asynchronous/closures.vala \ asynchronous/constructor-argument-check.vala \ diff --git a/tests/asynchronous/creation-method-uncaught.c-expected b/tests/asynchronous/creation-method-uncaught.c-expected new file mode 100644 index 000000000..67d85267e --- /dev/null +++ b/tests/asynchronous/creation-method-uncaught.c-expected @@ -0,0 +1,439 @@ +/* asynchronous_creation_method_uncaught.c generated by valac, the Vala compiler + * generated from asynchronous_creation_method_uncaught.vala, do not modify */ + +#include +#include +#include +#include + +#if !defined(VALA_EXTERN) +#if defined(_WIN32) || defined(__CYGWIN__) +#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_ERROR (foo_error_get_type ()) + +#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 _foo_unref0(var) ((var == NULL) ? NULL : (var = (foo_unref (var), NULL))) +typedef struct _FooNewData FooNewData; +typedef struct _ParamSpecFoo ParamSpecFoo; + +typedef enum { + FOO_ERROR_FOO +} 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 _FooNewData { + int _state_; + GObject* _source_object_; + GAsyncResult* _res_; + GTask* _async_result; + GType object_type; + Foo* self; + GError* _inner_error0_; +}; + +struct _ParamSpecFoo { + GParamSpec parent_instance; +}; + +static gpointer foo_parent_class = NULL; + +VALA_EXTERN GQuark foo_error_quark (void); +VALA_EXTERN GType foo_error_get_type (void) G_GNUC_CONST ; +VALA_EXTERN void bar (GError** error); +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) +static void foo_construct_data_free (gpointer _data); +VALA_EXTERN void foo_new (GAsyncReadyCallback _callback_, + gpointer _user_data_); +VALA_EXTERN Foo* foo_new_finish (GAsyncResult* _res_, + GError** error); +VALA_EXTERN void foo_construct (GType object_type, + GAsyncReadyCallback _callback_, + gpointer _user_data_); +VALA_EXTERN Foo* foo_construct_finish (GAsyncResult* _res_, + GError** error); +static gboolean foo_construct_co (FooNewData* _data_); +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 GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FOO, "FOO_ERROR_FOO", "foo"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + +void +bar (GError** error) +{ +} + +static void +foo_construct_data_free (gpointer _data) +{ + FooNewData* _data_; + _data_ = _data; + _foo_unref0 (_data_->self); + g_slice_free (FooNewData, _data_); +} + +void +foo_construct (GType object_type, + GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ + FooNewData* _data_; + _data_ = g_slice_new0 (FooNewData); + _data_->_async_result = g_task_new (NULL, NULL, _callback_, _user_data_); + g_task_set_task_data (_data_->_async_result, _data_, foo_construct_data_free); + _data_->object_type = object_type; + foo_construct_co (_data_); +} + +Foo* +foo_construct_finish (GAsyncResult* _res_, + GError** error) +{ + Foo* result; + FooNewData* _data_; + _data_ = g_task_propagate_pointer (G_TASK (_res_), error); + if (NULL == _data_) { + return NULL; + } + result = _data_->self; + _data_->self = NULL; + return result; +} + +static gboolean +foo_construct_co (FooNewData* _data_) +{ + Foo* self = NULL; + switch (_data_->_state_) { + case 0: + goto _state_0; + default: + g_assert_not_reached (); + } + _state_0: + _data_->self = (Foo*) g_type_create_instance (_data_->object_type); + { + bar (&_data_->_inner_error0_); + if (G_UNLIKELY (_data_->_inner_error0_ != NULL)) { + goto __catch0_g_error; + } + } + goto __finally0; + __catch0_g_error: + { + g_clear_error (&_data_->_inner_error0_); + } + __finally0: + if (G_UNLIKELY (_data_->_inner_error0_ != NULL)) { + if (_data_->_inner_error0_->domain == FOO_ERROR) { + g_task_return_error (_data_->_async_result, _data_->_inner_error0_); + g_object_unref (_data_->_async_result); + return FALSE; + } else { + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error0_->message, g_quark_to_string (_data_->_inner_error0_->domain), _data_->_inner_error0_->code); + g_clear_error (&_data_->_inner_error0_); + g_object_unref (_data_->_async_result); + return FALSE; + } + } + g_task_return_pointer (_data_->_async_result, _data_, NULL); + if (_data_->_state_ != 0) { + while (!g_task_get_completed (_data_->_async_result)) { + g_main_context_iteration (g_task_get_context (_data_->_async_result), TRUE); + } + } + g_object_unref (_data_->_async_result); + return FALSE; +} + +void +foo_new (GAsyncReadyCallback _callback_, + gpointer _user_data_) +{ + foo_construct (TYPE_FOO, _callback_, _user_data_); +} + +Foo* +foo_new_finish (GAsyncResult* _res_, + GError** error) +{ + return foo_construct_finish (_res_, error); +} + +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; +} + +static void +foo_instance_init (Foo * self, + gpointer klass) +{ + 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); +} + +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); + return foo_type_id; +} + +GType +foo_get_type (void) +{ + static volatile gsize foo_type_id__once = 0; + if (g_once_init_enter (&foo_type_id__once)) { + GType foo_type_id; + foo_type_id = foo_get_type_once (); + g_once_init_leave (&foo_type_id__once, foo_type_id); + } + return foo_type_id__once; +} + +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/asynchronous/creation-method-uncaught.vala b/tests/asynchronous/creation-method-uncaught.vala new file mode 100644 index 000000000..5e752ba9f --- /dev/null +++ b/tests/asynchronous/creation-method-uncaught.vala @@ -0,0 +1,18 @@ +errordomain FooError { + FOO; +} + +void bar () throws GLib.Error { +} + +class Foo { + public async Foo () throws FooError { + try { + bar (); + } catch { + } + } +} + +void main () { +}