[PATCH] D36797: [Verifier] Avoid visiting DIGlobalVariables twice

[Davide Italiano via Phabricator via llvm-commits]

davide created this revision.

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.


https://reviews.llvm.org/D36797

Files:
  lib/IR/Verifier.cpp
  test/DebugInfo/pr34186.ll


Index: test/DebugInfo/pr34186.ll
===================================================================
--- test/DebugInfo/pr34186.ll
+++ 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}
Index: lib/IR/Verifier.cpp
===================================================================
--- lib/IR/Verifier.cpp
+++ lib/IR/Verifier.cpp
@@ -1173,8 +1173,6 @@
 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);
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D36797.111361.patch
Type: text/x-patch
Size: 890 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170816/93f16129/attachment.bin>