fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-17 02:41:21 +00:00
Code Issues Projects Releases Wiki Activity

Improved lint

Browse Source
This commit is contained in:
Syrus
2019-12-20 20:45:10 -08:00
parent c4d70a6b75
commit 1a960a01ae
3 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/middleware-common-tests/src/lib.rs
View File

@ -119,22 +119,11 @@ mod tests {
let add_to: Func<(i32, i32), i32> = instance.func("add_to").unwrap(); let add_to: Func<(i32, i32), i32> = instance.func("add_to").unwrap();
let cv_pushed = if let Some(msm) = instance let cv_pushed = if let Some(msm) = instance.module.runnable_module.get_module_state_map() {
.module
.runnable_module
.borrow()
.get_module_state_map()
{
push_code_version(CodeVersion { push_code_version(CodeVersion {
baseline: true, baseline: true,
msm: msm, msm: msm,
base: instance base: instance.module.runnable_module.get_code().unwrap().as_ptr() as usize,
.module
.runnable_module
.borrow()
.get_code()
.unwrap()
.as_ptr() as usize,
runnable_module: instance.module.runnable_module.clone(), runnable_module: instance.module.runnable_module.clone(),
backend: backend_id, backend: backend_id,
}); });
@ -172,22 +161,11 @@ mod tests {
let add_to: Func<(i32, i32), i32> = instance.func("add_to").unwrap(); let add_to: Func<(i32, i32), i32> = instance.func("add_to").unwrap();
let cv_pushed = if let Some(msm) = instance let cv_pushed = if let Some(msm) = instance.module.runnable_module.get_module_state_map() {
.module
.runnable_module
.borrow()
.get_module_state_map()
{
push_code_version(CodeVersion { push_code_version(CodeVersion {
baseline: true, baseline: true,
msm: msm, msm: msm,
base: instance base: instance.module.runnable_module.get_code().unwrap().as_ptr() as usize,
.module
.runnable_module
.borrow()
.get_code()
.unwrap()
.as_ptr() as usize,
backend: backend_id, backend: backend_id,
runnable_module: instance.module.runnable_module.clone(), runnable_module: instance.module.runnable_module.clone(),
}); });

8
lib/runtime-core/src/instance.rs
View File

@ -146,11 +146,9 @@ impl Instance {
/// Load an `Instance` using the given loader. /// Load an `Instance` using the given loader.
pub fn load<T: Loader>(&self, loader: T) -> ::std::result::Result<T::Instance, T::Error> { pub fn load<T: Loader>(&self, loader: T) -> ::std::result::Result<T::Instance, T::Error> {
loader.load( loader.load(&**self.module.runnable_module, &self.module.info, unsafe {
&**self.module.runnable_module, &*self.inner.vmctx
&self.module.info, })
unsafe { &*self.inner.vmctx },
)
} }
/// Through generic magic and the awe-inspiring power of traits, we bring you... /// Through generic magic and the awe-inspiring power of traits, we bring you...

24
lib/runtime-core/src/tiering.rs
View File

@ -125,16 +125,9 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
msm: baseline msm: baseline
.module .module
.runnable_module .runnable_module
.borrow()
.get_module_state_map() .get_module_state_map()
.unwrap(), .unwrap(),
base: baseline base: baseline.module.runnable_module.get_code().unwrap().as_ptr() as usize,
.module
.runnable_module
.borrow()
.get_code()
.unwrap()
.as_ptr() as usize,
backend: baseline_backend, backend: baseline_backend,
runnable_module: baseline.module.runnable_module.clone(), runnable_module: baseline.module.runnable_module.clone(),
}); });
@ -166,14 +159,12 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
let code_ptr = optimized let code_ptr = optimized
.module .module
.runnable_module .runnable_module
.borrow()
.get_code() .get_code()
.unwrap() .unwrap()
.as_ptr() as usize; .as_ptr() as usize;
let target_addresses: Vec<usize> = optimized let target_addresses: Vec<usize> = optimized
.module .module
.runnable_module .runnable_module
.borrow()
.get_local_function_offsets() .get_local_function_offsets()
.unwrap() .unwrap()
.into_iter() .into_iter()
@ -184,7 +175,6 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
baseline baseline
.module .module
.runnable_module .runnable_module
.borrow()
.patch_local_function(i - base, target_addresses[i - base]); .patch_local_function(i - base, target_addresses[i - base]);
} }
@ -193,13 +183,11 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
msm: optimized msm: optimized
.module .module
.runnable_module .runnable_module
.borrow()
.get_module_state_map() .get_module_state_map()
.unwrap(), .unwrap(),
base: optimized base: optimized
.module .module
.runnable_module .runnable_module
.borrow()
.get_code() .get_code()
.unwrap() .unwrap()
.as_ptr() as usize, .as_ptr() as usize,
@ -218,16 +206,10 @@ pub unsafe fn run_tiering<F: Fn(InteractiveShellContext) -> ShellExitOperation>(
let msm = baseline let msm = baseline
.module .module
.runnable_module .runnable_module
.borrow()
.get_module_state_map() .get_module_state_map()
.unwrap(); .unwrap();
let code_base = baseline let code_base =
.module baseline.module.runnable_module.get_code().unwrap().as_ptr() as usize;
.runnable_module
.borrow()
.get_code()
.unwrap()
.as_ptr() as usize;
invoke_call_return_on_stack( invoke_call_return_on_stack(
&msm, &msm,
code_base, code_base,