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

[gardening] Drop BB from all argument related code in SILBasicBlock.

Browse Source 
Before this commit all code relating to handling arguments in SILBasicBlock had
somewhere in the name BB. This is redundant given that the class's name is
already SILBasicBlock. This commit drops those names.

Some examples:

getBBArg() => getArgument()
BBArgList => ArgumentList
bbarg_begin() => args_begin()
This commit is contained in:
Michael Gottesman
2016-11-25 00:14:08 -06:00
parent e42bf07af4
commit bf6920650c
68 changed files with 398 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/SILOptimizer/Utils/SILSSAUpdater.cpp
View File

@@ -199,10 +199,10 @@ SILValue SILSSAUpdater::GetValueInMiddleOfBlock(SILBasicBlock *BB) {
return SingularValue;
// Check if we already have an equivalent phi.
if (!BB->getBBArgs().empty()) {
if (!BB->getArguments().empty()) {
llvm::SmallDenseMap<SILBasicBlock *, SILValue, 8> ValueMap(PredVals.begin(),
PredVals.end());
for (auto *Arg : BB->getBBArgs())
for (auto *Arg : BB->getArguments())
if (isEquivalentPHI(Arg, ValueMap))
return Arg;
@@ -238,12 +238,13 @@ public:
/// can be used in the SSAUpdaterImpl.
class PhiIt {
private:
SILBasicBlock::bbarg_iterator It;
SILBasicBlock::arg_iterator It;
public:
explicit PhiIt(SILBasicBlock *B) // begin iterator
: It(B->bbarg_begin()) {}
: It(B->args_begin()) {}
PhiIt(SILBasicBlock *B, bool) // end iterator
: It(B->bbarg_end()) {}
: It(B->args_end()) {}
PhiIt &operator++() { ++It; return *this; }
operator SILArgument *() { return *It; }
@@ -489,7 +490,7 @@ static StructInst *replaceBBArgWithStruct(
SmallVector<unsigned, 4> ArgIdxForOper;
for (unsigned OperIdx : indices(FirstSI->getElements())) {
bool FoundMatchingArgIdx = false;
for (unsigned ArgIdx : indices(PhiBB->getBBArgs())) {
for (unsigned ArgIdx : indices(PhiBB->getArguments())) {
SmallVectorImpl<SILValue>::const_iterator AVIter = ArgValues.begin();
bool TryNextArgIdx = false;
for (SILBasicBlock *PredBB : PhiBB->getPreds()) {
@@ -517,7 +518,7 @@ static StructInst *replaceBBArgWithStruct(
SmallVector<SILValue, 4> StructArgs;
for (auto ArgIdx : ArgIdxForOper)
StructArgs.push_back(PhiBB->getBBArg(ArgIdx));
StructArgs.push_back(PhiBB->getArgument(ArgIdx));
SILBuilder Builder(PhiBB, PhiBB->begin());
return Builder.createStruct(cast<StructInst>(ArgValues[0])->getLoc(),