Pull in r257977 from upstream llvm trunk, by Keno Fischer:
[DwarfDebug] Move MergeValues to .cpp, NFC Pull in r257979 from upstream llvm trunk, by Keno Fischer: [DwarfDebug] Don't merge DebugLocEntries if their pieces overlap Summary: Later in DWARF emission we check that DebugLocEntries have non-overlapping pieces, so we should create any such entries by merging here. Fixes PR26163. Reviewers: aprantl Differential Revision: http://reviews.llvm.org/D16249 Again, these will be merged to the official release_38 branch soon, but we need them ASAP.
This commit is contained in:
parent
cdd9644c82
commit
47d45e347a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/clang380-import/; revision=294179
@ -93,18 +93,7 @@ class DebugLocEntry {
|
||||
/// variable, merge them by appending Next's values to the current
|
||||
/// list of values.
|
||||
/// Return true if the merge was successful.
|
||||
bool MergeValues(const DebugLocEntry &Next) {
|
||||
if (Begin == Next.Begin) {
|
||||
auto *Expr = cast_or_null<DIExpression>(Values[0].Expression);
|
||||
auto *NextExpr = cast_or_null<DIExpression>(Next.Values[0].Expression);
|
||||
if (Expr->isBitPiece() && NextExpr->isBitPiece()) {
|
||||
addValues(Next.Values);
|
||||
End = Next.End;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
bool MergeValues(const DebugLocEntry &Next);
|
||||
|
||||
/// \brief Attempt to merge this DebugLocEntry with Next and return
|
||||
/// true if the merge was successful. Entries can be merged if they
|
||||
|
@ -805,6 +805,24 @@ static bool piecesOverlap(const DIExpression *P1, const DIExpression *P2) {
|
||||
return (l1 < r2) && (l2 < r1);
|
||||
}
|
||||
|
||||
/// \brief If this and Next are describing different pieces of the same
|
||||
/// variable, merge them by appending Next's values to the current
|
||||
/// list of values.
|
||||
/// Return true if the merge was successful.
|
||||
bool DebugLocEntry::MergeValues(const DebugLocEntry &Next) {
|
||||
if (Begin == Next.Begin) {
|
||||
auto *Expr = cast_or_null<DIExpression>(Values[0].Expression);
|
||||
auto *NextExpr = cast_or_null<DIExpression>(Next.Values[0].Expression);
|
||||
if (Expr->isBitPiece() && NextExpr->isBitPiece() &&
|
||||
!piecesOverlap(Expr, NextExpr)) {
|
||||
addValues(Next.Values);
|
||||
End = Next.End;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/// Build the location list for all DBG_VALUEs in the function that
|
||||
/// describe the same variable. If the ranges of several independent
|
||||
/// pieces of the same variable overlap partially, split them up and
|
||||
|
Loading…
Reference in New Issue
Block a user