diff options
author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2015-04-03 16:54:30 +0000 |
---|---|---|
committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2015-04-03 16:54:30 +0000 |
commit | 81f522a62e885ef1e947a2d5c4c202df3d1b3f70 (patch) | |
tree | 19ae0575f3d18f617622b065632e9e4d39e0cacf /llvm/lib/IR/Verifier.cpp | |
parent | 7b0c62e6858d7764bf72d9e6f0f1fdf0157283d7 (diff) | |
download | bcm5719-llvm-81f522a62e885ef1e947a2d5c4c202df3d1b3f70.tar.gz bcm5719-llvm-81f522a62e885ef1e947a2d5c4c202df3d1b3f70.zip |
Verifier: Check that inlined-at locations agree
Check that the `MDLocalVariable::getInlinedAt()` in a debug info
intrinsic's variable always matches the `MDLocation::getInlinedAt()` of
its `!dbg` attachment.
The goal here is to get rid of `MDLocalVariable::getInlinedAt()`
entirely (PR22778), since it's expensive and unnecessary, but I'll let
this verifier check bake for a while (a week maybe?) first. I've
updated the testcases that had the wrong value for `inlinedAt:`.
This checks that things are sane in the IR, but currently things go out
of whack in a few places in the backend. I'll follow shortly with
assertions in the backend (with code fixes).
If you have out-of-tree testcases that just started failing, here's how
I updated these ones:
1. The verifier check gives you the basic block, function, instruction,
and relevant metadata arguments (metadata numbering doesn't
necessarily match the source file, unfortunately).
2. Look at the `@llvm.dbg.*()` instruction, and compare the
`inlinedAt:` fields of the variable argument (second `metadata`
argument) and the `!dbg` attachment.
3. Figure out based on the variable `scope:` chain and the functions in
the file whether the variable has been inlined (and into what), so
you can determine which `inlinedAt:` is actually correct. In all of
the in-tree testcases, the `!MDLocation()` was correct and the
`!MDLocalVariable()` was wrong, but YMMV.
4. Duplicate the metadata that you're going to change, and add/drop the
`inlinedAt:` field from one of them. Be careful that the other
references to the same metadata node point at the correct one.
llvm-svn: 234021
Diffstat (limited to 'llvm/lib/IR/Verifier.cpp')
-rw-r--r-- | llvm/lib/IR/Verifier.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index 31ddd6543a7..15e354b8dfc 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -3372,6 +3372,20 @@ void Verifier::visitDbgIntrinsic(StringRef Kind, DbgIntrinsicTy &DII) { Assert(isa<MDExpression>(DII.getRawExpression()), "invalid llvm.dbg." + Kind + " intrinsic expression", &DII, DII.getRawExpression()); + + // Ignore broken !dbg attachments; they're checked elsewhere. + if (MDNode *N = DII.getDebugLoc().getAsMDNode()) + if (!isa<MDLocation>(N)) + return; + + // The inlined-at attachments for variables and !dbg attachments must agree. + MDLocalVariable *Var = DII.getVariable(); + MDLocation *VarIA = Var->getInlinedAt(); + MDLocation *Loc = DII.getDebugLoc(); + MDLocation *LocIA = Loc ? Loc->getInlinedAt() : nullptr; + BasicBlock *BB = DII.getParent(); + Assert(VarIA == LocIA, "mismatched variable and !dbg inlined-at", &DII, BB, + BB ? BB->getParent() : nullptr, Var, VarIA, Loc, LocIA); } void Verifier::visitUnresolvedTypeRef(const MDString *S, const MDNode *N) { |