diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 10 | ||||
| -rw-r--r-- | 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 86d139da0c..813ef19d87 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 104134cdb0..2333e32e85 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 db6183e6bb..449bfff4d9 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}} +} |