[flang][OpenMP] Deprecation message for DESTROY with no argument #114988
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-semantics Author: Krzysztof Parzyszek (kparzysz) Changes[5.2:625:17] The syntax of the DESTROY clause on the DEPOBJ construct with no argument was deprecated. Full diff: https://github.com/llvm/llvm-project/pull/114988.diff 3 Files Affected:
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index 749d5887eaac07..e3fa3ea2b49a34 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -2648,11 +2648,21 @@ void OmpStructureChecker::Enter(const parser::OmpClause::Destroy &x) {
llvm::omp::Directive dir{GetContext().directive};
unsigned version{context_.langOptions().OpenMPVersion};
if (dir == llvm::omp::Directive::OMPD_depobj) {
- if (version < 52) {
- context_.Say(GetContext().clauseSource,
- "The object parameter in DESTROY clause in DEPOPJ construct "
- "was introduced in %s"_port_en_US,
- ThisVersion(52));
+ unsigned argSince{52}, noargDeprecatedIn{52};
+ if (x.v) {
+ if (version < argSince) {
+ context_.Say(GetContext().clauseSource,
+ "The object parameter in DESTROY clause on DEPOPJ construct "
+ "is not allowed in %s, %s"_warn_en_US,
+ ThisVersion(version), TryVersion(argSince));
+ }
+ } else {
+ if (version >= noargDeprecatedIn) {
+ context_.Say(GetContext().clauseSource,
+ "The DESTROY clause without argument on DEPOBJ construct "
+ "is deprecated in %s"_warn_en_US,
+ ThisVersion(noargDeprecatedIn));
+ }
}
}
}
diff --git a/flang/test/Semantics/OpenMP/depobj-construct-v50.f90 b/flang/test/Semantics/OpenMP/depobj-construct-v50.f90
index e7fa24d521b63b..e87d86ca54bee7 100644
--- a/flang/test/Semantics/OpenMP/depobj-construct-v50.f90
+++ b/flang/test/Semantics/OpenMP/depobj-construct-v50.f90
@@ -23,6 +23,6 @@ subroutine f02
subroutine f03
integer :: obj, jbo
!ERROR: The DESTROY clause must refer to the same object as the DEPOBJ construct
-!PORTABILITY: The object parameter in DESTROY clause in DEPOPJ construct was introduced in OpenMP v5.2
+!WARNING: The object parameter in DESTROY clause on DEPOPJ construct is not allowed in OpenMP v5.0, try -fopenmp-version=52
!$omp depobj(obj) destroy(jbo)
end
diff --git a/flang/test/Semantics/OpenMP/depobj-construct-v52.f90 b/flang/test/Semantics/OpenMP/depobj-construct-v52.f90
index f2e66485c6c801..6b695a30128ae9 100644
--- a/flang/test/Semantics/OpenMP/depobj-construct-v52.f90
+++ b/flang/test/Semantics/OpenMP/depobj-construct-v52.f90
@@ -13,3 +13,9 @@ subroutine f03
!ERROR: The DESTROY clause must refer to the same object as the DEPOBJ construct
!$omp depobj(obj) destroy(jbo)
end
+
+subroutine f06
+ integer :: obj
+!WARNING: The DESTROY clause without argument on DEPOBJ construct is deprecated in OpenMP v5.2
+ !$omp depobj(obj) destroy
+end
|
|
@llvm/pr-subscribers-flang-openmp Author: Krzysztof Parzyszek (kparzysz) Changes[5.2:625:17] The syntax of the DESTROY clause on the DEPOBJ construct with no argument was deprecated. Full diff: https://github.com/llvm/llvm-project/pull/114988.diff 3 Files Affected:
diff --git a/flang/lib/Semantics/check-omp-structure.cpp b/flang/lib/Semantics/check-omp-structure.cpp
index 749d5887eaac07..e3fa3ea2b49a34 100644
--- a/flang/lib/Semantics/check-omp-structure.cpp
+++ b/flang/lib/Semantics/check-omp-structure.cpp
@@ -2648,11 +2648,21 @@ void OmpStructureChecker::Enter(const parser::OmpClause::Destroy &x) {
llvm::omp::Directive dir{GetContext().directive};
unsigned version{context_.langOptions().OpenMPVersion};
if (dir == llvm::omp::Directive::OMPD_depobj) {
- if (version < 52) {
- context_.Say(GetContext().clauseSource,
- "The object parameter in DESTROY clause in DEPOPJ construct "
- "was introduced in %s"_port_en_US,
- ThisVersion(52));
+ unsigned argSince{52}, noargDeprecatedIn{52};
+ if (x.v) {
+ if (version < argSince) {
+ context_.Say(GetContext().clauseSource,
+ "The object parameter in DESTROY clause on DEPOPJ construct "
+ "is not allowed in %s, %s"_warn_en_US,
+ ThisVersion(version), TryVersion(argSince));
+ }
+ } else {
+ if (version >= noargDeprecatedIn) {
+ context_.Say(GetContext().clauseSource,
+ "The DESTROY clause without argument on DEPOBJ construct "
+ "is deprecated in %s"_warn_en_US,
+ ThisVersion(noargDeprecatedIn));
+ }
}
}
}
diff --git a/flang/test/Semantics/OpenMP/depobj-construct-v50.f90 b/flang/test/Semantics/OpenMP/depobj-construct-v50.f90
index e7fa24d521b63b..e87d86ca54bee7 100644
--- a/flang/test/Semantics/OpenMP/depobj-construct-v50.f90
+++ b/flang/test/Semantics/OpenMP/depobj-construct-v50.f90
@@ -23,6 +23,6 @@ subroutine f02
subroutine f03
integer :: obj, jbo
!ERROR: The DESTROY clause must refer to the same object as the DEPOBJ construct
-!PORTABILITY: The object parameter in DESTROY clause in DEPOPJ construct was introduced in OpenMP v5.2
+!WARNING: The object parameter in DESTROY clause on DEPOPJ construct is not allowed in OpenMP v5.0, try -fopenmp-version=52
!$omp depobj(obj) destroy(jbo)
end
diff --git a/flang/test/Semantics/OpenMP/depobj-construct-v52.f90 b/flang/test/Semantics/OpenMP/depobj-construct-v52.f90
index f2e66485c6c801..6b695a30128ae9 100644
--- a/flang/test/Semantics/OpenMP/depobj-construct-v52.f90
+++ b/flang/test/Semantics/OpenMP/depobj-construct-v52.f90
@@ -13,3 +13,9 @@ subroutine f03
!ERROR: The DESTROY clause must refer to the same object as the DEPOBJ construct
!$omp depobj(obj) destroy(jbo)
end
+
+subroutine f06
+ integer :: obj
+!WARNING: The DESTROY clause without argument on DEPOBJ construct is deprecated in OpenMP v5.2
+ !$omp depobj(obj) destroy
+end
|
[5.2:625:17] The syntax of the DESTROY clause on the DEPOBJ construct with no argument was deprecated.
kparzysz
force-pushed
the
users/kparzysz/depobp-destroy
branch
from
0eabb24 to
4aba4bf
Compare
kiranchandramohan
approved these changes
Nov 5, 2024
Comment on lines
2655
to
2664
| "The object parameter in DESTROY clause on DEPOPJ construct " | ||
| "is not allowed in %s, %s"_warn_en_US, | ||
| ThisVersion(version), TryVersion(argSince)); | ||
| } | ||
| } else { | ||
| if (version >= noargDeprecatedIn) { | ||
| context_.Say(GetContext().clauseSource, | ||
| "The DESTROY clause without argument on DEPOBJ construct " | ||
| "is deprecated in %s"_warn_en_US, | ||
| ThisVersion(noargDeprecatedIn)); |
There was a problem hiding this comment.
Nit: Consider putting on the same line if clang-format is OK to easily search error messages.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[5.2:625:17] The syntax of the DESTROY clause on the DEPOBJ construct with no argument was deprecated.