[PATCH] D47081: Fix evaluator for non-zero alloca addr space

[Yaxun Liu via Phabricator via llvm-commits]

yaxunl updated this revision to Diff 147584.
yaxunl marked an inline comment as done.
yaxunl added a comment.

Add positive check.


https://reviews.llvm.org/D47081

Files:
  lib/Transforms/Utils/Evaluator.cpp
  test/Transforms/GlobalOpt/amdgcn-ctor-alloca.ll


Index: test/Transforms/GlobalOpt/amdgcn-ctor-alloca.ll
===================================================================
--- /dev/null
+++ test/Transforms/GlobalOpt/amdgcn-ctor-alloca.ll
@@ -0,0 +1,17 @@
+; RUN: opt -data-layout=A5 -globalopt %s -S -o - | FileCheck %s
+
+; CHECK-NOT: @g
+ at g = internal addrspace(1) global i32* zeroinitializer
+
+; CHECK: @llvm.global_ctors = appending global [0 x { i32, void ()*, i8* }] zeroinitializer
+ at llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }]
+   [{ i32, void ()*, i8* } { i32 65535, void ()* @ctor, i8* null }]
+
+; CHECK-NOT: @ctor
+define internal void @ctor()  {
+  %addr = alloca i32, align 8, addrspace(5)
+  %tmp = addrspacecast i32 addrspace(5)* %addr to i32*
+  store i32* %tmp, i32* addrspace(1)* @g
+  ret void
+}
+
Index: lib/Transforms/Utils/Evaluator.cpp
===================================================================
--- lib/Transforms/Utils/Evaluator.cpp
+++ lib/Transforms/Utils/Evaluator.cpp
@@ -377,7 +377,8 @@
       Type *Ty = AI->getAllocatedType();
       AllocaTmps.push_back(llvm::make_unique<GlobalVariable>(
           Ty, false, GlobalValue::InternalLinkage, UndefValue::get(Ty),
-          AI->getName()));
+          AI->getName(), /*TLMode=*/GlobalValue::NotThreadLocal,
+          AI->getType()->getPointerAddressSpace()));
       InstResult = AllocaTmps.back().get();
       LLVM_DEBUG(dbgs() << "Found an alloca. Result: " << *InstResult << "\n");
     } else if (isa<CallInst>(CurInst) || isa<InvokeInst>(CurInst)) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D47081.147584.patch
Type: text/x-patch
Size: 1523 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180518/b37d2544/attachment.bin>