Aaron feedback

Author: apple-fcloutier

clang/docs/ReleaseNotes.rst

@@ -407,7 +407,7 @@ related warnings within the method body.
     example.c:6:17: warning: format specifies type 'char *' but the argument has type 'int' [-Wformat]
         6 |     printf(format, 123);
           |            ~~~~~~  ^~~
-    <scratch space>:1:4: note: format string resolved to a constant string
+    <scratch space>:1:4: note: format string computed from non-literal expression
         1 | "hello %s"
           |        ^~
           |        %d

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -9268,7 +9268,7 @@ def err_expected_callable_argument : Error<
 def note_building_builtin_dump_struct_call : Note<
   "in call to printing function with arguments '(%0)' while dumping struct">;
 def err_builtin_verbose_trap_arg : Error<
-  "argument to __builtin_verbose_trap must %select{be a pointer to a constant NUL-terminated string|not contain $}0">;
+  "argument to '__builtin_verbose_trap' must %select{be a pointer to a constant null-terminated string|not contain $}0">;
 
 def err_atomic_load_store_uses_lib : Error<
   "atomic %select{load|store}0 requires runtime support that is not "

clang/test/Sema/format-strings.c

@@ -1,13 +1,9 @@
+// #scratch_space
 // RUN: %clang_cc1 -fblocks -fsyntax-only -verify -Wformat-nonliteral -isystem %S/Inputs %s
 // RUN: %clang_cc1 -fblocks -fsyntax-only -verify -Wformat-nonliteral -isystem %S/Inputs -fno-signed-char %s
 // RUN: %clang_cc1 -fblocks -fsyntax-only -verify -Wformat-nonliteral -isystem %S/Inputs -triple=x86_64-unknown-fuchsia %s
 // RUN: %clang_cc1 -fblocks -fsyntax-only -verify -Wformat-nonliteral -isystem %S/Inputs -triple=x86_64-linux-android %s
 
-// expected-note@-5{{format string computed from non-literal expression}}
-// ^^^ there will be a <scratch space> SourceLocation caused by the
-// test_consteval_init_array test, that -verify treats as if it showed up at
-// line 1 of this file.
-
 #include <stdarg.h>
 #include <stddef.h>
 #define __need_wint_t
@@ -913,4 +909,5 @@ void test_consteval_init_array(void) {
   const char buf[] = {'%', 55 * 2 + 5, '\n', 0};
   printf(buf, "hello"); // no-warning
   printf(buf, 123); // expected-warning{{format specifies type 'char *' but the argument has type 'int'}}
+  // expected-note@#scratch_space {{format string computed from non-literal expression}}
 }

clang/test/SemaCXX/format-strings.cpp

@@ -1,14 +1,9 @@
+// #scratch_space
 // RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -Wformat-pedantic -fblocks %s
 // RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -fblocks -std=c++98 %s
 // RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -Wformat-pedantic -fblocks -std=c++11 %s
 // RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -Wformat-pedantic -fblocks -std=c++20 %s
-
-#if __cplusplus >= 202000l
-// expected-note@-6{{format string computed from non-literal expression}}
-// ^^^ there will be a <scratch space> SourceLocation caused by the
-// test_constexpr_string test, that -verify treats as if it showed up at
-// line 1 of this file.
-#endif
+// RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -Wformat-pedantic -fblocks -std=c++23 %s
 
 #include <stdarg.h>
 
@@ -310,5 +305,26 @@ constexpr my_string const_string() {
 void test_constexpr_string() {
   printf(const_string().c_str(), "hello", 123); // no-warning
   printf(const_string().c_str(), 123, 456); // expected-warning {{format specifies type 'char *' but the argument has type 'int'}}
+  // expected-note@#scratch_space {{format string computed from non-literal expression}}
+}
+#endif
+
+#if __cplusplus >= 202300L
+constexpr const char *consteval_str() {
+  if consteval {
+    return "%s";
+  } else {
+    return "%d"; // expected-note 2{{format string is defined here}}
+  }
+}
+
+constexpr const char *consteval_str_global = consteval_str();
+
+void test_consteval_str() {
+  printf(consteval_str(), 789); // no-warning
+  printf(consteval_str(), "hello"); // expected-warning {{format specifies type 'int' but the argument has type 'const char *'}}
+
+  printf(consteval_str_global, 1234); // no-warning
+  printf(consteval_str_global, "hello"); // expected-warning {{format specifies type 'int' but the argument has type 'const char *'}}
 }
 #endif

clang/test/SemaCXX/verbose-trap.cpp

@@ -27,13 +27,13 @@ void f(const char * arg) {
   __builtin_verbose_trap(); // expected-error {{too few arguments}}
   __builtin_verbose_trap(""); // expected-error {{too few arguments}}
   __builtin_verbose_trap("", "", ""); // expected-error {{too many arguments}}
-  __builtin_verbose_trap("", 0); // expected-error {{argument to __builtin_verbose_trap must be a pointer to a constant NUL-terminated string}}
+  __builtin_verbose_trap("", 0); // expected-error {{argument to '__builtin_verbose_trap' must be a pointer to a constant null-terminated string}}
   __builtin_verbose_trap(1, ""); // expected-error {{cannot initialize a parameter of type 'const char *' with an rvalue of type 'int'}}
-  __builtin_verbose_trap(arg, ""); // expected-error {{argument to __builtin_verbose_trap must be a pointer to a constant NUL-terminated string}}
-  __builtin_verbose_trap(buf, ""); // expected-error {{argument to __builtin_verbose_trap must be a pointer to a constant NUL-terminated string}}
+  __builtin_verbose_trap(arg, ""); // expected-error {{argument to '__builtin_verbose_trap' must be a pointer to a constant null-terminated string}}
+  __builtin_verbose_trap(buf, ""); // expected-error {{argument to '__builtin_verbose_trap' must be a pointer to a constant null-terminated string}}
   __builtin_verbose_trap(buf_nt1, "");
   __builtin_verbose_trap(buf_nt2, "");
-  __builtin_verbose_trap("cat$1", "hel$lo"); // expected-error 2 {{argument to __builtin_verbose_trap must not contain $}}
+  __builtin_verbose_trap("cat$1", "hel$lo"); // expected-error 2 {{argument to '__builtin_verbose_trap' must not contain $}}
   __builtin_verbose_trap(category, reason);
   __builtin_verbose_trap(u8"cat1", u8"hello");
 #if __cplusplus >= 202002L