From 829778f99fdfba9460ecf500a5d95641c23af272 Mon Sep 17 00:00:00 2001 From: Noah Falk Date: Fri, 28 Jul 2017 02:26:42 -0700 Subject: [PATCH] Fix tier0 flag on default code versions (#13098) Fixes github issue 13019. --- src/vm/prestub.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vm/prestub.cpp b/src/vm/prestub.cpp index d3639ab..e4aeb1e 100644 --- a/src/vm/prestub.cpp +++ b/src/vm/prestub.cpp @@ -988,12 +988,16 @@ CORJIT_FLAGS PrepareCodeConfig::GetJitCompilationFlags() { STANDARD_VM_CONTRACT; + CORJIT_FLAGS flags; if (m_pMethodDesc->IsILStub()) { ILStubResolver* pResolver = m_pMethodDesc->AsDynamicMethodDesc()->GetILStubResolver(); - return pResolver->GetJitFlags(); + flags = pResolver->GetJitFlags(); } - return CORJIT_FLAGS(); +#ifdef FEATURE_TIERED_COMPILATION + flags.Add(TieredCompilationManager::GetJitFlags(m_nativeCodeVersion)); +#endif + return flags; } BOOL PrepareCodeConfig::MayUsePrecompiledCode() -- 2.7.4