Fix hinted node handle insert in linked_hash_set and linked_hash_map. Return insert_return_type::position instead of nonexistent .first from insert(const_iterator, node_type&&), and cover the overload in unit tests. PiperOrigin-RevId: 1026281664
diff --git a/absl/container/linked_hash_map.h b/absl/container/linked_hash_map.h index b89e433..5f73a26 100644 --- a/absl/container/linked_hash_map.h +++ b/absl/container/linked_hash_map.h
@@ -476,7 +476,7 @@ } iterator insert(const_iterator, node_type&& node) { - return insert(std::move(node)).first; + return insert(std::move(node)).position; } // The last two template parameters ensure that both arguments are rvalues
diff --git a/absl/container/linked_hash_map_test.cc b/absl/container/linked_hash_map_test.cc index ef03e13..7c1edc5 100644 --- a/absl/container/linked_hash_map_test.cc +++ b/absl/container/linked_hash_map_test.cc
@@ -795,6 +795,11 @@ EXPECT_EQ(node.key(), 1); EXPECT_EQ(node.mapped(), 17); EXPECT_THAT(m, ElementsAre(Pair(2, 9))); + + node.mapped() = 19; + auto it = m.insert(m.begin(), std::move(node)); + EXPECT_EQ(it, m.find(1)); + EXPECT_THAT(m, ElementsAre(Pair(2, 9), Pair(1, 19))); } // Verify that emplacing and extracting nodes results in the same stateful
diff --git a/absl/container/linked_hash_set.h b/absl/container/linked_hash_set.h index b1c0024..490ed94 100644 --- a/absl/container/linked_hash_set.h +++ b/absl/container/linked_hash_set.h
@@ -445,7 +445,7 @@ } iterator insert(const_iterator, node_type&& node) { - return insert(std::move(node)).first; + return insert(std::move(node)).position; } template <typename... Args>
diff --git a/absl/container/linked_hash_set_test.cc b/absl/container/linked_hash_set_test.cc index 5e4c176..59a4b3b 100644 --- a/absl/container/linked_hash_set_test.cc +++ b/absl/container/linked_hash_set_test.cc
@@ -827,6 +827,11 @@ EXPECT_EQ(node.value(), 9); EXPECT_THAT(s, ElementsAre(7, 2, 17)); EXPECT_FALSE(s.contains(9)); + + node.value() = 19; + auto it = s.insert(s.begin(), std::move(node)); + EXPECT_EQ(it, s.find(19)); + EXPECT_THAT(s, ElementsAre(7, 2, 17, 19)); } // Verify that emplacing and extracting nodes results in the same stateful