mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2026-04-26 12:20:42 +00:00
IR: Give 'DI' prefix to debug info metadata
Finish off PR23080 by renaming the debug info IR constructs from `MD*` to `DI*`. The last of the `DIDescriptor` classes were deleted in r235356, and the last of the related typedefs removed in r235413, so this has all baked for about a week. Note: If you have out-of-tree code (like a frontend), I recommend that you get everything compiling and tests passing with the *previous* commit before updating to this one. It'll be easier to keep track of what code is using the `DIDescriptor` hierarchy and what you've already updated, and I think you're extremely unlikely to insert bugs. YMMV of course. Back to *this* commit: I did this using the rename-md-di-nodes.sh upgrade script I've attached to PR23080 (both code and testcases) and filtered through clang-format-diff.py. I edited the tests for test/Assembler/invalid-generic-debug-node-*.ll by hand since the columns were off-by-three. It should work on your out-of-tree testcases (and code, if you've followed the advice in the previous paragraph). Some of the tests are in badly named files now (e.g., test/Assembler/invalid-mdcompositetype-missing-tag.ll should be 'dicompositetype'); I'll come back and move the files in a follow-up commit. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@236120 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -174,14 +174,14 @@ bool AddDiscriminators::runOnFunction(Function &F) {
|
||||
for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I) {
|
||||
BasicBlock *B = I;
|
||||
TerminatorInst *Last = B->getTerminator();
|
||||
const MDLocation *LastDIL = Last->getDebugLoc();
|
||||
const DILocation *LastDIL = Last->getDebugLoc();
|
||||
if (!LastDIL)
|
||||
continue;
|
||||
|
||||
for (unsigned I = 0; I < Last->getNumSuccessors(); ++I) {
|
||||
BasicBlock *Succ = Last->getSuccessor(I);
|
||||
Instruction *First = Succ->getFirstNonPHIOrDbgOrLifetime();
|
||||
const MDLocation *FirstDIL = First->getDebugLoc();
|
||||
const DILocation *FirstDIL = First->getDebugLoc();
|
||||
if (!FirstDIL)
|
||||
continue;
|
||||
|
||||
@@ -197,7 +197,7 @@ bool AddDiscriminators::runOnFunction(Function &F) {
|
||||
auto *File = Builder.createFile(Filename, Scope->getDirectory());
|
||||
|
||||
// FIXME: Calculate the discriminator here, based on local information,
|
||||
// and delete MDLocation::computeNewDiscriminator(). The current
|
||||
// and delete DILocation::computeNewDiscriminator(). The current
|
||||
// solution gives different results depending on other modules in the
|
||||
// same context. All we really need is to discriminate between
|
||||
// FirstDIL and LastDIL -- a local map would suffice.
|
||||
@@ -205,7 +205,7 @@ bool AddDiscriminators::runOnFunction(Function &F) {
|
||||
auto *NewScope =
|
||||
Builder.createLexicalBlockFile(Scope, File, Discriminator);
|
||||
auto *NewDIL =
|
||||
MDLocation::get(Ctx, FirstDIL->getLine(), FirstDIL->getColumn(),
|
||||
DILocation::get(Ctx, FirstDIL->getLine(), FirstDIL->getColumn(),
|
||||
NewScope, FirstDIL->getInlinedAt());
|
||||
DebugLoc newDebugLoc = NewDIL;
|
||||
|
||||
|
||||
@@ -155,9 +155,9 @@ void llvm::CloneFunctionInto(Function *NewFunc, const Function *OldFunc,
|
||||
}
|
||||
|
||||
// Find the MDNode which corresponds to the subprogram data that described F.
|
||||
static MDSubprogram *FindSubprogram(const Function *F,
|
||||
static DISubprogram *FindSubprogram(const Function *F,
|
||||
DebugInfoFinder &Finder) {
|
||||
for (MDSubprogram *Subprogram : Finder.subprograms()) {
|
||||
for (DISubprogram *Subprogram : Finder.subprograms()) {
|
||||
if (Subprogram->describes(F))
|
||||
return Subprogram;
|
||||
}
|
||||
@@ -166,7 +166,7 @@ static MDSubprogram *FindSubprogram(const Function *F,
|
||||
|
||||
// Add an operand to an existing MDNode. The new operand will be added at the
|
||||
// back of the operand list.
|
||||
static void AddOperand(MDCompileUnit *CU, MDSubprogramArray SPs,
|
||||
static void AddOperand(DICompileUnit *CU, DISubprogramArray SPs,
|
||||
Metadata *NewSP) {
|
||||
SmallVector<Metadata *, 16> NewSPs;
|
||||
NewSPs.reserve(SPs.size() + 1);
|
||||
@@ -183,14 +183,14 @@ static void CloneDebugInfoMetadata(Function *NewFunc, const Function *OldFunc,
|
||||
DebugInfoFinder Finder;
|
||||
Finder.processModule(*OldFunc->getParent());
|
||||
|
||||
const MDSubprogram *OldSubprogramMDNode = FindSubprogram(OldFunc, Finder);
|
||||
const DISubprogram *OldSubprogramMDNode = FindSubprogram(OldFunc, Finder);
|
||||
if (!OldSubprogramMDNode) return;
|
||||
|
||||
// Ensure that OldFunc appears in the map.
|
||||
// (if it's already there it must point to NewFunc anyway)
|
||||
VMap[OldFunc] = NewFunc;
|
||||
auto *NewSubprogram =
|
||||
cast<MDSubprogram>(MapMetadata(OldSubprogramMDNode, VMap));
|
||||
cast<DISubprogram>(MapMetadata(OldSubprogramMDNode, VMap));
|
||||
|
||||
for (auto *CU : Finder.compile_units()) {
|
||||
auto Subprograms = CU->getSubprograms();
|
||||
|
||||
@@ -830,17 +830,16 @@ static bool hasLifetimeMarkers(AllocaInst *AI) {
|
||||
/// Rebuild the entire inlined-at chain for this instruction so that the top of
|
||||
/// the chain now is inlined-at the new call site.
|
||||
static DebugLoc
|
||||
updateInlinedAtInfo(DebugLoc DL, MDLocation *InlinedAtNode,
|
||||
LLVMContext &Ctx,
|
||||
DenseMap<const MDLocation *, MDLocation *> &IANodes) {
|
||||
SmallVector<MDLocation*, 3> InlinedAtLocations;
|
||||
MDLocation *Last = InlinedAtNode;
|
||||
MDLocation *CurInlinedAt = DL;
|
||||
updateInlinedAtInfo(DebugLoc DL, DILocation *InlinedAtNode, LLVMContext &Ctx,
|
||||
DenseMap<const DILocation *, DILocation *> &IANodes) {
|
||||
SmallVector<DILocation *, 3> InlinedAtLocations;
|
||||
DILocation *Last = InlinedAtNode;
|
||||
DILocation *CurInlinedAt = DL;
|
||||
|
||||
// Gather all the inlined-at nodes
|
||||
while (MDLocation *IA = CurInlinedAt->getInlinedAt()) {
|
||||
while (DILocation *IA = CurInlinedAt->getInlinedAt()) {
|
||||
// Skip any we've already built nodes for
|
||||
if (MDLocation *Found = IANodes[IA]) {
|
||||
if (DILocation *Found = IANodes[IA]) {
|
||||
Last = Found;
|
||||
break;
|
||||
}
|
||||
@@ -854,8 +853,8 @@ updateInlinedAtInfo(DebugLoc DL, MDLocation *InlinedAtNode,
|
||||
// map of already-constructed inlined-at nodes.
|
||||
for (auto I = InlinedAtLocations.rbegin(), E = InlinedAtLocations.rend();
|
||||
I != E; ++I) {
|
||||
const MDLocation *MD = *I;
|
||||
Last = IANodes[MD] = MDLocation::getDistinct(
|
||||
const DILocation *MD = *I;
|
||||
Last = IANodes[MD] = DILocation::getDistinct(
|
||||
Ctx, MD->getLine(), MD->getColumn(), MD->getScope(), Last);
|
||||
}
|
||||
|
||||
@@ -873,18 +872,18 @@ static void fixupLineNumbers(Function *Fn, Function::iterator FI,
|
||||
return;
|
||||
|
||||
auto &Ctx = Fn->getContext();
|
||||
MDLocation *InlinedAtNode = TheCallDL;
|
||||
DILocation *InlinedAtNode = TheCallDL;
|
||||
|
||||
// Create a unique call site, not to be confused with any other call from the
|
||||
// same location.
|
||||
InlinedAtNode = MDLocation::getDistinct(
|
||||
InlinedAtNode = DILocation::getDistinct(
|
||||
Ctx, InlinedAtNode->getLine(), InlinedAtNode->getColumn(),
|
||||
InlinedAtNode->getScope(), InlinedAtNode->getInlinedAt());
|
||||
|
||||
// Cache the inlined-at nodes as they're built so they are reused, without
|
||||
// this every instruction's inlined-at chain would become distinct from each
|
||||
// other.
|
||||
DenseMap<const MDLocation *, MDLocation *> IANodes;
|
||||
DenseMap<const DILocation *, DILocation *> IANodes;
|
||||
|
||||
for (; FI != Fn->end(); ++FI) {
|
||||
for (BasicBlock::iterator BI = FI->begin(), BE = FI->end();
|
||||
|
||||
@@ -978,7 +978,7 @@ unsigned llvm::getOrEnforceKnownAlignment(Value *V, unsigned PrefAlign,
|
||||
///
|
||||
|
||||
/// See if there is a dbg.value intrinsic for DIVar before I.
|
||||
static bool LdStHasDebugValue(const MDLocalVariable *DIVar, Instruction *I) {
|
||||
static bool LdStHasDebugValue(const DILocalVariable *DIVar, Instruction *I) {
|
||||
// Since we can't guarantee that the original dbg.declare instrinsic
|
||||
// is removed by LowerDbgDeclare(), we need to make sure that we are
|
||||
// not inserting the same dbg.value intrinsic over and over.
|
||||
|
||||
Reference in New Issue
Block a user