Get multi.c working in the Wasm C API
#1953
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hywan
reviewed
Dec 18, 2020
lib/c-api/src/wasm_c_api/macros.rs
Outdated
Comment on lines
270
to
278
| pub unsafe extern "C" fn [<wasm_ $name _vec_delete>](ptr: Option<&mut[<wasm_ $name _vec_t>]>) { | ||
| if let Some(vec) = ptr { | ||
| if !vec.data.is_null() { | ||
| let ptr: *mut Option<Box<[<wasm_ $name _t>]>> = vec.data as _; | ||
| let data: Vec<Option<Box<[<wasm_ $name _t>]>>> = Vec::from_raw_parts(ptr, vec.size, vec.size); | ||
|
|
||
| vec.data = ::std::ptr::null_mut(); | ||
| vec.size = 0; | ||
| } |
Hywan
reviewed
Dec 18, 2020
jubianchi
approved these changes
Dec 18, 2020
|
bors r+ |
syrusakbary
reviewed
Dec 21, 2020
| @@ -121,7 +121,7 @@ int main(int argc, const char* argv[]) { | |||
| // Call. | |||
| printf("Calling export...\n"); | |||
| wasm_val_t vals[4] = { | |||
| WASM_I32_VAL(1), WASM_I32_VAL(2), WASM_I32_VAL(3), WASM_I32_VAL(4) | |||
| WASM_I32_VAL(1), WASM_I64_VAL(2), WASM_I64_VAL(3), WASM_I32_VAL(4) | |||
There was a problem hiding this comment.
Is this intended? Did the code was updated in the wasm-c-api side?
There was a problem hiding this comment.
I linked to the PR on the Wasm C API above
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Gets the
multi.cexample working.This PR has significant overlap with #1949 due to changes in vec / boxed vec.
Changes in this PR:
Clonemore often, implement*_copyfunctions in terms ofClone*_vec_copyfunctions for boxed and unboxed versionswasm-c-api/examples/multi.c; fixed in the upstream Wasm C API here: Fix typo inmulti.c: args should be i32, i64, i64, i32 WebAssembly/wasm-c-api#163Review