diff options
| author | Qing Zhao <qing.zhao@oracle.com> | 2023-06-30 18:24:34 +0000 |
|---|---|---|
| committer | Qing Zhao <qing.zhao@oracle.com> | 2023-06-30 18:24:34 +0000 |
| commit | e050ce7c3adf71eedd5482c29cf54b827e026642 (patch) | |
| tree | 2cb23689a918b4729bb1b116f0685a28e4bafdd9 /gcc/tree-object-size.cc | |
| parent | db5d70632a6cb59521e41df7745cacb08d00a3f4 (diff) | |
| download | gcc-e050ce7c3adf71eedd5482c29cf54b827e026642.zip gcc-e050ce7c3adf71eedd5482c29cf54b827e026642.tar.gz gcc-e050ce7c3adf71eedd5482c29cf54b827e026642.tar.bz2 | |
Use TYPE_INCLUDES_FLEXARRAY in __builtin_object_size [PR tree-optimization/101832]
__builtin_object_size should treat struct with TYPE_INCLUDES_FLEXARRAY as
flexible size.
gcc/ChangeLog:
PR tree-optimization/101832
* tree-object-size.cc (addr_object_size): Handle structure/union type
when it has flexible size.
gcc/testsuite/ChangeLog:
PR tree-optimization/101832
* gcc.dg/builtin-object-size-pr101832.c: New test.
Diffstat (limited to 'gcc/tree-object-size.cc')
| -rw-r--r-- | gcc/tree-object-size.cc | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc index 9a936a9..a62af05 100644 --- a/gcc/tree-object-size.cc +++ b/gcc/tree-object-size.cc @@ -633,11 +633,32 @@ addr_object_size (struct object_size_info *osi, const_tree ptr, v = NULL_TREE; break; case COMPONENT_REF: - if (TREE_CODE (TREE_TYPE (v)) != ARRAY_TYPE) + /* When the ref is not to an aggregate type, i.e, an array, + a record or a union, it will not have flexible size, + compute the object size directly. */ + if (!AGGREGATE_TYPE_P (TREE_TYPE (v))) { v = NULL_TREE; break; } + /* if the ref is to a record or union type, but the type + does not include a flexible array recursively, compute + the object size directly. */ + if (RECORD_OR_UNION_TYPE_P (TREE_TYPE (v))) + { + if (!TYPE_INCLUDES_FLEXARRAY (TREE_TYPE (v))) + { + v = NULL_TREE; + break; + } + else + { + v = TREE_OPERAND (v, 0); + break; + } + } + /* Now the ref is to an array type. */ + gcc_assert (TREE_CODE (TREE_TYPE (v)) == ARRAY_TYPE); is_flexible_array_mem_ref = array_ref_flexible_size_p (v); while (v != pt_var && TREE_CODE (v) == COMPONENT_REF) if (TREE_CODE (TREE_TYPE (TREE_OPERAND (v, 0))) |