diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a9c0f1a8ecfa925347cbfe1120ca0d31fa192c90..8a3c9f77ad0df2cf2b77b3444afea7af5030159d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2020-02-22  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/93882
+	* decl.c (grokdeclarator): Use %qs in a diagnostic message.
+
 2020-02-21  Martin Sebor  <msebor@redhat.com>
 
 	PR gcov-profile/93753
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 31a556a0a1f80ac39380c0eaed63ecdd1828102a..1947c4ddb7ff865c5ad5a6973ef6c71a07b880b8 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -11251,7 +11251,7 @@ grokdeclarator (const cp_declarator *declarator,
   if (constinit_p && typedef_p)
     {
       error_at (declspecs->locations[ds_constinit],
-		"%<constinit%> cannot appear in a typedef declaration");
+		"%qs cannot appear in a typedef declaration", "constinit");
       return error_mark_node;
     }