procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tree-optimization/104941: Actually assign the conversion result

Browse source 
Assign the result of fold_convert to offset.  Also make the useless
conversion check lighter since the two way check is not needed here.

gcc/ChangeLog:

	PR tree-optimization/104941
	* tree-object-size.cc (size_for_offset): Make useless conversion
	check lighter and assign result of fold_convert to OFFSET.

gcc/testsuite/ChangeLog:

	PR tree-optimization/104941
	* gcc.dg/builtin-dynamic-object-size-0.c (S1, S2): New structs.
	(test_alloc_nested_structs, g): New functions.
	(main): Call test_alloc_nested_structs.

Signed-off-by: Siddhesh Poyarekar <siddhesh@gotplt.org>
This commit is contained in:
Siddhesh Poyarekar 2022-03-16 20:45:47 +05:30
parent be093b8dcc
commit beb12c62ea
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c
View file

@ -323,6 +323,34 @@ test_substring (size_t sz, size_t off)
return __builtin_dynamic_object_size (&str[off], 0);
}
struct S2
{
char arr[7];
};
struct S1
{
int pad;
struct S2 s2;
};
static long
g (struct S1 *s1)
{
struct S2 *s2 = &s1->s2;
return __builtin_dynamic_object_size (s2->arr, 0);
}
long
__attribute__ ((noinline))
test_alloc_nested_structs (int x)
{
struct S1 *s1 = __builtin_malloc (x);
return g (s1);
}
/* POINTER_PLUS expressions. */
size_t
__attribute__ ((noinline))
test_substring_ptrplus (size_t sz, size_t off)
@ -342,6 +370,8 @@ test_substring_ptrplus2 (size_t sz, size_t off, size_t off2)
return __builtin_dynamic_object_size (ptr + off2, 0);
}
/* Function parameters. */
size_t
__attribute__ ((access (__read_write__, 1, 2)))
__attribute__ ((noinline))
@ -382,6 +412,8 @@ test_parmsz_unknown (void *obj, void *unknown, size_t sz, int cond)
return __builtin_dynamic_object_size (cond ? obj : unknown, 0);
}
/* Loops. */
size_t
__attribute__ ((noinline))
__attribute__ ((access (__read_write__, 1, 2)))
@ -491,6 +523,8 @@ main (int argc, char **argv)
FAIL ();
if (test_dynarray_cond (1) != 8)
FAIL ();
if (test_alloc_nested_structs (42) != 42 - sizeof (int))
FAIL ();
if (test_deploop (128, 4) != 128)
FAIL ();
if (test_deploop (128, 129) != 32)

4
gcc/tree-object-size.cc
View file

@ -371,8 +371,8 @@ size_for_offset (tree sz, tree offset, tree wholesize = NULL_TREE)
}
/* Safe to convert now, since a valid net offset should be non-negative. */
if (!types_compatible_p (TREE_TYPE (offset), sizetype))
fold_convert (sizetype, offset);
if (!useless_type_conversion_p (sizetype, TREE_TYPE (offset)))
offset = fold_convert (sizetype, offset);
if (TREE_CODE (offset) == INTEGER_CST)
{