From c0870605befe4298241f80846c33322e96d2c2d2 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Mon, 10 Dec 2007 23:58:39 +0000 Subject: [PATCH] Fixed bug in CFG::PopulateBlkExprMap where the ordering between fetching the size of the expression map (for use as the next integer id for an Expr*) and the creation of the entry in the map could be non-deterministic. This could cause the size of the map to be incremented prior to the index being determine. On Linux the map entry would be created first, causing the map to the "size" to be incremented prior to it being queried. On Mac OS X we had the reverse behavior. Now the size is always queried prior to the new id being inserted into the map. This was the real cause of the bit-overrun triggered in PR 1847: http://llvm.org/bugs/show_bug.cgi?id=1847 Also reverted the change in patch 44813, which was a bogus fix to this problem: http://llvm.org/viewvc/llvm-project?rev=44813&view=rev llvm-svn: 44822 --- clang/AST/CFG.cpp | 6 ++++-- clang/include/clang/Analysis/ExprDeclBitVector.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/clang/AST/CFG.cpp b/clang/AST/CFG.cpp index 0c8589b058ea..b93d77e3fa06 100644 --- a/clang/AST/CFG.cpp +++ b/clang/AST/CFG.cpp @@ -969,8 +969,10 @@ static BlkExprMapTy* PopulateBlkExprMap(CFG& cfg) { for (CFG::iterator I=cfg.begin(), E=cfg.end(); I != E; ++I) for (CFGBlock::iterator BI=I->begin(), EI=I->end(); BI != EI; ++BI) - if (const Expr* E = dyn_cast(*BI)) - (*M)[E] = M->size(); + if (const Expr* E = dyn_cast(*BI)) { + unsigned x = M->size(); + (*M)[E] = x; + } return M; } diff --git a/clang/include/clang/Analysis/ExprDeclBitVector.h b/clang/include/clang/Analysis/ExprDeclBitVector.h index 2ddd985f4c4e..4cd9faa260b7 100644 --- a/clang/include/clang/Analysis/ExprDeclBitVector.h +++ b/clang/include/clang/Analysis/ExprDeclBitVector.h @@ -73,7 +73,7 @@ struct DeclBitVector_Types { public: void resetValues(AnalysisDataTy& AD) { - DeclBV.resize(AD.getNumDecls()+1); + DeclBV.resize(AD.getNumDecls()); DeclBV.reset(); } @@ -172,7 +172,7 @@ struct ExprDeclBitVector_Types { void resetValues(AnalysisDataTy& AD) { ParentRef(*this).resetValues(AD); - ExprBV.resize(AD.getNumExprs()+1); + ExprBV.resize(AD.getNumExprs()); ExprBV.reset(); }