Small bug fix in CFG construction: the active block for LabelStmts comes

from "Block", not the CFGBlock* returned from visiting its subexpression.

llvm-svn: 48392

1 files changed, 3 insertions, 2 deletions

diff --git a/clang/AST/CFG.cpp b/clang/AST/CFG.cpp
index 9bafb05daf4..e2aba6b3ff3 100644
--- a/clang/AST/CFG.cpp
+++ b/clang/AST/CFG.cpp
@@ -577,7 +577,8 @@ CFGBlock* CFGBuilder::VisitReturnStmt(ReturnStmt* R) {
 
 CFGBlock* CFGBuilder::VisitLabelStmt(LabelStmt* L) {
   // Get the block of the labeled statement.  Add it to our map.
-  CFGBlock* LabelBlock = Visit(L->getSubStmt());
+  Visit(L->getSubStmt());
+  CFGBlock* LabelBlock = Block;
   
   if (!LabelBlock)            // This can happen when the body is empty, i.e.
     LabelBlock=createBlock(); // scopes that only contains NullStmts.
@@ -970,7 +971,7 @@ CFGBlock* CFGBuilder::VisitCaseStmt(CaseStmt* S) {
   // This block is now the implicit successor of other blocks.
   Succ = CaseBlock;
   
-  return CaseBlock;    
+  return CaseBlock;
 }
   
 CFGBlock* CFGBuilder::VisitDefaultStmt(DefaultStmt* S) {