r229510 - Revert accidental commit.

Benjamin Kramer benny.kra at googlemail.com
Tue Feb 17 08:53:08 PST 2015


Author: d0k
Date: Tue Feb 17 10:53:08 2015
New Revision: 229510

URL: http://llvm.org/viewvc/llvm-project?rev=229510&view=rev
Log:
Revert accidental commit.

Modified:
    cfe/trunk/lib/CodeGen/CGCleanup.cpp

Modified: cfe/trunk/lib/CodeGen/CGCleanup.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCleanup.cpp?rev=229510&r1=229509&r2=229510&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGCleanup.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCleanup.cpp Tue Feb 17 10:53:08 2015
@@ -731,7 +731,7 @@ void CodeGenFunction::PopCleanupBlock(bo
       }
 
       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(bo
 
       // 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();





More information about the cfe-commits mailing list