From: Ted Kremenek <kremenek@apple.com>
Date: Thu, 14 Apr 2011 01:50:50 +0000 (+0000)
Subject: Return the correct lastly populated block from CFGBuilder::VisitUnaryExprOrTypeTraitE... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97e50714c262cc421f960303171d2c1afbc9bb4f;p=clang

Return the correct lastly populated block from CFGBuilder::VisitUnaryExprOrTypeTraitExpr().

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

diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp
index b5930cdccf..3dcc763eda 100644
--- a/lib/Analysis/CFG.cpp
+++ b/lib/Analysis/CFG.cpp
@@ -2173,13 +2173,15 @@ CFGBlock *CFGBuilder::VisitUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr *E,
   }
 
   // VLA types have expressions that must be evaluated.
+  CFGBlock *lastBlock = Block;
+  
   if (E->isArgumentType()) {
     for (const VariableArrayType *VA =FindVA(E->getArgumentType().getTypePtr());
          VA != 0; VA = FindVA(VA->getElementType().getTypePtr()))
-      addStmt(VA->getSizeExpr());
+      lastBlock = addStmt(VA->getSizeExpr());
   }
 
-  return Block;
+  return lastBlock;
 }
 
 /// VisitStmtExpr - Utility method to handle (nested) statement