Revert "Only scan global sections containing data in LSan on darwin"

This reverts commit 7e46d78d47832f03ce42adcf56417fbfd47cbaad.

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

1 files changed, 4 insertions, 11 deletions

diff --git a/lib/lsan/lsan_common_mac.cc b/lib/lsan/lsan_common_mac.cc
index 147e62d1f..ade94340a 100644
--- a/lib/lsan/lsan_common_mac.cc
+++ b/lib/lsan/lsan_common_mac.cc
@@ -92,15 +92,8 @@ LoadedModule *GetLinker() { return nullptr; }
 // required on Darwin.
 void InitializePlatformSpecificModules() {}
 
-// Sections which may contain global variables
-static const char *kGlobalVarSecNames[] = {
-    "__DATA",      "__bss",         "__common",       "__data",
-    "__objc_data", "__objc_opt_rw", "__objc_opt_ptrs"};
-
 // Scans global variables for heap pointers.
 void ProcessGlobalRegions(Frontier *frontier) {
-  for (auto name : kGlobalVarSecNames) CHECK(ARRAY_SIZE(name) < kMaxSegName);
-
   MemoryMappingLayout memory_mapping(false);
   InternalMmapVector<LoadedModule> modules(/*initial_capacity*/ 128);
   memory_mapping.DumpListOfModules(&modules);
@@ -111,10 +104,10 @@ void ProcessGlobalRegions(Frontier *frontier) {
 
     for (const __sanitizer::LoadedModule::AddressRange &range :
          modules[i].ranges()) {
-      for (auto name : kGlobalVarSecNames) {
-        if (!internal_strcmp(range.name, name))
-          ScanGlobalRange(range.beg, range.end, frontier);
-      }
+      // Sections storing global variables are writable and non-executable
+      if (range.executable || !range.writable) continue;
+
+      ScanGlobalRange(range.beg, range.end, frontier);
     }
   }
 }