T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deduplicate creation of CompiledModule (#3986)

Browse Source 
Push the creation of a module's `CompiledModule` into one location of
`Module::from_parts` instead of duplicating it across two callers.
This commit is contained in:
Alex Crichton
2022-03-31 15:37:16 -05:00
committed by GitHub
parent 5338e12f9d
commit fde84aa79c
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/wasmtime/src/module.rs
View File

@@ -332,14 +332,7 @@ impl Module {
} }
}; };
let module = CompiledModule::from_artifacts( Self::from_parts(engine, mmap, info, Arc::new(types))
mmap,
info,
&*engine.config().profiler,
engine.unique_id_allocator(),
)?;
Self::from_parts(engine, module, Arc::new(types))
} }
/// Converts an input binary-encoded WebAssembly module to compilation /// Converts an input binary-encoded WebAssembly module to compilation
@@ -498,9 +491,17 @@ impl Module {
fn from_parts( fn from_parts(
engine: &Engine, engine: &Engine,
module: Arc<CompiledModule>, mmap: MmapVec,
info: Option<CompiledModuleInfo>,
types: Arc<TypeTables>, types: Arc<TypeTables>,
) -> Result<Self> { ) -> Result<Self> {
let module = CompiledModule::from_artifacts(
mmap,
info,
&*engine.config().profiler,
engine.unique_id_allocator(),
)?;
// Validate the module can be used with the current allocator // Validate the module can be used with the current allocator
engine.allocator().validate(module.module())?; engine.allocator().validate(module.module())?;

11
crates/wasmtime/src/module/serialization.rs
View File

@@ -49,7 +49,7 @@ use std::path::Path;
use std::str::FromStr; use std::str::FromStr;
use std::sync::Arc; use std::sync::Arc;
use wasmtime_environ::{FlagValue, Tunables, TypeTables}; use wasmtime_environ::{FlagValue, Tunables, TypeTables};
use wasmtime_jit::{subslice_range, CompiledModule, CompiledModuleInfo}; use wasmtime_jit::{subslice_range, CompiledModuleInfo};
use wasmtime_runtime::MmapVec; use wasmtime_runtime::MmapVec;
const HEADER: &[u8] = b"\0wasmtime-aot"; const HEADER: &[u8] = b"\0wasmtime-aot";
@@ -206,14 +206,7 @@ impl<'a> SerializedModule<'a> {
pub fn into_module(self, engine: &Engine) -> Result<Module> { pub fn into_module(self, engine: &Engine) -> Result<Module> {
let (mmap, info, types) = self.into_parts(engine)?; let (mmap, info, types) = self.into_parts(engine)?;
let module = CompiledModule::from_artifacts( Module::from_parts(engine, mmap, info, Arc::new(types))
mmap,
info,
&*engine.config().profiler,
engine.unique_id_allocator(),
)?;
Module::from_parts(engine, module, Arc::new(types))
} }
pub fn into_parts( pub fn into_parts(