Skip to content

[IRGenDebugInfo] Replace llvm.dbg.coroframe_entry with dbg.declare_value #85796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adrian-prantl merged 1 commit into from
Dec 3, 2025
Merged

[IRGenDebugInfo] Replace llvm.dbg.coroframe_entry with dbg.declare_value #85796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions lib/IRGen/IRGenDebugInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3775,7 +3775,7 @@ struct DbgIntrinsicEmitter {
PointerUnion<llvm::BasicBlock *, llvm::Instruction *> InsertPt;
irgen::IRBuilder &IRBuilder;
llvm::DIBuilder &DIBuilder;
AddrDbgInstrKind ForceDbgDeclareOrCoro;
AddrDbgInstrKind ForceDbgDeclareOrDeclareValue;

/// Initialize the emitter and initialize the emitter to assume that it is
/// going to insert an llvm.dbg.declare or an llvm.dbg.addr either at the
Expand All @@ -3784,7 +3784,7 @@ struct DbgIntrinsicEmitter {
DbgIntrinsicEmitter(irgen::IRBuilder &IRBuilder, llvm::DIBuilder &DIBuilder,
AddrDbgInstrKind AddrDInstrKind)
: InsertPt(), IRBuilder(IRBuilder), DIBuilder(DIBuilder),
ForceDbgDeclareOrCoro(AddrDInstrKind) {
ForceDbgDeclareOrDeclareValue(AddrDInstrKind) {
auto *ParentBB = IRBuilder.GetInsertBlock();
auto InsertBefore = IRBuilder.GetInsertPoint();

Expand All @@ -3811,13 +3811,13 @@ struct DbgIntrinsicEmitter {
llvm::DIExpression *Expr,
const llvm::DILocation *DL,
llvm::Instruction *InsertBefore) {
if (ForceDbgDeclareOrCoro == AddrDbgInstrKind::DbgDeclare)
if (ForceDbgDeclareOrDeclareValue == AddrDbgInstrKind::DbgDeclare)
return DIBuilder.insertDeclare(Addr, VarInfo, Expr, DL,
InsertBefore->getIterator());

if (ForceDbgDeclareOrCoro == AddrDbgInstrKind::DbgCoroFrameEntry)
return DIBuilder.insertCoroFrameEntry(Addr, VarInfo, Expr, DL,
InsertBefore->getIterator());
if (ForceDbgDeclareOrDeclareValue == AddrDbgInstrKind::DbgDeclareValue)
return DIBuilder.insertDeclareValue(Addr, VarInfo, Expr, DL,
InsertBefore->getIterator());

Expr = llvm::DIExpression::append(Expr, llvm::dwarf::DW_OP_deref);
return DIBuilder.insertDbgValueIntrinsic(Addr, VarInfo, Expr, DL,
Expand All @@ -3828,11 +3828,11 @@ struct DbgIntrinsicEmitter {
llvm::DIExpression *Expr,
const llvm::DILocation *DL,
llvm::BasicBlock *Block) {
if (ForceDbgDeclareOrCoro == AddrDbgInstrKind::DbgDeclare)
if (ForceDbgDeclareOrDeclareValue == AddrDbgInstrKind::DbgDeclare)
return DIBuilder.insertDeclare(Addr, VarInfo, Expr, DL, Block);

if (ForceDbgDeclareOrCoro == AddrDbgInstrKind::DbgCoroFrameEntry)
return DIBuilder.insertCoroFrameEntry(Addr, VarInfo, Expr, DL, Block);
if (ForceDbgDeclareOrDeclareValue == AddrDbgInstrKind::DbgDeclareValue)
return DIBuilder.insertDeclareValue(Addr, VarInfo, Expr, DL, Block);

Expr = llvm::DIExpression::append(Expr, llvm::dwarf::DW_OP_deref);
return DIBuilder.insertDbgValueIntrinsic(Addr, VarInfo, Expr, DL, Block);
Expand Down Expand Up @@ -3894,7 +3894,7 @@ void IRGenDebugInfoImpl::emitDbgIntrinsic(
AddrDInstKind = AddrDbgInstrKind::DbgValueDeref;

if (InCoroContext && AddrDInstKind != AddrDbgInstrKind::DbgValueDeref)
AddrDInstKind = AddrDbgInstrKind::DbgCoroFrameEntry;
AddrDInstKind = AddrDbgInstrKind::DbgDeclareValue;

DbgIntrinsicEmitter inserter{Builder, DBuilder, AddrDInstKind};

Expand All @@ -3903,7 +3903,7 @@ void IRGenDebugInfoImpl::emitDbgIntrinsic(
auto InsertBefore = Builder.GetInsertPoint();

if (AddrDInstKind == AddrDbgInstrKind::DbgDeclare ||
AddrDInstKind == AddrDbgInstrKind::DbgCoroFrameEntry) {
AddrDInstKind == AddrDbgInstrKind::DbgDeclareValue) {
ParentBlock = Alloca->getParent();
InsertBefore = std::next(Alloca->getIterator());
}
Expand Down Expand Up @@ -3931,7 +3931,7 @@ void IRGenDebugInfoImpl::emitDbgIntrinsic(
// in the coroutine context by creating a llvm.dbg.declare for the variable
// in the entry block of each funclet.
if (AddrDInstKind == AddrDbgInstrKind::DbgDeclare ||
AddrDInstKind == AddrDbgInstrKind::DbgCoroFrameEntry) {
AddrDInstKind == AddrDbgInstrKind::DbgDeclareValue) {
// Function arguments in async functions are emitted without a shadow copy
// (that would interfere with coroutine splitting) but with a
// llvm.dbg.declare to give CoroSplit.cpp license to emit a shadow copy
Expand Down
2 changes: 1 addition & 1 deletion lib/IRGen/IRGenDebugInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ enum ArtificialKind : bool { RealValue = false, ArtificialValue = true };
enum class AddrDbgInstrKind : uint8_t {
DbgDeclare,
DbgValueDeref,
DbgCoroFrameEntry,
DbgDeclareValue,
};

/// Helper object that keeps track of the current CompileUnit, File,
Expand Down