Merge pull request #5648 from StephanTLavavej/merge-flat_map

Merge `main` to `feature/flat_map`

Author: StephanTLavavej

CMakeLists.txt

@@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 3.31.0)
 set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 project(msvc_standard_libraries LANGUAGES CXX)
 
-if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.44.35209")
-    message(FATAL_ERROR "The STL must be built with VS 2022 17.14.5 Preview 1 or later.")
+if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.44.35211")
+    message(FATAL_ERROR "The STL must be built with VS 2022 17.14.8 Preview 1 or later.")
 endif()
 
 include(CheckCXXSourceCompiles)
@@ -67,11 +67,6 @@ elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "x64")
     set(VCLIBS_I386_OR_AMD64 "amd64")
     set(VCLIBS_X86_OR_X64 "x64")
     add_compile_definitions(_AMD64_ _VCRT_WIN32_WINNT=0x0501 _STL_WIN32_WINNT=0x0501)
-elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^(arm|armv7)$")
-    set(VCLIBS_TARGET_ARCHITECTURE "arm")
-    set(VCLIBS_I386_OR_AMD64 "arm")
-    set(VCLIBS_X86_OR_X64 "arm")
-    add_compile_definitions(_ARM_ _VCRT_WIN32_WINNT=0x0602 _STL_WIN32_WINNT=0x0602)
 elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "arm64")
     set(VCLIBS_TARGET_ARCHITECTURE "arm64")
     set(VCLIBS_I386_OR_AMD64 "arm64")

CMakePresets.json

@@ -46,26 +46,6 @@
         ]
       }
     },
-    {
-      "name": "ARM",
-      "inherits": "base",
-      "description": "ARM Ninja Config",
-      "architecture": {
-        "strategy": "external",
-        "value": "ARM"
-      },
-      "condition": {
-        "type": "inList",
-        "string": "$env{Platform}",
-        "list": [
-          "arm",
-          ""
-        ]
-      },
-      "cacheVariables": {
-        "TESTS_BUILD_ONLY": true
-      }
-    },
     {
       "name": "ARM64",
       "inherits": "base",
@@ -119,11 +99,6 @@
       "configurePreset": "x64",
       "description": "Build x64 STL"
     },
-    {
-      "name": "ARM",
-      "configurePreset": "ARM",
-      "description": "Build ARM STL"
-    },
     {
       "name": "ARM64",
       "configurePreset": "ARM64",

README.md

@@ -39,7 +39,7 @@ soon as possible.)
 and fully ported libcxx to run under [lit][] using the various configurations/compilers we test internally.
 
 * Continuous Integration: **In progress.** We've set up Azure Pipelines to validate changes to the repository.
-Currently, it builds the STL (native desktop for x86, x64, ARM, and ARM64). Also, it strictly verifies that all of our
+Currently, it builds the STL (native desktop for x86, x64, and ARM64). Also, it strictly verifies that all of our
 files have been formatted with [clang-format][] and follow our other whitespace conventions.
 
 * Contribution Guidelines: **Coming soon.** Working on the STL's code involves following many rules. We have codebase
@@ -141,12 +141,10 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
 
 # How To Build With The Visual Studio IDE
 
-1. Install Visual Studio 2022 17.14.5 Preview 1 or later.
+1. Install Visual Studio 2022 17.14.8 Preview 1 or later.
     * Select "Windows 11 SDK (10.0.26100.3916)" in the VS Installer.
     * Select "MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)" in the VS Installer
     if you would like to build the ARM64/ARM64EC target.
-    * Select "MSVC v143 - VS 2022 C++ ARM build tools (Latest)" in the VS Installer
-    if you would like to build the ARM target.
     * 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.31.0 or later, and [Ninja][] 1.12.1 or later.
@@ -160,12 +158,10 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
 
 # How To Build With A Native Tools Command Prompt
 
-1. Install Visual Studio 2022 17.14.5 Preview 1 or later.
+1. Install Visual Studio 2022 17.14.8 Preview 1 or later.
     * Select "Windows 11 SDK (10.0.26100.3916)" in the VS Installer.
     * Select "MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)" in the VS Installer
     if you would like to build the ARM64/ARM64EC target.
-    * Select "MSVC v143 - VS 2022 C++ ARM build tools (Latest)" in the VS Installer
-    if you would like to build the ARM target.
     * 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.31.0 or later, and [Ninja][] 1.12.1 or later.
@@ -188,14 +184,6 @@ To build the x64 target (recommended):
 3. `cmake --preset x64`
 4. `cmake --build --preset x64`
 
-To build the ARM target:
-
-1. `"C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Auxiliary\Build\vcvarsall.bat" x64_arm`
-    * If you installed VS to a non-default location, change this path accordingly.
-2. Change directories to the previously cloned `STL` directory.
-3. `cmake --preset ARM`
-4. `cmake --build --preset ARM`
-
 To build the ARM64 target:
 
 1. `"C:\Program Files\Microsoft Visual Studio\2022\Preview\VC\Auxiliary\Build\vcvarsall.bat" x64_arm64`

azure-devops/asan-pipeline.yml

@@ -45,4 +45,4 @@ stages:
           asanBuild: true
           testTargets: STL-ASan-CI
 
-  # no coverage for ARM and ARM64
+  # no coverage for ARM64

azure-devops/config.yml

@@ -5,7 +5,7 @@
 
 variables:
 - name: poolName
-  value: 'StlBuild-2025-06-10T1243-Pool'
+  value: 'StlBuild-2025-07-09T1240-Pool'
   readonly: true
 - name: poolDemands
   value: 'EnableSpotVM -equals false'

azure-devops/provision-image.ps1

@@ -25,7 +25,6 @@ $VisualStudioWorkloads = @(
   'Microsoft.VisualStudio.Component.VC.CMake.Project',
   'Microsoft.VisualStudio.Component.VC.CoreIde',
   'Microsoft.VisualStudio.Component.VC.Llvm.Clang',
-  'Microsoft.VisualStudio.Component.VC.Tools.ARM',
   'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
   'Microsoft.VisualStudio.Component.VC.Tools.ARM64EC',
   'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
@@ -40,10 +39,10 @@ foreach ($workload in $VisualStudioWorkloads) {
 }
 
 # https://github.com/PowerShell/PowerShell/releases/latest
-$PowerShellUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.5.1/PowerShell-7.5.1-win-x64.msi'
+$PowerShellUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.5.2/PowerShell-7.5.2-win-x64.msi'
 $PowerShellArgs = @('/quiet', '/norestart')
 
-$PythonUrl = 'https://www.python.org/ftp/python/3.13.4/python-3.13.4-amd64.exe'
+$PythonUrl = 'https://www.python.org/ftp/python/3.13.5/python-3.13.5-amd64.exe'
 $PythonArgs = @('/quiet', 'InstallAllUsers=1', 'PrependPath=1', 'CompileAll=1', 'Include_doc=0')
 
 $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.4.0/local_installers/cuda_12.4.0_551.61_windows.exe'

azure-pipelines.yml

@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-# Build STL targeting x86, x64, arm, arm64, arm64ec
+# Build STL targeting x86, x64, arm64, arm64ec
 
 variables:
   - template: azure-devops/config.yml
@@ -52,22 +52,6 @@ stages:
           numShards: 1
           skipTesting: true
 
-#  - stage: Early_Build_ARM
-#    dependsOn: []
-#    displayName: 'Early Build ARM'
-#    pool:
-#      name: ${{ variables.poolName }}
-#      demands: ${{ variables.poolDemands }}
-#    jobs:
-#      - template: azure-devops/build-and-test.yml
-#        parameters:
-#          hostArch: x64
-#          targetArch: arm
-#          targetPlatform: arm
-#          analyzeBuild: true
-#          numShards: 1
-#          skipTesting: true
-
   - stage: Early_Build_ARM64
     dependsOn: []
     displayName: 'Early Build ARM64'
@@ -107,7 +91,6 @@ stages:
       - Code_Format
       - Early_Build_x64
       - Early_Build_x86
-#      - Early_Build_ARM
       - Early_Build_ARM64
       - Early_Build_ARM64EC
     displayName: 'Build and Test x64'
@@ -134,20 +117,6 @@ stages:
           targetArch: x86
           targetPlatform: x86
 
-#  - stage: Build_And_Test_ARM
-#    dependsOn: Build_And_Test_x64
-#    displayName: 'Build and Test ARM'
-#    pool:
-#      name: ${{ variables.poolName }}
-#      demands: ${{ variables.poolDemands }}
-#    jobs:
-#      - template: azure-devops/build-and-test.yml
-#        parameters:
-#          hostArch: x64
-#          targetArch: arm
-#          targetPlatform: arm
-#          testsBuildOnly: true
-
   - stage: Build_And_Test_ARM64
     dependsOn: Build_And_Test_x64
     displayName: 'Build and Test ARM64'

benchmarks/CMakeLists.txt

@@ -23,8 +23,6 @@ if(DEFINED STL_BINARY_DIR)
         set(VCLIBS_I386_OR_AMD64 "i386")
     elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "x64")
         set(VCLIBS_I386_OR_AMD64 "amd64")
-    elseif(VCLIBS_TARGET_ARCHITECTURE MATCHES "^(arm|armv7)$")
-        set(VCLIBS_I386_OR_AMD64 "arm")
     elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "arm64")
         set(VCLIBS_I386_OR_AMD64 "arm64")
     elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "arm64ec")

benchmarks/src/includes.cpp

@@ -7,6 +7,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <iostream>
+#include <limits>
 #include <random>
 #include <ranges>
 #include <type_traits>
@@ -74,9 +75,8 @@ void bm_includes(benchmark::State& state) {
 
     if (!expected_match) {
         const T v = needle[needle_size / 2];
-        const T r = static_cast<T>(static_cast<make_unsigned_t<T>>(v) + 1);
+        const T r = v != numeric_limits<T>::max() ? v + 1 : v - 1;
         ranges::replace(hay, v, r);
-        ranges::sort(hay);
     }
 
     for (auto _ : state) {

stl/CMakeLists.txt

@@ -421,7 +421,7 @@ set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "")
 set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "")
 
 # Toolset options must appear before add_library() for the options to take effect.
-add_compile_definitions(_CRTBLD _VCRT_ALLOW_INTERNALS _HAS_OLD_IOSTREAMS_MEMBERS=1)
+add_compile_definitions(_CRTBLD _HAS_OLD_IOSTREAMS_MEMBERS=1)
 
 # /Z7 for MSVC, /Zi for MASM
 set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "Embedded")