averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-apply "Sema: Always synthesize accessors for structs, unless they were imported from Clang"

Browse Source 
This reverts commit 24a70e17ea.
This commit is contained in:
Slava Pestov
2016-01-20 13:52:17 -08:00
parent 7d94d2c13a
commit 1d77d810fd
14 changed files with 201 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Sema/CodeSynthesis.cpp
View File

@@ -1285,12 +1285,11 @@ void swift::maybeAddMaterializeForSet(AbstractStorageDecl *storage,
} else if (isa<EnumDecl>(container)) {
return;
// Computed properties of @_fixed_layout structs don't need this, but
// resilient structs do, since stored properties can resiliently become
// computed or vice versa.
// Structs imported by Clang don't need this, because we can
// synthesize it later.
} else {
auto *structDecl = cast<StructDecl>(container);
if (structDecl->hasFixedLayout())
assert(isa<StructDecl>(container));
if (container->hasClangNode())
return;
}
@@ -1304,7 +1303,7 @@ void swift::maybeAddAccessorsToVariable(VarDecl *var, TypeChecker &TC) {
return;
// Local variables don't get accessors.
if(var->getDeclContext()->isLocalContext())
if (var->getDeclContext()->isLocalContext())
return;
assert(!var->hasAccessorFunctions());
@@ -1337,17 +1336,29 @@ void swift::maybeAddAccessorsToVariable(VarDecl *var, TypeChecker &TC) {
if (var->isImplicit())
return;
auto nominal = var->getDeclContext()->isNominalTypeOrNominalTypeExtensionContext();
if (!nominal) {
// Fixed-layout global variables don't get accessors.
if (var->hasFixedLayout())
return;
// Stored properties in protocols are converted to computed
// elsewhere.
} else if (isa<ProtocolDecl>(nominal)) {
return;
// NSManaged properties on classes require special handling.
if (var->getDeclContext()->isClassOrClassExtensionContext()) {
} else if (isa<ClassDecl>(nominal)) {
if (var->getAttrs().hasAttribute<NSManagedAttr>()) {
var->setIsBeingTypeChecked();
convertNSManagedStoredVarToComputed(var, TC);
var->setIsBeingTypeChecked(false);
return;
}
} else {
// Fixed-layout properties don't get accessors.
if (var->hasFixedLayout())
// Stored properties imported from Clang don't get accessors.
} else if (isa<StructDecl>(nominal)) {
if (nominal->hasClangNode())
return;
}