[llvm-commits] [llvm] r64058 - in /llvm/branches/Apple/Dib: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/cast_ld_addr_space.ll

[Bill Wendling]

Author: void
Date: Sat Feb  7 18:44:56 2009
New Revision: 64058

URL: http://llvm.org/viewvc/llvm-project?rev=64058&view=rev
Log:
Pull r64035 into Dib:

Instrcombine should not change load(cast p) to cast(load p) if the cast
changes the address space of the pointer.


Added:
    llvm/branches/Apple/Dib/test/Transforms/InstCombine/cast_ld_addr_space.ll
Modified:
    llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp

Modified: llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp?rev=64058&r1=64057&r2=64058&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/branches/Apple/Dib/lib/Transforms/Scalar/InstructionCombining.cpp Sat Feb  7 18:44:56 2009
@@ -11001,8 +11001,14 @@
     }
   }
 
-  const Type *DestPTy = cast<PointerType>(CI->getType())->getElementType();
+  const PointerType *DestTy = cast<PointerType>(CI->getType());
+  const Type *DestPTy = DestTy->getElementType();
   if (const PointerType *SrcTy = dyn_cast<PointerType>(CastOp->getType())) {
+
+    // If the address spaces don't match, don't eliminate the cast.
+    if (DestTy->getAddressSpace() != SrcTy->getAddressSpace())
+      return 0;
+
     const Type *SrcPTy = SrcTy->getElementType();
 
     if (DestPTy->isInteger() || isa<PointerType>(DestPTy) || 

Added: llvm/branches/Apple/Dib/test/Transforms/InstCombine/cast_ld_addr_space.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/test/Transforms/InstCombine/cast_ld_addr_space.ll?rev=64058&view=auto

==============================================================================
--- llvm/branches/Apple/Dib/test/Transforms/InstCombine/cast_ld_addr_space.ll (added)
+++ llvm/branches/Apple/Dib/test/Transforms/InstCombine/cast_ld_addr_space.ll Sat Feb  7 18:44:56 2009
@@ -0,0 +1,19 @@
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep bitcast | count 1
+
+; InstCombine can not 'load (cast P)' -> cast (load P)' if the cast changes
+; the address space.
+
+
+define void @test2(i8 addrspace(1)* %source, <2 x i8> addrspace(1)* %dest) {                                                                                        
+entry: 
+  %arrayidx1 = bitcast <2 x i8> addrspace(1)* %dest to <2 x i8> addrspace(1)*
+  %conv = bitcast i8 addrspace(1)* %source to <16 x i8>*
+  %arrayidx22 = bitcast <16 x i8>* %conv to <16 x i8>*
+  %tmp3 = load <16 x i8>* %arrayidx22
+  %arrayidx223 = bitcast i8 addrspace(1)* %source to i8*
+  %tmp4 = load i8* %arrayidx223
+  %tmp5 = insertelement <2 x i8> undef, i8 %tmp4, i32 0
+  %splat = shufflevector <2 x i8> %tmp5, <2 x i8> undef, <2 x i32> zeroinitializer
+  store <2 x i8> %splat, <2 x i8> addrspace(1)* %arrayidx1
+  ret void                                                                                                                                                             
+} 
\ No newline at end of file