Skip to content

Correctly wrap/unwrap DebugLocalVariable ArgNumber in OpConstant #3769

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

Open
AdamBrouwersHarries wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −6
Open

Correctly wrap/unwrap DebugLocalVariable ArgNumber in OpConstant #3769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ebd698
Correctly wrap/unwrap DebugLocalVariable ArgNumber in OpConstant
AdamBrouwersHarries Jun 1, 2026
43e474c
Clang format
AdamBrouwersHarries Jun 2, 2026
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
7 changes: 5 additions & 2 deletions lib/SPIRV/LLVMToSPIRVDbgTran.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,10 +1605,13 @@ LLVMToSPIRVDbgTran::transDbgLocalVariable(const DILocalVariable *Var) {
Ops[ColumnIdx] = 0; // This version of DILocalVariable has no column number
Ops[ParentIdx] = getScope(Var->getScope())->getId();
Ops[FlagsIdx] = transDebugFlags(Var);
if (SPIRVWord ArgNumber = Var->getArg())
std::vector<SPIRVWord> ConstantArgs = {LineIdx, ColumnIdx, FlagsIdx};
if (SPIRVWord ArgNumber = Var->getArg()) {
Ops.push_back(ArgNumber);
ConstantArgs.push_back(ArgNumberIdx);
}
if (isNonSemanticDebugInfo())
transformToConstant(Ops, {LineIdx, ColumnIdx, FlagsIdx});
transformToConstant(Ops, ConstantArgs);
return BM->addDebugInfo(SPIRVDebug::LocalVariable, getVoidTy(), Ops);
}

Expand Down
10 changes: 6 additions & 4 deletions lib/SPIRV/SPIRVToLLVMDbgTran.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,9 +1203,12 @@ DINode *SPIRVToLLVMDbgTran::transLocalVariable(const SPIRVExtInst *DebugInst) {
if (SPIRVFlags & SPIRVDebug::FlagIsObjectPointer)
Flags |= DINode::FlagObjectPointer;

if (Ops.size() > ArgNumberIdx)
if (Ops.size() > ArgNumberIdx) {
SPIRVWord ArgNo = getConstantValueOrLiteral(Ops, ArgNumberIdx,
DebugInst->getExtSetKind());
return getDIBuilder(DebugInst).createParameterVariable(
Scope, Name, Ops[ArgNumberIdx], File, LineNo, Ty, true, Flags);
Scope, Name, ArgNo, File, LineNo, Ty, true, Flags);
}
return getDIBuilder(DebugInst).createAutoVariable(Scope, Name, File, LineNo,
Ty, true, Flags);
}
Expand Down Expand Up @@ -1682,8 +1685,7 @@ SPIRVToLLVMDbgTran::transDebugIntrinsic(const SPIRVExtInst *DebugInst,
return DbgDeclare;
}
return DIB.insertDeclare(GetValue(Ops[VariableIdx]), LocalVar.first,
GetExpression(Ops[ExpressionIdx]), Loc,
BB);
GetExpression(Ops[ExpressionIdx]), Loc, BB);
}
case SPIRVDebug::Value: {
using namespace SPIRVDebug::Operand::DebugValue;
Expand Down
Loading