Commit 9d94c97a authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r228500: 

------------------------------------------------------------------------
r228500 | bsteinbr | 2015-02-07 09:54:36 -0800 (Sat, 07 Feb 2015) | 5 lines

Properly update AA metadata when performing call slot optimization

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D7482
------------------------------------------------------------------------

llvm-svn: 228504
parent f6f57fd8

llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp

+10 −0
Original line number Diff line number Diff line
@@ -750,6 +750,16 @@ bool MemCpyOpt::performCallSlotOptzn(Instruction *cpy, 
  // its dependence information by changing its parameter.

  MD->removeInstruction(C);



  // Update AA metadata

  // FIXME: MD_tbaa_struct and MD_mem_parallel_loop_access should also be

  // handled here, but combineMetadata doesn't support them yet

  unsigned KnownIDs[] = {

    LLVMContext::MD_tbaa,

    LLVMContext::MD_alias_scope,

    LLVMContext::MD_noalias,

  };

  combineMetadata(C, cpy, KnownIDs);



  // Remove the memcpy.

  MD->removeInstruction(cpy);

  ++NumMemCpyInstr;

llvm/test/Transforms/MemCpyOpt/callslot_aa.ll

0 → 100644
+22 −0
Original line number Diff line number Diff line 
; RUN: opt < %s -S -basicaa -memcpyopt | FileCheck %s

target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"



%T = type { i64, i64 }



define void @test(i8* %src) {

  %tmp = alloca i8

  %dst = alloca i8

; CHECK:   call void @llvm.memcpy.p0i8.p0i8.i64(i8* %dst, i8* %src, i64 1, i32 8, i1 false)

  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %tmp, i8* %src, i64 1, i32 8, i1 false), !noalias !2

  call void @llvm.memcpy.p0i8.p0i8.i64(i8* %dst, i8* %tmp, i64 1, i32 8, i1 false)



  ret void

}



declare void @llvm.memcpy.p0i8.p0i8.i64(i8*, i8*, i64, i32, i1)



; Check that the noalias for "dst" was removed by checking that the metadata is gone

; CHECK-NOT: "dst"

!0 = !{!0}

!1 = distinct !{!1, !0, !"dst"}

!2 = distinct !{!1}