diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Analysis/CFG.h | 8 | ||||
| -rw-r--r-- | clang/lib/Analysis/CFG.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/clang/include/clang/Analysis/CFG.h b/clang/include/clang/Analysis/CFG.h index 22f08cc3d55..14ed663307d 100644 --- a/clang/include/clang/Analysis/CFG.h +++ b/clang/include/clang/Analysis/CFG.h @@ -210,13 +210,13 @@ public: public: FilterOptions() { IgnoreDefaultsWithCoveredEnums = 0; - }; + } unsigned IgnoreDefaultsWithCoveredEnums : 1; }; static bool FilterEdge(const FilterOptions &F, const CFGBlock *Src, - const CFGBlock *Dst); + const CFGBlock *Dst); template <typename IMPL, bool IsPred> class FilteredCFGBlockIterator { @@ -226,8 +226,8 @@ public: const CFGBlock *From; public: explicit FilteredCFGBlockIterator(const IMPL &i, const IMPL &e, - const CFGBlock *from, - const FilterOptions &f) + const CFGBlock *from, + const FilterOptions &f) : I(i), E(e), F(f), From(from) {} bool hasMore() const { return I != E; } diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp index 3dae83b564f..5977de60906 100644 --- a/clang/lib/Analysis/CFG.cpp +++ b/clang/lib/Analysis/CFG.cpp @@ -1941,17 +1941,17 @@ unsigned CFG::getNumBlkExprs() { //===----------------------------------------------------------------------===// bool CFGBlock::FilterEdge(const CFGBlock::FilterOptions &F, - const CFGBlock *From, const CFGBlock *To) { + const CFGBlock *From, const CFGBlock *To) { if (F.IgnoreDefaultsWithCoveredEnums) { // If the 'To' has no label or is labeled but the label isn't a // CaseStmt then filter this edge. if (const SwitchStmt *S = - dyn_cast_or_null<SwitchStmt>(From->getTerminator())) { + dyn_cast_or_null<SwitchStmt>(From->getTerminator())) { if (S->isAllEnumCasesCovered()) { - const Stmt *L = To->getLabel(); - if (!L || !isa<CaseStmt>(L)) - return true; + const Stmt *L = To->getLabel(); + if (!L || !isa<CaseStmt>(L)) + return true; } } } |
