From c2433959dbbe1811418ef27e3d4196009a5a0cc5 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Mon, 22 Jun 2015 21:46:51 +0000 Subject: [PATCH] Linker: Do not expect comdat to exist in source module. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240341 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Linker/LinkModules.cpp | 4 ++-- test/Linker/comdat10.ll | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 test/Linker/comdat10.ll diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index f80f6bc4ce4..f1ce23f13e0 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -1573,8 +1573,8 @@ bool ModuleLinker::run() { if (C.getSelectionKind() == Comdat::Any) continue; const GlobalValue *GV = SrcM->getNamedValue(C.getName()); - assert(GV); - MapValue(GV, ValueMap, RF_None, &TypeMap, &ValMaterializer); + if (GV) + MapValue(GV, ValueMap, RF_None, &TypeMap, &ValMaterializer); } // Strip replaced subprograms before mapping any metadata -- so that we're diff --git a/test/Linker/comdat10.ll b/test/Linker/comdat10.ll new file mode 100644 index 00000000000..8a32c426739 --- /dev/null +++ b/test/Linker/comdat10.ll @@ -0,0 +1,6 @@ +; RUN: llvm-link %s /dev/null -S -o - | FileCheck %s + +$c = comdat largest + +; CHECK: @c = global i32 0, comdat +@c = global i32 0, comdat