public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Siddhesh Poyarekar <siddhesh@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-5649] tree-optimization/103456 - Record only successes from object_sizes_set Date: Wed, 1 Dec 2021 08:31:14 +0000 (GMT) [thread overview] Message-ID: <20211201083114.2BA983858D28@sourceware.org> (raw) https://gcc.gnu.org/g:da9386f9a70ac494939650c0e0a0e4168a6f76d8 commit r12-5649-gda9386f9a70ac494939650c0e0a0e4168a6f76d8 Author: Siddhesh Poyarekar <siddhesh@gotplt.org> Date: Wed Dec 1 12:58:12 2021 +0530 tree-optimization/103456 - Record only successes from object_sizes_set Avoid overwriting osi->changed if object_sizes_set does not update the size, so that a previous success in the same pass is not overwritten. This fixes the bootstrap-ubsan build config, which was failing due to incorrect object size. gcc/ChangeLog: PR tree-optimization/103456 * tree-object-size.c (merge_object_sizes): Update osi->changed only if object_sizes_set succeeded. gcc/testsuite/ChangeLog: PR tree-optimization/103456 * gcc.dg/ubsan/pr103456.c: New test. Co-authored-by: Martin Liška <mliska@suse.cz> Signed-off-by: Siddhesh Poyarekar <siddhesh@gotplt.org> Diff: --- gcc/testsuite/gcc.dg/ubsan/pr103456.c | 21 +++++++++++++++++++++ gcc/tree-object-size.c | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/gcc.dg/ubsan/pr103456.c b/gcc/testsuite/gcc.dg/ubsan/pr103456.c new file mode 100644 index 00000000000..20322fbaab1 --- /dev/null +++ b/gcc/testsuite/gcc.dg/ubsan/pr103456.c @@ -0,0 +1,21 @@ +/* PR tree-optimization/103456 */ +/* { dg-do compile } */ +/* { dg-options "-fsanitize=undefined -O -fdump-tree-objsz" } */ + +static char *multilib_options = "m64/m32"; + +void +used_arg_t (void) +{ + char *q = multilib_options; + for (;;) + { + while (*q) + q++; + while (__builtin_strchr (q, '_') == 0) + while (*q) + q++; + } +} + +/* { dg-final { scan-tree-dump-not "maximum object size 0" "objsz1" } } */ diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c index 3780437ff91..b4881ef198f 100644 --- a/gcc/tree-object-size.c +++ b/gcc/tree-object-size.c @@ -854,7 +854,8 @@ merge_object_sizes (struct object_size_info *osi, tree dest, tree orig, orig_bytes = (offset > orig_bytes) ? HOST_WIDE_INT_0U : orig_bytes - offset; - osi->changed = object_sizes_set (osi, varno, orig_bytes); + if (object_sizes_set (osi, varno, orig_bytes)) + osi->changed = true; return bitmap_bit_p (osi->reexamine, SSA_NAME_VERSION (orig)); }
reply other threads:[~2021-12-01 8:31 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211201083114.2BA983858D28@sourceware.org \ --to=siddhesh@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).