summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2018-07-23 12:17:56 -0700
committerGitHub <noreply@github.com>2018-07-23 12:17:56 -0700
commit0c7a59efa088c2043ec57d7449f9f11dc96a395e (patch)
tree22c678370ee17eb50485e3ff67c9ee493f51915a /src/tools
parent456d22753b62b5e46b61fa13bef75847229d30ca (diff)
downloadcoreclr-0c7a59efa088c2043ec57d7449f9f11dc96a395e.tar.gz
coreclr-0c7a59efa088c2043ec57d7449f9f11dc96a395e.tar.bz2
coreclr-0c7a59efa088c2043ec57d7449f9f11dc96a395e.zip
Partial R2R IBC fixes (#19073)
* Partial R2R IBC fixes - Log use method code access in all cases, not just when the method is JITed - Add workaround for CONTRACT_VIOLATION that shows up in checked builds when collecting IBC data - Make /ReadyToRun switch work for CoreLib
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/crossgen/crossgen.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/crossgen/crossgen.cpp b/src/tools/crossgen/crossgen.cpp
index 345de53d1b..48e52db414 100644
--- a/src/tools/crossgen/crossgen.cpp
+++ b/src/tools/crossgen/crossgen.cpp
@@ -422,6 +422,7 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
LPWSTR pwzSearchPathForManagedPDB = NULL;
LPCWSTR pwzOutputFilename = NULL;
LPCWSTR pwzPublicKeys = nullptr;
+ bool fExplicitReadyToRunSwitch = false;
#if !defined(FEATURE_MERGE_JIT_AND_ENGINE)
LPCWSTR pwszCLRJITPath = nullptr;
@@ -513,6 +514,7 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
else if (MatchParameter(*argv, W("ReadyToRun")))
{
dwFlags |= NGENWORKER_FLAGS_READYTORUN;
+ fExplicitReadyToRunSwitch = true;
}
else if (MatchParameter(*argv, W("FragileNonVersionable")))
{
@@ -835,7 +837,7 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
// Disable fragile NGen when compiling Mscorlib for ARM.
#if !(defined(_TARGET_ARM_) || defined(_TARGET_ARM64_))
- if (fCompilingMscorlib)
+ if (fCompilingMscorlib && !fExplicitReadyToRunSwitch)
dwFlags &= ~NGENWORKER_FLAGS_READYTORUN;
#endif // !(_TARGET_ARM_ || _TARGET_ARM64_)