[flang-commits] [flang] 2d5ef39 - [flang] Apply the check for the constraint `C1172` to more stmts
Katherine Rasmussen via flang-commits
flang-commits at lists.llvm.org
Wed May 17 19:46:46 PDT 2023
Author: Katherine Rasmussen
Date: 2023-05-17T19:38:44-07:00
New Revision: 2d5ef39184a4f17d75b0cd640f442cc43fe7edfc
URL: https://github.com/llvm/llvm-project/commit/2d5ef39184a4f17d75b0cd640f442cc43fe7edfc
DIFF: https://github.com/llvm/llvm-project/commit/2d5ef39184a4f17d75b0cd640f442cc43fe7edfc.diff
LOG: [flang] Apply the check for the constraint `C1172` to more stmts
Apply the check for the constraint `C1172` to `unlock-stmt`,
`change-team-stmt`, `end-team-stmt`, and `critical-stmt`, which
all have `sync-stat-lists` and so `C1172` applies to them. Add
a test to check the `sync-stat-lists` for these 4 statements.
Reviewed By: PeteSteinfeld
Differential Revision: https://reviews.llvm.org/D150745
Added:
flang/test/Semantics/sync-stat-list.f90
Modified:
flang/lib/Semantics/check-coarray.cpp
flang/lib/Semantics/check-coarray.h
Removed:
################################################################################
diff --git a/flang/lib/Semantics/check-coarray.cpp b/flang/lib/Semantics/check-coarray.cpp
index 688c3a7c92adc..31fa3088d16bf 100644
--- a/flang/lib/Semantics/check-coarray.cpp
+++ b/flang/lib/Semantics/check-coarray.cpp
@@ -140,6 +140,11 @@ static void CheckEventVariable(
void CoarrayChecker::Leave(const parser::ChangeTeamStmt &x) {
CheckNamesAreDistinct(std::get<std::list<parser::CoarrayAssociation>>(x.t));
CheckTeamType(context_, std::get<parser::TeamValue>(x.t));
+ CheckSyncStatList(context_, std::get<std::list<parser::StatOrErrmsg>>(x.t));
+}
+
+void CoarrayChecker::Leave(const parser::EndChangeTeamStmt &x) {
+ CheckSyncStatList(context_, std::get<std::list<parser::StatOrErrmsg>>(x.t));
}
void CoarrayChecker::Leave(const parser::SyncAllStmt &x) {
@@ -227,6 +232,14 @@ void CoarrayChecker::Leave(const parser::EventWaitStmt &x) {
}
}
+void CoarrayChecker::Leave(const parser::UnlockStmt &x) {
+ CheckSyncStatList(context_, std::get<std::list<parser::StatOrErrmsg>>(x.t));
+}
+
+void CoarrayChecker::Leave(const parser::CriticalStmt &x) {
+ CheckSyncStatList(context_, std::get<std::list<parser::StatOrErrmsg>>(x.t));
+}
+
void CoarrayChecker::Leave(const parser::ImageSelector &imageSelector) {
haveStat_ = false;
haveTeam_ = false;
diff --git a/flang/lib/Semantics/check-coarray.h b/flang/lib/Semantics/check-coarray.h
index 51d030cbf7719..251ee980d8a52 100644
--- a/flang/lib/Semantics/check-coarray.h
+++ b/flang/lib/Semantics/check-coarray.h
@@ -16,7 +16,9 @@ namespace Fortran::parser {
class CharBlock;
class MessageFixedText;
struct ChangeTeamStmt;
+struct CriticalStmt;
struct CoarrayAssociation;
+struct EndChangeTeamStmt;
struct EventPostStmt;
struct EventWaitStmt;
struct FormTeamStmt;
@@ -25,6 +27,7 @@ struct SyncAllStmt;
struct SyncImagesStmt;
struct SyncMemoryStmt;
struct SyncTeamStmt;
+struct UnlockStmt;
} // namespace Fortran::parser
namespace Fortran::semantics {
@@ -33,12 +36,15 @@ class CoarrayChecker : public virtual BaseChecker {
public:
CoarrayChecker(SemanticsContext &context) : context_{context} {}
void Leave(const parser::ChangeTeamStmt &);
+ void Leave(const parser::EndChangeTeamStmt &);
void Leave(const parser::SyncAllStmt &);
void Leave(const parser::SyncImagesStmt &);
void Leave(const parser::SyncMemoryStmt &);
void Leave(const parser::SyncTeamStmt &);
void Leave(const parser::EventPostStmt &);
void Leave(const parser::EventWaitStmt &);
+ void Leave(const parser::UnlockStmt &);
+ void Leave(const parser::CriticalStmt &);
void Leave(const parser::ImageSelector &);
void Leave(const parser::FormTeamStmt &);
diff --git a/flang/test/Semantics/sync-stat-list.f90 b/flang/test/Semantics/sync-stat-list.f90
new file mode 100644
index 0000000000000..85a85f8224534
--- /dev/null
+++ b/flang/test/Semantics/sync-stat-list.f90
@@ -0,0 +1,126 @@
+! RUN: %python %S/test_errors.py %s %flang_fc1
+! There are sync-stat-lists in critical-stmt, sync-all-stmt,
+! sync-images-stmt, sync-memory-stmt, sync-team-stmt,
+! event-post-stmt, unlock-stmt, change-team-stmt, and end-change-team-stmt.
+!
+! Some of these statements have their sync-stat-lists tested in other tests.
+! This test contains the statements that do not, namely critical-stmt, unlock-stmt,
+! change-team-stmt, and end-change-team-stmt.
+
+program test_sync_stat_list
+ use iso_fortran_env, only: team_type, lock_type
+
+ implicit none
+
+ integer coarray[*], sync_status, non_scalar(2), superfluous_stat, coindexed_integer[*]
+ character(len=128) error_message, superfluous_errmsg, coindexed_character[*]
+ logical invalid_type
+ type(team_type) :: home
+ type(lock_type) :: latch
+
+ ! valid
+ change team (home, stat=sync_status, errmsg=error_message)
+ end team (stat=sync_status, errmsg=error_message)
+
+ !ERROR: Must be a scalar value, but is a rank-1 array
+ change team (home, stat=non_scalar, errmsg=error_message)
+ end team
+
+ !ERROR: Must have INTEGER type, but is LOGICAL(4)
+ change team (home, stat=invalid_type, errmsg=error_message)
+ end team
+
+ !ERROR: Must have CHARACTER type, but is LOGICAL(4)
+ change team (home, stat=sync_status, errmsg=invalid_type)
+ end team
+
+ change team (home)
+ !ERROR: Must be a scalar value, but is a rank-1 array
+ end team (stat=non_scalar, errmsg=error_message)
+
+ change team (home)
+ !ERROR: Must have INTEGER type, but is LOGICAL(4)
+ end team (stat=invalid_type, errmsg=error_message)
+
+ change team (home)
+ !ERROR: Must have CHARACTER type, but is LOGICAL(4)
+ end team (stat=sync_status, errmsg=invalid_type)
+
+ !ERROR: The stat-variable in a sync-stat-list may not be repeated
+ change team (home, stat=sync_status, errmsg=error_message, stat=superfluous_stat)
+ end team
+
+ !ERROR: The errmsg-variable in a sync-stat-list may not be repeated
+ change team (home, stat=sync_status, errmsg=error_message, errmsg=superfluous_errmsg)
+ end team
+
+ change team (home)
+ !ERROR: The stat-variable in a sync-stat-list may not be repeated
+ end team (stat=sync_status, errmsg=error_message, stat=superfluous_stat)
+
+ change team (home)
+ !ERROR: The errmsg-variable in a sync-stat-list may not be repeated
+ end team (stat=sync_status, errmsg=error_message, errmsg=superfluous_errmsg)
+
+ !ERROR: The stat-variable or errmsg-variable in a sync-stat-list may not be a coindexed object
+ !ERROR: The stat-variable or errmsg-variable in a sync-stat-list may not be a coindexed object
+ change team (home, stat=coindexed_integer[1], errmsg=coindexed_character[1])
+ end team
+
+ change team (home)
+ !ERROR: The stat-variable or errmsg-variable in a sync-stat-list may not be a coindexed object
+ !ERROR: The stat-variable or errmsg-variable in a sync-stat-list may not be a coindexed object
+ end team (stat=coindexed_integer[1], errmsg=coindexed_character[1])
+
+ ! valid
+ unlock (latch, stat=sync_status, errmsg=error_message)
+
+ !ERROR: Must be a scalar value, but is a rank-1 array
+ unlock (latch, stat=non_scalar, errmsg=error_message)
+
+ !ERROR: Must have INTEGER type, but is LOGICAL(4)
+ unlock (latch, stat=invalid_type, errmsg=error_message)
+
+ !ERROR: Must have CHARACTER type, but is LOGICAL(4)
+ unlock (latch, stat=sync_status, errmsg=invalid_type)
+
+ !ERROR: The stat-variable in a sync-stat-list may not be repeated
+ unlock (latch, stat=sync_status, stat=superfluous_stat)
+
+ !ERROR: The errmsg-variable in a sync-stat-list may not be repeated
+ unlock (latch, stat=sync_status, errmsg=error_message, errmsg=superfluous_errmsg)
+
+ !ERROR: The stat-variable or errmsg-variable in a sync-stat-list may not be a coindexed object
+ !ERROR: The stat-variable or errmsg-variable in a sync-stat-list may not be a coindexed object
+ unlock (latch, stat=coindexed_integer[1], errmsg=coindexed_character[1])
+
+ ! valid
+ critical (stat=sync_status, errmsg=error_message)
+ end critical
+
+ !ERROR: Must be a scalar value, but is a rank-1 array
+ critical (stat=non_scalar, errmsg=error_message)
+ end critical
+
+ !ERROR: Must have INTEGER type, but is LOGICAL(4)
+ critical (stat=invalid_type, errmsg=error_message)
+ end critical
+
+ !ERROR: Must have CHARACTER type, but is LOGICAL(4)
+ critical (stat=sync_status, errmsg=invalid_type)
+ end critical
+
+ !ERROR: The stat-variable in a sync-stat-list may not be repeated
+ critical (stat=sync_status, errmsg=error_message, stat=superfluous_stat)
+ end critical
+
+ !ERROR: The errmsg-variable in a sync-stat-list may not be repeated
+ critical (stat=sync_status, errmsg=error_message, errmsg=superfluous_errmsg)
+ end critical
+
+ !ERROR: The stat-variable or errmsg-variable in a sync-stat-list may not be a coindexed object
+ !ERROR: The stat-variable or errmsg-variable in a sync-stat-list may not be a coindexed object
+ critical (stat=coindexed_integer[1], errmsg=coindexed_character[1])
+ end critical
+
+end program test_sync_stat_list
More information about the flang-commits
mailing list