Skip to content

Commit

Permalink
[scudo] Fix memtag tests.
Browse files Browse the repository at this point in the history
A few memtag tests were using EXPECT_DEBUG_DEATH which executes the
statement unless NDEBUG is set. This meant the statement would
cause an abort, but the EXPECT_DEATH part was not done. Change these
to simply EXPECT_DEATH, these tests already verify that SCUDO_DEBUG
is set before checking for DEATH.

Reviewed By: Chia-hungDuan

Differential Revision: https://reviews.llvm.org/D155538
  • Loading branch information
cferris1000 committed Jul 18, 2023
1 parent 729ffb5 commit 902c41f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions compiler-rt/lib/scudo/standalone/tests/memtag_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ TEST_F(MemtagDeathTest, AddFixedTag) {
for (uptr Tag = 0; Tag < 0x10; ++Tag)
EXPECT_EQ(Tag, extractTag(addFixedTag(Addr, Tag)));
if (SCUDO_DEBUG) {
EXPECT_DEBUG_DEATH(addFixedTag(Addr, 16), "");
EXPECT_DEBUG_DEATH(addFixedTag(~Addr, 0), "");
EXPECT_DEATH(addFixedTag(Addr, 16), "");
EXPECT_DEATH(addFixedTag(~Addr, 0), "");
}
}

Expand Down Expand Up @@ -131,8 +131,8 @@ TEST_F(MemtagDeathTest, SKIP_NO_DEBUG(LoadStoreTagUnaligned)) {
for (uptr P = Addr; P < Addr + 4 * archMemoryTagGranuleSize(); ++P) {
if (P % archMemoryTagGranuleSize() == 0)
continue;
EXPECT_DEBUG_DEATH(loadTag(P), "");
EXPECT_DEBUG_DEATH(storeTag(P), "");
EXPECT_DEATH(loadTag(P), "");
EXPECT_DEATH(storeTag(P), "");
}
}

Expand All @@ -153,7 +153,7 @@ TEST_F(MemtagDeathTest, SKIP_NO_DEBUG(StoreTagsUnaligned)) {
uptr Tagged = addFixedTag(P, 5);
if (Tagged % archMemoryTagGranuleSize() == 0)
continue;
EXPECT_DEBUG_DEATH(storeTags(Tagged, Tagged), "");
EXPECT_DEATH(storeTags(Tagged, Tagged), "");
}
}

Expand Down

0 comments on commit 902c41f

Please sign in to comment.