From 84a1ca52807a4fd79dd1b43aa3700514638b0c65 Mon Sep 17 00:00:00 2001
From: Ted Kremenek <kremenek@apple.com>
Date: Sat, 6 Aug 2011 00:30:00 +0000
Subject: [analyzer] Simplify logic for
 ExprEngine::VisitUnaryExprOrTypeTraitExpr to avoid recursion to
 subexpression.

This exposed bugs in the live variables analysis, and a latent analyzer bug in the SymbolReaper.

llvm-svn: 137006
---
 clang/lib/Analysis/CFG.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'clang/lib/Analysis/CFG.cpp')

diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp
index be6ffee668d..1edb328d013 100644
--- a/clang/lib/Analysis/CFG.cpp
+++ b/clang/lib/Analysis/CFG.cpp
@@ -2204,6 +2204,15 @@ CFGBlock *CFGBuilder::VisitUnaryExprOrTypeTraitExpr(UnaryExprOrTypeTraitExpr *E,
          VA != 0; VA = FindVA(VA->getElementType().getTypePtr()))
       lastBlock = addStmt(VA->getSizeExpr());
   }
+  else {
+    // For sizeof(x), where 'x' is a VLA, we should include the computation
+    // of the lvalue of 'x'.
+    Expr *subEx = E->getArgumentExpr();
+    if (subEx->getType()->isVariableArrayType()) {
+      assert(subEx->isLValue());
+      lastBlock = addStmt(subEx);
+    }
+  }
 
   return lastBlock;
 }
-- 
cgit v1.2.3