diff options
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 6 | ||||
| -rw-r--r-- | clang/test/SemaCXX/parentheses.cpp | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index 67bfffcd418..d0fb643eb35 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -9115,14 +9115,16 @@ EmitDiagnosticForLogicalAndInLogicalOr(Sema &Self, SourceLocation OpLoc, /// 'true'. static bool EvaluatesAsTrue(Sema &S, Expr *E) { bool Res; - return E->EvaluateAsBooleanCondition(Res, S.getASTContext()) && Res; + return !E->isValueDependent() && + E->EvaluateAsBooleanCondition(Res, S.getASTContext()) && Res; } /// \brief Returns true if the given expression can be evaluated as a constant /// 'false'. static bool EvaluatesAsFalse(Sema &S, Expr *E) { bool Res; - return E->EvaluateAsBooleanCondition(Res, S.getASTContext()) && !Res; + return !E->isValueDependent() && + E->EvaluateAsBooleanCondition(Res, S.getASTContext()) && !Res; } /// \brief Look for '&&' in the left hand of a '||' expr. diff --git a/clang/test/SemaCXX/parentheses.cpp b/clang/test/SemaCXX/parentheses.cpp new file mode 100644 index 00000000000..b430b25e5d6 --- /dev/null +++ b/clang/test/SemaCXX/parentheses.cpp @@ -0,0 +1,8 @@ +// RUN: %clang_cc1 -verify %s + +// PR16930, PR16727: +template<class Foo> +bool test(Foo f, int *array) +{ + return false && false || array[f.get()]; // expected-warning {{'&&' within '||'}} expected-note {{parentheses}} +} |
