[llvm-branch-commits] [llvm-branch] r303657 - Merging r299866:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Tue May 23 12:13:15 2017
New Revision: 303657

URL: http://llvm.org/viewvc/llvm-project?rev=303657&view=rev
Log:
Merging r299866:

------------------------------------------------------------------------
r299866 | arsenm | 2017-04-10 15:00:25 -0400 (Mon, 10 Apr 2017) | 3 lines

[MemCpyOpt] Only replace memcpy with bitcast if address spaces match

Patch by James Price
------------------------------------------------------------------------

Modified:
    llvm/branches/release_40/lib/Transforms/Scalar/MemCpyOptimizer.cpp
    llvm/branches/release_40/test/Transforms/MemCpyOpt/memcpy.ll

Modified: llvm/branches/release_40/lib/Transforms/Scalar/MemCpyOptimizer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/lib/Transforms/Scalar/MemCpyOptimizer.cpp?rev=303657&r1=303656&r2=303657&view=diff
==============================================================================
--- llvm/branches/release_40/lib/Transforms/Scalar/MemCpyOptimizer.cpp (original)
+++ llvm/branches/release_40/lib/Transforms/Scalar/MemCpyOptimizer.cpp Tue May 23 12:13:15 2017
@@ -1306,6 +1306,11 @@ bool MemCpyOptPass::processByValArgument
                                  CS.getInstruction(), &AC, &DT) < ByValAlign)
     return false;
 
+  // The address space of the memcpy source must match the byval argument
+  if (MDep->getSource()->getType()->getPointerAddressSpace() !=
+      ByValArg->getType()->getPointerAddressSpace())
+    return false;
+
   // Verify that the copied-from memory doesn't change in between the memcpy and
   // the byval call.
   //    memcpy(a <- b)

Modified: llvm/branches/release_40/test/Transforms/MemCpyOpt/memcpy.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/test/Transforms/MemCpyOpt/memcpy.ll?rev=303657&r1=303656&r2=303657&view=diff
==============================================================================
--- llvm/branches/release_40/test/Transforms/MemCpyOpt/memcpy.ll (original)
+++ llvm/branches/release_40/test/Transforms/MemCpyOpt/memcpy.ll Tue May 23 12:13:15 2017
@@ -76,8 +76,21 @@ define void @test4(i8 *%P) {
 ; CHECK-NEXT: call void @test4a(
 }
 
+; Make sure we don't remove the memcpy if the source address space doesn't match the byval argument
+define void @test4_addrspace(i8 addrspace(1)* %P) {
+  %A = alloca %1
+  %a = bitcast %1* %A to i8*
+  call void @llvm.memcpy.p0i8.p1i8.i64(i8* %a, i8 addrspace(1)* %P, i64 8, i32 4, i1 false)
+  call void @test4a(i8* align 1 byval %a)
+  ret void
+; CHECK-LABEL: @test4_addrspace(
+; CHECK: call void @llvm.memcpy.p0i8.p1i8.i64(
+; CHECK-NEXT: call void @test4a(
+}
+
 declare void @test4a(i8* align 1 byval)
 declare void @llvm.memcpy.p0i8.p0i8.i64(i8* nocapture, i8* nocapture, i64, i32, i1) nounwind
+declare void @llvm.memcpy.p0i8.p1i8.i64(i8* nocapture, i8 addrspace(1)* nocapture, i64, i32, i1) nounwind
 declare void @llvm.memcpy.p1i8.p1i8.i64(i8 addrspace(1)* nocapture, i8 addrspace(1)* nocapture, i64, i32, i1) nounwind
 
 %struct.S = type { i128, [4 x i8]}