From c4820a1b9da2ac69f51949a6afdf431446ec6305 Mon Sep 17 00:00:00 2001 From: Mikhail Kurinnoi Date: Thu, 20 Oct 2022 18:28:34 +0300 Subject: [PATCH] [Tizen] Fix verifyheap failures Partial backport commit: https://github.com/dotnet/diagnostics/commit/e84270352a5a947a4b3816499c42439329171d89 --- src/SOS/Strike/eeheap.cpp | 1 + src/SOS/Strike/sos.h | 2 +- src/shared/dbgutil/elfreader.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SOS/Strike/eeheap.cpp b/src/SOS/Strike/eeheap.cpp index 7bb21cf8b..378372e80 100644 --- a/src/SOS/Strike/eeheap.cpp +++ b/src/SOS/Strike/eeheap.cpp @@ -1585,6 +1585,7 @@ BOOL GCHeapTraverse(const GCHeapDetails &heap, AllocInfo* pallocInfo, VISITGCHEA } dwAddrCurrObj = (DWORD_PTR)segment.mem; + continue; } else { diff --git a/src/SOS/Strike/sos.h b/src/SOS/Strike/sos.h index 98a71b678..2a58703c8 100644 --- a/src/SOS/Strike/sos.h +++ b/src/SOS/Strike/sos.h @@ -721,7 +721,7 @@ namespace sos inline const SyncBlkIterator &operator++() { SOS_Assert(mCurr <= mTotal); - mSyncBlk = ++mCurr; + mSyncBlk = mCurr++; return *this; } diff --git a/src/shared/dbgutil/elfreader.cpp b/src/shared/dbgutil/elfreader.cpp index 0848b3f3f..f01d8a561 100644 --- a/src/shared/dbgutil/elfreader.cpp +++ b/src/shared/dbgutil/elfreader.cpp @@ -103,7 +103,7 @@ public: { return false; } - if (PAL_fseek(m_file, (LONG)address, SEEK_SET) != 0) + if (PAL_fseek(m_file, (LONG_PTR)address, SEEK_SET) != 0) { return false; } -- 2.34.1