Fix data address exports under -sMAIN_MODULE=1
#23020
Merged
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
kripken
approved these changes
Nov 26, 2024
In `-sMAIN_MODULE=1` mode we actually link twice, once to get the names the user exported symbols then again with everything exported. We when use the this `base_metadata` to limit the things that we export to on the JS module. However for data symbols we cannot use the addresses/values present in `base_metadata`. Fixes: emscripten-core#22980
sbc100
force-pushed
the
fix_global_exports
branch
from
b4d5ebe to
172ae79
Compare
hoodmane
added a commit
to hoodmane/pyodide
that referenced
this pull request
Feb 3, 2025
This requires this upstream fix which came out in Emscripten 3.1.73: emscripten-core/emscripten#23020 Applied upstream in the cpython repo here: https://github.com/python/cpython/pull/127113/files#diff-31f61a127a59386957acba86e9acedf0a96bc6ebe1ac159a48e39b1a291111b5R73-R75 This fixes an error that occurs when building with assertions -- we called `_py_version_major` before the runtime was set up so it triggered an assertion failure.
hoodmane
added a commit
to pyodide/pyodide
that referenced
this pull request
Feb 3, 2025
This requires this upstream fix which came out in Emscripten 3.1.73: emscripten-core/emscripten#23020 Applied upstream in the cpython repo here: https://github.com/python/cpython/pull/127113/files#diff-31f61a127a59386957acba86e9acedf0a96bc6ebe1ac159a48e39b1a291111b5R73-R75 This fixes an error that occurs when building with assertions -- we called _py_version_major before the runtime was set up so it triggered an assertion failure. Co-authored-by: Agriya Khetarpal <[email protected]>
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.
In
-sMAIN_MODULE=1mode we actually link twice, once to get the names the user exported symbols then again with everything exported.We when use the this
base_metadatato limit the things that we export to on the JS module. However for data symbols we cannot use the addresses/values present inbase_metadata.Fixes: #22980