Fix loading of cDAC in DAC#106289
Merged
elinor-fung merged 2 commits intodotnet:mainfrom Aug 12, 2024
Merged
Conversation
elinor-fung
requested review from
AaronRobinsonMSFT,
davidwrighton and
lambdageek
ghost
added
the
Contributor
|
Tagging subscribers to this area: @tommcdon |
lambdageek
approved these changes
Aug 12, 2024
AaronRobinsonMSFT
approved these changes
Aug 12, 2024
mikem8361
approved these changes
Aug 12, 2024
This was referenced Aug 12, 2024
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When loading the cDAC, we were relying on
GetClrModuleDirectoryin the DAC actually giving us the DAC directory. With #106217, it explicitly stores/uses the CLR module base. When we first try to load the cDAC in the DAC, that has not yet been set. The current intent is to actually load from next to the DAC, so switch the logic to look next to the current module for the cDAC instead of using the CLR module directory.Also renamed
GetCurrentModuleFileNamein utilcode toGetCurrentExecutableFileNameso that it accurately represents what it does (I tried to use it and was sad).