Skip to content

[TSan] Fix p == end == ShadowMem::end in ShadowSet #144994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 21, 2025
Merged

[TSan] Fix p == end == ShadowMem::end in ShadowSet #144994

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
515b000
{TSan] Fix p == end == ShadowMem::end in ShadowSet
Camsyn Jun 20, 2025
b337187
fix some issues adhering to the reviewer
Camsyn Jun 21, 2025
30fdb5b
Remove braces adhering to the coding standards
Camsyn Jun 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions compiler-rt/lib/tsan/rtl/tsan_rtl_access.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,9 +523,9 @@ ALWAYS_INLINE USED void UnalignedMemoryAccess(ThreadState* thr, uptr pc,
}

void ShadowSet(RawShadow* p, RawShadow* end, RawShadow v) {
DCHECK_LE(p, end);
DCHECK_LT(p, end);
DCHECK(IsShadowMem(p));
DCHECK(p == end || IsShadowMem(end - 1));
DCHECK(IsShadowMem(end - 1));
UNUSED const uptr kAlign = kShadowCnt * kShadowSize;
DCHECK_EQ(reinterpret_cast<uptr>(p) % kAlign, 0);
DCHECK_EQ(reinterpret_cast<uptr>(end) % kAlign, 0);
Expand Down Expand Up @@ -569,6 +569,7 @@ static void MemoryRangeSet(uptr addr, uptr size, RawShadow val) {
RawShadow* mid1 =
Min(end, reinterpret_cast<RawShadow*>(RoundUp(
reinterpret_cast<uptr>(begin) + kPageSize / 2, kPageSize)));
// begin must < mid1
ShadowSet(begin, mid1, val);
// Reset middle part.
RawShadow* mid2 = RoundDown(end, kPageSize);
Expand All @@ -577,7 +578,11 @@ static void MemoryRangeSet(uptr addr, uptr size, RawShadow val) {
Die();
}
// Set the ending.
ShadowSet(mid2, end, val);
if (mid2 < end) {
ShadowSet(mid2, end, val);
} else {
DCHECK_EQ(mid2, end);
}
}

void MemoryResetRange(ThreadState* thr, uptr pc, uptr addr, uptr size) {
Expand Down
Loading