1 files changed, 15 insertions, 0 deletions
diff --git a/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
index 83be31eada..fdea1b5946 100644
--- a/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ b/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -163,6 +163,8 @@ struct AddressSanitizer : public ModulePass {
 
  private:
 
+  void appendToPreinitArray(Module &M, Function *F);
+
   uint64_t getAllocaSizeInBytes(AllocaInst *AI) {
     Type *Ty = AI->getAllocatedType();
     uint64_t SizeInBytes = TD->getTypeStoreSizeInBits(Ty) / 8;
@@ -563,6 +565,18 @@ bool AddressSanitizer::insertGlobalRedzones(Module &M) {
   return true;
 }
 
+// .preinit_array is something that hapens before all other inits.
+// On systems where .preinit_array is honored, we will call __asan_init early.
+// On other systems this will make no effect.
+void AddressSanitizer::appendToPreinitArray(Module &M, Function *F) {
+  IRBuilder<> IRB(M.getContext());
+  GlobalVariable *Var =
+      new GlobalVariable(M, PointerType::getUnqual(F->getFunctionType()),
+                         false, GlobalValue::PrivateLinkage,
+                         F, "__asan_preinit_private");
+  Var->setSection(".preinit_array");
+}
+
 // virtual
 bool AddressSanitizer::runOnModule(Module &M) {
   // Initialize the private fields. No one has accessed them before.
@@ -633,6 +647,7 @@ bool AddressSanitizer::runOnModule(Module &M) {
   }
 
   appendToGlobalCtors(M, AsanCtorFunction, 1 /*high priority*/);
+  appendToPreinitArray(M, AsanInitFunction);
 
   return Res;
 }