[PATCH] D81751: [SemaObjC] Fix a -Wobjc-signed-char-bool false-positive with binary conditional operator
Erik Pilkington via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Fri Jun 12 11:26:24 PDT 2020
erik.pilkington created this revision.
erik.pilkington added a reviewer: rjmccall.
Herald added subscribers: ributzka, dexonsmith, jkorous.
We were previously bypassing the conditional expression special case for binary conditional expressions. Also, dig through the OpaqueValueExpr on the left of the ?:.
rdar://64134411
https://reviews.llvm.org/D81751
Files:
clang/lib/Sema/SemaChecking.cpp
clang/test/SemaObjC/signed-char-bool-conversion.m
Index: clang/test/SemaObjC/signed-char-bool-conversion.m
===================================================================
--- clang/test/SemaObjC/signed-char-bool-conversion.m
+++ clang/test/SemaObjC/signed-char-bool-conversion.m
@@ -108,3 +108,15 @@
f<short>(); // expected-note {{in instantiation of function template specialization 'f<short>' requested here}}
}
#endif
+
+void t5(BOOL b) {
+ int i;
+ b = b ?: YES; // no warning
+ b = b ?: i; // expected-warning {{implicit conversion from integral type 'int' to 'BOOL'}}
+ b = (b = i) // expected-warning {{implicit conversion from integral type 'int' to 'BOOL'}}
+ ?: YES;
+ b = (1 ? YES : i) ?: YES; // expected-warning {{implicit conversion from integral type 'int' to 'BOOL'}}
+ b = b ?: (1 ? i : i); // expected-warning 2 {{implicit conversion from integral type 'int' to 'BOOL'}}
+
+ b = b ? YES : (i ?: 0); // expected-warning {{implicit conversion from integral type 'int' to 'BOOL'}}
+}
Index: clang/lib/Sema/SemaChecking.cpp
===================================================================
--- clang/lib/Sema/SemaChecking.cpp
+++ clang/lib/Sema/SemaChecking.cpp
@@ -11803,27 +11803,33 @@
}
}
-static void CheckConditionalOperator(Sema &S, ConditionalOperator *E,
+static void CheckConditionalOperator(Sema &S, AbstractConditionalOperator *E,
SourceLocation CC, QualType T);
static void CheckConditionalOperand(Sema &S, Expr *E, QualType T,
SourceLocation CC, bool &ICContext) {
E = E->IgnoreParenImpCasts();
- if (isa<ConditionalOperator>(E))
- return CheckConditionalOperator(S, cast<ConditionalOperator>(E), CC, T);
+ if (auto *CO = dyn_cast<AbstractConditionalOperator>(E))
+ return CheckConditionalOperator(S, CO, CC, T);
AnalyzeImplicitConversions(S, E, CC);
if (E->getType() != T)
return CheckImplicitConversion(S, E, T, CC, &ICContext);
}
-static void CheckConditionalOperator(Sema &S, ConditionalOperator *E,
+static void CheckConditionalOperator(Sema &S, AbstractConditionalOperator *E,
SourceLocation CC, QualType T) {
AnalyzeImplicitConversions(S, E->getCond(), E->getQuestionLoc());
+ Expr *TrueExpr = E->getTrueExpr();
+ if (isa<BinaryConditionalOperator>(E))
+ if (auto *OVE = dyn_cast<OpaqueValueExpr>(TrueExpr))
+ if (Expr *SourceExpr = OVE->getSourceExpr())
+ TrueExpr = SourceExpr;
+
bool Suspicious = false;
- CheckConditionalOperand(S, E->getTrueExpr(), T, CC, Suspicious);
+ CheckConditionalOperand(S, TrueExpr, T, CC, Suspicious);
CheckConditionalOperand(S, E->getFalseExpr(), T, CC, Suspicious);
if (T->isBooleanType())
@@ -11842,7 +11848,7 @@
if (E->getType() == T) return;
Suspicious = false;
- CheckImplicitConversion(S, E->getTrueExpr()->IgnoreParenImpCasts(),
+ CheckImplicitConversion(S, TrueExpr->IgnoreParenImpCasts(),
E->getType(), CC, &Suspicious);
if (!Suspicious)
CheckImplicitConversion(S, E->getFalseExpr()->IgnoreParenImpCasts(),
@@ -11905,7 +11911,7 @@
// For conditional operators, we analyze the arguments as if they
// were being fed directly into the output.
- if (auto *CO = dyn_cast<ConditionalOperator>(SourceExpr)) {
+ if (auto *CO = dyn_cast<AbstractConditionalOperator>(SourceExpr)) {
CheckConditionalOperator(S, CO, CC, T);
return;
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D81751.270455.patch
Type: text/x-patch
Size: 3438 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200612/b523631a/attachment-0001.bin>
More information about the cfe-commits
mailing list