diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c9f8572f007..7ebc0756173 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2022-05-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/101833
+	PR c++/47634
+	* tree-core.h (struct attribute_spec): Update comment for HANDLER.
+
 2022-05-06  Jason Merrill  <jason@redhat.com>
 
 	* diagnostic-color.cc: Add fnname and targs color entries.
diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index e490589f7bf..f5a8b1963ca 100644
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20220507
+20220508
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 347db0c3f84..972c68b0567 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,24 @@
+2022-05-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/101833
+	PR c++/47634
+	* c-attribs.cc (positional_argument): Pass POS by reference.  Deal
+	with FN being either a function declaration or function type.  Use
+	maybe_adjust_arg_pos_for_attribute.
+	* c-common.cc (check_function_arguments): Maybe pass FNDECL down to
+	check_function_format.
+	* c-common.h (maybe_adjust_arg_pos_for_attribute): Declare.
+	(positional_argument): Adjust.
+	* c-format.cc (get_constant): Rename to ...
+	(validate_constant): ... this.  Take EXPR by reference.  Return bool
+	instead of tree.
+	(handle_format_arg_attribute): Don't overwrite FORMAT_NUM_EXPR by the
+	return value of validate_constant.
+	(decode_format_attr): Don't overwrite FORMAT_NUM_EXPR and
+	FIRST_ARG_NUM_EXPR by the return value of validate_constant.
+	(check_function_format): Adjust a parameter name.
+	(handle_format_attribute): Maybe pass FNDECL down to decode_format_attr.
+
 2022-05-04  Marek Polacek  <polacek@redhat.com>
 
 	* c-warn.cc (warnings_for_convert_and_check): Convert constants of type
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index b0fef44e35f..b8167c20057 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2022-05-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/101833
+	PR c++/47634
+	* c-objc-common.cc (maybe_adjust_arg_pos_for_attribute): New.
+
 2022-04-08  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/105149
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a539a0d8ae5..e72925f82d3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2022-05-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/101833
+	PR c++/47634
+	* tree.cc (maybe_adjust_arg_pos_for_attribute): New.
+
 2022-05-06  Jason Merrill  <jason@redhat.com>
 
 	* error.cc (decl_to_string): Add show_color parameter.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7630ce66e95..5d890c18acd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2022-05-07  Marek Polacek  <polacek@redhat.com>
+
+	PR c++/101833
+	PR c++/47634
+	* g++.dg/ext/attr-format-arg1.C: New test.
+	* g++.dg/ext/attr-format1.C: New test.
+	* g++.dg/ext/attr-format2.C: New test.
+	* g++.dg/ext/attr-format3.C: New test.
+
 2022-05-06  Jason Merrill  <jason@redhat.com>
 
 	* g++.dg/diagnostic/function-color1.C: New test.