diff options
| -rw-r--r-- | libcxx/include/memory | 2 | ||||
| -rw-r--r-- | libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/libcxx/include/memory b/libcxx/include/memory index fe3523828b0..87436ac7d91 100644 --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -621,7 +621,7 @@ inline _LIBCPP_INLINE_VISIBILITY _Tp* addressof(_Tp& __x) _NOEXCEPT { - return (_Tp*)&(char&)__x; + return (_Tp*)&reinterpret_cast<const volatile char&>(__x); } #if defined(_LIBCPP_HAS_OBJC_ARC) && !defined(_LIBCPP_PREDEFINED_OBJC_ARC_ADDRESSOF) diff --git a/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp b/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp index 3f1bef16a3f..e07bec4d0a4 100644 --- a/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp +++ b/libcxx/test/utilities/memory/specialized.algorithms/specialized.addressof/addressof.pass.cpp @@ -19,8 +19,17 @@ struct A void operator&() const {} }; +struct nothing { + operator char&() + { + static char c; + return c; + } +}; + int main() { + { int i; double d; assert(std::addressof(i) == &i); @@ -30,4 +39,13 @@ int main() assert(std::addressof(*tp) == tp); assert(std::addressof(*ctp) == tp); delete tp; + } + { + union + { + nothing n; + int i; + }; + assert(std::addressof(n) == (void*)std::addressof(i)); + } } |
