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

27
lib/SIL/SILBasicBlock.cpp
View File

@@ -38,7 +38,7 @@ SILBasicBlock::SILBasicBlock(SILFunction *parent, SILBasicBlock *afterBB)
}
SILBasicBlock::~SILBasicBlock() {
// Invalidate all of the basic block arguments.
for (auto *Arg : BBArgList) {
for (auto *Arg : ArgumentList) {
getModule().notifyDeleteHandlers(Arg);
}
@@ -105,41 +105,40 @@ void SILBasicBlock::eraseFromParent() {
/// Replace the ith BB argument with a new one with type Ty (and optional
/// ValueDecl D).
SILArgument *SILBasicBlock::replaceBBArg(unsigned i, SILType Ty,
const ValueDecl *D) {
SILArgument *SILBasicBlock::replaceArgument(unsigned i, SILType Ty,
const ValueDecl *D) {
SILModule &M = getParent()->getModule();
assert(BBArgList[i]->use_empty() && "Expected no uses of the old BB arg!");
assert(ArgumentList[i]->use_empty() && "Expected no uses of the old BB arg!");
// Notify the delete handlers that this argument is being deleted.
M.notifyDeleteHandlers(BBArgList[i]);
M.notifyDeleteHandlers(ArgumentList[i]);
auto *NewArg = new (M) SILArgument(Ty, D);
NewArg->setParent(this);
// TODO: When we switch to malloc/free allocation we'll be leaking memory
// here.
BBArgList[i] = NewArg;
ArgumentList[i] = NewArg;
return NewArg;
}
SILArgument *SILBasicBlock::createBBArg(SILType Ty, const ValueDecl *D) {
SILArgument *SILBasicBlock::createArgument(SILType Ty, const ValueDecl *D) {
return new (getModule()) SILArgument(this, Ty, D);
}
SILArgument *SILBasicBlock::insertBBArg(bbarg_iterator Iter, SILType Ty,
const ValueDecl *D) {
SILArgument *SILBasicBlock::insertArgument(arg_iterator Iter, SILType Ty,
const ValueDecl *D) {
return new (getModule()) SILArgument(this, Iter, Ty, D);
}
void SILBasicBlock::eraseBBArg(int Index) {
assert(getBBArg(Index)->use_empty() &&
void SILBasicBlock::eraseArgument(int Index) {
assert(getArgument(Index)->use_empty() &&
"Erasing block argument that has uses!");
// Notify the delete handlers that this BB argument is going away.
getModule().notifyDeleteHandlers(getBBArg(Index));
BBArgList.erase(BBArgList.begin() + Index);
getModule().notifyDeleteHandlers(getArgument(Index));
ArgumentList.erase(ArgumentList.begin() + Index);
}
/// \brief Splits a basic block into two at the specified instruction.