From 5e66b692b20264b974725665036641a6731f5f75 Mon Sep 17 00:00:00 2001
From: Francis Ricci <francisjricci@gmail.com>
Date: Fri, 29 Sep 2017 16:47:02 +0000
Subject: Move LoadedModule list to a NoCtor vector and initialize on demand.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@314533 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/sanitizer_common/sanitizer_linux_libcdep.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/sanitizer_common/sanitizer_linux_libcdep.cc')

diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
index da715dc6c..0f420875d 100644
--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
@@ -424,7 +424,7 @@ typedef ElfW(Phdr) Elf_Phdr;
 # endif
 
 struct DlIteratePhdrData {
-  InternalMmapVector<LoadedModule> *modules;
+  InternalMmapVectorNoCtor<LoadedModule> *modules;
   bool first;
 };
 
@@ -473,13 +473,13 @@ static bool requiresProcmaps() {
 #endif
 }
 
-static void procmapsInit(InternalMmapVector<LoadedModule> *modules) {
+static void procmapsInit(InternalMmapVectorNoCtor<LoadedModule> *modules) {
   MemoryMappingLayout memory_mapping(false);
   memory_mapping.DumpListOfModules(modules);
 }
 
 void ListOfModules::init() {
-  clear();
+  clearOrInit();
   if (requiresProcmaps()) {
     procmapsInit(&modules_);
   } else {
-- 
cgit v1.2.3