diff options
| author | Martin Sebor <msebor@redhat.com> | 2020-11-25 14:05:01 -0700 |
|---|---|---|
| committer | Martin Sebor <msebor@redhat.com> | 2020-11-25 15:00:27 -0700 |
| commit | ca23341b28cd3af7985b83a6479107d9ea145a90 (patch) | |
| tree | abaa791c43dac7f771cdc4dd863821bb89325df3 /gcc/ubsan.c | |
| parent | 15f82d80cfbf834365f5819d75aaa9eeb9321224 (diff) | |
| download | gcc-ca23341b28cd3af7985b83a6479107d9ea145a90.zip gcc-ca23341b28cd3af7985b83a6479107d9ea145a90.tar.gz gcc-ca23341b28cd3af7985b83a6479107d9ea145a90.tar.bz2 | |
Clean up -Wformat-diag warnings (PR bootstrap/97622, PR bootstrap/94982)
gcc/c-family/ChangeLog:
PR bootstrap/94982
* c-attribs.c (handle_patchable_function_entry_attribute): Avoid
-Wformat-diag.
gcc/cp/ChangeLog:
PR bootstrap/94982
* constraint.cc (debug_argument_list): Avoid -Wformat-diag.
* error.c (function_category): Same.
(print_template_differences): Same.
* logic.cc (debug): Same.
* name-lookup.c (lookup_using_decl): Same.
* parser.c (maybe_add_cast_fixit): Same.
(cp_parser_template_introduction): Same.
* typeck.c (access_failure_info::add_fixit_hint): Same.
gcc/ChangeLog:
PR bootstrap/97622
PR bootstrap/94982
* config/i386/i386-options.c (ix86_valid_target_attribute_inner_p):
Avoid -Wformat-diag.
* digraph.cc (struct test_edge): Same.
* dumpfile.c (dump_loc): Same.
(dump_context::begin_scope): Same.
* edit-context.c (edited_file::print_diff): Same.
(edited_file::print_diff_hunk): Same.
* json.cc (object::print): Same.
* lto-wrapper.c (merge_and_complain): Same.
* reload.c (find_reloads): Same.
* tree-diagnostic-path.cc (print_path_summary_as_text): Same.
* ubsan.c (ubsan_type_descriptor): Same.
gcc/jit/ChangeLog:
PR bootstrap/94982
* jit-recording.c (recording::function::dump_to_dot): Avoid
-Wformat-diag.
(recording::block::dump_to_dot): Same.
gcc/testsuite/ChangeLog:
PR bootstrap/94982
* c-c++-common/patchable_function_entry-error-3.c: Adjust text
of expected warning.
Diffstat (limited to 'gcc/ubsan.c')
| -rw-r--r-- | gcc/ubsan.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gcc/ubsan.c b/gcc/ubsan.c index acd8a0b..4c14a38 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -405,10 +405,12 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) /* We weren't able to determine the type name. */ tname = "<unknown>"; + pp_quote (&pretty_name); + tree eltype = type; if (pstyle == UBSAN_PRINT_POINTER) { - pp_printf (&pretty_name, "'%s%s%s%s%s%s%s", + pp_printf (&pretty_name, "%s%s%s%s%s%s%s", TYPE_VOLATILE (type2) ? "volatile " : "", TYPE_READONLY (type2) ? "const " : "", TYPE_RESTRICT (type2) ? "restrict " : "", @@ -420,14 +422,14 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) deref_depth == 0 ? "" : " "); while (deref_depth-- > 0) pp_star (&pretty_name); - pp_quote (&pretty_name); } else if (pstyle == UBSAN_PRINT_ARRAY) { /* Pretty print the array dimensions. */ gcc_assert (TREE_CODE (type) == ARRAY_TYPE); tree t = type; - pp_printf (&pretty_name, "'%s ", tname); + pp_string (&pretty_name, tname); + pp_space (&pretty_name); while (deref_depth-- > 0) pp_star (&pretty_name); while (TREE_CODE (t) == ARRAY_TYPE) @@ -453,13 +455,14 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) pp_right_bracket (&pretty_name); t = TREE_TYPE (t); } - pp_quote (&pretty_name); /* Save the tree with stripped types. */ eltype = t; } else - pp_printf (&pretty_name, "'%s'", tname); + pp_string (&pretty_name, tname); + + pp_quote (&pretty_name); switch (TREE_CODE (eltype)) { |