Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift_jenkins
2020-09-03 21:31:53 -07:00
78 changed files with 2698 additions and 781 deletions

View File

@@ -3314,9 +3314,9 @@ public:
++numBackingProperties;
arrayFields.push_back(S.addDeclRef(backingInfo.backingVar));
}
if (backingInfo.storageWrapperVar) {
if (backingInfo.projectionVar) {
++numBackingProperties;
arrayFields.push_back(S.addDeclRef(backingInfo.storageWrapperVar));
arrayFields.push_back(S.addDeclRef(backingInfo.projectionVar));
}
}
for (Type dependency : collectDependenciesFromType(ty->getCanonicalType()))