aboutsummaryrefslogtreecommitdiff
path: root/gcc/varasm.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2009-11-04 18:13:23 -0500
committerJason Merrill <jason@gcc.gnu.org>2009-11-04 18:13:23 -0500
commite3503aa8cfe91752b629f6e2a1d52736a21208dc (patch)
tree4c2a6d72e4c8f0bf639cd10cf3a74ce69904c0f4 /gcc/varasm.c
parentf4ecc8fd6b67ce601991e0f59a226bb5a18bed16 (diff)
downloadgcc-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/varasm.c')
-rw-r--r--gcc/varasm.c10
1 files changed, 8 insertions, 2 deletions
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: