aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AST/CFG.cpp6
-rw-r--r--include/clang/Analysis/ExprDeclBitVector.h4
2 files changed, 6 insertions, 4 deletions
diff --git a/AST/CFG.cpp b/AST/CFG.cpp
index 0c8589b058..b93d77e3fa 100644
--- a/AST/CFG.cpp
+++ b/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<Expr>(*BI))
- (*M)[E] = M->size();
+ if (const Expr* E = dyn_cast<Expr>(*BI)) {
+ unsigned x = M->size();
+ (*M)[E] = x;
+ }
return M;
}
diff --git a/include/clang/Analysis/ExprDeclBitVector.h b/include/clang/Analysis/ExprDeclBitVector.h
index 2ddd985f4c..4cd9faa260 100644
--- a/include/clang/Analysis/ExprDeclBitVector.h
+++ b/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();
}