summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-09-10 11:04:37 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2013-09-10 11:04:37 +0000
commit13c379073b8af7eb5ea4706078428d1594c487ab (patch)
tree9fd544315314d9ea3021b6152e061b3fda6f9c85 /lib
parent997454a41a1658837d72d69ec7def59616311243 (diff)
[msan] bool -> int to make msan_interface.h C-compatible.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@190402 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/msan/lit_tests/malloc_hook.cc2
-rw-r--r--lib/msan/msan_allocator.cc2
-rw-r--r--lib/msan/msan_interface_internal.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/msan/lit_tests/malloc_hook.cc b/lib/msan/lit_tests/malloc_hook.cc
index 5e7e7dc85..fc68fbc35 100644
--- a/lib/msan/lit_tests/malloc_hook.cc
+++ b/lib/msan/lit_tests/malloc_hook.cc
@@ -4,7 +4,7 @@
#include <unistd.h>
extern "C" {
-bool __msan_get_ownership(const void *p);
+int __msan_get_ownership(const void *p);
void *global_ptr;
diff --git a/lib/msan/msan_allocator.cc b/lib/msan/msan_allocator.cc
index 7b989decb..050a55c50 100644
--- a/lib/msan/msan_allocator.cc
+++ b/lib/msan/msan_allocator.cc
@@ -149,7 +149,7 @@ uptr __msan_get_estimated_allocated_size(uptr size) {
return size;
}
-bool __msan_get_ownership(const void *p) {
+int __msan_get_ownership(const void *p) {
return AllocationSize(p) != 0;
}
diff --git a/lib/msan/msan_interface_internal.h b/lib/msan/msan_interface_internal.h
index c8f51138d..4c919e67c 100644
--- a/lib/msan/msan_interface_internal.h
+++ b/lib/msan/msan_interface_internal.h
@@ -146,7 +146,7 @@ SANITIZER_INTERFACE_ATTRIBUTE
uptr __msan_get_estimated_allocated_size(uptr size);
SANITIZER_INTERFACE_ATTRIBUTE
-bool __msan_get_ownership(const void *p);
+int __msan_get_ownership(const void *p);
SANITIZER_INTERFACE_ATTRIBUTE
uptr __msan_get_allocated_size(const void *p);