commit 1c8315bfbc8fe5a2505e0efe1cb1aeccd675433b
author Louis Dionne <ldionne.2@gmail.com> Tue May 04 18:51:58 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Thu May 06 07:20:32 2021 -0700
tree 8d2b90f50e2baf15c906c96b073165d31a566884
parent 190aa2d87dc20fff42e37946b3bc132301f6ea7b

[libc++] Rewrite std::to_address to avoid relying on element_type

This is a rough reapplication of the change that fixed std::to_address
to avoid relying on element_type (da456167). It is somewhat different
because the fix to avoid breaking Clang (which caused it to be reverted
in 347f69c55) was a bit more involved.

Differential Revision: https://reviews.llvm.org/D101638

NOKEYCHECK=True
GitOrigin-RevId: fe0e86e6026f79e0b18f877196fbddd1d9e140d8

include/iterator

diff --git a/include/iterator b/include/iterator
index 1d308a2..687c641 100644
--- a/include/iterator
+++ b/include/iterator
@@ -1356,7 +1356,7 @@
         _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
                        "Attempted to dereference a non-dereferenceable iterator");
 #endif
-        return (pointer)_VSTD::addressof(*__i);
+        return _VSTD::__to_address(__i);
     }
     _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_IF_NODEBUG __wrap_iter& operator++() _NOEXCEPT
     {