aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorTobias Burnus <burnus@net-b.de>2008-09-25 17:01:16 +0200
committerTobias Burnus <burnus@gcc.gnu.org>2008-09-25 17:01:16 +0200
commit3dcc3ef2a12a9e0965dd80d7c32a26bda892d861 (patch)
tree865291e5e807cb4b828220df3729141d099a64a7 /gcc/fortran
parent116612b99423703dfdb01a531e42d1444af75e14 (diff)
downloadgcc-3dcc3ef2a12a9e0965dd80d7c32a26bda892d861.zip
gcc-3dcc3ef2a12a9e0965dd80d7c32a26bda892d861.tar.gz
gcc-3dcc3ef2a12a9e0965dd80d7c32a26bda892d861.tar.bz2
re PR fortran/37504 (Wrongly rejects: unprotected_pointer => protected_pointer)
2008-09-25 Tobias Burnus <burnus@net-b.de> PR fortran/37504 * expr.c (gfc_check_pointer_assign): Allow assignment of protected pointers. * match.c (gfc_match_assignment,gfc_match_pointer_assignment): Remove unreachable code. 2008-09-25 Tobias Burnus <burnus@net-b.de> PR fortran/37504 * gfortran.dg/protected_7.f90: New test. From-SVN: r140663
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog8
-rw-r--r--gcc/fortran/expr.c3
-rw-r--r--gcc/fortran/match.c17
3 files changed, 10 insertions, 18 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c8301f6..16ed9e9 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-25 Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/37504
+ * expr.c (gfc_check_pointer_assign): Allow assignment of
+ protected pointers.
+ * match.c (gfc_match_assignment,gfc_match_pointer_assignment):
+ Remove unreachable code.
+
2008-09-24 Tobias Burnus <burnus@net-b.de>
* options.c (set_default_std_flags,gfc_init_options):
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index e15412a..7b741b8 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -3076,7 +3076,8 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue)
return FAILURE;
}
- if (attr.is_protected && attr.use_assoc)
+ if (attr.is_protected && attr.use_assoc
+ && !(attr.pointer || attr.proc_pointer))
{
gfc_error ("Pointer assignment target has PROTECTED "
"attribute at %L", &rvalue->where);
diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c
index f7ff9bb..c8fd30d 100644
--- a/gcc/fortran/match.c
+++ b/gcc/fortran/match.c
@@ -1293,15 +1293,6 @@ gfc_match_assignment (void)
return MATCH_NO;
}
- if (lvalue->symtree->n.sym->attr.is_protected
- && lvalue->symtree->n.sym->attr.use_assoc)
- {
- gfc_current_locus = old_loc;
- gfc_free_expr (lvalue);
- gfc_error ("Setting value of PROTECTED variable at %C");
- return MATCH_ERROR;
- }
-
rvalue = NULL;
m = gfc_match (" %e%t", &rvalue);
if (m != MATCH_YES)
@@ -1353,14 +1344,6 @@ gfc_match_pointer_assignment (void)
if (m != MATCH_YES)
goto cleanup;
- if (lvalue->symtree->n.sym->attr.is_protected
- && lvalue->symtree->n.sym->attr.use_assoc)
- {
- gfc_error ("Assigning to a PROTECTED pointer at %C");
- m = MATCH_ERROR;
- goto cleanup;
- }
-
new_st.op = EXEC_POINTER_ASSIGN;
new_st.expr = lvalue;
new_st.expr2 = rvalue;