diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-02-24 13:45:18 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2022-02-24 13:45:18 +0100 |
| commit | 612bded4642734554b7658c64d90ec1c3336006d (patch) | |
| tree | b9af61643527b583b216ae6c473a11e795edf78e /codegen | |
| parent | 33510fe8fe76a569656de5cc69234c435149da14 (diff) | |
| download | vala-612bded4642734554b7658c64d90ec1c3336006d.tar.gz | |
codegen: Emit G_DEFINE_AUTOPTR_CLEANUP_FUNC() for interfaces with base class
Fixes https://gitlab.gnome.org/GNOME/vala/issues/1292
Diffstat (limited to 'codegen')
| -rw-r--r-- | codegen/valagtypemodule.vala | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala index 1f600afe3..28a29744c 100644 --- a/codegen/valagtypemodule.vala +++ b/codegen/valagtypemodule.vala @@ -2148,8 +2148,9 @@ public class Vala.GTypeModule : GErrorModule { decl_space.add_type_declaration (new CCodeTypeDefinition ("struct _%s".printf (get_ccode_name (iface)), new CCodeVariableDeclarator (get_ccode_name (iface)))); decl_space.add_type_declaration (new CCodeTypeDefinition ("struct %s".printf (type_struct.name), new CCodeVariableDeclarator (get_ccode_type_name (iface)))); + unowned Class? prereq_cl = null; foreach (DataType prerequisite in iface.get_prerequisites ()) { - unowned Class? prereq_cl = prerequisite.type_symbol as Class; + prereq_cl = prerequisite.type_symbol as Class; unowned Interface? prereq_iface = prerequisite.type_symbol as Interface; if (prereq_cl != null) { generate_class_declaration (prereq_cl, decl_space); @@ -2216,6 +2217,16 @@ public class Vala.GTypeModule : GErrorModule { decl_space.add_type_member_declaration (type_fun.get_declaration ()); requires_vala_extern = true; + + if (prereq_cl != null) { + var base_class = prereq_cl; + while (base_class.base_class != null) { + base_class = base_class.base_class; + } + // Custom unref-methods need to be emitted before G_DEFINE_AUTOPTR_CLEANUP_FUNC, + // so we guard against that special case and handle it in generate_method_declaration. + generate_autoptr_cleanup (iface, base_class, decl_space); + } } public override void visit_interface (Interface iface) { |