OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-object-size: Handle GIMPLE_CALL

Browse Source 
Handle non-constant expressions in GIMPLE_CALL arguments.  Also handle
alloca.

gcc/ChangeLog:

	PR middle-end/70090
	* tree-object-size.c (alloc_object_size): Make and return
	non-constant size expression.
	(call_object_size): Return expression or unknown based on
	whether dynamic object size is requested.

gcc/testsuite/ChangeLog:

	PR middle-end/70090
	* gcc.dg/builtin-dynamic-object-size-0.c: Add new tests.
	* gcc.dg/builtin-object-size-1.c (test1)
	[__builtin_object_size]: Alter expected result for dynamic
	object size.
	* gcc.dg/builtin-object-size-2.c (test1)
	[__builtin_object_size]: Likewise.
	* gcc.dg/builtin-object-size-3.c (test1)
	[__builtin_object_size]: Likewise.
	* gcc.dg/builtin-object-size-4.c (test1)
	[__builtin_object_size]: Likewise.

Signed-off-by: Siddhesh Poyarekar <siddhesh@gotplt.org>
This commit is contained in:
Siddhesh Poyarekar 2022-01-11 19:52:43 +05:30
parent ea19c8f33a
commit 1f07810659
6 changed files with 325 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

269
gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c
View File

@ -4,6 +4,73 @@
typedef __SIZE_TYPE__ size_t;
#define abort __builtin_abort
void *
__attribute__ ((alloc_size (1)))
__attribute__ ((__nothrow__ , __leaf__))
__attribute__ ((noinline))
alloc_func (size_t sz)
{
return __builtin_malloc (sz);
}
void *
__attribute__ ((alloc_size (1, 2)))
__attribute__ ((__nothrow__ , __leaf__))
__attribute__ ((noinline))
calloc_func (size_t cnt, size_t sz)
{
return __builtin_calloc (cnt, sz);
}
void *
__attribute__ ((noinline))
unknown_allocator (size_t cnt, size_t sz)
{
return __builtin_calloc (cnt, sz);
}
size_t
__attribute__ ((noinline))
test_unknown (size_t cnt, size_t sz)
{
void *ch = unknown_allocator (cnt, sz);
size_t ret = __builtin_dynamic_object_size (ch, 0);
__builtin_free (ch);
return ret;
}
/* Malloc-like allocator. */
size_t
__attribute__ ((noinline))
test_malloc (size_t sz)
{
void *ch = alloc_func (sz);
size_t ret = __builtin_dynamic_object_size (ch, 0);
__builtin_free (ch);
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_malloc (size_t sz)
{
void *ch = __builtin_malloc (sz);
size_t ret = __builtin_dynamic_object_size (ch, 0);
__builtin_free (ch);
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_malloc_cond (int cond)
{
void *ch = __builtin_malloc (cond ? 32 : 64);
size_t ret = __builtin_dynamic_object_size (ch, 0);
__builtin_free (ch);
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_malloc_condphi (int cond)
@ -21,6 +88,155 @@ test_builtin_malloc_condphi (int cond)
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_malloc_condphi2 (int cond, size_t in)
{
void *ch;
if (cond)
ch = __builtin_malloc (in);
else
ch = __builtin_malloc (64);
size_t ret = __builtin_dynamic_object_size (ch, 0);
__builtin_free (ch);
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_malloc_condphi3 (int cond, size_t in, size_t in2)
{
void *ch;
if (cond)
ch = __builtin_malloc (in);
else
ch = __builtin_malloc (in2);
size_t ret = __builtin_dynamic_object_size (ch, 0);
__builtin_free (ch);
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_malloc_condphi4 (size_t sz, int cond)
{
char *a = __builtin_malloc (sz);
char b[sz / 2];
size_t ret = __builtin_dynamic_object_size (cond ? b : (void *) &a, 0);
__builtin_free (a);
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_malloc_condphi5 (size_t sz, int cond, char *c)
{
char *a = __builtin_malloc (sz);
size_t ret = __builtin_dynamic_object_size (cond ? c : (void *) &a, 0);
__builtin_free (a);
return ret;
}
/* Calloc-like allocator. */
size_t
__attribute__ ((noinline))
test_calloc (size_t cnt, size_t sz)
{
void *ch = calloc_func (cnt, sz);
size_t ret = __builtin_dynamic_object_size (ch, 0);
__builtin_free (ch);
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_calloc (size_t cnt, size_t sz)
{
void *ch = __builtin_calloc (cnt, sz);
size_t ret = __builtin_dynamic_object_size (ch, 0);
__builtin_free (ch);
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_calloc_cond (int cond1, int cond2)
{
void *ch = __builtin_calloc (cond1 ? 32 : 64, cond2 ? 1024 : 16);
size_t ret = __builtin_dynamic_object_size (ch, 0);
__builtin_free (ch);
return ret;
}
size_t
__attribute__ ((noinline))
test_builtin_calloc_condphi (size_t cnt, size_t sz, int cond)
{
struct
{
int a;
char b;
} bin[cnt];
char *ch = __builtin_calloc (cnt, sz);
size_t ret = __builtin_dynamic_object_size (cond ? ch : (void *) &bin, 0);
__builtin_free (ch);
return ret;
}
/* Passthrough functions. */
size_t
__attribute__ ((noinline))
test_passthrough (size_t sz, char *in)
{
char *bin = __builtin_malloc (sz);
char *dest = __builtin_memcpy (bin, in, sz);
size_t ret = __builtin_dynamic_object_size (dest, 0);
__builtin_free (bin);
return ret;
}
size_t
__attribute__ ((noinline))
test_passthrough_nonssa (char *in)
{
char bin[__builtin_strlen (in) + 1];
char *dest = __builtin_memcpy (bin, in, __builtin_strlen (in) + 1);
return __builtin_dynamic_object_size (dest, 0);
}
/* Variable length arrays. */
size_t
__attribute__ ((noinline))
test_dynarray (size_t sz)
{
char bin[sz];
return __builtin_dynamic_object_size (bin, 0);
}
size_t
__attribute__ ((noinline))
test_dynarray_cond (int cond)
{
char bin[cond ? 8 : 16];
return __builtin_dynamic_object_size (bin, 0);
}
size_t
__attribute__ ((noinline))
test_deploop (size_t sz, size_t cond)
@ -29,7 +245,7 @@ test_deploop (size_t sz, size_t cond)
for (size_t i = 0; i < sz; i++)
if (i == cond)
bin = __builtin_alloca (64);
bin = __builtin_alloca (sz);
return __builtin_dynamic_object_size (bin, 0);
}
@ -68,10 +284,61 @@ unsigned nfails = 0;
int
main (int argc, char **argv)
{
size_t outsz = test_unknown (32, 42);
if (outsz != -1 && outsz != 32)
FAIL ();
if (test_malloc (2048) != 2048)
FAIL ();
if (test_builtin_malloc (2048) != 2048)
FAIL ();
if (test_builtin_malloc_cond (1) != 32)
FAIL ();
if (test_builtin_malloc_cond (0) != 64)
FAIL ();
if (test_builtin_malloc_condphi (1) != 32)
FAIL ();
if (test_builtin_malloc_condphi (0) != 64)
FAIL ();
if (test_builtin_malloc_condphi2 (1, 128) != 128)
FAIL ();
if (test_builtin_malloc_condphi2 (0, 128) != 64)
FAIL ();
if (test_builtin_malloc_condphi3 (1, 128, 256) != 128)
FAIL ();
if (test_builtin_malloc_condphi3 (0, 128, 256) != 256)
FAIL ();
if (test_builtin_malloc_condphi4 (128, 1) != 64)
FAIL ();
if (test_builtin_malloc_condphi4 (128, 0) != sizeof (void *))
FAIL ();
if (test_builtin_malloc_condphi5 (128, 0, argv[0]) != -1)
FAIL ();
if (test_calloc (2048, 4) != 2048 * 4)
FAIL ();
if (test_builtin_calloc (2048, 8) != 2048 * 8)
FAIL ();
if (test_builtin_calloc_cond (0, 0) != 64 * 16)
FAIL ();
if (test_builtin_calloc_cond (1, 1) != 32 * 1024)
FAIL ();
if (test_builtin_calloc_condphi (128, 1, 0)
!= 128 * sizeof (struct { int a; char b; }))
FAIL ();
if (test_builtin_calloc_condphi (128, 1, 1) != 128)
FAIL ();
if (test_passthrough (__builtin_strlen (argv[0]) + 1, argv[0])
!= __builtin_strlen (argv[0]) + 1)
FAIL ();
if (test_passthrough_nonssa (argv[0]) != __builtin_strlen (argv[0]) + 1)
FAIL ();
if (test_dynarray (__builtin_strlen (argv[0])) != __builtin_strlen (argv[0]))
FAIL ();
if (test_dynarray_cond (0) != 16)
FAIL ();
if (test_dynarray_cond (1) != 8)
FAIL ();
if (test_deploop (128, 4) != 128)
FAIL ();
if (test_deploop (128, 129) != 32)
FAIL ();
if (test_parmsz_simple (argv[0], __builtin_strlen (argv[0]) + 1)

7
gcc/testsuite/gcc.dg/builtin-object-size-1.c
View File

@ -135,10 +135,17 @@ test1 (void *q, int x)
abort ();
if (__builtin_object_size (&extb[5], 0) != sizeof (extb) - 5)
abort ();
#ifdef __builtin_object_size
if (__builtin_object_size (var, 0) != x + 10)
abort ();
if (__builtin_object_size (var + 10, 0) != x)
abort ();
#else
if (__builtin_object_size (var, 0) != (size_t) -1)
abort ();
if (__builtin_object_size (var + 10, 0) != (size_t) -1)
abort ();
#endif
if (__builtin_object_size (&var[5], 0) != (size_t) -1)
abort ();
if (__builtin_object_size (zerol, 0) != 0)

14
gcc/testsuite/gcc.dg/builtin-object-size-2.c
View File

@ -137,16 +137,30 @@ test1 (void *q, int x)
abort ();
if (__builtin_object_size (&extc[5].c[3], 1) != (size_t) -1)
abort ();
#ifdef __builtin_object_size
if (__builtin_object_size (var, 1) != x + 10)
abort ();
if (__builtin_object_size (var + 10, 1) != x)
abort ();
#else
if (__builtin_object_size (var, 1) != (size_t) -1)
abort ();
if (__builtin_object_size (var + 10, 1) != (size_t) -1)
abort ();
#endif
if (__builtin_object_size (&var[5], 1) != (size_t) -1)
abort ();
#ifdef __builtin_object_size
if (__builtin_object_size (vara, 1) != (x + 10) * sizeof (struct A))
abort ();
if (__builtin_object_size (vara + 10, 1) != x * sizeof (struct A))
abort ();
#else
if (__builtin_object_size (vara, 1) != (size_t) -1)
abort ();
if (__builtin_object_size (vara + 10, 1) != (size_t) -1)
abort ();
#endif
if (__builtin_object_size (&vara[5], 1) != (size_t) -1)
abort ();
if (__builtin_object_size (&vara[0].a, 1) != sizeof (vara[0].a))

7
gcc/testsuite/gcc.dg/builtin-object-size-3.c
View File

@ -140,10 +140,17 @@ test1 (void *q, int x)
abort ();
if (__builtin_object_size (&extb[5], 2) != sizeof (extb) - 5)
abort ();
#ifdef __builtin_object_size
if (__builtin_object_size (var, 2) != x + 10)
abort ();
if (__builtin_object_size (var + 10, 2) != x)
abort ();
#else
if (__builtin_object_size (var, 2) != 0)
abort ();
if (__builtin_object_size (var + 10, 2) != 0)
abort ();
#endif
if (__builtin_object_size (&var[5], 2) != 0)
abort ();
if (__builtin_object_size (zerol, 2) != 0)

14
gcc/testsuite/gcc.dg/builtin-object-size-4.c
View File

@ -150,16 +150,30 @@ test1 (void *q, int x)
abort ();
if (__builtin_object_size (&extc[5].c[3], 3) != 0)
abort ();
#ifdef __builtin_object_size
if (__builtin_object_size (var, 3) != x + 10)
abort ();
if (__builtin_object_size (var + 10, 3) != x)
abort ();
#else
if (__builtin_object_size (var, 3) != 0)
abort ();
if (__builtin_object_size (var + 10, 3) != 0)
abort ();
#endif
if (__builtin_object_size (&var[5], 3) != 0)
abort ();
#ifdef __builtin_object_size
if (__builtin_object_size (vara, 3) != (x + 10) * sizeof (struct A))
abort ();
if (__builtin_object_size (vara + 10, 3) != x * sizeof (struct A))
abort ();
#else
if (__builtin_object_size (vara, 3) != 0)
abort ();
if (__builtin_object_size (vara + 10, 3) != 0)
abort ();
#endif
if (__builtin_object_size (&vara[5], 3) != 0)
abort ();
if (__builtin_object_size (&vara[0].a, 3) != sizeof (vara[0].a))

22
gcc/tree-object-size.c
View File

@ -751,7 +751,8 @@ alloc_object_size (const gcall *call, int object_size_type)
gcc_assert (is_gimple_call (call));
tree calltype;
if (tree callfn = gimple_call_fndecl (call))
tree callfn = gimple_call_fndecl (call);
if (callfn)
calltype = TREE_TYPE (callfn);
else
calltype = gimple_call_fntype (call);
@ -771,12 +772,13 @@ alloc_object_size (const gcall *call, int object_size_type)
if (TREE_CHAIN (p))
arg2 = TREE_INT_CST_LOW (TREE_VALUE (TREE_CHAIN (p)))-1;
}
else if (gimple_call_builtin_p (call, BUILT_IN_NORMAL)
&& callfn && ALLOCA_FUNCTION_CODE_P (DECL_FUNCTION_CODE (callfn)))
arg1 = 0;
if (arg1 < 0 || arg1 >= (int)gimple_call_num_args (call)
|| TREE_CODE (gimple_call_arg (call, arg1)) != INTEGER_CST
|| (arg2 >= 0
&& (arg2 >= (int)gimple_call_num_args (call)
|| TREE_CODE (gimple_call_arg (call, arg2)) != INTEGER_CST)))
/* Non-const arguments are OK here, let the caller handle constness. */
if (arg1 < 0 || arg1 >= (int) gimple_call_num_args (call)
|| arg2 >= (int) gimple_call_num_args (call))
return size_unknown (object_size_type);
tree bytes = NULL_TREE;
@ -787,7 +789,10 @@ alloc_object_size (const gcall *call, int object_size_type)
else if (arg1 >= 0)
bytes = fold_convert (sizetype, gimple_call_arg (call, arg1));
return bytes;
if (bytes)
return STRIP_NOPS (bytes);
return size_unknown (object_size_type);
}
@ -1242,6 +1247,9 @@ call_object_size (struct object_size_info *osi, tree ptr, gcall *call)
gcc_assert (osi->pass == 0);
tree bytes = alloc_object_size (call, object_size_type);
if (!(object_size_type & OST_DYNAMIC) && TREE_CODE (bytes) != INTEGER_CST)
bytes = size_unknown (object_size_type);
object_sizes_set (osi, varno, bytes, bytes);
}