[PATCH] Fix addrspacecast with metadata globals

[Matt Arsenault]

The actual pointer isn't important, and all of the array elements need to be the same i8*, so use addrspacecast in llvm.used etc. when appropriate.

http://llvm-reviews.chandlerc.com/D2402

Files:
  lib/Transforms/IPO/GlobalOpt.cpp
  test/Transforms/GlobalOpt/alias-used-address-space.ll

Index: lib/Transforms/IPO/GlobalOpt.cpp
===================================================================
--- lib/Transforms/IPO/GlobalOpt.cpp
+++ lib/Transforms/IPO/GlobalOpt.cpp
@@ -2860,12 +2860,14 @@
     return;
   }
 
-  SmallVector<llvm::Constant *, 8> UsedArray;
-  PointerType *Int8PtrTy = Type::getInt8PtrTy(V.getContext());
+  // Type of pointer to the array of pointers.
+  PointerType *Int8PtrTy = Type::getInt8PtrTy(V.getContext(), 0);
 
+  SmallVector<llvm::Constant *, 8> UsedArray;
   for (SmallPtrSet<GlobalValue *, 8>::iterator I = Init.begin(), E = Init.end();
        I != E; ++I) {
-    Constant *Cast = llvm::ConstantExpr::getBitCast(*I, Int8PtrTy);
+    Constant *Cast
+      = ConstantExpr::getPointerBitCastOrAddrSpaceCast(*I, Int8PtrTy);
     UsedArray.push_back(Cast);
   }
   // Sort to get deterministic order.
Index: test/Transforms/GlobalOpt/alias-used-address-space.ll
===================================================================
--- test/Transforms/GlobalOpt/alias-used-address-space.ll
+++ test/Transforms/GlobalOpt/alias-used-address-space.ll
@@ -1,18 +1,26 @@
-; RUN: opt < %s -globalopt -S | FileCheck %s
+; RUN: opt -S -globalopt < %s | FileCheck %s
 
 target datalayout = "p:32:32:32-p1:16:16:16"
 
 @c = addrspace(1) global i8 42
 
 @i = internal addrspace(1) global i8 42
-; CHECK: @ia = internal global i8 42
+
+; CHECK: @ia = internal addrspace(1) global i8 42
 @ia = alias internal i8 addrspace(1)* @i
+
+ at llvm.used = appending global [1 x i8*] [i8* addrspacecast (i8 addrspace(1)* @ca to i8*)], section "llvm.metadata"
+; CHECK-DAG: @llvm.used = appending global [1 x i8*] [i8* addrspacecast (i8 addrspace(1)* @ca to i8*)], section "llvm.metadata"
+
+ at llvm.compiler.used = appending global [2 x i8*] [i8* addrspacecast(i8 addrspace(1)* @ia to i8*), i8* addrspacecast (i8 addrspace(1)* @i to i8*)], section "llvm.metadata"
+; CHECK-DAG: @llvm.compiler.used = appending global [1 x i8*] [i8* addrspacecast (i8 addrspace(1)* @ia to i8*)], section "llvm.metadata"
+
+ at sameAsUsed = global [1 x i8*] [i8* addrspacecast(i8 addrspace(1)* @ca to i8*)]
+; CHECK-DAG: @sameAsUsed = global [1 x i8*] [i8* addrspacecast (i8 addrspace(1)* @c to i8*)]
+
 @ca = alias internal i8 addrspace(1)* @c
-; CHECK: @ca = alias internal i8* @c
+; CHECK: @ca = alias internal i8 addrspace(1)* @c
 
 define i8 addrspace(1)* @h() {
   ret i8 addrspace(1)* @ca
 }
-
-
- at llvm.used = appending global [1 x i8 addrspace(1)*] [i8 addrspace(1)* @ca], section "llvm.metadata"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D2402.1.patch
Type: text/x-patch
Size: 2496 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20131213/d9d36c28/attachment.bin>