summaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorkargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4>2005-06-18 17:59:31 +0000
committerkargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4>2005-06-18 17:59:31 +0000
commit3feaa17e413960a88bb8383a0fdf02540feefdc6 (patch)
treeecf4ea34b31a7564df53b3d834fa066846d72fd9 /gcc/fortran
parent8a202ac725ac1d74b6a4e620d51e6cb27a6e254d (diff)
downloadgcc-3feaa17e413960a88bb8383a0fdf02540feefdc6.tar.gz
* intrinsic.c (gfc_intrinsic_func_interface): Enable errors for generic
functions whose simplification routine return FAILURE. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101160 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/intrinsic.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index bcad19f20db..0b3d11755f4 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-18 Steven G. Kargl <kargls@comcast.net>
+
+ * intrinsic.c (gfc_intrinsic_func_interface): Enable errors for generic
+ functions whose simplification routine return FAILURE.
+
2005-06-13 Geoffrey Keating <geoffk@apple.com>
* Make-lang.in (fortran.install-man): Doesn't depend on installdirs.
diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c
index 66cf1902689..4d535287825 100644
--- a/gcc/fortran/intrinsic.c
+++ b/gcc/fortran/intrinsic.c
@@ -3007,16 +3007,13 @@ got_specific:
expr->value.function.isym = specific;
gfc_intrinsic_symbol (expr->symtree->n.sym);
+ gfc_suppress_error = 0;
if (do_simplify (specific, expr) == FAILURE)
- {
- gfc_suppress_error = 0;
- return MATCH_ERROR;
- }
+ return MATCH_ERROR;
/* TODO: We should probably only allow elemental functions here. */
flag |= (expr->ts.type != BT_INTEGER && expr->ts.type != BT_CHARACTER);
- gfc_suppress_error = 0;
if (pedantic && gfc_init_expr
&& flag && gfc_init_expr_extensions (specific))
{