LLVM 6: Adapt to LLVM CodeModel cmdline option now exposed as llvm::Optional

Author: kinke

driver/cache.cpp

@@ -312,7 +312,13 @@ void outputIR2ObjRelevantCmdlineArgs(llvm::raw_ostream &hash_os) {
 #else
   hash_os << opts::getRelocModel();
 #endif
+#if LDC_LLVM_VER >= 600
+  const auto codeModel = opts::getCodeModel();
+  if (codeModel.hasValue())
+    hash_os << codeModel.getValue();
+#else
   hash_os << opts::getCodeModel();
+#endif
   hash_os << opts::disableFPElim();
 }
 

driver/cl_options-llvm.cpp

@@ -33,7 +33,11 @@ Optional<Reloc::Model> getRelocModel() { return ::getRelocModel(); }
 Reloc::Model getRelocModel() { return ::RelocModel; }
 #endif
 
+#if LDC_LLVM_VER >= 600
+Optional<CodeModel::Model> getCodeModel() { return ::getCodeModel(); }
+#else
 CodeModel::Model getCodeModel() { return ::CMModel; }
+#endif
 
 cl::boolOrDefault disableFPElim() {
   return ::DisableFPElim.getNumOccurrences() == 0
@@ -67,6 +71,12 @@ TargetOptions InitTargetOptionsFromCodeGenFlags() {
   return ::InitTargetOptionsFromCodeGenFlags();
 }
 
-CodeModel::Model GetCodeModelFromCMModel() { return CMModel; }
+#if LDC_LLVM_VER >= 600
+Optional<CodeModel::Model> GetCodeModelFromCMModel() {
+  return ::getCodeModel();
+}
+#else
+CodeModel::Model GetCodeModelFromCMModel() { return ::CMModel; }
+#endif
 }
 #endif // LDC_WITH_LLD && LDC_LLVM_VER >= 500

driver/cl_options-llvm.h

@@ -23,7 +23,11 @@ llvm::Optional<llvm::Reloc::Model> getRelocModel();
 #else
 llvm::Reloc::Model getRelocModel();
 #endif
+#if LDC_LLVM_VER >= 600
+llvm::Optional<llvm::CodeModel::Model> getCodeModel();
+#else
 llvm::CodeModel::Model getCodeModel();
+#endif
 llvm::cl::boolOrDefault disableFPElim();
 bool disableRedZone();
 bool printTargetFeaturesHelp();

driver/main.cpp

@@ -1036,8 +1036,7 @@ int cppmain(int argc, char **argv) {
 
   gTargetMachine = createTargetMachine(
       mTargetTriple, arch, opts::getCPUStr(), opts::getFeaturesStr(), bitness,
-      floatABI, relocModel, opts::getCodeModel(), codeGenOptLevel(),
-      disableLinkerStripDead);
+      floatABI, relocModel, codeGenOptLevel(), disableLinkerStripDead);
 
   opts::setDefaultMathOptions(gTargetMachine->Options);
 

driver/targetmachine.cpp

@@ -351,7 +351,6 @@ createTargetMachine(const std::string targetTriple, const std::string arch,
 #else
                     llvm::Reloc::Model relocModel,
 #endif
-                    const llvm::CodeModel::Model codeModel,
                     const llvm::CodeGenOpt::Level codeGenOptLevel,
                     const bool noLinkerStripDead) {
   // Determine target triple. If the user didn't explicitly specify one, use

driver/targetmachine.h

@@ -62,7 +62,6 @@ createTargetMachine(std::string targetTriple, std::string arch, std::string cpu,
 #else
                     llvm::Reloc::Model relocModel,
 #endif
-                    llvm::CodeModel::Model codeModel,
                     llvm::CodeGenOpt::Level codeGenOptLevel,
                     bool noLinkerStripDead);