Move merging of CapturedValue flags into the class itself so that it'll be more clear that dealing with this will be required if more flags are added in the future. And mergeFlags correctly on the dynamic self capture.

Author: gregomni

include/swift/AST/CaptureInfo.h

@@ -64,6 +64,12 @@ class CapturedValue {
 
   bool isDynamicSelfMetadata() const { return !Value.getPointer(); }
 
+  CapturedValue mergeFlags(CapturedValue cv) {
+    assert(Value.getPointer() == cv.Value.getPointer() &&
+           "merging flags on two different value decls");
+    return CapturedValue(Value.getPointer(), getFlags() & cv.getFlags());
+  }
+
   ValueDecl *getDecl() const {
     assert(Value.getPointer() && "dynamic Self metadata capture does not "
            "have a value");

lib/SIL/TypeLowering.cpp

@@ -2144,16 +2144,36 @@ TypeConverter::getLoweredLocalCaptures(AnyFunctionRef fn) {
           goto capture_value;
         }
         }
+
+        if (!capturedVar->hasStorage())
+          continue;
+
+        // We can always capture the storage in these cases.
+        Type captureType = capturedVar->getType();
+        if (auto *metatypeType = captureType->getAs<MetatypeType>())
+          captureType = metatypeType->getInstanceType();
+
+        if (auto *selfType = captureType->getAs<DynamicSelfType>()) {
+          captureType = selfType->getSelfType();
+
+          // We're capturing a 'self' value with dynamic 'Self' type;
+          // handle it specially.
+          if (captureType->getClassOrBoundGenericClass()) {
+            if (selfCapture)
+              selfCapture = selfCapture->mergeFlags(capture);
+            else
+              selfCapture = capture;
+            continue;
+          }
+        }
       }
     capture_value:
       // Collect non-function captures.
       ValueDecl *value = capture.getDecl();
       if (capturedValues.count(value)) {
         for (auto it = captures.begin(); it != captures.end(); ++it) {
           if (it->getDecl() == value) {
-            // The value is already in the list, it needs to have the logical
-            // AND of each flag of all uses.
-            *it = CapturedValue(value, it->getFlags() & capture.getFlags());
+            *it = it->mergeFlags(capture);
             break;
           }
         }