[msan] bool -> int to make msan_interface.h C-compatible.

llvm-svn: 190402

diff --git a/compiler-rt/include/sanitizer/msan_interface.h b/compiler-rt/include/sanitizer/msan_interface.h
index e8427ae..0112082 100644 (file)
--- a/compiler-rt/include/sanitizer/msan_interface.h
+++ b/compiler-rt/include/sanitizer/msan_interface.h
@@ -99,7 +99,7 @@ extern "C" {
 
   /* Returns true if p was returned by the Msan allocator and
      is not yet freed. */
-  bool __msan_get_ownership(const void *p);
+  int __msan_get_ownership(const void *p);
 
   /* Returns the number of bytes reserved for the pointer p.
      Requires (get_ownership(p) == true) or (p == 0). */

diff --git a/compiler-rt/lib/msan/lit_tests/malloc_hook.cc b/compiler-rt/lib/msan/lit_tests/malloc_hook.cc
index 5e7e7dc..fc68fbc 100644 (file)
--- 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 7b989de..050a55c 100644 (file)
--- 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 c8f5113..4c919e6 100644 (file)
--- 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);