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

Merge branch 'master' into docs/better-runtime-docs

Browse Source 
# Conflicts:
#	lib/runtime-core/src/vm.rs
This commit is contained in:
Syrus
2019-05-13 11:08:00 -07:00
parent 3eaf5525d1 9aac20e215
commit 5a6cb96714
268 changed files with 19736 additions and 4915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/runtime-core/src/backing.rs
View File

@ -73,8 +73,8 @@ impl LocalBacking {
(0..module.info.func_assoc.len() - module.info.imported_functions.len())
.map(|index| {
module
.func_resolver
.get(module, LocalFuncIndex::new(index))
.runnable_module
.get_func(&module.info, LocalFuncIndex::new(index))
.unwrap()
.as_ptr() as *const _
})
@ -223,8 +223,8 @@ impl LocalBacking {
let (func, ctx) = match func_index.local_or_import(&module.info) {
LocalOrImport::Local(local_func_index) => (
module
.func_resolver
.get(module, local_func_index)
.runnable_module
.get_func(&module.info, local_func_index)
.unwrap()
.as_ptr()
as *const vm::Func,
@ -262,8 +262,8 @@ impl LocalBacking {
let (func, ctx) = match func_index.local_or_import(&module.info) {
LocalOrImport::Local(local_func_index) => (
module
.func_resolver
.get(module, local_func_index)
.runnable_module
.get_func(&module.info, local_func_index)
.unwrap()
.as_ptr()
as *const vm::Func,