commit 4787d0fbeff57cdf7bcd25e9b727dd2b2c424afa
author Alexey Samsonov <samsonov@google.com> Wed Sep 12 14:10:14 2012 +0000
committer Alexey Samsonov <samsonov@google.com> Wed Sep 12 14:10:14 2012 +0000
tree 3abf57f7f914def295df6ce08fa87ffc5e630f59
parent 85e2bbc3f8c751584871537e72caffc2bffb9613

[ASan] more macro/casting magic to suppress warnings

llvm-svn: 163706

compiler-rt/lib/asan/asan_mac.cc

diff --git a/compiler-rt/lib/asan/asan_mac.cc b/compiler-rt/lib/asan/asan_mac.cc
index d496371..cecd5bd 100644
--- a/compiler-rt/lib/asan/asan_mac.cc
+++ b/compiler-rt/lib/asan/asan_mac.cc
@@ -96,7 +96,7 @@
   // the library is preloaded so that the wrappers work. If it is not, set
   // DYLD_INSERT_LIBRARIES and re-exec ourselves.
   Dl_info info;
-  CHECK(dladdr((void*)__asan_init, &info));
+  CHECK(dladdr((void*)((uptr)__asan_init), &info));
   const char *dyld_insert_libraries = GetEnv(kDyldInsertLibraries);
   if (!dyld_insert_libraries ||
       !REAL(strstr)(dyld_insert_libraries, info.dli_fname)) {
@@ -491,7 +491,7 @@
 
 DECLARE_REAL_AND_INTERCEPTOR(void, free, void *ptr)
 
-DECLARE_REAL_AND_INTERCEPTOR(void, __CFInitialize)
+DECLARE_REAL_AND_INTERCEPTOR(void, __CFInitialize, void)
 
 namespace __asan {
 

compiler-rt/lib/asan/asan_malloc_mac.cc

diff --git a/compiler-rt/lib/asan/asan_malloc_mac.cc b/compiler-rt/lib/asan/asan_malloc_mac.cc
index ef7fce7..0243bf9 100644
--- a/compiler-rt/lib/asan/asan_malloc_mac.cc
+++ b/compiler-rt/lib/asan/asan_malloc_mac.cc
@@ -108,7 +108,7 @@
 //
 // See http://code.google.com/p/address-sanitizer/issues/detail?id=87
 // and http://opensource.apple.com/source/CF/CF-550.43/CFRuntime.c
-INTERCEPTOR(void, __CFInitialize) {
+INTERCEPTOR(void, __CFInitialize, void) {
   // If the runtime is built as dynamic library, __CFInitialize wrapper may be
   // called before __asan_init.
 #if !MAC_INTERPOSE_FUNCTIONS

compiler-rt/lib/interception/interception_mac.h

diff --git a/compiler-rt/lib/interception/interception_mac.h b/compiler-rt/lib/interception/interception_mac.h
index 31fd7b3..6e9e808 100644
--- a/compiler-rt/lib/interception/interception_mac.h
+++ b/compiler-rt/lib/interception/interception_mac.h
@@ -42,7 +42,7 @@
     ::__interception::OverrideFunction( \
           (::__interception::uptr)old_func, \
           (::__interception::uptr)new_func, \
-          (::__interception::uptr*)&REAL(old_func))
+          (::__interception::uptr*)((::__interception::uptr)&REAL(old_func)))
 # define INTERCEPT_FUNCTION_MAC(func) OVERRIDE_FUNCTION_MAC(func, WRAP(func))
 
 #endif  // INTERCEPTION_MAC_H