---

yaml
---
r: 344983
b: refs/heads/master
c: 1923c27
h: refs/heads/master
i:
  344981: 2c3ef9e
  344979: ed2cce3
  344975: e03b865

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 579f7e633f52ca28eb2b940f9f1924d80a20fedd
+refs/heads/master: 1923c27346f74c21fc19756db61294b9283fbfa5
 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/MemAccessUtils.h

@@ -54,10 +54,9 @@ class ObjectProjection {
 
   const Projection &getProjection() const { return proj; }
 
-  const ProjectionPath getProjectionPath() const {
+  const Optional<ProjectionPath> getProjectionPath() const {
     return ProjectionPath::getProjectionPath(stripBorrow(REA->getOperand()),
-                                             REA)
-        .getValue();
+                                             REA);
   }
 
   bool operator==(const ObjectProjection &other) const {
@@ -284,7 +283,11 @@ class AccessedStorage {
     }
     auto projPath = getObjectProjection().getProjectionPath();
     auto otherProjPath = other.getObjectProjection().getProjectionPath();
-    return projPath.hasNonEmptySymmetricDifference(otherProjPath);
+    if (!projPath.hasValue() || !otherProjPath.hasValue()) {
+      return false;
+    }
+    return projPath.getValue().hasNonEmptySymmetricDifference(
+        otherProjPath.getValue());
   }
 
   /// Returns the ValueDecl for the underlying storage, if it can be