From 75aa84096885f047aefc610c68c1e140b66c92fd Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Thu, 17 Aug 2017 11:32:21 +0000 Subject: [PATCH] [Verifier] Avoid visiting DIGlobalVariables twice. 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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@311081 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/IR/Verifier.cpp | 2 -- test/DebugInfo/pr34186.ll | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp index d08b69fd4aa..c4ae3bb0a4b 100644 --- a/lib/IR/Verifier.cpp +++ b/lib/IR/Verifier.cpp @@ -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); } diff --git a/test/DebugInfo/pr34186.ll b/test/DebugInfo/pr34186.ll index 63d750659d1..594cf96b04b 100644 --- a/test/DebugInfo/pr34186.ll +++ b/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} -- 2.11.0