diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-09-10 11:04:37 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2013-09-10 11:04:37 +0000 |
| commit | df96e863de91b2553efeb8a5542e338c91f536ae (patch) | |
| tree | 5942153910f33163e73197be7e0f0add8ec223ca /compiler-rt/lib | |
| parent | 71665cd1fdf281cfcbbe3a3f91623ddd50bf6551 (diff) | |
| download | bcm5719-llvm-df96e863de91b2553efeb8a5542e338c91f536ae.tar.gz bcm5719-llvm-df96e863de91b2553efeb8a5542e338c91f536ae.zip | |
[msan] bool -> int to make msan_interface.h C-compatible.
llvm-svn: 190402
Diffstat (limited to 'compiler-rt/lib')
| -rw-r--r-- | compiler-rt/lib/msan/lit_tests/malloc_hook.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/msan/msan_allocator.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/msan/msan_interface_internal.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler-rt/lib/msan/lit_tests/malloc_hook.cc b/compiler-rt/lib/msan/lit_tests/malloc_hook.cc index 5e7e7dc857e..fc68fbc35fb 100644 --- a/compiler-rt/lib/msan/lit_tests/malloc_hook.cc +++ b/compiler-rt/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/compiler-rt/lib/msan/msan_allocator.cc b/compiler-rt/lib/msan/msan_allocator.cc index 7b989decb14..050a55c50eb 100644 --- a/compiler-rt/lib/msan/msan_allocator.cc +++ b/compiler-rt/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/compiler-rt/lib/msan/msan_interface_internal.h b/compiler-rt/lib/msan/msan_interface_internal.h index c8f51138d04..4c919e67c73 100644 --- a/compiler-rt/lib/msan/msan_interface_internal.h +++ b/compiler-rt/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); |

