Update the object crate to 0.27.0 (#3465)

Mostly just keeping us up to date with changes there since we somewhat
heavily rely on it now.
This commit is contained in:
Alex Crichton
2021-10-20 10:52:06 -05:00
committed by GitHub
parent fe4b15c8b0
commit e2a724ce18
12 changed files with 25 additions and 29 deletions

View File

@@ -222,7 +222,7 @@ impl wasmtime_environ::Compiler for Compiler {
types: &TypeTables,
funcs: PrimaryMap<DefinedFuncIndex, Box<dyn Any + Send>>,
emit_dwarf: bool,
obj: &mut Object,
obj: &mut Object<'static>,
) -> Result<(PrimaryMap<DefinedFuncIndex, FunctionInfo>, Vec<Trampoline>)> {
let funcs: crate::CompiledFunctions = funcs
.into_iter()
@@ -317,7 +317,7 @@ impl wasmtime_environ::Compiler for Compiler {
&self,
ty: &WasmFuncType,
host_fn: usize,
obj: &mut Object,
obj: &mut Object<'static>,
) -> Result<(Trampoline, Trampoline)> {
let host_to_wasm = self.host_to_wasm_trampoline(ty)?;
let wasm_to_host = self.wasm_to_host_trampoline(ty, host_fn)?;

View File

@@ -105,7 +105,7 @@ pub struct ObjectBuilder<'a> {
isa: &'a dyn TargetIsa,
/// The object file that we're generating code into.
obj: &'a mut Object,
obj: &'a mut Object<'static>,
/// The WebAssembly module we're generating code for.
module: &'a Module,
@@ -163,7 +163,7 @@ struct RUNTIME_FUNCTION {
}
impl<'a> ObjectBuilder<'a> {
pub fn new(obj: &'a mut Object, module: &'a Module, isa: &'a dyn TargetIsa) -> Self {
pub fn new(obj: &'a mut Object<'static>, module: &'a Module, isa: &'a dyn TargetIsa) -> Self {
// Entire code (functions and trampolines) will be placed
// in the ".text" section.
let text_section = obj.add_section(