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

Fix a bug in in our tuple-element dataflow propagation, where

Browse Source 
global "partial liveness" would overwrite local "always live"ness.
Always liveness on a local level always makes a value live-out,
even if it is partially live in.


Swift SVN r11005
This commit is contained in:
Chris Lattner
2013-12-09 05:44:09 +00:00
parent 4c16619081
commit 0566ebd40b
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/SILPasses/DefiniteInitialization.cpp
View File

@@ -474,7 +474,12 @@ void LifetimeChecker::diagnoseInitError(const DIMemoryUse &Use,
TheMemory.getPathStringToElement(FirstUndefElement, Name);
diagnose(Module, Inst->getLoc(), DiagMessage, Name);
// As a debugging hack, print the instruction itself if there is no location
// information. This should never happen.
if (Inst->getLoc().isNull())
llvm::errs() << " the instruction: " << *Inst << "\n";
// Provide context as note diagnostics.
// TODO: The QoI could be improved in many different ways here. For example,
@@ -1065,7 +1070,7 @@ Optional<DIKind> LifetimeChecker::getLiveOut1(SILBasicBlock *BB) {
}
void LifetimeChecker::getPredsLiveOut1(SILBasicBlock *BB,
Optional<DIKind> &Result) {
Optional<DIKind> &Result) {
bool LiveInAny = false, LiveInAll = true;
// If we have a starting point, incorporate it into our state.
@@ -1114,9 +1119,19 @@ AvailabilitySet LifetimeChecker::getLiveOutN(SILBasicBlock *BB) {
// is required to handle cycles properly.
BBState.LOState = LiveOutBlockState::IsComputingLiveOut;
auto Result = BBState.getAvailabilitySet();
auto Result = AvailabilitySet(NumElements);
getPredsLiveOutN(BB, Result);
// Anything that our initial pass knew as a definition is still a definition
// live out of this block. Something known to be not-defined in a predecessor
// does not drop it to "partial".
auto &LocalAV = BBState.getAvailabilitySet();
for (unsigned i = 0, e = NumElements; i != e; ++i) {
auto EV = LocalAV.getConditional(i);
if (EV.hasValue() && EV.getValue() == DIKind::Yes)
Result.set(i, DIKind::Yes);
}
// Finally, cache and return our result.
getBlockInfo(BB).setBlockAvailability(Result);
return Result;