RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-02-03 11:08:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Debug Info: Move the sorting and uniqueing of pieces from emitLocPieces()

Browse Source 
into buildLocationList(). By keeping the list of Values sorted,
DebugLocEntry::Merge can also merge multi-piece entries.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215384 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Adrian Prantl 2014-08-11 21:05:55 +00:00
parent 0ca6b9f076
commit b89cf2aa6e
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/CodeGen/AsmPrinter/DebugLocEntry.h
View File

@ -76,6 +76,13 @@ public:
llvm_unreachable("unhandled EntryKind");
}
// Compare two pieces based on their offset.
bool operator<(const Value &other) const {
DIVariable Var(Variable);
DIVariable OtherVar(other.Variable);
return Var.getPieceOffset() < OtherVar.getPieceOffset();
}
bool isLocation() const { return EntryKind == E_Location; }
bool isInt() const { return EntryKind == E_Integer; }
bool isConstantFP() const { return EntryKind == E_ConstantFP; }
@ -87,7 +94,7 @@ public:
const MDNode *getVariable() const { return Variable; }
};
private:
/// A list of locations/constants belonging to this entry.
/// A list of locations/constants belonging to this entry, sorted by offset.
SmallVector<Value, 1> Values;
public:
@ -108,6 +115,7 @@ public:
if (Var.getName() == NextVar.getName() &&
Var.isVariablePiece() && NextVar.isVariablePiece()) {
Values.append(Next.Values.begin(), Next.Values.end());
sortUniqueValues();
End = Next.End;
return true;
}
@ -135,6 +143,14 @@ public:
assert(DIVariable(Val.Variable).isVariablePiece() &&
"multi-value DebugLocEntries must be pieces");
Values.push_back(Val);
sortUniqueValues();
}
// Sort the pieces by offset.
// Remove any duplicate entries by dropping all but the first.
void sortUniqueValues() {
std::sort(Values.begin(), Values.end());
Values.erase(std::unique(Values.begin(), Values.end()), Values.end());
}
};

22
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -2065,30 +2065,18 @@ void DwarfDebug::emitDebugStr() {
void DwarfDebug::emitLocPieces(ByteStreamer &Streamer,
const DITypeIdentifierMap &Map,
ArrayRef<DebugLocEntry::Value> Values) {
typedef DebugLocEntry::Value Piece;
SmallVector<Piece, 4> Pieces(Values.begin(), Values.end());
assert(std::all_of(Pieces.begin(), Pieces.end(), [](Piece &P) {
assert(std::all_of(Values.begin(), Values.end(), [](DebugLocEntry::Value P) {
return DIVariable(P.getVariable()).isVariablePiece();
}) && "all values are expected to be pieces");
// Sort the pieces so they can be emitted using DW_OP_piece.
std::sort(Pieces.begin(), Pieces.end(), [](const Piece &A, const Piece &B) {
DIVariable VarA(A.getVariable());
DIVariable VarB(B.getVariable());
return VarA.getPieceOffset() < VarB.getPieceOffset();
});
// Remove any duplicate entries by dropping all but the first.
Pieces.erase(std::unique(Pieces.begin(), Pieces.end(),
[] (const Piece &A,const Piece &B){
return A.getVariable() == B.getVariable();
}), Pieces.end());
assert(std::is_sorted(Values.begin(), Values.end()) &&
"pieces are expected to be sorted");
unsigned Offset = 0;
for (auto Piece : Pieces) {
for (auto Piece : Values) {
DIVariable Var(Piece.getVariable());
unsigned PieceOffset = Var.getPieceOffset();
unsigned PieceSize = Var.getPieceSize();
assert(Offset <= PieceOffset && "overlapping pieces in DebugLocEntry");
assert(Offset <= PieceOffset && "overlapping or duplicate pieces");
if (Offset < PieceOffset) {
// The DWARF spec seriously mandates pieces with no locations for gaps.
Asm->EmitDwarfOpPiece(Streamer, (PieceOffset-Offset)*8);