commit 91f833a41372d262a9676a6dffe3e8f2f86a0fbf
author Alexey Samsonov <samsonov@google.com> Wed Mar 13 07:39:25 2013 +0000
committer Alexey Samsonov <samsonov@google.com> Wed Mar 13 07:39:25 2013 +0000
tree 167f683a51636e4b042589005d0ff8dfcee9b107
parent 05826ed8a08befac38a56cf0c3ef3a950fd523c6

[Sanitizer] Fixup for r176931 for Mac and Windows

llvm-svn: 176935

compiler-rt/lib/sanitizer_common/sanitizer_mac.cc

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
index eb2a6b6..3efb87a 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
@@ -243,7 +243,8 @@
 }
 
 bool MemoryMappingLayout::Next(uptr *start, uptr *end, uptr *offset,
-                               char filename[], uptr filename_size) {
+                               char filename[], uptr filename_size,
+                               uptr *protection) {
   for (; current_image_ >= 0; current_image_--) {
     const mach_header* hdr = _dyld_get_image_header(current_image_);
     if (!hdr) continue;
@@ -275,14 +276,14 @@
 #ifdef MH_MAGIC_64
         case MH_MAGIC_64: {
           if (NextSegmentLoad<LC_SEGMENT_64, struct segment_command_64>(
-                  start, end, offset, filename, filename_size))
+                  start, end, offset, filename, filename_size, protection))
             return true;
           break;
         }
 #endif
         case MH_MAGIC: {
           if (NextSegmentLoad<LC_SEGMENT, struct segment_command>(
-                  start, end, offset, filename, filename_size))
+                  start, end, offset, filename, filename_size, protection))
             return true;
           break;
         }
@@ -296,7 +297,7 @@
 
 bool MemoryMappingLayout::GetObjectNameAndOffset(uptr addr, uptr *offset,
                                                  char filename[],
-                                                 uptr filename_size
+                                                 uptr filename_size,
                                                  uptr *protection) {
   return IterateForObjectNameAndOffset(addr, offset, filename, filename_size,
                                        protection);

compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
index 1b61515..8df215d 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
@@ -24,7 +24,8 @@
  public:
   MemoryMappingLayout() {}
   bool GetObjectNameAndOffset(uptr addr, uptr *offset,
-                              char filename[], uptr filename_size) {
+                              char filename[], uptr filename_size,
+                              uptr *protection) {
     UNIMPLEMENTED();
   }
 };
@@ -105,7 +106,8 @@
 # elif defined __APPLE__
   template<u32 kLCSegment, typename SegmentCommand>
   bool NextSegmentLoad(uptr *start, uptr *end, uptr *offset,
-                       char filename[], uptr filename_size);
+                       char filename[], uptr filename_size,
+                       uptr *protection);
   int current_image_;
   u32 current_magic_;
   u32 current_filetype_;