diff options
| author | Mikael Morin <mikael@gcc.gnu.org> | 2011-11-04 00:14:58 +0000 |
|---|---|---|
| committer | Mikael Morin <mikael@gcc.gnu.org> | 2011-11-04 00:14:58 +0000 |
| commit | 93ee6382c7586e92cbc49fe217780c6d79eb8adb (patch) | |
| tree | 2e5e989c9334d7dec6fa0110ae26bf2b2ed1694f /gcc | |
| parent | 00b9bf8b7def3842e0c41376887aa41a9cec5bc0 (diff) | |
| download | gcc-93ee6382c7586e92cbc49fe217780c6d79eb8adb.zip gcc-93ee6382c7586e92cbc49fe217780c6d79eb8adb.tar.gz gcc-93ee6382c7586e92cbc49fe217780c6d79eb8adb.tar.bz2 | |
frontend-passes.c (cfe_register_funcs): Return early in the case of an inline intrinsic function.
* frontend-passes.c (cfe_register_funcs): Return early in the case
of an inline intrinsic function.
(optimize_binop_array_assignment): Skip optimization in the case of
an inline intrinsic function.
From-SVN: r180911
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/fortran/frontend-passes.c | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ed6a4df..6fca429 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,5 +1,12 @@ 2011-11-04 Mikael Morin <mikael@gcc.gnu.org> + * frontend-passes.c (cfe_register_funcs): Return early in the case + of an inline intrinsic function. + (optimize_binop_array_assignment): Skip optimization in the case of + an inline intrinsic function. + +2011-11-04 Mikael Morin <mikael@gcc.gnu.org> + * array.c (match_subscript): Skip whitespaces before setting locus. * matchexp.c (match_level_1): Ditto. diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index 5b1a644..a19f22d 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -203,8 +203,8 @@ cfe_register_funcs (gfc_expr **e, int *walk_subtrees ATTRIBUTE_UNUSED, /* Conversions are handled on the fly by the middle end, transpose during trans-* stages and TRANSFER by the middle end. */ if ((*e)->value.function.isym->id == GFC_ISYM_CONVERSION - || (*e)->value.function.isym->id == GFC_ISYM_TRANSPOSE - || (*e)->value.function.isym->id == GFC_ISYM_TRANSFER) + || (*e)->value.function.isym->id == GFC_ISYM_TRANSFER + || gfc_inline_intrinsic_function_p (*e)) return 0; /* Don't create an array temporary for elemental functions, @@ -567,7 +567,8 @@ optimize_binop_array_assignment (gfc_code *c, gfc_expr **rhs, bool seen_op) && ! (e->value.function.isym && (e->value.function.isym->elemental || e->ts.type != c->expr1->ts.type - || e->ts.kind != c->expr1->ts.kind))) + || e->ts.kind != c->expr1->ts.kind)) + && ! gfc_inline_intrinsic_function_p (e)) { gfc_code *n; |