Skip to content

Fix loading of R2R assemblies from byte arrays/streams #74118

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

Merged
VSadov merged 7 commits into from
Aug 20, 2022
Merged

Fix loading of R2R assemblies from byte arrays/streams #74118

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ea552a
enable test
VSadov Aug 17, 2022
21a4bdb
flat layout is ok if it is not a file
VSadov Aug 17, 2022
17cbdf6
do not convert non-file layouts on OSX
VSadov Aug 17, 2022
c2061d9
run some code when loading from byte array
VSadov Aug 18, 2022
4be4117
use flat layout on all platforms
VSadov Aug 19, 2022
c5dc71e
Suggestion from PR feedback
VSadov Aug 19, 2022
680b317
typo
VSadov Aug 19, 2022
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
Prev Previous commit
Next Next commit
use flat layout on all platforms
  • Loading branch information
@VSadov
VSadov committed Aug 19, 2022
commit 4be4117be3db29c10996cbe8072ac00054bb8a3a
23 changes: 7 additions & 16 deletions src/coreclr/vm/peimagelayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,24 +88,15 @@ PEImageLayout* PEImageLayout::LoadConverted(PEImage* pOwner)
_ASSERTE(!pOwner->IsFile() || !pFlat->HasReadyToRunHeader());
#endif

if (!pFlat->HasReadyToRunHeader() && !pFlat->HasWriteableSections())
// ignore R2R if the image is not a file.
if ((pFlat->HasReadyToRunHeader() && pOwner->IsFile()) ||
pFlat->HasWriteableSections())
{
// we can use flat layout for this
return pFlat.Extract();
return new ConvertedImageLayout(pFlat);
}

#ifdef TARGET_OSX
// We need to allocate executable memory on OSX in order to do relocation of R2R code.
// Converted layout currently uses VirtualAlloc, so it will not work.
// Do not convert byte array images on OSX for now (that will disable R2R)
// TODO: consider relaxing this in the future.
if (!pOwner->IsFile())
{
return pFlat.Extract();
}
#endif

return new ConvertedImageLayout(pFlat);
// we can use flat layout for this
return pFlat.Extract();
}

PEImageLayout* PEImageLayout::Load(PEImage* pOwner, HRESULT* loadFailure)
Expand Down Expand Up @@ -459,7 +450,7 @@ ConvertedImageLayout::ConvertedImageLayout(FlatImageLayout* source)

IfFailThrow(Init(loadedImage));

if (IsNativeMachineFormat() && g_fAllowNativeImages)
if (pOwner->IsFile() && IsNativeMachineFormat() && g_fAllowNativeImages)
{
// Do base relocation and exception hookup, if necessary.
// otherwise R2R will be disabled for this image.
Expand Down