aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2025-01-08 23:12:02 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2025-01-08 23:12:02 +0100
commite5180fbcbcc356c71154413588288cbd30e5198d (patch)
tree2d5cd6d75c41142a0eabbcfea3e0fc4f6308da18 /gcc
parentdcbd260a1dff3f93ed1aa6fd962e92bae8933dc6 (diff)
downloadgcc-e5180fbcbcc356c71154413588288cbd30e5198d.zip
gcc-e5180fbcbcc356c71154413588288cbd30e5198d.tar.gz
gcc-e5180fbcbcc356c71154413588288cbd30e5198d.tar.bz2
c++: Honor complain in cp_build_function_call_vec for check_function_arguments warnings [PR117825]
The following testcase ICEs due to re-entering diagnostics. When diagnosing -Wformat-security warning, we try to print instantiation context, which calls tsubst with tf_none, but that in the end calls cp_build_function_call_vec which calls check_function_arguments which diagnoses another warning (again -Wformat-security). The other check_function_arguments caller, build_over_call, doesn't call that function if !(complain & tf_warning), so I think the best fix is to do it the same in cp_build_function_call_vec as well. 2025-01-08 Jakub Jelinek <jakub@redhat.com> PR c++/117825 * typeck.cc (cp_build_function_call_vec): Don't call check_function_arguments if complain doesn't have tf_warning bit set. * g++.dg/warn/pr117825.C: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/typeck.cc8
-rw-r--r--gcc/testsuite/g++.dg/warn/pr117825.C18
2 files changed, 23 insertions, 3 deletions
diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc
index c3ef929..3e0d711 100644
--- a/gcc/cp/typeck.cc
+++ b/gcc/cp/typeck.cc
@@ -4513,9 +4513,11 @@ cp_build_function_call_vec (tree function, vec<tree, va_gc> **params,
/* Check for errors in format strings and inappropriately
null parameters. */
- bool warned_p = check_function_arguments (input_location, fndecl, fntype,
- nargs, argarray, NULL,
- cp_comp_parm_types);
+ bool warned_p
+ = ((complain & tf_warning)
+ && check_function_arguments (input_location, fndecl, fntype,
+ nargs, argarray, NULL,
+ cp_comp_parm_types));
ret = build_cxx_call (function, nargs, argarray, complain, orig_fndecl);
diff --git a/gcc/testsuite/g++.dg/warn/pr117825.C b/gcc/testsuite/g++.dg/warn/pr117825.C
new file mode 100644
index 0000000..077e09d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/pr117825.C
@@ -0,0 +1,18 @@
+// PR c++/117825
+// { dg-do compile { target c++17 } }
+// { dg-options "-Wformat -Wformat-security" }
+
+__attribute__((format (printf, 1, 2)))
+int fails (const char *, ...) { return 0; }
+
+template <auto func, typename... Args>
+auto wrap (Args... args) -> decltype (func (args...))
+{
+ return func (args...); // { dg-warning "format not a string literal and no format arguments" }
+}
+
+int
+main ()
+{
+ wrap<fails> ("Test!");
+}