diff options
author | Francis Ricci <francisjricci@gmail.com> | 2017-07-18 23:51:44 +0000 |
---|---|---|
committer | Francis Ricci <francisjricci@gmail.com> | 2017-07-18 23:51:44 +0000 |
commit | f326d7dfb080c1f02f44957b4f491b333b8a3adb (patch) | |
tree | d0df519c1402022c60939a585010fe7e1c803b81 /lib/lsan/lsan_common_mac.cc | |
parent | f9d9566dc29f527537dffe68cf2a2deb1d12b177 (diff) | |
download | compiler-rt-f326d7dfb080c1f02f44957b4f491b333b8a3adb.tar.gz |
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
Diffstat (limited to 'lib/lsan/lsan_common_mac.cc')
-rw-r--r-- | lib/lsan/lsan_common_mac.cc | 15 |
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); } } } |