r237856 - Check for bool-like conversion in conditional expressions.
Richard Trieu
rtrieu at google.com
Wed May 20 16:29:18 PDT 2015
Author: rtrieu
Date: Wed May 20 18:29:18 2015
New Revision: 237856
URL: http://llvm.org/viewvc/llvm-project?rev=237856&view=rev
Log:
Check for bool-like conversion in conditional expressions.
Add a check for bool-like conversions for the condition expression of
conditional operators. This is similiar to the checking of condition
expressions of if statements, for-loops, while-loops, and do-while loops.
Specificially, this is to fix the problem of assert("message") not triggering
-Wstring-conversion when the assert macro uses a conditional operator.
Modified:
cfe/trunk/lib/Sema/SemaExpr.cpp
cfe/trunk/test/Sema/warn-string-conversion.c
cfe/trunk/test/Sema/warn-tautological-compare.c
Modified: cfe/trunk/lib/Sema/SemaExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExpr.cpp?rev=237856&r1=237855&r2=237856&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExpr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExpr.cpp Wed May 20 18:29:18 2015
@@ -6528,6 +6528,8 @@ ExprResult Sema::ActOnConditionalOp(Sour
DiagnoseConditionalPrecedence(*this, QuestionLoc, Cond.get(), LHS.get(),
RHS.get());
+ CheckBoolLikeConversion(Cond.get(), QuestionLoc);
+
if (!commonExpr)
return new (Context)
ConditionalOperator(Cond.get(), QuestionLoc, LHS.get(), ColonLoc,
Modified: cfe/trunk/test/Sema/warn-string-conversion.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/warn-string-conversion.c?rev=237856&r1=237855&r2=237856&view=diff
==============================================================================
--- cfe/trunk/test/Sema/warn-string-conversion.c (original)
+++ cfe/trunk/test/Sema/warn-string-conversion.c Wed May 20 18:29:18 2015
@@ -1,12 +1,28 @@
// RUN: %clang_cc1 -verify -fsyntax-only -Wstring-conversion %s
-#define assert(EXPR) (void)(EXPR);
+void do_nothing();
+void assert_error();
+
+#define assert1(expr) \
+ if (expr) \
+ do_nothing(); \
+ else \
+ assert_error()
+
+#define assert2(expr) \
+ ((expr) ? do_nothing() : assert_error())
// Expection for common assert form.
void test1() {
- assert(0 && "foo");
- assert("foo" && 0);
- assert(0 || "foo"); // expected-warning {{string literal}}
+ assert1(0 && "foo");
+ assert1("foo" && 0);
+ assert1(0 || "foo"); // expected-warning {{string literal}}
+ assert1("foo"); // expected-warning {{string literal}}
+
+ assert2(0 && "foo");
+ assert2("foo" && 0);
+ assert2(0 || "foo"); // expected-warning {{string literal}}
+ assert2("foo"); // expected-warning {{string literal}}
}
void test2() {
@@ -14,4 +30,5 @@ void test2() {
while ("hello") {} // expected-warning {{string literal}}
for (;"howdy";) {} // expected-warning {{string literal}}
do { } while ("hey"); // expected-warning {{string literal}}
+ int x = "hey" ? 1 : 2; // expected-warning {{string literal}}
}
Modified: cfe/trunk/test/Sema/warn-tautological-compare.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/warn-tautological-compare.c?rev=237856&r1=237855&r2=237856&view=diff
==============================================================================
--- cfe/trunk/test/Sema/warn-tautological-compare.c (original)
+++ cfe/trunk/test/Sema/warn-tautological-compare.c Wed May 20 18:29:18 2015
@@ -84,3 +84,12 @@ void _HTTPClientErrorHandler(int me)
int *result;
SAVE_READ(&me);
}
+
+void test_conditional_operator() {
+ int x;
+ x = b ? 1 : 0; // expected-warning {{address of array}}
+ x = c.x ? 1 : 0; // expected-warning {{address of array}}
+ x = str ? 1 : 0; // expected-warning {{address of array}}
+ x = array ? 1 : 0; // expected-warning {{address of array}}
+ x = &x ? 1 : 0; // expected-warning {{address of 'x'}}
+}
More information about the cfe-commits
mailing list