fix universal: use std::addressof in FindOrNullptr

Fixes #1184
Tests: протестировано CI

---

Pull Request resolved: #1196

Co-authored-by: antoshkka <antoshkka@userver.tech>
Co-authored-by: antoshkka <antoshkka@userver.tech>
Co-authored-by: antoshkka <antoshkka@userver.tech>
commit_hash:94c5fac1d860840ea0d5a6f3df5e81070c1ad450

Author: 2 people

.mapping.json

@@ -6006,6 +6006,7 @@
   "universal/src/utils/not_null_test.cpp":"taxi/uservices/userver/universal/src/utils/not_null_test.cpp",
   "universal/src/utils/numeric_cast_test.cpp":"taxi/uservices/userver/universal/src/utils/numeric_cast_test.cpp",
   "universal/src/utils/optional_ref_test.cpp":"taxi/uservices/userver/universal/src/utils/optional_ref_test.cpp",
+  "universal/src/utils/overloaded_address_operator_test.hpp":"taxi/uservices/userver/universal/src/utils/overloaded_address_operator_test.hpp",
   "universal/src/utils/overloaded_test.cpp":"taxi/uservices/userver/universal/src/utils/overloaded_test.cpp",
   "universal/src/utils/projected_set_test.cpp":"taxi/uservices/userver/universal/src/utils/projected_set_test.cpp",
   "universal/src/utils/rand.cpp":"taxi/uservices/userver/universal/src/utils/rand.cpp",

universal/include/userver/utils/algo.hpp

@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <iterator>
+#include <memory>
 #include <optional>
 #include <string>
 #include <string_view>
@@ -46,9 +47,9 @@ template <typename Container, typename Key>
 auto* FindOrNullptr(Container& container, const Key& key) {
     const auto it = container.find(key);
     if constexpr (impl::HasMappedType<Container>) {
-        return (it != container.end() ? &(it->second) : nullptr);
+        return (it != container.end() ? std::addressof(it->second) : nullptr);
     } else {
-        return (it != container.end() ? &(*it) : nullptr);
+        return (it != container.end() ? std::addressof(*it) : nullptr);
     }
 }
 

universal/src/utils/algo_test.cpp

@@ -7,6 +7,8 @@
 #include <unordered_set>
 #include <vector>
 
+#include "overloaded_address_operator_test.hpp"
+
 #include <gtest/gtest.h>
 
 USERVER_NAMESPACE_BEGIN
@@ -46,6 +48,18 @@ TEST(UtilsAlgo, FindOrNullptrSets) {
     EXPECT_EQ(*utils::FindOrNullptr(us, "1"), "1");
 }
 
+TEST(UtilsAlgo, FindOrNullptrMapAddressof) {
+    const std::map<std::string, utils::OverloadedAddressOperator> m{{"1", {.payload = 1}}};
+    const auto ptr = utils::FindOrNullptr(m, "1");
+    ASSERT_TRUE(ptr);
+}
+
+TEST(UtilsAlgo, FindOrNullptrSetAddressof) {
+    const std::set<utils::OverloadedAddressOperator> s{{.payload = 1}};
+    const auto ptr = utils::FindOrNullptr(s, utils::OverloadedAddressOperator{.payload = 1});
+    ASSERT_TRUE(ptr);
+}
+
 TEST(UtilsAlgo, FindOrDefaultMaps) {
     constexpr int kFallback = 42;
     std::map<std::string, int> m = {{"1", 2}};

universal/src/utils/overloaded_address_operator_test.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <userver/utils/assert.hpp>
+
+USERVER_NAMESPACE_BEGIN
+
+namespace utils {
+
+struct OverloadedAddressOperator {
+    int payload{0};
+
+    auto operator<=>(const OverloadedAddressOperator& other) const { return payload <=> other.payload; };
+
+    auto operator&() {  // NOLINT(google-runtime-operator)
+        UASSERT(false);
+        return this;
+    }
+
+    auto operator&() const {  // NOLINT(google-runtime-operator)
+        UASSERT(false);
+        return this;
+    }
+};
+
+}  // namespace utils
+
+USERVER_NAMESPACE_END