From 09e7f68631c07f882a1294d4f00c5cf19498786e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Schl=C3=BCter?=
<tobias.schlueter@physik.uni-muenchen.de>
Date: Wed, 11 May 2005 16:52:51 +0200
Subject: [PATCH] resolve.c (resolve_symbol): Copy 'pointer' and 'dimension'
attribute from result symbol to function symbol.
fortran/
* resolve.c (resolve_symbol): Copy 'pointer' and 'dimension'
attribute from result symbol to function symbol.
testsuite/
* gfortran.dg/func_result_2.f90: New test.
From-SVN: r99580
---
gcc/fortran/ChangeLog | 5 +++++
gcc/fortran/resolve.c | 2 ++
gcc/fortran/trans-expr.c | 2 +-
gcc/testsuite/ChangeLog | 4 ++++
gcc/testsuite/gfortran.dg/func_result_2.f90 | 10 ++++++++++
5 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gfortran.dg/func_result_2.f90
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index ee08d1fffb51..c5ae3929d48b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-11 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
+
+ * resolve.c (resolve_symbol): Copy 'pointer' and 'dimension'
+ attribute from result symbol to function symbol.
+
2005-05-10 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
PR fortran/20178
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 9b097fe9a15b..5f7a76a57a47 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -4061,6 +4061,8 @@ resolve_symbol (gfc_symbol * sym)
sym->ts = sym->result->ts;
sym->as = gfc_copy_array_spec (sym->result->as);
+ sym->attr.dimension = sym->result->attr.dimension;
+ sym->attr.pointer = sym->result->attr.pointer;
}
}
}
diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c
index 35c3f12883df..52a532d2408e 100644
--- a/gcc/fortran/trans-expr.c
+++ b/gcc/fortran/trans-expr.c
@@ -1288,7 +1288,7 @@ gfc_conv_function_call (gfc_se * se, gfc_symbol * sym,
if (!se->direct_byref)
{
- if (sym->result->attr.dimension)
+ if (sym->attr.dimension)
{
if (flag_bounds_check)
{
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 33a1e02c39b4..6e3cae14cc9e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-11 Tobias Schl"uter <tobias.schlueter@physik.uni-muenchen.de>
+
+ * gfortran.dg/func_result_2.f90: New test.
+
2005-05-11 Bud Davis <bdavis@gfortran.org>
* gfortran.dg/dev_null.f90: New test.
diff --git a/gcc/testsuite/gfortran.dg/func_result_2.f90 b/gcc/testsuite/gfortran.dg/func_result_2.f90
new file mode 100644
index 000000000000..2b457d9d44f6
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/func_result_2.f90
@@ -0,0 +1,10 @@
+! { dg-do run }
+! Character functions with a result clause were broken
+program testch
+ if (ch().ne."hello ") call abort()
+contains
+ function ch result(str)
+ character(len = 10) :: str
+ str ="hello"
+ end function ch
+end program testch
--
GitLab