diff options
| author | Tobias Burnus <burnus@net-b.de> | 2011-06-08 08:28:41 +0200 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2011-06-08 08:28:41 +0200 |
| commit | 5493aa17a2da3923ee306b413ada64cc09549e74 (patch) | |
| tree | 2bbcfee69dbbc562c058ffd1078f6f90732ef100 /gcc/fortran/resolve.c | |
| parent | c2bbcb0db139ca738743376d429b0745a9b684d8 (diff) | |
| download | gcc-5493aa17a2da3923ee306b413ada64cc09549e74.zip gcc-5493aa17a2da3923ee306b413ada64cc09549e74.tar.gz gcc-5493aa17a2da3923ee306b413ada64cc09549e74.tar.bz2 | |
re PR fortran/18918 (Eventually support Fortran 2008's coarrays [co-arrays])
2011-06-08 Tobias Burnus <burnus@net-b.de>
PR fortran/18918
* gfortran.h (gfc_statement): Add ST_LOCK and ST_UNLOCK.
(gfc_exec_op): Add EXEC_LOCK and EXEC_UNLOCK.
(gfc_code): Add expr4.
* match.h (gfc_match_lock, gfc_match_unlock): New prototypes.
* match.c (gfc_match_lock, gfc_match_unlock,
lock_unlock_statement): New functions.
(sync_statement): Bug fix, avoiding double freeing.
(gfc_match_if): Handle LOCK/UNLOCK statement.
* parse.c (decode_statement, next_statement,
gfc_ascii_statement): Ditto.
* st.c (gfc_free_statement): Handle LOCK and UNLOCK.
* resolve.c (resolve_lock_unlock): New function.
(resolve_code): Call it.
* dump-parse-tree.c (show_code_node): Handle LOCK/UNLOCK.
* frontend-passes.c (gfc_code_walker): Optimize gfc_code's expr4.
2011-06-08 Tobias Burnus <burnus@net-b.de>
PR fortran/18918
* gfortran.dg/coarray_lock_1.f90: New.
* gfortran.dg/coarray_lock_2.f90: New.
From-SVN: r174796
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 6ca98f2..b2c3189 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -8199,6 +8199,40 @@ find_reachable_labels (gfc_code *block) static void +resolve_lock_unlock (gfc_code *code) +{ + /* FIXME: Add more lock-variable checks. For now, always reject it. + Note that ISO_FORTRAN_ENV's LOCK_TYPE is not yet available. */ + /* if (code->expr2->ts.type != BT_DERIVED + || code->expr2->rank != 0 + || code->expr2->expr_type != EXPR_VARIABLE) */ + gfc_error ("Lock variable at %L must be a scalar of type LOCK_TYPE", + &code->expr1->where); + + /* Check STAT. */ + if (code->expr2 + && (code->expr2->ts.type != BT_INTEGER || code->expr2->rank != 0 + || code->expr2->expr_type != EXPR_VARIABLE)) + gfc_error ("STAT= argument at %L must be a scalar INTEGER variable", + &code->expr2->where); + + /* Check ERRMSG. */ + if (code->expr3 + && (code->expr3->ts.type != BT_CHARACTER || code->expr3->rank != 0 + || code->expr3->expr_type != EXPR_VARIABLE)) + gfc_error ("ERRMSG= argument at %L must be a scalar CHARACTER variable", + &code->expr3->where); + + /* Check ACQUIRED_LOCK. */ + if (code->expr4 + && (code->expr4->ts.type != BT_LOGICAL || code->expr4->rank != 0 + || code->expr4->expr_type != EXPR_VARIABLE)) + gfc_error ("ACQUIRED_LOCK= argument at %L must be a scalar LOGICAL " + "variable", &code->expr4->where); +} + + +static void resolve_sync (gfc_code *code) { /* Check imageset. The * case matches expr1 == NULL. */ @@ -9065,6 +9099,11 @@ resolve_code (gfc_code *code, gfc_namespace *ns) resolve_sync (code); break; + case EXEC_LOCK: + case EXEC_UNLOCK: + resolve_lock_unlock (code); + break; + case EXEC_ENTRY: /* Keep track of which entry we are up to. */ current_entry_id = code->ext.entry->id; |