diff options
| author | Marek Polacek <polacek@redhat.com> | 2013-09-20 13:26:07 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2013-09-20 13:26:07 +0000 |
| commit | a54300190578a207d66e7db8931eabe936261c14 (patch) | |
| tree | 5dab4fb0ea472e947375cbd9033b08eac91e3add /gcc | |
| parent | 9fed7f3aa8f85b8658a081a0342b3a12d8107afa (diff) | |
| download | gcc-a54300190578a207d66e7db8931eabe936261c14.zip gcc-a54300190578a207d66e7db8931eabe936261c14.tar.gz gcc-a54300190578a207d66e7db8931eabe936261c14.tar.bz2 | |
re PR sanitizer/58413 (ubsan constant folding)
2013-09-20 Marek Polacek <polacek@redhat.com>
PR sanitizer/58413
* ubsan.c (get_ubsan_type_info_for_type): Use TYPE_SIZE instead of
TYPE_PRECISION. Add asserts.
testsuite/
* c-c++-common/ubsan/shift-4.c: New test.
From-SVN: r202776
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/ubsan/shift-4.c | 14 | ||||
| -rw-r--r-- | gcc/ubsan.c | 7 |
4 files changed, 28 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e4e4a69..2e50e73 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-09-20 Marek Polacek <polacek@redhat.com> + + PR sanitizer/58413 + * ubsan.c (get_ubsan_type_info_for_type): Use TYPE_SIZE instead of + TYPE_PRECISION. Add asserts. + 2013-09-20 Richard Biener <rguenther@suse.de> PR tree-optimization/58453 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8d287f1..f341632 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-09-20 Marek Polacek <polacek@redhat.com> + + PR sanitizer/58413 + * c-c++-common/ubsan/shift-4.c: New test. + 2013-09-20 Richard Biener <rguenther@suse.de> PR tree-optimization/58453 diff --git a/gcc/testsuite/c-c++-common/ubsan/shift-4.c b/gcc/testsuite/c-c++-common/ubsan/shift-4.c new file mode 100644 index 0000000..239c013 --- /dev/null +++ b/gcc/testsuite/c-c++-common/ubsan/shift-4.c @@ -0,0 +1,14 @@ +/* { dg-do run } */ +/* { dg-options "-fsanitize=shift -w" } */ + +struct S { unsigned long long int b:40; } s; + +int +main () +{ + s.b = 2; + s.b <<= 120; + return 0; +} + +/* { dg-output "shift exponent 120 is too large\[^\n\r]*(\n|\r\n|\r)" } */ diff --git a/gcc/ubsan.c b/gcc/ubsan.c index b8d40d5..6c6fea8 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -233,10 +233,9 @@ ubsan_source_location (location_t loc) static unsigned short get_ubsan_type_info_for_type (tree type) { - int prec = exact_log2 (TYPE_PRECISION (type)); - if (prec == -1) - error ("unexpected size of type %qT", type); - + gcc_assert (TYPE_SIZE (type) && host_integerp (TYPE_SIZE (type), 1)); + int prec = exact_log2 (tree_low_cst (TYPE_SIZE (type), 1)); + gcc_assert (prec != -1); return (prec << 1) | !TYPE_UNSIGNED (type); } |