From 29c94e65e1be846e8a71a3d24450c4cf1d1d5b41 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 6 May 2016 09:47:25 +0000 Subject: [PATCH] re PR sanitizer/70875 (ICE in get_ubsan_type_info_for_type with -fsanitize=undefined) PR sanitizer/70875 * ubsan.c (get_ubsan_type_info_for_type): Remove assert. * gcc.dg/ubsan/bounds-3.c: New test. From-SVN: r235951 --- gcc/ChangeLog | 5 +++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/ubsan/bounds-3.c | 22 ++++++++++++++++++++++ gcc/ubsan.c | 1 - 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/ubsan/bounds-3.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 951ae2cc5dc..1c6c42ca523 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-05-06 Marek Polacek + + PR sanitizer/70875 + * ubsan.c (get_ubsan_type_info_for_type): Remove assert. + 2016-05-06 Oleg Endo PR target/54089 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 17773ced6cf..aaf3e00c017 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-05-06 Marek Polacek + + PR sanitizer/70875 + * gcc.dg/ubsan/bounds-3.c: New test. + 2016-05-06 Oleg Endo PR target/54089 diff --git a/gcc/testsuite/gcc.dg/ubsan/bounds-3.c b/gcc/testsuite/gcc.dg/ubsan/bounds-3.c new file mode 100644 index 00000000000..50ad67389f8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/ubsan/bounds-3.c @@ -0,0 +1,22 @@ +/* PR sanitizer/70875 */ +/* { dg-do run } */ +/* { dg-options "-fsanitize=bounds" } */ + +int +foo (int n, int k) +{ + struct S + { + int i[n]; + int value; + } s[2]; + return s[k].value = 0; +} + +int +main () +{ + return foo (2, 2); +} + +/* { dg-output "index 2 out of bounds for type 'S \\\[2\\\]'" } */ diff --git a/gcc/ubsan.c b/gcc/ubsan.c index 802341e9995..c5543f821d8 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -302,7 +302,6 @@ ubsan_source_location (location_t loc) static unsigned short get_ubsan_type_info_for_type (tree type) { - gcc_assert (TYPE_SIZE (type) && tree_fits_uhwi_p (TYPE_SIZE (type))); if (TREE_CODE (type) == REAL_TYPE) return tree_to_uhwi (TYPE_SIZE (type)); else if (INTEGRAL_TYPE_P (type)) -- 2.30.2