diff options
| author | Richard Guenther <rguenther@suse.de> | 2011-05-19 10:45:26 +0000 |
|---|---|---|
| committer | Richard Guenther <rguenther@suse.de> | 2011-05-19 10:45:26 +0000 |
| commit | 93fbd106dcc85bec328d2b9b7ad88d4bd8f96fb1 (patch) | |
| tree | 5585ebe56b49c389bde1eddb7ee80e0ff227a9cf /gcc | |
| parent | 954b93035bc50affed90863c7315967f35bcd673 (diff) | |
2011-05-19 Richard Guenther <rguenther@suse.de>
PR middle-end/48985
* tree-object-size.c (addr_object_size): If the pointed-to
variable is a decl use DECL_SIZE_UNIT instead of TYPE_SIZE_UNIT.
* gcc.dg/builtin-object-size-11.c: New testcase.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@173901 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/builtin-object-size-11.c | 20 | ||||
| -rw-r--r-- | gcc/tree-object-size.c | 6 |
4 files changed, 37 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a653ae8442f..b03cc9bc4af 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2011-05-19 Richard Guenther <rguenther@suse.de> + PR middle-end/48985 + * tree-object-size.c (addr_object_size): If the pointed-to + variable is a decl use DECL_SIZE_UNIT instead of TYPE_SIZE_UNIT. + +2011-05-19 Richard Guenther <rguenther@suse.de> + * gimple.c (gimple_types_compatible_p_1): Compare names of the types themselves. (iterative_hash_gimple_type): And hash them that way. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f9defe50594..242a33b0283 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-05-19 Richard Guenther <rguenther@suse.de> + + PR middle-end/48985 + * gcc.dg/builtin-object-size-11.c: New testcase. + 2011-05-19 Tom de Vries <tom@codesourcery.com> PR target/45098 diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-11.c b/gcc/testsuite/gcc.dg/builtin-object-size-11.c new file mode 100644 index 00000000000..427b94d4335 --- /dev/null +++ b/gcc/testsuite/gcc.dg/builtin-object-size-11.c @@ -0,0 +1,20 @@ +/* PR48985 */ +/* { dg-do run } */ + +extern void abort (void); + +struct s { + int i; + char c[]; +} s = { 1, "01234" }; + +__SIZE_TYPE__ f (void) { return __builtin_object_size (&s.c, 0); } + +int +main() +{ + if (f() != sizeof ("01234")) + abort (); + + return 0; +} diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c index 043b445bf2e..41118d25b2e 100644 --- a/gcc/tree-object-size.c +++ b/gcc/tree-object-size.c @@ -205,6 +205,12 @@ addr_object_size (struct object_size_info *osi, const_tree ptr, pt_var_size = size_int (sz); } else if (pt_var + && DECL_P (pt_var) + && host_integerp (DECL_SIZE_UNIT (pt_var), 1) + && (unsigned HOST_WIDE_INT) + tree_low_cst (DECL_SIZE_UNIT (pt_var), 1) < offset_limit) + pt_var_size = DECL_SIZE_UNIT (pt_var); + else if (pt_var && (SSA_VAR_P (pt_var) || TREE_CODE (pt_var) == STRING_CST) && TYPE_SIZE_UNIT (TREE_TYPE (pt_var)) && host_integerp (TYPE_SIZE_UNIT (TREE_TYPE (pt_var)), 1) |