From 92f2e5bad299430ca6f84429ee5b710bcbebe750 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Tue, 5 Oct 2021 15:06:17 +0300 Subject: [PATCH] v.gen.c: fix compilation with `-prod`, for files using `$embed_file()` (regression after parallel cgen in 85b58b0) --- vlib/v/gen/c/cgen.v | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v index aebb52f23e..78fdc20917 100644 --- a/vlib/v/gen/c/cgen.v +++ b/vlib/v/gen/c/cgen.v @@ -301,7 +301,7 @@ pub fn gen(files []&ast.File, table &ast.Table, pref &pref.Preferences) string { done_optionals: global_g.done_optionals is_autofree: global_g.pref.autofree } - g.gen() + g.gen_file() return g } ) @@ -310,6 +310,7 @@ pub fn gen(files []&ast.File, table &ast.Table, pref &pref.Preferences) string { global_g.timers.start('cgen unification') // tg = thread gen for g in pp.get_results() { + global_g.embedded_files << g.embedded_files global_g.out.write(g.out) or { panic(err) } global_g.cheaders.write(g.cheaders) or { panic(err) } global_g.includes.write(g.includes) or { panic(err) } @@ -380,7 +381,7 @@ pub fn gen(files []&ast.File, table &ast.Table, pref &pref.Preferences) string { } else { for file in files { global_g.file = file - global_g.gen() + global_g.gen_file() global_g.inits[file.mod.name].write(global_g.init) or { panic(err) } global_g.init = strings.new_builder(100) global_g.cleanups[file.mod.name].write(global_g.cleanup) or { panic(err) } @@ -521,7 +522,7 @@ pub fn gen(files []&ast.File, table &ast.Table, pref &pref.Preferences) string { return b.str() } -pub fn (mut g Gen) gen() { +pub fn (mut g Gen) gen_file() { g.timers.start('cgen_file $g.file.path') if g.pref.is_vlines {