From 25c40e5a5b0cf827eb05d4b32c9eaf708daf4e5d Mon Sep 17 00:00:00 2001
From: Alexey Samsonov <samsonov@google.com>
Date: Fri, 15 Jun 2012 14:32:39 +0000
Subject: [PATCH] [Sanitizer] Fix type for placement new on 32-bit Mac

llvm-svn: 158524
---
 .../lib/sanitizer_common/sanitizer_placement_new.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h b/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
index 292e167863b1..4dd71aeaf4bf 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
@@ -18,14 +18,16 @@
 
 #include "sanitizer_internal_defs.h"
 
-#if __WORDSIZE == 64
-inline void *operator new(__sanitizer::uptr sz, void *p) {
-  return p;
-}
+namespace __sanitizer {
+#if (__WORDSIZE == 64) || defined(__APPLE__)
+typedef __sanitizer::uptr operator_new_ptr_type;
 #else
-inline void *operator new(__sanitizer::u32 sz, void *p) {
+typedef __sanitizer::u32 operator_new_ptr_type;
+#endif
+}  // namespace __sanitizer
+
+inline void *operator new(operator_new_ptr_type sz, void *p) {
   return p;
 }
-#endif
 
 #endif  // SANITIZER_PLACEMENT_NEW_H
-- 
GitLab