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

[Sema/SILGen] InitAccessors: Emit intersecting init accessor calls in memberwise init

Browse Source 
If init accessor initialize the same properties, let's emit them
in sequence and emit `destroy_addr` in-between to make sure that
there is no double initialization.
This commit is contained in:
Pavel Yaskevich
2023-06-09 10:20:40 -07:00
parent f6fd0bc1a7
commit ddcfe01ba5
5 changed files with 347 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/Sema/CodeSynthesis.cpp
View File

@@ -303,6 +303,11 @@ static ConstructorDecl *createImplicitConstructor(NominalTypeDecl *decl,
std::multimap<VarDecl *, VarDecl *> initializedViaAccessor;
decl->collectPropertiesInitializableByInitAccessors(initializedViaAccessor);
auto createParameter = [&](VarDecl *property) {
accessLevel = std::min(accessLevel, property->getFormalAccess());
params.push_back(createMemberwiseInitParameter(decl, Loc, property));
};
// A single property could be used to initialize N other stored
// properties via a call to its init accessor.
llvm::SmallPtrSet<VarDecl *, 4> usedInitProperties;
@@ -315,22 +320,17 @@ static ConstructorDecl *createImplicitConstructor(NominalTypeDecl *decl,
continue;
// Check whether this property could be initialized via init accessor.
//
// Note that we check for a single match here because intersecting
// properties are going to be diagnosed.
if (initializedViaAccessor.count(var) == 1) {
auto *initializerProperty = initializedViaAccessor.find(var)->second;
// Parameter for this property is already emitted.
if (usedInitProperties.count(initializerProperty))
continue;
if (initializedViaAccessor.count(var)) {
for (auto iter = initializedViaAccessor.find(var);
iter != initializedViaAccessor.end(); ++iter) {
auto *initializerProperty = iter->second;
var = initializerProperty;
usedInitProperties.insert(initializerProperty);
if (usedInitProperties.insert(initializerProperty).second)
createParameter(initializerProperty);
}
} else {
createParameter(var);
}
accessLevel = std::min(accessLevel, var->getFormalAccess());
params.push_back(createMemberwiseInitParameter(decl, Loc, var));
}
} else if (ICK == ImplicitConstructorKind::DefaultDistributedActor) {
auto classDecl = dyn_cast<ClassDecl>(decl);