projects
/
platform
/
upstream
/
dotnet
/
runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
39063e3
)
Modify zaprequire switch to allow Ready-to-Run images
author
John Chen (CLR)
<jochen@microsoft.com>
Sat, 5 Mar 2016 03:38:55 +0000
(19:38 -0800)
committer
John Chen (CLR)
<jochen@microsoft.com>
Sat, 5 Mar 2016 18:17:48 +0000
(10:17 -0800)
Address issue dotnet/coreclr#3527.
Commit migrated from https://github.com/dotnet/coreclr/commit/
a6de1e4296cb486bdb41724e4734faace158319e
src/coreclr/src/vm/domainfile.cpp
patch
|
blob
|
history
diff --git
a/src/coreclr/src/vm/domainfile.cpp
b/src/coreclr/src/vm/domainfile.cpp
index
4285024
..
0c6e4fc
100644
(file)
--- a/
src/coreclr/src/vm/domainfile.cpp
+++ b/
src/coreclr/src/vm/domainfile.cpp
@@
-943,6
+943,11
@@
void DomainFile::CheckZapRequired()
if (m_pFile->HasNativeImage() || !IsZapRequired())
return;
+#ifdef FEATURE_READYTORUN
+ if(m_pFile->GetLoaded()->HasReadyToRunHeader())
+ return;
+#endif
+
// Flush any log messages
GetFile()->FlushExternalLog();