From 1b812f6bdfe9d3d76f31bb0057f96157843f9bd6 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Mon, 30 Sep 2024 23:03:51 -0300 Subject: [PATCH] cgen: fix global struct init on tcc (fix #22300) (#22350) --- vlib/v/gen/c/cgen.v | 5 ++++ ...ave => global_initializer_nix.c.must_have} | 0 ...itializer.vv => global_initializer_nix.vv} | 0 .../global_initializer_windows.must_have | 1 + .../c/testdata/global_initializer_windows.vv | 11 +++++++++ vlib/v/tests/global_init_test.v | 23 +++++++++++++++++++ 6 files changed, 40 insertions(+) rename vlib/v/gen/c/testdata/{global_initializer.c.must_have => global_initializer_nix.c.must_have} (100%) rename vlib/v/gen/c/testdata/{global_initializer.vv => global_initializer_nix.vv} (100%) create mode 100644 vlib/v/gen/c/testdata/global_initializer_windows.must_have create mode 100644 vlib/v/gen/c/testdata/global_initializer_windows.vv create mode 100644 vlib/v/tests/global_init_test.v diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index 0e15b0cc1008d6..0cf4c8a8a4bc05 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -7353,6 +7353,11 @@ fn (mut g Gen) type_default(typ_ ast.Type) string { } else { '{' } + $if windows { + if !typ.has_flag(.shared_f) && g.inside_global_decl { + init_str = '(${g.typ(typ)}){' + } + } if sym.language in [.c, .v] { for field in info.fields { field_sym := g.table.sym(field.typ) diff --git a/vlib/v/gen/c/testdata/global_initializer.c.must_have b/vlib/v/gen/c/testdata/global_initializer_nix.c.must_have similarity index 100% rename from vlib/v/gen/c/testdata/global_initializer.c.must_have rename to vlib/v/gen/c/testdata/global_initializer_nix.c.must_have diff --git a/vlib/v/gen/c/testdata/global_initializer.vv b/vlib/v/gen/c/testdata/global_initializer_nix.vv similarity index 100% rename from vlib/v/gen/c/testdata/global_initializer.vv rename to vlib/v/gen/c/testdata/global_initializer_nix.vv diff --git a/vlib/v/gen/c/testdata/global_initializer_windows.must_have b/vlib/v/gen/c/testdata/global_initializer_windows.must_have new file mode 100644 index 00000000000000..383d042d59b133 --- /dev/null +++ b/vlib/v/gen/c/testdata/global_initializer_windows.must_have @@ -0,0 +1 @@ +Array_fixed_main__Foo_3 g_test_foo = {(main__Foo){.foo = 0,.bar = (main___VAnonStruct1){.a = 0,.b = 0,},}, (main__Foo){.foo = 0,.bar = (main___VAnonStruct1){.a = 0,.b = 0,},}, (main__Foo){.foo = 0,.bar = (main___VAnonStruct1){.a = 0,.b = 0,},}}; // global4 \ No newline at end of file diff --git a/vlib/v/gen/c/testdata/global_initializer_windows.vv b/vlib/v/gen/c/testdata/global_initializer_windows.vv new file mode 100644 index 00000000000000..6f2ad48dc3a8bb --- /dev/null +++ b/vlib/v/gen/c/testdata/global_initializer_windows.vv @@ -0,0 +1,11 @@ +// vtest vflags: -enable-globals + +struct Foo { + foo int + bar struct { + a int + b f64 + } +} + +__global g_test_foo = [3]Foo{} diff --git a/vlib/v/tests/global_init_test.v b/vlib/v/tests/global_init_test.v new file mode 100644 index 00000000000000..675b1d8a20dfee --- /dev/null +++ b/vlib/v/tests/global_init_test.v @@ -0,0 +1,23 @@ +@[has_globals] +module main + +interface IGameObject { +mut: + name string +} + +struct Game { +mut: + objects []IGameObject + delete_objects []IGameObject +} + +__global ( + game Game +) + +fn test_main() { + println('game: ${game}') + assert game.objects.len == 0 + assert game.delete_objects.len == 0 +}