Fix i64-using function pointers in upstream dynamic linking #9810
Conversation
This file contains hidden or 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
|
The dependencies have all rolled, and looks like tests all pass. |
sbc100
reviewed
Nov 13, 2019
src/support.js
Outdated
| assert(parts.length == 3) | ||
| var name = parts[1]; | ||
| var sig = parts[2]; | ||
| var legalized = sig.indexOf('j') >= 0; |
There was a problem hiding this comment.
Yes, j is i64. I'll add a comment.
| sym = 'orig$' + sym; | ||
| } | ||
| #if WASM_BACKEND | ||
| sym = '_' + sym; |
There was a problem hiding this comment.
Should we use asmjs_mangle here? Also does the mangling happen before the orig$ .. i.e. is it _orig$foo or orig$foo. Above it looks like your remove the mangled before pretending orig$.
There was a problem hiding this comment.
This is pre-existing code, but I think asm_mangle in python makes sense (where it checks if the _ is needed or not, which it isn't for dynCall etc.) while here, all we have are exported symbols at the C level, which does not include things like dynCall etc. that are only for JS.
|
Thanks, I pushed updates for the feedback. |
sbc100
approved these changes
Nov 13, 2019
kripken
added a commit
that referenced
this pull request
Nov 19, 2019
belraquib
pushed a commit
to belraquib/emscripten
that referenced
this pull request
Dec 23, 2020
…en-core#9810) The dynamic loader needs to place the original wasm functions in the table, so that other modules can call them. The JS-legalized versions will have the wrong types for indirect calls. To implement this, binaryen's legalization pass exports illegal functions twice, once legalized for JS, and once as orig$ plus the original name. This PR makes the loader use those. Fixes emscripten-core#9562
belraquib
pushed a commit
to belraquib/emscripten
that referenced
this pull request
Dec 23, 2020
…-core#9855) emscripten-core#9810 mostly fixed i64 pointers in MAIN_MODULE, but it turns out that a corner case was a function that is illegal only due to its return value. fixes emscripten-core#9850
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.
The dynamic loader needs to place the original wasm functions in the table, so that other modules can call them. The JS-legalized versions will have the wrong types for indirect calls.
To implement this, binaryen's legalization pass exports illegal functions twice, once legalized for JS, and once as
orig$plus the original name. This PR makes the loader use those.Fixes #9562
Depends on WebAssembly/binaryen#2427 to roll first.