| commit | 0b48cf9a62d1787d0e98d8b8e6df8b5a564dc81f | [log] [tgz] |
|---|---|---|
| author | Marshall Clow <[email protected]> | Mon Feb 02 17:35:53 2015 |
| committer | Marshall Clow <[email protected]> | Mon Feb 02 17:35:53 2015 |
| tree | 8657932e45cf78a81066ebd6bf4164fe68f4bf6c | |
| parent | 6a4ea636f30fc9c458857b429350a7712866d60e [diff] |
Fix PR#22427. The implementation of inplace_merge had a \'small data set\' optimization; if either half of the merge was small (i.e, less than 9 items), it did an inplace merge rather than allocating a buffer and doing a faster/smarter merge. However, this failed to satisfy the complexity requirements in the standard. Remove that code. Add tests to check the complexity, and add the same tests for std::merge, since we are in that section of the test suite anyway. llvm-svn: 227811