FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR middle-end/60226 (ICE initializing array of elements with too large alignment)

Browse source 
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.

	* c-c++-common/pr60226.c: New test.

From-SVN: r212346
This commit is contained in:
Marek Polacek 2014-07-08 05:38:12 +00:00 • committed by Marek Polacek
parent 09aa4b1fac
commit 605f12f4dc
6 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/ChangeLog
View file

@ -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

3
gcc/fold-const.c
View file

@ -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;

2
gcc/fold-const.h
View file

@ -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);

5
gcc/stor-layout.c
View file

@ -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)

5
gcc/testsuite/ChangeLog
View file

@ -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

14
gcc/testsuite/c-c++-common/pr60226.c Normal file
View file

@ -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" } */
}