From 9127334dade7fa36cb5cb999fc116ceaa4f52ac9 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 4 Sep 2013 15:33:34 +0000 Subject: [PATCH] Error on linking appending globals with different unnamed_addr. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189950 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Linker/LinkModules.cpp | 6 +++++- test/Linker/unnamed-addr-err-a.ll | 4 ++++ test/Linker/unnamed-addr-err-b.ll | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 test/Linker/unnamed-addr-err-a.ll create mode 100644 test/Linker/unnamed-addr-err-b.ll diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 16e2851f0bc..4fffa55fe4d 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -704,7 +704,11 @@ bool ModuleLinker::linkAppendingVarProto(GlobalVariable *DstGV, if (DstGV->getVisibility() != SrcGV->getVisibility()) return emitError( "Appending variables with different visibility need to be linked!"); - + + if (DstGV->hasUnnamedAddr() != SrcGV->hasUnnamedAddr()) + return emitError( + "Appending variables with different unnamed_addr need to be linked!"); + if (DstGV->getSection() != SrcGV->getSection()) return emitError( "Appending variables with different section name need to be linked!"); diff --git a/test/Linker/unnamed-addr-err-a.ll b/test/Linker/unnamed-addr-err-a.ll new file mode 100644 index 00000000000..4872098004b --- /dev/null +++ b/test/Linker/unnamed-addr-err-a.ll @@ -0,0 +1,4 @@ +; RUN: not llvm-link %s %p/unnamed-addr-err-b.ll -S -o - 2>&1 | FileCheck %s + +@foo = appending unnamed_addr global [1 x i32] [i32 42] +; CHECK: Appending variables with different unnamed_addr need to be linked diff --git a/test/Linker/unnamed-addr-err-b.ll b/test/Linker/unnamed-addr-err-b.ll new file mode 100644 index 00000000000..5e5fed9bb62 --- /dev/null +++ b/test/Linker/unnamed-addr-err-b.ll @@ -0,0 +1,4 @@ +; This file is for use with unnamed-addr-err-a.ll +; RUN: true + +@foo = appending global [1 x i32] [i32 42]