---

yaml
---
r: 277438
b: refs/heads/tensorflow-merge
c: c9683d5
h: refs/heads/master

Author: rxwei

[refs]

@@ -1124,7 +1124,7 @@ refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-29-a: 1b087071edaea398480fb778e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-10-30-a: 8bc9e108e1480d9217299984e428c601c7aaac75
 refs/tags/swift-4.2.1-RELEASE: 02a6ca969ea1387475b6caeb69c31186df7d30b6
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-11-01-a: 3b0299288f8287094b9ef587f46df54f42a347af
-refs/heads/tensorflow-merge: 9511f404ceae43fdaa91263a396716a22b17f9e0
+refs/heads/tensorflow-merge: c9683d5d231b0b9102803f6155218dfd33b0726e
 refs/heads/TensorFlowLite: b91446471276e37bbfe64767c875f3c7f7102954
 refs/heads/ad-side-effects: 19e0c0de1f59b0929c381925df2e8c72cdf4a728
 refs/heads/add-test-for-asan-compiler-crash: 3cdeecffb47bf28707b299fa2b5bdf0769a4a826

branches/tensorflow-merge/lib/SIL/SILFunctionBuilder.cpp

@@ -73,25 +73,25 @@ void SILFunctionBuilder::addFunctionAttributes(SILFunction *F,
   // - Non-getter accessors (setters, modifiers, etc).
   // - Default argument generator functions.
   // - Thunks. Those are currently handled in SILGenThunk.cpp.
-  if ((!isa<AccessorDecl>(decl) || dyn_cast<AccessorDecl>(decl)->isGetter()) &&
+  if ((!isa<AccessorDecl>(decl) || cast<AccessorDecl>(decl)->isGetter()) &&
       constant.kind != SILDeclRef::Kind::DefaultArgGenerator &&
       !constant.autoDiffAssociatedFunctionIdentifier &&
+      !constant.isStoredPropertyInitializer() &&
       !constant.isThunk()) {
     for (auto *A : Attrs.getAttributes<DifferentiableAttr>()) {
-      auto *DA = cast<DifferentiableAttr>(A);
       std::string jvpName, vjpName;
       // Get JVP/VJP names.
-      if (auto *jvpFn = DA->getJVPFunction())
+      if (auto *jvpFn = A->getJVPFunction())
         jvpName = SILDeclRef(jvpFn).mangle();
-      if (auto *vjpFn = DA->getVJPFunction())
+      if (auto *vjpFn = A->getVJPFunction())
         vjpName = SILDeclRef(vjpFn).mangle();
       // Get lowered argument indices.
-      auto paramIndices = DA->getParameterIndices();
-      auto loweredIndices = paramIndices->getLowered(
+      auto paramIndices = A->getParameterIndices();
+      auto loweredParamIndices = paramIndices->getLowered(
           decl->getInterfaceType()->castTo<AnyFunctionType>());
-      SILAutoDiffIndices indices(/*source*/ 0, loweredIndices);
+      SILAutoDiffIndices indices(/*source*/ 0, loweredParamIndices);
       auto silDiffAttr = SILDifferentiableAttr::create(
-          M, indices, DA->getRequirements(), M.allocateCopy(jvpName),
+          M, indices, A->getRequirements(), M.allocateCopy(jvpName),
           M.allocateCopy(vjpName));
       F->addDifferentiableAttr(silDiffAttr);
     }

branches/tensorflow-merge/test/AutoDiff/differentiable_attr_silgen.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-silgen -verify %s | %FileCheck %s
+// RUN: %target-swift-frontend -emit-silgen -enable-testing -verify %s | %FileCheck %s
 
 //===----------------------------------------------------------------------===//
 // Normal types
@@ -155,4 +155,12 @@ extension DiffComputedProp : Differentiable {
 }
 
 // CHECK-LABEL: DiffComputedProp.computedProp.getter
-// CHECK-NEXT: sil {{.*}} [differentiable source 0 wrt 0 jvp @computedPropJVP vjp @computedPropVJP]
+// CHECK-NEXT: [differentiable source 0 wrt 0 jvp @computedPropJVP vjp @computedPropVJP]
+
+public struct MyLayer: Differentiable {
+  @differentiable
+  var x: Float = 10
+}
+
+// CHECK-LABEL: initialization expression of MyLayer.x
+// CHECK-NEXT: sil [transparent] @$s26differentiable_attr_silgen7MyLayerV1xSfvpfi : $@convention(thin) () -> Float