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

[Property Wrappers] Lower assign_by_wrapper to re-assignment of the backing

Browse Source 
property wrapper before all of self is initialized if the wrapper has already
been initialized.
This commit is contained in:
Holly Borla
2020-09-11 12:45:46 -07:00
parent 9de171a51f
commit 1f426773ee
5 changed files with 108 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp
View File

@@ -533,6 +533,7 @@ LifetimeChecker::LifetimeChecker(const DIMemoryObjectInfo &TheMemory,
case DIUseKind::Escape:
continue;
case DIUseKind::Assign:
case DIUseKind::AssignWrappedValue:
case DIUseKind::IndirectIn:
case DIUseKind::InitOrAssign:
case DIUseKind::InOutArgument:
@@ -750,6 +751,7 @@ void LifetimeChecker::doIt() {
continue;
case DIUseKind::Assign:
case DIUseKind::AssignWrappedValue:
// Instructions classified as assign are only generated when lowering
// InitOrAssign instructions in regions known to be initialized. Since
// they are already known to be definitely init, don't reprocess them.
@@ -1048,16 +1050,15 @@ void LifetimeChecker::handleStoreUse(unsigned UseID) {
// an initialization or assign in the uses list so that clients know about it.
if (isFullyUninitialized) {
Use.Kind = DIUseKind::Initialization;
} else if (isFullyInitialized && isa<AssignByWrapperInst>(Use.Inst)) {
// If some fields are uninitialized, re-write assign_by_wrapper to assignment
// of the backing wrapper. If all fields are initialized, assign to the wrapped
// value.
auto allFieldsInitialized =
getAnyUninitializedMemberAtInst(Use.Inst, 0, TheMemory.getNumElements()) == -1;
Use.Kind = allFieldsInitialized ? DIUseKind::AssignWrappedValue : DIUseKind::Assign;
} else if (isFullyInitialized) {
// Only re-write assign_by_wrapper to assignment if all fields have been
// initialized.
if (isa<AssignByWrapperInst>(Use.Inst) &&
getAnyUninitializedMemberAtInst(Use.Inst, 0,
TheMemory.getNumElements()) != -1) {
Use.Kind = DIUseKind::Initialization;
} else {
Use.Kind = DIUseKind::Assign;
}
Use.Kind = DIUseKind::Assign;
} else {
// If it is initialized on some paths, but not others, then we have an
// inconsistent initialization, which needs dynamic control logic in the
@@ -1918,7 +1919,7 @@ void LifetimeChecker::updateInstructionForInitState(DIMemoryUse &Use) {
Use.Kind == DIUseKind::SelfInit)
InitKind = IsInitialization;
else {
assert(Use.Kind == DIUseKind::Assign);
assert(Use.Kind == DIUseKind::Assign || Use.Kind == DIUseKind::AssignWrappedValue);
InitKind = IsNotInitialization;
}
@@ -1967,14 +1968,21 @@ void LifetimeChecker::updateInstructionForInitState(DIMemoryUse &Use) {
Use.Inst = nullptr;
NonLoadUses.erase(Inst);
if (TheMemory.isClassInitSelf() &&
Use.Kind == DIUseKind::SelfInit) {
assert(InitKind == IsInitialization);
AI->setOwnershipQualifier(AssignOwnershipQualifier::Reinit);
} else {
AI->setOwnershipQualifier((InitKind == IsInitialization
? AssignOwnershipQualifier::Init
: AssignOwnershipQualifier::Reassign));
switch (Use.Kind) {
case DIUseKind::Initialization:
AI->setAssignInfo(AssignOwnershipQualifier::Init,
AssignByWrapperInst::Destination::BackingWrapper);
break;
case DIUseKind::Assign:
AI->setAssignInfo(AssignOwnershipQualifier::Reassign,
AssignByWrapperInst::Destination::BackingWrapper);
break;
case DIUseKind::AssignWrappedValue:
AI->setAssignInfo(AssignOwnershipQualifier::Reassign,
AssignByWrapperInst::Destination::WrappedValue);
break;
default:
llvm_unreachable("Wrong use kind for assign_by_wrapper");
}
return;