Various cleanups (microsoft#3177)

StephanTLavavej · CaseyCarter · web-flow · commit 296e84079fad · 2022-10-26T06:14:12.000-07:00
Co-authored-by: Casey Carter &lt;Casey@Carter.net&gt;
diff --git a/azure-devops/cmake-configure-build.yml b/azure-devops/cmake-configure-build.yml
@@ -57,8 +57,6 @@ steps:
     cmake ${{ parameters.cmakeAdditionalFlags}} -G Ninja ^
     -DCMAKE_CXX_COMPILER=cl ^
     -DCMAKE_BUILD_TYPE=Release ^
-    -DLIT_FLAGS=$(litFlags) ^
-    -DSTL_USE_ANALYZE=ON ^
     -DSTL_BINARY_DIR=$(${{ parameters.buildOutputLocationVar }}) ^
     -S $(Build.SourcesDirectory)/benchmarks -B $(${{ parameters.benchmarkBuildOutputLocationVar }})
   displayName: 'Configure the benchmarks'
diff --git a/stl/inc/expected b/stl/inc/expected
@@ -321,7 +321,6 @@ public:
     }
 
     // clang-format off
-    // TRANSITION, LLVM-46269, destructor order is significant
     ~expected() requires is_trivially_destructible_v<_Ty> && is_trivially_destructible_v<_Err> = default;
     // clang-format on
 
@@ -842,7 +841,6 @@ public:
     }
 
     // clang-format off
-    // TRANSITION, LLVM-46269, destructor order is significant
     ~expected() requires is_trivially_destructible_v<_Err> = default;
     // clang-format on
 
diff --git a/stl/inc/iterator b/stl/inc/iterator
@@ -639,7 +639,6 @@ public:
         _Raw_clear();
     }
 
-    // TRANSITION, LLVM-46269, destructor order is significant
     // clang-format off
     constexpr ~_Variantish() requires is_trivially_destructible_v<_Ty1> && is_trivially_destructible_v<_Ty2> = default;
 
diff --git a/stl/inc/ranges b/stl/inc/ranges
@@ -265,7 +265,6 @@ namespace ranges {
             }
         }
 
-        // TRANSITION, LLVM-46269, destructor order is significant
         // clang-format off
         ~_Movable_box() requires is_trivially_destructible_v<_Ty> = default;
 
@@ -483,7 +482,6 @@ namespace ranges {
             }
         }
 
-        // TRANSITION, LLVM-46269, destructor order is significant
         // clang-format off
         ~_Defaultabox() requires is_trivially_destructible_v<_Ty> = default;
 
@@ -701,7 +699,6 @@ namespace ranges {
             }
         }
 
-        // TRANSITION, LLVM-46269, destructor order is significant
         // clang-format off
         ~_Non_propagating_cache() requires is_trivially_destructible_v<_Ty> = default;
         // clang-format on
diff --git a/stl/inc/string b/stl/inc/string
@@ -69,21 +69,21 @@ _EXPORT_STD template <class _Elem, class _Traits, class _Alloc>
 basic_istream<_Elem, _Traits>& getline(
     basic_istream<_Elem, _Traits>&& _Istr, basic_string<_Elem, _Traits, _Alloc>& _Str) {
     // get characters into string, discard newline
-    return getline(_Istr, _Str, _Istr.widen('\n'));
+    return _STD getline(_STD move(_Istr), _Str, _Istr.widen('\n'));
 }
 
 _EXPORT_STD template <class _Elem, class _Traits, class _Alloc>
 basic_istream<_Elem, _Traits>& getline(
     basic_istream<_Elem, _Traits>& _Istr, basic_string<_Elem, _Traits, _Alloc>& _Str, const _Elem _Delim) {
     // get characters into string, discard delimiter
-    return getline(_STD move(_Istr), _Str, _Delim);
+    return _STD getline(_STD move(_Istr), _Str, _Delim);
 }
 
 _EXPORT_STD template <class _Elem, class _Traits, class _Alloc>
 basic_istream<_Elem, _Traits>& getline(
     basic_istream<_Elem, _Traits>& _Istr, basic_string<_Elem, _Traits, _Alloc>& _Str) {
     // get characters into string, discard newline
-    return getline(_STD move(_Istr), _Str, _Istr.widen('\n'));
+    return _STD getline(_STD move(_Istr), _Str, _Istr.widen('\n'));
 }
 
 _EXPORT_STD _NODISCARD inline int stoi(const string& _Str, size_t* _Idx = nullptr, int _Base = 10) {
diff --git a/stl/inc/xlocinfo b/stl/inc/xlocinfo
@@ -60,10 +60,6 @@ _MRTIMP2 _Success_(return >= 0) int __cdecl _Mbrtowc(
     _When_(_Max_multibyte != 0, _Out_) wchar_t*, const char*, size_t _Max_multibyte, mbstate_t*, const _Cvtvec*);
 #endif // _M_CEE_PURE
 
-_CRTIMP2_PURE float __CLRCALL_PURE_OR_CDECL _Stof(const char*, _Out_opt_ _Deref_post_opt_valid_ char**, long);
-_CRTIMP2_PURE double __CLRCALL_PURE_OR_CDECL _Stod(const char*, _Out_opt_ _Deref_post_opt_valid_ char**, long);
-_CRTIMP2_PURE long double __CLRCALL_PURE_OR_CDECL _Stold(const char*, _Out_opt_ _Deref_post_opt_valid_ char**, long);
-
 _CRTIMP2_PURE int __CLRCALL_PURE_OR_CDECL _Strcoll(const char*, const char*, const char*, const char*, const _Collvec*);
 _CRTIMP2_PURE size_t __CLRCALL_PURE_OR_CDECL _Strxfrm(_Out_writes_(_End1 - _String1)
                                                           _Post_readable_size_(return) char* _String1,
@@ -106,14 +102,6 @@ _Success_(return > 0) _ACRTIMP size_t __cdecl _Wcsftime(
     _Out_writes_z_(_Maxsize) wchar_t*, _In_ size_t _Maxsize, _In_z_ const wchar_t*, _In_ const tm*, _In_opt_ void*);
 _END_EXTERN_C
 
-#ifdef _M_CEE_PURE
-[System::Runtime::InteropServices::DllImport(_CRT_MSVCP_CURRENT, EntryPoint = "_GetLocaleForCP",
-    CallingConvention = System::Runtime::InteropServices::CallingConvention::Cdecl)] extern "C" _locale_t
-    _GetLocaleForCP(unsigned int);
-#else // _M_CEE_PURE
-_MRTIMP2 _locale_t __cdecl _GetLocaleForCP(unsigned int);
-#endif // _M_CEE_PURE
-
 _STD_BEGIN
 extern "C++" class _CRTIMP2_PURE_IMPORT _Timevec { // smart pointer to information used by _Strftime
 public:
diff --git a/stl/inc/xlocnum b/stl/inc/xlocnum
@@ -24,10 +24,6 @@ _STL_DISABLE_CLANG_WARNINGS
 
 _EXTERN_C_UNLESS_PURE
 
-_CRTIMP2_PURE float __CLRCALL_PURE_OR_CDECL _Stofx(const char*, _Out_opt_ _Deref_post_opt_valid_ char**, long, int*);
-_CRTIMP2_PURE double __CLRCALL_PURE_OR_CDECL _Stodx(const char*, _Out_opt_ _Deref_post_opt_valid_ char**, long, int*);
-_CRTIMP2_PURE long double __CLRCALL_PURE_OR_CDECL _Stoldx(
-    const char*, _Out_opt_ _Deref_post_opt_valid_ char**, long, int*);
 _CRTIMP2_PURE long __CLRCALL_PURE_OR_CDECL _Stolx(const char*, _Out_opt_ _Deref_post_opt_valid_ char**, int, int*);
 _CRTIMP2_PURE unsigned long __CLRCALL_PURE_OR_CDECL _Stoulx(
     const char*, _Out_opt_ _Deref_post_opt_valid_ char**, int, int*);
diff --git a/stl/src/special_math.cpp b/stl/src/special_math.cpp
@@ -8,14 +8,9 @@
 #include <utility>
 
 #pragma warning(push)
-#pragma warning(disable : 4619) // #pragma warning: there is no warning number '%d'
-#pragma warning(disable : 4643) // Forward declaring '%s' in namespace std is not permitted by the C++ Standard
 #pragma warning(disable : 4702) // unreachable code
-#pragma warning(disable : 5219) // implicit conversion from '%s' to '%s', possible loss of data
 #pragma warning(disable : 6326) // potential comparison of a constant with another constant
 
-#define BOOST_CHRONO_HEADER_ONLY
-#define BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE
 #define BOOST_MATH_DOMAIN_ERROR_POLICY   errno_on_error
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 
diff --git a/stl/src/xstod.cpp b/stl/src/xstod.cpp
@@ -13,9 +13,11 @@
 
 _EXTERN_C_UNLESS_PURE
 
+// TRANSITION, ABI: preserved for binary compatibility
 _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL _Stodx(const CTYPE* s, CTYPE** endptr, long pten, int* perr)
 #include "xxstod.hpp"
 
+    // TRANSITION, ABI: preserved for binary compatibility
     _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL
     _Stod(const CTYPE* s, CTYPE** endptr, long pten) { // convert string, discard error code
     return _Stodx(s, endptr, pten, nullptr);
diff --git a/stl/src/xstof.cpp b/stl/src/xstof.cpp
@@ -13,9 +13,11 @@
 
 _EXTERN_C_UNLESS_PURE
 
+// TRANSITION, ABI: preserved for binary compatibility
 _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL _Stofx(const CTYPE* s, CTYPE** endptr, long pten, int* perr)
 #include "xxstod.hpp"
 
+    // TRANSITION, ABI: preserved for binary compatibility
     _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL
     _Stof(const CTYPE* s, CTYPE** endptr, long pten) { // convert string, discard error code
     return _Stofx(s, endptr, pten, nullptr);
diff --git a/stl/src/xstold.cpp b/stl/src/xstold.cpp
@@ -13,9 +13,11 @@
 
 _EXTERN_C_UNLESS_PURE
 
+// TRANSITION, ABI: preserved for binary compatibility
 _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL _Stoldx(const CTYPE* s, CTYPE** endptr, long pten, int* perr)
 #include "xxstod.hpp"
 
+    // TRANSITION, ABI: preserved for binary compatibility
     _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL
     _Stold(const CTYPE* s, CTYPE** endptr, long pten) { // convert string, discard error code
     return _Stoldx(s, endptr, pten, nullptr);
diff --git a/stl/src/xwstod.cpp b/stl/src/xwstod.cpp
@@ -12,9 +12,11 @@
 
 _EXTERN_C_UNLESS_PURE
 
+// TRANSITION, ABI: preserved for binary compatibility
 _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL _WStodx(const CTYPE* s, CTYPE** endptr, long pten, int* perr)
 #include "xxstod.hpp"
 
+    // TRANSITION, ABI: preserved for binary compatibility
     _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL
     _WStod(const CTYPE* s, CTYPE** endptr, long pten) { // convert string, discard error code
     return _WStodx(s, endptr, pten, nullptr);
diff --git a/stl/src/xwstof.cpp b/stl/src/xwstof.cpp
@@ -11,9 +11,11 @@
 
 _EXTERN_C_UNLESS_PURE
 
+// TRANSITION, ABI: preserved for binary compatibility
 _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL _WStofx(const CTYPE* s, CTYPE** endptr, long pten, int* perr)
 #include "xxstod.hpp"
 
+    // TRANSITION, ABI: preserved for binary compatibility
     _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL
     _WStof(const CTYPE* s, CTYPE** endptr, long pten) { // convert string, discard error code
     return _WStofx(s, endptr, pten, nullptr);
diff --git a/stl/src/xwstold.cpp b/stl/src/xwstold.cpp
@@ -11,9 +11,11 @@
 
 _EXTERN_C_UNLESS_PURE
 
+// TRANSITION, ABI: preserved for binary compatibility
 _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL _WStoldx(const CTYPE* s, CTYPE** endptr, long pten, int* perr)
 #include "xxstod.hpp"
 
+    // TRANSITION, ABI: preserved for binary compatibility
     _CRTIMP2_PURE FTYPE __CLRCALL_PURE_OR_CDECL
     _WStold(const CTYPE* s, CTYPE** endptr, long pten) { // convert string, discard error code
     return _WStoldx(s, endptr, pten, nullptr);
diff --git a/tests/libcxx/expected_results.txt b/tests/libcxx/expected_results.txt
@@ -1038,6 +1038,10 @@ std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable.pass.cp
 std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable.pass.cpp:0 FAIL
 std/utilities/tuple/tuple.tuple/tuple.cnstr/convert_const_move.pass.cpp FAIL
 
+# Not yet analyzed, possible path length issue. With a repo root of D:\GitHub\STL (13 characters), fails with:
+# "error RC2136 : missing '=' in EXSTYLE=<flags>" followed by "LINK : fatal error LNK1327: failure during running rc.exe"
+std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until_deadlock_bug.pass.cpp SKIPPED
+
 
 # *** XFAILs WHICH PASS ***
 # Nothing here! :-)
diff --git a/tests/libcxx/skipped_tests.txt b/tests/libcxx/skipped_tests.txt
@@ -1038,6 +1038,10 @@ utilities\meta\meta.unary\meta.unary.prop\is_nothrow_copy_assignable.pass.cpp
 utilities\meta\meta.unary\meta.unary.prop\is_nothrow_move_assignable.pass.cpp
 utilities\tuple\tuple.tuple\tuple.cnstr\convert_const_move.pass.cpp
 
+# Not yet analyzed, possible path length issue. With a repo root of D:\GitHub\STL (13 characters), fails with:
+# "error RC2136 : missing '=' in EXSTYLE=<flags>" followed by "LINK : fatal error LNK1327: failure during running rc.exe"
+thread\thread.mutex\thread.mutex.requirements\thread.sharedtimedmutex.requirements\thread.sharedtimedmutex.class\try_lock_until_deadlock_bug.pass.cpp
+
 
 # *** SKIPPED FOR MSVC-INTERNAL CONTEST ONLY ***
 # "XFAIL: msvc" or "XFAIL: clang"
diff --git a/tests/std/tests/P0323R12_expected/test.cpp b/tests/std/tests/P0323R12_expected/test.cpp
@@ -247,9 +247,7 @@ namespace test_expected {
 
         { // Check payload type
             using Expected = expected<payload_copy_constructor, int>;
-#ifndef __clang__ // TRANSITION, LLVM-46269
             static_assert(is_trivially_copy_constructible_v<Expected> == should_be_trivial);
-#endif // !__clang__
             static_assert(is_copy_constructible_v<Expected>);
 
             const Expected with_value{in_place};
@@ -267,9 +265,7 @@ namespace test_expected {
 
         { // Check error type
             using Expected = expected<int, payload_copy_constructor>;
-#ifndef __clang__ // TRANSITION, LLVM-46269
             static_assert(is_trivially_copy_constructible_v<Expected> == should_be_trivial);
-#endif // !__clang__
             static_assert(is_copy_constructible_v<Expected>);
 
             const Expected with_value{in_place};
@@ -287,9 +283,7 @@ namespace test_expected {
 
         { // Check void payload
             using Expected = expected<void, payload_copy_constructor>;
-#ifndef __clang__ // TRANSITION, LLVM-46269
             static_assert(is_trivially_copy_constructible_v<Expected> == should_be_trivial);
-#endif // !__clang__
             static_assert(is_copy_constructible_v<Expected>);
 
             const Expected with_value{in_place};
@@ -339,9 +333,7 @@ namespace test_expected {
 
         { // Check payload type
             using Expected = expected<payload_move_constructor, int>;
-#ifndef __clang__ // TRANSITION, LLVM-46269
             static_assert(is_trivially_move_constructible_v<Expected> == should_be_trivial);
-#endif // !__clang__
             static_assert(is_move_constructible_v<Expected>);
 
             Expected value_input{in_place};
@@ -359,9 +351,7 @@ namespace test_expected {
 
         { // Check error type
             using Expected = expected<int, payload_move_constructor>;
-#ifndef __clang__ // TRANSITION, LLVM-46269
             static_assert(is_trivially_move_constructible_v<Expected> == should_be_trivial);
-#endif // !__clang__
             static_assert(is_move_constructible_v<Expected>);
 
             Expected value_input{in_place};
@@ -379,9 +369,7 @@ namespace test_expected {
 
         { // Check void payload
             using Expected = expected<void, payload_move_constructor>;
-#ifndef __clang__ // TRANSITION, LLVM-46269
             static_assert(is_trivially_move_constructible_v<Expected> == should_be_trivial);
-#endif // !__clang__
             static_assert(is_move_constructible_v<Expected>);
 
             Expected value_input{in_place};
@@ -410,15 +398,12 @@ namespace test_expected {
     template <IsTriviallyDestructible triviallyDestructible>
     struct payload_destructor {
         constexpr payload_destructor(bool& destructor_called) : _destructor_called(destructor_called) {}
-        bool& _destructor_called;
-    };
-    template <> // TRANSITION, LLVM-46269
-    struct payload_destructor<IsTriviallyDestructible::Not> {
-        constexpr payload_destructor(bool& destructor_called) : _destructor_called(destructor_called) {}
-        payload_destructor(const payload_destructor&) = default;
+        // clang-format off
+        constexpr ~payload_destructor() requires (IsYes(triviallyDestructible)) = default;
+        // clang-format on
         constexpr ~payload_destructor() {
             _destructor_called = true;
-        };
+        }
 
         bool& _destructor_called;
     };
@@ -428,9 +413,7 @@ namespace test_expected {
         bool destructor_called    = false;
         { // Check payload
             using Expected = expected<payload_destructor<triviallyDestructible>, int>;
-#ifndef __clang__ // TRANSITION, LLVM-46269
             static_assert(is_trivially_destructible_v<Expected> == is_trivial);
-#endif // !__clang__
 
             Expected val{in_place, destructor_called};
         }
@@ -439,9 +422,7 @@ namespace test_expected {
 
         { // Check error
             using Expected = expected<int, payload_destructor<triviallyDestructible>>;
-#ifndef __clang__ // TRANSITION, LLVM-46269
             static_assert(is_trivially_destructible_v<Expected> == is_trivial);
-#endif // !__clang__
 
             Expected err{unexpect, destructor_called};
         }
@@ -450,9 +431,7 @@ namespace test_expected {
 
         { // Check void error
             using Expected = expected<void, payload_destructor<triviallyDestructible>>;
-#ifndef __clang__ // TRANSITION, LLVM-46269
             static_assert(is_trivially_destructible_v<Expected> == is_trivial);
-#endif // !__clang__
 
             Expected err{unexpect, destructor_called};
         }
diff --git a/tests/std/tests/P0896R4_ranges_alg_is_permutation/test.cpp b/tests/std/tests/P0896R4_ranges_alg_is_permutation/test.cpp
@@ -142,7 +142,8 @@ struct instantiator {
 
                 NonCopyableBool()                       = default;
                 NonCopyableBool(const NonCopyableBool&) = delete;
-            } b;
+            };
+            NonCopyableBool b;
             assert(ranges::is_permutation(range2, range2, [&](auto, auto) -> NonCopyableBool& { return b; }));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,6 @@ public:`
`321`	`321`	`}`
`322`	`322`
`323`	`323`	`// clang-format off`
`324`		`- // TRANSITION, LLVM-46269, destructor order is significant`
`325`	`324`	`~expected() requires is_trivially_destructible_v<_Ty> && is_trivially_destructible_v<_Err> = default;`
`326`	`325`	`// clang-format on`
`327`	`326`
`@@ -842,7 +841,6 @@ public:`
`842`	`841`	`}`
`843`	`842`
`844`	`843`	`// clang-format off`
`845`		`- // TRANSITION, LLVM-46269, destructor order is significant`
`846`	`844`	`~expected() requires is_trivially_destructible_v<_Err> = default;`
`847`	`845`	`// clang-format on`
`848`	`846`
Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,6 @@ public:`
`639`	`639`	`_Raw_clear();`
`640`	`640`	`}`
`641`	`641`
`642`		`- // TRANSITION, LLVM-46269, destructor order is significant`
`643`	`642`	`// clang-format off`
`644`	`643`	`constexpr ~_Variantish() requires is_trivially_destructible_v<_Ty1> && is_trivially_destructible_v<_Ty2> = default;`
`645`	`644`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,6 @@ namespace ranges {`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`
`268`		`- // TRANSITION, LLVM-46269, destructor order is significant`
`269`	`268`	`// clang-format off`
`270`	`269`	`~_Movable_box() requires is_trivially_destructible_v<_Ty> = default;`
`271`	`270`
`@@ -483,7 +482,6 @@ namespace ranges {`
`483`	`482`	`}`
`484`	`483`	`}`
`485`	`484`
`486`		`- // TRANSITION, LLVM-46269, destructor order is significant`
`487`	`485`	`// clang-format off`
`488`	`486`	`~_Defaultabox() requires is_trivially_destructible_v<_Ty> = default;`
`489`	`487`
`@@ -701,7 +699,6 @@ namespace ranges {`
`701`	`699`	`}`
`702`	`700`	`}`
`703`	`701`
`704`		`- // TRANSITION, LLVM-46269, destructor order is significant`
`705`	`702`	`// clang-format off`
`706`	`703`	`~_Non_propagating_cache() requires is_trivially_destructible_v<_Ty> = default;`
`707`	`704`	`// clang-format on`