-
Notifications
You must be signed in to change notification settings - Fork 11.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[flang] Remove GCC 7.2 workarounds #73574
Merged
Merged
Conversation
This file contains 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
Flang issues not falling into any other category
flang:semantics
labels
Nov 27, 2023
@llvm/pr-subscribers-flang-semantics Author: Brad Smith (brad0) ChangesThe minimum GCC version was bumped from 7.1 to 7.4 so garbage collect https://reviews.llvm.org/D156286 Full diff: https://github.com/llvm/llvm-project/pull/73574.diff 2 Files Affected:
diff --git a/flang/lib/Evaluate/variable.cpp b/flang/lib/Evaluate/variable.cpp
index 29483b103054c83..b184240a7423246 100644
--- a/flang/lib/Evaluate/variable.cpp
+++ b/flang/lib/Evaluate/variable.cpp
@@ -568,12 +568,6 @@ template <typename T> BaseObject Designator<T>::GetBaseObject() const {
[](SymbolRef symbol) { return BaseObject{symbol}; },
[](const Substring &sstring) { return sstring.GetBaseObject(); },
[](const auto &x) {
-#if !__clang__ && __GNUC__ == 7 && __GNUC_MINOR__ == 2
- if constexpr (std::is_same_v<std::decay_t<decltype(x)>,
- Substring>) {
- return x.GetBaseObject();
- } else
-#endif
return BaseObject{x.GetFirstSymbol()};
},
},
@@ -586,12 +580,6 @@ template <typename T> const Symbol *Designator<T>::GetLastSymbol() const {
[](SymbolRef symbol) { return &*symbol; },
[](const Substring &sstring) { return sstring.GetLastSymbol(); },
[](const auto &x) {
-#if !__clang__ && __GNUC__ == 7 && __GNUC_MINOR__ == 2
- if constexpr (std::is_same_v<std::decay_t<decltype(x)>,
- Substring>) {
- return x.GetLastSymbol();
- } else
-#endif
return &x.GetLastSymbol();
},
},
diff --git a/flang/lib/Semantics/symbol.cpp b/flang/lib/Semantics/symbol.cpp
index 2ce8e83e4771467..2eae96af0623d7b 100644
--- a/flang/lib/Semantics/symbol.cpp
+++ b/flang/lib/Semantics/symbol.cpp
@@ -736,19 +736,7 @@ std::string GenericKind::ToString() const {
common::visitors {
[](const OtherKind &x) { return std::string{EnumToString(x)}; },
[](const common::DefinedIo &x) { return AsFortran(x).ToString(); },
-#if !__clang__ && __GNUC__ == 7 && __GNUC_MINOR__ == 2
- [](const common::NumericOperator &x) {
- return std::string{common::EnumToString(x)};
- },
- [](const common::LogicalOperator &x) {
- return std::string{common::EnumToString(x)};
- },
- [](const common::RelationalOperator &x) {
- return std::string{common::EnumToString(x)};
- },
-#else
[](const auto &x) { return std::string{common::EnumToString(x)}; },
-#endif
},
u);
}
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
brad0
force-pushed
the
flang_gcc_7.2_workaround
branch
from
November 27, 2023 22:38
7d818d5
to
b326f5e
Compare
The minimum GCC version was bumped from 7.1 to 7.4 so garbage collect the 7.2 workarounds. https://reviews.llvm.org/D156286
brad0
force-pushed
the
flang_gcc_7.2_workaround
branch
from
November 28, 2023 02:58
b326f5e
to
95ed284
Compare
Ping. |
kparzysz
approved these changes
Dec 2, 2023
klausler
approved these changes
Dec 4, 2023
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.
The minimum GCC version was bumped from 7.1 to 7.4 so garbage collect
the 7.2 workarounds.
https://reviews.llvm.org/D156286