Fix STACKTOP/STACK_MAX variables for relocatable #8434
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
|
Looks good, thanks! |
sbc100
reviewed
Apr 15, 2019
| @@ -484,7 +484,7 @@ def create_module_asmjs(function_table_sigs, metadata, | |||
| asm_runtime_thread_local_vars = create_asm_runtime_thread_local_vars() | |||
|
|
|||
| stack = '' | |||
| if not (shared.Settings.WASM and shared.Settings.SIDE_MODULE): | |||
| if not shared.Settings.RELOCATABLE and not (shared.Settings.WASM and shared.Settings.SIDE_MODULE): | |||
There was a problem hiding this comment.
IIUC this is redundant.
If we apply De Morgan's here I a little clearer to see:
if shared.Settings.RELOCATABLE or (shared.Settings.WASM and shared.Settings.SIDE_MODULE):
Since RELOCATABLE is always set for SIDE_MODULE the second clause is redundant I think?
There was a problem hiding this comment.
In theory, we may want to allow non-relocatable dynamic modules (i.e., loadable at runtime, but at known-beforehand locations in memory/table). At least it would be nice to not rule that out for now, I think. So checking for relocation separately makes sense in my opinion.
There was a problem hiding this comment.
Yeah, that's how my original working diff was. I changed it to mirror the logic in the other part of the diff when I realized that other change was necessary.
VirtualTim
pushed a commit
to VirtualTim/emscripten
that referenced
this pull request
May 21, 2019
VirtualTim
added a commit
to VirtualTim/emscripten
that referenced
this pull request
May 23, 2019
…core#8434)" This reverts commit a365dba.
VirtualTim
added a commit
to VirtualTim/emscripten
that referenced
this pull request
May 23, 2019
…core#8434)" This reverts commit a365dba.
belraquib
pushed a commit
to belraquib/emscripten
that referenced
this pull request
Dec 23, 2020
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.
STACKTOPandSTACK_MAXwere being output twice in relocatable modules. Fixes #8433