Skip to content

[silgen] Eliminate some unneeded constructors from SILGenBuilder. #23823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2019
Merged

[silgen] Eliminate some unneeded constructors from SILGenBuilder. #23823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/SILGen/SILGenBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ SILGenModule &SILGenBuilder::getSILGenModule() const { return SGF.SGM; }
SILGenBuilder::SILGenBuilder(SILGenFunction &SGF)
: SILBuilder(SGF.F), SGF(SGF) {}

SILGenBuilder::SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB)
: SILBuilder(insertBB), SGF(SGF) {}

SILGenBuilder::SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB,
SmallVectorImpl<SILInstruction *> *insertedInsts)
: SILBuilder(insertBB, insertedInsts), SGF(SGF) {}
Expand Down
15 changes: 1 addition & 14 deletions lib/SILGen/SILGenBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,11 @@ class SILGenBuilder : public SILBuilder {

public:
SILGenBuilder(SILGenFunction &SGF);
SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB);
SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB,
SmallVectorImpl<SILInstruction *> *insertedInsts);
SmallVectorImpl<SILInstruction *> *insertedInsts = nullptr);
SILGenBuilder(SILGenFunction &SGF, SILBasicBlock *insertBB,
SILBasicBlock::iterator insertInst);

SILGenBuilder(SILGenFunction &SGF, SILFunction::iterator insertBB)
: SILGenBuilder(SGF, &*insertBB) {}
SILGenBuilder(SILGenFunction &SGF, SILFunction::iterator insertBB,
SmallVectorImpl<SILInstruction *> *insertedInsts)
: SILGenBuilder(SGF, &*insertBB, insertedInsts) {}
SILGenBuilder(SILGenFunction &SGF, SILFunction::iterator insertBB,
SILInstruction *insertInst)
: SILGenBuilder(SGF, &*insertBB, insertInst->getIterator()) {}
SILGenBuilder(SILGenFunction &SGF, SILFunction::iterator insertBB,
SILBasicBlock::iterator insertInst)
: SILGenBuilder(SGF, &*insertBB, insertInst) {}

// Create a new builder, inheriting the given builder's context and debug
// scope.
SILGenBuilder(SILGenBuilder &builder, SILBasicBlock *insertBB)
Expand Down
2 changes: 1 addition & 1 deletion lib/SILGen/SILGenGlobalVariable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ SILGenFunction::emitGlobalVariableRef(SILLocation loc, VarDecl *var) {
// Global variables can be accessed directly with global_addr. Emit this
// instruction into the prolog of the function so we can memoize/CSE it in
// VarLocs.
auto entryBB = getFunction().begin();
auto *entryBB = &*getFunction().begin();
SILGenBuilder prologueB(*this, entryBB, entryBB->begin());
prologueB.setTrackingList(B.getTrackingList());

Expand Down