[llvm-commits] [llvm-gcc-4.2] r132493 - /llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

[Bill Wendling]

Author: void
Date: Thu Jun  2 17:11:17 2011
New Revision: 132493

URL: http://llvm.org/viewvc/llvm-project?rev=132493&view=rev
Log:
Don't mark everything as having 'unnamed_addr'. It doesn't make much sense for
something that has external linkage.
<rdar://problem/9402870>

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=132493&r1=132492&r2=132493&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Thu Jun  2 17:11:17 2011
@@ -1375,7 +1375,9 @@
 
   // Set the initializer.
   GV->setInitializer(Init);
-  GV->setUnnamedAddr(true);
+  if (GV->hasHiddenVisibility() || GV->hasInternalLinkage() ||
+      GV->hasPrivateLinkage())
+    GV->setUnnamedAddr(true);
 }
   
 /// reset_type_and_initializer_llvm - Change the type and initializer for 
@@ -1396,7 +1398,9 @@
 
   // Temporary to avoid infinite recursion (see comments emit_global_to_llvm)
   GV->setInitializer(UndefValue::get(GV->getType()->getElementType()));
-  GV->setUnnamedAddr(true);
+  if (GV->hasHiddenVisibility() || GV->hasInternalLinkage() ||
+      GV->hasPrivateLinkage())
+    GV->setUnnamedAddr(true);
 
   // Convert the initializer over.
   Constant *Init = TreeConstantToLLVM::Convert(DECL_INITIAL(decl));
@@ -1411,7 +1415,6 @@
                                              GV->isConstant(),
                                              GV->getLinkage(), 0,
                                              GV->getName());
-    NGV->setUnnamedAddr(true);
     NGV->setVisibility(GV->getVisibility());
     NGV->setSection(GV->getSection());
     NGV->setAlignment(GV->getAlignment());
@@ -1420,12 +1423,14 @@
     changeLLVMConstant(GV, NGV);
     delete GV;
     SET_DECL_LLVM(decl, NGV);
+    if (NGV->hasHiddenVisibility() || NGV->hasInternalLinkage() ||
+        NGV->hasPrivateLinkage())
+      NGV->setUnnamedAddr(true);
     GV = NGV;
   }
 
   // Set the initializer.
   GV->setInitializer(Init);
-  GV->setUnnamedAddr(true);
 }
   
 /// emit_global_to_llvm - Emit the specified VAR_DECL or aggregate CONST_DECL to
@@ -1477,7 +1482,9 @@
     // this can happen for things like void *G = &G;
     //
     GV->setInitializer(UndefValue::get(GV->getType()->getElementType()));
-    GV->setUnnamedAddr(true);
+    if (GV->hasHiddenVisibility() || GV->hasInternalLinkage() ||
+        GV->hasPrivateLinkage())
+      GV->setUnnamedAddr(true);
     Init = TreeConstantToLLVM::Convert(DECL_INITIAL(decl));
   }
 
@@ -1491,7 +1498,6 @@
                                              GV->isConstant(),
                                              GlobalValue::ExternalLinkage, 0,
                                              GV->getName());
-    NGV->setUnnamedAddr(true);
     GV->replaceAllUsesWith(TheFolder->CreateBitCast(NGV, GV->getType()));
     changeLLVMConstant(GV, NGV);
     delete GV;
@@ -1501,7 +1507,9 @@
  
   // Set the initializer.
   GV->setInitializer(Init);
-  GV->setUnnamedAddr(true);
+  if (GV->hasHiddenVisibility() || GV->hasInternalLinkage() ||
+      GV->hasPrivateLinkage())
+    GV->setUnnamedAddr(true);
 
   // Set thread local (TLS)
   if (TREE_CODE(decl) == VAR_DECL && DECL_THREAD_LOCAL_P(decl))
@@ -1555,6 +1563,9 @@
 #endif /* TARGET_ADJUST_LLVM_LINKAGE */
 
   handleVisibility(decl, GV);
+  if (GV->hasHiddenVisibility() || GV->hasInternalLinkage() ||
+      GV->hasPrivateLinkage())
+    GV->setUnnamedAddr(true);
 
   // Set the section for the global.
   if (TREE_CODE(decl) == VAR_DECL) {
@@ -1803,7 +1814,6 @@
     if (Name[0] == 0) {   // Global has no name.
       GV = new GlobalVariable(*TheModule, Ty, false, 
                               GlobalValue::ExternalLinkage, 0, "");
-      GV->setUnnamedAddr(true);
 
       // Check for external weak linkage.
       if (DECL_EXTERNAL(decl) && DECL_WEAK(decl))
@@ -1814,6 +1824,9 @@
 #endif /* TARGET_ADJUST_LLVM_LINKAGE */
 
       handleVisibility(decl, GV);
+      if (GV->hasHiddenVisibility() || GV->hasInternalLinkage() ||
+          GV->hasPrivateLinkage())
+        GV->setUnnamedAddr(true);
     } else {
       // If the global has a name, prevent multiple vars with the same name from
       // being created.
@@ -1823,7 +1836,6 @@
         GV = new GlobalVariable(*TheModule, Ty, false,
                                 GlobalValue::ExternalLinkage, 0, Name);
 
-        GV->setUnnamedAddr(true);
         // Check for external weak linkage.
         if (DECL_EXTERNAL(decl) && DECL_WEAK(decl))
           GV->setLinkage(GlobalValue::ExternalWeakLinkage);
@@ -1834,6 +1846,10 @@
 
 	handleVisibility(decl, GV);
 
+        if (GV->hasHiddenVisibility() || GV->hasInternalLinkage() ||
+            GV->hasPrivateLinkage())
+          GV->setUnnamedAddr(true);
+
         // If GV got renamed, then there is already an object with this name in
         // the symbol table.  If this happens, the old one must be a forward
         // decl, just replace it with a cast of the new one.