replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove warning for null characters in CFString literals. Clang handles them just fine, and GCC 4.2 doesn't warn here either. 

We added this warning back in 2007 when we were comparing against GCC 4.0.

llvm-svn: 127704
This commit is contained in:
Ted Kremenek 2011-03-15 21:18:52 +00:00
parent 0d5b9ef564
commit 6cd0187718
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -3607,8 +3607,6 @@ def err_block_returning_array_function : Error<
// CFString checking
def err_cfstring_literal_not_string_constant : Error<
"CFString literal is not a string constant">;
def warn_cfstring_literal_contains_nul_character : Warning<
"CFString literal contains NUL character">;
def warn_cfstring_truncated : Warning<
"input conversion stopped due to an input byte that does not "
"belong to the input codeset UTF-8">;

6
clang/lib/Sema/SemaChecking.cpp
View File

@ -552,12 +552,6 @@ bool Sema::CheckObjCString(Expr *Arg) {
return true;
}
size_t NulPos = Literal->getString().find('\0');
if (NulPos != llvm::StringRef::npos) {
Diag(getLocationOfStringLiteralByte(Literal, NulPos),
diag::warn_cfstring_literal_contains_nul_character)
<< Arg->getSourceRange();
}
if (Literal->containsNonAsciiOrNull()) {
llvm::StringRef String = Literal->getString();
unsigned NumBytes = String.size();

2
clang/test/Sema/builtins.c
View File

@ -27,7 +27,7 @@ int test6(float a, long double b) {
void test7() {
const void *X;
X = CFSTR("\242"); // expected-warning {{input conversion stopped}}
X = CFSTR("\0"); // expected-warning {{ CFString literal contains NUL character }}
X = CFSTR("\0"); // no-warning
X = CFSTR(242); // expected-error {{ CFString literal is not a string constant }} expected-warning {{incompatible integer to pointer conversion}}
X = CFSTR("foo", "bar"); // expected-error {{too many arguments to function call}}
}

4
clang/test/SemaObjC/exprs.m
View File

@ -9,12 +9,12 @@ Class test1(Class X) {
// rdar://6079877
void test2() {
id str = @"foo"
"bar\0" // expected-warning {{literal contains NUL character}}
"bar\0" // no-warning
@"baz" " blarg";
id str2 = @"foo"
"bar"
@"baz"
" b\0larg"; // expected-warning {{literal contains NUL character}}
" b\0larg"; // no-warning
if (@encode(int) == "foo") { } // expected-warning {{result of comparison against @encode is unspecified}}