OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trans-const.c (gfc_conv_const): Fix typo in comment. 

2009-11-21  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	* trans-const.c (gfc_conv_const): Fix typo in comment. Replace assert
	with error message if not constant.
	* resolve.c (next_data_value): Delete check for constant.

From-SVN: r154418
This commit is contained in:
Jerry DeLisle 2009-11-22 01:59:16 +00:00
parent fd829514a5
commit 9d3d3f1078
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/fortran/ChangeLog
View File

@ -1,3 +1,9 @@
2009-11-21 Jerry DeLisle <jvdelisle@gcc.gnu.org>
* trans-const.c (gfc_conv_const): Fix typo in comment. Replace assert
with error message if not constant.
* resolve.c (next_data_value): Delete check for constant.
2009-11-20 Janus Weil <janus@gcc.gnu.org>
* intrinsic.texi (C_F_PROCPOINTER): Remove obsolete comment.

3
gcc/fortran/resolve.c
View File

@ -11083,9 +11083,6 @@ next_data_value (void)
{
while (mpz_cmp_ui (values.left, 0) == 0)
{
if (!gfc_is_constant_expr (values.vnode->expr))
gfc_error ("non-constant DATA value at %L",
&values.vnode->expr->where);
if (values.vnode->next == NULL)
return FAILURE;

8
gcc/fortran/trans-const.c
View File

@ -340,7 +340,7 @@ void
gfc_conv_constant (gfc_se * se, gfc_expr * expr)
{
/* We may be receiving an expression for C_NULL_PTR or C_NULL_FUNPTR. If
so, they expr_type will not yet be an EXPR_CONSTANT. We need to make
so, the expr_type will not yet be an EXPR_CONSTANT. We need to make
it so here. */
if (expr->ts.type == BT_DERIVED && expr->ts.u.derived
&& expr->ts.u.derived->attr.is_iso_c)
@ -353,7 +353,11 @@ gfc_conv_constant (gfc_se * se, gfc_expr * expr)
}
}
gcc_assert (expr->expr_type == EXPR_CONSTANT);
if (expr->expr_type != EXPR_CONSTANT)
{
gfc_error ("non-constant initialization expression at %L", &expr->where);
return;
}
if (se->ss != NULL)
{