upgrade to llvm21 (#2223)

Signed-off-by: David Korczynski <[email protected]>

Author: DavidKorczynski

build_all.sh

@@ -30,8 +30,9 @@ if [ -d $BUILD_BASE ]; then
         -DLLVM_BINUTILS_INCDIR=../binutils/include \
         -DCMAKE_BUILD_TYPE=Release \
         -DLLVM_TARGETS_TO_BUILD="X86" ../llvm-project/llvm/
-  make llvm-headers
-  make -j5
+  make -j5 llvm-headers
+  make -j10
+  make
 else
   echo "Cloning and building binutild-gdb and LLVM from scratch."
   mkdir $BUILD_BASE
@@ -56,7 +57,7 @@ else
   cd ${BUILD_BASE}
   git clone https://github.com/llvm/llvm-project/
   cd llvm-project/
-  git checkout llvmorg-18-init-14420-gea3a3b25
+  git checkout llvmorg-21.1.0-rc3
 
   echo "Applying diffs to insert Fuzz Introspector plugin in the LLVM pipeline"
   $BASE/frontends/llvm/patch-llvm.sh

frontends/llvm/lib/Transforms/FuzzIntrospector/FuzzIntrospector.cpp

@@ -2260,7 +2260,8 @@ FuzzIntrospector::getBBDebugInfo(BasicBlock *BB, DILocation *PrevLoc) {
   BranchInst *CurrBI;
   Instruction *CurrTI, *CurrI;
   DILocation *CurrLoc;
-
+  /* TODO(David): Fix this for LLVM 21. Although I'm not 100% sure we still use this.*/
+/*
   // Traverse all dummy BBs associated with the previous Loc.
   do {
     CurrTI = CurrBB->getTerminator();
@@ -2281,7 +2282,7 @@ FuzzIntrospector::getBBDebugInfo(BasicBlock *BB, DILocation *PrevLoc) {
   }
   if (CurrI)
     Result = getInsnDebugInfo(CurrI);
-
+*/
   return Result;
 }
 

frontends/llvm/patch-llvm.sh

@@ -29,10 +29,13 @@ if [ -f ./llvm/lib/Transforms/IPO/PassManagerBuilder.cpp ]; then
     sed -i 's/MPM.addPass(CrossDSOCFIPass());/MPM.addPass(CrossDSOCFIPass());\n  MPM.addPass(FuzzIntrospectorPass());/g' ./llvm/lib/Passes/PassBuilderPipelines.cpp
     sed -i 's/MODULE_PASS("annotation2metadata", Annotation2MetadataPass())/MODULE_PASS("annotation2metadata", Annotation2MetadataPass())\nMODULE_PASS("fuzz-introspector", FuzzIntrospectorPass())/g' ./llvm/lib/Passes/PassRegistry.def
 else
-    echo "Applying llvm 18 pathes"
+    echo "Applying llvm 18 patches"
     echo "add_subdirectory(FuzzIntrospector)" >> ./llvm/lib/Transforms/CMakeLists.txt
     sed -i 's/Instrumentation/Instrumentation\n  FuzzIntrospector/g' ./llvm/lib/Transforms/IPO/CMakeLists.txt
 
+    #  This is for LLVM 21. Monitor if this affects more.
+    sed -i 's/LLVM_ABI void initializeMIRNamerPass/LLVM_ABI void initializeFuzzIntrospectorPass(PassRegistry \&);\nLLVM_ABI void initializeMIRNamerPass/g' llvm/include/llvm/InitializePasses.h
+
     sed -i 's/void initializeXRayInstrumentationPass(PassRegistry\&);/void initializeXRayInstrumentationPass(PassRegistry\&);\nvoid initializeFuzzIntrospectorPass(PassRegistry\&);/g' ./llvm/include/llvm/InitializePasses.h
     sed -i 's/#include "llvm\/Transforms\/Instrumentation\/ThreadSanitizer.h"/#include "llvm\/Transforms\/Instrumentation\/ThreadSanitizer.h"\n#include "llvm\/Transforms\/FuzzIntrospector\/FuzzIntrospector.h"/g' ./llvm/lib/Passes/PassBuilder.cpp
     sed -i 's/#include "llvm\/Transforms\/Instrumentation\/PGOInstrumentation.h"/#include "llvm\/Transforms\/Instrumentation\/PGOInstrumentation.h"\n#include "llvm\/Transforms\/FuzzIntrospector\/FuzzIntrospector.h"/g' ./llvm/lib/Passes/PassBuilderPipelines.cpp