Reverse the RHSBlock of LogicalOp && and ||

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@57041 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AST/CFG.cpp b/lib/AST/CFG.cpp
index 0313ada82c50bfd44636fbd5220fa6303ab39c01..8e9c3fb10ba65d9619e6a878a3417fbdd38e89d3 100644 (file)
--- a/lib/AST/CFG.cpp
+++ b/lib/AST/CFG.cpp
@@ -458,6 +458,7 @@ CFGBlock* CFGBuilder::WalkAST(Stmt* Terminator, bool AlwaysAddStmt = false) {
         Succ = ConfluenceBlock;
         Block = NULL;
         CFGBlock* RHSBlock = Visit(B->getRHS());
+        FinishBlock(RHSBlock);
 
         // Now link the LHSBlock with RHSBlock.
         if (B->getOpcode() == BinaryOperator::LOr) {