2010-11-30 02:17:10 +00:00
|
|
|
//===- LiveDebugVariables.cpp - Tracking debug info variables -------------===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// This file implements the LiveDebugVariables analysis.
|
|
|
|
//
|
|
|
|
// Remove all DBG_VALUE instructions referencing virtual registers and replace
|
|
|
|
// them with a data structure tracking where live user variables are kept - in a
|
|
|
|
// virtual register or in a stack slot.
|
|
|
|
//
|
|
|
|
// Allow the data structure to be updated during register allocation when values
|
|
|
|
// are moved between registers and stack slots. Finally emit new DBG_VALUE
|
|
|
|
// instructions after register allocation is complete.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "LiveDebugVariables.h"
|
2010-12-02 00:37:37 +00:00
|
|
|
#include "llvm/ADT/IntervalMap.h"
|
2011-08-04 18:45:38 +00:00
|
|
|
#include "llvm/ADT/Statistic.h"
|
2011-08-10 21:25:34 +00:00
|
|
|
#include "llvm/CodeGen/LexicalScopes.h"
|
2010-11-30 02:17:10 +00:00
|
|
|
#include "llvm/CodeGen/LiveIntervalAnalysis.h"
|
2010-12-02 00:37:37 +00:00
|
|
|
#include "llvm/CodeGen/MachineDominators.h"
|
2010-12-03 21:47:10 +00:00
|
|
|
#include "llvm/CodeGen/MachineFunction.h"
|
|
|
|
#include "llvm/CodeGen/MachineInstrBuilder.h"
|
2011-03-18 21:42:19 +00:00
|
|
|
#include "llvm/CodeGen/MachineRegisterInfo.h"
|
2010-11-30 02:17:10 +00:00
|
|
|
#include "llvm/CodeGen/Passes.h"
|
2012-11-28 19:13:06 +00:00
|
|
|
#include "llvm/CodeGen/VirtRegMap.h"
|
2013-01-02 11:36:10 +00:00
|
|
|
#include "llvm/IR/Constants.h"
|
2014-03-06 00:46:21 +00:00
|
|
|
#include "llvm/IR/DebugInfo.h"
|
2013-01-02 11:36:10 +00:00
|
|
|
#include "llvm/IR/Metadata.h"
|
|
|
|
#include "llvm/IR/Value.h"
|
2010-12-02 00:37:37 +00:00
|
|
|
#include "llvm/Support/CommandLine.h"
|
|
|
|
#include "llvm/Support/Debug.h"
|
2015-03-23 19:32:43 +00:00
|
|
|
#include "llvm/Support/raw_ostream.h"
|
2010-12-03 21:47:10 +00:00
|
|
|
#include "llvm/Target/TargetInstrInfo.h"
|
2010-11-30 02:17:10 +00:00
|
|
|
#include "llvm/Target/TargetMachine.h"
|
2010-12-02 00:37:37 +00:00
|
|
|
#include "llvm/Target/TargetRegisterInfo.h"
|
2014-08-04 21:25:23 +00:00
|
|
|
#include "llvm/Target/TargetSubtargetInfo.h"
|
2014-04-21 20:37:07 +00:00
|
|
|
#include <memory>
|
2016-05-27 14:27:24 +00:00
|
|
|
#include <utility>
|
2014-04-21 20:37:07 +00:00
|
|
|
|
2010-11-30 02:17:10 +00:00
|
|
|
using namespace llvm;
|
|
|
|
|
2014-04-22 02:02:50 +00:00
|
|
|
#define DEBUG_TYPE "livedebug"
|
|
|
|
|
2011-01-07 22:33:41 +00:00
|
|
|
static cl::opt<bool>
|
2011-01-12 23:36:21 +00:00
|
|
|
EnableLDV("live-debug-variables", cl::init(true),
|
2011-01-07 22:33:41 +00:00
|
|
|
cl::desc("Enable the live debug variables pass"), cl::Hidden);
|
|
|
|
|
2011-08-04 18:45:38 +00:00
|
|
|
STATISTIC(NumInsertedDebugValues, "Number of DBG_VALUEs inserted");
|
2010-11-30 02:17:10 +00:00
|
|
|
char LiveDebugVariables::ID = 0;
|
|
|
|
|
|
|
|
INITIALIZE_PASS_BEGIN(LiveDebugVariables, "livedebugvars",
|
|
|
|
"Debug Variable Analysis", false, false)
|
2010-12-02 00:37:37 +00:00
|
|
|
INITIALIZE_PASS_DEPENDENCY(MachineDominatorTree)
|
2010-11-30 02:17:10 +00:00
|
|
|
INITIALIZE_PASS_DEPENDENCY(LiveIntervals)
|
|
|
|
INITIALIZE_PASS_END(LiveDebugVariables, "livedebugvars",
|
|
|
|
"Debug Variable Analysis", false, false)
|
|
|
|
|
|
|
|
void LiveDebugVariables::getAnalysisUsage(AnalysisUsage &AU) const {
|
2010-12-02 00:37:37 +00:00
|
|
|
AU.addRequired<MachineDominatorTree>();
|
2010-11-30 02:17:10 +00:00
|
|
|
AU.addRequiredTransitive<LiveIntervals>();
|
|
|
|
AU.setPreservesAll();
|
|
|
|
MachineFunctionPass::getAnalysisUsage(AU);
|
|
|
|
}
|
|
|
|
|
2014-04-14 00:51:57 +00:00
|
|
|
LiveDebugVariables::LiveDebugVariables() : MachineFunctionPass(ID), pImpl(nullptr) {
|
2010-11-30 02:17:10 +00:00
|
|
|
initializeLiveDebugVariablesPass(*PassRegistry::getPassRegistry());
|
|
|
|
}
|
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
/// LocMap - Map of where a user value is live, and its location.
|
|
|
|
typedef IntervalMap<SlotIndex, unsigned, 4> LocMap;
|
|
|
|
|
2011-09-16 00:35:06 +00:00
|
|
|
namespace {
|
2013-11-20 00:54:25 +00:00
|
|
|
/// UserValueScopes - Keeps track of lexical scopes associated with a
|
2011-09-13 18:40:53 +00:00
|
|
|
/// user value's source location.
|
|
|
|
class UserValueScopes {
|
|
|
|
DebugLoc DL;
|
|
|
|
LexicalScopes &LS;
|
|
|
|
SmallPtrSet<const MachineBasicBlock *, 4> LBlocks;
|
|
|
|
|
|
|
|
public:
|
2016-05-27 14:27:24 +00:00
|
|
|
UserValueScopes(DebugLoc D, LexicalScopes &L) : DL(std::move(D)), LS(L) {}
|
2011-09-13 18:40:53 +00:00
|
|
|
|
|
|
|
/// dominates - Return true if current scope dominates at least one machine
|
|
|
|
/// instruction in a given machine basic block.
|
|
|
|
bool dominates(MachineBasicBlock *MBB) {
|
|
|
|
if (LBlocks.empty())
|
|
|
|
LS.getMachineBasicBlocks(DL, LBlocks);
|
2015-10-24 23:11:13 +00:00
|
|
|
return LBlocks.count(MBB) != 0 || LS.dominates(DL, MBB);
|
2011-09-13 18:40:53 +00:00
|
|
|
}
|
|
|
|
};
|
2011-09-16 00:35:06 +00:00
|
|
|
} // end anonymous namespace
|
2011-09-13 18:40:53 +00:00
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
/// UserValue - A user value is a part of a debug info user variable.
|
|
|
|
///
|
|
|
|
/// A DBG_VALUE instruction notes that (a sub-register of) a virtual register
|
|
|
|
/// holds part of a user variable. The part is identified by a byte offset.
|
|
|
|
///
|
|
|
|
/// UserValues are grouped into equivalence classes for easier searching. Two
|
|
|
|
/// user values are related if they refer to the same variable, or if they are
|
|
|
|
/// held by the same virtual register. The equivalence class is the transitive
|
|
|
|
/// closure of that relation.
|
|
|
|
namespace {
|
2011-03-18 21:42:19 +00:00
|
|
|
class LDVImpl;
|
2010-12-02 00:37:37 +00:00
|
|
|
class UserValue {
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
const MDNode *Variable; ///< The debug info variable we are part of.
|
|
|
|
const MDNode *Expression; ///< Any complex address expression.
|
2010-12-02 00:37:37 +00:00
|
|
|
unsigned offset; ///< Byte offset into variable.
|
2013-07-09 20:28:37 +00:00
|
|
|
bool IsIndirect; ///< true if this is a register-indirect+offset value.
|
2011-02-04 01:43:25 +00:00
|
|
|
DebugLoc dl; ///< The debug location for the variable. This is
|
|
|
|
///< used by dwarf writer to find lexical scope.
|
2010-12-02 00:37:37 +00:00
|
|
|
UserValue *leader; ///< Equivalence class leader.
|
|
|
|
UserValue *next; ///< Next value in equivalence class, or null.
|
|
|
|
|
|
|
|
/// Numbered locations referenced by locmap.
|
2011-01-09 05:33:21 +00:00
|
|
|
SmallVector<MachineOperand, 4> locations;
|
2010-12-02 00:37:37 +00:00
|
|
|
|
|
|
|
/// Map of slot indices where this value is live.
|
|
|
|
LocMap locInts;
|
|
|
|
|
2010-12-03 22:25:07 +00:00
|
|
|
/// coalesceLocation - After LocNo was changed, check if it has become
|
|
|
|
/// identical to another location, and coalesce them. This may cause LocNo or
|
|
|
|
/// a later location to be erased, but no earlier location will be erased.
|
|
|
|
void coalesceLocation(unsigned LocNo);
|
|
|
|
|
2010-12-03 21:47:10 +00:00
|
|
|
/// insertDebugValue - Insert a DBG_VALUE into MBB at Idx for LocNo.
|
|
|
|
void insertDebugValue(MachineBasicBlock *MBB, SlotIndex Idx, unsigned LocNo,
|
|
|
|
LiveIntervals &LIS, const TargetInstrInfo &TII);
|
|
|
|
|
2011-05-06 18:00:02 +00:00
|
|
|
/// splitLocation - Replace OldLocNo ranges with NewRegs ranges where NewRegs
|
|
|
|
/// is live. Returns true if any changes were made.
|
2013-08-14 23:50:04 +00:00
|
|
|
bool splitLocation(unsigned OldLocNo, ArrayRef<unsigned> NewRegs,
|
|
|
|
LiveIntervals &LIS);
|
2011-05-06 18:00:02 +00:00
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
public:
|
|
|
|
/// UserValue - Create a new UserValue.
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
UserValue(const MDNode *var, const MDNode *expr, unsigned o, bool i,
|
|
|
|
DebugLoc L, LocMap::Allocator &alloc)
|
2016-05-27 14:27:24 +00:00
|
|
|
: Variable(var), Expression(expr), offset(o), IsIndirect(i),
|
|
|
|
dl(std::move(L)), leader(this), next(nullptr), locInts(alloc) {}
|
2010-12-02 00:37:37 +00:00
|
|
|
|
|
|
|
/// getLeader - Get the leader of this value's equivalence class.
|
|
|
|
UserValue *getLeader() {
|
|
|
|
UserValue *l = leader;
|
|
|
|
while (l != l->leader)
|
|
|
|
l = l->leader;
|
|
|
|
return leader = l;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// getNext - Return the next UserValue in the equivalence class.
|
|
|
|
UserValue *getNext() const { return next; }
|
|
|
|
|
2011-07-06 23:09:51 +00:00
|
|
|
/// match - Does this UserValue match the parameters?
|
2015-04-29 16:38:44 +00:00
|
|
|
bool match(const MDNode *Var, const MDNode *Expr, const DILocation *IA,
|
2015-04-16 22:27:54 +00:00
|
|
|
unsigned Offset, bool indirect) const {
|
|
|
|
return Var == Variable && Expr == Expression && dl->getInlinedAt() == IA &&
|
|
|
|
Offset == offset && indirect == IsIndirect;
|
2010-12-02 00:37:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// merge - Merge equivalence classes.
|
|
|
|
static UserValue *merge(UserValue *L1, UserValue *L2) {
|
|
|
|
L2 = L2->getLeader();
|
|
|
|
if (!L1)
|
|
|
|
return L2;
|
|
|
|
L1 = L1->getLeader();
|
|
|
|
if (L1 == L2)
|
|
|
|
return L1;
|
|
|
|
// Splice L2 before L1's members.
|
|
|
|
UserValue *End = L2;
|
2016-02-18 22:09:30 +00:00
|
|
|
while (End->next) {
|
|
|
|
End->leader = L1;
|
|
|
|
End = End->next;
|
|
|
|
}
|
2010-12-02 00:37:37 +00:00
|
|
|
End->leader = L1;
|
|
|
|
End->next = L1->next;
|
|
|
|
L1->next = L2;
|
|
|
|
return L1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// getLocationNo - Return the location number that matches Loc.
|
2011-01-09 05:33:21 +00:00
|
|
|
unsigned getLocationNo(const MachineOperand &LocMO) {
|
2011-03-18 21:42:19 +00:00
|
|
|
if (LocMO.isReg()) {
|
|
|
|
if (LocMO.getReg() == 0)
|
|
|
|
return ~0u;
|
|
|
|
// For register locations we dont care about use/def and other flags.
|
|
|
|
for (unsigned i = 0, e = locations.size(); i != e; ++i)
|
|
|
|
if (locations[i].isReg() &&
|
|
|
|
locations[i].getReg() == LocMO.getReg() &&
|
|
|
|
locations[i].getSubReg() == LocMO.getSubReg())
|
|
|
|
return i;
|
|
|
|
} else
|
|
|
|
for (unsigned i = 0, e = locations.size(); i != e; ++i)
|
|
|
|
if (LocMO.isIdenticalTo(locations[i]))
|
|
|
|
return i;
|
2011-01-09 05:33:21 +00:00
|
|
|
locations.push_back(LocMO);
|
|
|
|
// We are storing a MachineOperand outside a MachineInstr.
|
|
|
|
locations.back().clearParent();
|
2011-03-18 21:42:19 +00:00
|
|
|
// Don't store def operands.
|
|
|
|
if (locations.back().isReg())
|
|
|
|
locations.back().setIsUse();
|
2011-01-09 05:33:21 +00:00
|
|
|
return locations.size() - 1;
|
2010-12-02 00:37:37 +00:00
|
|
|
}
|
|
|
|
|
2011-03-18 21:42:19 +00:00
|
|
|
/// mapVirtRegs - Ensure that all virtual register locations are mapped.
|
|
|
|
void mapVirtRegs(LDVImpl *LDV);
|
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
/// addDef - Add a definition point to this value.
|
|
|
|
void addDef(SlotIndex Idx, const MachineOperand &LocMO) {
|
|
|
|
// Add a singular (Idx,Idx) -> Loc mapping.
|
|
|
|
LocMap::iterator I = locInts.find(Idx);
|
|
|
|
if (!I.valid() || I.start() != Idx)
|
|
|
|
I.insert(Idx, Idx.getNextSlot(), getLocationNo(LocMO));
|
2011-08-03 23:44:31 +00:00
|
|
|
else
|
|
|
|
// A later DBG_VALUE at the same SlotIndex overrides the old location.
|
|
|
|
I.setValue(getLocationNo(LocMO));
|
2010-12-02 00:37:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// extendDef - Extend the current definition as far as possible down the
|
|
|
|
/// dominator tree. Stop when meeting an existing def or when leaving the live
|
|
|
|
/// range of VNI.
|
2011-03-18 21:42:19 +00:00
|
|
|
/// End points where VNI is no longer live are added to Kills.
|
2010-12-02 00:37:37 +00:00
|
|
|
/// @param Idx Starting point for the definition.
|
|
|
|
/// @param LocNo Location number to propagate.
|
2013-10-10 21:29:02 +00:00
|
|
|
/// @param LR Restrict liveness to where LR has the value VNI. May be null.
|
|
|
|
/// @param VNI When LR is not null, this is the value to restrict to.
|
2011-03-18 21:42:19 +00:00
|
|
|
/// @param Kills Append end points of VNI's live range to Kills.
|
2010-12-02 00:37:37 +00:00
|
|
|
/// @param LIS Live intervals analysis.
|
|
|
|
/// @param MDT Dominator tree.
|
|
|
|
void extendDef(SlotIndex Idx, unsigned LocNo,
|
2013-10-10 21:29:02 +00:00
|
|
|
LiveRange *LR, const VNInfo *VNI,
|
2011-03-18 21:42:19 +00:00
|
|
|
SmallVectorImpl<SlotIndex> *Kills,
|
2011-08-10 21:25:34 +00:00
|
|
|
LiveIntervals &LIS, MachineDominatorTree &MDT,
|
2012-03-15 21:33:39 +00:00
|
|
|
UserValueScopes &UVS);
|
2010-12-02 00:37:37 +00:00
|
|
|
|
2011-03-18 21:42:19 +00:00
|
|
|
/// addDefsFromCopies - The value in LI/LocNo may be copies to other
|
|
|
|
/// registers. Determine if any of the copies are available at the kill
|
|
|
|
/// points, and add defs if possible.
|
|
|
|
/// @param LI Scan for copies of the value in LI->reg.
|
|
|
|
/// @param LocNo Location number of LI->reg.
|
|
|
|
/// @param Kills Points where the range of LocNo could be extended.
|
|
|
|
/// @param NewDefs Append (Idx, LocNo) of inserted defs here.
|
|
|
|
void addDefsFromCopies(LiveInterval *LI, unsigned LocNo,
|
|
|
|
const SmallVectorImpl<SlotIndex> &Kills,
|
|
|
|
SmallVectorImpl<std::pair<SlotIndex, unsigned> > &NewDefs,
|
|
|
|
MachineRegisterInfo &MRI,
|
|
|
|
LiveIntervals &LIS);
|
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
/// computeIntervals - Compute the live intervals of all locations after
|
|
|
|
/// collecting all their def points.
|
2012-06-22 17:15:32 +00:00
|
|
|
void computeIntervals(MachineRegisterInfo &MRI, const TargetRegisterInfo &TRI,
|
2011-08-10 21:25:34 +00:00
|
|
|
LiveIntervals &LIS, MachineDominatorTree &MDT,
|
2011-09-13 18:40:53 +00:00
|
|
|
UserValueScopes &UVS);
|
2010-12-02 00:37:37 +00:00
|
|
|
|
2011-05-06 18:00:02 +00:00
|
|
|
/// splitRegister - Replace OldReg ranges with NewRegs ranges where NewRegs is
|
|
|
|
/// live. Returns true if any changes were made.
|
2013-08-14 23:50:04 +00:00
|
|
|
bool splitRegister(unsigned OldLocNo, ArrayRef<unsigned> NewRegs,
|
|
|
|
LiveIntervals &LIS);
|
2011-05-06 18:00:02 +00:00
|
|
|
|
2010-12-03 21:47:10 +00:00
|
|
|
/// rewriteLocations - Rewrite virtual register locations according to the
|
|
|
|
/// provided virtual register map.
|
|
|
|
void rewriteLocations(VirtRegMap &VRM, const TargetRegisterInfo &TRI);
|
|
|
|
|
2013-02-13 02:29:18 +00:00
|
|
|
/// emitDebugValues - Recreate DBG_VALUE instruction from data structures.
|
2010-12-03 21:47:10 +00:00
|
|
|
void emitDebugValues(VirtRegMap *VRM,
|
|
|
|
LiveIntervals &LIS, const TargetInstrInfo &TRI);
|
|
|
|
|
2011-09-13 18:40:53 +00:00
|
|
|
/// getDebugLoc - Return DebugLoc of this UserValue.
|
|
|
|
DebugLoc getDebugLoc() { return dl;}
|
2015-02-27 00:11:34 +00:00
|
|
|
void print(raw_ostream &, const TargetRegisterInfo *);
|
2010-12-02 00:37:37 +00:00
|
|
|
};
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
/// LDVImpl - Implementation of the LiveDebugVariables pass.
|
|
|
|
namespace {
|
|
|
|
class LDVImpl {
|
|
|
|
LiveDebugVariables &pass;
|
|
|
|
LocMap::Allocator allocator;
|
|
|
|
MachineFunction *MF;
|
|
|
|
LiveIntervals *LIS;
|
2011-08-10 21:25:34 +00:00
|
|
|
LexicalScopes LS;
|
2010-12-02 00:37:37 +00:00
|
|
|
MachineDominatorTree *MDT;
|
|
|
|
const TargetRegisterInfo *TRI;
|
|
|
|
|
2013-02-13 20:23:48 +00:00
|
|
|
/// Whether emitDebugValues is called.
|
|
|
|
bool EmitDone;
|
|
|
|
/// Whether the machine function is modified during the pass.
|
|
|
|
bool ModifiedMF;
|
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
/// userValues - All allocated UserValue instances.
|
2014-04-21 20:37:07 +00:00
|
|
|
SmallVector<std::unique_ptr<UserValue>, 8> userValues;
|
2010-12-02 00:37:37 +00:00
|
|
|
|
|
|
|
/// Map virtual register to eq class leader.
|
|
|
|
typedef DenseMap<unsigned, UserValue*> VRMap;
|
2010-12-03 22:25:09 +00:00
|
|
|
VRMap virtRegToEqClass;
|
2010-12-02 00:37:37 +00:00
|
|
|
|
|
|
|
/// Map user variable to eq class leader.
|
|
|
|
typedef DenseMap<const MDNode *, UserValue*> UVMap;
|
|
|
|
UVMap userVarMap;
|
|
|
|
|
|
|
|
/// getUserValue - Find or create a UserValue.
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
UserValue *getUserValue(const MDNode *Var, const MDNode *Expr,
|
2016-06-12 15:39:02 +00:00
|
|
|
unsigned Offset, bool IsIndirect, const DebugLoc &DL);
|
2010-12-02 00:37:37 +00:00
|
|
|
|
2010-12-02 18:15:44 +00:00
|
|
|
/// lookupVirtReg - Find the EC leader for VirtReg or null.
|
|
|
|
UserValue *lookupVirtReg(unsigned VirtReg);
|
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
/// handleDebugValue - Add DBG_VALUE instruction to our maps.
|
|
|
|
/// @param MI DBG_VALUE instruction
|
|
|
|
/// @param Idx Last valid SLotIndex before instruction.
|
|
|
|
/// @return True if the DBG_VALUE instruction should be deleted.
|
|
|
|
bool handleDebugValue(MachineInstr *MI, SlotIndex Idx);
|
|
|
|
|
|
|
|
/// collectDebugValues - Collect and erase all DBG_VALUE instructions, adding
|
|
|
|
/// a UserValue def for each instruction.
|
|
|
|
/// @param mf MachineFunction to be scanned.
|
|
|
|
/// @return True if any debug values were found.
|
|
|
|
bool collectDebugValues(MachineFunction &mf);
|
|
|
|
|
|
|
|
/// computeIntervals - Compute the live intervals of all user values after
|
|
|
|
/// collecting all their def points.
|
|
|
|
void computeIntervals();
|
|
|
|
|
|
|
|
public:
|
Recommit r212203: Don't try to construct debug LexicalScopes hierarchy for functions that do not have top level debug information.
Reverted by Eric Christopher (Thanks!) in r212203 after Bob Wilson
reported LTO issues. Duncan Exon Smith and Aditya Nandakumar helped
provide a reduced reproduction, though the failure wasn't too hard to
guess, and even easier with the example to confirm.
The assertion that the subprogram metadata associated with an
llvm::Function matches the scope data referenced by the DbgLocs on the
instructions in that function is not valid under LTO. In LTO, a C++
inline function might exist in multiple CUs and the subprogram metadata
nodes will refer to the same llvm::Function. In this case, depending on
the order of the CUs, the first intance of the subprogram metadata may
not be the one referenced by the instructions in that function and the
assertion will fail.
A test case (test/DebugInfo/cross-cu-linkonce-distinct.ll) is added, the
assertion removed and a comment added to explain this situation.
This was then reverted again in r213581 as it caused PR20367. The root
cause of this was the early exit in LiveDebugVariables meant that
spurious DBG_VALUE intrinsics that referenced dead variables were not
removed, causing an assertion/crash later on. The fix is to have
LiveDebugVariables strip all DBG_VALUE intrinsics in functions without
debug info as they're not needed anyway. Test case added to cover this
situation (that occurs when a debug-having function is inlined into a
nodebug function) in test/DebugInfo/X86/nodebug_with_debug_loc.ll
Original commit message:
If a function isn't actually in a CU's subprogram list in the debug info
metadata, ignore all the DebugLocs and don't try to build scopes, track
variables, etc.
While this is possibly a minor optimization, it's also a correctness fix
for an incoming patch that will add assertions to LexicalScopes and the
debug info verifier to ensure that all scope chains lead to debug info
for the current function.
Fix up a few test cases that had broken/incomplete debug info that could
violate this constraint.
Add a test case where this occurs by design (inlining a
debug-info-having function in an attribute nodebug function - we want
this to work because /if/ the nodebug function is then inlined into a
debug-info-having function, it should be fine (and will work fine - we
just stitch the scopes up as usual), but should the inlining not happen
we need to not assert fail either).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213952 91177308-0d34-0410-b5e6-96231b3b80d8
2014-07-25 16:10:16 +00:00
|
|
|
LDVImpl(LiveDebugVariables *ps)
|
|
|
|
: pass(*ps), MF(nullptr), EmitDone(false), ModifiedMF(false) {}
|
2010-12-02 00:37:37 +00:00
|
|
|
bool runOnMachineFunction(MachineFunction &mf);
|
|
|
|
|
2013-02-13 20:23:48 +00:00
|
|
|
/// clear - Release all memory.
|
2010-12-02 00:37:37 +00:00
|
|
|
void clear() {
|
Recommit r212203: Don't try to construct debug LexicalScopes hierarchy for functions that do not have top level debug information.
Reverted by Eric Christopher (Thanks!) in r212203 after Bob Wilson
reported LTO issues. Duncan Exon Smith and Aditya Nandakumar helped
provide a reduced reproduction, though the failure wasn't too hard to
guess, and even easier with the example to confirm.
The assertion that the subprogram metadata associated with an
llvm::Function matches the scope data referenced by the DbgLocs on the
instructions in that function is not valid under LTO. In LTO, a C++
inline function might exist in multiple CUs and the subprogram metadata
nodes will refer to the same llvm::Function. In this case, depending on
the order of the CUs, the first intance of the subprogram metadata may
not be the one referenced by the instructions in that function and the
assertion will fail.
A test case (test/DebugInfo/cross-cu-linkonce-distinct.ll) is added, the
assertion removed and a comment added to explain this situation.
This was then reverted again in r213581 as it caused PR20367. The root
cause of this was the early exit in LiveDebugVariables meant that
spurious DBG_VALUE intrinsics that referenced dead variables were not
removed, causing an assertion/crash later on. The fix is to have
LiveDebugVariables strip all DBG_VALUE intrinsics in functions without
debug info as they're not needed anyway. Test case added to cover this
situation (that occurs when a debug-having function is inlined into a
nodebug function) in test/DebugInfo/X86/nodebug_with_debug_loc.ll
Original commit message:
If a function isn't actually in a CU's subprogram list in the debug info
metadata, ignore all the DebugLocs and don't try to build scopes, track
variables, etc.
While this is possibly a minor optimization, it's also a correctness fix
for an incoming patch that will add assertions to LexicalScopes and the
debug info verifier to ensure that all scope chains lead to debug info
for the current function.
Fix up a few test cases that had broken/incomplete debug info that could
violate this constraint.
Add a test case where this occurs by design (inlining a
debug-info-having function in an attribute nodebug function - we want
this to work because /if/ the nodebug function is then inlined into a
debug-info-having function, it should be fine (and will work fine - we
just stitch the scopes up as usual), but should the inlining not happen
we need to not assert fail either).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213952 91177308-0d34-0410-b5e6-96231b3b80d8
2014-07-25 16:10:16 +00:00
|
|
|
MF = nullptr;
|
2010-12-02 00:37:37 +00:00
|
|
|
userValues.clear();
|
2010-12-03 22:25:09 +00:00
|
|
|
virtRegToEqClass.clear();
|
2010-12-02 00:37:37 +00:00
|
|
|
userVarMap.clear();
|
2013-02-13 20:23:48 +00:00
|
|
|
// Make sure we call emitDebugValues if the machine function was modified.
|
|
|
|
assert((!ModifiedMF || EmitDone) &&
|
|
|
|
"Dbg values are not emitted in LDV");
|
|
|
|
EmitDone = false;
|
|
|
|
ModifiedMF = false;
|
2014-10-24 02:46:50 +00:00
|
|
|
LS.reset();
|
2010-12-02 00:37:37 +00:00
|
|
|
}
|
|
|
|
|
2011-03-18 21:42:19 +00:00
|
|
|
/// mapVirtReg - Map virtual register to an equivalence class.
|
|
|
|
void mapVirtReg(unsigned VirtReg, UserValue *EC);
|
|
|
|
|
2011-05-06 18:00:02 +00:00
|
|
|
/// splitRegister - Replace all references to OldReg with NewRegs.
|
2013-08-14 23:50:04 +00:00
|
|
|
void splitRegister(unsigned OldReg, ArrayRef<unsigned> NewRegs);
|
2011-05-06 18:00:02 +00:00
|
|
|
|
2013-02-13 02:29:18 +00:00
|
|
|
/// emitDebugValues - Recreate DBG_VALUE instruction from data structures.
|
2010-12-03 21:47:10 +00:00
|
|
|
void emitDebugValues(VirtRegMap *VRM);
|
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
void print(raw_ostream&);
|
|
|
|
};
|
|
|
|
} // namespace
|
|
|
|
|
2016-06-12 15:39:02 +00:00
|
|
|
static void printDebugLoc(const DebugLoc &DL, raw_ostream &CommentOS,
|
2015-04-14 02:09:32 +00:00
|
|
|
const LLVMContext &Ctx) {
|
|
|
|
if (!DL)
|
|
|
|
return;
|
|
|
|
|
2015-04-29 16:38:44 +00:00
|
|
|
auto *Scope = cast<DIScope>(DL.getScope());
|
2015-04-14 02:09:32 +00:00
|
|
|
// Omit the directory, because it's likely to be long and uninteresting.
|
2015-04-16 01:37:00 +00:00
|
|
|
CommentOS << Scope->getFilename();
|
2015-04-14 02:09:32 +00:00
|
|
|
CommentOS << ':' << DL.getLine();
|
|
|
|
if (DL.getCol() != 0)
|
|
|
|
CommentOS << ':' << DL.getCol();
|
|
|
|
|
|
|
|
DebugLoc InlinedAtDL = DL.getInlinedAt();
|
|
|
|
if (!InlinedAtDL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
CommentOS << " @[ ";
|
|
|
|
printDebugLoc(InlinedAtDL, CommentOS, Ctx);
|
|
|
|
CommentOS << " ]";
|
|
|
|
}
|
|
|
|
|
2015-04-29 16:38:44 +00:00
|
|
|
static void printExtendedName(raw_ostream &OS, const DILocalVariable *V,
|
|
|
|
const DILocation *DL) {
|
2015-04-14 02:09:32 +00:00
|
|
|
const LLVMContext &Ctx = V->getContext();
|
|
|
|
StringRef Res = V->getName();
|
|
|
|
if (!Res.empty())
|
|
|
|
OS << Res << "," << V->getLine();
|
2015-04-15 22:29:27 +00:00
|
|
|
if (auto *InlinedAt = DL->getInlinedAt()) {
|
2015-04-14 02:09:32 +00:00
|
|
|
if (DebugLoc InlinedAtDL = InlinedAt) {
|
|
|
|
OS << " @[";
|
|
|
|
printDebugLoc(InlinedAtDL, OS, Ctx);
|
|
|
|
OS << "]";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-02-27 00:11:34 +00:00
|
|
|
void UserValue::print(raw_ostream &OS, const TargetRegisterInfo *TRI) {
|
2015-04-29 16:38:44 +00:00
|
|
|
auto *DV = cast<DILocalVariable>(Variable);
|
2014-08-07 20:04:00 +00:00
|
|
|
OS << "!\"";
|
2015-04-15 22:29:27 +00:00
|
|
|
printExtendedName(OS, DV, dl);
|
2015-04-14 02:09:32 +00:00
|
|
|
|
2011-08-09 01:03:35 +00:00
|
|
|
OS << "\"\t";
|
2010-12-02 00:37:37 +00:00
|
|
|
if (offset)
|
|
|
|
OS << '+' << offset;
|
|
|
|
for (LocMap::const_iterator I = locInts.begin(); I.valid(); ++I) {
|
|
|
|
OS << " [" << I.start() << ';' << I.stop() << "):";
|
|
|
|
if (I.value() == ~0u)
|
|
|
|
OS << "undef";
|
|
|
|
else
|
|
|
|
OS << I.value();
|
|
|
|
}
|
2011-05-06 17:59:59 +00:00
|
|
|
for (unsigned i = 0, e = locations.size(); i != e; ++i) {
|
|
|
|
OS << " Loc" << i << '=';
|
2015-02-27 00:11:34 +00:00
|
|
|
locations[i].print(OS, TRI);
|
2011-05-06 17:59:59 +00:00
|
|
|
}
|
2010-12-02 00:37:37 +00:00
|
|
|
OS << '\n';
|
|
|
|
}
|
|
|
|
|
|
|
|
void LDVImpl::print(raw_ostream &OS) {
|
|
|
|
OS << "********** DEBUG VARIABLES **********\n";
|
|
|
|
for (unsigned i = 0, e = userValues.size(); i != e; ++i)
|
2015-02-27 00:11:34 +00:00
|
|
|
userValues[i]->print(OS, TRI);
|
2010-12-02 00:37:37 +00:00
|
|
|
}
|
|
|
|
|
2010-12-03 22:25:07 +00:00
|
|
|
void UserValue::coalesceLocation(unsigned LocNo) {
|
2011-01-09 05:33:21 +00:00
|
|
|
unsigned KeepLoc = 0;
|
|
|
|
for (unsigned e = locations.size(); KeepLoc != e; ++KeepLoc) {
|
|
|
|
if (KeepLoc == LocNo)
|
|
|
|
continue;
|
|
|
|
if (locations[KeepLoc].isIdenticalTo(locations[LocNo]))
|
|
|
|
break;
|
2010-12-03 22:25:07 +00:00
|
|
|
}
|
2011-01-09 05:33:21 +00:00
|
|
|
// No matches.
|
|
|
|
if (KeepLoc == locations.size())
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Keep the smaller location, erase the larger one.
|
|
|
|
unsigned EraseLoc = LocNo;
|
|
|
|
if (KeepLoc > EraseLoc)
|
|
|
|
std::swap(KeepLoc, EraseLoc);
|
2010-12-03 22:25:07 +00:00
|
|
|
locations.erase(locations.begin() + EraseLoc);
|
|
|
|
|
|
|
|
// Rewrite values.
|
|
|
|
for (LocMap::iterator I = locInts.begin(); I.valid(); ++I) {
|
|
|
|
unsigned v = I.value();
|
|
|
|
if (v == EraseLoc)
|
|
|
|
I.setValue(KeepLoc); // Coalesce when possible.
|
|
|
|
else if (v > EraseLoc)
|
|
|
|
I.setValueUnchecked(v-1); // Avoid coalescing with untransformed values.
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-03-18 21:42:19 +00:00
|
|
|
void UserValue::mapVirtRegs(LDVImpl *LDV) {
|
|
|
|
for (unsigned i = 0, e = locations.size(); i != e; ++i)
|
|
|
|
if (locations[i].isReg() &&
|
|
|
|
TargetRegisterInfo::isVirtualRegister(locations[i].getReg()))
|
|
|
|
LDV->mapVirtReg(locations[i].getReg(), this);
|
|
|
|
}
|
|
|
|
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
UserValue *LDVImpl::getUserValue(const MDNode *Var, const MDNode *Expr,
|
|
|
|
unsigned Offset, bool IsIndirect,
|
2016-06-12 15:39:02 +00:00
|
|
|
const DebugLoc &DL) {
|
2010-12-02 00:37:37 +00:00
|
|
|
UserValue *&Leader = userVarMap[Var];
|
|
|
|
if (Leader) {
|
|
|
|
UserValue *UV = Leader->getLeader();
|
|
|
|
Leader = UV;
|
|
|
|
for (; UV; UV = UV->getNext())
|
2015-04-16 22:27:54 +00:00
|
|
|
if (UV->match(Var, Expr, DL->getInlinedAt(), Offset, IsIndirect))
|
2010-12-02 00:37:37 +00:00
|
|
|
return UV;
|
|
|
|
}
|
|
|
|
|
2014-04-21 20:37:07 +00:00
|
|
|
userValues.push_back(
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
make_unique<UserValue>(Var, Expr, Offset, IsIndirect, DL, allocator));
|
2014-04-21 20:37:07 +00:00
|
|
|
UserValue *UV = userValues.back().get();
|
2010-12-02 00:37:37 +00:00
|
|
|
Leader = UserValue::merge(Leader, UV);
|
|
|
|
return UV;
|
|
|
|
}
|
|
|
|
|
|
|
|
void LDVImpl::mapVirtReg(unsigned VirtReg, UserValue *EC) {
|
|
|
|
assert(TargetRegisterInfo::isVirtualRegister(VirtReg) && "Only map VirtRegs");
|
2010-12-03 22:25:09 +00:00
|
|
|
UserValue *&Leader = virtRegToEqClass[VirtReg];
|
2010-12-02 00:37:37 +00:00
|
|
|
Leader = UserValue::merge(Leader, EC);
|
|
|
|
}
|
|
|
|
|
2010-12-02 18:15:44 +00:00
|
|
|
UserValue *LDVImpl::lookupVirtReg(unsigned VirtReg) {
|
2010-12-03 22:25:09 +00:00
|
|
|
if (UserValue *UV = virtRegToEqClass.lookup(VirtReg))
|
2010-12-02 18:15:44 +00:00
|
|
|
return UV->getLeader();
|
2014-04-14 00:51:57 +00:00
|
|
|
return nullptr;
|
2010-12-02 18:15:44 +00:00
|
|
|
}
|
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
bool LDVImpl::handleDebugValue(MachineInstr *MI, SlotIndex Idx) {
|
|
|
|
// DBG_VALUE loc, offset, variable
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
if (MI->getNumOperands() != 4 ||
|
2013-07-09 20:28:37 +00:00
|
|
|
!(MI->getOperand(1).isReg() || MI->getOperand(1).isImm()) ||
|
|
|
|
!MI->getOperand(2).isMetadata()) {
|
2010-12-02 00:37:37 +00:00
|
|
|
DEBUG(dbgs() << "Can't handle " << *MI);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get or create the UserValue for (variable,offset).
|
2013-09-16 23:29:03 +00:00
|
|
|
bool IsIndirect = MI->isIndirectDebugValue();
|
2013-07-09 20:28:37 +00:00
|
|
|
unsigned Offset = IsIndirect ? MI->getOperand(1).getImm() : 0;
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
const MDNode *Var = MI->getDebugVariable();
|
|
|
|
const MDNode *Expr = MI->getDebugExpression();
|
2013-09-16 23:29:03 +00:00
|
|
|
//here.
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
UserValue *UV =
|
|
|
|
getUserValue(Var, Expr, Offset, IsIndirect, MI->getDebugLoc());
|
2010-12-02 00:37:37 +00:00
|
|
|
UV->addDef(Idx, MI->getOperand(0));
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool LDVImpl::collectDebugValues(MachineFunction &mf) {
|
|
|
|
bool Changed = false;
|
|
|
|
for (MachineFunction::iterator MFI = mf.begin(), MFE = mf.end(); MFI != MFE;
|
|
|
|
++MFI) {
|
2015-10-09 19:13:58 +00:00
|
|
|
MachineBasicBlock *MBB = &*MFI;
|
2010-12-02 00:37:37 +00:00
|
|
|
for (MachineBasicBlock::iterator MBBI = MBB->begin(), MBBE = MBB->end();
|
|
|
|
MBBI != MBBE;) {
|
|
|
|
if (!MBBI->isDebugValue()) {
|
|
|
|
++MBBI;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
// DBG_VALUE has no slot index, use the previous instruction instead.
|
2016-02-27 06:40:41 +00:00
|
|
|
SlotIndex Idx =
|
|
|
|
MBBI == MBB->begin()
|
|
|
|
? LIS->getMBBStartIdx(MBB)
|
|
|
|
: LIS->getInstructionIndex(*std::prev(MBBI)).getRegSlot();
|
2010-12-02 00:37:37 +00:00
|
|
|
// Handle consecutive DBG_VALUE instructions with the same slot index.
|
|
|
|
do {
|
|
|
|
if (handleDebugValue(MBBI, Idx)) {
|
|
|
|
MBBI = MBB->erase(MBBI);
|
|
|
|
Changed = true;
|
|
|
|
} else
|
|
|
|
++MBBI;
|
|
|
|
} while (MBBI != MBBE && MBBI->isDebugValue());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Changed;
|
|
|
|
}
|
|
|
|
|
2015-12-21 20:03:00 +00:00
|
|
|
/// We only propagate DBG_VALUES locally here. LiveDebugValues performs a
|
|
|
|
/// data-flow analysis to propagate them beyond basic block boundaries.
|
|
|
|
void UserValue::extendDef(SlotIndex Idx, unsigned LocNo, LiveRange *LR,
|
|
|
|
const VNInfo *VNI, SmallVectorImpl<SlotIndex> *Kills,
|
2011-08-10 21:25:34 +00:00
|
|
|
LiveIntervals &LIS, MachineDominatorTree &MDT,
|
2012-03-15 21:33:39 +00:00
|
|
|
UserValueScopes &UVS) {
|
2015-12-21 20:03:00 +00:00
|
|
|
SlotIndex Start = Idx;
|
|
|
|
MachineBasicBlock *MBB = LIS.getMBBFromIndex(Start);
|
|
|
|
SlotIndex Stop = LIS.getMBBEndIdx(MBB);
|
|
|
|
LocMap::iterator I = locInts.find(Start);
|
|
|
|
|
|
|
|
// Limit to VNI's live range.
|
|
|
|
bool ToEnd = true;
|
|
|
|
if (LR && VNI) {
|
|
|
|
LiveInterval::Segment *Segment = LR->getSegmentContaining(Start);
|
|
|
|
if (!Segment || Segment->valno != VNI) {
|
|
|
|
if (Kills)
|
|
|
|
Kills->push_back(Start);
|
|
|
|
return;
|
2010-12-02 00:37:37 +00:00
|
|
|
}
|
2016-02-18 22:09:30 +00:00
|
|
|
if (Segment->end < Stop) {
|
|
|
|
Stop = Segment->end;
|
|
|
|
ToEnd = false;
|
|
|
|
}
|
2015-12-21 20:03:00 +00:00
|
|
|
}
|
2010-12-02 00:37:37 +00:00
|
|
|
|
2015-12-21 20:03:00 +00:00
|
|
|
// There could already be a short def at Start.
|
|
|
|
if (I.valid() && I.start() <= Start) {
|
|
|
|
// Stop when meeting a different location or an already extended interval.
|
|
|
|
Start = Start.getNextSlot();
|
|
|
|
if (I.value() != LocNo || I.stop() != Start)
|
|
|
|
return;
|
|
|
|
// This is a one-slot placeholder. Just skip it.
|
|
|
|
++I;
|
|
|
|
}
|
2010-12-02 00:37:37 +00:00
|
|
|
|
2015-12-21 20:03:00 +00:00
|
|
|
// Limited by the next def.
|
2016-02-18 22:09:30 +00:00
|
|
|
if (I.valid() && I.start() < Stop) {
|
|
|
|
Stop = I.start();
|
|
|
|
ToEnd = false;
|
|
|
|
}
|
2015-12-21 20:03:00 +00:00
|
|
|
// Limited by VNI's live range.
|
|
|
|
else if (!ToEnd && Kills)
|
|
|
|
Kills->push_back(Stop);
|
2010-12-02 00:37:37 +00:00
|
|
|
|
2015-12-21 20:03:00 +00:00
|
|
|
if (Start < Stop)
|
2010-12-02 00:37:37 +00:00
|
|
|
I.insert(Start, Stop, LocNo);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2011-03-18 21:42:19 +00:00
|
|
|
UserValue::addDefsFromCopies(LiveInterval *LI, unsigned LocNo,
|
|
|
|
const SmallVectorImpl<SlotIndex> &Kills,
|
|
|
|
SmallVectorImpl<std::pair<SlotIndex, unsigned> > &NewDefs,
|
|
|
|
MachineRegisterInfo &MRI, LiveIntervals &LIS) {
|
|
|
|
if (Kills.empty())
|
|
|
|
return;
|
|
|
|
// Don't track copies from physregs, there are too many uses.
|
|
|
|
if (!TargetRegisterInfo::isVirtualRegister(LI->reg))
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Collect all the (vreg, valno) pairs that are copies of LI.
|
|
|
|
SmallVector<std::pair<LiveInterval*, const VNInfo*>, 8> CopyValues;
|
2014-03-17 19:36:09 +00:00
|
|
|
for (MachineOperand &MO : MRI.use_nodbg_operands(LI->reg)) {
|
|
|
|
MachineInstr *MI = MO.getParent();
|
2011-03-18 21:42:19 +00:00
|
|
|
// Copies of the full value.
|
2014-03-17 19:36:09 +00:00
|
|
|
if (MO.getSubReg() || !MI->isCopy())
|
2011-03-18 21:42:19 +00:00
|
|
|
continue;
|
|
|
|
unsigned DstReg = MI->getOperand(0).getReg();
|
|
|
|
|
2011-03-22 22:33:08 +00:00
|
|
|
// Don't follow copies to physregs. These are usually setting up call
|
|
|
|
// arguments, and the argument registers are always call clobbered. We are
|
|
|
|
// better off in the source register which could be a callee-saved register,
|
|
|
|
// or it could be spilled.
|
|
|
|
if (!TargetRegisterInfo::isVirtualRegister(DstReg))
|
|
|
|
continue;
|
|
|
|
|
2011-03-18 21:42:19 +00:00
|
|
|
// Is LocNo extended to reach this copy? If not, another def may be blocking
|
|
|
|
// it, or we are looking at a wrong value of LI.
|
2016-02-27 06:40:41 +00:00
|
|
|
SlotIndex Idx = LIS.getInstructionIndex(*MI);
|
2011-11-13 20:45:27 +00:00
|
|
|
LocMap::iterator I = locInts.find(Idx.getRegSlot(true));
|
2011-03-18 21:42:19 +00:00
|
|
|
if (!I.valid() || I.value() != LocNo)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!LIS.hasInterval(DstReg))
|
|
|
|
continue;
|
|
|
|
LiveInterval *DstLI = &LIS.getInterval(DstReg);
|
2011-11-13 20:45:27 +00:00
|
|
|
const VNInfo *DstVNI = DstLI->getVNInfoAt(Idx.getRegSlot());
|
|
|
|
assert(DstVNI && DstVNI->def == Idx.getRegSlot() && "Bad copy value");
|
2011-03-18 21:42:19 +00:00
|
|
|
CopyValues.push_back(std::make_pair(DstLI, DstVNI));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (CopyValues.empty())
|
|
|
|
return;
|
|
|
|
|
|
|
|
DEBUG(dbgs() << "Got " << CopyValues.size() << " copies of " << *LI << '\n');
|
|
|
|
|
|
|
|
// Try to add defs of the copied values for each kill point.
|
|
|
|
for (unsigned i = 0, e = Kills.size(); i != e; ++i) {
|
|
|
|
SlotIndex Idx = Kills[i];
|
|
|
|
for (unsigned j = 0, e = CopyValues.size(); j != e; ++j) {
|
|
|
|
LiveInterval *DstLI = CopyValues[j].first;
|
|
|
|
const VNInfo *DstVNI = CopyValues[j].second;
|
|
|
|
if (DstLI->getVNInfoAt(Idx) != DstVNI)
|
|
|
|
continue;
|
|
|
|
// Check that there isn't already a def at Idx
|
|
|
|
LocMap::iterator I = locInts.find(Idx);
|
|
|
|
if (I.valid() && I.start() <= Idx)
|
|
|
|
continue;
|
|
|
|
DEBUG(dbgs() << "Kill at " << Idx << " covered by valno #"
|
|
|
|
<< DstVNI->id << " in " << *DstLI << '\n');
|
|
|
|
MachineInstr *CopyMI = LIS.getInstructionFromIndex(DstVNI->def);
|
|
|
|
assert(CopyMI && CopyMI->isCopy() && "Bad copy value");
|
|
|
|
unsigned LocNo = getLocationNo(CopyMI->getOperand(0));
|
|
|
|
I.insert(Idx, Idx.getNextSlot(), LocNo);
|
|
|
|
NewDefs.push_back(std::make_pair(Idx, LocNo));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
UserValue::computeIntervals(MachineRegisterInfo &MRI,
|
2012-06-22 17:15:32 +00:00
|
|
|
const TargetRegisterInfo &TRI,
|
2011-03-18 21:42:19 +00:00
|
|
|
LiveIntervals &LIS,
|
2011-08-10 21:25:34 +00:00
|
|
|
MachineDominatorTree &MDT,
|
2012-03-15 21:33:39 +00:00
|
|
|
UserValueScopes &UVS) {
|
2010-12-02 00:37:37 +00:00
|
|
|
SmallVector<std::pair<SlotIndex, unsigned>, 16> Defs;
|
|
|
|
|
|
|
|
// Collect all defs to be extended (Skipping undefs).
|
|
|
|
for (LocMap::const_iterator I = locInts.begin(); I.valid(); ++I)
|
|
|
|
if (I.value() != ~0u)
|
|
|
|
Defs.push_back(std::make_pair(I.start(), I.value()));
|
|
|
|
|
2011-03-18 21:42:19 +00:00
|
|
|
// Extend all defs, and possibly add new ones along the way.
|
|
|
|
for (unsigned i = 0; i != Defs.size(); ++i) {
|
2010-12-02 00:37:37 +00:00
|
|
|
SlotIndex Idx = Defs[i].first;
|
|
|
|
unsigned LocNo = Defs[i].second;
|
2011-01-09 05:33:21 +00:00
|
|
|
const MachineOperand &Loc = locations[LocNo];
|
2010-12-02 00:37:37 +00:00
|
|
|
|
2012-06-22 17:15:32 +00:00
|
|
|
if (!Loc.isReg()) {
|
2014-04-14 00:51:57 +00:00
|
|
|
extendDef(Idx, LocNo, nullptr, nullptr, nullptr, LIS, MDT, UVS);
|
2012-06-22 17:15:32 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-12-02 00:37:37 +00:00
|
|
|
// Register locations are constrained to where the register value is live.
|
2012-06-22 17:15:32 +00:00
|
|
|
if (TargetRegisterInfo::isVirtualRegister(Loc.getReg())) {
|
2014-04-14 00:51:57 +00:00
|
|
|
LiveInterval *LI = nullptr;
|
|
|
|
const VNInfo *VNI = nullptr;
|
2012-06-22 18:51:35 +00:00
|
|
|
if (LIS.hasInterval(Loc.getReg())) {
|
|
|
|
LI = &LIS.getInterval(Loc.getReg());
|
|
|
|
VNI = LI->getVNInfoAt(Idx);
|
|
|
|
}
|
2011-03-18 21:42:19 +00:00
|
|
|
SmallVector<SlotIndex, 16> Kills;
|
2011-09-13 18:40:53 +00:00
|
|
|
extendDef(Idx, LocNo, LI, VNI, &Kills, LIS, MDT, UVS);
|
2012-06-22 18:51:35 +00:00
|
|
|
if (LI)
|
|
|
|
addDefsFromCopies(LI, LocNo, Kills, Defs, MRI, LIS);
|
2012-06-22 17:15:32 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// For physregs, use the live range of the first regunit as a guide.
|
|
|
|
unsigned Unit = *MCRegUnitIterator(Loc.getReg(), &TRI);
|
2013-10-10 21:29:02 +00:00
|
|
|
LiveRange *LR = &LIS.getRegUnit(Unit);
|
|
|
|
const VNInfo *VNI = LR->getVNInfoAt(Idx);
|
2012-06-22 17:15:32 +00:00
|
|
|
// Don't track copies from physregs, it is too expensive.
|
2014-04-14 00:51:57 +00:00
|
|
|
extendDef(Idx, LocNo, LR, VNI, nullptr, LIS, MDT, UVS);
|
2010-12-02 00:37:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Finally, erase all the undefs.
|
|
|
|
for (LocMap::iterator I = locInts.begin(); I.valid();)
|
|
|
|
if (I.value() == ~0u)
|
|
|
|
I.erase();
|
|
|
|
else
|
|
|
|
++I;
|
|
|
|
}
|
|
|
|
|
|
|
|
void LDVImpl::computeIntervals() {
|
2011-03-18 21:42:19 +00:00
|
|
|
for (unsigned i = 0, e = userValues.size(); i != e; ++i) {
|
2011-09-13 18:40:53 +00:00
|
|
|
UserValueScopes UVS(userValues[i]->getDebugLoc(), LS);
|
2012-06-22 17:15:32 +00:00
|
|
|
userValues[i]->computeIntervals(MF->getRegInfo(), *TRI, *LIS, *MDT, UVS);
|
2011-03-18 21:42:19 +00:00
|
|
|
userValues[i]->mapVirtRegs(this);
|
|
|
|
}
|
2010-12-02 00:37:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool LDVImpl::runOnMachineFunction(MachineFunction &mf) {
|
Recommit r212203: Don't try to construct debug LexicalScopes hierarchy for functions that do not have top level debug information.
Reverted by Eric Christopher (Thanks!) in r212203 after Bob Wilson
reported LTO issues. Duncan Exon Smith and Aditya Nandakumar helped
provide a reduced reproduction, though the failure wasn't too hard to
guess, and even easier with the example to confirm.
The assertion that the subprogram metadata associated with an
llvm::Function matches the scope data referenced by the DbgLocs on the
instructions in that function is not valid under LTO. In LTO, a C++
inline function might exist in multiple CUs and the subprogram metadata
nodes will refer to the same llvm::Function. In this case, depending on
the order of the CUs, the first intance of the subprogram metadata may
not be the one referenced by the instructions in that function and the
assertion will fail.
A test case (test/DebugInfo/cross-cu-linkonce-distinct.ll) is added, the
assertion removed and a comment added to explain this situation.
This was then reverted again in r213581 as it caused PR20367. The root
cause of this was the early exit in LiveDebugVariables meant that
spurious DBG_VALUE intrinsics that referenced dead variables were not
removed, causing an assertion/crash later on. The fix is to have
LiveDebugVariables strip all DBG_VALUE intrinsics in functions without
debug info as they're not needed anyway. Test case added to cover this
situation (that occurs when a debug-having function is inlined into a
nodebug function) in test/DebugInfo/X86/nodebug_with_debug_loc.ll
Original commit message:
If a function isn't actually in a CU's subprogram list in the debug info
metadata, ignore all the DebugLocs and don't try to build scopes, track
variables, etc.
While this is possibly a minor optimization, it's also a correctness fix
for an incoming patch that will add assertions to LexicalScopes and the
debug info verifier to ensure that all scope chains lead to debug info
for the current function.
Fix up a few test cases that had broken/incomplete debug info that could
violate this constraint.
Add a test case where this occurs by design (inlining a
debug-info-having function in an attribute nodebug function - we want
this to work because /if/ the nodebug function is then inlined into a
debug-info-having function, it should be fine (and will work fine - we
just stitch the scopes up as usual), but should the inlining not happen
we need to not assert fail either).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213952 91177308-0d34-0410-b5e6-96231b3b80d8
2014-07-25 16:10:16 +00:00
|
|
|
clear();
|
2010-12-02 00:37:37 +00:00
|
|
|
MF = &mf;
|
|
|
|
LIS = &pass.getAnalysis<LiveIntervals>();
|
|
|
|
MDT = &pass.getAnalysis<MachineDominatorTree>();
|
2014-08-05 02:39:49 +00:00
|
|
|
TRI = mf.getSubtarget().getRegisterInfo();
|
2011-08-10 21:25:34 +00:00
|
|
|
LS.initialize(mf);
|
2010-12-02 00:37:37 +00:00
|
|
|
DEBUG(dbgs() << "********** COMPUTING LIVE DEBUG VARIABLES: "
|
2012-08-22 17:18:53 +00:00
|
|
|
<< mf.getName() << " **********\n");
|
2010-12-02 00:37:37 +00:00
|
|
|
|
|
|
|
bool Changed = collectDebugValues(mf);
|
|
|
|
computeIntervals();
|
|
|
|
DEBUG(print(dbgs()));
|
2013-02-13 20:23:48 +00:00
|
|
|
ModifiedMF = Changed;
|
2010-12-02 00:37:37 +00:00
|
|
|
return Changed;
|
|
|
|
}
|
|
|
|
|
Recommit r212203: Don't try to construct debug LexicalScopes hierarchy for functions that do not have top level debug information.
Reverted by Eric Christopher (Thanks!) in r212203 after Bob Wilson
reported LTO issues. Duncan Exon Smith and Aditya Nandakumar helped
provide a reduced reproduction, though the failure wasn't too hard to
guess, and even easier with the example to confirm.
The assertion that the subprogram metadata associated with an
llvm::Function matches the scope data referenced by the DbgLocs on the
instructions in that function is not valid under LTO. In LTO, a C++
inline function might exist in multiple CUs and the subprogram metadata
nodes will refer to the same llvm::Function. In this case, depending on
the order of the CUs, the first intance of the subprogram metadata may
not be the one referenced by the instructions in that function and the
assertion will fail.
A test case (test/DebugInfo/cross-cu-linkonce-distinct.ll) is added, the
assertion removed and a comment added to explain this situation.
This was then reverted again in r213581 as it caused PR20367. The root
cause of this was the early exit in LiveDebugVariables meant that
spurious DBG_VALUE intrinsics that referenced dead variables were not
removed, causing an assertion/crash later on. The fix is to have
LiveDebugVariables strip all DBG_VALUE intrinsics in functions without
debug info as they're not needed anyway. Test case added to cover this
situation (that occurs when a debug-having function is inlined into a
nodebug function) in test/DebugInfo/X86/nodebug_with_debug_loc.ll
Original commit message:
If a function isn't actually in a CU's subprogram list in the debug info
metadata, ignore all the DebugLocs and don't try to build scopes, track
variables, etc.
While this is possibly a minor optimization, it's also a correctness fix
for an incoming patch that will add assertions to LexicalScopes and the
debug info verifier to ensure that all scope chains lead to debug info
for the current function.
Fix up a few test cases that had broken/incomplete debug info that could
violate this constraint.
Add a test case where this occurs by design (inlining a
debug-info-having function in an attribute nodebug function - we want
this to work because /if/ the nodebug function is then inlined into a
debug-info-having function, it should be fine (and will work fine - we
just stitch the scopes up as usual), but should the inlining not happen
we need to not assert fail either).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213952 91177308-0d34-0410-b5e6-96231b3b80d8
2014-07-25 16:10:16 +00:00
|
|
|
static void removeDebugValues(MachineFunction &mf) {
|
|
|
|
for (MachineBasicBlock &MBB : mf) {
|
|
|
|
for (auto MBBI = MBB.begin(), MBBE = MBB.end(); MBBI != MBBE; ) {
|
|
|
|
if (!MBBI->isDebugValue()) {
|
|
|
|
++MBBI;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
MBBI = MBB.erase(MBBI);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-30 02:17:10 +00:00
|
|
|
bool LiveDebugVariables::runOnMachineFunction(MachineFunction &mf) {
|
2011-01-07 22:33:41 +00:00
|
|
|
if (!EnableLDV)
|
|
|
|
return false;
|
2015-11-05 22:03:56 +00:00
|
|
|
if (!mf.getFunction()->getSubprogram()) {
|
Recommit r212203: Don't try to construct debug LexicalScopes hierarchy for functions that do not have top level debug information.
Reverted by Eric Christopher (Thanks!) in r212203 after Bob Wilson
reported LTO issues. Duncan Exon Smith and Aditya Nandakumar helped
provide a reduced reproduction, though the failure wasn't too hard to
guess, and even easier with the example to confirm.
The assertion that the subprogram metadata associated with an
llvm::Function matches the scope data referenced by the DbgLocs on the
instructions in that function is not valid under LTO. In LTO, a C++
inline function might exist in multiple CUs and the subprogram metadata
nodes will refer to the same llvm::Function. In this case, depending on
the order of the CUs, the first intance of the subprogram metadata may
not be the one referenced by the instructions in that function and the
assertion will fail.
A test case (test/DebugInfo/cross-cu-linkonce-distinct.ll) is added, the
assertion removed and a comment added to explain this situation.
This was then reverted again in r213581 as it caused PR20367. The root
cause of this was the early exit in LiveDebugVariables meant that
spurious DBG_VALUE intrinsics that referenced dead variables were not
removed, causing an assertion/crash later on. The fix is to have
LiveDebugVariables strip all DBG_VALUE intrinsics in functions without
debug info as they're not needed anyway. Test case added to cover this
situation (that occurs when a debug-having function is inlined into a
nodebug function) in test/DebugInfo/X86/nodebug_with_debug_loc.ll
Original commit message:
If a function isn't actually in a CU's subprogram list in the debug info
metadata, ignore all the DebugLocs and don't try to build scopes, track
variables, etc.
While this is possibly a minor optimization, it's also a correctness fix
for an incoming patch that will add assertions to LexicalScopes and the
debug info verifier to ensure that all scope chains lead to debug info
for the current function.
Fix up a few test cases that had broken/incomplete debug info that could
violate this constraint.
Add a test case where this occurs by design (inlining a
debug-info-having function in an attribute nodebug function - we want
this to work because /if/ the nodebug function is then inlined into a
debug-info-having function, it should be fine (and will work fine - we
just stitch the scopes up as usual), but should the inlining not happen
we need to not assert fail either).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213952 91177308-0d34-0410-b5e6-96231b3b80d8
2014-07-25 16:10:16 +00:00
|
|
|
removeDebugValues(mf);
|
|
|
|
return false;
|
|
|
|
}
|
2010-12-02 00:37:37 +00:00
|
|
|
if (!pImpl)
|
|
|
|
pImpl = new LDVImpl(this);
|
2013-02-13 20:23:48 +00:00
|
|
|
return static_cast<LDVImpl*>(pImpl)->runOnMachineFunction(mf);
|
2010-12-02 00:37:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void LiveDebugVariables::releaseMemory() {
|
2013-02-13 20:23:48 +00:00
|
|
|
if (pImpl)
|
2010-12-02 00:37:37 +00:00
|
|
|
static_cast<LDVImpl*>(pImpl)->clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
LiveDebugVariables::~LiveDebugVariables() {
|
|
|
|
if (pImpl)
|
|
|
|
delete static_cast<LDVImpl*>(pImpl);
|
2010-11-30 02:17:10 +00:00
|
|
|
}
|
2010-12-02 18:15:44 +00:00
|
|
|
|
2011-05-06 18:00:02 +00:00
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
// Live Range Splitting
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
bool
|
2013-08-14 23:50:04 +00:00
|
|
|
UserValue::splitLocation(unsigned OldLocNo, ArrayRef<unsigned> NewRegs,
|
|
|
|
LiveIntervals& LIS) {
|
2011-05-06 18:00:02 +00:00
|
|
|
DEBUG({
|
|
|
|
dbgs() << "Splitting Loc" << OldLocNo << '\t';
|
2014-04-14 00:51:57 +00:00
|
|
|
print(dbgs(), nullptr);
|
2011-05-06 18:00:02 +00:00
|
|
|
});
|
|
|
|
bool DidChange = false;
|
|
|
|
LocMap::iterator LocMapI;
|
|
|
|
LocMapI.setMap(locInts);
|
|
|
|
for (unsigned i = 0; i != NewRegs.size(); ++i) {
|
2013-08-14 23:50:04 +00:00
|
|
|
LiveInterval *LI = &LIS.getInterval(NewRegs[i]);
|
2011-05-06 18:00:02 +00:00
|
|
|
if (LI->empty())
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// Don't allocate the new LocNo until it is needed.
|
|
|
|
unsigned NewLocNo = ~0u;
|
|
|
|
|
|
|
|
// Iterate over the overlaps between locInts and LI.
|
|
|
|
LocMapI.find(LI->beginIndex());
|
|
|
|
if (!LocMapI.valid())
|
|
|
|
continue;
|
|
|
|
LiveInterval::iterator LII = LI->advanceTo(LI->begin(), LocMapI.start());
|
|
|
|
LiveInterval::iterator LIE = LI->end();
|
|
|
|
while (LocMapI.valid() && LII != LIE) {
|
|
|
|
// At this point, we know that LocMapI.stop() > LII->start.
|
|
|
|
LII = LI->advanceTo(LII, LocMapI.start());
|
|
|
|
if (LII == LIE)
|
|
|
|
break;
|
|
|
|
|
|
|
|
// Now LII->end > LocMapI.start(). Do we have an overlap?
|
|
|
|
if (LocMapI.value() == OldLocNo && LII->start < LocMapI.stop()) {
|
|
|
|
// Overlapping correct location. Allocate NewLocNo now.
|
|
|
|
if (NewLocNo == ~0u) {
|
|
|
|
MachineOperand MO = MachineOperand::CreateReg(LI->reg, false);
|
|
|
|
MO.setSubReg(locations[OldLocNo].getSubReg());
|
|
|
|
NewLocNo = getLocationNo(MO);
|
|
|
|
DidChange = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
SlotIndex LStart = LocMapI.start();
|
|
|
|
SlotIndex LStop = LocMapI.stop();
|
|
|
|
|
|
|
|
// Trim LocMapI down to the LII overlap.
|
|
|
|
if (LStart < LII->start)
|
|
|
|
LocMapI.setStartUnchecked(LII->start);
|
|
|
|
if (LStop > LII->end)
|
|
|
|
LocMapI.setStopUnchecked(LII->end);
|
|
|
|
|
|
|
|
// Change the value in the overlap. This may trigger coalescing.
|
|
|
|
LocMapI.setValue(NewLocNo);
|
|
|
|
|
|
|
|
// Re-insert any removed OldLocNo ranges.
|
|
|
|
if (LStart < LocMapI.start()) {
|
|
|
|
LocMapI.insert(LStart, LocMapI.start(), OldLocNo);
|
|
|
|
++LocMapI;
|
|
|
|
assert(LocMapI.valid() && "Unexpected coalescing");
|
|
|
|
}
|
|
|
|
if (LStop > LocMapI.stop()) {
|
|
|
|
++LocMapI;
|
|
|
|
LocMapI.insert(LII->end, LStop, OldLocNo);
|
|
|
|
--LocMapI;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Advance to the next overlap.
|
|
|
|
if (LII->end < LocMapI.stop()) {
|
|
|
|
if (++LII == LIE)
|
|
|
|
break;
|
|
|
|
LocMapI.advanceTo(LII->start);
|
|
|
|
} else {
|
|
|
|
++LocMapI;
|
|
|
|
if (!LocMapI.valid())
|
|
|
|
break;
|
|
|
|
LII = LI->advanceTo(LII, LocMapI.start());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Finally, remove any remaining OldLocNo intervals and OldLocNo itself.
|
|
|
|
locations.erase(locations.begin() + OldLocNo);
|
|
|
|
LocMapI.goToBegin();
|
|
|
|
while (LocMapI.valid()) {
|
|
|
|
unsigned v = LocMapI.value();
|
|
|
|
if (v == OldLocNo) {
|
|
|
|
DEBUG(dbgs() << "Erasing [" << LocMapI.start() << ';'
|
|
|
|
<< LocMapI.stop() << ")\n");
|
|
|
|
LocMapI.erase();
|
|
|
|
} else {
|
|
|
|
if (v > OldLocNo)
|
|
|
|
LocMapI.setValueUnchecked(v-1);
|
|
|
|
++LocMapI;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-14 00:51:57 +00:00
|
|
|
DEBUG({dbgs() << "Split result: \t"; print(dbgs(), nullptr);});
|
2011-05-06 18:00:02 +00:00
|
|
|
return DidChange;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool
|
2013-08-14 23:50:04 +00:00
|
|
|
UserValue::splitRegister(unsigned OldReg, ArrayRef<unsigned> NewRegs,
|
|
|
|
LiveIntervals &LIS) {
|
2011-05-06 18:00:02 +00:00
|
|
|
bool DidChange = false;
|
2011-05-06 19:31:19 +00:00
|
|
|
// Split locations referring to OldReg. Iterate backwards so splitLocation can
|
2012-03-15 21:33:35 +00:00
|
|
|
// safely erase unused locations.
|
2011-05-06 19:31:19 +00:00
|
|
|
for (unsigned i = locations.size(); i ; --i) {
|
|
|
|
unsigned LocNo = i-1;
|
2011-05-06 18:00:02 +00:00
|
|
|
const MachineOperand *Loc = &locations[LocNo];
|
|
|
|
if (!Loc->isReg() || Loc->getReg() != OldReg)
|
|
|
|
continue;
|
2013-08-14 23:50:04 +00:00
|
|
|
DidChange |= splitLocation(LocNo, NewRegs, LIS);
|
2011-05-06 18:00:02 +00:00
|
|
|
}
|
|
|
|
return DidChange;
|
|
|
|
}
|
|
|
|
|
2013-08-14 23:50:04 +00:00
|
|
|
void LDVImpl::splitRegister(unsigned OldReg, ArrayRef<unsigned> NewRegs) {
|
2011-05-06 18:00:02 +00:00
|
|
|
bool DidChange = false;
|
|
|
|
for (UserValue *UV = lookupVirtReg(OldReg); UV; UV = UV->getNext())
|
2013-08-14 23:50:04 +00:00
|
|
|
DidChange |= UV->splitRegister(OldReg, NewRegs, *LIS);
|
2011-05-06 18:00:02 +00:00
|
|
|
|
|
|
|
if (!DidChange)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Map all of the new virtual registers.
|
|
|
|
UserValue *UV = lookupVirtReg(OldReg);
|
|
|
|
for (unsigned i = 0; i != NewRegs.size(); ++i)
|
2013-08-14 23:50:04 +00:00
|
|
|
mapVirtReg(NewRegs[i], UV);
|
2011-05-06 18:00:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void LiveDebugVariables::
|
2013-08-14 23:50:04 +00:00
|
|
|
splitRegister(unsigned OldReg, ArrayRef<unsigned> NewRegs, LiveIntervals &LIS) {
|
2011-05-06 18:00:02 +00:00
|
|
|
if (pImpl)
|
|
|
|
static_cast<LDVImpl*>(pImpl)->splitRegister(OldReg, NewRegs);
|
|
|
|
}
|
|
|
|
|
2010-12-03 21:47:10 +00:00
|
|
|
void
|
|
|
|
UserValue::rewriteLocations(VirtRegMap &VRM, const TargetRegisterInfo &TRI) {
|
|
|
|
// Iterate over locations in reverse makes it easier to handle coalescing.
|
|
|
|
for (unsigned i = locations.size(); i ; --i) {
|
|
|
|
unsigned LocNo = i-1;
|
2011-01-09 05:33:21 +00:00
|
|
|
MachineOperand &Loc = locations[LocNo];
|
2010-12-03 21:47:10 +00:00
|
|
|
// Only virtual registers are rewritten.
|
2011-01-09 05:33:21 +00:00
|
|
|
if (!Loc.isReg() || !Loc.getReg() ||
|
|
|
|
!TargetRegisterInfo::isVirtualRegister(Loc.getReg()))
|
2010-12-03 21:47:10 +00:00
|
|
|
continue;
|
2011-01-09 05:33:21 +00:00
|
|
|
unsigned VirtReg = Loc.getReg();
|
2011-01-12 22:37:49 +00:00
|
|
|
if (VRM.isAssignedReg(VirtReg) &&
|
|
|
|
TargetRegisterInfo::isPhysicalRegister(VRM.getPhys(VirtReg))) {
|
2011-05-08 19:21:08 +00:00
|
|
|
// This can create a %noreg operand in rare cases when the sub-register
|
|
|
|
// index is no longer available. That means the user value is in a
|
|
|
|
// non-existent sub-register, and %noreg is exactly what we want.
|
2011-01-09 05:33:21 +00:00
|
|
|
Loc.substPhysReg(VRM.getPhys(VirtReg), TRI);
|
2011-11-13 01:23:30 +00:00
|
|
|
} else if (VRM.getStackSlot(VirtReg) != VirtRegMap::NO_STACK_SLOT) {
|
2010-12-03 21:47:10 +00:00
|
|
|
// FIXME: Translate SubIdx to a stackslot offset.
|
2011-01-09 05:33:21 +00:00
|
|
|
Loc = MachineOperand::CreateFI(VRM.getStackSlot(VirtReg));
|
2010-12-03 21:47:10 +00:00
|
|
|
} else {
|
2011-01-09 05:33:21 +00:00
|
|
|
Loc.setReg(0);
|
|
|
|
Loc.setSubReg(0);
|
2010-12-03 21:47:10 +00:00
|
|
|
}
|
2010-12-03 22:25:07 +00:00
|
|
|
coalesceLocation(LocNo);
|
2010-12-03 21:47:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-02-04 01:43:25 +00:00
|
|
|
/// findInsertLocation - Find an iterator for inserting a DBG_VALUE
|
2010-12-03 21:47:10 +00:00
|
|
|
/// instruction.
|
|
|
|
static MachineBasicBlock::iterator
|
2011-02-04 01:43:25 +00:00
|
|
|
findInsertLocation(MachineBasicBlock *MBB, SlotIndex Idx,
|
2010-12-03 21:47:10 +00:00
|
|
|
LiveIntervals &LIS) {
|
|
|
|
SlotIndex Start = LIS.getMBBStartIdx(MBB);
|
|
|
|
Idx = Idx.getBaseIndex();
|
|
|
|
|
|
|
|
// Try to find an insert location by going backwards from Idx.
|
|
|
|
MachineInstr *MI;
|
|
|
|
while (!(MI = LIS.getInstructionFromIndex(Idx))) {
|
|
|
|
// We've reached the beginning of MBB.
|
|
|
|
if (Idx == Start) {
|
|
|
|
MachineBasicBlock::iterator I = MBB->SkipPHIsAndLabels(MBB->begin());
|
|
|
|
return I;
|
|
|
|
}
|
|
|
|
Idx = Idx.getPrevIndex();
|
|
|
|
}
|
2011-02-04 01:43:25 +00:00
|
|
|
|
2011-01-13 23:35:53 +00:00
|
|
|
// Don't insert anything after the first terminator, though.
|
2011-12-07 07:15:52 +00:00
|
|
|
return MI->isTerminator() ? MBB->getFirstTerminator() :
|
2014-03-02 12:27:27 +00:00
|
|
|
std::next(MachineBasicBlock::iterator(MI));
|
2010-12-03 21:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void UserValue::insertDebugValue(MachineBasicBlock *MBB, SlotIndex Idx,
|
|
|
|
unsigned LocNo,
|
|
|
|
LiveIntervals &LIS,
|
|
|
|
const TargetInstrInfo &TII) {
|
2011-02-04 01:43:25 +00:00
|
|
|
MachineBasicBlock::iterator I = findInsertLocation(MBB, Idx, LIS);
|
2011-01-09 05:33:21 +00:00
|
|
|
MachineOperand &Loc = locations[LocNo];
|
2011-08-04 20:42:11 +00:00
|
|
|
++NumInsertedDebugValues;
|
2010-12-03 21:47:10 +00:00
|
|
|
|
2015-04-29 16:38:44 +00:00
|
|
|
assert(cast<DILocalVariable>(Variable)
|
2015-04-06 23:27:40 +00:00
|
|
|
->isValidLocationForIntrinsic(getDebugLoc()) &&
|
2015-04-03 19:20:26 +00:00
|
|
|
"Expected inlined-at fields to agree");
|
2013-07-09 20:28:37 +00:00
|
|
|
if (Loc.isReg())
|
2015-04-03 19:20:26 +00:00
|
|
|
BuildMI(*MBB, I, getDebugLoc(), TII.get(TargetOpcode::DBG_VALUE),
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
IsIndirect, Loc.getReg(), offset, Variable, Expression);
|
2013-07-09 20:28:37 +00:00
|
|
|
else
|
2015-04-03 19:20:26 +00:00
|
|
|
BuildMI(*MBB, I, getDebugLoc(), TII.get(TargetOpcode::DBG_VALUE))
|
Move the complex address expression out of DIVariable and into an extra
argument of the llvm.dbg.declare/llvm.dbg.value intrinsics.
Previously, DIVariable was a variable-length field that has an optional
reference to a Metadata array consisting of a variable number of
complex address expressions. In the case of OpPiece expressions this is
wasting a lot of storage in IR, because when an aggregate type is, e.g.,
SROA'd into all of its n individual members, the IR will contain n copies
of the DIVariable, all alike, only differing in the complex address
reference at the end.
By making the complex address into an extra argument of the
dbg.value/dbg.declare intrinsics, all of the pieces can reference the
same variable and the complex address expressions can be uniqued across
the CU, too.
Down the road, this will allow us to move other flags, such as
"indirection" out of the DIVariable, too.
The new intrinsics look like this:
declare void @llvm.dbg.declare(metadata %storage, metadata %var, metadata %expr)
declare void @llvm.dbg.value(metadata %storage, i64 %offset, metadata %var, metadata %expr)
This patch adds a new LLVM-local tag to DIExpressions, so we can detect
and pretty-print DIExpression metadata nodes.
What this patch doesn't do:
This patch does not touch the "Indirect" field in DIVariable; but moving
that into the expression would be a natural next step.
http://reviews.llvm.org/D4919
rdar://problem/17994491
Thanks to dblaikie and dexonsmith for reviewing this patch!
Note: I accidentally committed a bogus older version of this patch previously.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@218787 91177308-0d34-0410-b5e6-96231b3b80d8
2014-10-01 18:55:02 +00:00
|
|
|
.addOperand(Loc)
|
|
|
|
.addImm(offset)
|
|
|
|
.addMetadata(Variable)
|
|
|
|
.addMetadata(Expression);
|
2010-12-03 21:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void UserValue::emitDebugValues(VirtRegMap *VRM, LiveIntervals &LIS,
|
|
|
|
const TargetInstrInfo &TII) {
|
|
|
|
MachineFunction::iterator MFEnd = VRM->getMachineFunction().end();
|
|
|
|
|
|
|
|
for (LocMap::const_iterator I = locInts.begin(); I.valid();) {
|
|
|
|
SlotIndex Start = I.start();
|
|
|
|
SlotIndex Stop = I.stop();
|
|
|
|
unsigned LocNo = I.value();
|
|
|
|
DEBUG(dbgs() << "\t[" << Start << ';' << Stop << "):" << LocNo);
|
2015-10-09 19:13:58 +00:00
|
|
|
MachineFunction::iterator MBB = LIS.getMBBFromIndex(Start)->getIterator();
|
|
|
|
SlotIndex MBBEnd = LIS.getMBBEndIdx(&*MBB);
|
2010-12-03 21:47:10 +00:00
|
|
|
|
|
|
|
DEBUG(dbgs() << " BB#" << MBB->getNumber() << '-' << MBBEnd);
|
2015-10-09 19:13:58 +00:00
|
|
|
insertDebugValue(&*MBB, Start, LocNo, LIS, TII);
|
2010-12-03 21:47:10 +00:00
|
|
|
// This interval may span multiple basic blocks.
|
|
|
|
// Insert a DBG_VALUE into each one.
|
|
|
|
while(Stop > MBBEnd) {
|
|
|
|
// Move to the next block.
|
|
|
|
Start = MBBEnd;
|
|
|
|
if (++MBB == MFEnd)
|
|
|
|
break;
|
2015-10-09 19:13:58 +00:00
|
|
|
MBBEnd = LIS.getMBBEndIdx(&*MBB);
|
2010-12-03 21:47:10 +00:00
|
|
|
DEBUG(dbgs() << " BB#" << MBB->getNumber() << '-' << MBBEnd);
|
2015-10-09 19:13:58 +00:00
|
|
|
insertDebugValue(&*MBB, Start, LocNo, LIS, TII);
|
2010-12-03 21:47:10 +00:00
|
|
|
}
|
|
|
|
DEBUG(dbgs() << '\n');
|
|
|
|
if (MBB == MFEnd)
|
|
|
|
break;
|
|
|
|
|
|
|
|
++I;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void LDVImpl::emitDebugValues(VirtRegMap *VRM) {
|
|
|
|
DEBUG(dbgs() << "********** EMITTING LIVE DEBUG VARIABLES **********\n");
|
Recommit r212203: Don't try to construct debug LexicalScopes hierarchy for functions that do not have top level debug information.
Reverted by Eric Christopher (Thanks!) in r212203 after Bob Wilson
reported LTO issues. Duncan Exon Smith and Aditya Nandakumar helped
provide a reduced reproduction, though the failure wasn't too hard to
guess, and even easier with the example to confirm.
The assertion that the subprogram metadata associated with an
llvm::Function matches the scope data referenced by the DbgLocs on the
instructions in that function is not valid under LTO. In LTO, a C++
inline function might exist in multiple CUs and the subprogram metadata
nodes will refer to the same llvm::Function. In this case, depending on
the order of the CUs, the first intance of the subprogram metadata may
not be the one referenced by the instructions in that function and the
assertion will fail.
A test case (test/DebugInfo/cross-cu-linkonce-distinct.ll) is added, the
assertion removed and a comment added to explain this situation.
This was then reverted again in r213581 as it caused PR20367. The root
cause of this was the early exit in LiveDebugVariables meant that
spurious DBG_VALUE intrinsics that referenced dead variables were not
removed, causing an assertion/crash later on. The fix is to have
LiveDebugVariables strip all DBG_VALUE intrinsics in functions without
debug info as they're not needed anyway. Test case added to cover this
situation (that occurs when a debug-having function is inlined into a
nodebug function) in test/DebugInfo/X86/nodebug_with_debug_loc.ll
Original commit message:
If a function isn't actually in a CU's subprogram list in the debug info
metadata, ignore all the DebugLocs and don't try to build scopes, track
variables, etc.
While this is possibly a minor optimization, it's also a correctness fix
for an incoming patch that will add assertions to LexicalScopes and the
debug info verifier to ensure that all scope chains lead to debug info
for the current function.
Fix up a few test cases that had broken/incomplete debug info that could
violate this constraint.
Add a test case where this occurs by design (inlining a
debug-info-having function in an attribute nodebug function - we want
this to work because /if/ the nodebug function is then inlined into a
debug-info-having function, it should be fine (and will work fine - we
just stitch the scopes up as usual), but should the inlining not happen
we need to not assert fail either).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213952 91177308-0d34-0410-b5e6-96231b3b80d8
2014-07-25 16:10:16 +00:00
|
|
|
if (!MF)
|
|
|
|
return;
|
2014-08-05 02:39:49 +00:00
|
|
|
const TargetInstrInfo *TII = MF->getSubtarget().getInstrInfo();
|
2010-12-03 21:47:10 +00:00
|
|
|
for (unsigned i = 0, e = userValues.size(); i != e; ++i) {
|
2015-02-27 00:11:34 +00:00
|
|
|
DEBUG(userValues[i]->print(dbgs(), TRI));
|
2010-12-03 21:47:10 +00:00
|
|
|
userValues[i]->rewriteLocations(*VRM, *TRI);
|
|
|
|
userValues[i]->emitDebugValues(VRM, *LIS, *TII);
|
|
|
|
}
|
2013-02-13 20:23:48 +00:00
|
|
|
EmitDone = true;
|
2010-12-03 21:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void LiveDebugVariables::emitDebugValues(VirtRegMap *VRM) {
|
2013-02-13 20:23:48 +00:00
|
|
|
if (pImpl)
|
2010-12-03 21:47:10 +00:00
|
|
|
static_cast<LDVImpl*>(pImpl)->emitDebugValues(VRM);
|
|
|
|
}
|
|
|
|
|
Recommit r212203: Don't try to construct debug LexicalScopes hierarchy for functions that do not have top level debug information.
Reverted by Eric Christopher (Thanks!) in r212203 after Bob Wilson
reported LTO issues. Duncan Exon Smith and Aditya Nandakumar helped
provide a reduced reproduction, though the failure wasn't too hard to
guess, and even easier with the example to confirm.
The assertion that the subprogram metadata associated with an
llvm::Function matches the scope data referenced by the DbgLocs on the
instructions in that function is not valid under LTO. In LTO, a C++
inline function might exist in multiple CUs and the subprogram metadata
nodes will refer to the same llvm::Function. In this case, depending on
the order of the CUs, the first intance of the subprogram metadata may
not be the one referenced by the instructions in that function and the
assertion will fail.
A test case (test/DebugInfo/cross-cu-linkonce-distinct.ll) is added, the
assertion removed and a comment added to explain this situation.
This was then reverted again in r213581 as it caused PR20367. The root
cause of this was the early exit in LiveDebugVariables meant that
spurious DBG_VALUE intrinsics that referenced dead variables were not
removed, causing an assertion/crash later on. The fix is to have
LiveDebugVariables strip all DBG_VALUE intrinsics in functions without
debug info as they're not needed anyway. Test case added to cover this
situation (that occurs when a debug-having function is inlined into a
nodebug function) in test/DebugInfo/X86/nodebug_with_debug_loc.ll
Original commit message:
If a function isn't actually in a CU's subprogram list in the debug info
metadata, ignore all the DebugLocs and don't try to build scopes, track
variables, etc.
While this is possibly a minor optimization, it's also a correctness fix
for an incoming patch that will add assertions to LexicalScopes and the
debug info verifier to ensure that all scope chains lead to debug info
for the current function.
Fix up a few test cases that had broken/incomplete debug info that could
violate this constraint.
Add a test case where this occurs by design (inlining a
debug-info-having function in an attribute nodebug function - we want
this to work because /if/ the nodebug function is then inlined into a
debug-info-having function, it should be fine (and will work fine - we
just stitch the scopes up as usual), but should the inlining not happen
we need to not assert fail either).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213952 91177308-0d34-0410-b5e6-96231b3b80d8
2014-07-25 16:10:16 +00:00
|
|
|
bool LiveDebugVariables::doInitialization(Module &M) {
|
|
|
|
return Pass::doInitialization(M);
|
|
|
|
}
|
2010-12-03 21:47:10 +00:00
|
|
|
|
2010-12-02 18:15:44 +00:00
|
|
|
#ifndef NDEBUG
|
2016-01-29 20:50:44 +00:00
|
|
|
LLVM_DUMP_METHOD void LiveDebugVariables::dump() {
|
2010-12-02 18:15:44 +00:00
|
|
|
if (pImpl)
|
|
|
|
static_cast<LDVImpl*>(pImpl)->print(dbgs());
|
|
|
|
}
|
|
|
|
#endif
|