Rename TOTAL_MEMORY to INITIAL_MEMORY and WASM_MEM_MAX to MAXIMUM_MEMORY #10566
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
dschuff
approved these changes
Feb 25, 2020
sbc100
approved these changes
Feb 25, 2020
| }); | ||
|
|
||
| int main() { | ||
| int x = add_forty_two(100); | ||
| int y = get_total_memory(); | ||
| int y = get_INITIAL_MEMORY(); |
There was a problem hiding this comment.
Maybe leave the function name alone?
tests/core/test_memorygrowth_3.c
Outdated
| @@ -12,15 +12,15 @@ | |||
| #include <assert.h> | |||
| #include "emscripten.h" | |||
|
|
|||
| int get_TOTAL_MEMORY() { | |||
| int get_INITIAL_MEMORY() { | |||
| @@ -12,42 +12,42 @@ | |||
| #include <assert.h> | |||
| #include "emscripten.h" | |||
|
|
|||
| int get_TOTAL_MEMORY() { | |||
| int get_INITIAL_MEMORY() { | |||
kripken
added a commit
that referenced
this pull request
Feb 26, 2020
This is a regression from #10566 which renamed that setting to INITIAL_MEMORY, and #10449 which added a test using that setting in that way, and landed close enough that we didn't notice it was doing so. It should have worked since we tried to support the old name of the setting, but this uncovered a bug, so it's actually good that it broke! The bug is that we have special handling for expanding things like 64MB into a number, and that handling did not work on aliases. As a solution, map aliases very early in parsing.
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.
As suggested (first half) by @dschuff . The new names are consistent with
wasm's names for them, and more accurate (as TOTAL_MEMORY wasn't
necessarily the total memory size if growth was enabled).
The old names are still supported as aliases.