diff options
| -rw-r--r-- | llvm/include/llvm/ADT/PriorityWorklist.h | 6 | ||||
| -rw-r--r-- | llvm/unittests/ADT/PriorityWorklistTest.cpp | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/llvm/include/llvm/ADT/PriorityWorklist.h b/llvm/include/llvm/ADT/PriorityWorklist.h index ef7b8930ab3..3198dd43870 100644 --- a/llvm/include/llvm/ADT/PriorityWorklist.h +++ b/llvm/include/llvm/ADT/PriorityWorklist.h @@ -112,12 +112,16 @@ public: template <typename SequenceT> typename std::enable_if<!std::is_convertible<SequenceT, T>::value>::type insert(SequenceT &&Input) { + if (std::begin(Input) == std::end(Input)) + // Nothing to do for an empty input sequence. + return; + // First pull the input sequence into the vector as a bulk append // operation. ptrdiff_t StartIndex = V.size(); V.insert(V.end(), std::begin(Input), std::end(Input)); // Now walk backwards fixing up the index map and deleting any duplicates. - for (auto i : reverse(seq<ptrdiff_t>(StartIndex, V.size()))) { + for (ptrdiff_t i = V.size() - 1; i >= StartIndex; --i) { auto InsertResult = M.insert({V[i], i}); if (InsertResult.second) continue; diff --git a/llvm/unittests/ADT/PriorityWorklistTest.cpp b/llvm/unittests/ADT/PriorityWorklistTest.cpp index aa7a5430e21..040a11f95f4 100644 --- a/llvm/unittests/ADT/PriorityWorklistTest.cpp +++ b/llvm/unittests/ADT/PriorityWorklistTest.cpp @@ -109,6 +109,14 @@ TYPED_TEST(PriorityWorklistTest, InsertSequence) { EXPECT_EQ(7, W.pop_back_val()); EXPECT_EQ(2, W.pop_back_val()); ASSERT_TRUE(W.empty()); + + ASSERT_TRUE(W.insert(2)); + ASSERT_TRUE(W.insert(7)); + // Inserting an empty sequence does nothing. + W.insert(std::vector<int>()); + EXPECT_EQ(7, W.pop_back_val()); + EXPECT_EQ(2, W.pop_back_val()); + ASSERT_TRUE(W.empty()); } TYPED_TEST(PriorityWorklistTest, EraseIf) { |
