diff options
| author | Stephen Tozer <Stephen.Tozer@Sony.com> | 2021-03-10 14:34:47 +0000 |
|---|---|---|
| committer | Stephen Tozer <Stephen.Tozer@Sony.com> | 2021-03-10 14:35:33 +0000 |
| commit | 429c6ecbb302e2beedd8694378ae5be456206209 (patch) | |
| tree | 341db82f5c1c4c31d58e75fba3e0866b0729aebd /llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp | |
| parent | 6e92f468c82bac06051675fa94f72ca2789d2bc0 (diff) | |
| download | llvm-429c6ecbb302e2beedd8694378ae5be456206209.zip llvm-429c6ecbb302e2beedd8694378ae5be456206209.tar.gz llvm-429c6ecbb302e2beedd8694378ae5be456206209.tar.bz2 | |
Revert "[DebugInfo] Add DWARF emission for DBG_VALUE_LIST"
This reverts commit 0da27ba56c9f5e3f534a65401962301189eac342.
This revision was causing an error on the sanitizer-x86_64-linux-autoconf build.
Diffstat (limited to 'llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp b/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp index b9a9e1c..68a4bfb 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DebugHandlerBase.cpp @@ -35,8 +35,7 @@ Optional<DbgVariableLocation> DbgVariableLocation::extractFromMachineInstruction( const MachineInstr &Instruction) { DbgVariableLocation Location; - // Variables calculated from multiple locations can't be represented here. - if (Instruction.getNumDebugOperands() != 1) + if (!Instruction.isDebugValue()) return None; if (!Instruction.getDebugOperand(0).isReg()) return None; @@ -47,15 +46,6 @@ DbgVariableLocation::extractFromMachineInstruction( int64_t Offset = 0; const DIExpression *DIExpr = Instruction.getDebugExpression(); auto Op = DIExpr->expr_op_begin(); - // We can handle a DBG_VALUE_LIST iff it has exactly one location operand that - // appears exactly once at the start of the expression. - if (Instruction.isDebugValueList()) { - if (Instruction.getNumDebugOperands() == 1 && - Op->getOp() == dwarf::DW_OP_LLVM_arg) - ++Op; - else - return None; - } while (Op != DIExpr->expr_op_end()) { switch (Op->getOp()) { case dwarf::DW_OP_constu: { @@ -271,8 +261,7 @@ void DebugHandlerBase::beginFunction(const MachineFunction *MF) { continue; auto IsDescribedByReg = [](const MachineInstr *MI) { - return any_of(MI->debug_operands(), - [](auto &MO) { return MO.isReg() && MO.getReg(); }); + return MI->getDebugOperand(0).isReg() && MI->getDebugOperand(0).getReg(); }; // The first mention of a function argument gets the CurrentFnBegin label, |