diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 21:28:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 21:28:18 +0000 |
| commit | 58b4d19a6b6c8a6790c31bb3d6fcd13a8892239b (patch) | |
| tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /equivalence_map.cc | |
| parent | 919a460e14c48a672288254f67db3e0c28166e82 (diff) | |
| parent | d9eed84a58f90af50d84b02ca6a38d805b425a95 (diff) | |
| download | zucchini-58b4d19a6b6c8a6790c31bb3d6fcd13a8892239b.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959 am: d9eed84a58
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854
Change-Id: I7de3d8374e868066777abb326d3e20c1e4b44803
Diffstat (limited to 'equivalence_map.cc')
| -rw-r--r-- | equivalence_map.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/equivalence_map.cc b/equivalence_map.cc index 26c0764..b4d5e27 100644 --- a/equivalence_map.cc +++ b/equivalence_map.cc @@ -214,7 +214,7 @@ EquivalenceCandidate VisitEquivalenceSeed( /******** OffsetMapper ********/ -OffsetMapper::OffsetMapper(std::vector<Equivalence>&& equivalences, +OffsetMapper::OffsetMapper(std::deque<Equivalence>&& equivalences, offset_t old_image_size, offset_t new_image_size) : equivalences_(std::move(equivalences)), @@ -291,7 +291,7 @@ offset_t OffsetMapper::ExtendedForwardProject(offset_t offset) const { : kOffsetBound - 1; } -void OffsetMapper::ForwardProjectAll(std::vector<offset_t>* offsets) const { +void OffsetMapper::ForwardProjectAll(std::deque<offset_t>* offsets) const { DCHECK(std::is_sorted(offsets->begin(), offsets->end())); auto current = equivalences_.begin(); for (auto& src : *offsets) { @@ -310,7 +310,7 @@ void OffsetMapper::ForwardProjectAll(std::vector<offset_t>* offsets) const { } void OffsetMapper::PruneEquivalencesAndSortBySource( - std::vector<Equivalence>* equivalences) { + std::deque<Equivalence>* equivalences) { std::sort(equivalences->begin(), equivalences->end(), [](const Equivalence& a, const Equivalence& b) { return a.src_offset < b.src_offset; @@ -368,6 +368,7 @@ void OffsetMapper::PruneEquivalencesAndSortBySource( base::EraseIf(*equivalences, [](const Equivalence& equivalence) { return equivalence.length == 0; }); + equivalences->shrink_to_fit(); } /******** EquivalenceMap ********/ |