rdar://7119244 - globals with an explicit section specified don't get

common linkage.

llvm-svn: 78158

2 files changed, 10 insertions, 2 deletions

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 08dc9930ba3..95ce3e5d3af 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/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/clang/test/CodeGen/global-init.c b/clang/test/CodeGen/global-init.c
index 4b769f8ccbb..2c4ccce5a66 100644
--- a/clang/test/CodeGen/global-init.c
+++ b/clang/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"