---

yaml
---
r: 348579
b: refs/heads/master
c: cf8e534
h: refs/heads/master
i:
  348577: 753b667
  348575: cee0d57

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 28d1852c3e1f25b3b2d8f9eafb97f36f05d580e7
+refs/heads/master: cf8e5349f62cbccd1c86c3dc6add261bbc899327
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/SIL/OwnershipUtils.h

@@ -170,6 +170,18 @@ class LinearLifetimeChecker {
              ArrayRef<BranchPropagatedUser> nonConsumingUses,
              ownership::ErrorBehaviorKind errorBehavior,
              SmallVectorImpl<SILBasicBlock *> *leakingBlocks = nullptr);
+
+  /// Returns true that \p value forms a linear lifetime with consuming uses \p
+  /// consumingUses, non consuming uses \p nonConsumingUses. Returns false
+  /// otherwise.
+  bool validateLifetime(SILValue value,
+                        ArrayRef<BranchPropagatedUser> consumingUses,
+                        ArrayRef<BranchPropagatedUser> nonConsumingUses) {
+    return !checkValue(value, consumingUses, nonConsumingUses,
+                       ownership::ErrorBehaviorKind::ReturnFalse,
+                       nullptr /*leakingBlocks*/)
+                .getFoundError();
+  }
 };
 
 /// Returns true if v is an address or trivial.

trunk/lib/SIL/OwnershipUtils.cpp

@@ -207,7 +207,5 @@ bool BorrowScopeIntroducingValue::areInstructionsWithinScope(
       [&scratchSpace](SILInstruction *i) { scratchSpace.emplace_back(i); });
 
   LinearLifetimeChecker checker(visitedBlocks, deadEndBlocks);
-  auto result = checker.checkValue(value, scratchSpace, instructions,
-                                   ownership::ErrorBehaviorKind::ReturnFalse);
-  return !result.getFoundError();
+  return checker.validateLifetime(value, scratchSpace, instructions);
 }

trunk/lib/SILOptimizer/Mandatory/SemanticARCOpts.cpp

@@ -673,9 +673,10 @@ class StorageGuaranteesLoadVisitor
     SmallPtrSet<SILBasicBlock *, 4> visitedBlocks;
 
     LinearLifetimeChecker checker(visitedBlocks, ARCOpt.getDeadEndBlocks());
-    auto result = checker.checkValue(baseObject, baseEndBorrows, valueDestroys,
-                                     ownership::ErrorBehaviorKind::ReturnFalse);
-    return answer(result.getFoundError());
+    // Returns true on success. So we invert.
+    bool foundError =
+        !checker.validateLifetime(baseObject, baseEndBorrows, valueDestroys);
+    return answer(foundError);
   }
 
   // TODO: Handle other access kinds?