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

DI: Handle 'assert' instructions in the SelfInit state.

Browse Source 
rdar://17746401



Swift SVN r20646
This commit is contained in:
Nadav Rotem
2014-07-28 21:46:55 +00:00
parent 5496c4beac
commit a09e0d58ba
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/SILPasses/DefiniteInitialization.cpp
View File

@@ -373,7 +373,7 @@ namespace {
void handleLoadUseFailure(const DIMemoryUse &InstInfo,
bool IsSuperInitComplete);
void handleSuperInitUse(const DIMemoryUse &InstInfo);
void handleSelfInitUse(const DIMemoryUse &InstInfo);
void handleSelfInitUse(DIMemoryUse &InstInfo);
void updateInstructionForInitState(DIMemoryUse &InstInfo);
@@ -885,7 +885,7 @@ void LifetimeChecker::handleSuperInitUse(const DIMemoryUse &InstInfo) {
/// handleSuperInitUse - When processing a 'self' argument on a class, this is
/// a call to self.init.
void LifetimeChecker::handleSelfInitUse(const DIMemoryUse &InstInfo) {
void LifetimeChecker::handleSelfInitUse(DIMemoryUse &InstInfo) {
auto *Inst = InstInfo.Inst;
assert(TheMemory.NumElements == 1 && "delegating inits have a single elt");
@@ -903,7 +903,8 @@ void LifetimeChecker::handleSelfInitUse(const DIMemoryUse &InstInfo) {
return;
}
// Otherwise everything is good!
// Lower Assign instructions if needed.
updateInstructionForInitState(InstInfo);
}
@@ -913,9 +914,10 @@ void LifetimeChecker::handleSelfInitUse(const DIMemoryUse &InstInfo) {
/// operations.
void LifetimeChecker::updateInstructionForInitState(DIMemoryUse &InstInfo) {
SILInstruction *Inst = InstInfo.Inst;
bool IsSelfInit = InstInfo.Kind == DIUseKind::SelfInit;
IsInitialization_t InitKind;
if (InstInfo.Kind == DIUseKind::Initialization)
if (InstInfo.Kind == DIUseKind::Initialization || IsSelfInit)
InitKind = IsInitialization;
else {
assert(InstInfo.Kind == DIUseKind::Assign);
@@ -968,8 +970,10 @@ void LifetimeChecker::updateInstructionForInitState(DIMemoryUse &InstInfo) {
}
return;
}
assert(isa<StoreInst>(Inst) && "Unknown store instruction!");
// Ignore non-stores for SelfInits.
assert((isa<StoreInst>(Inst) || IsSelfInit) &&
"Unknown store instruction!");
}
/// processNonTrivialRelease - We handle two kinds of release instructions here: