Skip to content

Commit ddfac07

Browse files
committed
Revert "[MemoryLocation] Handle memset_pattern{4,8,16} in getForDest."
This reverts commit ac60263. It looks like the test fails on certain non-Darwin system, even though the triple is explicitly set to macos. Revert while I investigate.
1 parent 7abf299 commit ddfac07

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

llvm/lib/Analysis/MemoryLocation.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ MemoryLocation::getForDest(const CallBase *CB, const TargetLibraryInfo &TLI) {
137137
LibFunc LF;
138138
if (TLI.getLibFunc(*CB, LF) && TLI.has(LF)) {
139139
switch (LF) {
140-
case LibFunc_memset_pattern4:
141-
case LibFunc_memset_pattern8:
142-
case LibFunc_memset_pattern16:
143140
case LibFunc_strncpy:
144141
case LibFunc_strcpy:
145142
case LibFunc_strcat:

llvm/test/Transforms/DeadStoreElimination/libcalls-darwin.ll

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ declare void @memset_pattern16(i8*, i8*, i64)
1010
define void @test_memset_pattern4_const_size(i8* noalias %a, i8* noalias %pattern) {
1111
; CHECK-LABEL: @test_memset_pattern4_const_size(
1212
; CHECK-NEXT: entry:
13-
; CHECK-NEXT: [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 17
13+
; CHECK-NEXT: [[A_GEP_1:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 1
14+
; CHECK-NEXT: store i8 0, i8* [[A_GEP_1]], align 1
15+
; CHECK-NEXT: [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A]], i32 17
1416
; CHECK-NEXT: store i8 1, i8* [[A_GEP_17]], align 1
1517
; CHECK-NEXT: call void @memset_pattern4(i8* [[A]], i8* [[PATTERN:%.*]], i64 17)
1618
; CHECK-NEXT: ret void
@@ -46,7 +48,9 @@ entry:
4648
define void @test_memset_pattern8_const_size(i8* noalias %a, i8* noalias %pattern) {
4749
; CHECK-LABEL: @test_memset_pattern8_const_size(
4850
; CHECK-NEXT: entry:
49-
; CHECK-NEXT: [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 17
51+
; CHECK-NEXT: [[A_GEP_1:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 1
52+
; CHECK-NEXT: store i8 0, i8* [[A_GEP_1]], align 1
53+
; CHECK-NEXT: [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A]], i32 17
5054
; CHECK-NEXT: store i8 1, i8* [[A_GEP_17]], align 1
5155
; CHECK-NEXT: call void @memset_pattern8(i8* [[A]], i8* [[PATTERN:%.*]], i64 17)
5256
; CHECK-NEXT: ret void
@@ -82,7 +86,9 @@ entry:
8286
define void @test_memset_pattern16_const_size(i8* noalias %a, i8* noalias %pattern) {
8387
; CHECK-LABEL: @test_memset_pattern16_const_size(
8488
; CHECK-NEXT: entry:
85-
; CHECK-NEXT: [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 17
89+
; CHECK-NEXT: [[A_GEP_1:%.*]] = getelementptr i8, i8* [[A:%.*]], i32 1
90+
; CHECK-NEXT: store i8 0, i8* [[A_GEP_1]], align 1
91+
; CHECK-NEXT: [[A_GEP_17:%.*]] = getelementptr i8, i8* [[A]], i32 17
8692
; CHECK-NEXT: store i8 1, i8* [[A_GEP_17]], align 1
8793
; CHECK-NEXT: call void @memset_pattern16(i8* [[A]], i8* [[PATTERN:%.*]], i64 17)
8894
; CHECK-NEXT: ret void

0 commit comments

Comments
 (0)