summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBruno Cardoso Lopes <bruno.cardoso@gmail.com>2016-07-24 01:27:07 +0000
committerBruno Cardoso Lopes <bruno.cardoso@gmail.com>2016-07-24 01:27:07 +0000
commitbb6c145b44d2a1d29d365770ddab0f4eade8f47e (patch)
treed236f848a248f964fad75311bf3a5a76e7c2cfe0 /lib
parentd307ca28083065851ad969444f3c063562f2d4bd (diff)
Revert r276539 "Silence -Wpointer-bool-conversion warning after r276324"
Some bots are not happy with the change. This reverts commit d307ca28083065851ad969444f3c063562f2d4bd. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@276541 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/sanitizer_common/sanitizer_common_interceptors.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_common_interceptors.inc b/lib/sanitizer_common/sanitizer_common_interceptors.inc
index d4256595b..3660f6b8b 100644
--- a/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/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);