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

Merge branch 'master' into feature/runtime-abi-delete

Browse Source
This commit is contained in:
Syrus Akbary 2019-09-25 10:21:20 -07:00 committed by GitHub
commit fdc486c53d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ Blocks of changes will separated by version increments.
## **[Unreleased]**
- [#832](https://github.com/wasmerio/wasmer/pull/832) Delete unused runtime ABI
- [#809](https://github.com/wasmerio/wasmer/pull/809) Fix bugs leading to panics in `LocalBacking`.
- [#822](https://github.com/wasmerio/wasmer/pull/822) Update Cranelift fork version to `0.43.1`
- [#829](https://github.com/wasmerio/wasmer/pull/829) Fix deps on `make bench-*` commands; benchmarks don't compile other backends now
- [#807](https://github.com/wasmerio/wasmer/pull/807) Implement Send for `Instance`, breaking change on `ImportObject`, remove method `get_namespace` replaced with `with_namespace` and `maybe_with_namespace`

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

@ -152,6 +152,11 @@ impl LocalBacking {
}]);
}
Initializer::GetGlobal(import_global_index) => {
if import_global_index.index() >= imports.globals.len() {
return Err(vec![LinkError::Generic {
message: "incorrect global index for initializer".to_string(),
}]);
}
if let Value::I32(x) = imports.globals[import_global_index].get() {
x as u32
} else {
@ -208,6 +213,11 @@ impl LocalBacking {
}]);
}
Initializer::GetGlobal(import_global_index) => {
if import_global_index.index() >= imports.globals.len() {
return Err(vec![LinkError::Generic {
message: "incorrect global index for initializer".to_string(),
}]);
}
if let Value::I32(x) = imports.globals[import_global_index].get() {
x as u32
} else {
@ -276,6 +286,11 @@ impl LocalBacking {
}]);
}
Initializer::GetGlobal(import_global_index) => {
if import_global_index.index() >= imports.globals.len() {
return Err(vec![LinkError::Generic {
message: "incorrect global index for initializer".to_string(),
}]);
}
if let Value::I32(x) = imports.globals[import_global_index].get() {
x as u32
} else {
@ -329,6 +344,11 @@ impl LocalBacking {
}]);
}
Initializer::GetGlobal(import_global_index) => {
if import_global_index.index() >= imports.globals.len() {
return Err(vec![LinkError::Generic {
message: "incorrect global index for initializer".to_string(),
}]);
}
if let Value::I32(x) = imports.globals[import_global_index].get() {
x as u32
} else {