From 735e62b9058e5127051b33db0f758b5c2c3f95f9 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Sun, 5 Nov 2017 09:57:17 +0000 Subject: [PATCH] [libsanitizer] Remove semicolon after do {} while (0) in macro body 2017-11-05 Tom de Vries PR other/82784 * asan/asan_poisoning.cc (CHECK_SMALL_REGION): Remove semicolon after "do {} while (0)". * lsan/lsan_common.cc (LOG_POINTERS, LOG_THREADS): Same. From-SVN: r254419 --- libsanitizer/ChangeLog | 7 +++++++ libsanitizer/asan/asan_poisoning.cc | 2 +- libsanitizer/lsan/lsan_common.cc | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 63e71317cbf..0428650d906 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,10 @@ +2017-11-05 Tom de Vries + + PR other/82784 + * asan/asan_poisoning.cc (CHECK_SMALL_REGION): Remove semicolon after + "do {} while (0)". + * lsan/lsan_common.cc (LOG_POINTERS, LOG_THREADS): Same. + 2017-10-20 Jakub Jelinek PR sanitizer/82595 diff --git a/libsanitizer/asan/asan_poisoning.cc b/libsanitizer/asan/asan_poisoning.cc index 15cd8eaac3e..1343dfbd39e 100644 --- a/libsanitizer/asan/asan_poisoning.cc +++ b/libsanitizer/asan/asan_poisoning.cc @@ -215,7 +215,7 @@ uptr __asan_region_is_poisoned(uptr beg, uptr size) { uptr __bad = __asan_region_is_poisoned(__p, __size); \ __asan_report_error(pc, bp, sp, __bad, isWrite, __size, 0);\ } \ - } while (false); \ + } while (false) extern "C" SANITIZER_INTERFACE_ATTRIBUTE diff --git a/libsanitizer/lsan/lsan_common.cc b/libsanitizer/lsan/lsan_common.cc index a3274d5c1c3..4afce9df071 100644 --- a/libsanitizer/lsan/lsan_common.cc +++ b/libsanitizer/lsan/lsan_common.cc @@ -55,12 +55,12 @@ void RegisterLsanFlags(FlagParser *parser, Flags *f) { #define LOG_POINTERS(...) \ do { \ if (flags()->log_pointers) Report(__VA_ARGS__); \ - } while (0); + } while (0) #define LOG_THREADS(...) \ do { \ if (flags()->log_threads) Report(__VA_ARGS__); \ - } while (0); + } while (0) ALIGNED(64) static char suppression_placeholder[sizeof(SuppressionContext)]; static SuppressionContext *suppression_ctx = nullptr; -- 2.30.2