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

change interfaces to use slices instead of Vec

Browse Source
This commit is contained in:
Nathan Froyd
2020-03-05 10:07:01 -05:00
parent 0f49a830c9
commit 2bb3096342
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cranelift/faerie/src/backend.rs
View File

@@ -152,11 +152,11 @@ impl Backend for FaerieBackend {
ctx: &cranelift_codegen::Context,
namespace: &ModuleNamespace<Self>,
total_size: u32,
) -> ModuleResult<(FaerieCompiledFunction, Option<&Vec<TrapSite>>)> {
) -> ModuleResult<(FaerieCompiledFunction, &[TrapSite])> {
let mut code: Vec<u8> = vec![0; total_size as usize];
// TODO: Replace this with FaerieStackmapSink once it is implemented.
let mut stackmap_sink = NullStackmapSink {};
let mut traps = None;
let mut traps: &[TrapSite] = &[];
// Non-lexical lifetimes would obviate the braces here.
{
@@ -179,7 +179,7 @@ impl Backend for FaerieBackend {
&mut stackmap_sink,
)
};
traps = Some(trap_manifest.add_sink(trap_sink));
traps = trap_manifest.add_sink(trap_sink);
} else {
let mut trap_sink = NullTrapSink {};
unsafe {
@@ -211,16 +211,16 @@ impl Backend for FaerieBackend {
bytes: &[u8],
_namespace: &ModuleNamespace<Self>,
traps: Vec<TrapSite>,
) -> ModuleResult<(FaerieCompiledFunction, Option<&Vec<TrapSite>>)> {
) -> ModuleResult<(FaerieCompiledFunction, &[TrapSite])> {
let code_length: u32 = match bytes.len().try_into() {
Ok(code_length) => code_length,
_ => Err(ModuleError::FunctionTooLarge(name.to_string()))?,
};
let mut ret_traps = None;
let mut ret_traps: &[TrapSite] = &[];
if let Some(ref mut trap_manifest) = self.trap_manifest {
let trap_sink = FaerieTrapSink::new_with_sites(name, code_length, traps);
ret_traps = Some(trap_manifest.add_sink(trap_sink));
ret_traps = trap_manifest.add_sink(trap_sink);
}
self.artifact