diff options
| author | Francis Ricci <francisjricci@gmail.com> | 2017-07-20 21:23:14 +0000 |
|---|---|---|
| committer | Francis Ricci <francisjricci@gmail.com> | 2017-07-20 21:23:14 +0000 |
| commit | eb87176f80444bae9500e10d07531956f7142cac (patch) | |
| tree | 8d38d66a57a5a21516fbbd3826e8d471238ed7af /lib/sanitizer_common/sanitizer_procmaps.h | |
| parent | 66c4a26305e73d350c2638798fe77e0031fae7f9 (diff) | |
| download | compiler-rt-eb87176f80444bae9500e10d07531956f7142cac.tar.gz | |
Revert "Add MemoryMappedSection struct for two-level memory map iteration"
This probably broke lib0 tsan unit test on 10.11 buildbots
This reverts commit 35ad307c385e384f47a7fb348c14b3602d3a33c4.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@308676 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_procmaps.h')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_procmaps.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/lib/sanitizer_common/sanitizer_procmaps.h b/lib/sanitizer_common/sanitizer_procmaps.h index eb9e6c109..7e7997454 100644 --- a/lib/sanitizer_common/sanitizer_procmaps.h +++ b/lib/sanitizer_common/sanitizer_procmaps.h @@ -37,8 +37,7 @@ static const uptr kProtectionWrite = 2; static const uptr kProtectionExecute = 4; static const uptr kProtectionShared = 8; -class MemoryMappedSegment { - public: +struct MemoryMappedSegment { MemoryMappedSegment(char *buff = nullptr, uptr size = 0) : filename(buff), filename_size(size) {} ~MemoryMappedSegment() {} @@ -56,22 +55,6 @@ class MemoryMappedSegment { uptr protection; ModuleArch arch; u8 uuid[kModuleUUIDSize]; - -#if SANITIZER_MAC - - private: - friend class MemoryMappingLayout; - - template <typename Section> - void NextSectionLoad(LoadedModule *module); - void AddAddressRanges(LoadedModule *module); - - uptr nsects_; - char *current_load_cmd_addr_; - u32 lc_type_; - uptr base_virt_addr_; - uptr addr_mask_; -#endif }; class MemoryMappingLayout { |