Skip to content

Commit af13914

Browse files
authored
Merge pull request #20587 from moiseev/v7k-fix
Fix abi_v7k.swift test
2 parents 2f4a901 + 51bd2f1 commit af13914

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

stdlib/public/core/FloatingPointTypes.swift.gyb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,8 +1625,9 @@ extension ${Self} {
16251625

16261626
// We "shouldn't" need this, but the typechecker barfs on an expression
16271627
// in the test suite without it.
1628-
@inlinable // FIXME(inline-always)
1629-
@inline(__always)
1628+
// If replaced with @inline(__always) the init no longer gets
1629+
// inlined in -Onone and this breaks the abi_v7k test in a subtle way.
1630+
@_transparent
16301631
public init(_ v: Int) {
16311632
_value = Builtin.sitofp_Int${word_bits}_FPIEEE${bits}(v._value)
16321633
}

test/IRGen/abi_v7k.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
// REQUIRES: CPU=armv7k
55
// REQUIRES: OS=watchos
6-
// REQUIRES: rdar45306568
76

87
// CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k9addFloats{{.*}}"(float, float)
98
// CHECK: fadd float %0, %1
@@ -179,7 +178,7 @@ func testSingleP(x: SinglePayload) -> Double {
179178
// V7K-LABEL: _$s8test_v7k0A6MultiP
180179
// V7K: vldr d16, [sp{{.*}}]
181180
// V7K: vmov.f64 d0, d16
182-
// V7K: pop {{{.*}}}
181+
// V7K: bx lr
183182
// Backend will assign r0, r1 and r2 for input parameters and d0 for return values.
184183
class Bignum {}
185184
enum MultiPayload {

0 commit comments

Comments
 (0)