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 | b07805485c603be3d8011f72611465324c9e664b (patch) | |
| tree | 2a1bf633a0201b748631fb8fa90fa7c2280990cc /lib/Sema/AnalysisBasedWarnings.cpp | |
| parent | 02fb50d54042982bccc04c276ad2342827c8fcd3 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175938 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/AnalysisBasedWarnings.cpp')
| -rw-r--r-- | lib/Sema/AnalysisBasedWarnings.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/Sema/AnalysisBasedWarnings.cpp b/lib/Sema/AnalysisBasedWarnings.cpp index 9a67d4991f..50feef87c2 100644 --- a/lib/Sema/AnalysisBasedWarnings.cpp +++ b/lib/Sema/AnalysisBasedWarnings.cpp @@ -762,8 +762,8 @@ namespace { for (CFGBlock::const_reverse_iterator ElemIt = P->rbegin(), ElemEnd = P->rend(); ElemIt != ElemEnd; ++ElemIt) { - if (CFGStmt CS = ElemIt->getAs<CFGStmt>()) { - if (const AttributedStmt *AS = asFallThroughAttr(CS.getStmt())) { + if (Optional<CFGStmt> CS = ElemIt->getAs<CFGStmt>()) { + if (const AttributedStmt *AS = asFallThroughAttr(CS->getStmt())) { S.Diag(AS->getLocStart(), diag::warn_fallthrough_attr_unreachable); markFallthroughVisited(AS); @@ -833,8 +833,8 @@ namespace { for (CFGBlock::const_reverse_iterator ElemIt = B.rbegin(), ElemEnd = B.rend(); ElemIt != ElemEnd; ++ElemIt) { - if (CFGStmt CS = ElemIt->getAs<CFGStmt>()) - return CS.getStmt(); + if (Optional<CFGStmt> CS = ElemIt->getAs<CFGStmt>()) + return CS->getStmt(); } // Workaround to detect a statement thrown out by CFGBuilder: // case X: {} case Y: |