summaryrefslogtreecommitdiffstats
path: root/clang/lib/CodeGen
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2015-02-17 16:53:08 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2015-02-17 16:53:08 +0000
commitc749745bac3338041fba8593fefbced378f8e918 (patch)
treebb617664df6101ff6ab9a288d728a5f105751b16 /clang/lib/CodeGen
parent959e828b518f152c5bbeea13f4a79a4ae85037d3 (diff)
downloadbcm5719-llvm-c749745bac3338041fba8593fefbced378f8e918.tar.gz
bcm5719-llvm-c749745bac3338041fba8593fefbced378f8e918.zip
Revert accidental commit.
llvm-svn: 229510
Diffstat (limited to 'clang/lib/CodeGen')
-rw-r--r--clang/lib/CodeGen/CGCleanup.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CGCleanup.cpp b/clang/lib/CodeGen/CGCleanup.cpp
index f7971f687c2..566befc915c 100644
--- a/clang/lib/CodeGen/CGCleanup.cpp
+++ b/clang/lib/CodeGen/CGCleanup.cpp
@@ -731,7 +731,7 @@ void CodeGenFunction::PopCleanupBlock(bool FallthroughIsBranchThrough) {
}
llvm::BasicBlock *FallthroughDest = nullptr;
- llvm::BasicBlock::InstListType InstsToAppend;
+ SmallVector<llvm::Instruction*, 2> InstsToAppend;
// If there's exactly one branch-after and no other threads,
// we can route it without a switch.
@@ -796,7 +796,8 @@ void CodeGenFunction::PopCleanupBlock(bool FallthroughIsBranchThrough) {
// Append the prepared cleanup prologue from above.
llvm::BasicBlock *NormalExit = Builder.GetInsertBlock();
- NormalExit->getInstList().splice(NormalExit->end(), InstsToAppend);
+ for (unsigned I = 0, E = InstsToAppend.size(); I != E; ++I)
+ NormalExit->getInstList().push_back(InstsToAppend[I]);
// Optimistically hope that any fixups will continue falling through.
for (unsigned I = FixupDepth, E = EHStack.getNumBranchFixups();
OpenPOWER on IntegriCloud