diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-11-24 08:35:10 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2017-11-24 08:35:10 +0000 |
| commit | ad888f7b2aa46f61949df0680cb49c20c193656b (patch) | |
| tree | 3a4e2f0ac43fd6daf365662ac82800c3ccd775db | |
| parent | ccd8bd8032bf47a4ed9aad45e72ff15f18a38d55 (diff) | |
PR sanitizer/83014
* ubsan.c (ubsan_type_descriptor): Use pp_unsigned_wide_integer
instead of pp_printf with HOST_WIDE_INT_PRINT_DEC. Avoid calling
tree_to_uhwi twice.
* gcc.dg/ubsan/pr83014.c: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@255134 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/ubsan/pr83014.c | 12 | ||||
| -rw-r--r-- | gcc/ubsan.c | 6 |
4 files changed, 23 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 787e545949e..8f34f37b365 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2017-11-24 Jakub Jelinek <jakub@redhat.com> + PR sanitizer/83014 + * ubsan.c (ubsan_type_descriptor): Use pp_unsigned_wide_integer + instead of pp_printf with HOST_WIDE_INT_PRINT_DEC. Avoid calling + tree_to_uhwi twice. + * tree-object-size.c (pass_through_call): Use gimple_call_return_flags ERF_RETURN*ARG* for builtins other than BUILT_IN_ASSUME_ALIGNED, check for the latter with gimple_call_builtin_p. Do not handle diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 480a5c637ff..eef79af85a4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2017-11-24 Jakub Jelinek <jakub@redhat.com> + PR sanitizer/83014 + * gcc.dg/ubsan/pr83014.c: New test. + * gcc.dg/builtin-object-size-18.c: New test. 2017-11-23 Julia Koval <julia.koval@intel.com> diff --git a/gcc/testsuite/gcc.dg/ubsan/pr83014.c b/gcc/testsuite/gcc.dg/ubsan/pr83014.c new file mode 100644 index 00000000000..de626043cc6 --- /dev/null +++ b/gcc/testsuite/gcc.dg/ubsan/pr83014.c @@ -0,0 +1,12 @@ +/* PR sanitizer/83014 */ +/* { dg-do compile } */ +/* { dg-options "-fsanitize=undefined" } */ + +int +foo (void) +{ + int data[5]; + data[0] = 0; + data[5] = 0; + return data[0]; +} diff --git a/gcc/ubsan.c b/gcc/ubsan.c index 560d4654850..efde3f7bc36 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -436,10 +436,10 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) && TYPE_MAX_VALUE (dom) != NULL_TREE && TREE_CODE (TYPE_MAX_VALUE (dom)) == INTEGER_CST) { + unsigned HOST_WIDE_INT m; if (tree_fits_uhwi_p (TYPE_MAX_VALUE (dom)) - && tree_to_uhwi (TYPE_MAX_VALUE (dom)) + 1 != 0) - pp_printf (&pretty_name, HOST_WIDE_INT_PRINT_DEC, - tree_to_uhwi (TYPE_MAX_VALUE (dom)) + 1); + && (m = tree_to_uhwi (TYPE_MAX_VALUE (dom))) + 1 != 0) + pp_unsigned_wide_integer (&pretty_name, m + 1); else pp_wide_int (&pretty_name, wi::add (wi::to_widest (TYPE_MAX_VALUE (dom)), 1), |