- Rework computation of "direct" closure capture formation to be based on whether

  the DeclRefExpr's access semantics is "direct to storage" instead of basing it
  on the weird special case we were using before.
- Change AST dumper to print the "direct" flag.

NFC.



Swift SVN r25749

Author: lattner

Diff for: lib/AST/CaptureInfo.cpp

@@ -46,9 +46,17 @@ void CaptureInfo::dump() const {
 
 void CaptureInfo::print(raw_ostream &OS) const {
   OS << "captures=(";
-  OS << getCaptures()[0].getDecl()->getName();
-  for (auto capture : getCaptures().slice(1)) {
-    OS << ", " << capture.getDecl()->getName();
+  bool isFirst = true;
+  
+  for (auto capture : getCaptures()) {
+    if (isFirst)
+      isFirst = false;
+    else
+      OS << ", ";
+    OS << capture.getDecl()->getName();
+    
+    if (capture.isDirect())
+      OS << "<direct>";
   }
   OS << ')';
 }

Diff for: lib/SIL/TypeLowering.cpp

@@ -154,7 +154,7 @@ getDeclCaptureKind(CapturedValue capture, AnyFunctionRef TheClosure) {
   auto decl = capture.getDecl();
   if (VarDecl *var = dyn_cast<VarDecl>(decl)) {
     // If captured directly, the variable is captured by box or pointer.
-    if (capture.isDirect()) {
+    if (capture.isDirect() && var->getStorageKind() != VarDecl::Stored) {
       assert(var->hasStorage());
       return TheClosure.isKnownNoEscape() ?
          CaptureKind::NoEscape : CaptureKind::Box;

Diff for: lib/Sema/TypeCheckExpr.cpp

@@ -708,12 +708,10 @@ namespace {
 
       unsigned Flags = 0;
 
-      // Determine whether this is a direct capture.  This is a direct capture
-      // if we're looking at an accessor capturing its underlying decl.
-      if (const FuncDecl *FuncContext = dyn_cast<FuncDecl>(CurDC))
-        if (auto *ASD = FuncContext->getAccessorStorageDecl())
-          if (ASD == D)
-            Flags |= CapturedValue::IsDirect;
+      // If this is a direct reference to underlying storage, then this is a
+      // capture of the storage address - not a capture of the getter/setter.
+      if (DRE->getAccessSemantics() == AccessSemantics::DirectToStorage)
+        Flags |= CapturedValue::IsDirect;
 
       addCapture(CapturedValue(D, Flags), DRE->getStartLoc());
       return { false, DRE };