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

Use a single data structure to store all user variables in DwarfDebug

Browse Source 
Summary:
Get rid of UserVariables set, and turn DbgValues into MapVector
to get a fixed ordering, as suggested in review for http://reviews.llvm.org/D3573.

Test Plan: llvm regression tests

Reviewers: dblaikie

Reviewed By: dblaikie

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D3579

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207720 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexey Samsonov 2014-04-30 23:02:40 +00:00
parent 4e9d8388dd
commit 5c91f4db1f
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.h
View File

@ -10,7 +10,7 @@
#ifndef CODEGEN_ASMPRINTER_DBGVALUEHISTORYCALCULATOR_H_
#define CODEGEN_ASMPRINTER_DBGVALUEHISTORYCALCULATOR_H_
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/SmallVector.h"
namespace llvm {
@ -22,8 +22,8 @@ class TargetRegisterInfo;
// For each user variable, keep a list of DBG_VALUE instructions in order.
// The list can also contain normal instructions that clobber the previous
// DBG_VALUE.
typedef DenseMap<const MDNode *, SmallVector<const MachineInstr *, 4>>
// DBG_VALUE. The variables are listed in order of appearance.
typedef MapVector<const MDNode *, SmallVector<const MachineInstr *, 4>>
DbgValueHistoryMap;
void calculateDbgValueHistory(const MachineFunction *MF,

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

@ -1196,18 +1196,18 @@ DwarfDebug::collectVariableInfo(SmallPtrSet<const MDNode *, 16> &Processed) {
// Grab the variable info that was squirreled away in the MMI side-table.
collectVariableInfoFromMMITable(Processed);
for (const MDNode *Var : UserVariables) {
if (Processed.count(Var))
for (const auto &I : DbgValues) {
DIVariable DV(I.first);
if (Processed.count(DV))
continue;
// History contains relevant DBG_VALUE instructions for Var and instructions
// History contains relevant DBG_VALUE instructions for DV and instructions
// clobbering it.
SmallVectorImpl<const MachineInstr *> &History = DbgValues[Var];
const SmallVectorImpl<const MachineInstr *> &History = I.second;
if (History.empty())
continue;
const MachineInstr *MInsn = History.front();
DIVariable DV(Var);
LexicalScope *Scope = nullptr;
if (DV.getTag() == dwarf::DW_TAG_arg_variable &&
DISubprogram(DV.getContext()).describes(CurFn->getFunction()))
@ -1421,7 +1421,7 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) {
if (LScopes.empty())
return;
assert(UserVariables.empty() && DbgValues.empty() && "Maps weren't cleaned");
assert(DbgValues.empty() && "DbgValues map wasn't cleaned!");
// Make sure that each lexical scope will have a begin/end label.
identifyScopeMarkers();
@ -1448,13 +1448,13 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) {
for (const auto &MI : MBB) {
if (MI.isDebugValue()) {
assert(MI.getNumOperands() > 1 && "Invalid machine instruction!");
// Keep track of user variables in order of appearance. Store the set
// of variables we've already seen as a set of keys in DbgValues.
// Keep track of user variables in order of appearance. Create the
// empty history for each variable so that the order of keys in
// DbgValues is correct. Actual history will be populated in
// calculateDbgValueHistory() function.
const MDNode *Var = MI.getDebugVariable();
auto IterPair = DbgValues.insert(
DbgValues.insert(
std::make_pair(Var, SmallVector<const MachineInstr *, 4>()));
if (IterPair.second)
UserVariables.push_back(Var);
} else if (!MI.getFlag(MachineInstr::FrameSetup) &&
PrologEndLoc.isUnknown() && !MI.getDebugLoc().isUnknown()) {
// First known non-DBG_VALUE and non-frame setup location marks
@ -1609,7 +1609,6 @@ void DwarfDebug::endFunction(const MachineFunction *MF) {
DeleteContainerPointers(I.second);
ScopeVariables.clear();
DeleteContainerPointers(CurrentFnArguments);
UserVariables.clear();
DbgValues.clear();
AbstractVariables.clear();
LabelsBeforeInsn.clear();

5
lib/CodeGen/AsmPrinter/DwarfDebug.h
View File

@ -219,11 +219,8 @@ class DwarfDebug : public AsmPrinterHandler {
// Maps instruction with label emitted after instruction.
DenseMap<const MachineInstr *, MCSymbol *> LabelsAfterInsn;
// Every user variable mentioned by a DBG_VALUE instruction in order of
// appearance.
SmallVector<const MDNode *, 8> UserVariables;
// History of DBG_VALUE and clobber instructions for each user variable.
// Variables are listed in order of appearance.
DbgValueHistoryMap DbgValues;
// Previous instruction's location information. This is used to determine