diff options
| -rw-r--r-- | clang/lib/Sema/SemaExpr.cpp | 3 | ||||
| -rw-r--r-- | clang/test/SemaCXX/warn-char-subscripts.cpp | 13 |
2 files changed, 15 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index e41cd5b6653..2842e7199b1 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -4741,7 +4741,8 @@ Sema::CreateBuiltinArraySubscriptExpr(Expr *Base, SourceLocation LLoc, if ((IndexExpr->getType()->isSpecificBuiltinType(BuiltinType::Char_S) || IndexExpr->getType()->isSpecificBuiltinType(BuiltinType::Char_U)) - && !IndexExpr->isTypeDependent()) + && !IndexExpr->isTypeDependent() + && !isa<CharacterLiteral>(IndexExpr)) Diag(LLoc, diag::warn_subscript_is_char) << IndexExpr->getSourceRange(); // C99 6.5.2.1p1: "shall have type "pointer to *object* type". Similarly, diff --git a/clang/test/SemaCXX/warn-char-subscripts.cpp b/clang/test/SemaCXX/warn-char-subscripts.cpp index 84ea536b979..7760ed0e5eb 100644 --- a/clang/test/SemaCXX/warn-char-subscripts.cpp +++ b/clang/test/SemaCXX/warn-char-subscripts.cpp @@ -14,6 +14,19 @@ void t2() { int val = subscript[array]; // expected-warning{{array subscript is of type 'char'}} } +void t3() { + int array[50] = { 0 }; + int val = array[' ']; // no warning, subscript is a literal +} +void t4() { + int array[50] = { 0 }; + int val = '('[array]; // no warning, subscript is a literal +} +void t5() { + int array[50] = { 0 }; + int val = array['\x11']; // no warning, subscript is a literal +} + void test() { t1<char>(); // expected-note {{in instantiation of function template specialization 't1<char>' requested here}} t2<char>(); // expected-note {{in instantiation of function template specialization 't2<char>' requested here}} |
