[cfe-commits] r65203 - in /cfe/trunk: lib/CodeGen/CodeGenModule.cpp test/CodeGen/global-decls.c

[Daniel Dunbar]

Author: ddunbar
Date: Fri Feb 20 18:24:10 2009
New Revision: 65203

URL: http://llvm.org/viewvc/llvm-project?rev=65203&view=rev
Log:
Emit extern_weak when needed.
 - PR3629.

Added:
    cfe/trunk/test/CodeGen/global-decls.c
Modified:
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=65203&r1=65202&r2=65203&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Fri Feb 20 18:24:10 2009
@@ -264,7 +264,8 @@
         } else
           GV->setLinkage(llvm::Function::DLLImportLinkage);
       }
-    }
+    } else if (D->getAttr<WeakAttr>())
+      GV->setLinkage(llvm::Function::ExternalWeakLinkage);
   } else {
     if (IsInternal) {
       GV->setLinkage(llvm::Function::InternalLinkage);
@@ -287,11 +288,10 @@
     setGlobalVisibility(GV, attr->getVisibility());
   // FIXME: else handle -fvisibility
 
-  if (const AsmLabelAttr *ALA = D->getAttr<AsmLabelAttr>()) {
-    // Prefaced with special LLVM marker to indicate that the name
-    // should not be munged.
+  // Prefaced with special LLVM marker to indicate that the name
+  // should not be munged.
+  if (const AsmLabelAttr *ALA = D->getAttr<AsmLabelAttr>())
     GV->setName("\01" + ALA->getLabel());
-  }
 
   if (const SectionAttr *SA = D->getAttr<SectionAttr>())
     GV->setSection(SA->getName());
@@ -598,8 +598,13 @@
 
     GV->setConstant(D->getType().isConstant(Context));
 
+    // FIXME: Merge with other attribute handling code.
+
     if (D->getStorageClass() == VarDecl::PrivateExtern)
       setGlobalVisibility(GV, VisibilityAttr::HiddenVisibility);
+
+    if (D->getAttr<WeakAttr>())
+      GV->setLinkage(llvm::GlobalValue::ExternalWeakLinkage);
   }
   
   // Make sure the result is of the correct type.

Added: cfe/trunk/test/CodeGen/global-decls.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/global-decls.c?rev=65203&view=auto

==============================================================================
--- cfe/trunk/test/CodeGen/global-decls.c (added)
+++ cfe/trunk/test/CodeGen/global-decls.c Fri Feb 20 18:24:10 2009
@@ -0,0 +1,22 @@
+// RUN: clang -arch i386 -emit-llvm -o %t %s &&
+
+// RUN: grep '@g0_ext = extern_weak global i32' %t &&
+extern int g0_ext __attribute__((weak));
+// RUN: grep 'declare extern_weak i32 @g1_ext()' %t &&
+extern int __attribute__((weak)) g1_ext (void);
+
+// RUN: grep '@g0_common = weak global i32' %t &&
+int g0_common __attribute__((weak));
+
+// RUN: grep '@g0_def = weak global i32' %t &&
+int g0_def __attribute__((weak)) = 52;
+// RUN: grep 'define weak i32 @g1_def()' %t &&
+int __attribute__((weak)) g1_def (void) {}
+
+// Force _ext references
+void f0() {
+  int a = g0_ext;
+  int b = g1_ext();
+}
+
+// RUN: true