Skip to content

Commit b337187

Browse files
committed
fix some issues adhering to the reviewer
1 parent 515b000 commit b337187

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

compiler-rt/lib/tsan/rtl/tsan_rtl_access.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ ALWAYS_INLINE USED void UnalignedMemoryAccess(ThreadState* thr, uptr pc,
525525
void ShadowSet(RawShadow* p, RawShadow* end, RawShadow v) {
526526
DCHECK_LT(p, end);
527527
DCHECK(IsShadowMem(p));
528-
DCHECK(p == end || IsShadowMem(end - 1));
528+
DCHECK(IsShadowMem(end - 1));
529529
UNUSED const uptr kAlign = kShadowCnt * kShadowSize;
530530
DCHECK_EQ(reinterpret_cast<uptr>(p) % kAlign, 0);
531531
DCHECK_EQ(reinterpret_cast<uptr>(end) % kAlign, 0);
@@ -578,8 +578,11 @@ static void MemoryRangeSet(uptr addr, uptr size, RawShadow val) {
578578
Die();
579579
}
580580
// Set the ending.
581-
if (mid2 < end)
581+
if (mid2 < end) {
582582
ShadowSet(mid2, end, val);
583+
} else {
584+
DCHECK_EQ(mid2, end);
585+
}
583586
}
584587

585588
void MemoryResetRange(ThreadState* thr, uptr pc, uptr addr, uptr size) {

0 commit comments

Comments
 (0)