From 262acdab8ba128857a6e5323f767f5e154ce75e6 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Thu, 12 Apr 2012 21:24:56 +0000
Subject: [PATCH] objective-c literals: Issue warning and ignore when BOOL is
not of an intergal type when boolean literals are used. // rdar://11231426
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154619 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/clang/Basic/DiagnosticSemaKinds.td | 3 +++
lib/Sema/SemaExpr.cpp | 10 +++++++---
test/SemaObjC/objc-literal-nsnumber.m | 7 +++++++
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 86d139da0cf..813ef19d87d 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -1547,6 +1547,9 @@ def warn_objc_redundant_literal_use : Warning<
"using %0 with a literal is redundant">, InGroup<ObjCRedundantLiteralUse>;
}
+def warn_bool_for_boolean_literal : Warning<
+ "BOOL of type %0 is non-intergal and unsuitable for a "
+ "boolean literal - ignored">, InGroup<DiagGroup<"numeric-literals">>;
def err_only_annotate_after_access_spec : Error<
"access specifier can only have annotation attributes">;
def err_attribute_section_invalid_for_target : Error<
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 104134cdb0e..2333e32e85f 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -11270,9 +11270,13 @@ Sema::ActOnObjCBoolLiteral(SourceLocation OpLoc, tok::TokenKind Kind) {
Decl *TD =
LookupSingleName(TUScope, &Context.Idents.get("BOOL"),
SourceLocation(), LookupOrdinaryName);
- if (TypeDecl *BoolTD = dyn_cast_or_null<TypeDecl>(TD)) {
- QualType QT = QualType(BoolTD->getTypeForDecl(), 0);
- if (!QT.isNull())
+ if (TypedefDecl *BoolTD = dyn_cast_or_null<TypedefDecl>(TD)) {
+ QualType QT = BoolTD->getUnderlyingType();
+ if (!QT->isIntegralOrUnscopedEnumerationType()) {
+ Diag(OpLoc, diag::warn_bool_for_boolean_literal) << QT;
+ Diag(BoolTD->getLocation(), diag::note_previous_declaration);
+ }
+ else
ObjCBoolLiteralQT = QT;
}
diff --git a/test/SemaObjC/objc-literal-nsnumber.m b/test/SemaObjC/objc-literal-nsnumber.m
index db6183e6bb2..449bfff4d96 100644
--- a/test/SemaObjC/objc-literal-nsnumber.m
+++ b/test/SemaObjC/objc-literal-nsnumber.m
@@ -76,3 +76,10 @@ NSDictionary * warn() {
@"date" : [NSDate date] };
return dictionary3;
}
+
+// rdar:// 11231426
+typedef float BOOL; // expected-note {{previous declaration is here}}
+
+BOOL radar11231426() {
+ return __objc_yes; // expected-warning {{BOOL of type 'float' is non-intergal and unsuitable for a boolean literal - ignored}}
+}
--
GitLab