diff options
| author | Vedant Kumar <vsk@apple.com> | 2019-11-19 11:58:14 -0800 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2019-11-19 12:03:52 -0800 |
| commit | ba71ca37208faf0916b4cae4298789796b791cfe (patch) | |
| tree | 0675663a7963fab9717de416a794db48bb9d1183 | |
| parent | 3279724905c14a8db383ade53af40a0dd49504d8 (diff) | |
| download | bcm5719-llvm-ba71ca37208faf0916b4cae4298789796b791cfe.tar.gz bcm5719-llvm-ba71ca37208faf0916b4cae4298789796b791cfe.zip | |
[DebugInfo] Describe size of spilled values in call site params
A call site parameter description of a memory operand needs to
unambiguously convey the size of the operand to prevent incorrect entry
value evaluation.
Thanks for David Stenberg for pointing this issue out!
| -rw-r--r-- | llvm/lib/CodeGen/TargetInstrInfo.cpp | 6 | ||||
| -rw-r--r-- | llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/TargetInstrInfo.cpp b/llvm/lib/CodeGen/TargetInstrInfo.cpp index 2b987dabd24..d7a02eb61a2 100644 --- a/llvm/lib/CodeGen/TargetInstrInfo.cpp +++ b/llvm/lib/CodeGen/TargetInstrInfo.cpp @@ -1150,7 +1150,11 @@ TargetInstrInfo::describeLoadedValue(const MachineInstr &MI) const { if (!TII->getMemOperandWithOffset(MI, BaseOp, Offset, TRI)) return None; - Expr = DIExpression::prepend(Expr, DIExpression::DerefAfter, Offset); + SmallVector<uint64_t, 8> Ops; + DIExpression::appendOffset(Ops, Offset); + Ops.push_back(dwarf::DW_OP_deref_size); + Ops.push_back(MMO->getSize()); + Expr = DIExpression::prependOpcodes(Expr, Ops); return ParamLoadedValue(*BaseOp, Expr); } diff --git a/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir b/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir index 26ea062c499..373b484850a 100644 --- a/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir +++ b/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir @@ -22,7 +22,7 @@ # CHECK-LABEL: DW_TAG_call_site_parameter # CHECK-NEXT: DW_AT_location (DW_OP_reg5 RDI) -# CHECK-NEXT: DW_AT_call_value (DW_OP_fbreg -44, DW_OP_deref) +# CHECK-NEXT: DW_AT_call_value (DW_OP_fbreg -44, DW_OP_deref_size 0x4) --- | ; ModuleID = 'spill.cc' |
