---

yaml
---
r: 345933
b: refs/heads/master
c: 186513b
h: refs/heads/master
i:
  345931: 9555405

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3758290ba3b1dffeac39b0e72a4f1ae7bc2fc80b
+refs/heads/master: 186513bb382b2ad588fc76faf733f99d4adf7fa9
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/stdlib/public/core/FloatingPointTypes.swift.gyb

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

trunk/test/IRGen/abi_v7k.swift

@@ -3,7 +3,6 @@
 
 // REQUIRES: CPU=armv7k
 // REQUIRES: OS=watchos
-// REQUIRES: rdar45306568
 
 // CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k9addFloats{{.*}}"(float, float)
 // CHECK: fadd float %0, %1
@@ -179,7 +178,7 @@ func testSingleP(x: SinglePayload) -> Double {
 // V7K-LABEL: _$s8test_v7k0A6MultiP
 // V7K:        vldr     d16, [sp{{.*}}]
 // V7K:        vmov.f64 d0, d16
-// V7K:        pop     {{{.*}}}
+// V7K:        bx lr
 // Backend will assign r0, r1 and r2 for input parameters and d0 for return values.
 class Bignum {}
 enum MultiPayload {