mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-11-02 07:17:36 +00:00
DebugInfo: Remove 'inlinedAt:' field from MDLocalVariable
Remove 'inlinedAt:' from MDLocalVariable. Besides saving some memory (variables with it seem to be single largest `Metadata` contributer to memory usage right now in -g -flto builds), this stops optimization and backend passes from having to change local variables. The 'inlinedAt:' field was used by the backend in two ways: 1. To tell the backend whether and into what a variable was inlined. 2. To create a unique id for each inlined variable. Instead, rely on the 'inlinedAt:' field of the intrinsic's `!dbg` attachment, and change the DWARF backend to use a typedef called `InlinedVariable` which is `std::pair<MDLocalVariable*, MDLocation*>`. This `DebugLoc` is already passed reliably through the backend (as verified by r234021). This commit removes the check from r234021, but I added a new check (that will survive) in r235048, and changed the `DIBuilder` API in r235041 to require a `!dbg` attachment whose 'scope:` is in the same `MDSubprogram` as the variable's. If this breaks your out-of-tree testcases, perhaps the script I used (mdlocalvariable-drop-inlinedat.sh) will help; I'll attach it to PR22778 in a moment. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@235050 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -1745,7 +1745,6 @@ static void writeMDLocalVariable(raw_ostream &Out, const MDLocalVariable *N,
|
||||
Printer.printInt("line", N->getLine());
|
||||
Printer.printMetadata("type", N->getRawType());
|
||||
Printer.printDIFlags("flags", N->getFlags());
|
||||
Printer.printMetadata("inlinedAt", N->getRawInlinedAt());
|
||||
Out << ")";
|
||||
}
|
||||
|
||||
|
||||
@@ -35,16 +35,6 @@ using namespace llvm::dwarf;
|
||||
|
||||
DIScopeRef DIScope::getRef() const { return MDScopeRef::get(get()); }
|
||||
|
||||
DIVariable llvm::createInlinedVariable(MDNode *DV, MDNode *InlinedScope,
|
||||
LLVMContext &VMContext) {
|
||||
return cast<MDLocalVariable>(DV)
|
||||
->withInline(cast_or_null<MDLocation>(InlinedScope));
|
||||
}
|
||||
|
||||
DIVariable llvm::cleanseInlinedVariable(MDNode *DV, LLVMContext &VMContext) {
|
||||
return cast<MDLocalVariable>(DV)->withoutInline();
|
||||
}
|
||||
|
||||
DISubprogram llvm::getDISubprogram(const MDNode *Scope) {
|
||||
if (auto *LocalScope = dyn_cast_or_null<MDLocalScope>(Scope))
|
||||
return LocalScope->getSubprogram();
|
||||
|
||||
@@ -450,10 +450,12 @@ MDGlobalVariable::getImpl(LLVMContext &Context, Metadata *Scope, MDString *Name,
|
||||
Ops);
|
||||
}
|
||||
|
||||
MDLocalVariable *MDLocalVariable::getImpl(
|
||||
LLVMContext &Context, unsigned Tag, Metadata *Scope, MDString *Name,
|
||||
Metadata *File, unsigned Line, Metadata *Type, unsigned Arg, unsigned Flags,
|
||||
Metadata *InlinedAt, StorageType Storage, bool ShouldCreate) {
|
||||
MDLocalVariable *MDLocalVariable::getImpl(LLVMContext &Context, unsigned Tag,
|
||||
Metadata *Scope, MDString *Name,
|
||||
Metadata *File, unsigned Line,
|
||||
Metadata *Type, unsigned Arg,
|
||||
unsigned Flags, StorageType Storage,
|
||||
bool ShouldCreate) {
|
||||
// Truncate Arg to 8 bits.
|
||||
//
|
||||
// FIXME: This is gross (and should be changed to an assert or removed), but
|
||||
@@ -463,8 +465,8 @@ MDLocalVariable *MDLocalVariable::getImpl(
|
||||
assert(Scope && "Expected scope");
|
||||
assert(isCanonical(Name) && "Expected canonical MDString");
|
||||
DEFINE_GETIMPL_LOOKUP(MDLocalVariable, (Tag, Scope, getString(Name), File,
|
||||
Line, Type, Arg, Flags, InlinedAt));
|
||||
Metadata *Ops[] = {Scope, Name, File, Type, InlinedAt};
|
||||
Line, Type, Arg, Flags));
|
||||
Metadata *Ops[] = {Scope, Name, File, Type};
|
||||
DEFINE_GETIMPL_STORE(MDLocalVariable, (Tag, Line, Arg, Flags), Ops);
|
||||
}
|
||||
|
||||
|
||||
@@ -736,29 +736,24 @@ template <> struct MDNodeKeyImpl<MDLocalVariable> {
|
||||
Metadata *Type;
|
||||
unsigned Arg;
|
||||
unsigned Flags;
|
||||
Metadata *InlinedAt;
|
||||
|
||||
MDNodeKeyImpl(unsigned Tag, Metadata *Scope, StringRef Name, Metadata *File,
|
||||
unsigned Line, Metadata *Type, unsigned Arg, unsigned Flags,
|
||||
Metadata *InlinedAt)
|
||||
unsigned Line, Metadata *Type, unsigned Arg, unsigned Flags)
|
||||
: Tag(Tag), Scope(Scope), Name(Name), File(File), Line(Line), Type(Type),
|
||||
Arg(Arg), Flags(Flags), InlinedAt(InlinedAt) {}
|
||||
Arg(Arg), Flags(Flags) {}
|
||||
MDNodeKeyImpl(const MDLocalVariable *N)
|
||||
: Tag(N->getTag()), Scope(N->getRawScope()), Name(N->getName()),
|
||||
File(N->getRawFile()), Line(N->getLine()), Type(N->getRawType()),
|
||||
Arg(N->getArg()), Flags(N->getFlags()),
|
||||
InlinedAt(N->getRawInlinedAt()) {}
|
||||
Arg(N->getArg()), Flags(N->getFlags()) {}
|
||||
|
||||
bool isKeyOf(const MDLocalVariable *RHS) const {
|
||||
return Tag == RHS->getTag() && Scope == RHS->getRawScope() &&
|
||||
Name == RHS->getName() && File == RHS->getRawFile() &&
|
||||
Line == RHS->getLine() && Type == RHS->getRawType() &&
|
||||
Arg == RHS->getArg() && Flags == RHS->getFlags() &&
|
||||
InlinedAt == RHS->getRawInlinedAt();
|
||||
Arg == RHS->getArg() && Flags == RHS->getFlags();
|
||||
}
|
||||
unsigned getHashValue() const {
|
||||
return hash_combine(Tag, Scope, Name, File, Line, Type, Arg, Flags,
|
||||
InlinedAt);
|
||||
return hash_combine(Tag, Scope, Name, File, Line, Type, Arg, Flags);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -1075,9 +1075,6 @@ void Verifier::visitMDLocalVariable(const MDLocalVariable &N) {
|
||||
"invalid tag", &N);
|
||||
Assert(N.getRawScope() && isa<MDLocalScope>(N.getRawScope()),
|
||||
"local variable requires a valid scope", &N, N.getRawScope());
|
||||
if (auto *IA = N.getRawInlinedAt())
|
||||
Assert(isa<MDLocation>(IA), "local variable requires a valid scope", &N,
|
||||
IA);
|
||||
}
|
||||
|
||||
void Verifier::visitMDExpression(const MDExpression &N) {
|
||||
@@ -3401,17 +3398,12 @@ void Verifier::visitDbgIntrinsic(StringRef Kind, DbgIntrinsicTy &DII) {
|
||||
BasicBlock *BB = DII.getParent();
|
||||
Function *F = BB ? BB->getParent() : nullptr;
|
||||
|
||||
// The inlined-at attachments for variables and !dbg attachments must agree.
|
||||
// The scopes for variables and !dbg attachments must agree.
|
||||
MDLocalVariable *Var = DII.getVariable();
|
||||
MDLocation *VarIA = Var->getInlinedAt();
|
||||
MDLocation *Loc = DII.getDebugLoc();
|
||||
Assert(Loc, "llvm.dbg." + Kind + " intrinsic requires a !dbg attachment",
|
||||
&DII, BB, F);
|
||||
|
||||
MDLocation *LocIA = Loc->getInlinedAt();
|
||||
Assert(VarIA == LocIA, "mismatched variable and !dbg inlined-at", &DII, BB, F,
|
||||
Var, VarIA, Loc, LocIA);
|
||||
|
||||
MDSubprogram *VarSP = getSubprogram(Var->getRawScope());
|
||||
MDSubprogram *LocSP = getSubprogram(Loc->getRawScope());
|
||||
if (!VarSP || !LocSP)
|
||||
|
||||
Reference in New Issue
Block a user