Bugfixes for <any>

stl/inc/any

@@ -78,17 +78,17 @@ struct _Any_small_RTTI { // Hand-rolled vtable for nontrivial types that can be
 
     template <class _Ty>
     static void __CLRCALL_PURE_OR_CDECL _Destroy_impl(void* const _Target) noexcept {
-        _Destroy_in_place(*static_cast<_Ty*>(_Target));
+        _STD _Destroy_in_place(*static_cast<_Ty*>(_Target));
     }
 
     template <class _Ty>
     static void __CLRCALL_PURE_OR_CDECL _Copy_impl(void* const _Target, const void* const _Source) {
-        _Construct_in_place(*static_cast<_Ty*>(_Target), *static_cast<const _Ty*>(_Source));
+        _STD _Construct_in_place(*static_cast<_Ty*>(_Target), *static_cast<const _Ty*>(_Source));
     }
 
     template <class _Ty>
     static void __CLRCALL_PURE_OR_CDECL _Move_impl(void* const _Target, void* const _Source) noexcept {
-        _Construct_in_place(*static_cast<_Ty*>(_Target), _STD move(*static_cast<_Ty*>(_Source)));
+        _STD _Construct_in_place(*static_cast<_Ty*>(_Target), _STD move(*static_cast<_Ty*>(_Source)));
     }
 
     _Destroy_fn* _Destroy;
@@ -168,8 +168,10 @@ public:
     }
 
     any& operator=(any&& _That) noexcept {
-        reset();
-        _Move_from(_That);
+        if (this != &_That) {
+            reset();
+            _Move_from(_That);
+        }
         return *this;
     }
 
@@ -295,14 +297,14 @@ private:
         if constexpr (_Any_is_trivial<_Decayed>) {
             // using the _Trivial representation
             auto& _Obj = reinterpret_cast<_Decayed&>(_Storage._TrivialData);
-            _Construct_in_place(_Obj, _STD forward<_Types>(_Args)...);
+            _STD _Construct_in_place(_Obj, _STD forward<_Types>(_Args)...);
             _Storage._TypeData =
                 reinterpret_cast<uintptr_t>(&typeid(_Decayed)) | static_cast<uintptr_t>(_Any_representation::_Trivial);
             return _Obj;
         } else if constexpr (_Any_is_small<_Decayed>) {
             // using the _Small representation
             auto& _Obj = reinterpret_cast<_Decayed&>(_Storage._SmallStorage._Data);
-            _Construct_in_place(_Obj, _STD forward<_Types>(_Args)...);
+            _STD _Construct_in_place(_Obj, _STD forward<_Types>(_Args)...);
             _Storage._SmallStorage._RTTI = &_Any_small_RTTI_obj<_Decayed>;
             _Storage._TypeData =
                 reinterpret_cast<uintptr_t>(&typeid(_Decayed)) | static_cast<uintptr_t>(_Any_representation::_Small);

tests/std/tests/GH_003965_robust_against_adl_any/env.lst

@@ -0,0 +1,4 @@
+# Copyright (c) Microsoft Corporation.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+RUNALL_INCLUDE ..\usual_17_matrix.lst

tests/std/tests/GH_003965_robust_against_adl_any/test.cpp

@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#include <any>
+#include <utility>
+
+struct incomplete;
+
+template <class T>
+struct wrapper {
+    T t;
+};
+
+struct nontrivial {
+    nontrivial() {}
+    ~nontrivial() {}
+};
+
+int main() {
+    using foo = wrapper<incomplete>*;
+    struct bar {
+        foo p{};
+        nontrivial q{};
+    };
+    struct baz {
+        foo p[20]{};
+    };
+
+    std::any a{foo{}}, b(bar{}), c{baz{}};
+    a = a, b = b, c = c;
+    a = std::move(a), b = std::move(b), c = std::move(c);
+    auto a_ = std::any_cast<foo>(a);
+    auto b_ = std::any_cast<bar>(b);
+    auto c_ = std::any_cast<baz>(c);
+
+    return 0;
+}

tests/std/tests/P0220R1_any/test.cpp

@@ -3160,6 +3160,23 @@ namespace msvc {
         }
 #pragma warning(pop)
     } // namespace trivial
+
+    namespace self_move_assign {
+        struct foo {
+            int val;
+            foo() : val(42) {}
+            ~foo() {
+                val = 0;
+            }
+        };
+        void run_test() {
+            any a(foo{});
+            a = std::move(a);
+            assert(a.has_value());
+            assert(containsType<foo>(a));
+            assert(any_cast<foo>(&a)->val == 42);
+        }
+    } // namespace self_move_assign
 } // namespace msvc
 
 int main() {
@@ -3196,4 +3213,5 @@ int main() {
     msvc::size_and_alignment::run_test();
     msvc::small_type::run_test();
     msvc::trivial::run_test();
+    msvc::self_move_assign::run_test();
 }