[llvm] ddfac07 - Revert "[MemoryLocation] Handle memset_pattern{4,8,16} in getForDest."

[Florian Hahn via llvm-commits]

Author: Florian Hahn
Date: 2021-12-14T14:48:47Z
New Revision: ddfac0759c3c21652672502646e5315554fa18eb

URL: https://github.com/llvm/llvm-project/commit/ddfac0759c3c21652672502646e5315554fa18eb
DIFF: https://github.com/llvm/llvm-project/commit/ddfac0759c3c21652672502646e5315554fa18eb.diff

LOG: Revert "[MemoryLocation] Handle memset_pattern{4,8,16} in getForDest."

This reverts commit ac60263ad173dbd2eba6e0c8d892d8c3dcc5306c.

It looks like the test fails on certain non-Darwin system, even though
the triple is explicitly set to macos. Revert while I investigate.

Added: 
    

Modified: 
    llvm/lib/Analysis/MemoryLocation.cpp
    llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Analysis/MemoryLocation.cpp b/llvm/lib/Analysis/MemoryLocation.cpp
index bfe33efe772f9..c74b6258f780e 100644
--- a/llvm/lib/Analysis/MemoryLocation.cpp
+++ b/llvm/lib/Analysis/MemoryLocation.cpp
@@ -137,9 +137,6 @@ MemoryLocation::getForDest(const CallBase *CB, const TargetLibraryInfo &TLI) {
   LibFunc LF;
   if (TLI.getLibFunc(*CB, LF) && TLI.has(LF)) {
     switch (LF) {
-    case LibFunc_memset_pattern4:
-    case LibFunc_memset_pattern8:
-    case LibFunc_memset_pattern16:
     case LibFunc_strncpy:
     case LibFunc_strcpy:
     case LibFunc_strcat:

diff  --git a/llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll b/llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll
index 9fe5eb3ca7e0f..76e595a1dbb35 100644
--- a/llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll
+++ b/llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll
@@ -10,7 +10,9 @@ declare void @memset_pattern16(i8*, i8*, i64)
 define void @test_memset_pattern4_const_size(i8* noalias %a, i8* noalias %pattern) {
 ; CHECK-LABEL: @test_memset_pattern4_const_size(
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 17
+; CHECK-NEXT:    [[A_GEP_1:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 1
+; CHECK-NEXT:    store i8 0, i8* [[A_GEP_1]], align 1
+; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A]], i32 17
 ; CHECK-NEXT:    store i8 1, i8* [[A_GEP_17]], align 1
 ; CHECK-NEXT:    call void @memset_pattern4(i8* [[A]], i8* [[PATTERN:%.*]], i64 17)
 ; CHECK-NEXT:    ret void
@@ -46,7 +48,9 @@ entry:
 define void @test_memset_pattern8_const_size(i8* noalias %a, i8* noalias %pattern) {
 ; CHECK-LABEL: @test_memset_pattern8_const_size(
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 17
+; CHECK-NEXT:    [[A_GEP_1:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 1
+; CHECK-NEXT:    store i8 0, i8* [[A_GEP_1]], align 1
+; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A]], i32 17
 ; CHECK-NEXT:    store i8 1, i8* [[A_GEP_17]], align 1
 ; CHECK-NEXT:    call void @memset_pattern8(i8* [[A]], i8* [[PATTERN:%.*]], i64 17)
 ; CHECK-NEXT:    ret void
@@ -82,7 +86,9 @@ entry:
 define void @test_memset_pattern16_const_size(i8* noalias %a, i8* noalias %pattern) {
 ; CHECK-LABEL: @test_memset_pattern16_const_size(
 ; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 17
+; CHECK-NEXT:    [[A_GEP_1:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 1
+; CHECK-NEXT:    store i8 0, i8* [[A_GEP_1]], align 1
+; CHECK-NEXT:    [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A]], i32 17
 ; CHECK-NEXT:    store i8 1, i8* [[A_GEP_17]], align 1
 ; CHECK-NEXT:    call void @memset_pattern16(i8* [[A]], i8* [[PATTERN:%.*]], i64 17)
 ; CHECK-NEXT:    ret void