]> granicus.if.org Git - llvm/commitdiff
fix nullptr Mangler in LTOModule
authorBob Haarman <llvm@inglorion.net>
Sat, 4 Feb 2017 01:28:44 +0000 (01:28 +0000)
committerBob Haarman <llvm@inglorion.net>
Sat, 4 Feb 2017 01:28:44 +0000 (01:28 +0000)
Reviewers: kcc, pcc

Subscribers: mehdi_amini

Differential Revision: https://reviews.llvm.org/D29523

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

lib/LTO/LTOModule.cpp

index 89aeb80000388a8cbe6b218794500ae2a1d2988e..473684255a522238dbd93a0601b6c824b1c6da97 100644 (file)
@@ -16,6 +16,7 @@
 #include "llvm/ADT/Triple.h"
 #include "llvm/Bitcode/BitcodeReader.h"
 #include "llvm/CodeGen/Analysis.h"
+#include "llvm/CodeGen/TargetLoweringObjectFileImpl.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DiagnosticPrinter.h"
 #include "llvm/IR/LLVMContext.h"
@@ -647,11 +648,15 @@ void LTOModule::parseMetadata() {
     }
   }
 
-  // Globals
+  // Globals - we only need to do this for COFF.
+  const Triple TT(_target->getTargetTriple());
+  if (!TT.isOSBinFormatCOFF())
+    return;
+  Mangler M;
   for (const NameAndAttributes &Sym : _symbols) {
     if (!Sym.symbol)
       continue;
-    _target->getObjFileLowering()->emitLinkerFlagsForGlobal(OS, Sym.symbol);
+    emitLinkerFlagsForGlobalCOFF(OS, Sym.symbol, TT, M);
   }
 
   // Add other interesting metadata here.