From 992b3112ce2966a8fabfacd997d6925eb893e7b7 Mon Sep 17 00:00:00 2001 From: Ted Kremenek Date: Sat, 4 May 2013 01:13:12 +0000 Subject: [PATCH] [analyzer;alternate edges] ignore parentheses when determining edge levels. llvm-svn: 181087 --- clang/lib/StaticAnalyzer/Core/BugReporter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp index 759503a688b0..c198db299260 100644 --- a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp +++ b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp @@ -1747,7 +1747,7 @@ const Stmt *getLocStmt(PathDiagnosticLocation L) { const Stmt *getStmtParent(const Stmt *S, ParentMap &PM) { if (!S) return 0; - return PM.getParent(S); + return PM.getParentIgnoreParens(S); } static bool optimizeEdges(PathPieces &path, @@ -1837,7 +1837,7 @@ static bool optimizeEdges(PathPieces &path, // (1.1 -> 1.1.1) -> (1.1.1 -> 1.2) becomes (1.1 -> 1.2). if (level1 && level2 && level1 == level4 && - level2 == level3 && PM.getParent(level2) == level1) { + level2 == level3 && PM.getParentIgnoreParens(level2) == level1) { PieceI->setEndLocation(PieceNextI->getEndLocation()); path.erase(NextI); hasChanges = true; @@ -1856,7 +1856,7 @@ static bool optimizeEdges(PathPieces &path, // // (1.1 -> 1.1.1) -> (1.1.1 -> X) becomes (1.1 -> X). // - if (level1 && level2 && level1 == PM.getParent(level2)) { + if (level1 && level2 && level1 == PM.getParentIgnoreParens(level2)) { PieceI->setEndLocation(PieceNextI->getEndLocation()); path.erase(NextI); hasChanges = true;