[PATCH] D67658: Revert "[SLC] Preserve attrs for strncpy(x, "", y) -> memset(align 1 x, '\0', y)"

[Krasimir Georgiev via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL372125: Revert "[SLC] Preserve attrs for strncpy(x, "", y) -> memset(align 1 x, '\0'… (authored by krasimir, committed by ).

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D67658/new/

https://reviews.llvm.org/D67658

Files:
  llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp
  llvm/trunk/test/Transforms/InstCombine/strncpy-1.ll


Index: llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp
+++ llvm/trunk/lib/Transforms/Utils/SimplifyLibCalls.cpp
@@ -610,10 +610,7 @@
 
   if (SrcLen == 0) {
     // strncpy(x, "", y) -> memset(align 1 x, '\0', y)
-    CallInst *NewCI = B.CreateMemSet(Dst, B.getInt8('\0'), Size, 1);
-    AttrBuilder ArgAttrs(CI->getAttributes().getParamAttributes(0));
-    NewCI->setAttributes(NewCI->getAttributes().addParamAttributes(
-        CI->getContext(), 0, ArgAttrs));
+    B.CreateMemSet(Dst, B.getInt8('\0'), Size, 1);
     return Dst;
   }
 
Index: llvm/trunk/test/Transforms/InstCombine/strncpy-1.ll
===================================================================
--- llvm/trunk/test/Transforms/InstCombine/strncpy-1.ll
+++ llvm/trunk/test/Transforms/InstCombine/strncpy-1.ll
@@ -134,16 +134,6 @@
   ret i8* %ret
 }
 
-define i8* @test3(i8* %dst, i32 %n) {
-; CHECK-LABEL: @test3(
-; CHECK-NEXT:    call void @llvm.memset.p0i8.i32(i8* noalias nonnull align 1 dereferenceable(5) [[DST:%.*]], i8 0, i32 5, i1 false)
-; CHECK-NEXT:    ret i8* [[DST]]
-;
-  %src = getelementptr [1 x i8], [1 x i8]* @null, i32 0, i32 0
-  %ret = call i8* @strncpy(i8* noalias nonnull %dst, i8* nonnull %src, i32 5);
-  ret i8* %ret
-}
-
 ; Check cases that shouldn't be simplified.
 
 define void @test_no_simplify1() {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D67658.220500.patch
Type: text/x-patch
Size: 1432 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190917/c00331ba/attachment.bin>