averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5920 from gottesmm/vacation_gardening

Browse Source 
Vacation gardening
This commit is contained in:
Michael Gottesman
2016-11-25 09:17:21 -06:00
committed by GitHub
parent 2127cea3f1 0a8c54d04f
commit 96837babda
78 changed files with 552 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/SILOptimizer/LoopTransforms/COWArrayOpt.cpp
View File

@@ -427,7 +427,7 @@ bool COWArrayOpt::checkUniqueArrayContainer(SILValue ArrayContainer) {
// Check that the argument is passed as an inout type. This means there are
// no aliases accessible within this function scope.
auto Params = Function->getLoweredFunctionType()->getParameters();
ArrayRef<SILArgument*> FunctionArgs = Function->begin()->getBBArgs();
ArrayRef<SILArgument *> FunctionArgs = Function->begin()->getArguments();
for (unsigned ArgIdx = 0, ArgEnd = Params.size();
ArgIdx != ArgEnd; ++ArgIdx) {
if (FunctionArgs[ArgIdx] != Arg)
@@ -1819,7 +1819,7 @@ private:
// Check that the argument is passed as an inout or by value type. This
// means there are no aliases accessible within this function scope.
auto Params = Fun->getLoweredFunctionType()->getParameters();
ArrayRef<SILArgument*> FunctionArgs = Fun->begin()->getBBArgs();
ArrayRef<SILArgument *> FunctionArgs = Fun->begin()->getArguments();
for (unsigned ArgIdx = 0, ArgEnd = Params.size(); ArgIdx != ArgEnd;
++ArgIdx) {
if (FunctionArgs[ArgIdx] != Arg)
@@ -1952,9 +1952,7 @@ public:
SILBasicBlock *cloneRegion() {
assert (DomTree.getNode(StartBB) != nullptr && "Can't cloned dead code");
auto CurFun = StartBB->getParent();
auto &Mod = CurFun->getModule();
// We don't want to visit blocks outside of the region. visitSILBasicBlocks
// checks BBMap before it clones a block. So we mark exiting blocks as
@@ -1975,13 +1973,13 @@ public:
}
// Create the cloned start basic block.
auto *ClonedStartBB = new (Mod) SILBasicBlock(CurFun);
auto *ClonedStartBB = CurFun->createBasicBlock();
BBMap[StartBB] = ClonedStartBB;
// Clone the arguments.
for (auto &Arg : StartBB->getBBArgs()) {
for (auto &Arg : StartBB->getArguments()) {
SILValue MappedArg =
new (Mod) SILArgument(ClonedStartBB, getOpType(Arg->getType()));
ClonedStartBB->createArgument(getOpType(Arg->getType()));
ValueMap.insert(std::make_pair(Arg, MappedArg));
}
@@ -2091,7 +2089,7 @@ protected:
auto *OrigBB = Entry.first;
// Update outside used phi values.
for (auto *Arg : OrigBB->getBBArgs())
for (auto *Arg : OrigBB->getArguments())
updateSSAForValue(OrigBB, Arg, SSAUp);
// Update outside used instruction values.