diff options
| author | David Blaikie <dblaikie@gmail.com> | 2013-02-23 00:29:34 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2013-02-23 00:29:34 +0000 |
| commit | 00be69ab5c21ad965959376a4b1cdeaaf13be443 (patch) | |
| tree | e37dabd45c984fa9ab4e9ce859301092f133deda /clang/lib/Analysis/LiveVariables.cpp | |
| parent | 16c8cf0e11dd7f53d3a50609d5821f56e6b52c1a (diff) | |
| download | bcm5719-llvm-00be69ab5c21ad965959376a4b1cdeaaf13be443.tar.gz bcm5719-llvm-00be69ab5c21ad965959376a4b1cdeaaf13be443.zip | |
Remove the CFGElement "Invalid" state.
Use Optional<CFG*> where invalid states were needed previously. In the one case
where that's not possible (beginAutomaticObjDtorsInsert) just use a dummy
CFGAutomaticObjDtor.
Thanks for the help from Jordan Rose & discussion/feedback from Ted Kremenek
and Doug Gregor.
Post commit code review feedback on r175796 by Ted Kremenek.
llvm-svn: 175938
Diffstat (limited to 'clang/lib/Analysis/LiveVariables.cpp')
| -rw-r--r-- | clang/lib/Analysis/LiveVariables.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/clang/lib/Analysis/LiveVariables.cpp b/clang/lib/Analysis/LiveVariables.cpp index 519d5288b8b..b43892a3093 100644 --- a/clang/lib/Analysis/LiveVariables.cpp +++ b/clang/lib/Analysis/LiveVariables.cpp @@ -474,8 +474,9 @@ LiveVariablesImpl::runOnBlock(const CFGBlock *block, ei = block->rend(); it != ei; ++it) { const CFGElement &elem = *it; - if (CFGAutomaticObjDtor Dtor = elem.getAs<CFGAutomaticObjDtor>()){ - val.liveDecls = DSetFact.add(val.liveDecls, Dtor.getVarDecl()); + if (Optional<CFGAutomaticObjDtor> Dtor = + elem.getAs<CFGAutomaticObjDtor>()) { + val.liveDecls = DSetFact.add(val.liveDecls, Dtor->getVarDecl()); continue; } @@ -534,8 +535,9 @@ LiveVariables::computeLiveness(AnalysisDeclContext &AC, if (killAtAssign) for (CFGBlock::const_iterator bi = block->begin(), be = block->end(); bi != be; ++bi) { - if (CFGStmt cs = bi->getAs<CFGStmt>()) { - if (const BinaryOperator *BO = dyn_cast<BinaryOperator>(cs.getStmt())) { + if (Optional<CFGStmt> cs = bi->getAs<CFGStmt>()) { + if (const BinaryOperator *BO = + dyn_cast<BinaryOperator>(cs->getStmt())) { if (BO->getOpcode() == BO_Assign) { if (const DeclRefExpr *DR = dyn_cast<DeclRefExpr>(BO->getLHS()->IgnoreParens())) { |
