Skip to content

Commit 959e899

Browse files
committed
Fixing up IRGen tests that use attribute no-frame-pointer-elim.
Changes I made to swift (PR swiftlang#26263) for llvm cfe r366645 have caused these tests to fail because the string attributes have changes. This patch fixes them to use the new frame pointer elision attributes.
1 parent fd577fa commit 959e899

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

test/IRGen/c_globals.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ public func testCaptureGlobal() {
3131
}) // CHECK: {{^}$}}
3232
}
3333

34-
// CHECK-DAG: attributes [[CLANG_FUNC_ATTR]] = { noinline nounwind {{.*}}"no-frame-pointer-elim"="true"{{.*}}
35-
// CHECK-DAG: attributes [[SWIFT_FUNC_ATTR]] = { "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "target-cpu"
34+
// CHECK-DAG: attributes [[CLANG_FUNC_ATTR]] = { noinline nounwind {{.*}}"frame-pointer"="all"{{.*}}
35+
// CHECK-DAG: attributes [[SWIFT_FUNC_ATTR]] = { "frame-pointer"="all" "target-cpu"

test/IRGen/generic_metatypes.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func makeGenericMetatypes() {
204204
// CHECK-NOT: call void @llvm.lifetime.end
205205
// CHECK: ret %swift.metadata_response
206206

207-
// CHECK: attributes [[NOUNWIND_READNONE_OPT]] = { nounwind readnone "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "target-cpu"
208-
// CHECK: attributes [[NOUNWIND_OPT]] = { nounwind "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "target-cpu"
207+
// CHECK: attributes [[NOUNWIND_READNONE_OPT]] = { nounwind readnone "frame-pointer"="all" "target-cpu"
208+
// CHECK: attributes [[NOUNWIND_OPT]] = { nounwind "frame-pointer"="all" "target-cpu"
209209
// CHECK: attributes [[NOUNWIND_READNONE]] = { nounwind readnone }
210210
// CHECK: attributes [[NOUNWIND_ARGMEM]] = { inaccessiblemem_or_argmemonly nounwind }

0 commit comments

Comments
 (0)