From 81b27444a5e57da150819ad60c2fdaaf10237929 Mon Sep 17 00:00:00 2001 From: David Mason Date: Wed, 11 Mar 2020 13:18:03 -0700 Subject: [PATCH 1/2] remove asserts that were firing during rejit tests --- src/coreclr/src/vm/callcounting.cpp | 2 +- src/coreclr/src/vm/rejit.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/coreclr/src/vm/callcounting.cpp b/src/coreclr/src/vm/callcounting.cpp index 366753f7fb1356..2e7894b128df2c 100644 --- a/src/coreclr/src/vm/callcounting.cpp +++ b/src/coreclr/src/vm/callcounting.cpp @@ -448,7 +448,7 @@ bool CallCountingManager::IsCallCountingEnabled(NativeCodeVersion codeVersion) CONTRACTL_END; _ASSERTE(!codeVersion.IsNull()); - _ASSERTE(codeVersion.IsDefaultVersion()); + _ASSERTE(codeVersion.IsDefaultVersion() || codeVersion.GetILCodeVersionId() != 0); _ASSERTE(codeVersion.GetMethodDesc()->IsEligibleForTieredCompilation()); CodeVersionManager::LockHolder codeVersioningLockHolder; diff --git a/src/coreclr/src/vm/rejit.cpp b/src/coreclr/src/vm/rejit.cpp index 2f46bd3939a9b5..d954b26352600a 100644 --- a/src/coreclr/src/vm/rejit.cpp +++ b/src/coreclr/src/vm/rejit.cpp @@ -657,7 +657,6 @@ HRESULT ReJitManager::UpdateActiveILVersions( // ThreadStore crsts SystemDomain::LockHolder lh; - _ASSERTE(ThreadStore::HoldingThreadStore()); hr = pCodeVersionManager->SetActiveILCodeVersions(pCodeActivationBatch->m_methodsToActivate.Ptr(), pCodeActivationBatch->m_methodsToActivate.Count(), &errorRecords); if (FAILED(hr)) break; From 54336c34cebb645d8c6c265ed040cfeb3268eb5d Mon Sep 17 00:00:00 2001 From: David Mason Date: Thu, 12 Mar 2020 11:20:57 -0700 Subject: [PATCH 2/2] remove callcounting assert change --- src/coreclr/src/vm/callcounting.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/src/vm/callcounting.cpp b/src/coreclr/src/vm/callcounting.cpp index 2e7894b128df2c..366753f7fb1356 100644 --- a/src/coreclr/src/vm/callcounting.cpp +++ b/src/coreclr/src/vm/callcounting.cpp @@ -448,7 +448,7 @@ bool CallCountingManager::IsCallCountingEnabled(NativeCodeVersion codeVersion) CONTRACTL_END; _ASSERTE(!codeVersion.IsNull()); - _ASSERTE(codeVersion.IsDefaultVersion() || codeVersion.GetILCodeVersionId() != 0); + _ASSERTE(codeVersion.IsDefaultVersion()); _ASSERTE(codeVersion.GetMethodDesc()->IsEligibleForTieredCompilation()); CodeVersionManager::LockHolder codeVersioningLockHolder;