Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-03 22:02:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[flang] Remove use of std::set::merge

Browse Source 
Some versions of clang that we are building with don't have
std::set::merge, even though it is part of C++17. Work around
that by using std::set::insert until we can count on merge being
available everywhere.

Original-commit: flang-compiler/f18@886ccc37fb
Reviewed-on: https://github.com/flang-compiler/f18/pull/1014
This commit is contained in:
Tim Keith 2020-02-22 11:47:04 -08:00
parent 42cc44fbc8
commit c875618506
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
flang/lib/Semantics/check-do-forall.cpp
View File

@ -763,13 +763,27 @@ private:
common::visitors{ common::visitors{
[&](const evaluate::Assignment::BoundsSpec &spec) { [&](const evaluate::Assignment::BoundsSpec &spec) {
for (const auto &bound : spec) { for (const auto &bound : spec) {
// TODO: this is working around missing std::set::merge in some versions of
// clang that we are building with
#ifdef __clang__
auto boundSymbols{evaluate::CollectSymbols(bound)};
symbols.insert(boundSymbols.begin(), boundSymbols.end());
#else
symbols.merge(evaluate::CollectSymbols(bound)); symbols.merge(evaluate::CollectSymbols(bound));
#endif
} }
}, },
[&](const evaluate::Assignment::BoundsRemapping &remapping) { [&](const evaluate::Assignment::BoundsRemapping &remapping) {
for (const auto &bounds : remapping) { for (const auto &bounds : remapping) {
#ifdef __clang__
auto lbSymbols{evaluate::CollectSymbols(bounds.first)};
symbols.insert(lbSymbols.begin(), lbSymbols.end());
auto ubSymbols{evaluate::CollectSymbols(bounds.second)};
symbols.insert(ubSymbols.begin(), ubSymbols.end());
#else
symbols.merge(evaluate::CollectSymbols(bounds.first)); symbols.merge(evaluate::CollectSymbols(bounds.first));
symbols.merge(evaluate::CollectSymbols(bounds.second)); symbols.merge(evaluate::CollectSymbols(bounds.second));
#endif
} }
}, },
[](const auto &) {}, [](const auto &) {},