From e03115a9559619d3ec020f20a4ccc3ea0fe2c5c3 Mon Sep 17 00:00:00 2001 From: "John Chen (CLR)" Date: Fri, 4 Mar 2016 19:38:55 -0800 Subject: [PATCH] Modify zaprequire switch to allow Ready-to-Run images Address issue dotnet/coreclr#3527. Commit migrated from https://github.com/dotnet/coreclr/commit/a6de1e4296cb486bdb41724e4734faace158319e --- src/coreclr/src/vm/domainfile.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/coreclr/src/vm/domainfile.cpp b/src/coreclr/src/vm/domainfile.cpp index 4285024..0c6e4fc 100644 --- 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(); -- 2.7.4