[llvm] r200977 - Fix a bug with .weak_def_can_be_hidden: Mutable variables cannot use it.

[Rafael Espindola]

Author: rafael
Date: Fri Feb  7 10:21:30 2014
New Revision: 200977

URL: http://llvm.org/viewvc/llvm-project?rev=200977&view=rev
Log:
Fix a bug with .weak_def_can_be_hidden: Mutable variables cannot use it.

Thanks to John McCall for noticing it.

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/trunk/test/CodeGen/PowerPC/weak_def_can_be_hidden.ll
    llvm/trunk/test/CodeGen/X86/weak_def_can_be_hidden.ll

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=200977&r1=200976&r2=200977&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Fri Feb  7 10:21:30 2014
@@ -245,6 +245,18 @@ static bool canBeHidden(const GlobalValu
   if (GV->hasUnnamedAddr())
     return true;
 
+  // This is only used for MachO, so right now it doesn't really matter how
+  // we handle alias. Revisit this once the MachO linker implements aliases.
+  if (isa<GlobalAlias>(GV))
+    return false;
+
+  // If it is a non constant variable, it needs to be uniqued across shared
+  // objects.
+  if (const GlobalVariable *Var = dyn_cast<GlobalVariable>(GV)) {
+    if (!Var->isConstant())
+      return false;
+  }
+
   GlobalStatus GS;
   if (!GlobalStatus::analyzeGlobal(GV, GS) && !GS.IsCompared)
     return true;

Modified: llvm/trunk/test/CodeGen/PowerPC/weak_def_can_be_hidden.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/weak_def_can_be_hidden.ll?rev=200977&r1=200976&r2=200977&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/weak_def_can_be_hidden.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/weak_def_can_be_hidden.ll Fri Feb  7 10:21:30 2014
@@ -3,7 +3,7 @@
 ; RUN: llc -mtriple=powerpc-apple-darwin9 -O0 < %s | FileCheck --check-prefix=CHECK-D89 %s
 ; RUN: llc -mtriple=powerpc-apple-darwin8 -O0 < %s | FileCheck --check-prefix=CHECK-D89 %s
 
- at v1 = linkonce_odr global i32 32
+ at v1 = linkonce_odr constant i32 32
 ; CHECK: .globl  _v1
 ; CHECK: .weak_def_can_be_hidden _v1
 
@@ -15,13 +15,17 @@ define i32 @f1() {
   ret i32 %x
 }
 
- at v2 = linkonce_odr global i32 32
+ at v2 = linkonce_odr constant i32 32
 ; CHECK: .globl  _v2
 ; CHECK: .weak_definition _v2
 
 ; CHECK-D89: .globl  _v2
 ; CHECK-D89: .weak_definition _v2
 
+define i32* @f2() {
+  ret i32* @v2
+}
+
 @v3 = linkonce_odr unnamed_addr global i32 32
 ; CHECK: .globl  _v3
 ; CHECK: .weak_def_can_be_hidden _v3
@@ -29,10 +33,18 @@ define i32 @f1() {
 ; CHECK-D89: .globl  _v3
 ; CHECK-D89: .weak_definition _v3
 
-define i32* @f2() {
-  ret i32* @v2
-}
-
 define i32* @f3() {
   ret i32* @v3
 }
+
+ at v4 = linkonce_odr global i32 32
+; CHECK: .globl  _v4
+; CHECK: .weak_definition _v4
+
+; CHECK-D89: .globl  _v4
+; CHECK-D89: .weak_definition _v4
+
+define i32 @f4() {
+  %x = load i32 * @v4
+  ret i32 %x
+}

Modified: llvm/trunk/test/CodeGen/X86/weak_def_can_be_hidden.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/weak_def_can_be_hidden.ll?rev=200977&r1=200976&r2=200977&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/weak_def_can_be_hidden.ll (original)
+++ llvm/trunk/test/CodeGen/X86/weak_def_can_be_hidden.ll Fri Feb  7 10:21:30 2014
@@ -4,7 +4,7 @@
 ; RUN: llc -mtriple=i686-apple-darwin9 -O0 < %s | FileCheck --check-prefix=CHECK-D89 %s
 ; RUN: llc -mtriple=i686-apple-darwin8 -O0 < %s | FileCheck --check-prefix=CHECK-D89 %s
 
- at v1 = linkonce_odr global i32 32
+ at v1 = linkonce_odr constant i32 32
 ; CHECK: .globl  _v1
 ; CHECK: .weak_def_can_be_hidden _v1
 
@@ -16,13 +16,17 @@ define i32 @f1() {
   ret i32 %x
 }
 
- at v2 = linkonce_odr global i32 32
+ at v2 = linkonce_odr constant i32 32
 ; CHECK: .globl  _v2
 ; CHECK: .weak_definition _v2
 
 ; CHECK-D89: .globl  _v2
 ; CHECK-D89: .weak_definition _v2
 
+define i32* @f2() {
+  ret i32* @v2
+}
+
 @v3 = linkonce_odr unnamed_addr global i32 32
 ; CHECK: .globl  _v3
 ; CHECK: .weak_def_can_be_hidden _v3
@@ -30,10 +34,18 @@ define i32 @f1() {
 ; CHECK-D89: .globl  _v3
 ; CHECK-D89: .weak_definition _v3
 
-define i32* @f2() {
-  ret i32* @v2
-}
-
 define i32* @f3() {
   ret i32* @v3
 }
+
+ at v4 = linkonce_odr global i32 32
+; CHECK: .globl  _v4
+; CHECK: .weak_definition _v4
+
+; CHECK-D89: .globl  _v4
+; CHECK-D89: .weak_definition _v4
+
+define i32 @f4() {
+  %x = load i32 * @v4
+  ret i32 %x
+}