Update module info in-place.

kebing1011 · Nov 23, 2020 · 9d8f315 · 9d8f315
1 parent 13a979a
commit 9d8f315
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 24 deletions.
diff --git a/lib/compiler-cranelift/src/compiler.rs b/lib/compiler-cranelift/src/compiler.rs
@@ -19,11 +19,13 @@ use cranelift_codegen::{binemit, Context};
 #[cfg(feature = "unwind")]
 use gimli::write::{Address, EhFrame, FrameTable};
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
+use std::sync::Arc;
 use wasmer_compiler::CompileError;
 use wasmer_compiler::{CallingConvention, ModuleTranslationState, Target};
 use wasmer_compiler::{
     Compilation, CompileModuleInfo, CompiledFunction, CompiledFunctionFrameInfo,
-    CompiledFunctionUnwindInfo, Compiler, Dwarf, FunctionBody, FunctionBodyData, SectionIndex,
+    CompiledFunctionUnwindInfo, Compiler, Dwarf, FunctionBody, FunctionBodyData,
+    ModuleMiddlewareChain, SectionIndex,
 };
 use wasmer_types::entity::{EntityRef, PrimaryMap};
 use wasmer_types::{FunctionIndex, LocalFunctionIndex, SignatureIndex};
@@ -54,14 +56,17 @@ impl Compiler for CraneliftCompiler {
     fn compile_module(
         &self,
         target: &Target,
-        compile_info: &CompileModuleInfo,
+        compile_info: &mut CompileModuleInfo,
         module_translation_state: &ModuleTranslationState,
         function_body_inputs: PrimaryMap<LocalFunctionIndex, FunctionBodyData<'_>>,
     ) -> Result<Compilation, CompileError> {
         let isa = self.config().isa(target);
         let frontend_config = isa.frontend_config();
         let memory_styles = &compile_info.memory_styles;
         let table_styles = &compile_info.table_styles;
+        let mut module = (*compile_info.module).clone();
+        self.config.middlewares.apply_on_module_info(&mut module);
+        compile_info.module = Arc::new(module);
         let module = &compile_info.module;
         let signatures = module
             .signatures
@@ -77,7 +82,7 @@ impl Compiler for CraneliftCompiler {
             // FDEs will cause some issues in Linux.
             None
         } else {
-            use std::sync::{Arc, Mutex};
+            use std::sync::Mutex;
             match target.triple().default_calling_convention() {
                 Ok(CallingConvention::SystemV) => {
                     match isa.create_systemv_cie() {
@@ -125,7 +130,7 @@ impl Compiler for CraneliftCompiler {
                 )?;
 
                 let mut code_buf: Vec<u8> = Vec::new();
-                let mut reloc_sink = RelocSink::new(module, func_index);
+                let mut reloc_sink = RelocSink::new(&module, func_index);
                 let mut trap_sink = TrapSink::new();
                 let mut stackmap_sink = binemit::NullStackMapSink {};
                 context

diff --git a/lib/compiler-llvm/src/compiler.rs b/lib/compiler-llvm/src/compiler.rs
@@ -8,15 +8,16 @@ use inkwell::module::{Linkage, Module};
 use inkwell::targets::FileType;
 use inkwell::DLLStorageClass;
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
+use std::sync::Arc;
 use wasmer_compiler::{
     Compilation, CompileError, CompileModuleInfo, Compiler, CustomSection, CustomSectionProtection,
-    Dwarf, FunctionBodyData, ModuleTranslationState, RelocationTarget, SectionBody, SectionIndex,
-    Symbol, SymbolRegistry, Target,
+    Dwarf, FunctionBodyData, ModuleMiddlewareChain, ModuleTranslationState, RelocationTarget,
+    SectionBody, SectionIndex, Symbol, SymbolRegistry, Target,
 };
 use wasmer_types::entity::{EntityRef, PrimaryMap};
 use wasmer_types::{FunctionIndex, LocalFunctionIndex, SignatureIndex};
 
-//use std::sync::{Arc, Mutex};
+//use std::sync::Mutex;
 
 /// A compiler that compiles a WebAssembly module with LLVM, translating the Wasm to LLVM IR,
 /// optimizing it and then translating to assembly.
@@ -233,13 +234,17 @@ impl Compiler for LLVMCompiler {
     fn compile_module<'data, 'module>(
         &self,
         target: &Target,
-        compile_info: &'module CompileModuleInfo,
+        compile_info: &'module mut CompileModuleInfo,
         module_translation: &ModuleTranslationState,
         function_body_inputs: PrimaryMap<LocalFunctionIndex, FunctionBodyData<'data>>,
     ) -> Result<Compilation, CompileError> {
         //let data = Arc::new(Mutex::new(0));
         let memory_styles = &compile_info.memory_styles;
         let table_styles = &compile_info.table_styles;
+
+        let mut module = (*compile_info.module).clone();
+        self.config.middlewares.apply_on_module_info(&mut module);
+        compile_info.module = Arc::new(module);
         let module = &compile_info.module;
 
         // TODO: merge constants in sections.
@@ -260,7 +265,7 @@ impl Compiler for LLVMCompiler {
                     // TODO: remove (to serialize)
                     //let _data = data.lock().unwrap();
                     func_translator.translate(
-                        &module,
+                        module,
                         module_translation,
                         i,
                         input,

diff --git a/lib/compiler-singlepass/src/compiler.rs b/lib/compiler-singlepass/src/compiler.rs
@@ -47,7 +47,7 @@ impl Compiler for SinglepassCompiler {
     fn compile_module(
         &self,
         _target: &Target,
-        compile_info: &CompileModuleInfo,
+        compile_info: &mut CompileModuleInfo,
         _module_translation: &ModuleTranslationState,
         function_body_inputs: PrimaryMap<LocalFunctionIndex, FunctionBodyData<'_>>,
     ) -> Result<Compilation, CompileError> {
@@ -57,6 +57,9 @@ impl Compiler for SinglepassCompiler {
         let vmoffsets = VMOffsets::new(8, &compile_info.module);
         let memory_styles = &compile_info.memory_styles;
         let table_styles = &compile_info.table_styles;
+        let mut module = (*compile_info.module).clone();
+        self.config.middlewares.apply_on_module_info(&mut module);
+        compile_info.module = Arc::new(module);
         let module = &compile_info.module;
         let import_trampolines: PrimaryMap<SectionIndex, _> = (0..module.num_imported_functions)
             .map(FunctionIndex::new)

diff --git a/lib/compiler/README.md b/lib/compiler/README.md
@@ -34,7 +34,7 @@ pub trait Compiler {
     fn compile_module<'data, 'module>(
         &self,
         target: &Target,
-        compile_info: &'module CompileModuleInfo,
+        compile_info: &'module mut CompileModuleInfo,
         module_translation: &ModuleTranslationState,
         // The list of function bodies
         function_body_inputs: PrimaryMap<LocalFunctionIndex, FunctionBodyData<'data>>,

diff --git a/lib/compiler/src/compiler.rs b/lib/compiler/src/compiler.rs
@@ -84,7 +84,7 @@ pub trait Compiler {
     fn compile_module<'data, 'module>(
         &self,
         target: &Target,
-        module: &'module CompileModuleInfo,
+        module: &'module mut CompileModuleInfo,
         module_translation: &ModuleTranslationState,
         // The list of function bodies
         function_body_inputs: PrimaryMap<LocalFunctionIndex, FunctionBodyData<'data>>,

diff --git a/lib/engine-jit/src/artifact.rs b/lib/engine-jit/src/artifact.rs
@@ -70,7 +70,7 @@ impl JITArtifact {
             .map(|table_type| tunables.table_style(table_type))
             .collect();
 
-        let compile_info = CompileModuleInfo {
+        let mut compile_info = CompileModuleInfo {
             module: Arc::new(translation.module),
             features: features.clone(),
             memory_styles,
@@ -82,7 +82,7 @@ impl JITArtifact {
         // Compile the Module
         let compilation = compiler.compile_module(
             &jit.target(),
-            &compile_info,
+            &mut compile_info,
             // SAFETY: Calling `unwrap` is correct since
             // `environ.translate()` above will write some data into
             // `module_translation_state`.

diff --git a/lib/engine-native/src/artifact.rs b/lib/engine-native/src/artifact.rs
@@ -176,7 +176,7 @@ impl NativeArtifact {
             .map(|_function_body| 0u64)
             .collect::<PrimaryMap<LocalFunctionIndex, u64>>();
 
-        let metadata = ModuleMetadata {
+        let mut metadata = ModuleMetadata {
             compile_info,
             prefix: engine_inner.get_prefix(&data),
             data_initializers,
@@ -190,12 +190,13 @@ impl NativeArtifact {
             .expect("Should write number");
         metadata_binary.extend(serialized_data);
 
+        let (compile_info, symbol_registry) = metadata.split();
         let maybe_obj_bytes = compiler.experimental_native_compile_module(
             &target,
-            &metadata.compile_info,
+            compile_info,
             module_translation.as_ref().unwrap(),
             &function_body_inputs,
-            &metadata,
+            symbol_registry,
             &metadata_binary,
         );
 
@@ -216,7 +217,7 @@ impl NativeArtifact {
             None => {
                 let compilation = compiler.compile_module(
                     &target,
-                    &metadata.compile_info,
+                    &mut metadata.compile_info,
                     module_translation.as_ref().unwrap(),
                     function_body_inputs,
                 )?;

diff --git a/lib/engine-native/src/serialize.rs b/lib/engine-native/src/serialize.rs
@@ -13,6 +13,16 @@ pub struct ModuleMetadata {
     pub function_body_lengths: PrimaryMap<LocalFunctionIndex, u64>,
 }
 
+impl ModuleMetadata {
+    pub fn split(&mut self) -> (&mut CompileModuleInfo, &dyn SymbolRegistry) {
+        let compile_info = &self.compile_info;
+        let symbol_registry = self as &dyn SymbolRegistry;
+        #[allow(mutable_transmutes)]
+        let compile_info = unsafe { std::mem::transmute::<&_, &mut _>(compile_info) };
+        (compile_info, symbol_registry)
+    }
+}
+
 impl SymbolRegistry for ModuleMetadata {
     fn symbol_to_name(&self, symbol: Symbol) -> String {
         match symbol {

diff --git a/lib/engine-object-file/src/artifact.rs b/lib/engine-object-file/src/artifact.rs
@@ -162,7 +162,7 @@ impl ObjectFileArtifact {
             .map(|_function_body| 0u64)
             .collect::<PrimaryMap<LocalFunctionIndex, u64>>();
 
-        let metadata = ModuleMetadata {
+        let mut metadata = ModuleMetadata {
             compile_info,
             prefix: engine_inner.get_prefix(&data),
             data_initializers,
@@ -194,12 +194,13 @@ impl ObjectFileArtifact {
         metadata_binary.extend(serialized_data);
         let metadata_length = metadata_binary.len();
 
+        let (compile_info, symbol_registry) = metadata.split();
         let maybe_obj_bytes = compiler.experimental_native_compile_module(
             &target,
-            &metadata.compile_info,
+            compile_info,
             module_translation.as_ref().unwrap(),
             &function_body_inputs,
-            &metadata,
+            symbol_registry,
             &metadata_binary,
         );
 
@@ -208,7 +209,7 @@ impl ObjectFileArtifact {
         } else {
             let compilation = compiler.compile_module(
                 &target,
-                &metadata.compile_info,
+                &mut metadata.compile_info,
                 module_translation.as_ref().unwrap(),
                 function_body_inputs,
             )?;

diff --git a/lib/engine-object-file/src/serialize.rs b/lib/engine-object-file/src/serialize.rs
@@ -13,6 +13,16 @@ pub struct ModuleMetadata {
     pub function_body_lengths: PrimaryMap<LocalFunctionIndex, u64>,
 }
 
+impl ModuleMetadata {
+    pub fn split(&mut self) -> (&mut CompileModuleInfo, &dyn SymbolRegistry) {
+        let compile_info = &self.compile_info;
+        let symbol_registry = self as &dyn SymbolRegistry;
+        #[allow(mutable_transmutes)]
+        let compile_info = unsafe { std::mem::transmute::<&_, &mut _>(compile_info) };
+        (compile_info, symbol_registry)
+    }
+}
+
 impl SymbolRegistry for ModuleMetadata {
     fn symbol_to_name(&self, symbol: Symbol) -> String {
         match symbol {

diff --git a/lib/vm/src/module.rs b/lib/vm/src/module.rs
@@ -19,7 +19,7 @@ use wasmer_types::{
     TableIndex, TableInitializer, TableType,
 };
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct ModuleId {
     id: usize,
 }
@@ -41,7 +41,7 @@ impl Default for ModuleId {
 
 /// A translated WebAssembly module, excluding the function bodies and
 /// memory initializers.
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ModuleInfo {
     /// A unique identifier (within this process) for this module.
     ///