Look through copy_addr and opened existentials to diagnose move-only sources.

Author: jckarter

lib/SILOptimizer/Mandatory/MoveOnlyDiagnostics.cpp

@@ -93,6 +93,19 @@ static void getVariableNameForValue(SILValue value2,
       value2->getFunction());
   while (true) {
     if (auto *allocInst = dyn_cast<AllocationInst>(searchValue)) {
+      // If the instruction itself doesn't carry any variable info, see whether
+      // it's copied from another place that does.
+      if (!allocInst->getDecl()) {
+        if (auto copy = allocInst->getSingleUserOfType<CopyAddrInst>()) {
+          if (copy->getDest() == allocInst
+              && !copy->isTakeOfSrc()
+              && copy->isInitializationOfDest()) {
+            searchValue = copy->getSrc();
+            continue;
+          }
+        }
+      }
+    
       variableNamePath.push_back(allocInst);
       break;
     }
@@ -102,6 +115,11 @@ static void getVariableNameForValue(SILValue value2,
       break;
     }
 
+    if (auto *oeInst = dyn_cast<OpenExistentialAddrInst>(searchValue)) {
+      searchValue = oeInst->getOperand();
+      continue;
+    }
+
     if (auto *rei = dyn_cast<RefElementAddrInst>(searchValue)) {
       variableNamePath.push_back(rei);
       searchValue = rei->getOperand();

test/SILOptimizer/moveonly_modify_coroutine.swift

@@ -80,22 +80,21 @@ func test(m_snc snc: inout SNC) {
 
 func test<T: P>(t: T) {
   borrow(t.data)
-  take(t.data) // expected-error{{'unknown.data' is borrowed and cannot be consumed}} expected-note{{consumed here}}
+  take(t.data) // expected-error{{'t.data' is borrowed and cannot be consumed}} expected-note{{consumed here}}
 }
 func test<T: P>(m_t t: inout T) {
   borrow(t.data)
   take(t.data) // expected-error{{missing reinitialization of inout parameter 't.data' after consume}} expected-note{{consumed here}}
   mod(&t.data)
 }
 
-// FIXME: get the actual variable name instead of 'unknown' in these cases.
 func test(p: P) {
   borrow(p.data)
-  take(p.data) // expected-error{{'unknown.data' is borrowed and cannot be consumed}} expected-note{{consumed here}}
+  take(p.data) // expected-error{{'p.data' is borrowed and cannot be consumed}} expected-note{{consumed here}}
 }
 func test(m_p p: inout P) {
   borrow(p.data)
-  take(p.data) // expected-error{{missing reinitialization of inout parameter 'unknown' after consume}} expected-note{{consumed here}}
+  take(p.data) // expected-error{{missing reinitialization of inout parameter 'p.data' after consume}} expected-note{{consumed here}}
   mod(&p.data)
 }
 

test/SILOptimizer/moveonly_read_coroutine.swift

@@ -62,13 +62,12 @@ func test(snc: borrowing SNC) {
   take(snc.data) // expected-error{{'snc.data' is borrowed and cannot be consumed}} expected-note{{consumed here}}
 }
 
-// FIXME: get the actual variable name instead of 'unknown' in these cases.
 func test<T: P>(t: T) {
   borrow(t.data)
-  take(t.data) // expected-error{{'unknown.data' is borrowed and cannot be consumed}} expected-note{{consumed here}}
+  take(t.data) // expected-error{{'t.data' is borrowed and cannot be consumed}} expected-note{{consumed here}}
 }
 func test(p: P) {
   borrow(p.data)
-  take(p.data) // expected-error{{'unknown.data' is borrowed and cannot be consumed}} expected-note{{consumed here}}
+  take(p.data) // expected-error{{'p.data' is borrowed and cannot be consumed}} expected-note{{consumed here}}
 }