---

yaml
---
r: 293883
b: refs/heads/tensorflow
c: 17ab3b9
h: refs/heads/master
i:
  293881: 1879ea6
  293879: f8e9400

Author: dan-zheng

[refs]

@@ -816,7 +816,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-04-25-a: 22f738a831d43aff2b9c9773bcb65
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-05-08-a: 7d98cc16689baba5c8a3b90a9329bdcc1a12b4e9
 refs/heads/cherr42: a566ad54b073c2c56ac0a705d0a5bed9743135a5
 "refs/heads/codable_test_comment_fix": fc8f6824f7f347e1e8db55bff62db385c5728b5a
-refs/heads/tensorflow: 3edf725be279cba222551da18ec0b3c8fa5b2d46
+refs/heads/tensorflow: 17ab3b95d03bcb5a7cd9c90ad060dfef91c92758
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-11-a: 8126fd7a652e2f70ad6d76505239e34fb2ef3e1a
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-12-a: b3fd3dd84df6717f2e2e9df58c6d7e99fed57086
 refs/tags/swift-4.1-DEVELOPMENT-SNAPSHOT-2018-05-13-a: 71135119579039dc321c5f65d870050fe36efda2

branches/tensorflow/test/AutoDiff/derived_differentiable_properties.swift

@@ -18,7 +18,7 @@ public struct Foo : Differentiable {
 // CHECK-AST:   public typealias CotangentVector = Foo.AllDifferentiableVariables
 
 // CHECK-SILGEN-LABEL: // Foo.a.getter
-// CHECK-SILGEN-NEXT: sil [transparent] [serialized] [differentiable source 0 wrt 0] @$s33derived_differentiable_properties3FooV1aSfvg : $@convention(method) (Foo) -> Float
+// CHECK-SILGEN-NEXT: sil [transparent] [serialized] [differentiable source 0 wrt 0] [ossa] @$s33derived_differentiable_properties3FooV1aSfvg : $@convention(method) (Foo) -> Float
 
 struct AdditiveTangentIsSelf : AdditiveArithmetic, Differentiable {
   var a: Float

branches/tensorflow/test/AutoDiff/differentiable_attr_silgen.swift

@@ -10,14 +10,14 @@ public func foo(_ x: Float, _ y: Float) -> Float {
   return 1
 }
 
-// CHECK-LABEL: sil [differentiable source 0 wrt 0, 1 vjp @dfoo] @foo
+// CHECK-LABEL: sil [differentiable source 0 wrt 0, 1 vjp @dfoo] [ossa] @foo
 
 @_silgen_name("dfoo")
 public func dfoo(_ x: Float, _ y: Float) -> (Float, (Float) -> (Float, Float)) {
   return (foo(x, y), { _ in (1, 1) })
 }
 
-// CHECK-LABEL: sil @dfoo
+// CHECK-LABEL: sil [ossa] @dfoo
 
 //===----------------------------------------------------------------------===//
 // Indirect returns
@@ -29,8 +29,8 @@ public func foo_indir_ret<T: Differentiable>(_ x: Float, _ y: T) -> T {
   return y
 }
 
-// CHECK-LABEL: sil [differentiable source 0 wrt 0, 1 vjp @dfoo_indir_ret] @foo_indir_ret : $@convention(thin) <T where T : Differentiable> (Float, @in_guaranteed T) -> @out T {
-// CHECK: bb0(%0 : @trivial $*T, %1 : @trivial $Float, %2 : @trivial $*T):
+// CHECK-LABEL: sil [differentiable source 0 wrt 0, 1 vjp @dfoo_indir_ret] [ossa] @foo_indir_ret : $@convention(thin) <T where T : Differentiable> (Float, @in_guaranteed T) -> @out T {
+// CHECK: bb0(%0 : $*T, %1 : $Float, %2 : $*T):
 
 @_silgen_name("dfoo_indir_ret")
 public func dfoo_indir_ret<T: Differentiable>(_ x: Float, _ y: T) -> (T, (T.CotangentVector) -> (Float, T.CotangentVector)) {
@@ -47,14 +47,14 @@ public func hasjvp(_ x: Float, _ y: Float) -> Float {
   return 1
 }
 
-// CHECK-LABEL: sil [differentiable source 0 wrt 0, 1 jvp @dhasjvp] @hasjvp
+// CHECK-LABEL: sil [differentiable source 0 wrt 0, 1 jvp @dhasjvp] [ossa] @hasjvp
 
 @_silgen_name("dhasjvp")
 public func dhasjvp(_ x: Float, _ y: Float) -> (Float, (Float, Float) -> Float) {
   return (1, { _, _ in 1 })
 }
 
-// CHECK-LABEL: sil @dhasjvp
+// CHECK-LABEL: sil [ossa] @dhasjvp
 
 //===----------------------------------------------------------------------===//
 // VJP
@@ -67,14 +67,14 @@ public func hasvjp(_ x: Float, _ y: Float) -> Float {
   return 1
 }
 
-// CHECK-LABEL: sil [serialized] [differentiable source 0 wrt 0, 1 vjp @dhasvjp] @hasvjp
+// CHECK-LABEL: sil [serialized] [differentiable source 0 wrt 0, 1 vjp @dhasvjp] [ossa] @hasvjp
 
 @_silgen_name("dhasvjp")
 public func dhasvjp(_ x: Float, _ y: Float) -> (Float, (Float) -> (Float, Float)) {
   return (1, { _ in (1, 1) })
 }
 
-// CHECK-LABEL: sil @dhasvjp
+// CHECK-LABEL: sil [ossa] @dhasvjp
 
 //===----------------------------------------------------------------------===//
 // Stored property
@@ -163,4 +163,4 @@ public struct MyLayer: Differentiable {
 }
 
 // CHECK-LABEL: initialization expression of MyLayer.x
-// CHECK-NEXT: sil [transparent] @$s26differentiable_attr_silgen7MyLayerV1xSfvpfi : $@convention(thin) () -> Float
+// CHECK-NEXT: sil [transparent] [ossa] @$s26differentiable_attr_silgen7MyLayerV1xSfvpfi : $@convention(thin) () -> Float

branches/tensorflow/test/AutoDiff/differentiable_attr_type_checking.swift

@@ -564,8 +564,9 @@ func vjpNonvariadic(_ x: Float, indices: [Int32]) -> (Float, (Float) -> Float) {
   return (x, { $0 })
 }
 
-// expected-error @+2 {{type 'Scalar' constrained to non-protocol, non-class type 'Float'}}
-// expected-error @+1 {{can only differentiate with respect to parameters that conform to 'Differentiable', but 'Scalar' does not conform to 'Differentiable'}}
+// expected-error @+3 {{type 'Scalar' constrained to non-protocol, non-class type 'Float'}}
+// expected-error @+2 {{can only differentiate with respect to parameters that conform to 'Differentiable', but 'Scalar' does not conform to 'Differentiable'}}
+// expected-note @+1 {{use 'Scalar == Float' to require 'Scalar' to be 'Float'}}
 @differentiable(where Scalar : Float)
 func invalidRequirementConformance<Scalar>(x: Scalar) -> Scalar {
   return x