---

yaml
---
r: 293887
b: refs/heads/tensorflow
c: 5e00fdd
h: refs/heads/master
i:
  293885: 2363e4e
  293883: d3814ec
  293879: f8e9400
  293871: 2e8d8cc
  293855: 4b54b29
  293823: 7570ea4
  293759: d1893ee
  293631: d0f8079
  293375: 093a42c
  292863: 24b455d

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: 79518bec6768cf5b1dce6a6886f2f7218d0d07b9
+refs/heads/tensorflow: 5e00fdd2728b5af180914c8d8f1a3848cfce88dc
 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/lib/SILGen/SILGenBuiltin.cpp

@@ -1078,12 +1078,11 @@ static ManagedValue emitBuiltinAutoDiffApplyAssociatedFunction(
         continue;
 
       if (argumentValue->getType().isObject()) {
-        SGF.B.createDestroyValue(loc, argumentValue);
+        SGF.B.emitDestroyValueOperation(loc, argumentValue);
         continue;
       }
 
-      if (false)
-        SGF.B.createDestroyAddr(loc, argumentValue);
+      SGF.B.createDestroyAddr(loc, argumentValue);
     }
   };
 
@@ -1096,7 +1095,8 @@ static ManagedValue emitBuiltinAutoDiffApplyAssociatedFunction(
     auto curryLevelArgVals = ArrayRef<SILValue>(origFnArgVals).slice(
         currentParameter, curryLevel->getNumParameters());
     auto applyResult = SGF.B.createApply(
-        loc, assocFn, SubstitutionMap(), curryLevelArgVals, /*isNonThrowing*/ false);
+        loc, assocFn, SubstitutionMap(), curryLevelArgVals,
+        /*isNonThrowing*/ false);
     currentParameter += curryLevel->getNumParameters();
 
     if (assocFnNeedsDestroy)
@@ -1125,8 +1125,8 @@ static ManagedValue emitBuiltinAutoDiffApplyAssociatedFunction(
         currentParameter);
     for (auto origFnArgVal : curryLevelArgVals)
       applyArgs.push_back(origFnArgVal);
-    auto differential = SGF.B.createApply(loc, assocFn, SubstitutionMap(), applyArgs,
-                                          /*isNonThrowing*/ false);
+    auto differential = SGF.B.createApply(
+        loc, assocFn, SubstitutionMap(), applyArgs, /*isNonThrowing*/ false);
 
     if (assocFnNeedsDestroy)
       SGF.B.createDestroyValue(loc, assocFn);
@@ -1143,8 +1143,9 @@ static ManagedValue emitBuiltinAutoDiffApplyAssociatedFunction(
   // Apply the last curry level, in the case where it only has direct results.
   auto curryLevelArgVals = ArrayRef<SILValue>(origFnArgVals).slice(
       currentParameter);
-  auto resultTuple = SGF.B.createApply(loc, assocFn, SubstitutionMap(), curryLevelArgVals,
-                                       /*isNonThrowing*/ false);
+  auto resultTuple = SGF.B.createApply(
+      loc, assocFn, SubstitutionMap(), curryLevelArgVals,
+      /*isNonThrowing*/ false);
 
   if (assocFnNeedsDestroy)
     SGF.B.createDestroyValue(loc, assocFn);

branches/tensorflow/lib/SILGen/SILGenPoly.cpp

@@ -3245,13 +3245,8 @@ static ManagedValue createAutoDiffThunk(SILGenFunction &SGF,
                                         CanAnyFunctionType outputSubstType) {
   // Applies a thunk to all the components by extracting them, applying thunks
   // to all of them, and then putting them back together.
-
   auto sourceType = fn.getType().castTo<SILFunctionType>();
 
-  // We're never going to pass `fn` into anything that consumes it, so get its
-  // value without disabling cleanup.
-  auto fnValue = fn.getValue();
-
   auto withoutDifferentiablePattern = [](AbstractionPattern pattern)
       -> AbstractionPattern {
     auto patternType = cast<AnyFunctionType>(pattern.getType());
@@ -3269,10 +3264,13 @@ static ManagedValue createAutoDiffThunk(SILGenFunction &SGF,
   auto outputOrigTypeNotDiff = withoutDifferentiablePattern(outputOrigType);
   auto &expectedTLNotDiff = SGF.getTypeLowering(outputOrigTypeNotDiff,
                                                 outputSubstTypeNotDiff);
-  SILValue original = SGF.B.createAutoDiffFunctionExtractOriginal(loc, fnValue);
-  auto managedOriginal = original->getType().isTrivial(SGF.F)
-                             ? ManagedValue::forTrivialObjectRValue(original)
-                             : ManagedValue::forBorrowedObjectRValue(original);
+  // `autodiff_function_extract` is consuming; copy `fn` before passing as
+  // operand.
+  auto copiedFnValue = fn.copy(SGF, loc);
+  auto *original = SGF.B.createAutoDiffFunctionExtractOriginal(
+      loc, copiedFnValue.forward(SGF));
+  auto managedOriginal = SGF.emitManagedRValueWithCleanup(original);
+
   ManagedValue originalThunk = createThunk(
       SGF, loc, managedOriginal, inputOrigTypeNotDiff, inputSubstTypeNotDiff,
       outputOrigTypeNotDiff, outputSubstTypeNotDiff, expectedTLNotDiff);
@@ -3309,12 +3307,12 @@ static ManagedValue createAutoDiffThunk(SILGenFunction &SGF,
                                                    kind);
     auto &assocFnExpectedTL = SGF.getTypeLowering(assocFnOutputOrigType,
                                                   assocFnOutputSubstType);
-    auto assocFn = SGF.B.createAutoDiffFunctionExtract(
-        loc, kind,
-        /*differentiationOrder*/ 1, fnValue);
-    auto managedAssocFn = assocFn->getType().isTrivial(SGF.F)
-                              ? ManagedValue::forTrivialObjectRValue(assocFn)
-                              : ManagedValue::forBorrowedObjectRValue(assocFn);
+    // `autodiff_function_extract` is consuming; copy `fn` before passing as
+    // operand.
+    auto copiedFnValue = fn.copy(SGF, loc);
+    auto *assocFn = SGF.B.createAutoDiffFunctionExtract(
+        loc, kind, /*differentiationOrder*/ 1, copiedFnValue.forward(SGF));
+    auto managedAssocFn = SGF.emitManagedRValueWithCleanup(assocFn);
     return createThunk(SGF, loc, managedAssocFn, assocFnInputOrigType,
                        assocFnInputSubstType, assocFnOutputOrigType,
                        assocFnOutputSubstType, assocFnExpectedTL);

branches/tensorflow/test/AutoDiff/builtin_differential_operators.swift

@@ -1,4 +1,7 @@
-// RUN: %target-run
+// RUN: %empty-directory(%t)
+// RUN: %target-build-swift %s -parse-stdlib -o %t/Builtins
+// RUN: %target-codesign %t/Builtins
+// RUN: %target-run %t/Builtins
 // REQUIRES: executable_test
 
 import Swift