Handle non-constant expressions in GIMPLE_CALL arguments. Also handle
alloca.
gcc/ChangeLog:
* 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:
* 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
---
Changes since v4:
- Free allocations in tests.
.../gcc.dg/builtin-dynamic-object-size-0.c| 251 +-
gcc/testsuite/gcc.dg/builtin-object-size-1.c | 7 +
gcc/testsuite/gcc.dg/builtin-object-size-2.c | 14 +
gcc/testsuite/gcc.dg/builtin-object-size-3.c | 7 +
gcc/testsuite/gcc.dg/builtin-object-size-4.c | 14 +
gcc/tree-object-size.c| 22 +-
6 files changed, 307 insertions(+), 8 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 7616ffa4cf0..d67cf4a3c07 100644
--- a/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c
+++ b/gcc/testsuite/gcc.dg/builtin-dynamic-object-size-0.c
@@ -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,95 @@ 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_siz
