diff options
| author | Jason Merrill <jason@redhat.com> | 2009-11-04 18:13:23 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-11-04 18:13:23 -0500 |
| commit | e3503aa8cfe91752b629f6e2a1d52736a21208dc (patch) | |
| tree | 4c2a6d72e4c8f0bf639cd10cf3a74ce69904c0f4 /gcc | |
| parent | f4ecc8fd6b67ce601991e0f59a226bb5a18bed16 (diff) | |
| download | gcc-e3503aa8cfe91752b629f6e2a1d52736a21208dc.zip gcc-e3503aa8cfe91752b629f6e2a1d52736a21208dc.tar.gz gcc-e3503aa8cfe91752b629f6e2a1d52736a21208dc.tar.bz2 | |
re PR c++/36912 (ICE with "-frounding-math -g")
PR c++/36912
* varasm.c (initializer_constant_valid_p): A PLUS_EXPR
or MINUS_EXPR of REAL_TYPE is not a valid constant initializer.
(output_constant): Avoid crash after error.
From-SVN: r153921
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/init/static-init2.C | 3 | ||||
| -rw-r--r-- | gcc/varasm.c | 10 |
4 files changed, 23 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 38a62e2..4d7fe5f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2009-11-04 Jason Merrill <jason@redhat.com> + + PR c++/36912 + * varasm.c (initializer_constant_valid_p): A PLUS_EXPR + or MINUS_EXPR of REAL_TYPE is not a valid constant initializer. + (output_constant): Avoid crash after error. + 2009-11-04 Eric Botcazou <ebotcazou@adacore.com> PR target/10127 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 61f8450..b65593e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2009-11-04 Jason Merrill <jason@redhat.com> + PR c++/36912 + * g++.dg/init/static-init2.C: New. + +2009-11-04 Jason Merrill <jason@redhat.com> + PR c++/39413 * g++.dg/template/overload11.C: New. * g++.dg/template/nested3.C: Adjust. diff --git a/gcc/testsuite/g++.dg/init/static-init2.C b/gcc/testsuite/g++.dg/init/static-init2.C new file mode 100644 index 0000000..34bf2b2 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/static-init2.C @@ -0,0 +1,3 @@ +// PR c++/36912 +// { dg-options -frounding-math } +const double c = .1, d = c+1; diff --git a/gcc/varasm.c b/gcc/varasm.c index b6ff4ae..c9953d1 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -4322,6 +4322,10 @@ initializer_constant_valid_p (tree value, tree endtype) case POINTER_PLUS_EXPR: case PLUS_EXPR: + /* Any valid floating-point constants will have been folded by now; + with -frounding-math we hit this with addition of two constants. */ + if (TREE_CODE (endtype) == REAL_TYPE) + return NULL_TREE; if (! INTEGRAL_TYPE_P (endtype) || TYPE_PRECISION (endtype) >= int_or_pointer_precision (TREE_TYPE (value))) @@ -4345,6 +4349,8 @@ initializer_constant_valid_p (tree value, tree endtype) break; case MINUS_EXPR: + if (TREE_CODE (endtype) == REAL_TYPE) + return NULL_TREE; if (! INTEGRAL_TYPE_P (endtype) || TYPE_PRECISION (endtype) >= int_or_pointer_precision (TREE_TYPE (value))) @@ -4560,8 +4566,8 @@ output_constant (tree exp, unsigned HOST_WIDE_INT size, unsigned int align) case REAL_TYPE: if (TREE_CODE (exp) != REAL_CST) error ("initializer for floating value is not a floating constant"); - - assemble_real (TREE_REAL_CST (exp), TYPE_MODE (TREE_TYPE (exp)), align); + else + assemble_real (TREE_REAL_CST (exp), TYPE_MODE (TREE_TYPE (exp)), align); break; case COMPLEX_TYPE: |