Revert "[DebugInfo] Delete a now-unused function after 5328c73"

ronlieb · ronlieb · commit 8c7c451ad13f · 2025-07-16T17:59:42.000-05:00
This reverts commit 7eb65f4.
diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp
@@ -1695,7 +1695,6 @@ static void insertDbgValueOrDbgVariableRecord(DIBuilder &Builder, Value *DV,
   Instr->getParent()->insertDbgRecordBefore(DVRec, Instr);
 }
 
-<<<<<<< HEAD
 static void insertDbgValueOrDbgVariableRecordAfter(
     DIBuilder &Builder, Value *DV, DILocalVariable *DIVar, DIExpression *DIExpr,
     const DebugLoc &NewLoc, Instruction *Instr) {
@@ -1793,8 +1792,6 @@ void llvm::ConvertDebugDeclareToDebugValue(DbgVariableIntrinsic *DII,
                                     SI->getIterator());
 }
 
-=======
->>>>>>> 7eb65f470c5e
 static DIExpression *dropInitialDeref(const DIExpression *DIExpr) {
   int NumEltDropped = DIExpr->getElements()[0] == dwarf::DW_OP_LLVM_arg ? 3 : 1;
   return DIExpression::get(DIExpr->getContext(),

Original file line number	Diff line number	Diff line change
`@@ -1695,7 +1695,6 @@ static void insertDbgValueOrDbgVariableRecord(DIBuilder &Builder, Value *DV,`
`1695`	`1695`	`Instr->getParent()->insertDbgRecordBefore(DVRec, Instr);`
`1696`	`1696`	`}`
`1697`	`1697`
`1698`		`-<<<<<<< HEAD`
`1699`	`1698`	`static void insertDbgValueOrDbgVariableRecordAfter(`
`1700`	`1699`	`DIBuilder &Builder, Value DV, DILocalVariable DIVar, DIExpression *DIExpr,`
`1701`	`1700`	`const DebugLoc &NewLoc, Instruction *Instr) {`
`@@ -1793,8 +1792,6 @@ void llvm::ConvertDebugDeclareToDebugValue(DbgVariableIntrinsic *DII,`
`1793`	`1792`	`SI->getIterator());`
`1794`	`1793`	`}`
`1795`	`1794`
`1796`		`-=======`
`1797`		`->>>>>>> 7eb65f470c5e`
`1798`	`1795`	`static DIExpression dropInitialDeref(const DIExpression DIExpr) {`
`1799`	`1796`	`int NumEltDropped = DIExpr->getElements()[0] == dwarf::DW_OP_LLVM_arg ? 3 : 1;`
`1800`	`1797`	`return DIExpression::get(DIExpr->getContext(),`