From: noahfalk Date: Tue, 5 Feb 2019 08:04:58 +0000 (-0800) Subject: Merge "Fix SOS GCInfo for Arm/Arm64" PR #22188 from coreclr SOS. X-Git-Tag: submit/tizen/20190813.035844~58^2~2^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da4b87b09c5e02ceb1df31ec0db1ffd8b15520c6;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git Merge "Fix SOS GCInfo for Arm/Arm64" PR #22188 from coreclr SOS. (work originally by mikem, I just split his mega-commit so history would a little more understandable) --- diff --git a/src/SOS/gcdump/gcdumpnonx86.cpp b/src/SOS/gcdump/gcdumpnonx86.cpp index 766b15423..763503764 100644 --- a/src/SOS/gcdump/gcdumpnonx86.cpp +++ b/src/SOS/gcdump/gcdumpnonx86.cpp @@ -285,7 +285,11 @@ size_t GCDump::DumpGCTable(PTR_CBYTE gcInfoBlock, | DECODE_GENERICS_INST_CONTEXT | DECODE_GC_LIFETIMES | DECODE_PROLOG_LENGTH - | DECODE_RETURN_KIND), + | DECODE_RETURN_KIND +#if defined(_TARGET_ARM_) || defined(_TARGET_ARM64_) + | DECODE_HAS_TAILCALLS +#endif + ), 0); if (NO_SECURITY_OBJECT != hdrdecoder.GetSecurityObjectStackSlot() ||