---

yaml
---
r: 345526
b: refs/heads/master
c: 99ea448
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 876d1ef645118ee365f3010f19eb71e3503c0b31
+refs/heads/master: 99ea4485c711b529a4719ec32335f51ee81af018
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/SILGen/ArgumentSource.h

@@ -196,9 +196,7 @@ class ArgumentSource {
     return Storage.get<LValueStorage>(StoredKind).Loc;
   }
 
-  Expr *peekExpr() & {
-    return Storage.get<Expr*>(StoredKind);
-  }
+  Expr *findStorageReferenceExprForBorrow() &&;
 
   /// Given that this source is an expression, extract and clear
   /// that expression.

trunk/lib/SILGen/SILGenApply.cpp

@@ -2459,6 +2459,20 @@ static Expr *findStorageReferenceExprForBorrow(Expr *e) {
   return nullptr;
 }
 
+Expr *ArgumentSource::findStorageReferenceExprForBorrow() && {
+  if (!isExpr()) return nullptr;
+
+  auto argExpr = asKnownExpr();
+  auto lvExpr = ::findStorageReferenceExprForBorrow(argExpr);
+
+  // Claim the value of this argument if we found a storage reference.
+  if (lvExpr) {
+    (void) std::move(*this).asKnownExpr();
+  }
+
+  return lvExpr;
+}
+
 namespace {
 
 /// A destination for an argument other than just "onto to the end
@@ -2894,14 +2908,9 @@ class ArgEmitter {
     assert(paramsSlice.size() == 1);
 
     // Try to find an expression we can emit as an l-value.
-    if (!arg.isExpr()) return false;
-    auto argExpr = arg.peekExpr();
-    auto lvExpr = findStorageReferenceExprForBorrow(argExpr);
+    auto lvExpr = std::move(arg).findStorageReferenceExprForBorrow();
     if (!lvExpr) return false;
 
-    // Claim the argument.
-    (void) std::move(arg).asKnownExpr();
-
     emitBorrowed(lvExpr, loweredSubstArgType, loweredSubstParamType,
                  origParamType, paramsSlice);
     return true;