[clang] 1499cce - [clang] Improve diagnostic for "initializer-string for char array is too long"
Timm Bäder via cfe-commits
cfe-commits at lists.llvm.org
Thu Jan 19 04:13:24 PST 2023
Author: Evan Smal
Date: 2023-01-19T13:13:08+01:00
New Revision: 1499cce2646cbf4dd78f8534a4e71bd856b10994
URL: https://github.com/llvm/llvm-project/commit/1499cce2646cbf4dd78f8534a4e71bd856b10994
DIFF: https://github.com/llvm/llvm-project/commit/1499cce2646cbf4dd78f8534a4e71bd856b10994.diff
LOG: [clang] Improve diagnostic for "initializer-string for char array is too long"
This patch improves the diagnostic message "initializer-string for
char array is too long" by specifying an expected array length and by
indicating that the initializer string implicitly includes the
null terminator.
Fixes #58829
Differential Revision: https://reviews.llvm.org/D141283
Added:
Modified:
clang/include/clang/Basic/DiagnosticSemaKinds.td
clang/lib/Sema/SemaInit.cpp
clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
Removed:
################################################################################
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 2ba52728e9485..69ec2032dcefd 100644
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -5965,7 +5965,7 @@ def ext_excess_initializers_in_char_array_initializer : ExtWarn<
"excess elements in char array initializer">,
InGroup<ExcessInitializers>;
def err_initializer_string_for_char_array_too_long : Error<
- "initializer-string for char array is too long">;
+ "initializer-string for char array is too long, array size is %0 but initializer has size %1 (including the null terminating character)">;
def ext_initializer_string_for_char_array_too_long : ExtWarn<
"initializer-string for char array is too long">,
InGroup<ExcessInitializers>;
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp
index 3597a3147308a..ddb2b5cf5cd16 100644
--- a/clang/lib/Sema/SemaInit.cpp
+++ b/clang/lib/Sema/SemaInit.cpp
@@ -239,6 +239,7 @@ static void CheckStringInit(Expr *Str, QualType &DeclT, const ArrayType *AT,
if (StrLength > CAT->getSize().getZExtValue())
S.Diag(Str->getBeginLoc(),
diag::err_initializer_string_for_char_array_too_long)
+ << CAT->getSize().getZExtValue() << StrLength
<< Str->getSourceRange();
} else {
// C99 6.7.8p14.
diff --git a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
index 3d67fccb42821..8436361f0eb79 100644
--- a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
+++ b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
@@ -1,2 +1,3 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
-char test1[1]="f"; // expected-error {{initializer-string for char array is too long}}
+char test1[1]="f"; // expected-error {{initializer-string for char array is too long, array size is 1 but initializer has size 2 (including the null terminating character)}}
+char test2[1]="";
More information about the cfe-commits
mailing list