diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-09-27 23:46:14 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2005-09-27 23:46:14 +0200 |
| commit | 57f0d086d592e6c9bb44c330939b9dda63d24934 (patch) | |
| tree | c3973b2ad4259e5ebeaafcea074d679fc6155edd /gcc | |
| parent | 93954fcc895e40418cecc5c0c1d35ef579ea204d (diff) | |
| download | gcc-57f0d086d592e6c9bb44c330939b9dda63d24934.zip gcc-57f0d086d592e6c9bb44c330939b9dda63d24934.tar.gz gcc-57f0d086d592e6c9bb44c330939b9dda63d24934.tar.bz2 | |
re PR fortran/18518 (equivalenced variables are not saved)
PR fortran/18518
* trans-common.c (build_equiv_decl): Add IS_SAVED argument.
If it is true, set TREE_STATIC on the decl.
(create_common): If any symbol in equivalence has SAVE attribute,
pass true as last argument to build_equiv_decl.
* gfortran.fortran-torture/execute/save_2.f90: New decl.
From-SVN: r104712
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/fortran/trans-common.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.fortran-torture/execute/save_2.f90 | 23 |
4 files changed, 45 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 2644f58..4334c3c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2005-09-27 Jakub Jelinek <jakub@redhat.com> + + PR fortran/18518 + * trans-common.c (build_equiv_decl): Add IS_SAVED argument. + If it is true, set TREE_STATIC on the decl. + (create_common): If any symbol in equivalence has SAVE attribute, + pass true as last argument to build_equiv_decl. + 2005-09-24 Janne Blomqvist <jblomqvi@cc.hut.fi> * trans-io.c (gfc_build_io_library_fndecls): Add entry diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c index 039d86d..de47f90 100644 --- a/gcc/fortran/trans-common.c +++ b/gcc/fortran/trans-common.c @@ -268,7 +268,7 @@ build_field (segment_info *h, tree union_type, record_layout_info rli) /* Get storage for local equivalence. */ static tree -build_equiv_decl (tree union_type, bool is_init) +build_equiv_decl (tree union_type, bool is_init, bool is_saved) { tree decl; char name[15]; @@ -286,7 +286,8 @@ build_equiv_decl (tree union_type, bool is_init) DECL_ARTIFICIAL (decl) = 1; DECL_IGNORED_P (decl) = 1; - if (!gfc_can_put_var_on_stack (DECL_SIZE_UNIT (decl))) + if (!gfc_can_put_var_on_stack (DECL_SIZE_UNIT (decl)) + || is_saved) TREE_STATIC (decl) = 1; TREE_ADDRESSABLE (decl) = 1; @@ -385,6 +386,7 @@ create_common (gfc_common_head *com, segment_info * head, bool saw_equiv) record_layout_info rli; tree decl; bool is_init = false; + bool is_saved = false; /* Declare the variables inside the common block. If the current common block contains any equivalence object, then @@ -410,13 +412,17 @@ create_common (gfc_common_head *com, segment_info * head, bool saw_equiv) /* Has initial value. */ if (s->sym->value) is_init = true; + + /* Has SAVE attribute. */ + if (s->sym->attr.save) + is_saved = true; } finish_record_layout (rli, true); if (com) decl = build_common_decl (com, union_type, is_init); else - decl = build_equiv_decl (union_type, is_init); + decl = build_equiv_decl (union_type, is_init, is_saved); if (is_init) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 61bf586..e6375b5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-09-27 Jakub Jelinek <jakub@redhat.com> + + PR fortran/18518 + * gfortran.fortran-torture/execute/save_2.f90: New decl. + 2005-09-27 Devang Patel <dpatel@apple.com> PR tree-optimization/23625 diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/save_2.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/save_2.f90 new file mode 100644 index 0000000..c3775bb --- /dev/null +++ b/gcc/testsuite/gfortran.fortran-torture/execute/save_2.f90 @@ -0,0 +1,23 @@ +! PR fortran/18518 + program main + call foo + call bar + call foo + end program main + + subroutine foo + integer i,g,h + data i/0/ + equivalence (g,h) + save g + if (i == 0) then + i = 1 + h = 12345 + end if + if (h .ne. 12345) call abort + end subroutine foo + + subroutine bar + integer a(10) + a = 34 + end subroutine bar |