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

Merge pull request #30610 from eeckstein/fix-destroy-hoisting

Browse Source 
DestroyHoisting: fix a bug which creates invalid SIL
This commit is contained in:
eeckstein
2020-03-24 17:20:53 +01:00
committed by GitHub
parent a856d59623 15f519f544
commit 2ca8b15b51
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/SILOptimizer/Transforms/DestroyHoisting.cpp
View File

@@ -549,15 +549,17 @@ SILValue DestroyHoisting::createAddress(unsigned locIdx, SILBuilder &builder) {
assert(!isa<BeginAccessInst>(loc->representativeValue) &&
"only a root location can be a begin_access");
SingleValueInstruction *&cachedProj = addressProjections[locIdx];
if (cachedProj)
return cachedProj;
if (!domTree)
domTree = DA->get(function);
SILInstruction *ip = &*builder.getInsertionPoint();
SingleValueInstruction *&cachedProj = addressProjections[locIdx];
if (cachedProj && domTree->properlyDominates(cachedProj, ip))
return cachedProj;
auto *projInst = cast<SingleValueInstruction>(loc->representativeValue);
if (domTree->properlyDominates(projInst, &*builder.getInsertionPoint())) {
if (domTree->properlyDominates(projInst, ip)) {
cachedProj = projInst;
return projInst;
}
@@ -580,7 +582,7 @@ SILValue DestroyHoisting::createAddress(unsigned locIdx, SILBuilder &builder) {
newProj = projBuilder.createTupleElementAddr(TEA->getLoc(), baseAddr,
TEA->getFieldNo(), TEA->getType());
}
assert(domTree->properlyDominates(newProj, &*builder.getInsertionPoint()) &&
assert(domTree->properlyDominates(newProj, ip) &&
"new projection does not dominate insert point");
// We need to remember the new projection instruction because in tailMerging
// we might call locations.getLocationIdx() on such a new instruction.