RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-21 18:22:53 +01:00
Code Issues Projects Releases Wiki Activity

[DebugInfo] Add replaceArg function to simplify DBG_VALUE_LIST expressions

Browse Source 
The LiveDebugValues and LiveDebugVariables implementations for handling
DBG_VALUE_LIST instructions can be simplified significantly if they do not have
to deal with any duplicated operands, such as a DBG_VALUE_LIST that uses the
same register multiple times in its expression. This patch adds a function,
replaceArg, that can be used to simplify a DIExpression in the case of
duplicated operands.

Differential Revision: https://reviews.llvm.org/D83896
This commit is contained in:
gbtozers 2020-09-11 15:52:53 +01:00 committed by Stephen Tozer
parent 17152b7023
commit 3089bda8b6
3 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/llvm/IR/DebugInfoMetadata.h
View File

@ -2779,6 +2779,15 @@ public:
ArrayRef<uint64_t> Ops, unsigned ArgNo,
bool StackValue = false);
/// Create a copy of \p Expr with each instance of
/// `DW_OP_LLVM_arg, \p OldArg` replaced with `DW_OP_LLVM_arg, \p NewArg`,
/// and each instance of `DW_OP_LLVM_arg, Arg` with `DW_OP_LLVM_arg, Arg - 1`
/// for all Arg > \p OldArg.
/// This is used when replacing one of the operands of a debug value list
/// with another operand in the same list and deleting the old operand.
static DIExpression *replaceArg(const DIExpression *Expr, uint64_t OldArg,
uint64_t NewArg);
/// Create a DIExpression to describe one part of an aggregate variable that
/// is fragmented across multiple Values. The DW_OP_LLVM_fragment operation
/// will be appended to the elements of \c Expr. If \c Expr already contains

22
lib/IR/DebugInfoMetadata.cpp
View File

@ -1296,6 +1296,28 @@ DIExpression *DIExpression::appendOpsToArg(const DIExpression *Expr,
return DIExpression::get(Expr->getContext(), NewOps);
}
DIExpression *DIExpression::replaceArg(const DIExpression *Expr,
uint64_t OldArg, uint64_t NewArg) {
assert(Expr && "Can't replace args in this expression");
SmallVector<uint64_t, 8> NewOps;
for (auto Op : Expr->expr_ops()) {
if (Op.getOp() != dwarf::DW_OP_LLVM_arg || Op.getArg(0) < OldArg) {
Op.appendToVector(NewOps);
continue;
}
NewOps.push_back(dwarf::DW_OP_LLVM_arg);
uint64_t Arg = Op.getArg(0) == OldArg ? NewArg : Op.getArg(0);
// OldArg has been deleted from the Op list, so decrement all indices
// greater than it.
if (Arg > OldArg)
--Arg;
NewOps.push_back(Arg);
}
return DIExpression::get(Expr->getContext(), NewOps);
}
DIExpression *DIExpression::prependOpcodes(const DIExpression *Expr,
SmallVectorImpl<uint64_t> &Ops,
bool StackValue,

28
unittests/IR/MetadataTest.cpp
View File

@ -2866,6 +2866,34 @@ TEST_F(DIExpressionTest, createFragmentExpression) {
#undef EXPECT_INVALID_FRAGMENT
}
TEST_F(DIExpressionTest, replaceArg) {
#define EXPECT_REPLACE_ARG_EQ(Expr, OldArg, NewArg, ...) \
do { \
uint64_t Elements[] = {__VA_ARGS__}; \
ArrayRef<uint64_t> Expected = Elements; \
DIExpression *Expression = DIExpression::replaceArg(Expr, OldArg, NewArg); \
EXPECT_EQ(Expression->getElements(), Expected); \
} while (false)
auto N = DIExpression::get(
Context, {dwarf::DW_OP_LLVM_arg, 0, dwarf::DW_OP_LLVM_arg, 1,
dwarf::DW_OP_plus, dwarf::DW_OP_LLVM_arg, 2, dwarf::DW_OP_mul});
EXPECT_REPLACE_ARG_EQ(N, 0, 1, dwarf::DW_OP_LLVM_arg, 0,
dwarf::DW_OP_LLVM_arg, 0, dwarf::DW_OP_plus,
dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_mul);
EXPECT_REPLACE_ARG_EQ(N, 0, 2, dwarf::DW_OP_LLVM_arg, 1,
dwarf::DW_OP_LLVM_arg, 0, dwarf::DW_OP_plus,
dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_mul);
EXPECT_REPLACE_ARG_EQ(N, 2, 0, dwarf::DW_OP_LLVM_arg, 0,
dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_plus,
dwarf::DW_OP_LLVM_arg, 0, dwarf::DW_OP_mul);
EXPECT_REPLACE_ARG_EQ(N, 2, 1, dwarf::DW_OP_LLVM_arg, 0,
dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_plus,
dwarf::DW_OP_LLVM_arg, 1, dwarf::DW_OP_mul);
#undef EXPECT_REPLACE_ARG_EQ
}
typedef MetadataTest DIObjCPropertyTest;
TEST_F(DIObjCPropertyTest, get) {