[llvm] r295387 - Bug 31948: Fix assertion when bitcasting constantexpr pointers

[Matt Arsenault via llvm-commits]

Author: arsenm
Date: Thu Feb 16 18:32:19 2017
New Revision: 295387

URL: http://llvm.org/viewvc/llvm-project?rev=295387&view=rev
Log:
Bug 31948: Fix assertion when bitcasting constantexpr pointers

Added:
    llvm/trunk/test/Transforms/InferAddressSpaces/AMDGPU/lit.local.cfg
      - copied, changed from r295383, llvm/trunk/test/Transforms/InferAddressSpaces/lit.local.cfg
    llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/
    llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/bug31948.ll
    llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/lit.local.cfg
Removed:
    llvm/trunk/test/Transforms/InferAddressSpaces/lit.local.cfg
Modified:
    llvm/trunk/lib/Transforms/Scalar/InferAddressSpaces.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/InferAddressSpaces.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InferAddressSpaces.cpp?rev=295387&r1=295386&r2=295387&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InferAddressSpaces.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InferAddressSpaces.cpp Thu Feb 16 18:32:19 2017
@@ -448,6 +448,12 @@ static Value *cloneConstantExprWithNewAd
     return ConstantExpr::getBitCast(CE->getOperand(0), TargetType);
   }
 
+  if (CE->getOpcode() == Instruction::BitCast) {
+    if (Value *NewOperand = ValueWithNewAddrSpace.lookup(CE->getOperand(0)))
+      return ConstantExpr::getBitCast(cast<Constant>(NewOperand), TargetType);
+    return ConstantExpr::getAddrSpaceCast(CE, TargetType);
+  }
+
   if (CE->getOpcode() == Instruction::Select) {
     Constant *Src0 = CE->getOperand(1);
     Constant *Src1 = CE->getOperand(2);

Copied: llvm/trunk/test/Transforms/InferAddressSpaces/AMDGPU/lit.local.cfg (from r295383, llvm/trunk/test/Transforms/InferAddressSpaces/lit.local.cfg)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InferAddressSpaces/AMDGPU/lit.local.cfg?p2=llvm/trunk/test/Transforms/InferAddressSpaces/AMDGPU/lit.local.cfg&p1=llvm/trunk/test/Transforms/InferAddressSpaces/lit.local.cfg&r1=295383&r2=295387&rev=295387&view=diff
==============================================================================
    (empty)

Added: llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/bug31948.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/bug31948.ll?rev=295387&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/bug31948.ll (added)
+++ llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/bug31948.ll Thu Feb 16 18:32:19 2017
@@ -0,0 +1,24 @@
+; RUN: opt -S -mtriple=nvptx64-nvidia-cuda -infer-address-spaces %s | FileCheck %s
+
+target datalayout = "e-i64:64-v16:16-v32:32-n16:32:64"
+
+%struct.bar = type { float, float* }
+
+ at var1 = local_unnamed_addr addrspace(3) externally_initialized global %struct.bar undef, align 8
+
+; CHECK-LABEL: @bug31948(
+; CHECK: %tmp = load float*, float* addrspace(3)* getelementptr inbounds (%struct.bar, %struct.bar addrspace(3)* @var1, i64 0, i32 1), align 8
+; CHECK: %tmp1 = load float, float* %tmp, align 4
+; CHECK: store float %conv1, float* %tmp, align 4
+; CHECK: store i32 32, i32 addrspace(3)* addrspacecast (i32* bitcast (float** getelementptr (%struct.bar, %struct.bar* addrspacecast (%struct.bar addrspace(3)* @var1 to %struct.bar*), i64 0, i32 1) to i32*) to i32 addrspace(3)*), align 4
+define void @bug31948(float %a, float* nocapture readnone %x, float* nocapture readnone %y) local_unnamed_addr #0 {
+entry:
+  %tmp = load float*, float** getelementptr (%struct.bar, %struct.bar* addrspacecast (%struct.bar addrspace(3)* @var1 to %struct.bar*), i64 0, i32 1), align 8
+  %tmp1 = load float, float* %tmp, align 4
+  %conv1 = fadd float %tmp1, 1.000000e+00
+  store float %conv1, float* %tmp, align 4
+  store i32 32, i32* bitcast (float** getelementptr (%struct.bar, %struct.bar* addrspacecast (%struct.bar addrspace(3)* @var1 to %struct.bar*), i64 0, i32 1) to i32*), align 4
+  ret void
+}
+
+attributes #0 = { norecurse nounwind }

Added: llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/lit.local.cfg?rev=295387&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/lit.local.cfg (added)
+++ llvm/trunk/test/Transforms/InferAddressSpaces/NVPTX/lit.local.cfg Thu Feb 16 18:32:19 2017
@@ -0,0 +1,2 @@
+if not 'NVPTX' in config.root.targets:
+    config.unsupported = True

Removed: llvm/trunk/test/Transforms/InferAddressSpaces/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InferAddressSpaces/lit.local.cfg?rev=295386&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/InferAddressSpaces/lit.local.cfg (original)
+++ llvm/trunk/test/Transforms/InferAddressSpaces/lit.local.cfg (removed)
@@ -1,3 +0,0 @@
-if not 'AMDGPU' in config.root.targets:
-    config.unsupported = True
-