Revert "Add MemoryMappedSection struct for two-level memory map iteration"

This reverts commit c8095ce74118dee8544b0f1ffaba8f46aa10215c.

Reverted due to some buildbot timeouts, perhaps due to 10.11 issues.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@308395 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 1 insertions, 17 deletions

diff --git a/lib/sanitizer_common/sanitizer_procmaps.h b/lib/sanitizer_common/sanitizer_procmaps.h
index 76685661c..06d072b4d 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,21 +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_;
-#endif
 };
 
 class MemoryMappingLayout {