Merge pull request #283 from ned14/wip-fix-addressof

Use a preprocessor macro to control the use of std::addressof(), fixing #282.
ned14 · Jul 15, 2023 · 0bedf67 · 0bedf67
2 parents 7fe6e84 + cc6088d
commit 0bedf67
Show file tree

Hide file tree

Showing 12 changed files with 175 additions and 126 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -218,7 +218,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test" AND NOT PROJECT_IS_DEPENDENCY)
         add_executable(${target_name} "${testsource}")
         if(NOT first_test_target_noexcept)
           set(first_test_target_noexcept ${target_name})
-        elseif(${target_name} MATCHES "coroutine-support|fileopen|hooks")
+        elseif(${target_name} MATCHES "coroutine-support|fileopen|hooks|core-result")
           set_target_properties(${target_name} PROPERTIES DISABLE_PRECOMPILE_HEADERS On)
         elseif(COMMAND target_precompile_headers)
           target_precompile_headers(${target_name} REUSE_FROM ${first_test_target_noexcept})
@@ -249,7 +249,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test" AND NOT PROJECT_IS_DEPENDENCY)
           add_executable(${target_name} "${testsource}")
           if(NOT first_test_target_permissive)
             set(first_test_target_permissive ${target_name})
-          elseif(${target_name} MATCHES "coroutine-support|fileopen")
+          elseif(${target_name} MATCHES "coroutine-support|fileopen|core-result")
             set_target_properties(${target_name} PROPERTIES DISABLE_PRECOMPILE_HEADERS On)
           elseif(COMMAND target_precompile_headers)
             target_precompile_headers(${target_name} REUSE_FROM ${first_test_target_permissive})

diff --git a/doc/src/content/changelog/_index.md b/doc/src/content/changelog/_index.md
@@ -15,8 +15,9 @@ This as usual will cause minor breakage due to LEWG renaming of things.
 
 - Outcome previously took addresses of things not using `std::addressof()`, and until now
 nobody complained because custom `operator&` which doesn't return an address is an
-abomination not used in much modern C++. But finally someone did complain, so it is fixed
-for both normal Outcome and Experimental.Outcome.
+abomination not used in much modern C++. But finally someone did complain, so
+for both normal Outcome and Experimental.Outcome, if you set `OUTCOME_USE_STD_ADDRESSOF = 1`,
+Outcome will use `std::addressof()`
 
 ### Bug fixes:
 

diff --git a/include/outcome/config.hpp b/include/outcome/config.hpp
@@ -171,6 +171,13 @@ template <class T> constexpr in_place_type_t<T> in_place_type{};
 OUTCOME_V2_NAMESPACE_END
 #endif
 
+#if OUTCOME_USE_STD_ADDRESSOF
+#include <memory>  // for std::addressof
+#define OUTCOME_ADDRESS_OF(...) std::addressof(__VA_ARGS__)
+#else
+#define OUTCOME_ADDRESS_OF(...) (&__VA_ARGS__)
+#endif
+
 #ifndef OUTCOME_TRIVIAL_ABI
 #if defined(STANDARDESE_IS_IN_THE_HOUSE) || __clang_major__ >= 7
 //! Defined to be `[[clang::trivial_abi]]` when on a new enough clang compiler. Usually automatic, can be overriden.

diff --git a/include/outcome/detail/revision.hpp b/include/outcome/detail/revision.hpp
@@ -22,6 +22,6 @@ Distributed under the Boost Software License, Version 1.0.
 */
 
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define OUTCOME_PREVIOUS_COMMIT_REF 44da28c59d85f2245230931b6c25725b679b556c
-#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-06-28 21:21:35 +00:00"
-#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 44da28c5
+#define OUTCOME_PREVIOUS_COMMIT_REF 06da8aa6452ede5600af3c4ed4781ebd631149f9
+#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-07-15 10:37:16 +00:00"
+#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 06da8aa6
diff --git a/include/outcome/detail/value_storage.hpp b/include/outcome/detail/value_storage.hpp
@@ -1055,11 +1055,11 @@ namespace detail
     {
       if(o._status.have_value())
       {
-        new(std::addressof(_value)) _value_type_(static_cast<_value_type_ &&>(o._value));  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_value)) _value_type_(static_cast<_value_type_ &&>(o._value));  // NOLINT
       }
       else if(o._status.have_error())
       {
-        new(std::addressof(_error)) _error_type_(static_cast<_error_type_ &&>(o._error));  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_error)) _error_type_(static_cast<_error_type_ &&>(o._error));  // NOLINT
       }
       _status = o._status;
       o._status.set_have_moved_from(true);
@@ -1072,11 +1072,11 @@ namespace detail
     {
       if(o._status.have_value())
       {
-        new(std::addressof(_value)) _value_type_(o._value);  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_value)) _value_type_(o._value);  // NOLINT
       }
       else if(o._status.have_error())
       {
-        new(std::addressof(_error)) _error_type_(o._error);  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_error)) _error_type_(o._error);  // NOLINT
       }
       _status = o._status;
     }
@@ -1182,11 +1182,11 @@ namespace detail
     {
       if(o._status.have_value())
       {
-        new(std::addressof(_value)) _value_type_();  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_value)) _value_type_();  // NOLINT
       }
       else if(o._status.have_error())
       {
-        new(std::addressof(_error)) _error_type_(o._error);  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_error)) _error_type_(o._error);  // NOLINT
       }
       _status = o._status;
     }
@@ -1197,11 +1197,11 @@ namespace detail
     {
       if(o._status.have_value())
       {
-        new(std::addressof(_value)) _value_type_();  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_value)) _value_type_();  // NOLINT
       }
       else if(o._status.have_error())
       {
-        new(std::addressof(_error)) _error_type_(static_cast<_error_type_ &&>(o._error));  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_error)) _error_type_(static_cast<_error_type_ &&>(o._error));  // NOLINT
       }
       _status = o._status;
       o._status.set_have_moved_from(true);
@@ -1219,11 +1219,11 @@ namespace detail
     {
       if(o._status.have_value())
       {
-        new(std::addressof(_value)) _value_type_(o._value);  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_value)) _value_type_(o._value);  // NOLINT
       }
       else if(o._status.have_error())
       {
-        new(std::addressof(_error)) _error_type_();  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_error)) _error_type_();  // NOLINT
       }
       _status = o._status;
     }
@@ -1234,11 +1234,11 @@ namespace detail
     {
       if(o._status.have_value())
       {
-        new(std::addressof(_value)) _value_type_(static_cast<_value_type_ &&>(o._value));  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_value)) _value_type_(static_cast<_value_type_ &&>(o._value));  // NOLINT
       }
       else if(o._status.have_error())
       {
-        new(std::addressof(_error)) _error_type_();  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_error)) _error_type_();  // NOLINT
       }
       _status = o._status;
       o._status.set_have_moved_from(true);
@@ -1325,7 +1325,7 @@ namespace detail
       if(_status.have_value() && !o._status.have_error())
       {
         // Move construct me into other
-        new(std::addressof(o._value)) _value_type_(static_cast<_value_type_ &&>(_value));  // NOLINT
+        new(OUTCOME_ADDRESS_OF(o._value)) _value_type_(static_cast<_value_type_ &&>(_value));  // NOLINT
         if(!trait::is_move_bitcopying<value_type>::value)
         {
           this->_value.~value_type();  // NOLINT
@@ -1336,7 +1336,7 @@ namespace detail
       if(o._status.have_value() && !_status.have_error())
       {
         // Move construct other into me
-        new(std::addressof(_value)) _value_type_(static_cast<_value_type_ &&>(o._value));  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_value)) _value_type_(static_cast<_value_type_ &&>(o._value));  // NOLINT
         if(!trait::is_move_bitcopying<value_type>::value)
         {
           o._value.~value_type();  // NOLINT
@@ -1347,7 +1347,7 @@ namespace detail
       if(_status.have_error() && !o._status.have_value())
       {
         // Move construct me into other
-        new(std::addressof(o._error)) _error_type_(static_cast<_error_type_ &&>(_error));  // NOLINT
+        new(OUTCOME_ADDRESS_OF(o._error)) _error_type_(static_cast<_error_type_ &&>(_error));  // NOLINT
         if(!trait::is_move_bitcopying<error_type>::value)
         {
           this->_error.~error_type();  // NOLINT
@@ -1358,7 +1358,7 @@ namespace detail
       if(o._status.have_error() && !_status.have_value())
       {
         // Move construct other into me
-        new(std::addressof(_error)) _error_type_(static_cast<_error_type_ &&>(o._error));  // NOLINT
+        new(OUTCOME_ADDRESS_OF(_error)) _error_type_(static_cast<_error_type_ &&>(o._error));  // NOLINT
         if(!trait::is_move_bitcopying<error_type>::value)
         {
           o._error.~error_type();  // NOLINT
@@ -1382,7 +1382,7 @@ namespace detail
             this->b.set_have_lost_consistency(true);
           }
         }
-      } _{_status, o._status, std::addressof(_value), std::addressof(o._value), std::addressof(_error), std::addressof(o._error)};
+      } _{_status, o._status, OUTCOME_ADDRESS_OF(_value), OUTCOME_ADDRESS_OF(o._value), OUTCOME_ADDRESS_OF(_error), OUTCOME_ADDRESS_OF(o._error)};
       if(_status.have_value() && o._status.have_error())
       {
         strong_placement(_.all_good, _.o_value, _.value, [&_] {    //
@@ -1507,7 +1507,7 @@ namespace detail
       }
       if(!this->_status.have_value() && !this->_status.have_error() && o._status.have_value())
       {
-        move_assign_to_empty<_value_type_>(std::addressof(this->_value), std::addressof(o._value));
+        move_assign_to_empty<_value_type_>(OUTCOME_ADDRESS_OF(this->_value), OUTCOME_ADDRESS_OF(o._value));
         this->_status = o._status;
         o._status.set_have_moved_from(true);
         return *this;
@@ -1524,7 +1524,7 @@ namespace detail
       }
       if(!this->_status.have_value() && !this->_status.have_error() && o._status.have_error())
       {
-        move_assign_to_empty<_error_type_>(std::addressof(this->_error), std::addressof(o._error));
+        move_assign_to_empty<_error_type_>(OUTCOME_ADDRESS_OF(this->_error), OUTCOME_ADDRESS_OF(o._error));
         this->_status = o._status;
         o._status.set_have_moved_from(true);
         return *this;
@@ -1535,7 +1535,7 @@ namespace detail
         {
           this->_value.~_value_type_();  // NOLINT
         }
-        move_assign_to_empty<_error_type_>(std::addressof(this->_error), std::addressof(o._error));
+        move_assign_to_empty<_error_type_>(OUTCOME_ADDRESS_OF(this->_error), OUTCOME_ADDRESS_OF(o._error));
         this->_status = o._status;
         o._status.set_have_moved_from(true);
         return *this;
@@ -1546,7 +1546,7 @@ namespace detail
         {
           this->_error.~_error_type_();  // NOLINT
         }
-        move_assign_to_empty<_value_type_>(std::addressof(this->_value), std::addressof(o._value));
+        move_assign_to_empty<_value_type_>(OUTCOME_ADDRESS_OF(this->_value), OUTCOME_ADDRESS_OF(o._value));
         this->_status = o._status;
         o._status.set_have_moved_from(true);
         return *this;
@@ -1604,7 +1604,7 @@ namespace detail
       }
       if(!this->_status.have_value() && !this->_status.have_error() && o._status.have_value())
       {
-        copy_assign_to_empty<_value_type_>(std::addressof(this->_value), std::addressof(o._value));
+        copy_assign_to_empty<_value_type_>(OUTCOME_ADDRESS_OF(this->_value), OUTCOME_ADDRESS_OF(o._value));
         this->_status = o._status;
         return *this;
       }
@@ -1619,7 +1619,7 @@ namespace detail
       }
       if(!this->_status.have_value() && !this->_status.have_error() && o._status.have_error())
       {
-        copy_assign_to_empty<_error_type_>(std::addressof(this->_error), std::addressof(o._error));
+        copy_assign_to_empty<_error_type_>(OUTCOME_ADDRESS_OF(this->_error), OUTCOME_ADDRESS_OF(o._error));
         this->_status = o._status;
         return *this;
       }
@@ -1629,7 +1629,7 @@ namespace detail
         {
           this->_value.~_value_type_();  // NOLINT
         }
-        copy_assign_to_empty<_error_type_>(std::addressof(this->_error), std::addressof(o._error));
+        copy_assign_to_empty<_error_type_>(OUTCOME_ADDRESS_OF(this->_error), OUTCOME_ADDRESS_OF(o._error));
         this->_status = o._status;
         return *this;
       }
@@ -1639,7 +1639,7 @@ namespace detail
         {
           this->_error.~_error_type_();  // NOLINT
         }
-        copy_assign_to_empty<_value_type_>(std::addressof(this->_value), std::addressof(o._value));
+        copy_assign_to_empty<_value_type_>(OUTCOME_ADDRESS_OF(this->_value), OUTCOME_ADDRESS_OF(o._value));
         this->_status = o._status;
         return *this;
       }

diff --git a/include/outcome/experimental/status-code b/include/outcome/experimental/status-code
diff --git a/include/outcome/experimental/status_result.hpp b/include/outcome/experimental/status_result.hpp
@@ -28,6 +28,12 @@ Distributed under the Boost Software License, Version 1.0.
 #include "../basic_result.hpp"
 #include "../policy/fail_to_compile_observers.hpp"
 
+#ifndef SYSTEM_ERROR2_USE_STD_ADDRESSOF
+#if OUTCOME_USE_STD_ADDRESSOF
+#define SYSTEM_ERROR2_USE_STD_ADDRESSOF 1
+#endif
+#endif
+
 #if __PCPP_ALWAYS_TRUE__
 #include "status-code/include/status-code/system_error2.hpp"
 #elif !OUTCOME_USE_SYSTEM_STATUS_CODE && __has_include("status-code/include/status-code/system_error2.hpp")

diff --git a/include/outcome/iostream_support.hpp b/include/outcome/iostream_support.hpp
@@ -82,12 +82,12 @@ namespace detail
     v._status.spare_storage_value = y;
     if(v._status.have_value())
     {
-      new(std::addressof(v._value)) decltype(v._value)();  // NOLINT
+      new(OUTCOME_ADDRESS_OF(v._value)) decltype(v._value)();  // NOLINT
       s >> v._value;                                       // NOLINT
     }
     if(v._status.have_error())
     {
-      new(std::addressof(v._error)) decltype(v._error)();  // NOLINT
+      new(OUTCOME_ADDRESS_OF(v._error)) decltype(v._error)();  // NOLINT
       s >> v._error;                                       // NOLINT
     }
     return s;
@@ -103,7 +103,7 @@ namespace detail
     v._status.spare_storage_value = y;
     if(v._status.have_error())
     {
-      new(std::addressof(v._error)) decltype(v._error)();  // NOLINT
+      new(OUTCOME_ADDRESS_OF(v._error)) decltype(v._error)();  // NOLINT
       s >> v._error;                                       // NOLINT
     }
     return s;
@@ -119,7 +119,7 @@ namespace detail
     v._status.spare_storage_value = y;
     if(v._status.have_value())
     {
-      new(std::addressof(v._value)) decltype(v._value)();  // NOLINT
+      new(OUTCOME_ADDRESS_OF(v._value)) decltype(v._value)();  // NOLINT
       s >> v._value;                                       // NOLINT
     }
     return s;
+2 −2		include/status-code/boost_error_code.hpp
+7 −0		include/status-code/config.hpp
+1 −1		include/status-code/nested_status_code.hpp
+10 −7		single-header/system_error2-nowindows.hpp
+10 −7		single-header/system_error2.hpp