Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not use ExecutableMemoryAllocator on 64 bit platforms if default base address usage is requested #70563

Merged
merged 1 commit into from
Jun 14, 2022
Merged

Do not use ExecutableMemoryAllocator on 64 bit platforms if default base address usage is requested #70563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/coreclr/pal/src/map/map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2284,7 +2284,13 @@ void * MAPMapPEFile(HANDLE hFile, off_t offset)
// more efficient code (by avoiding usage of jump stubs). Alignment to a 64 KB granularity should
// not be necessary (alignment to page size should be sufficient), but see
// ExecutableMemoryAllocator::AllocateMemory() for the reason why it is done.
loadedBase = ReserveMemoryFromExecutableAllocator(pThread, ALIGN_UP(reserveSize, VIRTUAL_64KB));

#ifdef FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION
if (!g_useDefaultBaseAddr)
#endif // FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION
{
loadedBase = ReserveMemoryFromExecutableAllocator(pThread, ALIGN_UP(reserveSize, VIRTUAL_64KB));
}
#endif // HOST_64BIT

if (loadedBase == NULL)
Expand Down