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

Optimizer: fix an ownership violation when duplicating loops

Browse Source 
If a guaranteed value is used in a dead-end exit block and the enclosing value is _not_ destroyed in this block, we end up missing the enclosing value as phi-argument after duplicating the loop.
TODO: once we have complete lifetimes we can remove this check again.

rdar://159125605
This commit is contained in:
Erik Eckstein
2025-08-28 18:40:23 +02:00
parent 5f20a5b8b5
commit 9081edd4c2
5 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/SILOptimizer/LoopTransforms/ArrayPropertyOpt.cpp
View File

@@ -61,6 +61,7 @@
#include "swift/SIL/Projection.h"
#include "swift/SIL/SILCloner.h"
#include "swift/SILOptimizer/Analysis/ArraySemantic.h"
#include "swift/SILOptimizer/Analysis/DeadEndBlocksAnalysis.h"
#include "swift/SILOptimizer/Analysis/LoopAnalysis.h"
#include "swift/SILOptimizer/PassManager/Transforms.h"
#include "swift/SILOptimizer/Utils/BasicBlockOptUtils.h"
@@ -87,6 +88,7 @@ class ArrayPropertiesAnalysis {
SILLoop *Loop;
SILBasicBlock *Preheader;
DominanceInfo *DomTree;
DeadEndBlocks *deb;
SinkAddressProjections sinkProj;
@@ -104,9 +106,9 @@ class ArrayPropertiesAnalysis {
bool reachingBlocksComputed = false;
public:
ArrayPropertiesAnalysis(SILLoop *L, DominanceAnalysis *DA)
ArrayPropertiesAnalysis(SILLoop *L, DominanceAnalysis *DA, DeadEndBlocks *deb)
: Fun(L->getHeader()->getParent()), Loop(L), Preheader(nullptr),
DomTree(DA->get(Fun)), ReachingBlocks(Fun) {}
DomTree(DA->get(Fun)), deb(deb), ReachingBlocks(Fun) {}
/// Check if it is profitable to specialize a loop when you see an apply
/// instruction. We consider it is not profitable to specialize the loop when:
@@ -178,7 +180,7 @@ public:
for (auto &Inst : *BB) {
// Can't clone alloc_stack instructions whose dealloc_stack is outside
// the loop.
if (!canDuplicateLoopInstruction(Loop, &Inst))
if (!canDuplicateLoopInstruction(Loop, &Inst, deb))
return false;
if (!sinkProj.analyzeAddressProjections(&Inst)) {
@@ -796,6 +798,7 @@ class SwiftArrayPropertyOptPass : public SILFunctionTransform {
return;
DominanceAnalysis *DA = PM->getAnalysis<DominanceAnalysis>();
DeadEndBlocks *deb = PM->getAnalysis<DeadEndBlocksAnalysis>()->get(Fn);
SILLoopAnalysis *LA = PM->getAnalysis<SILLoopAnalysis>();
SILLoopInfo *LI = LA->get(Fn);
@@ -808,7 +811,7 @@ class SwiftArrayPropertyOptPass : public SILFunctionTransform {
// possible loop-nest.
SmallVector<SILBasicBlock *, 16> HoistableLoopNests;
std::function<void(SILLoop *)> processChildren = [&](SILLoop *L) {
ArrayPropertiesAnalysis Analysis(L, DA);
ArrayPropertiesAnalysis Analysis(L, DA, deb);
if (Analysis.run()) {
// Hoist in the current loop nest.
HasChanged = true;