replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix PR#35119 : set_union misbehaves with move_iterators. Thanks to Denis Yaroshevskiy for both the bug report and the fix. 

llvm-svn: 316914
This commit is contained in:
Marshall Clow 2017-10-30 15:50:00 +00:00
parent 4e13d4de52
commit 05da5b0205
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcxx/include/algorithm
View File

@ -5547,9 +5547,9 @@ __set_union(_InputIterator1 __first1, _InputIterator1 __last1,
}
else
{
*__result = *__first1;
if (!__comp(*__first1, *__first2))
++__first2;
*__result = *__first1;
++__first1;
}
}

44
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/set_union_move.pass.cpp Normal file
View File

@ -0,0 +1,44 @@
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
// <algorithm>
// template<InputIterator InIter1, InputIterator InIter2, typename OutIter,
// CopyConstructible Compare>
// requires OutputIterator<OutIter, InIter1::reference>
// && OutputIterator<OutIter, InIter2::reference>
// && Predicate<Compare, InIter1::value_type, InIter2::value_type>
// && Predicate<Compare, InIter2::value_type, InIter1::value_type>
// OutIter
// set_union(InIter1 first1, InIter1 last1, InIter2 first2, InIter2 last2,
// OutIter result, Compare comp);
#include <algorithm>
#include <cassert>
#include <iterator>
#include <vector>
#include "MoveOnly.h"
int main()
{
std::vector<MoveOnly> lhs, rhs;
lhs.push_back(MoveOnly(2));
rhs.push_back(MoveOnly(2));
std::vector<MoveOnly> res;
std::set_union(std::make_move_iterator(lhs.begin()),
std::make_move_iterator(lhs.end()),
std::make_move_iterator(rhs.begin()),
std::make_move_iterator(rhs.end()), std::back_inserter(res));
assert(res.size() == 1);
assert(res[0].get() == 2);
}