Merge branch 'master' into host-trampolines

lib/compiler-llvm/src/compiler.rs

@@ -72,6 +72,7 @@ impl Compiler for LLVMCompiler {
         let mut readonly_section = CustomSection {
             protection: CustomSectionProtection::Read,
             bytes: SectionBody::default(),
+            relocations: vec![],
         };
 
         for (func_index, _) in &module.functions {

lib/compiler-llvm/src/translator/code.rs

@@ -439,6 +439,7 @@ impl FuncTranslator {
             CustomSection {
                 protection: CustomSectionProtection::Read,
                 bytes: SectionBody::default(),
+                relocations: vec![],
             },
         );
         for (section_idx, local_section_idx) in required_custom_sections {
@@ -2335,7 +2336,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
                     let vmctx_ptr_ptr = builder
                         .build_struct_gep(
                             vmfunction_import_ptr,
-                            intrinsics.vmfunction_import_body_element,
+                            intrinsics.vmfunction_import_vmctx_element,
                             "",
                         )
                         .unwrap();