Skip to content

Commit

Permalink
[Verifier] Avoid visiting DIGlobalVariables twice.
Browse files Browse the repository at this point in the history
We currently visit them twice.
Once, through `visitMDNode()` -> (the code generated by)
  `../include/llvm/IR/Metadata.def:109` -> `visitDIGlobalVariable()`
Then, through `visitMDNode()` -> `visitDIGlobalVariableExpression()`
  -> `visitDIGlobalVariable()`

This results in verification failures printed twice, e.g.:

  $ ./opt -verify ../../test/DebugInfo/pr34186.ll
  missing global variable type
  !4 = distinct !DIGlobalVariable(name: "pat", scope: !0,
    file: !1, line: 27, isLocal: true, isDefinition: true)
  missing global variable type
  !4 = distinct !DIGlobalVariable(name: "pat", scope: !0,
    file: !1, line: 27, isLocal: true, isDefinition: true)
  ./opt: ../../test/DebugInfo/pr34186.ll: error: input module is broken!

The patch removes one call so we ensure each GV is visited exactly once.

Differential Revision:  https://reviews.llvm.org/D36797

llvm-svn: 311081
  • Loading branch information
dcci committed Aug 17, 2017
1 parent 8a2c07f commit 903fd3e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 0 additions & 2 deletions llvm/lib/IR/Verifier.cpp
Expand Up @@ -1173,8 +1173,6 @@ void Verifier::visitDIExpression(const DIExpression &N) {
void Verifier::visitDIGlobalVariableExpression(
const DIGlobalVariableExpression &GVE) {
AssertDI(GVE.getVariable(), "missing variable");
if (auto *Var = GVE.getVariable())
visitDIGlobalVariable(*Var);
if (auto *Expr = GVE.getExpression())
visitDIExpression(*Expr);
}
Expand Down
2 changes: 2 additions & 0 deletions llvm/test/DebugInfo/pr34186.ll
@@ -1,5 +1,7 @@
; Make sure we reject GVs without a type and we verify each exactly once.
; RUN: not llc %s 2>&1 | FileCheck %s
; CHECK: missing global variable type
; CHECK-NOT: missing global variable type

!llvm.dbg.cu = !{!2}
!llvm.module.flags = !{!63, !64}
Expand Down

0 comments on commit 903fd3e

Please sign in to comment.