From 36962f34f943b7cd41af89dabbbe8ad4ceb69d13 Mon Sep 17 00:00:00 2001 From: Jeremy Morse Date: Fri, 24 Jan 2025 08:18:23 +0000 Subject: [PATCH] [NFC][DebugInfo] Mop up final instruction-insertion call sites These are the final places in the monorepo that make use of instruction insertion for methods like insertBefore and moveBefore. As part of the RemoveDIs project, instead use iterators for insertion. --- llvm/lib/SandboxIR/Instruction.cpp | 2 +- llvm/lib/SandboxIR/Tracker.cpp | 4 ++-- .../LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/lib/SandboxIR/Instruction.cpp b/llvm/lib/SandboxIR/Instruction.cpp index cc961418600e3..956047cf87b6b 100644 --- a/llvm/lib/SandboxIR/Instruction.cpp +++ b/llvm/lib/SandboxIR/Instruction.cpp @@ -129,7 +129,7 @@ void Instruction::insertBefore(Instruction *BeforeI) { // Insert the LLVM IR Instructions in program order. for (llvm::Instruction *I : getLLVMInstrs()) - I->insertBefore(BeforeTopI); + I->insertBefore(BeforeTopI->getIterator()); } void Instruction::insertAfter(Instruction *AfterI) { diff --git a/llvm/lib/SandboxIR/Tracker.cpp b/llvm/lib/SandboxIR/Tracker.cpp index 27ed37aa9bdd3..5fa9f181055ca 100644 --- a/llvm/lib/SandboxIR/Tracker.cpp +++ b/llvm/lib/SandboxIR/Tracker.cpp @@ -175,7 +175,7 @@ void EraseFromParent::revert(Tracker &Tracker) { // Place the bottom-most instruction first. auto [Operands, BotLLVMI] = InstrData[0]; if (auto *NextLLVMI = dyn_cast(NextLLVMIOrBB)) { - BotLLVMI->insertBefore(NextLLVMI); + BotLLVMI->insertBefore(NextLLVMI->getIterator()); } else { auto *LLVMBB = cast(NextLLVMIOrBB); BotLLVMI->insertInto(LLVMBB, LLVMBB->end()); @@ -185,7 +185,7 @@ void EraseFromParent::revert(Tracker &Tracker) { // Go over the rest of the instructions and stack them on top. for (auto [Operands, LLVMI] : drop_begin(InstrData)) { - LLVMI->insertBefore(BotLLVMI); + LLVMI->insertBefore(BotLLVMI->getIterator()); for (auto [OpNum, Op] : enumerate(Operands)) LLVMI->setOperand(OpNum, Op); BotLLVMI = LLVMI; diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp index 3fcdefa8a2f67..eb873fd1b7f6f 100644 --- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp +++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp @@ -3828,7 +3828,7 @@ handleDeclareTargetMapVar(MapInfoData &mapData, if (insn->getFunction() == func) { auto *load = builder.CreateLoad(mapData.BasePointers[i]->getType(), mapData.BasePointers[i]); - load->moveBefore(insn); + load->moveBefore(insn->getIterator()); user->replaceUsesOfWith(mapData.OriginalValue[i], load); } }