From 8a97f4458feba1a9dba2f21b9dcf2d5587bdac41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=BCtt?= Date: Tue, 27 Dec 2022 16:08:04 +0100 Subject: [PATCH] Debug why --object-format serialized segfaults --- lib/cli/src/commands/create_exe.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/cli/src/commands/create_exe.rs b/lib/cli/src/commands/create_exe.rs index e188685c6..268fa9be0 100644 --- a/lib/cli/src/commands/create_exe.rs +++ b/lib/cli/src/commands/create_exe.rs @@ -1198,14 +1198,6 @@ fn generate_wasmer_main_c( let atom_name = prefix.clone(); let module_name = format!("WASMER_{}_METADATA", prefix.to_uppercase()); - write!( - c_code_to_add, - " - extern size_t {module_name}_LENGTH asm(\"{module_name}_LENGTH\"); - extern char {module_name}_DATA asm(\"{module_name}_DATA\"); - " - )?; - if compile_static { extra_headers.push(format!("#include \"static_defs_{atom_name}.h\"")); @@ -1219,6 +1211,15 @@ fn generate_wasmer_main_c( ")?; } else { extra_headers.push(format!("const extern unsigned char {module_name}[];\r\n")); + + write!( + c_code_to_add, + " + extern size_t {module_name}_LENGTH asm(\"{module_name}_LENGTH\"); + extern char {module_name}_DATA asm(\"{module_name}_DATA\"); + " + )?; + write!(c_code_to_instantiate, " wasm_byte_vec_t atom_{atom_name}_byte_vec = {{ .size = {module_name}_LENGTH,