Skip to content

Commit aeeda41

Browse files
committed
Default to swift-async-fp=always
This matches what we did before the introduction of dynamic swift_async_extendedFramePointerFlags usage
1 parent 4f6937e commit aeeda41

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

llvm/lib/CodeGen/CommandFlags.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ codegen::RegisterCodeGenFlags::RegisterCodeGenFlags() {
281281
static cl::opt<SwiftAsyncFramePointerMode> SwiftAsyncFramePointer(
282282
"swift-async-fp",
283283
cl::desc("Determine when the Swift async frame pointer should be set"),
284-
cl::init(SwiftAsyncFramePointerMode::DeploymentBased),
284+
cl::init(SwiftAsyncFramePointerMode::Always),
285285
cl::values(clEnumValN(SwiftAsyncFramePointerMode::DeploymentBased, "auto",
286286
"Determine based on deployment target"),
287287
clEnumValN(SwiftAsyncFramePointerMode::Always, "always",

llvm/test/CodeGen/AArch64/swift-dynamic-async-frame.ll

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
; RUN: llc -mtriple arm64-apple-ios15.0.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
22
; RUN: llc -mtriple arm64-apple-ios15.0.0 -swift-async-fp=auto %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
3+
; RUN: llc -mtriple arm64-apple-ios15.0.0 -swift-async-fp=never %s -o - | FileCheck %s --check-prefix=CHECK-NEVER
34
; RUN: llc -mtriple arm64-apple-ios14.9.0 -swift-async-fp=always %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
4-
; RUN: llc -mtriple arm64-apple-ios14.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC
5+
; RUN: llc -mtriple arm64-apple-ios14.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
56
; RUN: llc -mtriple arm64-apple-ios14.9.0 -swift-async-fp=auto %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC
67
; RUN: llc -mtriple arm64-apple-tvos15.0.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
7-
; RUN: llc -mtriple arm64-apple-tvos14.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC
8+
; RUN: llc -mtriple arm64-apple-tvos14.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
89
; RUN: llc -mtriple arm64-apple-macosx12.0.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
9-
; RUN: llc -mtriple arm64-apple-macosx11.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC
10+
; RUN: llc -mtriple arm64-apple-macosx11.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
1011
; RUN: llc -mtriple arm64_32-apple-watchos8.0.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
11-
; RUN: llc -mtriple arm64_32-apple-watchos7.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC-32
12+
; RUN: llc -mtriple arm64_32-apple-watchos7.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-STATIC
13+
; RUN: llc -mtriple -swift-async-fp=auto arm64_32-apple-watchos7.9.0 %s -o - | FileCheck %s --check-prefix=CHECK-DYNAMIC-32
1214

1315
; CHECK-STATIC-LABEL: foo:
1416
; CHECK-STATIC: orr x29, x29, #0x1000000000000000
1517

18+
; CHECK-NEVER-LABEL: foo:
19+
; CHECK-NEVER-NOT: orr x29, x29, #0x1000000000000000
20+
; CHECK-NEVER-NOT: _swift_async_extendedFramePointerFlags
21+
1622
; CHECK-DYNAMIC-LABEL: foo:
1723
; CHECK-DYNAMIC: adrp x16, _swift_async_extendedFramePointerFlags@GOTPAGE
1824
; CHECK-DYNAMIC: ldr x16, [x16, _swift_async_extendedFramePointerFlags@GOTPAGEOFF]

0 commit comments

Comments
 (0)