From 1f849e3b848443f12446871b443e5eb94f7221d7 Mon Sep 17 00:00:00 2001 From: Bruno Cardoso Lopes Date: Sun, 24 Jul 2016 01:27:07 +0000 Subject: [PATCH] Revert r276539 "Silence -Wpointer-bool-conversion warning after r276324" Some bots are not happy with the change. This reverts commit d307ca28083065851ad969444f3c063562f2d4bd. llvm-svn: 276541 --- compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc index d425659..3660f6b 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc @@ -664,7 +664,7 @@ INTERCEPTOR(void*, memchr, const void *s, int c, SIZE_T n) { void *ctx; COMMON_INTERCEPTOR_ENTER(ctx, memchr, s, c, n); void *res; - if (REAL(&memchr)) { + if (REAL(memchr)) { res = REAL(memchr)(s, c, n); } else { res = internal_memchr(s, c, n); -- 2.7.4