diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 4 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 4 | ||||
| -rw-r--r-- | clang/test/SemaObjC/exprs.m | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 0a53a65e138..815b8b5ae63 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -1417,8 +1417,8 @@ def warn_ret_stack_ref : Warning< def warn_selfcomparison : Warning< "self-comparison always results in a constant value">; def warn_stringcompare : Warning< - "result of comparison against a string literal is unspecified " - "(use strcmp?)">; + "result of comparison against %select{a string literal|@encode}0 is " + "unspecified (use strcmp instead)">; diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index b3c8be49c98..55eaaa4bc86 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -3411,7 +3411,8 @@ QualType Sema::CheckCompareOperands(Expr *&lex, Expr *&rex, SourceLocation Loc, // operand is null), the user probably wants strcmp. if ((isa<StringLiteral>(LHSStripped) || isa<ObjCEncodeExpr>(LHSStripped)) && !RHSStripped->isNullPointerConstant(Context)) - Diag(Loc, diag::warn_stringcompare) + Diag(Loc, diag::warn_stringcompare) + << isa<ObjCEncodeExpr>(LHSStripped) << lex->getSourceRange() << CodeModificationHint::CreateReplacement(SourceRange(Loc), ", ") << CodeModificationHint::CreateInsertion(lex->getLocStart(), @@ -3423,6 +3424,7 @@ QualType Sema::CheckCompareOperands(Expr *&lex, Expr *&rex, SourceLocation Loc, isa<ObjCEncodeExpr>(RHSStripped)) && !LHSStripped->isNullPointerConstant(Context)) Diag(Loc, diag::warn_stringcompare) + << isa<ObjCEncodeExpr>(RHSStripped) << rex->getSourceRange() << CodeModificationHint::CreateReplacement(SourceRange(Loc), ", ") << CodeModificationHint::CreateInsertion(lex->getLocStart(), diff --git a/clang/test/SemaObjC/exprs.m b/clang/test/SemaObjC/exprs.m index 342449d9975..d51d135fa27 100644 --- a/clang/test/SemaObjC/exprs.m +++ b/clang/test/SemaObjC/exprs.m @@ -15,5 +15,7 @@ void test2() { "bar" @"baz" " b\0larg"; // expected-warning {{literal contains NUL character}} + + if (@encode(int) == "foo") { } // expected-warning {{result of comparison against @encode is unspecified}} } |
