diff options
| -rw-r--r-- | clang/include/clang/AST/Stmt.h | 3 | ||||
| -rw-r--r-- | clang/lib/Analysis/ReachableCode.cpp | 2 | ||||
| -rw-r--r-- | clang/test/SemaCXX/PR29152.cpp | 15 |
3 files changed, 20 insertions, 0 deletions
diff --git a/clang/include/clang/AST/Stmt.h b/clang/include/clang/AST/Stmt.h index 9381a44985f..e28675d6a82 100644 --- a/clang/include/clang/AST/Stmt.h +++ b/clang/include/clang/AST/Stmt.h @@ -387,6 +387,9 @@ public: /// Skip past any implicit AST nodes which might surround this /// statement, such as ExprWithCleanups or ImplicitCastExpr nodes. Stmt *IgnoreImplicit(); + const Stmt *IgnoreImplicit() const { + return const_cast<Stmt *>(this)->IgnoreImplicit(); + } /// \brief Skip no-op (attributed, compound) container stmts and skip captured /// stmt at the top, if \a IgnoreCaptured is true. diff --git a/clang/lib/Analysis/ReachableCode.cpp b/clang/lib/Analysis/ReachableCode.cpp index 8165b09f408..69d000c03ba 100644 --- a/clang/lib/Analysis/ReachableCode.cpp +++ b/clang/lib/Analysis/ReachableCode.cpp @@ -164,6 +164,8 @@ static bool isConfigurationValue(const Stmt *S, if (!S) return false; + S = S->IgnoreImplicit(); + if (const Expr *Ex = dyn_cast<Expr>(S)) S = Ex->IgnoreCasts(); diff --git a/clang/test/SemaCXX/PR29152.cpp b/clang/test/SemaCXX/PR29152.cpp new file mode 100644 index 00000000000..63c9c9bed54 --- /dev/null +++ b/clang/test/SemaCXX/PR29152.cpp @@ -0,0 +1,15 @@ +// RUN: %clang_cc1 -fsyntax-only -Wunreachable-code -verify %s + +static const bool False = false; + +struct A { + ~A(); + operator bool(); +}; +void Bar(); + +void Foo() { + if (False && A()) { + Bar(); // expected-no-diagnostics + } +} |
