Renamed Module to ModuleInfo

lib/compiler-llvm/src/compiler.rs

@@ -14,7 +14,7 @@ use wasmer_compiler::{
     CustomSectionProtection, FunctionBody, FunctionBodyData, ModuleTranslationState, Relocation,
     RelocationTarget, SectionBody, SectionIndex, Target, TrapInformation,
 };
-use wasmer_runtime::{MemoryPlan, Module, TablePlan, TrapCode};
+use wasmer_runtime::{MemoryPlan, ModuleInfo, TablePlan, TrapCode};
 
 use inkwell::targets::{InitializationConfig, Target as InkwellTarget};
 
@@ -56,7 +56,7 @@ impl Compiler for LLVMCompiler {
     /// associated relocations.
     fn compile_module<'data, 'module>(
         &self,
-        module: &'module Module,
+        module: &'module ModuleInfo,
         _module_translation: &ModuleTranslationState,
         function_body_inputs: PrimaryMap<LocalFunctionIndex, FunctionBodyData<'data>>,
         memory_plans: PrimaryMap<MemoryIndex, MemoryPlan>,
@@ -142,7 +142,7 @@ impl Compiler for LLVMCompiler {
 
     fn compile_dynamic_function_trampolines(
         &self,
-        module: &Module,
+        module: &ModuleInfo,
     ) -> Result<PrimaryMap<FunctionIndex, FunctionBody>, CompileError> {
         Ok(PrimaryMap::new())
         // unimplemented!("Dynamic function trampolines not yet implemented");

lib/compiler-llvm/src/config.rs

@@ -10,7 +10,7 @@ use itertools::Itertools;
 use target_lexicon::Architecture;
 use wasmer_compiler::{Compiler, CompilerConfig, CpuFeature, Features, Target, Triple};
 
-/// The InkWell Module type
+/// The InkWell ModuleInfo type
 pub type InkwellModule<'ctx> = inkwell::module::Module<'ctx>;
 
 /// The InkWell MemoryBuffer type

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

@@ -47,8 +47,9 @@ use wasmer_compiler::{
     RelocationKind, RelocationTarget, SectionBody, SectionIndex, SourceLoc, WasmResult,
 };
 use wasmer_runtime::libcalls::LibCall;
-use wasmer_runtime::Module as WasmerCompilerModule;
-use wasmer_runtime::{MemoryPlan, MemoryStyle, TablePlan, VMBuiltinFunctionIndex, VMOffsets};
+use wasmer_runtime::{
+    MemoryPlan, MemoryStyle, ModuleInfo, TablePlan, VMBuiltinFunctionIndex, VMOffsets,
+};
 
 // TODO: debugging
 use std::fs;
@@ -119,7 +120,7 @@ impl FuncTranslator {
 
     pub fn translate(
         &mut self,
-        wasm_module: &WasmerCompilerModule,
+        wasm_module: &ModuleInfo,
         local_func_index: &LocalFunctionIndex,
         function_body: &FunctionBodyData,
         config: &LLVMConfig,
@@ -1434,7 +1435,7 @@ pub struct LLVMFunctionCodeGenerator<'ctx, 'a> {
     */
     module: &'a Module<'ctx>,
     vmoffsets: VMOffsets,
-    wasm_module: &'a WasmerCompilerModule,
+    wasm_module: &'a ModuleInfo,
     func_names: &'a SecondaryMap<FunctionIndex, String>,
 }
 
@@ -1442,7 +1443,7 @@ impl<'ctx, 'a> LLVMFunctionCodeGenerator<'ctx, 'a> {
     fn translate_operator(
         &mut self,
         op: Operator,
-        module: &WasmerCompilerModule,
+        module: &ModuleInfo,
         _source_loc: u32,
     ) -> Result<(), CompileError> {
         // TODO: remove this vmctx by moving everything into CtxType. Values

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

@@ -25,7 +25,7 @@ use wasm_common::{
     FunctionIndex, FunctionType as FuncType, GlobalIndex, MemoryIndex, Mutability, Pages,
     SignatureIndex, TableIndex, Type,
 };
-use wasmer_runtime::Module as WasmerCompilerModule;
+use wasmer_runtime::ModuleInfo as WasmerCompilerModule;
 use wasmer_runtime::{MemoryPlan, MemoryStyle, TrapCode, VMOffsets};
 
 pub fn type_to_llvm_ptr<'ctx>(intrinsics: &Intrinsics<'ctx>, ty: Type) -> PointerType<'ctx> {

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

@@ -4,7 +4,7 @@ use byteorder::{LittleEndian, ReadBytesExt};
 use std::io::{self, Cursor};
 use wasmer_runtime_core::vm::Ctx;
 use wasmer_runtime_core::{
-    module::ModuleInfo,
+    module::Module,
     structures::TypedIndex,
     types::{GlobalIndex, LocalOrImport, TableIndex},
 };