From: Noah Falk Date: Thu, 12 Oct 2017 21:54:31 +0000 (-0700) Subject: Fix #14418 (#14419) X-Git-Tag: accepted/tizen/base/20180629.140029~916 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1248d27e661c7cf7bd179f45d6dc45148ae60e0b;p=platform%2Fupstream%2Fcoreclr.git Fix #14418 (#14419) Adds the appropriate handling of the default ILCodeVersion in DacDbiInterfaceImpl::GetILCodeVersionNode --- diff --git a/src/debug/daccess/dacdbiimpl.cpp b/src/debug/daccess/dacdbiimpl.cpp index 38f52ad..4f15297 100644 --- a/src/debug/daccess/dacdbiimpl.cpp +++ b/src/debug/daccess/dacdbiimpl.cpp @@ -7221,7 +7221,16 @@ HRESULT DacDbiInterfaceImpl::GetILCodeVersionNode(VMPTR_NativeCodeVersionNode vm return E_INVALIDARG; #ifdef FEATURE_REJIT NativeCodeVersionNode* pNativeCodeVersionNode = vmNativeCodeVersionNode.GetDacPtr(); - pVmILCodeVersionNode->SetDacTargetPtr(PTR_TO_TADDR(pNativeCodeVersionNode->GetILCodeVersion().AsNode())); + ILCodeVersion ilCodeVersion = pNativeCodeVersionNode->GetILCodeVersion(); + if (ilCodeVersion.IsDefaultVersion()) + { + pVmILCodeVersionNode->SetDacTargetPtr(0); + } + else + { + pVmILCodeVersionNode->SetDacTargetPtr(PTR_TO_TADDR(ilCodeVersion.AsNode())); + } + #else _ASSERTE(!"You shouldn't be calling this - rejit is not supported in this build"); pVmILCodeVersionNode->SetDacTargetPtr(0);