from:"Evan Smal via Phabricator via cfe\-commits"

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

2023-01-09 Thread Evan Smal via Phabricator via cfe-commits

evansmal created this revision.
evansmal added a reviewer: clang.
evansmal added a project: clang.
Herald added a project: All.
evansmal requested review of this revision.
Herald added a subscriber: cfe-commits.

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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D141283

Files:
  clang/include/clang/Basic/DiagnosticSemaKinds.td
  clang/lib/Sema/SemaInit.cpp


Index: clang/lib/Sema/SemaInit.cpp
===
--- clang/lib/Sema/SemaInit.cpp
+++ clang/lib/Sema/SemaInit.cpp
@@ -239,6 +239,8 @@
 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.
Index: clang/include/clang/Basic/DiagnosticSemaKinds.td
===
--- clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -5953,7 +5953,7 @@
   "excess elements in char array initializer">,
   InGroup;
 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, expected %0 but was %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;


Index: clang/lib/Sema/SemaInit.cpp
===
--- clang/lib/Sema/SemaInit.cpp
+++ clang/lib/Sema/SemaInit.cpp
@@ -239,6 +239,8 @@
 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.
Index: clang/include/clang/Basic/DiagnosticSemaKinds.td
===
--- clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -5953,7 +5953,7 @@
   "excess elements in char array initializer">,
   InGroup;
 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, expected %0 but was %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;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

2023-01-09 Thread Evan Smal via Phabricator via cfe-commits

evansmal added a comment.

In D141283#4036449 , @shafik wrote:

> Thank you for this diagnostic fix, please make sure you update 
> `clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp`.

I noticed that there are also some tests in: 
//clang/test/SemaCXX/pascal-strings.cpp//, //clang/test/Sema/array-init.c//, 
and //clang/test/Sema/format-strings.c//. I assume these should also be updated?

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D141283/new/

https://reviews.llvm.org/D141283

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

2023-01-09 Thread Evan Smal via Phabricator via cfe-commits

evansmal updated this revision to Diff 487443.
evansmal added a comment.

Improve specificity of the diagnostic message.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D141283/new/

https://reviews.llvm.org/D141283

Files:
  clang/include/clang/Basic/DiagnosticSemaKinds.td
  clang/lib/Sema/SemaInit.cpp
  clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp


Index: clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
===
--- clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
+++ clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
@@ -1,2 +1,2 @@
 // 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)}}
Index: clang/lib/Sema/SemaInit.cpp
===
--- clang/lib/Sema/SemaInit.cpp
+++ clang/lib/Sema/SemaInit.cpp
@@ -239,6 +239,8 @@
 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.
Index: clang/include/clang/Basic/DiagnosticSemaKinds.td
===
--- clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -5953,7 +5953,7 @@
   "excess elements in char array initializer">,
   InGroup;
 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;


Index: clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
===
--- clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
+++ clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
@@ -1,2 +1,2 @@
 // 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)}}
Index: clang/lib/Sema/SemaInit.cpp
===
--- clang/lib/Sema/SemaInit.cpp
+++ clang/lib/Sema/SemaInit.cpp
@@ -239,6 +239,8 @@
 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.
Index: clang/include/clang/Basic/DiagnosticSemaKinds.td
===
--- clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -5953,7 +5953,7 @@
   "excess elements in char array initializer">,
   InGroup;
 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;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

2023-01-10 Thread Evan Smal via Phabricator via cfe-commits

evansmal marked an inline comment as done.
evansmal added a comment.



In D141283#4038703 , @tbaeder wrote:

> When grepping `clang/test/` for "for char array is too long", I get a bunch 
> of other hits for this diagnostic, are the those tests not failing for you 
> (e.g. `clang/test/Sema/array-init.c:149`)?

Yeah, the tests don't fail for me. I can update  them, but I'm  unsure how to 
tell if they're working properly.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D141283/new/

https://reviews.llvm.org/D141283

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

2023-01-10 Thread Evan Smal via Phabricator via cfe-commits

evansmal added a comment.

Thanks all for the review!


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D141283/new/

https://reviews.llvm.org/D141283

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

2023-01-10 Thread Evan Smal via Phabricator via cfe-commits

evansmal updated this revision to Diff 488012.
evansmal added a comment.

Added additional test case


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D141283/new/

https://reviews.llvm.org/D141283

Files:
  clang/include/clang/Basic/DiagnosticSemaKinds.td
  clang/lib/Sema/SemaInit.cpp
  clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp


Index: clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
===
--- clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
+++ 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]="";
Index: clang/lib/Sema/SemaInit.cpp
===
--- clang/lib/Sema/SemaInit.cpp
+++ clang/lib/Sema/SemaInit.cpp
@@ -239,6 +239,8 @@
 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.
Index: clang/include/clang/Basic/DiagnosticSemaKinds.td
===
--- clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -5953,7 +5953,7 @@
   "excess elements in char array initializer">,
   InGroup;
 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;


Index: clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
===
--- clang/test/CXX/dcl.decl/dcl.init/dcl.init.string/p2.cpp
+++ 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]="";
Index: clang/lib/Sema/SemaInit.cpp
===
--- clang/lib/Sema/SemaInit.cpp
+++ clang/lib/Sema/SemaInit.cpp
@@ -239,6 +239,8 @@
 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.
Index: clang/include/clang/Basic/DiagnosticSemaKinds.td
===
--- clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -5953,7 +5953,7 @@
   "excess elements in char array initializer">,
   InGroup;
 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;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

2023-01-13 Thread Evan Smal via Phabricator via cfe-commits

evansmal added a comment.

Hi @shafik! Thanks for the review. I don't have commit access and am unsure 
what I should do to get this committed. Can you let me know what I need to do 
next?


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D141283/new/

https://reviews.llvm.org/D141283

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

2023-01-19 Thread Evan Smal via Phabricator via cfe-commits

evansmal added a comment.

In D141283#4065117 , @tbaeder wrote:

> AFAIK we need a name and an email address so the commit can be attributed 
> properly.

The commit can be attributed to Evan Smal 


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D141283/new/

https://reviews.llvm.org/D141283

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

2023-01-19 Thread Evan Smal via Phabricator via cfe-commits

evansmal added a comment.

@tbaeder Thank you! :^)


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D141283/new/

https://reviews.llvm.org/D141283

___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

[PATCH] D141283: [clang] Improve diagnostic for "initializer-string for char array is too long"

9 matches

Site Navigation

Mail list logo

Footer information