aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-08-05 04:56:58 +0000
committerChris Lattner <sabre@nondot.org>2009-08-05 04:56:58 +0000
commit309457d0f1b416c1b379c9f3e172848adffedb23 (patch)
treeae3607a9d2bb31d74e46873e62bb334a2a4e0bf9
parentbfc8168e77abd451af76ae8c01dfa346ffe87dd9 (diff)
rdar://7119244 - globals with an explicit section specified don't get
common linkage. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@78158 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/CodeGen/CodeGenModule.cpp3
-rw-r--r--test/CodeGen/global-init.c9
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 08dc9930ba..95ce3e5d3a 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -883,7 +883,8 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D) {
else if (D->hasAttr<WeakAttr>())
GV->setLinkage(llvm::GlobalVariable::WeakAnyLinkage);
else if (!CompileOpts.NoCommon &&
- (!D->hasExternalStorage() && !D->getInit()))
+ !D->hasExternalStorage() && !D->getInit() &&
+ !D->getAttr<SectionAttr>())
GV->setLinkage(llvm::GlobalVariable::CommonLinkage);
else
GV->setLinkage(llvm::GlobalVariable::ExternalLinkage);
diff --git a/test/CodeGen/global-init.c b/test/CodeGen/global-init.c
index 4b769f8ccb..2c4ccce5a6 100644
--- a/test/CodeGen/global-init.c
+++ b/test/CodeGen/global-init.c
@@ -1,7 +1,14 @@
-// RUN: clang-cc -emit-llvm -o - %s | not grep "common"
+// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
// This checks that the global won't be marked as common.
// (It shouldn't because it's being initialized).
int a;
int a = 242;
+// CHECK: @a = global i32 242
+
+// This shouldn't be emitted as common because it has an explicit section.
+// rdar://7119244
+int b __attribute__((section("foo")));
+
+// CHECK: @b = global i32 0, section "foo"