[2020-02] [aot] Avoid mono_defaults when creating trampolines.
#19062
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
Fixes mono#19009. mono#18505 made PLT initialization occur at image load time. When initializing the PLT for mscorlib, `mono_defaults.corlib` is not yet initialized. This change works around this by using `mscorlib_aot_module`--which is initialized relatively early--instead of `mono_defaults.corlib`. PLT initialization is also moved slightly later: it now happens after `use_page_trampolines` has been initialized. The `USE_PAGE_TRAMPOLINES` macro has also been changed to dereference `mscorlib_aot_module`. This commit also removes an unused parameter from `mono_aot_create_specific_trampoline`.
lewurm
approved these changes
Feb 27, 2020
Contributor
|
@monojenkins squash |
Contributor
Author
|
Cannot squash because the following required status checks are not successful:
|
Member
|
@monojenkins build failed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Fixes #19009.
#18505 made PLT initialization occur at
image load time. When initializing the PLT for mscorlib,
mono_defaults.corlibis not yet initialized.This change works around this by using
mscorlib_aot_module--which isinitialized relatively early--instead of
mono_defaults.corlib. PLTinitialization is also moved slightly later: it now happens after
use_page_trampolineshas been initialized. TheUSE_PAGE_TRAMPOLINESmacro has also been changed to dereference
mscorlib_aot_module.This commit also removes an unused parameter from
mono_aot_create_specific_trampoline.Backport of #19055.
/cc @lewurm @imhameed