Misc. LLVM 18 fixes

driver/linker-gcc.cpp

@@ -636,6 +636,10 @@ void ArgsBuilder::addLinker() {
 //////////////////////////////////////////////////////////////////////////////
 
 void ArgsBuilder::addUserSwitches() {
+#if LDC_LLVM_VER >= 1800
+  #define startswith starts_with
+#endif
+
   // additional linker and cc switches (preserve order across both lists)
   for (unsigned ilink = 0, icc = 0;;) {
     unsigned linkpos = ilink < opts::linkerSwitches.size()
@@ -664,6 +668,10 @@ void ArgsBuilder::addUserSwitches() {
       break;
     }
   }
+
+#if LDC_LLVM_VER >= 1800
+  #undef startswith
+#endif
 }
 
 //////////////////////////////////////////////////////////////////////////////

driver/main.cpp

@@ -189,6 +189,10 @@ void tryParse(const llvm::SmallVectorImpl<const char *> &args, size_t i,
 }
 
 bool tryParseLowmem(const llvm::SmallVectorImpl<const char *> &args) {
+#if LDC_LLVM_VER >= 1800
+  #define startswith starts_with
+#endif
+
   bool lowmem = false;
   for (size_t i = 1; i < args.size(); ++i) {
     if (args::isRunArg(args[i]))
@@ -206,6 +210,10 @@ bool tryParseLowmem(const llvm::SmallVectorImpl<const char *> &args) {
     }
   }
   return lowmem;
+
+#if LDC_LLVM_VER >= 1800
+  #undef startswith
+#endif
 }
 
 const char *

driver/targetmachine.cpp

@@ -52,6 +52,10 @@
 
 #include "gen/optimizer.h"
 
+#if LDC_LLVM_VER >= 1800
+#define startswith starts_with
+#endif
+
 #ifdef LDC_LLVM_SUPPORTS_MACHO_DWARF_LINE_AS_REGULAR_SECTION
 // LDC-LLVM >= 6.0.1:
 // On Mac, emit __debug_line section in __DWARF segment as regular (non-debug)

driver/toobj.cpp

@@ -50,7 +50,6 @@ using CodeGenFileType = llvm::CodeGenFileType;
 #if LDC_LLVM_VER >= 1800
 constexpr llvm::CodeGenFileType CGFT_AssemblyFile = CodeGenFileType::AssemblyFile;
 constexpr llvm::CodeGenFileType CGFT_ObjectFile = CodeGenFileType::ObjectFile;
-constexpr llvm::CodeGenFileType CGFT_Null = CodeGenFileType::Null;
 #endif
 
 #if LDC_LLVM_VER < 1700

gen/asm-gcc.cpp

@@ -60,6 +60,10 @@ class ConstraintsBuilder {
   // Appends a constraint string expression with an optional prefix.
   // Returns true if the string describes an indirect operand.
   bool append(Expression *e, char prefix = 0) {
+#if LDC_LLVM_VER >= 1800
+    #define startswith starts_with
+#endif
+
     auto se = e->isStringExp();
     assert(se);
     llvm::StringRef code = peekString(se);
@@ -90,6 +94,10 @@ class ConstraintsBuilder {
     str << ',';
 
     return isIndirect;
+
+#if LDC_LLVM_VER >= 1800
+    #undef startswith
+#endif
   }
 
   // Might set `isIndirect` to true (but never resets to false).

gen/declarations.cpp

@@ -393,6 +393,11 @@ class CodegenVisitor : public Visitor {
   void visit(PragmaDeclaration *decl) override {
     const auto &triple = *global.params.targetTriple;
 
+#if LDC_LLVM_VER >= 1800
+    #define endswith ends_with
+    #define startswith starts_with
+#endif
+
     if (decl->ident == Id::lib) {
       assert(!irs->dcomputetarget);
       llvm::StringRef name = getPragmaStringArg(decl);
@@ -466,6 +471,11 @@ class CodegenVisitor : public Visitor {
       }
     }
     visit(static_cast<AttribDeclaration *>(decl));
+
+#if LDC_LLVM_VER >= 1800
+    #undef endswith
+    #undef startswith
+#endif
   }
 
   //////////////////////////////////////////////////////////////////////////

gen/functions.cpp

@@ -901,6 +901,10 @@ bool eraseDummyAfterReturnBB(llvm::BasicBlock *bb) {
  * to be found.
  */
 void emulateWeakAnyLinkageForMSVC(IrFunction *irFunc, LINK linkage) {
+#if LDC_LLVM_VER >= 1800
+  #define startswith starts_with
+#endif
+
   LLFunction *func = irFunc->getLLVMFunc();
 
   const bool isWin32 = global.params.targetTriple->isArch32Bit();
@@ -952,6 +956,10 @@ void emulateWeakAnyLinkageForMSVC(IrFunction *irFunc, LINK linkage) {
   // declaration
   irFunc->setLLVMFunc(newFunc);
   func->replaceNonMetadataUsesWith(newFunc);
+
+#if LDC_LLVM_VER >= 1800
+  #undef startswith
+#endif
 }
 
 } // anonymous namespace

gen/passes/DLLImportRelocation.cpp

@@ -200,7 +200,7 @@ struct Impl {
         t = st->getElementType(i);
       else if (ArrayType *at = dyn_cast<ArrayType>(t))
         t = at->getElementType();
-      else if (PointerType *pt = dyn_cast<PointerType>(t))
+      else if (dyn_cast<PointerType>(t))
         llvm_unreachable("Shouldn't be trying to GEP a pointer in initializer");
     }
 

gen/pgo_ASTbased.cpp

@@ -43,7 +43,6 @@ llvm::cl::opt<bool, false, opts::FlagParser<bool>> enablePGOIndirectCalls(
 #if LDC_LLVM_VER >= 1800
 namespace llvm::support {
   const auto little = llvm::endianness::little;
-  const auto big = llvm::endianness::big;
 }
 #endif
 

gen/tocall.cpp

@@ -271,7 +271,8 @@ static LLType *getPtrToAtomicType(LLType *type) {
 #if LDC_LLVM_VER < 1800
     return LLType::getIntNPtrTy(gIR->context(), static_cast<unsigned>(N));
 #else
-    return LLPointerType::getIntNPtrTy(gIR->context(), static_cast<unsigned>(N));
+    return LLType::getIntNTy(gIR->context(), static_cast<unsigned>(N))
+        ->getPointerTo();
 #endif
   default:
     return nullptr;

gen/uda.cpp

@@ -315,6 +315,10 @@ void applyAttrTarget(StructLiteralExp *sle, llvm::Function *func,
   // The current implementation here does not do any checking of the specified
   // string and simply passes all to llvm.
 
+#if LDC_LLVM_VER >= 1800
+  #define startswith starts_with
+#endif
+
   checkStructElems(sle, {Type::tstring});
   llvm::StringRef targetspec = getFirstElemString(sle);
 
@@ -375,6 +379,10 @@ void applyAttrTarget(StructLiteralExp *sle, llvm::Function *func,
                     llvm::join(features.begin(), features.end(), ","));
     irFunc->targetFeaturesOverridden = true;
   }
+
+#if LDC_LLVM_VER >= 1800
+  #undef startswith
+#endif
 }
 
 void applyAttrAssumeUsed(IRState &irs, StructLiteralExp *sle,

ir/iraggr.cpp

@@ -61,6 +61,10 @@ bool IrAggr::useDLLImport() const {
 //////////////////////////////////////////////////////////////////////////////
 
 LLConstant *IrAggr::getInitSymbol(bool define) {
+#if LDC_LLVM_VER >= 1800
+  #define startswith starts_with
+#endif
+
   if (!init) {
     const auto irMangle = getIRMangledInitSymbolName(aggrdecl);
 
@@ -107,6 +111,10 @@ LLConstant *IrAggr::getInitSymbol(bool define) {
   }
 
   return init;
+
+#if LDC_LLVM_VER >= 1800
+  #undef startswith
+#endif
 }
 
 //////////////////////////////////////////////////////////////////////////////

tests/sanitizers/fsanitize_address.d

@@ -4,12 +4,12 @@
 // RUN: %ldc -c -output-ll -g -fsanitize=address,thread -of=%t.tsan.ll %s && FileCheck %s --check-prefix=wTSAN < %t.tsan.ll
 // RUN: %ldc -c -output-ll -g -fsanitize=address -fsanitize=thread -of=%t.tsan.ll %s && FileCheck %s --check-prefix=wTSAN < %t.tsan.ll
 
-void foo() {
+void foo(size_t a) {
     // wTSAN: call {{.*}}_tsan_func_entry
     // CHECK: call {{.*}}_asan_stack_malloc
     // wTSAN: {{(call|invoke)}} {{.*}}_asan_stack_malloc
     int[10] i;
     // CHECK: call {{.*}}_asan_report_store
     // wTSAN: {{(call|invoke)}} {{.*}}_asan_report_store
-    i[0] = 1;
+    i[a] = 1;
 }

tests/sanitizers/fsanitize_fuzzer.d

@@ -16,9 +16,10 @@ bool FuzzMe(const ubyte* data, size_t dataSize)
 }
 
 // CHECK-LABEL: define{{.*}} @{{.*}}allocInt
-void allocInt() {
+void allocInt(size_t i) {
     // wASAN: call {{.*}}_asan_stack_malloc
     int[10] a;
+    a[i] = 1;
 }
 
 // CHECK-LABEL: define{{.*}} @{{.*}}foo

tools/ldc-profdata/llvm-profdata-18.1.cpp

@@ -3269,3 +3269,10 @@ int llvm_profdata_main(int argc, char **argvNonConst,
          << ": Unknown command. Run llvm-profdata --help for usage.\n";
   return 1;
 }
+
+// LDC manually added `main` function, which is generated by CMake in LLVM's build. See LLVM's llvm-driver-template.cpp.in
+#include "llvm/Support/InitLLVM.h"
+int main(int argc, char **argv) {
+  llvm::InitLLVM X(argc, argv);
+  return llvm_profdata_main(argc, argv, {argv[0], nullptr, false});
+}

tools/ldc-profgen/ldc-profgen-18.1/CMakeLists.txt

@@ -0,0 +1,25 @@
+
+set(LLVM_LINK_COMPONENTS
+  AllTargetsDescs
+  AllTargetsDisassemblers
+  AllTargetsInfos
+  DebugInfoDWARF
+  Core
+  MC
+  IPO
+  MCDisassembler
+  Object
+  ProfileData
+  Support
+  Symbolize
+  TargetParser
+  )
+
+add_llvm_tool(llvm-profgen
+  llvm-profgen.cpp
+  PerfReader.cpp
+  CSPreInliner.cpp
+  ProfiledBinary.cpp
+  ProfileGenerator.cpp
+  MissingFrameInferrer.cpp
+  )