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

6
lib/SILOptimizer/Transforms/CSE.cpp
View File

@@ -601,7 +601,7 @@ namespace {
static void updateBasicBlockArgTypes(SILBasicBlock *BB,
TypeSubstitutionMap &TypeSubstMap) {
// Check types of all BB arguments.
for (auto &Arg : BB->getBBArgs()) {
for (auto &Arg : BB->getArguments()) {
if (!Arg->getType().getSwiftRValueType()->hasOpenedExistential())
continue;
// Type of this BB argument uses an opened existential.
@@ -623,7 +623,7 @@ static void updateBasicBlockArgTypes(SILBasicBlock *BB,
// Then replace all uses by an undef.
Arg->replaceAllUsesWith(SILUndef::get(Arg->getType(), BB->getModule()));
// Replace the type of the BB argument.
BB->replaceBBArg(Arg->getIndex(), NewArgType, Arg->getDecl());
BB->replaceArgument(Arg->getIndex(), NewArgType, Arg->getDecl());
// Restore all uses to refer to the BB argument with updated type.
for (auto ArgUse : OriginalArgUses) {
ArgUse->set(Arg);
@@ -667,7 +667,7 @@ bool CSE::processOpenExistentialRef(SILInstruction *Inst, ValueBase *V,
// those uses by the new opened archetype.
auto Successors = User->getParent()->getSuccessorBlocks();
for (auto Successor : Successors) {
if (Successor->bbarg_empty())
if (Successor->args_empty())
continue;
// If a BB has any arguments, update their types if necessary.
updateBasicBlockArgTypes(Successor, TypeSubstMap);