Respect the WASM_MEM_MAX limit in memory growth #6937
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
dschuff
reviewed
Aug 8, 2018
src/preamble.js
Outdated
| @@ -1027,6 +1027,20 @@ function enlargeMemory() { | |||
| } | |||
| } | |||
|
|
|||
| #if WASM_MEM_MAX != -1 | |||
| // A limit was set for how much we can grow. We should not exceed that | |||
| // (the wasm binary specifies it, so if we tried, we'd fail anyhow). | |||
There was a problem hiding this comment.
I'm not sure I understand why this is necessary. If WASM_MEM_MAX causes the binary to set the limit, then reallocBuffer should fail and we'd fail down on line 1051? But from the linked issue it looks like we are not, so maybe something else is wrong?
There was a problem hiding this comment.
Yeah, maybe this should be explained better. The issue is if we are 64MB and the max is 100MB, then we normally double the size - so we'd try to 64->128MB, which fails. Instead, with this PR, we'll try for 64->100MB, which might work.
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.
If the user specified a limit, it is set in the wasm binary, and we can't (and shouldn't) grow past it.
Also the docs in settings.js about this were wrong.
See #6042 (comment)