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

Remove finalize_* from the Backend trait

Browse Source 
Instead let the `finish` method perform finalization
This commit is contained in:
bjorn3
2020-09-30 14:20:39 +02:00
parent 59f95083b1
commit 405b9e2875
4 changed files with 142 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cranelift/module/src/module.rs
View File

@@ -213,14 +213,14 @@ pub struct DataDeclaration {
}
/// A data object belonging to a `Module`.
struct ModuleData<B>
pub struct ModuleData<B>
where
B: Backend,
{
/// The data object declaration.
decl: DataDeclaration,
pub decl: DataDeclaration,
/// The "compiled" artifact, once it's available.
compiled: Option<B::CompiledData>,
pub compiled: Option<B::CompiledData>,
}
impl<B> ModuleData<B>
@@ -282,11 +282,21 @@ where
}
}
/// Get the `ModuleFunction` for the given function.
pub fn get_function_info(&self, func_id: FuncId) -> &ModuleFunction<B> {
&self.functions[func_id]
}
/// Get the `FunctionDeclaration` for the function named by `name`.
pub fn get_function_decl(&self, name: &ir::ExternalName) -> &FunctionDeclaration {
&self.functions[self.get_function_id(name)].decl
}
/// Get the `ModuleData` for the given data object.
pub fn get_data_info(&self, data_id: DataId) -> &ModuleData<B> {
&self.data_objects[data_id]
}
/// Get the `DataDeclaration` for the data object named by `name`.
pub fn get_data_decl(&self, name: &ir::ExternalName) -> &DataDeclaration {
&self.data_objects[self.get_data_id(name)].decl
@@ -647,29 +657,7 @@ where
/// Consume the module and return the resulting `Product`. Some `Backend`
/// implementations may provide additional functionality available after
/// a `Module` is complete.
pub fn finish(mut self) -> B::Product {
for func in self.functions_to_finalize.drain(..) {
let info = &self.contents.functions[func];
debug_assert!(info.decl.linkage.is_definable());
self.backend.finalize_function(
func,
info.compiled
.as_ref()
.expect("function must be compiled before it can be finalized"),
&self.contents,
);
}
for data in self.data_objects_to_finalize.drain(..) {
let info = &self.contents.data_objects[data];
debug_assert!(info.decl.linkage.is_definable());
self.backend.finalize_data(
data,
info.compiled
.as_ref()
.expect("data object must be compiled before it can be finalized"),
&self.contents,
);
}
pub fn finish(self) -> B::Product {
self.backend.finish(self.names, self.contents)
}
}