From 062b9df0c4a5d1a192c2006a7e172c6c0401809c Mon Sep 17 00:00:00 2001 From: kbkpbot Date: Sat, 4 Oct 2025 10:51:58 +0800 Subject: [PATCH] cgen: fix calling builtin__closure__closure_init() before vinit() with -shared (fix #25417) (#25433) --- vlib/v/gen/c/cgen.v | 3 --- vlib/v/gen/c/testdata/closure_shared_lib.c.must_have | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index 7989f9fcc..ad3007249 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -6798,9 +6798,6 @@ fn (mut g Gen) write_init_function() { g.export_funcs << '_vinit_caller' g.writeln('void _vinit_caller() {') g.writeln('\tstatic bool once = false; if (once) {return;} once = true;') - if g.nr_closures > 0 { - g.writeln('\tbuiltin__closure__closure_init(); // vinit_caller()') - } g.writeln('\t_vinit(0,0);') g.writeln('}') diff --git a/vlib/v/gen/c/testdata/closure_shared_lib.c.must_have b/vlib/v/gen/c/testdata/closure_shared_lib.c.must_have index d98668cd1..b1793c0e0 100644 --- a/vlib/v/gen/c/testdata/closure_shared_lib.c.must_have +++ b/vlib/v/gen/c/testdata/closure_shared_lib.c.must_have @@ -1 +1 @@ -__closure_init(); // vinit_caller() \ No newline at end of file +builtin__closure__closure_init(); -- 2.39.5