Reword diagnostic

Author: apple-fcloutier

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -10355,7 +10355,7 @@ def warn_format_bool_as_character : Warning<
   InGroup<Format>;
 def note_format_string_defined : Note<"format string is defined here">;
 def note_format_string_evaluated_to : Note<
-  "format string resolved to a constant string">;
+  "format string computed from non-literal expression">;
 def note_format_fix_specifier : Note<"did you mean to use '%0'?">;
 def note_printf_c_str: Note<"did you mean to call the %0 method?">;
 def note_format_security_fixit: Note<

clang/lib/Sema/SemaChecking.cpp

@@ -6492,7 +6492,7 @@ EvaluateStringAndCreateLiteral(Sema &S, const Expr *E, const StringLiteral *&SL,
   if (SER->getStringLiteral(SL, Offset))
     return SLCER_Evaluated;
 
-  // Otherwise, lop that string into a scratch buffer, create a string literal
+  // Otherwise, plop that string into a scratch buffer, create a string literal
   // and then go with that.
   std::unique_ptr<llvm::MemoryBuffer> MemBuf;
   {

clang/test/Sema/format-strings.c

@@ -3,7 +3,7 @@
 // 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 was constant-evaluated}}
+// 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.

clang/test/SemaCXX/format-strings.cpp

@@ -4,7 +4,7 @@
 // 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 was constant-evaluated}}
+// 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.