diff options
| author | Ryan Prichard <rprichard@google.com> | 2023-09-20 22:57:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-20 22:57:26 +0000 |
| commit | cffa43f6dfa98bf35f7caf29745da2f66ce6094d (patch) | |
| tree | 0c085351dbc5fd2cea90f8fa5b451b8c567ec0e5 | |
| parent | 7bb96187f78872cdccf6a9d2758a8ef6b22674f8 (diff) | |
| parent | d0210ae77cd0cee7e2d1b66f774581727eaf565d (diff) | |
| download | clang-cffa43f6dfa98bf35f7caf29745da2f66ce6094d.tar.gz | |
Merge "Don't discard the result of std::unique" into main am: d0210ae77c
Original change: https://android-review.googlesource.com/c/platform/external/clang/+/2755601
Change-Id: Ieebd0485e830289ce72222b9f57c470792c471a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | include/clang/Serialization/ContinuousRangeMap.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/clang/Serialization/ContinuousRangeMap.h b/include/clang/Serialization/ContinuousRangeMap.h index 244b01b22a..edc42441b2 100644 --- a/include/clang/Serialization/ContinuousRangeMap.h +++ b/include/clang/Serialization/ContinuousRangeMap.h @@ -117,14 +117,17 @@ public: ~Builder() { std::sort(Self.Rep.begin(), Self.Rep.end(), Compare()); - std::unique(Self.Rep.begin(), Self.Rep.end(), - [](const_reference A, const_reference B) { - // FIXME: we should not allow any duplicate keys, but there are a lot of - // duplicate 0 -> 0 mappings to remove first. - assert((A == B || A.first != B.first) && - "ContinuousRangeMap::Builder given non-unique keys"); - return A == B; - }); + Self.Rep.erase( + std::unique( + Self.Rep.begin(), Self.Rep.end(), + [](const_reference A, const_reference B) { + // FIXME: we should not allow any duplicate keys, but there are + // a lot of duplicate 0 -> 0 mappings to remove first. + assert((A == B || A.first != B.first) && + "ContinuousRangeMap::Builder given non-unique keys"); + return A == B; + }), + Self.Rep.end()); } void insert(const value_type &Val) { |