diff options
| author | Pierre Gousseau <pierregousseau14@gmail.com> | 2017-05-02 10:22:05 +0000 |
|---|---|---|
| committer | Pierre Gousseau <pierregousseau14@gmail.com> | 2017-05-02 10:22:05 +0000 |
| commit | 1c5550671dee51da58fb657a7b08c174f67089b0 (patch) | |
| tree | a51cafcee78fd43c5dabd3982ff2d973a9bd70e5 /compiler-rt/lib/msan/tests/msan_test.cc | |
| parent | 4d35d6b3b38bba179c26049c86e3cb8a05559154 (diff) | |
| download | bcm5719-llvm-1c5550671dee51da58fb657a7b08c174f67089b0.tar.gz bcm5719-llvm-1c5550671dee51da58fb657a7b08c174f67089b0.zip | |
Revert r301904 causing tsan test failure in x86_64-linux-autoconf
llvm-svn: 301909
Diffstat (limited to 'compiler-rt/lib/msan/tests/msan_test.cc')
| -rw-r--r-- | compiler-rt/lib/msan/tests/msan_test.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler-rt/lib/msan/tests/msan_test.cc b/compiler-rt/lib/msan/tests/msan_test.cc index 432d92c2e79..dd81c4d798f 100644 --- a/compiler-rt/lib/msan/tests/msan_test.cc +++ b/compiler-rt/lib/msan/tests/msan_test.cc @@ -1581,8 +1581,7 @@ TEST(MemorySanitizer, strdup) { TEST(MemorySanitizer, strndup) { char buf[4] = "abc"; __msan_poison(buf + 2, sizeof(*buf)); - char *x; - EXPECT_UMR(x = strndup(buf, 3)); + char *x = strndup(buf, 3); EXPECT_NOT_POISONED(x[0]); EXPECT_NOT_POISONED(x[1]); EXPECT_POISONED(x[2]); @@ -1594,8 +1593,7 @@ TEST(MemorySanitizer, strndup_short) { char buf[4] = "abc"; __msan_poison(buf + 1, sizeof(*buf)); __msan_poison(buf + 2, sizeof(*buf)); - char *x; - EXPECT_UMR(x = strndup(buf, 2)); + char *x = strndup(buf, 2); EXPECT_NOT_POISONED(x[0]); EXPECT_POISONED(x[1]); EXPECT_NOT_POISONED(x[2]); |
