aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/trans-const.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a29a34c..e2eadb2 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,10 @@
2009-11-26 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+ PR fortran/41807
+ * trans-const.c (gfc_conv_const): Set se->expr to a constant on error.
+
+2009-11-26 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+
PR fortran/41278
* trans-array.c (gfc_conv_array_transpose): Delete unnecessary assert.
diff --git a/gcc/fortran/trans-const.c b/gcc/fortran/trans-const.c
index e2cd40b..7452088 100644
--- a/gcc/fortran/trans-const.c
+++ b/gcc/fortran/trans-const.c
@@ -356,6 +356,7 @@ gfc_conv_constant (gfc_se * se, gfc_expr * expr)
if (expr->expr_type != EXPR_CONSTANT)
{
gfc_error ("non-constant initialization expression at %L", &expr->where);
+ se->expr = gfc_conv_constant_to_tree (gfc_int_expr (0));
return;
}