Adapt to llvm/llvm-project@f6b0555

Author: Zentrik

src/disasm.cpp

@@ -99,7 +99,6 @@
 // for outputting assembly
 #include <llvm/CodeGen/AsmPrinter.h>
 #include <llvm/CodeGen/AsmPrinterHandler.h>
-#include <llvm/CodeGen/DebugHandlerBase.h>
 #include <llvm/CodeGen/MachineModuleInfo.h>
 #include <llvm/CodeGen/Passes.h>
 #include <llvm/CodeGen/TargetPassConfig.h>
@@ -1154,11 +1153,7 @@ addPassesToGenerateCode(LLVMTargetMachine *TM, PassManagerBase &PM) {
     return &MMIWP->getMMI().getContext();
 }
 
-#if JL_LLVM_VERSION >= 190000
-class LineNumberPrinterHandler : public DebugHandlerBase {
-#else
 class LineNumberPrinterHandler : public AsmPrinterHandler {
-#endif
     MCStreamer &S;
     LineNumberAnnotatedWriter LinePrinter;
     std::string Buffer;
@@ -1167,11 +1162,7 @@ class LineNumberPrinterHandler : public AsmPrinterHandler {
 
 public:
     LineNumberPrinterHandler(AsmPrinter &Printer, const char *debuginfo)
-        :
-#if JL_LLVM_VERSION >= 190000
-          DebugHandlerBase(&Printer),
-#endif
-          S(*Printer.OutStreamer),
+        : S(*Printer.OutStreamer),
           LinePrinter("; ", true, debuginfo),
           RawStream(Buffer),
           Stream(RawStream) {}
@@ -1190,20 +1181,12 @@ class LineNumberPrinterHandler : public AsmPrinterHandler {
     //virtual void beginModule(Module *M) override {}
     virtual void endModule() override {}
     /// note that some AsmPrinter implementations may not call beginFunction at all
-#if JL_LLVM_VERSION >= 190000
-    virtual void beginFunctionImpl(const MachineFunction *MF) override {
-#else
     virtual void beginFunction(const MachineFunction *MF) override {
-#endif
         LinePrinter.emitFunctionAnnot(&MF->getFunction(), Stream);
         emitAndReset();
     }
     //virtual void markFunctionEnd() override {}
-#if JL_LLVM_VERSION >= 190000
-    virtual void endFunctionImpl(const MachineFunction *MF) override {
-#else
     virtual void endFunction(const MachineFunction *MF) override {
-#endif
         LinePrinter.emitEnd(Stream);
         emitAndReset();
     }
@@ -1293,7 +1276,7 @@ jl_value_t *jl_dump_function_asm_impl(jl_llvmf_dump_t* dump, char emit_mc, const
                     ));
             AsmPrinter *Printer = TM->getTarget().createAsmPrinter(*TM, std::move(S));
 #if JL_LLVM_VERSION >= 190000
-            Printer->addDebugHandler(
+            Printer->addAsmPrinterHandler(
                         std::make_unique<LineNumberPrinterHandler>(*Printer, debuginfo));
 #else
             Printer->addAsmPrinterHandler(AsmPrinter::HandlerInfo(