commit c56e67644f705e0728b802447d82902db2305c75
author Daniel Dunbar <daniel@zuster.org> Tue Nov 11 09:41:28 2008 +0000
committer Daniel Dunbar <daniel@zuster.org> Tue Nov 11 09:41:28 2008 +0000
tree e7f314727a0895560c281fe217096f1074f94585
parent a0821bf8a2a386d24dbe3a51b3fdd74304b3104f

Add CodeGenFunction::EmitBranch.
 - Emits an unconditional branch, with extra logic to avoid generating
   spurious branches out of dummy blocks.

llvm-svn: 59037

clang/lib/CodeGen/CGExprAgg.cpp

diff --git a/clang/lib/CodeGen/CGExprAgg.cpp b/clang/lib/CodeGen/CGExprAgg.cpp
index b713945..f531d36 100644
--- a/clang/lib/CodeGen/CGExprAgg.cpp
+++ b/clang/lib/CodeGen/CGExprAgg.cpp
@@ -242,14 +242,12 @@
   assert(E->getLHS() && "Must have LHS for aggregate value");
 
   Visit(E->getLHS());
-  Builder.CreateBr(ContBlock);
-  LHSBlock = Builder.GetInsertBlock();
+  CGF.EmitBranch(ContBlock);
   
   CGF.EmitBlock(RHSBlock);
   
   Visit(E->getRHS());
-  Builder.CreateBr(ContBlock);
-  RHSBlock = Builder.GetInsertBlock();
+  CGF.EmitBranch(ContBlock);
   
   CGF.EmitBlock(ContBlock);
 }