From 018314991b57392d4172f38facb4fb9baff0fa22 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Tue, 6 Aug 2019 21:47:18 +0000 Subject: [PATCH] IR: Disable verifier check for GlobalValues with private linkage named after a comdat for non-COFF. This check is only meaningful for COFF and it is perfectly valid to create such a GlobalValue in ELF. Differential Revision: https://reviews.llvm.org/D65686 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@368094 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/IR/Verifier.cpp | 15 +++++++++------ test/Verifier/comdat2.ll | 4 +++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/IR/Verifier.cpp b/lib/IR/Verifier.cpp index 1793ba42009..f961aa73c9d 100644 --- a/lib/IR/Verifier.cpp +++ b/lib/IR/Verifier.cpp @@ -119,6 +119,7 @@ struct VerifierSupport { raw_ostream *OS; const Module &M; ModuleSlotTracker MST; + Triple TT; const DataLayout &DL; LLVMContext &Context; @@ -130,7 +131,8 @@ struct VerifierSupport { bool TreatBrokenDebugInfoAsError = true; explicit VerifierSupport(raw_ostream *OS, const Module &M) - : OS(OS), M(M), MST(&M), DL(M.getDataLayout()), Context(M.getContext()) {} + : OS(OS), M(M), MST(&M), TT(M.getTargetTriple()), DL(M.getDataLayout()), + Context(M.getContext()) {} private: void Write(const Module *M) { @@ -1306,11 +1308,12 @@ void Verifier::visitDIImportedEntity(const DIImportedEntity &N) { } void Verifier::visitComdat(const Comdat &C) { - // The Module is invalid if the GlobalValue has private linkage. Entities - // with private linkage don't have entries in the symbol table. - if (const GlobalValue *GV = M.getNamedValue(C.getName())) - Assert(!GV->hasPrivateLinkage(), "comdat global value has private linkage", - GV); + // In COFF the Module is invalid if the GlobalValue has private linkage. + // Entities with private linkage don't have entries in the symbol table. + if (TT.isOSBinFormatCOFF()) + if (const GlobalValue *GV = M.getNamedValue(C.getName())) + Assert(!GV->hasPrivateLinkage(), + "comdat global value has private linkage", GV); } void Verifier::visitModuleIdents(const Module &M) { diff --git a/test/Verifier/comdat2.ll b/test/Verifier/comdat2.ll index 9d892b974fa..b461d5846f9 100644 --- a/test/Verifier/comdat2.ll +++ b/test/Verifier/comdat2.ll @@ -1,4 +1,6 @@ -; RUN: not llvm-as %s -o /dev/null 2>&1 | FileCheck %s +; RUN: llvm-as %s -o /dev/null +; RUN: opt -mtriple=x86_64-unknown-linux -o /dev/null +; RUN: not opt -mtriple=x86_64-pc-win32 %s -o /dev/null 2>&1 | FileCheck %s $v = comdat any @v = private global i32 0, comdat($v) -- 2.49.0