Merge remote-tracking branch 'upstream/main' into to_underlying

Author: SuperWig

CMakeLists.txt

@@ -67,7 +67,7 @@ add_compile_definitions(
     _ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH WIN32_LEAN_AND_MEAN STRICT _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS
     _CRT_DECLARE_NONSTDC_NAMES=1 )
 
-add_compile_options(/diagnostics:caret /W4 /WX /w14265 /w15038 /d1FastFail /guard:cf /Z7 /Gm- /Gy /Zp8 /std:c++latest /permissive- /Zc:threadSafeInit- /Zl)
+add_compile_options(/diagnostics:caret /W4 /WX /w14265 /w15038 /d1FastFail /guard:cf /Z7 /Gm- /Gy /Zp8 /std:c++latest /permissive- /Zc:threadSafeInit- /Zl /ZH:SHA_256)
 
 set(VCLIBS_DEBUG_OPTIONS "/Od")
 set(VCLIBS_RELEASE_OPTIONS "/O2;/Os") # TRANSITION: Potentially remove /Os

README.md

@@ -143,7 +143,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
 The STL uses boost-math headers to provide P0226R1 Mathematical Special Functions. We recommend using [vcpkg][] to
 acquire this dependency.
 
-1. Install Visual Studio 2019 16.10 Preview 4 or later.
+1. Install Visual Studio 2019 16.11 Preview 1 or later.
     * We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
     This will ensure that you're using supported versions of CMake and Ninja.
     * Otherwise, install [CMake][] 3.20 or later, and [Ninja][] 1.10.2 or later.
@@ -158,7 +158,7 @@ acquire this dependency.
 
 # How To Build With A Native Tools Command Prompt
 
-1. Install Visual Studio 2019 16.10 Preview 4 or later.
+1. Install Visual Studio 2019 16.11 Preview 1 or later.
     * We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
     This will ensure that you're using supported versions of CMake and Ninja.
     * Otherwise, install [CMake][] 3.20 or later, and [Ninja][] 1.10.2 or later.

azure-devops/create-vmss.ps1

@@ -27,7 +27,7 @@ $ProtoVMName = 'PROTOTYPE'
 $LiveVMPrefix = 'BUILD'
 $ImagePublisher = 'MicrosoftWindowsDesktop'
 $ImageOffer = 'Windows-10'
-$ImageSku = '20h2-ent-g2'
+$ImageSku = '21h1-ent-g2'
 
 $ProgressActivity = 'Creating Scale Set'
 $TotalProgress = 14
@@ -310,6 +310,8 @@ Write-Progress `
   -Status 'Sleeping after restart' `
   -PercentComplete (100 / $TotalProgress * $CurrentProgress++)
 
+# The VM appears to be busy immediately after restarting.
+# This workaround waits for a minute before attempting to run sysprep.ps1.
 Start-Sleep -Seconds 60
 
 ####################################################################################################

azure-pipelines.yml

@@ -8,7 +8,7 @@ variables:
   buildOutputLocation: 'D:\build'
   vcpkgLocation: '$(Build.SourcesDirectory)/vcpkg'
 
-pool: 'StlBuild-2021-05-18'
+pool: 'StlBuild-2021-06-02'
 
 stages:
   - stage: Code_Format

stl/CMakeLists.txt

@@ -5,6 +5,7 @@ set(HEADERS
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_all_public_headers.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_system_error_abi.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_tzdb.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/inc/__msvc_xlocinfo_types.hpp
     ${CMAKE_CURRENT_LIST_DIR}/inc/algorithm
     ${CMAKE_CURRENT_LIST_DIR}/inc/any
     ${CMAKE_CURRENT_LIST_DIR}/inc/array
@@ -220,7 +221,6 @@ set(HEADERS
     ${CMAKE_CURRENT_LIST_DIR}/inc/xlocale
     ${CMAKE_CURRENT_LIST_DIR}/inc/xlocbuf
     ${CMAKE_CURRENT_LIST_DIR}/inc/xlocinfo
-    ${CMAKE_CURRENT_LIST_DIR}/inc/xlocinfo.h
     ${CMAKE_CURRENT_LIST_DIR}/inc/xlocmes
     ${CMAKE_CURRENT_LIST_DIR}/inc/xlocmon
     ${CMAKE_CURRENT_LIST_DIR}/inc/xlocnum

stl/inc/__msvc_xlocinfo_types.hpp

@@ -0,0 +1,47 @@
+// __msvc_xlocinfo_types.hpp internal header (core)
+
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+#pragma once
+#ifndef __MSVC_XLOCINFO_TYPES_HPP
+#define __MSVC_XLOCINFO_TYPES_HPP
+#include <yvals_core.h>
+#if _STL_COMPILER_PREPROCESSOR
+
+#pragma pack(push, _CRT_PACKING)
+#pragma warning(push, _STL_WARNING_LEVEL)
+#pragma warning(disable : _STL_DISABLED_WARNINGS)
+_STL_DISABLE_CLANG_WARNINGS
+#pragma push_macro("new")
+#undef new
+
+_EXTERN_C_UNLESS_PURE
+
+struct _Collvec { // stuff needed by _Strcoll, etc.
+    unsigned int _Page; // UINT
+    wchar_t* _LocaleName;
+};
+
+struct _Ctypevec { // stuff needed by _Tolower, etc.
+    unsigned int _Page; // UINT
+    const short* _Table;
+    int _Delfl;
+    wchar_t* _LocaleName;
+};
+
+struct _Cvtvec { // stuff needed by _Mbrtowc, etc.
+    unsigned int _Page; // UINT
+    unsigned int _Mbcurmax;
+    int _Isclocale; // LCID == _CLOCALEHANDLE
+    unsigned char _Isleadbyte[32]; // 256 bits
+};
+
+_END_EXTERN_C_UNLESS_PURE
+
+#pragma pop_macro("new")
+_STL_RESTORE_CLANG_WARNINGS
+#pragma warning(pop)
+#pragma pack(pop)
+#endif // _STL_COMPILER_PREPROCESSOR
+#endif // __MSVC_XLOCINFO_TYPES_HPP

stl/inc/algorithm

@@ -4072,9 +4072,12 @@ namespace ranges {
 
     // VARIABLE ranges::unique_copy
     // clang-format off
+    template <class _It, class _Ty>
+    concept _Is_input_with_value_type = input_iterator<_It> && same_as<iter_value_t<_It>, _Ty>;
+
     template <class _It, class _Out>
     concept _Can_reread_or_store = forward_iterator<_It>
-                                || (input_iterator<_Out> && same_as<iter_value_t<_It>, iter_value_t<_Out>>)
+                                || _Is_input_with_value_type<_Out, iter_value_t<_It>>
                                 || indirectly_copyable_storable<_It, _Out>;
     // clang-format on
     class _Unique_copy_fn : private _Not_quite_object {
@@ -4127,7 +4130,7 @@ namespace ranges {
                 return {_STD move(_First), _STD move(_Result)};
             }
 
-            if constexpr (input_iterator<_Out> && same_as<iter_value_t<_It>, iter_value_t<_Out>>) {
+            if constexpr (_Is_input_with_value_type<_Out, iter_value_t<_It>>) {
                 // Can reread _Result
                 *_Result = *_First;
 
@@ -10257,12 +10260,27 @@ namespace ranges {
 
             using _Memcmp_classification_pred =
                 typename decltype(_Lex_compare_memcmp_classify(_First1, _First2, _Pred))::_Pred;
-            if constexpr (!is_void_v<_Memcmp_classification_pred> && sized_sentinel_for<_Se1, _It1> //
-                          && sized_sentinel_for<_Se2, _It2> && same_as<_Pj1, identity> && same_as<_Pj2, identity>) {
+            constexpr bool _Is_sized1 = sized_sentinel_for<_Se1, _It1>;
+            constexpr bool _Is_sized2 = sized_sentinel_for<_Se2, _It2>;
+            if constexpr (!is_void_v<_Memcmp_classification_pred> && _Sized_or_unreachable_sentinel_for<_Se1, _It1> //
+                          && _Sized_or_unreachable_sentinel_for<_Se2, _It2> //
+                          && same_as<_Pj1, identity> && same_as<_Pj2, identity>) {
                 if (!_STD is_constant_evaluated()) {
-                    const auto _Num1 = static_cast<size_t>(_Last1 - _First1);
-                    const auto _Num2 = static_cast<size_t>(_Last2 - _First2);
-                    const int _Ans   = _Memcmp_count(_First1, _First2, (_STD min)(_Num1, _Num2));
+                    size_t _Num1;
+                    if constexpr (_Is_sized1) {
+                        _Num1 = static_cast<size_t>(_Last1 - _First1);
+                    } else {
+                        _Num1 = SIZE_MAX;
+                    }
+
+                    size_t _Num2;
+                    if constexpr (_Is_sized2) {
+                        _Num2 = static_cast<size_t>(_Last2 - _First2);
+                    } else {
+                        _Num2 = SIZE_MAX;
+                    }
+
+                    const int _Ans = _Memcmp_count(_First1, _First2, (_STD min)(_Num1, _Num2));
                     return _Memcmp_classification_pred{}(_Ans, 0) || (_Ans == 0 && _Num1 < _Num2);
                 }
             }

stl/inc/bit

@@ -96,23 +96,6 @@ _NODISCARD constexpr _Ty rotr(const _Ty _Val, const int _Rotation) noexcept {
     }
 }
 
-// Implementation of popcount without using specialized CPU instructions.
-// Used at compile time and when said instructions are not supported.
-template <class _Ty>
-_NODISCARD constexpr int _Popcount_fallback(_Ty _Val) noexcept {
-    constexpr int _Digits = numeric_limits<_Ty>::digits;
-    // we static_cast these bit patterns in order to truncate them to the correct size
-    _Val = static_cast<_Ty>(_Val - ((_Val >> 1) & static_cast<_Ty>(0x5555'5555'5555'5555ull)));
-    _Val = static_cast<_Ty>((_Val & static_cast<_Ty>(0x3333'3333'3333'3333ull))
-                            + ((_Val >> 2) & static_cast<_Ty>(0x3333'3333'3333'3333ull)));
-    _Val = static_cast<_Ty>((_Val + (_Val >> 4)) & static_cast<_Ty>(0x0F0F'0F0F'0F0F'0F0Full));
-    for (int _Shift_digits = 8; _Shift_digits < _Digits; _Shift_digits <<= 1) {
-        _Val = static_cast<_Ty>(_Val + static_cast<_Ty>(_Val >> _Shift_digits));
-    }
-    // we want the bottom "slot" that's big enough to store _Digits
-    return static_cast<int>(_Val & static_cast<_Ty>(_Digits + _Digits - 1));
-}
-
 #if defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
 
 extern "C" {
@@ -184,32 +167,8 @@ _NODISCARD int _Checked_x86_x64_countl_zero(const _Ty _Val) noexcept {
     }
 #endif // __AVX2__
 }
-
-template <class _Ty>
-_NODISCARD int _Checked_x86_x64_popcount(const _Ty _Val) noexcept {
-    constexpr int _Digits = numeric_limits<_Ty>::digits;
-#ifndef __AVX__
-    const bool _Definitely_have_popcnt = __isa_available >= __ISA_AVAILABLE_SSE42;
-    if (!_Definitely_have_popcnt) {
-        return _Popcount_fallback(_Val);
-    }
-#endif // !defined(__AVX__)
-
-    if constexpr (_Digits <= 16) {
-        return static_cast<int>(__popcnt16(_Val));
-    } else if constexpr (_Digits == 32) {
-        return static_cast<int>(__popcnt(_Val));
-    } else {
-#ifdef _M_IX86
-        return static_cast<int>(__popcnt(_Val >> 32) + __popcnt(static_cast<unsigned int>(_Val)));
-#else // ^^^ _M_IX86 / !_M_IX86 vvv
-        return static_cast<int>(__popcnt64(_Val));
-#endif // _M_IX86
-    }
-}
 #endif // defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
 
-
 #if defined(_M_ARM) || defined(_M_ARM64)
 #ifdef __clang__ // TRANSITION, GH-1586
 _NODISCARD constexpr int _Clang_arm_arm64_countl_zero(const unsigned short _Val) {
@@ -283,14 +242,9 @@ _NODISCARD constexpr int countr_one(const _Ty _Val) noexcept {
     return _Countr_zero(static_cast<_Ty>(~_Val));
 }
 
-template <class _Ty, enable_if_t<_Is_standard_unsigned_integer<_Ty>, int> _Enabled = 0>
+template <class _Ty, enable_if_t<_Is_standard_unsigned_integer<_Ty>, int> = 0>
 _NODISCARD constexpr int popcount(const _Ty _Val) noexcept {
-#if defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
-    if (!_STD is_constant_evaluated()) {
-        return _Checked_x86_x64_popcount(_Val);
-    }
-#endif // defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
-    return _Popcount_fallback(_Val);
+    return _Popcount(_Val);
 }
 
 enum class endian { little = 0, big = 1, native = little };

stl/inc/execution

@@ -927,7 +927,7 @@ struct _Static_partition_range<_FwdIt, _Diff, false> {
         auto _Result                = _Division_points.begin();
         *_Result                    = _Get_unwrapped(_First);
         for (_Diff _Idx{}; _Idx < _Unchunked_items; ++_Idx) { // record bounds of chunks with an extra item
-            for (_Diff _This_chunk_size = _Chunk_size; 0 < _This_chunk_size--;) {
+            for (_Diff _This_chunk_size = _Chunk_size + 1; 0 < _This_chunk_size--;) {
                 if (_First == _Last) {
                     return false;
                 }