maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

DebugInfo: Stop modifying Operation::Error inside of verify() 

The only caller of Operation::verify() is DWARFExpression::verify(),
which iterates past the (ephemeral) Operation immediately after.

- Stop setting Operation::Error because the mutation will never be
  observed.
- Change verify() to a static function to be sure all callers are
  updated.

Differential Revision: https://reviews.llvm.org/D113957
This commit is contained in:
Duncan P. N. Exon Smith 2021-11-15 17:15:41 -08:00
parent 5ed404a4ab
commit a0f1f17131
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/DebugInfo/DWARF/DWARFExpression.h
View File

@ -97,7 +97,9 @@ public:
bool print(raw_ostream &OS, DIDumpOptions DumpOpts,
const DWARFExpression *Expr, const MCRegisterInfo *RegInfo,
DWARFUnit *U, bool isEH) const;
bool verify(DWARFUnit *U);
/// Verify \p Op. Does not affect the return of \a isError().
static bool verify(const Operation &Op, DWARFUnit *U);
private:
bool extract(DataExtractor Data, uint8_t AddressSize, uint64_t Offset,

15
llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp
View File

@ -357,10 +357,9 @@ void DWARFExpression::print(raw_ostream &OS, DIDumpOptions DumpOpts,
}
}
bool DWARFExpression::Operation::verify(DWARFUnit *U) {
bool DWARFExpression::Operation::verify(const Operation &Op, DWARFUnit *U) {
for (unsigned Operand = 0; Operand < 2; ++Operand) {
unsigned Size = Desc.Op[Operand];
unsigned Size = Op.Desc.Op[Operand];
if (Size == Operation::SizeNA)
break;
@ -370,13 +369,11 @@ bool DWARFExpression::Operation::verify(DWARFUnit *U) {
// the generic type should be done, so don't look up a base type in that
// case. The same holds for DW_OP_reinterpret, which is currently not
// supported.
if (Opcode == DW_OP_convert && Operands[Operand] == 0)
if (Op.Opcode == DW_OP_convert && Op.Operands[Operand] == 0)
continue;
auto Die = U->getDIEForOffset(U->getOffset() + Operands[Operand]);
if (!Die || Die.getTag() != dwarf::DW_TAG_base_type) {
Error = true;
auto Die = U->getDIEForOffset(U->getOffset() + Op.Operands[Operand]);
if (!Die || Die.getTag() != dwarf::DW_TAG_base_type)
return false;
}
}
}
@ -385,7 +382,7 @@ bool DWARFExpression::Operation::verify(DWARFUnit *U) {
bool DWARFExpression::verify(DWARFUnit *U) {
for (auto &Op : *this)
if (!Op.verify(U))
if (!Operation::verify(Op, U))
return false;
return true;