From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 0A341385841C; Tue, 7 Feb 2023 20:03:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0A341385841C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675800224; bh=2Ms6bssPTa4P5KDjYJE7Bq5Z9xmeqnW041u3z2gpCI0=; h=From:To:Subject:Date:From; b=riex0VN8k1VD1DhDCXNBfePkgbXU2C3f4qlK9lEwEFGmhk2Y4JP4vtQWlMJS/amSn FzVZJSHs6pzDX8E/oczT6xrdgSn5R7FI6HfpidOM81oQprzm0CtUQNxvK8o5FppFEJ Ikyzgo1HdsHWBhBRcRt3Ao532AZow7T4553393VE= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Siddhesh Poyarekar To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-9113] tree-optimization/108522 Use component_ref_field_offset X-Act-Checkin: gcc X-Git-Author: Siddhesh Poyarekar X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 4526562a305b3bfc18485a2aa017500aa22aa14b X-Git-Newrev: 45b346664c0af57053e77276cd030015eb21f851 Message-Id: <20230207200344.0A341385841C@sourceware.org> Date: Tue, 7 Feb 2023 20:03:44 +0000 (GMT) List-Id: https://gcc.gnu.org/g:45b346664c0af57053e77276cd030015eb21f851 commit r12-9113-g45b346664c0af57053e77276cd030015eb21f851 Author: Siddhesh Poyarekar Date: Thu Jan 26 07:07:03 2023 -0500 tree-optimization/108522 Use component_ref_field_offset Instead of using TREE_OPERAND (expr, 2) directly, use component_ref_field_offset instead, which does scaling for us. The function also substitutes PLACEHOLDER_EXPRs but it is not relevant for tree-object-size. gcc/ChangeLog: PR tree-optimization/108522 * tree-object-size.cc (compute_object_offset): Make EXPR argument non-const. Call component_ref_field_offset. gcc/testsuite/ChangeLog: PR tree-optimization/108522 * gcc.dg/builtin-dynamic-object-size-0.c (DEFSTRUCT): New macro. (test_dynarray_struct_member_b, test_dynarray_struct_member_c, test_dynarray_struct_member_d, test_dynarray_struct_member_subobj_b, test_dynarray_struct_member_subobj_c, test_dynarray_struct_member_subobj_d): New tests. (main): Call them. Signed-off-by: Siddhesh Poyarekar (cherry picked from commit 0573a0778af88e805f7630ac8640ecd67d692665) Diff: --- .../gcc.dg/builtin-dynamic-object-size-0.c | 81 ++++++++++++++++++++-- gcc/tree-object-size.cc | 7 +- 2 files changed, 77 insertions(+), 11 deletions(-) diff --git a/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c b/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c index 2dd81c8d2fa..d6942c4b38c 100644 --- a/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c +++ b/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c @@ -315,19 +315,70 @@ test_dynarray_struct_subobj2 (size_t sz, size_t off, size_t *objsz) } /* See pr #108522. */ + +#define DEFSTRUCT(_s, _n) \ + struct DS \ + { \ + char a[_n]; \ + unsigned long long b; \ + int c; \ + char d[2 * _n]; \ + } _s + size_t __attribute__ ((noinline)) -test_dynarray_struct_member (size_t sz) +test_dynarray_struct_member_b (size_t sz) { - struct - { - char a[sz]; - char b; - } s; + DEFSTRUCT (s, sz); return __builtin_dynamic_object_size (&s.b, 0); } +size_t +__attribute__ ((noinline)) +test_dynarray_struct_member_c (size_t sz) +{ + DEFSTRUCT (s, sz); + + return __builtin_dynamic_object_size (&s.c, 0); +} + +size_t +__attribute__ ((noinline)) +test_dynarray_struct_member_d (size_t sz, size_t offset) +{ + DEFSTRUCT (s, sz); + + return __builtin_dynamic_object_size (&s.d[offset], 0); +} + +size_t +__attribute__ ((noinline)) +test_dynarray_struct_member_subobj_b (size_t sz) +{ + DEFSTRUCT (s, sz); + + return __builtin_dynamic_object_size (&s.b, 1); +} + +size_t +__attribute__ ((noinline)) +test_dynarray_struct_member_subobj_c (size_t sz) +{ + DEFSTRUCT (s, sz); + + return __builtin_dynamic_object_size (&s.c, 1); +} + +size_t +__attribute__ ((noinline)) +test_dynarray_struct_member_subobj_d (size_t sz, size_t offset) +{ + DEFSTRUCT (s, sz); + + return __builtin_dynamic_object_size (&s.d[offset], 1); +} + size_t __attribute__ ((noinline)) test_substring (size_t sz, size_t off) @@ -587,7 +638,23 @@ main (int argc, char **argv) if (test_dynarray_struct_subobj2 (42, 4, &objsz) != objsz - 4 - sizeof (long) - sizeof (int)) FAIL (); - if (test_dynarray_struct_member (42) != sizeof (char)) + DEFSTRUCT(ds, 64); + const size_t n = sizeof (ds.a); + if (test_dynarray_struct_member_b (n) + != sizeof (ds) - __builtin_offsetof (struct DS, b)) + FAIL (); + if (test_dynarray_struct_member_c (n) + != sizeof (ds) - __builtin_offsetof (struct DS, c)) + FAIL (); + if (test_dynarray_struct_member_d (n, 0) + != sizeof (ds) - __builtin_offsetof (struct DS, d)) + FAIL (); + if (test_dynarray_struct_member_subobj_b (n) != sizeof (ds.b)) + FAIL (); + if (test_dynarray_struct_member_subobj_c (n) != sizeof (ds.c)) + FAIL (); + if (test_dynarray_struct_member_subobj_d (n, n - 2) + != sizeof (ds) - __builtin_offsetof (struct DS, d) - n + 2) FAIL (); if (test_substring_ptrplus (128, 4) != (128 - 4) * sizeof (int)) FAIL (); diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc index b83d5b1c93e..91db1238f50 100644 --- a/gcc/tree-object-size.cc +++ b/gcc/tree-object-size.cc @@ -56,7 +56,7 @@ struct GTY(()) object_size tree wholesize; }; -static tree compute_object_offset (const_tree, const_tree); +static tree compute_object_offset (tree, const_tree); static bool addr_object_size (struct object_size_info *, const_tree, int, tree *, tree *t = NULL); static tree alloc_object_size (const gcall *, int); @@ -392,7 +392,7 @@ size_for_offset (tree sz, tree offset, tree wholesize = NULL_TREE) if unknown. */ static tree -compute_object_offset (const_tree expr, const_tree var) +compute_object_offset (tree expr, const_tree var) { enum tree_code code = PLUS_EXPR; tree base, off, t; @@ -409,8 +409,7 @@ compute_object_offset (const_tree expr, const_tree var) t = TREE_OPERAND (expr, 1); off = size_binop (PLUS_EXPR, - (TREE_OPERAND (expr, 2) ? TREE_OPERAND (expr, 2) - : DECL_FIELD_OFFSET (t)), + component_ref_field_offset (expr), size_int (tree_to_uhwi (DECL_FIELD_BIT_OFFSET (t)) / BITS_PER_UNIT)); break;