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
flat layout is ok if it is not a file
  • Loading branch information
@VSadov
VSadov committed Aug 17, 2022
commit 21a4bdb21acf14e4355d361683f7f2a86f6a1773
2 changes: 1 addition & 1 deletion src/coreclr/vm/peimagelayout.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ PEImageLayout* PEImageLayout::LoadConverted(PEImage* pOwner)
// ConvertedImageLayout may be able to handle them, but the fact that we were unable to
// load directly implies that MAPMapPEFile could not consume what crossgen produced.
// that is suspicious, one or another might have a bug.
_ASSERTE(!pFlat->HasReadyToRunHeader());
_ASSERTE(!pOwner->IsFile() || !pFlat->HasReadyToRunHeader());
#endif

if (!pFlat->HasReadyToRunHeader() && !pFlat->HasWriteableSections())
Expand Down