From b8220b986dcc8c5d0c44a125642009d8175fc11d Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Sat, 20 Jul 2024 21:27:36 -0700 Subject: [PATCH] [MC] Remove unused bool arguments from createMCObjectStreamer callers --- clang/tools/driver/cc1as_main.cpp | 4 +--- llvm/lib/CodeGen/LLVMTargetMachine.cpp | 11 +++++------ llvm/lib/DWARFLinker/Classic/DWARFStreamer.cpp | 3 +-- llvm/lib/DWARFLinker/Parallel/DWARFEmitterImpl.cpp | 3 +-- llvm/tools/llvm-dwp/llvm-dwp.cpp | 5 ++--- .../llvm-mc-assemble-fuzzer.cpp | 5 ++--- llvm/tools/llvm-mc/llvm-mc.cpp | 4 +--- llvm/tools/llvm-ml/llvm-ml.cpp | 5 ++--- .../DebugInfo/DWARF/DWARFExpressionCopyBytesTest.cpp | 5 +---- llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp | 3 +-- llvm/unittests/MC/DwarfLineTableHeaders.cpp | 5 +---- mlir/lib/Target/LLVM/ROCDL/Target.cpp | 3 +-- 12 files changed, 19 insertions(+), 37 deletions(-) diff --git a/clang/tools/driver/cc1as_main.cpp b/clang/tools/driver/cc1as_main.cpp index ec93f092713f..2d5acbecb123 100644 --- a/clang/tools/driver/cc1as_main.cpp +++ b/clang/tools/driver/cc1as_main.cpp @@ -571,9 +571,7 @@ static bool ExecuteAssemblerImpl(AssemblerInvocation &Opts, Triple T(Opts.Triple); Str.reset(TheTarget->createMCObjectStreamer( - T, Ctx, std::move(MAB), std::move(OW), std::move(CE), *STI, - Opts.RelaxAll, Opts.IncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd*/ true)); + T, Ctx, std::move(MAB), std::move(OW), std::move(CE), *STI)); Str.get()->initSections(Opts.NoExecStack, *STI); } diff --git a/llvm/lib/CodeGen/LLVMTargetMachine.cpp b/llvm/lib/CodeGen/LLVMTargetMachine.cpp index 3092177e37e9..562821df0665 100644 --- a/llvm/lib/CodeGen/LLVMTargetMachine.cpp +++ b/llvm/lib/CodeGen/LLVMTargetMachine.cpp @@ -208,8 +208,7 @@ Expected> LLVMTargetMachine::createMCStreamer( T, Context, std::unique_ptr(MAB), DwoOut ? MAB->createDwoObjectWriter(Out, *DwoOut) : MAB->createObjectWriter(Out), - std::unique_ptr(MCE), STI, /*ignore=*/false, false, - false)); + std::unique_ptr(MCE), STI)); break; } case CodeGenFileType::Null: @@ -275,15 +274,15 @@ bool LLVMTargetMachine::addPassesToEmitMC(PassManagerBase &PM, MCContext *&Ctx, const MCRegisterInfo &MRI = *getMCRegisterInfo(); std::unique_ptr MCE( getTarget().createMCCodeEmitter(*getMCInstrInfo(), *Ctx)); - std::unique_ptr MAB( - getTarget().createMCAsmBackend(STI, MRI, Options.MCOptions)); + MCAsmBackend *MAB = + getTarget().createMCAsmBackend(STI, MRI, Options.MCOptions); if (!MCE || !MAB) return true; const Triple &T = getTargetTriple(); std::unique_ptr AsmStreamer(getTarget().createMCObjectStreamer( - T, *Ctx, std::move(MAB), MAB->createObjectWriter(Out), std::move(MCE), - STI, /*ignore=*/false, false, false)); + T, *Ctx, std::unique_ptr(MAB), MAB->createObjectWriter(Out), + std::move(MCE), STI)); // Create the AsmPrinter, which takes ownership of AsmStreamer if successful. FunctionPass *Printer = diff --git a/llvm/lib/DWARFLinker/Classic/DWARFStreamer.cpp b/llvm/lib/DWARFLinker/Classic/DWARFStreamer.cpp index 74df2eb9d68a..55a0ee81ad4b 100644 --- a/llvm/lib/DWARFLinker/Classic/DWARFStreamer.cpp +++ b/llvm/lib/DWARFLinker/Classic/DWARFStreamer.cpp @@ -110,8 +110,7 @@ Error DwarfStreamer::init(Triple TheTriple, MS = TheTarget->createMCObjectStreamer( TheTriple, *MC, std::unique_ptr(MAB), MAB->createObjectWriter(OutFile), std::unique_ptr(MCE), - *MSTI, MCOptions.MCRelaxAll, MCOptions.MCIncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd*/ false); + *MSTI); break; } } diff --git a/llvm/lib/DWARFLinker/Parallel/DWARFEmitterImpl.cpp b/llvm/lib/DWARFLinker/Parallel/DWARFEmitterImpl.cpp index b9edcb63a340..dd379de68e4c 100644 --- a/llvm/lib/DWARFLinker/Parallel/DWARFEmitterImpl.cpp +++ b/llvm/lib/DWARFLinker/Parallel/DWARFEmitterImpl.cpp @@ -89,8 +89,7 @@ Error DwarfEmitterImpl::init(Triple TheTriple, MS = TheTarget->createMCObjectStreamer( TheTriple, *MC, std::unique_ptr(MAB), MAB->createObjectWriter(OutFile), std::unique_ptr(MCE), - *MSTI, MCOptions.MCRelaxAll, MCOptions.MCIncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd*/ false); + *MSTI); break; } } diff --git a/llvm/tools/llvm-dwp/llvm-dwp.cpp b/llvm/tools/llvm-dwp/llvm-dwp.cpp index 18f4f1a0eb9f..60a89cb13c57 100644 --- a/llvm/tools/llvm-dwp/llvm-dwp.cpp +++ b/llvm/tools/llvm-dwp/llvm-dwp.cpp @@ -266,9 +266,8 @@ int llvm_dwp_main(int argc, char **argv, const llvm::ToolContext &) { std::unique_ptr MS(TheTarget->createMCObjectStreamer( *ErrOrTriple, MC, std::unique_ptr(MAB), - MAB->createObjectWriter(*OS), std::unique_ptr(MCE), *MSTI, - MCOptions.MCRelaxAll, MCOptions.MCIncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd*/ false)); + MAB->createObjectWriter(*OS), std::unique_ptr(MCE), + *MSTI)); if (!MS) return error("no object streamer for target " + TripleName, Context); diff --git a/llvm/tools/llvm-mc-assemble-fuzzer/llvm-mc-assemble-fuzzer.cpp b/llvm/tools/llvm-mc-assemble-fuzzer/llvm-mc-assemble-fuzzer.cpp index 6ec19a367d58..ef9d0f37198a 100644 --- a/llvm/tools/llvm-mc-assemble-fuzzer/llvm-mc-assemble-fuzzer.cpp +++ b/llvm/tools/llvm-mc-assemble-fuzzer/llvm-mc-assemble-fuzzer.cpp @@ -233,9 +233,8 @@ int AssembleOneInput(const uint8_t *Data, size_t Size) { MCAsmBackend *MAB = TheTarget->createMCAsmBackend(*STI, *MRI, MCOptions); Str.reset(TheTarget->createMCObjectStreamer( TheTriple, Ctx, std::unique_ptr(MAB), - MAB->createObjectWriter(*OS), std::unique_ptr(CE), *STI, - MCOptions.MCRelaxAll, MCOptions.MCIncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd*/ false)); + MAB->createObjectWriter(*OS), std::unique_ptr(CE), + *STI)); } const int Res = AssembleInput(ProgName, TheTarget, SrcMgr, Ctx, *Str, *MAI, *STI, *MCII, MCOptions); diff --git a/llvm/tools/llvm-mc/llvm-mc.cpp b/llvm/tools/llvm-mc/llvm-mc.cpp index de999a48d575..c46e4f087d42 100644 --- a/llvm/tools/llvm-mc/llvm-mc.cpp +++ b/llvm/tools/llvm-mc/llvm-mc.cpp @@ -555,9 +555,7 @@ int main(int argc, char **argv) { TheTriple, Ctx, std::unique_ptr(MAB), DwoOut ? MAB->createDwoObjectWriter(*OS, DwoOut->os()) : MAB->createObjectWriter(*OS), - std::unique_ptr(CE), *STI, MCOptions.MCRelaxAll, - MCOptions.MCIncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd*/ false)); + std::unique_ptr(CE), *STI)); if (NoExecStack) Str->initSections(true, *STI); } diff --git a/llvm/tools/llvm-ml/llvm-ml.cpp b/llvm/tools/llvm-ml/llvm-ml.cpp index 24643bd4296b..829347dafee9 100644 --- a/llvm/tools/llvm-ml/llvm-ml.cpp +++ b/llvm/tools/llvm-ml/llvm-ml.cpp @@ -402,9 +402,8 @@ int llvm_ml_main(int Argc, char **Argv, const llvm::ToolContext &) { MCAsmBackend *MAB = TheTarget->createMCAsmBackend(*STI, *MRI, MCOptions); Str.reset(TheTarget->createMCObjectStreamer( TheTriple, Ctx, std::unique_ptr(MAB), - MAB->createObjectWriter(*OS), std::unique_ptr(CE), *STI, - MCOptions.MCRelaxAll, MCOptions.MCIncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd*/ false)); + MAB->createObjectWriter(*OS), std::unique_ptr(CE), + *STI)); } else { llvm_unreachable("Invalid file type!"); } diff --git a/llvm/unittests/DebugInfo/DWARF/DWARFExpressionCopyBytesTest.cpp b/llvm/unittests/DebugInfo/DWARF/DWARFExpressionCopyBytesTest.cpp index 43fdf5d3d6f3..ec9c0dddcbc0 100644 --- a/llvm/unittests/DebugInfo/DWARF/DWARFExpressionCopyBytesTest.cpp +++ b/llvm/unittests/DebugInfo/DWARF/DWARFExpressionCopyBytesTest.cpp @@ -112,10 +112,7 @@ DWARFExpressionCopyBytesTest::createStreamer(raw_pwrite_stream &OS) { std::unique_ptr OW = MAB->createObjectWriter(OS); Res.Streamer.reset(TheTarget->createMCObjectStreamer( Triple(TripleName), *Res.Ctx, std::unique_ptr(MAB), - std::move(OW), std::unique_ptr(MCE), *STI, - /* RelaxAll */ false, - /* IncrementalLinkerCompatible */ false, - /* DWARFMustBeAtTheEnd */ false)); + std::move(OW), std::unique_ptr(MCE), *STI)); return Res; } diff --git a/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp b/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp index ad5e51b7efb8..2cbd4cc55df9 100644 --- a/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp +++ b/llvm/unittests/DebugInfo/DWARF/DwarfGenerator.cpp @@ -503,8 +503,7 @@ llvm::Error dwarfgen::Generator::init(Triple TheTriple, uint16_t V) { MS = TheTarget->createMCObjectStreamer( TheTriple, *MC, std::unique_ptr(MAB), MAB->createObjectWriter(*Stream), std::unique_ptr(MCE), - *MSTI, MCOptions.MCRelaxAll, MCOptions.MCIncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd*/ false); + *MSTI); if (!MS) return make_error("no object streamer for target " + TripleName, diff --git a/llvm/unittests/MC/DwarfLineTableHeaders.cpp b/llvm/unittests/MC/DwarfLineTableHeaders.cpp index d8a657ed5048..1fad1ba6ce63 100644 --- a/llvm/unittests/MC/DwarfLineTableHeaders.cpp +++ b/llvm/unittests/MC/DwarfLineTableHeaders.cpp @@ -83,10 +83,7 @@ public: std::unique_ptr OW = MAB->createObjectWriter(OS); Res.Streamer.reset(TheTarget->createMCObjectStreamer( Triple(TripleName), *Res.Ctx, std::unique_ptr(MAB), - std::move(OW), std::unique_ptr(MCE), *STI, - /* RelaxAll */ false, - /* IncrementalLinkerCompatible */ false, - /* DWARFMustBeAtTheEnd */ false)); + std::move(OW), std::unique_ptr(MCE), *STI)); return Res; } diff --git a/mlir/lib/Target/LLVM/ROCDL/Target.cpp b/mlir/lib/Target/LLVM/ROCDL/Target.cpp index 70d6bcd76285..4d23f987eb05 100644 --- a/mlir/lib/Target/LLVM/ROCDL/Target.cpp +++ b/mlir/lib/Target/LLVM/ROCDL/Target.cpp @@ -324,8 +324,7 @@ SerializeGPUModuleBase::assembleIsa(StringRef isa) { mcStreamer.reset(target->createMCObjectStreamer( triple, ctx, std::unique_ptr(mab), mab->createObjectWriter(os), std::unique_ptr(ce), - *sti, mcOptions.MCRelaxAll, mcOptions.MCIncrementalLinkerCompatible, - /*DWARFMustBeAtTheEnd*/ false)); + *sti)); std::unique_ptr parser( createMCAsmParser(srcMgr, ctx, *mcStreamer, *mai));