codegen: Skip StructRegisterFunction for boolean/integer/floating types

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

diff --git a/codegen/valaccodestructmodule.vala b/codegen/valaccodestructmodule.vala
index 2cd56bb67f56824d873cb5878850bbc25e0f74e7..c2882047da4227f03f8b4bc5ffdc9f6ee205f1b4 100644 (file)
--- a/codegen/valaccodestructmodule.vala
+++ b/codegen/valaccodestructmodule.vala
@@ -31,6 +31,7 @@ public abstract class Vala.CCodeStructModule : CCodeBaseModule {
                }
 
                if (st.is_boolean_type () || st.is_integer_type () || st.is_floating_type ()) {
+                       // See GTypeModule.visit_struct()
                        if (st.base_struct != null) {
                                generate_struct_declaration (st.base_struct, decl_space);
                                decl_space.add_type_declaration (new CCodeTypeDefinition (get_ccode_name (st.base_struct), new CCodeVariableDeclarator (get_ccode_name (st))));

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 72007249bd75e1f4ad16d3087e88b6bcf0fb2c88..cbb38398e55deb7ff05f713122b0efd04633c3e8 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -2242,6 +2242,12 @@ public class Vala.GTypeModule : GErrorModule {
        public override void visit_struct (Struct st) {
                base.visit_struct (st);
 
+               if (st.is_boolean_type () || st.is_integer_type () || st.is_floating_type ()) {
+                       // Skip GType handling for these struct types,
+                       // like in CCodeStructModule.generate_struct_declaration()
+                       return;
+               }
+
                if (get_ccode_has_type_id (st)) {
                        push_line (st.source_reference);
                        var type_fun = new StructRegisterFunction (st);

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 24f9d16224f374c52f5b93ddf1a061603eac7e82..81cde2fe9e093a6829d40a034eb0191153d239a6 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -241,6 +241,7 @@ TESTS = \
        structs/struct-base-types.vala \
        structs/struct-empty-still.test \
        structs/struct-no-gtype.vala \
+       structs/struct-no-gtype-inherit.vala \
        structs/struct-static-field-initializer.vala \
        structs/struct-static-field-initializer.test \
        structs/struct-static-property-initializer.test \

diff --git a/tests/structs/struct-no-gtype-inherit.vala b/tests/structs/struct-no-gtype-inherit.vala
new file mode 100644 (file)
index 0000000..3dc3e8c
--- /dev/null
+++ b/tests/structs/struct-no-gtype-inherit.vala
@@ -0,0 +1,11 @@
+[SimpleType]
+[IntegerType (rank = 6, signed = true, width = 32)]
+[CCode (has_type_id = false)]
+struct foo_t {
+}
+
+struct bar_t : foo_t {
+}
+
+void main () {
+}