diff options
| author | Ryan Prichard <rprichard@google.com> | 2023-09-21 02:38:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-21 02:38:01 +0000 |
| commit | 1648e07c618e9763f6e18984860f2e86c879f56c (patch) | |
| tree | 0c085351dbc5fd2cea90f8fa5b451b8c567ec0e5 | |
| parent | 7bb96187f78872cdccf6a9d2758a8ef6b22674f8 (diff) | |
| parent | 2e32ff5e4e0d77658f5f8e023f961b40e47332ca (diff) | |
| download | clang-1648e07c618e9763f6e18984860f2e86c879f56c.tar.gz | |
Merge "Don't discard the result of std::unique" into main am: d0210ae77c am: cffa43f6df am: 2e32ff5e4e
Original change: https://android-review.googlesource.com/c/platform/external/clang/+/2755601
Change-Id: Idaa0238e553e495f23a73b76fc981e6f74cb9425
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) { |