From 2139b1edd9c7d5c855d642d9675f29fabb3876be Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 22 Jan 2015 22:11:56 +0000 Subject: [PATCH] Make the ?: precedence warning handle pointers to the left of ? Previously, Clang would fail to warn on: int n = x + foo ? 1 : 2; when foo is a pointer. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@226870 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExpr.cpp | 2 ++ test/Sema/parentheses.c | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 74779bc28c..bf6c7806c1 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -6129,6 +6129,8 @@ static bool ExprLooksBoolean(Expr *E) { return IsLogicOp(OP->getOpcode()); if (UnaryOperator *OP = dyn_cast(E)) return OP->getOpcode() == UO_LNot; + if (E->getType()->isPointerType()) + return true; return false; } diff --git a/test/Sema/parentheses.c b/test/Sema/parentheses.c index b7f1b6e93a..739561dd2b 100644 --- a/test/Sema/parentheses.c +++ b/test/Sema/parentheses.c @@ -80,7 +80,7 @@ void bitwise_rel(unsigned i) { _Bool someConditionFunc(); -void conditional_op(int x, int y, _Bool b) { +void conditional_op(int x, int y, _Bool b, void* p) { (void)(x + someConditionFunc() ? 1 : 2); // expected-warning {{operator '?:' has lower precedence than '+'}} \ // expected-note {{place parentheses around the '+' expression to silence this warning}} \ // expected-note {{place parentheses around the '?:' expression to evaluate it first}} @@ -116,6 +116,14 @@ void conditional_op(int x, int y, _Bool b) { // CHECK: fix-it:"{{.*}}":{[[@LINE-6]]:24-[[@LINE-6]]:24}:")" (void)(x % 2 ? 1 : 2); // no warning + + (void)(x + p ? 1 : 2); // expected-warning {{operator '?:' has lower precedence than '+'}} expected-note 2{{place parentheses}} + (void)(p + x ? 1 : 2); // no warning + + (void)(p + b ? 1 : 2); // expected-warning {{operator '?:' has lower precedence than '+'}} expected-note 2{{place parentheses}} + + (void)(x + y > 0 ? 1 : 2); // no warning + (void)(x + (y > 0) ? 1 : 2); // expected-warning {{operator '?:' has lower precedence than '+'}} expected-note 2{{place parentheses}} } // RUN: not %clang_cc1 -fsyntax-only -Wparentheses -Werror -fdiagnostics-show-option %s 2>&1 | FileCheck %s -check-prefix=CHECK-FLAG -- 2.40.0