diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fold-const.c | 3 | ||||
| -rw-r--r-- | gcc/fold-const.h | 2 | ||||
| -rw-r--r-- | gcc/stor-layout.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/pr60226.c | 14 |
6 files changed, 34 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1e06ded..edf3dc1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2014-07-08 Marek Polacek <polacek@redhat.com> + + PR c/60226 + * fold-const.c (round_up_loc): Change the parameter type. + Remove assert. + * fold-const.h (round_up_loc): Adjust declaration. + * stor-layout.c (finalize_record_size): Check for too large types. + 2014-07-07 Jan Hubicka <hubicka@ucw.cz> * symtab.c: Include calls.h diff --git a/gcc/fold-const.c b/gcc/fold-const.c index d22eac1..c57ac7b 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -16647,11 +16647,10 @@ fold_ignored_result (tree t) /* Return the value of VALUE, rounded up to a multiple of DIVISOR. */ tree -round_up_loc (location_t loc, tree value, int divisor) +round_up_loc (location_t loc, tree value, unsigned int divisor) { tree div = NULL_TREE; - gcc_assert (divisor > 0); if (divisor == 1) return value; diff --git a/gcc/fold-const.h b/gcc/fold-const.h index dcb97a1..3b5fd84 100644 --- a/gcc/fold-const.h +++ b/gcc/fold-const.h @@ -144,7 +144,7 @@ extern tree combine_comparisons (location_t, enum tree_code, enum tree_code, extern void debug_fold_checksum (const_tree); extern bool may_negate_without_overflow_p (const_tree); #define round_up(T,N) round_up_loc (UNKNOWN_LOCATION, T, N) -extern tree round_up_loc (location_t, tree, int); +extern tree round_up_loc (location_t, tree, unsigned int); #define round_down(T,N) round_down_loc (UNKNOWN_LOCATION, T, N) extern tree round_down_loc (location_t, tree, int); extern tree size_int_kind (HOST_WIDE_INT, enum size_type_kind); diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index cfd436f..19e7adb 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -1587,6 +1587,11 @@ finalize_record_size (record_layout_info rli) unpadded_size_unit = size_binop (PLUS_EXPR, unpadded_size_unit, size_one_node); + if (TREE_CODE (unpadded_size_unit) == INTEGER_CST + && !TREE_OVERFLOW (unpadded_size_unit) + && !valid_constant_size_p (unpadded_size_unit)) + error ("type %qT is too large", rli->t); + /* Round the size up to be a multiple of the required alignment. */ TYPE_SIZE (rli->t) = round_up (unpadded_size, TYPE_ALIGN (rli->t)); TYPE_SIZE_UNIT (rli->t) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2b5e354..9940e72 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-07-08 Marek Polacek <polacek@redhat.com> + + PR c/60226 + * c-c++-common/pr60226.c: New test. + 2014-07-07 Paul Thomas <pault@gcc.gnu.org> PR fortran/61459 diff --git a/gcc/testsuite/c-c++-common/pr60226.c b/gcc/testsuite/c-c++-common/pr60226.c new file mode 100644 index 0000000..3a1c261 --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr60226.c @@ -0,0 +1,14 @@ +/* PR c/60226 */ +/* { dg-do compile } */ +/* { dg-options "-Wno-c++-compat" { target c } } */ + +typedef int __attribute__ ((aligned (1 << 28))) int28; +int28 foo[4] = {}; /* { dg-error "alignment of array elements is greater than element size" } */ +typedef int __attribute__ ((aligned (1 << 29))) int29; /* { dg-error "requested alignment is too large" } */ + +void +f (void) +{ + struct { __attribute__((aligned (1 << 28))) double a; } x1; + struct { __attribute__((aligned (1 << 29))) double a; } x2; /* { dg-error "requested alignment is too large" } */ +} |