From 37a79210cbe622f030c75c2ba667fc6fc6fa721b Mon Sep 17 00:00:00 2001 From: Viktor Kutuzov Date: Mon, 16 Feb 2015 13:30:52 +0000 Subject: [PATCH] [Msan] Improve the EXPECT_NOT_POISONED() macro to provide the original line number Differential Revision: http://reviews.llvm.org/D7341 llvm-svn: 229389 --- compiler-rt/lib/msan/tests/msan_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler-rt/lib/msan/tests/msan_test.cc b/compiler-rt/lib/msan/tests/msan_test.cc index 1fc5e8c50054..5e578ab7c659 100644 --- a/compiler-rt/lib/msan/tests/msan_test.cc +++ b/compiler-rt/lib/msan/tests/msan_test.cc @@ -168,11 +168,11 @@ void ExpectPoisonedWithOrigin(const T& t, unsigned origin) { EXPECT_EQ(origin, __msan_get_origin((void*)&t)); } -#define EXPECT_NOT_POISONED(x) ExpectNotPoisoned(x) +#define EXPECT_NOT_POISONED(x) EXPECT_EQ(true, TestForNotPoisoned((x))) template -void ExpectNotPoisoned(const T& t) { - EXPECT_EQ(-1, __msan_test_shadow((void*)&t, sizeof(t))); +bool TestForNotPoisoned(const T& t) { + return __msan_test_shadow((void*)&t, sizeof(t)) == -1; } static U8 poisoned_array[100];