Commit 9fe22a29b34e274af4f1d67a08c7757d2d0bc1fa | zig

CMakeLists.txt+3-6

 @@ -133,9 +133,9 @@ else()
     set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")
 endif()
-find_package(llvm 22)
+find_package(llvm 23)
-find_package(clang 22)
+find_package(clang 23)
-find_package(lld 22)
+find_package(lld 23)
 if(ZIG_STATIC_ZLIB)
     if (MSVC)
 @@ -614,9 +614,6 @@ else()
   set(ZIG_WASM2C_COMPILE_FLAGS "-std=c99")
   set(ZIG1_COMPILE_FLAGS "-std=c99 -Oz -fno-strict-aliasing")
   set(ZIG2_COMPILE_FLAGS "-std=c99 -Oz -fno-sanitize=undefined -fno-stack-protector -fno-strict-aliasing")
-  if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND ZIG_HOST_TARGET_ARCH STREQUAL "s390x")
-    string(REPLACE -Oz -O0 ZIG2_COMPILE_FLAGS "${ZIG2_COMPILE_FLAGS}") # llvm 22 assertion failure
-  endif()
   # Must match the condition in build.zig.
   if(ZIG_HOST_TARGET_ARCH MATCHES "^(arm|thumb)(eb)?$" OR ZIG_HOST_TARGET_ARCH EQUAL "hexagon" OR ZIG_HOST_TARGET_ARCH MATCHES "^powerpc(64)?(le)?$")
     set(ZIG1_COMPILE_FLAGS "${ZIG1_COMPILE_FLAGS} -ffunction-sections -fdata-sections")

README.md+41-41

...	@@ -47,7 +47,7 @@ Ensure you have the required dependencies:	...	@@ -47,7 +47,7 @@ Ensure you have the required dependencies:
47		47
48	* CMake >= 3.15	48	* CMake >= 3.15
49	* System C/C++ Toolchain	49	* System C/C++ Toolchain
50	* LLVM, Clang, LLD development libraries, version 22.x, compiled with the	50	* LLVM, Clang, LLD development libraries, version 23.x, compiled with the
51	same system C/C++ toolchain.	51	same system C/C++ toolchain.
52	- If the system package manager lacks these libraries, or has them misconfigured,	52	- If the system package manager lacks these libraries, or has them misconfigured,
53	see below for how to build them from source.	53	see below for how to build them from source.
...	@@ -257,15 +257,15 @@ that you have no trailing slash (`/` or `\`) at the end of the	...	@@ -257,15 +257,15 @@ that you have no trailing slash (`/` or `\`) at the end of the
257		257
258	Install [CMake](https://cmake.org/), version 3.20.0 or newer.	258	Install [CMake](https://cmake.org/), version 3.20.0 or newer.
259		259
260	[Download LLVM, Clang, and LLD sources](https://releases.llvm.org/download.html#22.0.0)	260	[Download LLVM, Clang, and LLD sources](https://releases.llvm.org/download.html#23.0.0)
261	The downloads from llvm lead to the github release pages, where the source's	261	The downloads from llvm lead to the github release pages, where the source's
262	will be listed as : `llvm-22.X.X.src.tar.xz`, `clang-22.X.X.src.tar.xz`,	262	will be listed as : `llvm-23.X.X.src.tar.xz`, `clang-23.X.X.src.tar.xz`,
263	`lld-22.X.X.src.tar.xz`. Unzip each to their own directory. Ensure no	263	`lld-23.X.X.src.tar.xz`. Unzip each to their own directory. Ensure no
264	directories have spaces in them. For example:	264	directories have spaces in them. For example:
265		265
266	* `C:\Users\Andy\llvm-22.0.0.src`	266	* `C:\Users\Andy\llvm-23.0.0.src`
267	* `C:\Users\Andy\clang-22.0.0.src`	267	* `C:\Users\Andy\clang-23.0.0.src`
268	* `C:\Users\Andy\lld-22.0.0.src`	268	* `C:\Users\Andy\lld-23.0.0.src`
269		269
270	Install [Build Tools for Visual Studio	270	Install [Build Tools for Visual Studio
271	2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019).	271	2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019).
...	@@ -298,9 +298,9 @@ Using the start menu, run x64 Native Tools Command Prompt for VS 2019 and ex	...	@@ -298,9 +298,9 @@ Using the start menu, run x64 Native Tools Command Prompt for VS 2019 and ex
298	##### Release Mode	298	##### Release Mode
299		299
300	```bat	300	```bat
301	mkdir C:\Users\Andy\llvm-22.0.0.src\build-release	301	mkdir C:\Users\Andy\llvm-23.0.0.src\build-release
302	cd C:\Users\Andy\llvm-22.0.0.src\build-release	302	cd C:\Users\Andy\llvm-23.0.0.src\build-release
303	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\Andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-release-mt -DCMAKE_PREFIX_PATH=C:\Users\Andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-release-mt -	303	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\Andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-release-mt -DCMAKE_PREFIX_PATH=C:\Users\Andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-release-mt -
304	DLLVM_ENABLE_ZLIB=OFF -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_USE_CRT_RELEASE=MT	304	DLLVM_ENABLE_ZLIB=OFF -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_USE_CRT_RELEASE=MT
305	msbuild /m -p:Configuration=Release INSTALL.vcxproj	305	msbuild /m -p:Configuration=Release INSTALL.vcxproj
306	```	306	```
...	@@ -308,10 +308,10 @@ msbuild /m -p:Configuration=Release INSTALL.vcxproj	...	@@ -308,10 +308,10 @@ msbuild /m -p:Configuration=Release INSTALL.vcxproj
308	##### Debug Mode	308	##### Debug Mode
309		309
310	```bat	310	```bat
311	mkdir C:\Users\Andy\llvm-22.0.0.src\build-debug	311	mkdir C:\Users\Andy\llvm-23.0.0.src\build-debug
312	cd C:\Users\Andy\llvm-22.0.0.src\build-debug	312	cd C:\Users\Andy\llvm-23.0.0.src\build-debug
313	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-debug -	313	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-debug -
314	DLLVM_ENABLE_ZLIB=OFF -DCMAKE_PREFIX_PATH=C:\Users\andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-debug -DCMAKE_BUILD_TYPE=Debug -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AVR" -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_USE_CRT_DEBUG=MTd	314	DLLVM_ENABLE_ZLIB=OFF -DCMAKE_PREFIX_PATH=C:\Users\andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-debug -DCMAKE_BUILD_TYPE=Debug -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AVR" -DLLVM_ENABLE_LIBXML2=OFF -DLLVM_USE_CRT_DEBUG=MTd
315	msbuild /m INSTALL.vcxproj	315	msbuild /m INSTALL.vcxproj
316	```	316	```
317		317
...	@@ -322,18 +322,18 @@ Using the start menu, run x64 Native Tools Command Prompt for VS 2019 and ex	...	@@ -322,18 +322,18 @@ Using the start menu, run x64 Native Tools Command Prompt for VS 2019 and ex
322	##### Release Mode	322	##### Release Mode
323		323
324	```bat	324	```bat
325	mkdir C:\Users\Andy\lld-22.0.0.src\build-release	325	mkdir C:\Users\Andy\lld-23.0.0.src\build-release
326	cd C:\Users\Andy\lld-22.0.0.src\build-release	326	cd C:\Users\Andy\lld-23.0.0.src\build-release
327	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\Andy\llvm+clang+lld-14.0.6-x86_64-windows-msvc-release-mt -DCMAKE_PREFIX_PATH=C:\Users\Andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-release-mt -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_CRT_RELEASE=MT	327	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\Andy\llvm+clang+lld-14.0.6-x86_64-windows-msvc-release-mt -DCMAKE_PREFIX_PATH=C:\Users\Andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-release-mt -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_CRT_RELEASE=MT
328	msbuild /m -p:Configuration=Release INSTALL.vcxproj	328	msbuild /m -p:Configuration=Release INSTALL.vcxproj
329	```	329	```
330		330
331	##### Debug Mode	331	##### Debug Mode
332		332
333	```bat	333	```bat
334	mkdir C:\Users\Andy\lld-22.0.0.src\build-debug	334	mkdir C:\Users\Andy\lld-23.0.0.src\build-debug
335	cd C:\Users\Andy\lld-22.0.0.src\build-debug	335	cd C:\Users\Andy\lld-23.0.0.src\build-debug
336	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-debug -DCMAKE_PREFIX_PATH=C:\Users\andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-debug -DCMAKE_BUILD_TYPE=Debug -DLLVM_USE_CRT_DEBUG=MTd	336	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-debug -DCMAKE_PREFIX_PATH=C:\Users\andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-debug -DCMAKE_BUILD_TYPE=Debug -DLLVM_USE_CRT_DEBUG=MTd
337	msbuild /m INSTALL.vcxproj	337	msbuild /m INSTALL.vcxproj
338	```	338	```
339		339
...	@@ -344,18 +344,18 @@ Using the start menu, run x64 Native Tools Command Prompt for VS 2019 and ex	...	@@ -344,18 +344,18 @@ Using the start menu, run x64 Native Tools Command Prompt for VS 2019 and ex
344	##### Release Mode	344	##### Release Mode
345		345
346	```bat	346	```bat
347	mkdir C:\Users\Andy\clang-22.0.0.src\build-release	347	mkdir C:\Users\Andy\clang-23.0.0.src\build-release
348	cd C:\Users\Andy\clang-22.0.0.src\build-release	348	cd C:\Users\Andy\clang-23.0.0.src\build-release
349	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\Andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-release-mt -DCMAKE_PREFIX_PATH=C:\Users\Andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-release-mt -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_CRT_RELEASE=MT	349	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\Andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-release-mt -DCMAKE_PREFIX_PATH=C:\Users\Andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-release-mt -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_CRT_RELEASE=MT
350	msbuild /m -p:Configuration=Release INSTALL.vcxproj	350	msbuild /m -p:Configuration=Release INSTALL.vcxproj
351	```	351	```
352		352
353	##### Debug Mode	353	##### Debug Mode
354		354
355	```bat	355	```bat
356	mkdir C:\Users\Andy\clang-22.0.0.src\build-debug	356	mkdir C:\Users\Andy\clang-23.0.0.src\build-debug
357	cd C:\Users\Andy\clang-22.0.0.src\build-debug	357	cd C:\Users\Andy\clang-23.0.0.src\build-debug
358	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-debug -DCMAKE_PREFIX_PATH=C:\Users\andy\llvm+clang+lld-22.0.0-x86_64-windows-msvc-debug -DCMAKE_BUILD_TYPE=Debug -DLLVM_USE_CRT_DEBUG=MTd	358	"c:\Program Files\CMake\bin\cmake.exe" .. -Thost=x64 -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX=C:\Users\andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-debug -DCMAKE_PREFIX_PATH=C:\Users\andy\llvm+clang+lld-23.0.0-x86_64-windows-msvc-debug -DCMAKE_BUILD_TYPE=Debug -DLLVM_USE_CRT_DEBUG=MTd
359	msbuild /m INSTALL.vcxproj	359	msbuild /m INSTALL.vcxproj
360	```	360	```
361		361
...	@@ -371,14 +371,14 @@ This is the generally recommended approach.	...	@@ -371,14 +371,14 @@ This is the generally recommended approach.
371		371
372	```sh	372	```sh
373	cd ~/Downloads	373	cd ~/Downloads
374	git clone --depth 1 --branch release/22.x https://github.com/llvm/llvm-project llvm-project-22	374	git clone --depth 1 --branch release/23.x https://github.com/llvm/llvm-project llvm-project-23
375	cd llvm-project-22	375	cd llvm-project-23
376	git checkout release/22.x	376	git checkout release/23.x
377		377
378	mkdir build-release	378	mkdir build-release
379	cd build-release	379	cd build-release
380	cmake ../llvm \	380	cmake ../llvm \
381	-DCMAKE_INSTALL_PREFIX=$HOME/local/llvm22-assert \	381	-DCMAKE_INSTALL_PREFIX=$HOME/local/llvm23-assert \
382	-DCMAKE_BUILD_TYPE=Release \	382	-DCMAKE_BUILD_TYPE=Release \
383	-DLLVM_ENABLE_PROJECTS="lld;clang" \	383	-DLLVM_ENABLE_PROJECTS="lld;clang" \
384	-DLLVM_ENABLE_LIBXML2=OFF \	384	-DLLVM_ENABLE_LIBXML2=OFF \
...	@@ -399,16 +399,16 @@ others are in Release mode.	...	@@ -399,16 +399,16 @@ others are in Release mode.
399		399
400	```sh	400	```sh
401	cd ~/Downloads	401	cd ~/Downloads
402	git clone --depth 1 --branch release/22.x https://github.com/llvm/llvm-project llvm-project-22	402	git clone --depth 1 --branch release/23.x https://github.com/llvm/llvm-project llvm-project-23
403	cd llvm-project-22	403	cd llvm-project-23
404	git checkout release/22.x	404	git checkout release/23.x
405		405
406	# LLVM	406	# LLVM
407	mkdir llvm/build-debug	407	mkdir llvm/build-debug
408	cd llvm/build-debug	408	cd llvm/build-debug
409	cmake .. \	409	cmake .. \
410	-DCMAKE_INSTALL_PREFIX=$HOME/local/llvm22-debug \	410	-DCMAKE_INSTALL_PREFIX=$HOME/local/llvm23-debug \
411	-DCMAKE_PREFIX_PATH=$HOME/local/llvm22-debug \	411	-DCMAKE_PREFIX_PATH=$HOME/local/llvm23-debug \
412	-DCMAKE_BUILD_TYPE=Debug \	412	-DCMAKE_BUILD_TYPE=Debug \
413	-DLLVM_ENABLE_LIBXML2=OFF \	413	-DLLVM_ENABLE_LIBXML2=OFF \
414	-DLLVM_ENABLE_TERMINFO=OFF \	414	-DLLVM_ENABLE_TERMINFO=OFF \
...	@@ -422,8 +422,8 @@ cd ../..	...	@@ -422,8 +422,8 @@ cd ../..
422	mkdir lld/build-debug	422	mkdir lld/build-debug
423	cd lld/build-debug	423	cd lld/build-debug
424	cmake .. \	424	cmake .. \
425	-DCMAKE_INSTALL_PREFIX=$HOME/local/llvm22-debug \	425	-DCMAKE_INSTALL_PREFIX=$HOME/local/llvm23-debug \
426	-DCMAKE_PREFIX_PATH=$HOME/local/llvm22-debug \	426	-DCMAKE_PREFIX_PATH=$HOME/local/llvm23-debug \
427	-DCMAKE_BUILD_TYPE=Release \	427	-DCMAKE_BUILD_TYPE=Release \
428	-DLLVM_PARALLEL_LINK_JOBS=1 \	428	-DLLVM_PARALLEL_LINK_JOBS=1 \
429	-DCMAKE_CXX_STANDARD=17 \	429	-DCMAKE_CXX_STANDARD=17 \
...	@@ -435,8 +435,8 @@ cd ../..	...	@@ -435,8 +435,8 @@ cd ../..
435	mkdir clang/build-debug	435	mkdir clang/build-debug
436	cd clang/build-debug	436	cd clang/build-debug
437	cmake .. \	437	cmake .. \
438	-DCMAKE_INSTALL_PREFIX=$HOME/local/llvm22-debug \	438	-DCMAKE_INSTALL_PREFIX=$HOME/local/llvm23-debug \
439	-DCMAKE_PREFIX_PATH=$HOME/local/llvm22-debug \	439	-DCMAKE_PREFIX_PATH=$HOME/local/llvm23-debug \
440	-DCMAKE_BUILD_TYPE=Release \	440	-DCMAKE_BUILD_TYPE=Release \
441	-DLLVM_PARALLEL_LINK_JOBS=1 \	441	-DLLVM_PARALLEL_LINK_JOBS=1 \
442	-DLLVM_INCLUDE_TESTS=OFF \	442	-DLLVM_INCLUDE_TESTS=OFF \
...	@@ -446,8 +446,8 @@ cd ../..	...	@@ -446,8 +446,8 @@ cd ../..
446	```	446	```
447		447
448	Then add to your Zig CMake line that you got from the README.md:	448	Then add to your Zig CMake line that you got from the README.md:
449	`-DCMAKE_PREFIX_PATH=$HOME/local/llvm22-debug` or	449	`-DCMAKE_PREFIX_PATH=$HOME/local/llvm23-debug` or
450	`-DCMAKE_PREFIX_PATH=$HOME/local/llvm22-assert` depending on whether you want	450	`-DCMAKE_PREFIX_PATH=$HOME/local/llvm23-assert` depending on whether you want
451	Debug or Release LLVM.	451	Debug or Release LLVM.
452		452
453		453

build.zig+8-4

 @@ -1362,20 +1362,23 @@ const clang_libs = [_][]const u8{
     "clangStaticAnalyzerCheckers",
     "clangStaticAnalyzerCore",
     "clangCrossTU",
-    "clangFrontend",
     "clangDriver",
+    "clangScalableStaticAnalysisAnalyses",
+    "clangScalableStaticAnalysisCore",
+    "clangScalableStaticAnalysisFrontend",
+    "clangScalableStaticAnalysisSourceTransformation",
+    "clangDependencyScanning",
+    "clangFrontend",
     "clangOptions",
     "clangSerialization",
     "clangSema",
     "clangAnalysisLifetimeSafety",
     "clangAnalysis",
     "clangASTMatchers",
-    "clangAST",
     "clangParse",
-    "clangSema",
     "clangAPINotes",
-    "clangBasic",
     "clangEdit",
+    "clangUnifiedSymbolResolution",
     "clangLex",
     "clangRewriteFrontend",
     "clangRewrite",
 @@ -1387,6 +1390,7 @@ const clang_libs = [_][]const u8{
     "clangSupport",
     "clangInstallAPI",
     "clangAST",
+    "clangBasic",
 };
 const lld_libs = [_][]const u8{
     "lldMinGW",

ci/aarch64-freebsd-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-freebsd-none"	8	TARGET="aarch64-freebsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-freebsd-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-freebsd-none"	8	TARGET="aarch64-freebsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-linux-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-linux-musl"	8	TARGET="aarch64-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-linux-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-linux-musl"	8	TARGET="aarch64-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-macos-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-macos-none"	8	TARGET="aarch64-macos-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/$CACHE_BASENAME"	11	PREFIX="$HOME/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-macos-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-macos-none"	8	TARGET="aarch64-macos-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/$CACHE_BASENAME"	11	PREFIX="$HOME/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-netbsd-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-netbsd-none"	8	TARGET="aarch64-netbsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-netbsd-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-netbsd-none"	8	TARGET="aarch64-netbsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-openbsd-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-openbsd-none"	8	TARGET="aarch64-openbsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.2030+f955266cf"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-openbsd-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="aarch64-openbsd-none"	8	TARGET="aarch64-openbsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.2030+f955266cf"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/aarch64-windows-debug.ps1+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	$TARGET = "aarch64-windows-gnu"	1	$TARGET = "aarch64-windows-gnu"
2	$MCPU = "baseline"	2	$MCPU = "baseline"
3	$PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	3	$PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
4	$ZIG = "$PREFIX_PATH\bin\zig.exe"	4	$ZIG = "$PREFIX_PATH\bin\zig.exe"
5	$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }	5	$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
6		6

ci/aarch64-windows-release.ps1+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	$TARGET = "aarch64-windows-gnu"	1	$TARGET = "aarch64-windows-gnu"
2	$MCPU = "baseline"	2	$MCPU = "baseline"
3	$PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	3	$PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
4	$ZIG = "$PREFIX_PATH\bin\zig.exe"	4	$ZIG = "$PREFIX_PATH\bin\zig.exe"
5	$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }	5	$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
6		6

ci/loongarch64-linux-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="loongarch64-linux-musl"	8	TARGET="loongarch64-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/loongarch64-linux-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="loongarch64-linux-musl"	8	TARGET="loongarch64-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/powerpc64le-linux-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="powerpc64le-linux-musl"	8	TARGET="powerpc64le-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/powerpc64le-linux-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="powerpc64le-linux-musl"	8	TARGET="powerpc64le-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/riscv64-linux-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="riscv64-linux-musl"	8	TARGET="riscv64-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/riscv64-linux-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="riscv64-linux-musl"	8	TARGET="riscv64-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/s390x-linux-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="s390x-linux-musl"	8	TARGET="s390x-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/s390x-linux-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="s390x-linux-musl"	8	TARGET="s390x-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-freebsd-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="x86_64-freebsd-none"	8	TARGET="x86_64-freebsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-freebsd-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="x86_64-freebsd-none"	8	TARGET="x86_64-freebsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-linux-debug-llvm.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="x86_64-linux-musl"	8	TARGET="x86_64-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-linux-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="x86_64-linux-musl"	8	TARGET="x86_64-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-linux-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="x86_64-linux-musl"	8	TARGET="x86_64-linux-musl"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-netbsd-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="x86_64-netbsd-none"	8	TARGET="x86_64-netbsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-netbsd-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="x86_64-netbsd-none"	8	TARGET="x86_64-netbsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-openbsd-debug.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="x86_64-openbsd-none"	8	TARGET="x86_64-openbsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-openbsd-release.sh+1-1

...	@@ -7,7 +7,7 @@ set -e	...	@@ -7,7 +7,7 @@ set -e
7		7
8	TARGET="x86_64-openbsd-none"	8	TARGET="x86_64-openbsd-none"
9	MCPU="baseline"	9	MCPU="baseline"
10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	10	CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
11	PREFIX="$HOME/deps/$CACHE_BASENAME"	11	PREFIX="$HOME/deps/$CACHE_BASENAME"
12	ZIG="$PREFIX/bin/zig"	12	ZIG="$PREFIX/bin/zig"
13		13

ci/x86_64-windows-debug.ps1+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	$TARGET = "x86_64-windows-gnu"	1	$TARGET = "x86_64-windows-gnu"
2	$MCPU = "baseline"	2	$MCPU = "baseline"
3	$PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	3	$PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
4	$ZIG = "$PREFIX_PATH\bin\zig.exe"	4	$ZIG = "$PREFIX_PATH\bin\zig.exe"
5	$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }	5	$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
6		6

ci/x86_64-windows-release.ps1+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	$TARGET = "x86_64-windows-gnu"	1	$TARGET = "x86_64-windows-gnu"
2	$MCPU = "baseline"	2	$MCPU = "baseline"
3	$PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.17.0-dev.203+073889523"	3	$PREFIX_PATH = "$($Env:USERPROFILE)\deps\zig+llvm+lld+clang-$TARGET-0.18.0-dev.92+1e1964473"
4	$ZIG = "$PREFIX_PATH\bin\zig.exe"	4	$ZIG = "$PREFIX_PATH\bin\zig.exe"
5	$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }	5	$ZSF_MAX_RSS = if ($Env:ZSF_MAX_RSS) { $Env:ZSF_MAX_RSS } else { 0 }
6		6

cmake/Findclang.cmake+11-5

 @@ -17,10 +17,10 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
 if(${LLVM_LINK_MODE} STREQUAL "shared")
   find_library(CLANG_LIBRARIES
     NAMES
-      libclang-cpp.so.22
+      libclang-cpp.so.23
-      libclang-cpp.so.22.1
+      libclang-cpp.so.23.1
-      clang-cpp-22.0
+      clang-cpp-23.0
-      clang-cpp220
+      clang-cpp230
       clang-cpp
     NAMES_PER_DIR
     HINTS "${LLVM_LIBDIRS}"
 @@ -48,8 +48,13 @@ else()
   FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
   FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
   FIND_AND_ADD_CLANG_LIB(clangCrossTU)
-  FIND_AND_ADD_CLANG_LIB(clangFrontend)
   FIND_AND_ADD_CLANG_LIB(clangDriver)
+  FIND_AND_ADD_CLANG_LIB(clangScalableStaticAnalysisAnalyses)
+  FIND_AND_ADD_CLANG_LIB(clangScalableStaticAnalysisCore)
+  FIND_AND_ADD_CLANG_LIB(clangScalableStaticAnalysisFrontend)
+  FIND_AND_ADD_CLANG_LIB(clangScalableStaticAnalysisSourceTransformation)
+  FIND_AND_ADD_CLANG_LIB(clangDependencyScanning)
+  FIND_AND_ADD_CLANG_LIB(clangFrontend)
   FIND_AND_ADD_CLANG_LIB(clangOptions)
   FIND_AND_ADD_CLANG_LIB(clangSerialization)
   FIND_AND_ADD_CLANG_LIB(clangSema)
 @@ -59,6 +64,7 @@ else()
   FIND_AND_ADD_CLANG_LIB(clangParse)
   FIND_AND_ADD_CLANG_LIB(clangAPINotes)
   FIND_AND_ADD_CLANG_LIB(clangEdit)
+  FIND_AND_ADD_CLANG_LIB(clangUnifiedSymbolResolution)
   FIND_AND_ADD_CLANG_LIB(clangLex)
   FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
   FIND_AND_ADD_CLANG_LIB(clangRewrite)

cmake/Findlld.cmake+19-19

...	@@ -9,23 +9,23 @@	...	@@ -9,23 +9,23 @@
9	find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h	9	find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
10	HINTS ${LLVM_INCLUDE_DIRS}	10	HINTS ${LLVM_INCLUDE_DIRS}
11	PATHS	11	PATHS
12	/usr/lib/llvm-22/include	12	/usr/lib/llvm-23/include
13	/usr/local/llvm220/include	13	/usr/local/llvm230/include
14	/usr/local/llvm22/include	14	/usr/local/llvm23/include
15	/usr/local/opt/lld@22/include	15	/usr/local/opt/lld@23/include
16	/opt/homebrew/opt/lld@22/include	16	/opt/homebrew/opt/lld@23/include
17	/home/linuxbrew/.linuxbrew/opt/lld@22/include	17	/home/linuxbrew/.linuxbrew/opt/lld@23/include
18	/mingw64/include)	18	/mingw64/include)
19		19
20	find_library(LLD_LIBRARY NAMES lld-22.0 lld220 lld NAMES_PER_DIR	20	find_library(LLD_LIBRARY NAMES lld-23.0 lld230 lld NAMES_PER_DIR
21	HINTS ${LLVM_LIBDIRS}	21	HINTS ${LLVM_LIBDIRS}
22	PATHS	22	PATHS
23	/usr/lib/llvm-22/lib	23	/usr/lib/llvm-23/lib
24	/usr/local/llvm220/lib	24	/usr/local/llvm230/lib
25	/usr/local/llvm22/lib	25	/usr/local/llvm23/lib
26	/usr/local/opt/lld@22/lib	26	/usr/local/opt/lld@23/lib
27	/opt/homebrew/opt/lld@22/lib	27	/opt/homebrew/opt/lld@23/lib
28	/home/linuxbrew/.linuxbrew/opt/lld@22/lib	28	/home/linuxbrew/.linuxbrew/opt/lld@23/lib
29	)	29	)
30	if(EXISTS ${LLD_LIBRARY})	30	if(EXISTS ${LLD_LIBRARY})
31	set(LLD_LIBRARIES ${LLD_LIBRARY})	31	set(LLD_LIBRARIES ${LLD_LIBRARY})
...	@@ -36,12 +36,12 @@ else()	...	@@ -36,12 +36,12 @@ else()
36	HINTS ${LLVM_LIBDIRS}	36	HINTS ${LLVM_LIBDIRS}
37	PATHS	37	PATHS
38	${LLD_LIBDIRS}	38	${LLD_LIBDIRS}
39	/usr/lib/llvm-22/lib	39	/usr/lib/llvm-23/lib
40	/usr/local/llvm220/lib	40	/usr/local/llvm230/lib
41	/usr/local/llvm22/lib	41	/usr/local/llvm23/lib
42	/usr/local/opt/lld@22/lib	42	/usr/local/opt/lld@23/lib
43	/opt/homebrew/opt/lld@22/lib	43	/opt/homebrew/opt/lld@23/lib
44	/home/linuxbrew/.linuxbrew/opt/lld@22/lib	44	/home/linuxbrew/.linuxbrew/opt/lld@23/lib
45	/mingw64/lib	45	/mingw64/lib
46	/c/msys64/mingw64/lib	46	/c/msys64/mingw64/lib
47	c:/msys64/mingw64/lib)	47	c:/msys64/mingw64/lib)

cmake/Findllvm.cmake+6-6

...	@@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG)	...	@@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG)
17	# terminate when the right LLVM version is not found.	17	# terminate when the right LLVM version is not found.
18	unset(LLVM_CONFIG_EXE CACHE)	18	unset(LLVM_CONFIG_EXE CACHE)
19	find_program(LLVM_CONFIG_EXE	19	find_program(LLVM_CONFIG_EXE
20	NAMES llvm-config-22 llvm-config-22.0 llvm-config220 llvm-config22 llvm-config NAMES_PER_DIR	20	NAMES llvm-config-23 llvm-config-23.0 llvm-config230 llvm-config23 llvm-config NAMES_PER_DIR
21	PATHS	21	PATHS
22	"/mingw64/bin"	22	"/mingw64/bin"
23	"/c/msys64/mingw64/bin"	23	"/c/msys64/mingw64/bin"
24	"c:/msys64/mingw64/bin"	24	"c:/msys64/mingw64/bin"
25	"C:/Libraries/llvm-22.0.0/bin")	25	"C:/Libraries/llvm-23.0.0/bin")
26		26
27	if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")	27	if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
28	if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")	28	if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")
...	@@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG)	...	@@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG)
40	OUTPUT_STRIP_TRAILING_WHITESPACE)	40	OUTPUT_STRIP_TRAILING_WHITESPACE)
41		41
42	get_filename_component(LLVM_CONFIG_DIR "${LLVM_CONFIG_EXE}" DIRECTORY)	42	get_filename_component(LLVM_CONFIG_DIR "${LLVM_CONFIG_EXE}" DIRECTORY)
43	if("${LLVM_CONFIG_VERSION}" VERSION_LESS 22 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 23 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 23)	43	if("${LLVM_CONFIG_VERSION}" VERSION_LESS 23 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 24 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 24)
44	# Save the error message, in case this is the last llvm-config we find	44	# Save the error message, in case this is the last llvm-config we find
45	list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 22.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")	45	list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 23.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
46		46
47	# Ignore this directory and try the search again	47	# Ignore this directory and try the search again
48	list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")	48	list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")
...	@@ -66,9 +66,9 @@ if(ZIG_USE_LLVM_CONFIG)	...	@@ -66,9 +66,9 @@ if(ZIG_USE_LLVM_CONFIG)
66	if (LLVM_CONFIG_ERROR)	66	if (LLVM_CONFIG_ERROR)
67	# Save the error message, in case this is the last llvm-config we find	67	# Save the error message, in case this is the last llvm-config we find
68	if (ZIG_SHARED_LLVM)	68	if (ZIG_SHARED_LLVM)
69	list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 22.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")	69	list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 23.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")
70	else()	70	else()
71	list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 22.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library")	71	list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 23.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library")
72	endif()	72	endif()
73		73
74	# Ignore this directory and try the search again	74	# Ignore this directory and try the search again

lib/c/wchar.zig+1-6

...	@@ -14,7 +14,6 @@ comptime {	...	@@ -14,7 +14,6 @@ comptime {
14	symbol(&wmemcpy, "wmemcpy");	14	symbol(&wmemcpy, "wmemcpy");
15	symbol(&wmemmove, "wmemmove");	15	symbol(&wmemmove, "wmemmove");
16	symbol(&wmemset, "wmemset");	16	symbol(&wmemset, "wmemset");
17	symbol(&wcslen, "wcslen");
18	symbol(&wcsnlen, "wcsnlen");	17	symbol(&wcsnlen, "wcsnlen");
19	symbol(&wcscmp, "wcscmp");	18	symbol(&wcscmp, "wcscmp");
20	symbol(&wcsncmp, "wcsncmp");	19	symbol(&wcsncmp, "wcsncmp");
...	@@ -81,10 +80,6 @@ fn wmemset(dest: []wchar_t, elem: wchar_t, len: usize) callconv(.c) []wchar_t	...	@@ -81,10 +80,6 @@ fn wmemset(dest: []wchar_t, elem: wchar_t, len: usize) callconv(.c) []wchar_t
81	return dest;	80	return dest;
82	}	81	}
83		82
84	fn wcslen(str: [*:0]const wchar_t) callconv(.c) usize {
85	return std.mem.len(str);
86	}
87
88	fn wcsnlen(str: [*:0]const wchar_t, max: usize) callconv(.c) usize {	83	fn wcsnlen(str: [*:0]const wchar_t, max: usize) callconv(.c) usize {
89	for (0..max) \|i\| {	84	for (0..max) \|i\| {
90	if (str[i] == 0) return i;	85	if (str[i] == 0) return i;
...	@@ -199,7 +194,7 @@ fn wcswcs(noalias haystack: [:0]const wchar_t, noalias needle: [:0]const wchar	...	@@ -199,7 +194,7 @@ fn wcswcs(noalias haystack: [:0]const wchar_t, noalias needle: [:0]const wchar
199	}	194	}
200		195
201	fn wcsdup(str: [:0]const wchar_t) callconv(.c) ?[:0]wchar_t {	196	fn wcsdup(str: [:0]const wchar_t) callconv(.c) ?[:0]wchar_t {
202	const len = wcslen(str);	197	const len = c.wcslen(str);
203	const size = (len + 1) * @sizeOf(wchar_t);	198	const size = (len + 1) * @sizeOf(wchar_t);
204	const d_opaque = c.malloc(size) orelse return null;	199	const d_opaque = c.malloc(size) orelse return null;
205	const d: [*]wchar_t = @ptrCast(@alignCast(d_opaque));	200	const d: [*]wchar_t = @ptrCast(@alignCast(d_opaque));

lib/compiler/aro/aro/Compilation.zig-1

...	@@ -675,7 +675,6 @@ fn generateSystemDefines(comp: Compilation, w: Io.Writer) !void {	...	@@ -675,7 +675,6 @@ fn generateSystemDefines(comp: Compilation, w: Io.Writer) !void {
675	.{ .amx_fp8, "__AMX_FP8__" },	675	.{ .amx_fp8, "__AMX_FP8__" },
676	.{ .amx_movrs, "__AMX_MOVRS__" },	676	.{ .amx_movrs, "__AMX_MOVRS__" },
677	.{ .amx_avx512, "__AMX_AVX512__" },	677	.{ .amx_avx512, "__AMX_AVX512__" },
678	.{ .amx_tf32, "__AMX_TF32__" },
679	.{ .cmpccxadd, "__CMPCCXADD__" },	678	.{ .cmpccxadd, "__CMPCCXADD__" },
680	.{ .raoint, "__RAOINT__" },	679	.{ .raoint, "__RAOINT__" },
681	.{ .avxifma, "__AVXIFMA__" },	680	.{ .avxifma, "__AVXIFMA__" },

lib/compiler_rt.zig+5

...	@@ -162,6 +162,7 @@ comptime {	...	@@ -162,6 +162,7 @@ comptime {
162	symbol(&bcmp, "bcmp");	162	symbol(&bcmp, "bcmp");
163	_ = @import("compiler_rt/ssp.zig");	163	_ = @import("compiler_rt/ssp.zig");
164	symbol(&strlen, "strlen");	164	symbol(&strlen, "strlen");
		165	symbol(&wcslen, "wcslen");
165	}	166	}
166		167
167	_ = @import("compiler_rt/elf.zig");	168	_ = @import("compiler_rt/elf.zig");
...	@@ -178,6 +179,10 @@ fn strlen(s: [*:0]const c_char) callconv(.c) usize {	...	@@ -178,6 +179,10 @@ fn strlen(s: [*:0]const c_char) callconv(.c) usize {
178	return std.mem.len(s);	179	return std.mem.len(s);
179	}	180	}
180		181
		182	fn wcslen(s: [*:0]const std.c.wchar_t) callconv(.c) usize {
		183	return std.mem.len(s);
		184	}
		185
181	fn memcmp(vl: []const u8, vr: []const u8, n: usize) callconv(.c) c_int {	186	fn memcmp(vl: []const u8, vr: []const u8, n: usize) callconv(.c) c_int {
182	var i: usize = 0;	187	var i: usize = 0;
183	while (i < n) : (i += 1) {	188	while (i < n) : (i += 1) {

lib/compiler_rt/float_from_int.zig-9

 @@ -287,10 +287,6 @@ comptime {
     } else {
         if (builtin.cpu.arch == .x86) {
             symbol(&__floatuntitf_x86, "__floatuntitf");
-        } else if (builtin.cpu.arch == .x86_64 and
-            (builtin.os.tag == .windows or builtin.os.tag == .uefi))
-        {
-            symbol(&__floatuntitf_x86_64_windows, "__floatuntitf");
         } else {
             symbol(&__floatuntitf, "__floatuntitf");
         }
 @@ -452,11 +448,6 @@ fn __floatuntitf(a: u128) callconv(.c) compiler_rt.f128.Abi {
 fn __floatuntitf_x86(a: f128) callconv(.c) compiler_rt.f128.Abi {
     return compiler_rt.f128.toAbi(f128_floatFromInt_u128(@bitCast(a)));
 }
-fn __floatuntitf_x86_64_windows(a_lo: u64, a_hi: u64) callconv(.c) compiler_rt.f128.Abi {
-    return compiler_rt.f128.toAbi(f128_floatFromInt_u128(@bitCast(
-        packed struct { lo: u64, hi: u64 }{ .lo = a_lo, .hi = a_hi },
-    )));
-}
 pub fn f128_floatFromInt_u128(a: u128) f128 {
     return floatFromInt(f128, a);
 }

lib/compiler_rt/udivmodei4.zig+1

...	@@ -164,6 +164,7 @@ test "__udivei4/__umodei4" {	...	@@ -164,6 +164,7 @@ test "__udivei4/__umodei4" {
164	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;	164	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
165	if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;	165	if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
166	if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;	166	if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
		167	if (builtin.zig_backend == .stage2_llvm and builtin.target.cpu.arch == .sparc64) return error.SkipZigTest; // https://codeberg.org/ziglang/zig/issues/37056
167		168
168	const RndGen = std.Random.DefaultPrng;	169	const RndGen = std.Random.DefaultPrng;
169	var rnd = RndGen.init(42);	170	var rnd = RndGen.init(42);

lib/include/__clang_spirv_libdevice_declares.h created+170

...	@@ -0,0 +1,170 @@
1	/*===-- __clang_spirv_libdevice_declares.h - decls for libdevice functions --===
2	*
3	* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	* See https://llvm.org/LICENSE.txt for license information.
5	* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	*
7	*===-----------------------------------------------------------------------===
8	*/
9
10	#ifndef __CLANG_SPIRV_LIBDEVICE_DECLARES_H__
11	#define __CLANG_SPIRV_LIBDEVICE_DECLARES_H__
12
13	#if defined(__cplusplus)
14	extern "C" {
15	#else
16	_Pragma("push_macro(\"bool\")");
17	#define bool _Bool
18	#endif
19
20	#define _CLC_OVERLOAD [[clang::overloadable]]
21	#define _CLC_CONSTFN [[gnu::const]]
22	// TODO: Add vector versions of the API in case it is required.
23	_CLC_OVERLOAD _CLC_CONSTFN unsigned int __spirv_ocl_s_abs(int);
24	_CLC_OVERLOAD _CLC_CONSTFN unsigned long __spirv_ocl_s_abs(long);
25	_CLC_OVERLOAD _CLC_CONSTFN unsigned long long __spirv_ocl_s_abs(long long);
26	_CLC_OVERLOAD _CLC_CONSTFN int __spirv_ocl_s_max(int, int);
27	_CLC_OVERLOAD _CLC_CONSTFN long __spirv_ocl_s_max(long, long);
28	_CLC_OVERLOAD _CLC_CONSTFN long long __spirv_ocl_s_max(long long, long long);
29	_CLC_OVERLOAD _CLC_CONSTFN int __spirv_ocl_s_min(int, int);
30	_CLC_OVERLOAD _CLC_CONSTFN long __spirv_ocl_s_min(long, long);
31	_CLC_OVERLOAD _CLC_CONSTFN long long __spirv_ocl_s_min(long long, long long);
32	_CLC_OVERLOAD _CLC_CONSTFN unsigned int __spirv_ocl_u_max(unsigned int,
33	unsigned int);
34	_CLC_OVERLOAD _CLC_CONSTFN unsigned long __spirv_ocl_u_max(unsigned long,
35	unsigned long);
36	_CLC_OVERLOAD _CLC_CONSTFN unsigned long long
37	__spirv_ocl_u_max(unsigned long long, unsigned long long);
38	_CLC_OVERLOAD _CLC_CONSTFN unsigned int __spirv_ocl_u_min(unsigned int,
39	unsigned int);
40	_CLC_OVERLOAD _CLC_CONSTFN unsigned long __spirv_ocl_u_min(unsigned long,
41	unsigned long);
42	_CLC_OVERLOAD _CLC_CONSTFN unsigned long long
43	__spirv_ocl_u_min(unsigned long long, unsigned long long);
44	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_acos(float);
45	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_acos(double);
46	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_acosh(float);
47	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_acosh(double);
48	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_asin(float);
49	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_asin(double);
50	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_asinh(float);
51	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_asinh(double);
52	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_atan(float);
53	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_atan(double);
54	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_atan2(float, float);
55	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_atan2(double, double);
56	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_atanh(float);
57	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_atanh(double);
58	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_cbrt(float);
59	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_cbrt(double);
60	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_ceil(float);
61	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_ceil(double);
62	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_cos(float);
63	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_cos(double);
64	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_cosh(float);
65	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_cosh(double);
66	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_cospi(float);
67	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_cospi(double);
68	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_erf(float);
69	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_erf(double);
70	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_erfc(float);
71	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_erfc(double);
72	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_exp(float);
73	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_exp(double);
74	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_exp2(float);
75	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_exp2(double);
76	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_exp10(float);
77	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_exp10(double);
78	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_expm1(float);
79	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_expm1(double);
80	_CLC_OVERLOAD _CLC_CONSTFN bool __spirv_IsNan(float);
81	_CLC_OVERLOAD _CLC_CONSTFN bool __spirv_IsNan(double);
82	_CLC_OVERLOAD _CLC_CONSTFN bool __spirv_IsInf(float);
83	_CLC_OVERLOAD _CLC_CONSTFN bool __spirv_IsInf(double);
84	_CLC_OVERLOAD _CLC_CONSTFN bool __spirv_IsFinite(float);
85	_CLC_OVERLOAD _CLC_CONSTFN bool __spirv_IsFinite(double);
86	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_copysign(float, float);
87	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_copysign(double, double);
88	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_ldexp(float, int);
89	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_ldexp(double, int);
90	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_fabs(float);
91	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_fabs(double);
92	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_logb(float);
93	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_logb(double);
94	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_fmax(float, float);
95	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_fmax(double, double);
96	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_fmin(float, float);
97	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_fmin(double, double);
98	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_fdim(float, float);
99	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_fdim(double, double);
100	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_floor(float);
101	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_floor(double);
102	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_fma(float, float, float);
103	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_fma(double, double, double);
104	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_fmod(float, float);
105	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_fmod(double, double);
106	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_frexp(float, int *);
107	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_frexp(double, int *);
108	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_hypot(float, float);
109	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_hypot(double, double);
110	_CLC_OVERLOAD _CLC_CONSTFN int __spirv_ocl_ilogb(float);
111	_CLC_OVERLOAD _CLC_CONSTFN int __spirv_ocl_ilogb(double);
112	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_lgamma(float);
113	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_lgamma(double);
114	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_round(float);
115	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_round(double);
116	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_log(float);
117	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_log(double);
118	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_log10(float);
119	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_log10(double);
120	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_log1p(float);
121	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_log1p(double);
122	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_log2(float);
123	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_log2(double);
124	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_modf(float, float *);
125	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_modf(double, double *);
126	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_nan(int);
127	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_nan(unsigned int);
128	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_nan(long);
129	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_nan(unsigned long);
130	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_nextafter(float, float);
131	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_nextafter(double, double);
132	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_sqrt(float);
133	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_sqrt(double);
134	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_rsqrt(float);
135	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_rsqrt(double);
136	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_pow(float, float);
137	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_pow(double, double);
138	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_pown(float, int);
139	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_pown(double, int);
140	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_remainder(float, float);
141	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_remainder(double, double);
142	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_remquo(float, float, int *);
143	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_remquo(double, double, int *);
144	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_sin(float);
145	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_sin(double);
146	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_sincos(float, float *);
147	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_sincos(double, double *);
148	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_sinh(float);
149	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_sinh(double);
150	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_sinpi(float);
151	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_sinpi(double);
152	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_tan(float);
153	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_tan(double);
154	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_tanh(float);
155	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_tanh(double);
156	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_tgamma(float);
157	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_tgamma(double);
158	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_trunc(float);
159	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_trunc(double);
160	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_rint(float);
161	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_rint(double);
162	_CLC_OVERLOAD _CLC_CONSTFN float __spirv_ocl_fclamp(float, float, float);
163	_CLC_OVERLOAD _CLC_CONSTFN double __spirv_ocl_fclamp(double, double, double);
164
165	#if defined(__cplusplus)
166	} // extern "C"
167	#else
168	_Pragma("pop_macro(\"bool\")");
169	#endif
170	#endif // __CLANG_SPIRV_LIBDEVICE_DECLARES_H__

lib/include/__clang_spirv_math.h created+719

...	@@ -0,0 +1,719 @@
1	/*===---- __clang_spirv_math.h - Device-side SPIRV math support ------------===
2	*
3	* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	* See https://llvm.org/LICENSE.txt for license information.
5	* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	*
7	*===-----------------------------------------------------------------------===
8	*/
9	#ifndef __CLANG_SPIRV_MATH_H__
10	#define __CLANG_SPIRV_MATH_H__
11
12	#if !defined(__SPIRV__) && !defined(__OPENMP_SPIRV__)
13	#error "This file is for SPIRV and OpenMP SPIRV device compilation only."
14	#endif
15
16	// The __CLANG_GPU_DISABLE_MATH_WRAPPERS macro provides a way to let standard
17	// libcalls reach the link step instead of being eagerly replaced.
18	#ifndef __CLANG_GPU_DISABLE_MATH_WRAPPERS
19
20	// __DEVICE__ is a helper macro with common set of attributes for the wrappers
21	// we implement in this file. We need static in order to avoid emitting unused
22	// functions and __forceinline__ helps inlining these wrappers at -O1.
23	#pragma push_macro("__DEVICE__")
24	#ifdef __OPENMP_SPIRV__
25	#if defined(__cplusplus)
26	#define __DEVICE__ static constexpr __attribute__((always_inline, nothrow))
27	#else
28	#define __DEVICE__ static __attribute__((always_inline, nothrow))
29	#endif
30	#else
31	#define __DEVICE__ static __device__ __forceinline__
32	#endif
33
34	__DEVICE__
35	float __cosf(float __x) { return __spirv_ocl_cos(__x); }
36	__DEVICE__
37	float __exp10f(float __x) { return __spirv_ocl_exp10(__x); }
38	__DEVICE__
39	float __expf(float __x) { return __spirv_ocl_exp(__x); }
40
41	__DEVICE__
42	float __fadd_rd(float __x, float __y) {
43	float sum = __x + __y;
44	float rounded = __spirv_ocl_floor(sum);
45	if (rounded > sum)
46	rounded -= 1.0f;
47	return rounded;
48	}
49
50	__DEVICE__
51	float __fadd_rn(float __x, float __y) { return __spirv_ocl_rint(__x + __y); }
52	__DEVICE__
53	float __fadd_ru(float __x, float __y) { return __spirv_ocl_ceil(__x + __y); }
54	__DEVICE__
55	float __fadd_rz(float __x, float __y) { return __spirv_ocl_trunc(__x + __y); }
56
57	__DEVICE__
58	float __fdiv_rd(float __x, float __y) {
59	float res = __x / __y;
60	float rounded = __spirv_ocl_floor(res);
61	if (rounded > res)
62	rounded -= 1.0f;
63	return rounded;
64	}
65	__DEVICE__
66	float __fdiv_rn(float __x, float __y) { return __spirv_ocl_rint(__x / __y); }
67	__DEVICE__
68	float __fdiv_ru(float __x, float __y) { return __spirv_ocl_ceil(__x / __y); }
69	__DEVICE__
70	float __fdiv_rz(float __x, float __y) { return __spirv_ocl_trunc(__x / __y); }
71	__DEVICE__
72	float __fdividef(float __x, float __y) { return __x / __y; }
73
74	__DEVICE__
75	float __fmaf_rd(float __x, float __y, float __z) {
76	float res = __x * __y + __z;
77	float rounded = __spirv_ocl_floor(res);
78	if (rounded > res)
79	rounded -= 1.0f;
80	return rounded;
81	}
82	__DEVICE__
83	float __fmaf_rn(float __x, float __y, float __z) {
84	return __spirv_ocl_rint(__x * __y + __z);
85	}
86	__DEVICE__
87	float __fmaf_ru(float __x, float __y, float __z) {
88	return __spirv_ocl_ceil(__x * __y + __z);
89	}
90	__DEVICE__
91	float __fmaf_rz(float __x, float __y, float __z) {
92	return __spirv_ocl_trunc(__x * __y + __z);
93	}
94
95	__DEVICE__
96	float __fmul_rd(float __x, float __y) {
97	float res = __x * __y;
98	float rounded = __spirv_ocl_floor(res);
99	if (rounded > res)
100	rounded -= 1.0f;
101	return rounded;
102	}
103	__DEVICE__
104	float __fmul_rn(float __x, float __y) { return __spirv_ocl_rint(__x * __y); }
105	__DEVICE__
106	float __fmul_ru(float __x, float __y) { return __spirv_ocl_ceil(__x * __y); }
107	__DEVICE__
108	float __fmul_rz(float __x, float __y) { return __spirv_ocl_trunc(__x * __y); }
109
110	__DEVICE__
111	float __frcp_rd(float __x) { return __fdiv_rd(1.0f, __x); }
112	__DEVICE__
113	float __frcp_rn(float __x) { return __fdiv_rn(1.0f, __x); }
114	__DEVICE__
115	float __frcp_ru(float __x) { return __fdiv_ru(1.0f, __x); }
116	__DEVICE__
117	float __frcp_rz(float __x) { return __fdiv_rz(1.0f, __x); }
118	__DEVICE__
119
120	float __frsqrt_rn(float __x) {
121	return __spirv_ocl_rint(__spirv_ocl_rsqrt(__x));
122	}
123
124	__DEVICE__
125	float __fsqrt_rd(float __x) {
126	float res = __spirv_ocl_sqrt(__x);
127	float rounded = __spirv_ocl_floor(res);
128	if (rounded > res)
129	rounded -= 1.0f;
130	return rounded;
131	}
132	__DEVICE__
133	float __fsqrt_rn(float __x) { return __spirv_ocl_rint(__spirv_ocl_sqrt(__x)); }
134	__DEVICE__
135	float __fsqrt_ru(float __x) { return __spirv_ocl_ceil(__spirv_ocl_sqrt(__x)); }
136	__DEVICE__
137	float __fsqrt_rz(float __x) { return __spirv_ocl_trunc(__spirv_ocl_sqrt(__x)); }
138
139	__DEVICE__
140	float __fsub_rd(float __x, float __y) {
141	float res = __x - __y;
142	float rounded = __spirv_ocl_floor(res);
143	if (rounded > res)
144	rounded -= 1.0f;
145	return rounded;
146	}
147	__DEVICE__
148	float __fsub_rn(float __x, float __y) { return __spirv_ocl_rint(__x - __y); }
149	__DEVICE__
150	float __fsub_ru(float __x, float __y) { return __spirv_ocl_ceil(__x - __y); }
151	__DEVICE__
152	float __fsub_rz(float __x, float __y) { return __spirv_ocl_trunc(__x - __y); }
153	__DEVICE__
154	float __log10f(float __x) { return __spirv_ocl_log10(__x); }
155	__DEVICE__
156	float __log2f(float __x) { return __spirv_ocl_log2(__x); }
157	__DEVICE__
158	float __logf(float __x) { return __spirv_ocl_log(__x); }
159	__DEVICE__
160	float __powf(float __x, float __y) { return __spirv_ocl_pow(__x, __y); }
161
162	__DEVICE__
163	float __saturatef(float __x) { return __spirv_ocl_fclamp(__x, 0.0f, 1.0f); }
164
165	__DEVICE__
166	void __sincosf(float __x, float __sinptr, float __cosptr) {
167	*__sinptr = __spirv_ocl_sincos(__x, __cosptr);
168	}
169
170	__DEVICE__
171	float __sinf(float __x) { return __spirv_ocl_sin(__x); }
172
173	__DEVICE__
174	float __tanf(float __x) { return __spirv_ocl_tan(__x); }
175
176	__DEVICE__
177	int __finitef(float __x) { return !__spirv_IsInf(__x) && !__spirv_IsNan(__x); }
178	__DEVICE__
179	int __isinff(float __x) { return __spirv_IsInf(__x); }
180	__DEVICE__
181	int __isnanf(float __x) { return __spirv_IsNan(__x); }
182	__DEVICE__
183	int __signbitf(float __x) { return __builtin_signbitf(__x); }
184
185	__DEVICE__
186	int __finite(double __x) { return !__spirv_IsInf(__x) && !__spirv_IsNan(__x); }
187
188	__DEVICE__
189	int __isinf(double __x) { return __spirv_IsInf(__x); }
190
191	__DEVICE__
192	int __isnan(double __x) { return __spirv_IsNan(__x); }
193	__DEVICE__
194	int __signbit(double __x) { return __builtin_signbit(__x); }
195
196	__DEVICE__
197	double __dadd_rd(double __x, double __y) {
198	double sum = __x + __y;
199	double rounded = __spirv_ocl_floor(sum);
200	if (rounded > sum)
201	rounded -= 1.0;
202	return rounded;
203	}
204	__DEVICE__
205	double __dadd_rn(double __x, double __y) { return __spirv_ocl_rint(__x + __y); }
206	__DEVICE__
207	double __dadd_ru(double __x, double __y) { return __spirv_ocl_ceil(__x + __y); }
208	__DEVICE__
209	double __dadd_rz(double __x, double __y) {
210	return __spirv_ocl_trunc(__x + __y);
211	}
212	__DEVICE__
213	double __ddiv_rd(double __x, double __y) {
214	double res = __x / __y;
215	double rounded = __spirv_ocl_floor(res);
216	if (rounded > res)
217	rounded -= 1.0;
218	return rounded;
219	}
220	__DEVICE__
221	double __ddiv_rn(double __x, double __y) { return __spirv_ocl_rint(__x / __y); }
222	__DEVICE__
223	double __ddiv_ru(double __x, double __y) { return __spirv_ocl_ceil(__x / __y); }
224	__DEVICE__
225	double __ddiv_rz(double __x, double __y) {
226	return __spirv_ocl_trunc(__x / __y);
227	}
228
229	__DEVICE__
230	double __dmul_rd(double __x, double __y) {
231	double res = __x * __y;
232	double rounded = __spirv_ocl_floor(res);
233	if (rounded > res)
234	rounded -= 1.0;
235	return rounded;
236	}
237	__DEVICE__
238	double __dmul_rn(double __x, double __y) { return __spirv_ocl_rint(__x * __y); }
239	__DEVICE__
240	double __dmul_ru(double __x, double __y) { return __spirv_ocl_ceil(__x * __y); }
241	__DEVICE__
242	double __dmul_rz(double __x, double __y) {
243	return __spirv_ocl_trunc(__x * __y);
244	}
245
246	__DEVICE__
247	double __drcp_rd(double __x) { return __ddiv_rd(1.0, __x); }
248	__DEVICE__
249	double __drcp_rn(double __x) { return __ddiv_rn(1.0, __x); }
250	__DEVICE__
251	double __drcp_ru(double __x) { return __ddiv_ru(1.0, __x); }
252	__DEVICE__
253	double __drcp_rz(double __x) { return __ddiv_rz(1.0, __x); }
254
255	__DEVICE__
256	double __dsqrt_rd(double __x) {
257	double res = __spirv_ocl_sqrt(__x);
258	double rounded = __spirv_ocl_floor(res);
259	if (rounded > res)
260	rounded -= 1.0;
261	return rounded;
262	}
263	__DEVICE__
264	double __dsqrt_rn(double __x) {
265	return __spirv_ocl_rint(__spirv_ocl_sqrt(__x));
266	}
267	__DEVICE__
268	double __dsqrt_ru(double __x) {
269	return __spirv_ocl_ceil(__spirv_ocl_sqrt(__x));
270	}
271	__DEVICE__
272	double __dsqrt_rz(double __x) {
273	return __spirv_ocl_trunc(__spirv_ocl_sqrt(__x));
274	}
275
276	__DEVICE__
277	double __dsub_rd(double __x, double __y) {
278	double res = __x - __y;
279	double rounded = __spirv_ocl_floor(res);
280	if (rounded > res)
281	rounded -= 1.0;
282	return rounded;
283	}
284	__DEVICE__
285	double __dsub_rn(double __x, double __y) { return __spirv_ocl_rint(__x - __y); }
286	__DEVICE__
287	double __dsub_ru(double __x, double __y) { return __spirv_ocl_ceil(__x - __y); }
288	__DEVICE__
289	double __dsub_rz(double __x, double __y) {
290	return __spirv_ocl_trunc(__x - __y);
291	}
292
293	__DEVICE__
294	double __fma_rd(double __x, double __y, double __z) {
295	double res = __x * __y + __z;
296	double rounded = __spirv_ocl_floor(res);
297	if (rounded > res)
298	rounded -= 1.0;
299	return rounded;
300	}
301	__DEVICE__
302	double __fma_rn(double __x, double __y, double __z) {
303	return __spirv_ocl_rint(__x * __y + __z);
304	}
305	__DEVICE__
306	double __fma_ru(double __x, double __y, double __z) {
307	return __spirv_ocl_ceil(__x * __y + __z);
308	}
309	__DEVICE__
310	double __fma_rz(double __x, double __y, double __z) {
311	return __spirv_ocl_trunc(__x * __y + __z);
312	}
313
314	__DEVICE__ int abs(int __a) { return __spirv_ocl_s_abs(__a); }
315	__DEVICE__ double fabs(double __a) { return __spirv_ocl_fabs(__a); }
316	__DEVICE__ double acos(double __a) { return __spirv_ocl_acos(__a); }
317	__DEVICE__ float acosf(float __a) { return __spirv_ocl_acos(__a); }
318	__DEVICE__ double acosh(double __a) { return __spirv_ocl_acosh(__a); }
319	__DEVICE__ float acoshf(float __a) { return __spirv_ocl_acosh(__a); }
320	__DEVICE__ double asin(double __a) { return __spirv_ocl_asin(__a); }
321	__DEVICE__ float asinf(float __a) { return __spirv_ocl_asin(__a); }
322	__DEVICE__ double asinh(double __a) { return __spirv_ocl_asinh(__a); }
323	__DEVICE__ float asinhf(float __a) { return __spirv_ocl_asinh(__a); }
324	__DEVICE__ double atan(double __a) { return __spirv_ocl_atan(__a); }
325	__DEVICE__ double atan2(double __a, double __b) {
326	return __spirv_ocl_atan2(__a, __b);
327	}
328	__DEVICE__ float atan2f(float __a, float __b) {
329	return __spirv_ocl_atan2(__a, __b);
330	}
331	__DEVICE__ float atanf(float __a) { return __spirv_ocl_atan(__a); }
332	__DEVICE__ double atanh(double __a) { return __spirv_ocl_atanh(__a); }
333	__DEVICE__ float atanhf(float __a) { return __spirv_ocl_atanh(__a); }
334	__DEVICE__ double cbrt(double __a) { return __spirv_ocl_cbrt(__a); }
335	__DEVICE__ float cbrtf(float __a) { return __spirv_ocl_cbrt(__a); }
336	__DEVICE__ double ceil(double __a) { return __spirv_ocl_ceil(__a); }
337	__DEVICE__ float ceilf(float __a) { return __spirv_ocl_ceil(__a); }
338	__DEVICE__ double copysign(double __a, double __b) {
339	return __spirv_ocl_copysign(__a, __b);
340	}
341	__DEVICE__ float copysignf(float __a, float __b) {
342	return __spirv_ocl_copysign(__a, __b);
343	}
344	__DEVICE__ double cos(double __a) { return __spirv_ocl_cos(__a); }
345	__DEVICE__ float cosf(float __a) { return __spirv_ocl_cos(__a); }
346	__DEVICE__ double cosh(double __a) { return __spirv_ocl_cosh(__a); }
347	__DEVICE__ float coshf(float __a) { return __spirv_ocl_cosh(__a); }
348	__DEVICE__ double cospi(double __a) { return __spirv_ocl_cospi(__a); }
349	__DEVICE__ float cospif(float __a) { return __spirv_ocl_cospi(__a); }
350	__DEVICE__ double erf(double __a) { return __spirv_ocl_erf(__a); }
351	__DEVICE__ double erfc(double __a) { return __spirv_ocl_erfc(__a); }
352	__DEVICE__ float erfcf(float __a) { return __spirv_ocl_erfc(__a); }
353	__DEVICE__ double erfcx(double __a) {
354	return __spirv_ocl_exp(__a * __a) * __spirv_ocl_erfc(__a);
355	}
356	__DEVICE__ float erfcxf(float __a) {
357	return __spirv_ocl_exp(__a * __a) * __spirv_ocl_erfc(__a);
358	}
359	__DEVICE__ float erff(float __a) { return __spirv_ocl_erf(__a); }
360	__DEVICE__ double exp(double __a) { return __spirv_ocl_exp(__a); }
361	__DEVICE__ double exp10(double __a) { return __spirv_ocl_exp10(__a); }
362	__DEVICE__ float exp10f(float __a) { return __spirv_ocl_exp10(__a); }
363	__DEVICE__ double exp2(double __a) { return __spirv_ocl_exp2(__a); }
364	__DEVICE__ float exp2f(float __a) { return __spirv_ocl_exp2(__a); }
365	__DEVICE__ float expf(float __a) { return __spirv_ocl_exp(__a); }
366	__DEVICE__ double expm1(double __a) { return __spirv_ocl_expm1(__a); }
367	__DEVICE__ float expm1f(float __a) { return __spirv_ocl_expm1(__a); }
368	__DEVICE__ float fabsf(float __a) { return __spirv_ocl_fabs(__a); }
369	__DEVICE__ double fdim(double __a, double __b) {
370	return __spirv_ocl_fdim(__a, __b);
371	}
372	__DEVICE__ float fdimf(float __a, float __b) {
373	return __spirv_ocl_fdim(__a, __b);
374	}
375	__DEVICE__ double fdivide(double __a, double __b) { return __a / __b; }
376	__DEVICE__ float fdividef(float __a, float __b) { return __a / __b; }
377	__DEVICE__ double floor(double __f) { return __spirv_ocl_floor(__f); }
378	__DEVICE__ float floorf(float __f) { return __spirv_ocl_floor(__f); }
379	__DEVICE__ double fma(double __a, double __b, double __c) {
380	return __spirv_ocl_fma(__a, __b, __c);
381	}
382	__DEVICE__ float fmaf(float __a, float __b, float __c) {
383	return __spirv_ocl_fma(__a, __b, __c);
384	}
385	__DEVICE__ double fmax(double __a, double __b) {
386	return __spirv_ocl_fmax(__a, __b);
387	}
388	__DEVICE__ float fmaxf(float __a, float __b) {
389	return __spirv_ocl_fmax(__a, __b);
390	}
391	__DEVICE__ double fmin(double __a, double __b) {
392	return __spirv_ocl_fmin(__a, __b);
393	}
394	__DEVICE__ float fminf(float __a, float __b) {
395	return __spirv_ocl_fmin(__a, __b);
396	}
397	__DEVICE__ double fmod(double __a, double __b) {
398	return __spirv_ocl_fmod(__a, __b);
399	}
400	__DEVICE__ float fmodf(float __a, float __b) {
401	return __spirv_ocl_fmod(__a, __b);
402	}
403	__DEVICE__ double frexp(double __a, int *__b) {
404	return __spirv_ocl_frexp(__a, __b);
405	}
406	__DEVICE__ float frexpf(float __a, int *__b) {
407	return __spirv_ocl_frexp(__a, __b);
408	}
409	__DEVICE__ double hypot(double __a, double __b) {
410	return __spirv_ocl_hypot(__a, __b);
411	}
412	__DEVICE__ float hypotf(float __a, float __b) {
413	return __spirv_ocl_hypot(__a, __b);
414	}
415	__DEVICE__ int ilogb(double __a) { return __spirv_ocl_ilogb(__a); }
416	__DEVICE__ int ilogbf(float __a) { return __spirv_ocl_ilogb(__a); }
417	__DEVICE__ long labs(long __a) { return __spirv_ocl_s_abs(__a); };
418	__DEVICE__ double ldexp(double __a, int __b) {
419	return __spirv_ocl_ldexp(__a, __b);
420	}
421	__DEVICE__ float ldexpf(float __a, int __b) {
422	return __spirv_ocl_ldexp(__a, __b);
423	}
424	__DEVICE__ double lgamma(double __a) { return __spirv_ocl_lgamma(__a); }
425	__DEVICE__ float lgammaf(float __a) { return __spirv_ocl_lgamma(__a); }
426	__DEVICE__ long long llabs(long long __a) { return __spirv_ocl_s_abs(__a); }
427	__DEVICE__ long long llmax(long long __a, long long __b) {
428	return __spirv_ocl_s_max(__a, __b);
429	}
430	__DEVICE__ long long llmin(long long __a, long long __b) {
431	return __spirv_ocl_s_min(__a, __b);
432	}
433	__DEVICE__ long long llrint(double __a) { return __builtin_rint(__a); }
434	__DEVICE__ long long llrintf(float __a) { return __builtin_rintf(__a); }
435	__DEVICE__ long long llround(double __a) { return __builtin_round(__a); }
436	__DEVICE__ long long llroundf(float __a) { return __builtin_roundf(__a); }
437	__DEVICE__ double round(double __a) { return __spirv_ocl_round(__a); }
438	__DEVICE__ float roundf(float __a) { return __spirv_ocl_round(__a); }
439	__DEVICE__ double log(double __a) { return __spirv_ocl_log(__a); }
440	__DEVICE__ double log10(double __a) { return __spirv_ocl_log10(__a); }
441	__DEVICE__ float log10f(float __a) { return __spirv_ocl_log10(__a); }
442	__DEVICE__ double log1p(double __a) { return __spirv_ocl_log1p(__a); }
443	__DEVICE__ float log1pf(float __a) { return __spirv_ocl_log1p(__a); }
444	__DEVICE__ double log2(double __a) { return __spirv_ocl_log2(__a); }
445	__DEVICE__ float log2f(float __a) { return __spirv_ocl_log2(__a); }
446	__DEVICE__ double logb(double __a) { return __spirv_ocl_logb(__a); }
447	__DEVICE__ float logbf(float __a) { return __spirv_ocl_logb(__a); }
448	__DEVICE__ float logf(float __a) { return __spirv_ocl_log(__a); }
449	__DEVICE__ long lrint(double __a) { return __builtin_rint(__a); }
450	__DEVICE__ long lrintf(float __a) { return __builtin_rintf(__a); }
451	__DEVICE__ long lround(double __a) { return __builtin_round(__a); }
452	__DEVICE__ long lroundf(float __a) { return __builtin_roundf(__a); }
453	__DEVICE__ int max(int __a, int __b) { return __spirv_ocl_s_max(__a, __b); }
454	__DEVICE__ int min(int __a, int __b) { return __spirv_ocl_s_min(__a, __b); }
455	__DEVICE__ double modf(double __a, double *__b) {
456	return __spirv_ocl_modf(__a, __b);
457	}
458	__DEVICE__ float modff(float __a, float *__b) {
459	return __spirv_ocl_modf(__a, __b);
460	}
461	__DEVICE__ double nearbyint(double __a) { return __spirv_ocl_rint(__a); }
462	__DEVICE__ float nearbyintf(float __a) { return __spirv_ocl_rint(__a); }
463	__DEVICE__ double nextafter(double __a, double __b) {
464	return __spirv_ocl_nextafter(__a, __b);
465	}
466	__DEVICE__ float nextafterf(float __a, float __b) {
467	return __spirv_ocl_nextafter(__a, __b);
468	}
469
470	__DEVICE__ double norm(int __dim, const double *__a) {
471	double __r = 0;
472	while (__dim--) {
473	__r += __a[0] * __a[0];
474	++__a;
475	}
476
477	return __spirv_ocl_sqrt(__r);
478	}
479	__DEVICE__ double norm3d(double __a, double __b, double __c) {
480	return __spirv_ocl_sqrt(__a * __a + __b * __b + __c * __c);
481	}
482	__DEVICE__ float norm3df(float __a, float __b, float __c) {
483	return __spirv_ocl_sqrt(__a * __a + __b * __b + __c * __c);
484	}
485	__DEVICE__ double norm4d(double __a, double __b, double __c, double __d) {
486	return __spirv_ocl_sqrt(__a * __a + __b * __b + __c * __c + __d * __d);
487	}
488	__DEVICE__ float norm4df(float __a, float __b, float __c, float __d) {
489	return __spirv_ocl_sqrt(__a * __a + __b * __b + __c * __c + __d * __d);
490	}
491	__DEVICE__ double normcdf(double __a) {
492	return 0.5 * (1.0 + __spirv_ocl_erf(__a * __spirv_ocl_rsqrt(2.0)));
493	}
494	__DEVICE__ float normcdff(float __a) {
495	return 0.5f * (1.0f + __spirv_ocl_erf(__a * __spirv_ocl_rsqrt(2.0f)));
496	}
497	__DEVICE__ float normf(int __dim, const float *__a) {
498	float __r = 0;
499	while (__dim--) {
500	__r += __a[0] * __a[0];
501	++__a;
502	}
503	return __spirv_ocl_sqrt(__r);
504	}
505	__DEVICE__ double pow(double __a, double __b) {
506	return __spirv_ocl_pow(__a, __b);
507	}
508	__DEVICE__ float powf(float __a, float __b) {
509	return __spirv_ocl_pow(__a, __b);
510	}
511	__DEVICE__ double powi(double __a, int __b) { return pow(__a, (double)__b); }
512	__DEVICE__ float powif(float __a, int __b) { return pow(__a, (float)__b); }
513	__DEVICE__ double rcbrt(double __a) { return 1.0 / __spirv_ocl_cbrt(__a); }
514	__DEVICE__ float rcbrtf(float __a) { return 1.0f / __spirv_ocl_cbrt(__a); }
515	__DEVICE__ double remainder(double __a, double __b) {
516	return __spirv_ocl_remainder(__a, __b);
517	}
518	__DEVICE__ float remainderf(float __a, float __b) {
519	return __spirv_ocl_remainder(__a, __b);
520	}
521	__DEVICE__ double remquo(double __a, double __b, int *__c) {
522	return __spirv_ocl_remquo(__a, __b, __c);
523	}
524	__DEVICE__ float remquof(float __a, float __b, int *__c) {
525	return __spirv_ocl_remquo(__a, __b, __c);
526	}
527	__DEVICE__ double rhypot(double __a, double __b) {
528	return __spirv_ocl_hypot(__a, __b);
529	}
530	__DEVICE__ float rhypotf(float __a, float __b) {
531	return __spirv_ocl_hypot(__a, __b);
532	}
533	__DEVICE__ double rint(double __a) { return __spirv_ocl_rint(__a); }
534	__DEVICE__ float rintf(float __a) { return __spirv_ocl_rint(__a); }
535	__DEVICE__ double rnorm(int __dim, const double *__a) {
536	double __r = 0;
537	while (__dim--) {
538	__r += __a[0] * __a[0];
539	++__a;
540	}
541
542	return __spirv_ocl_rsqrt(__r);
543	}
544	__DEVICE__ double rnorm3d(double __a, double __b, double __c) {
545	return __spirv_ocl_rsqrt(__a * __a + __b * __b + __c * __c);
546	}
547	__DEVICE__ float rnorm3df(float __a, float __b, float __c) {
548	return __spirv_ocl_rsqrt(__a * __a + __b * __b + __c * __c);
549	}
550	__DEVICE__ double rnorm4d(double __a, double __b, double __c, double __d) {
551	return __spirv_ocl_rsqrt(__a * __a + __b * __b + __c * __c + __d * __d);
552	}
553	__DEVICE__ float rnorm4df(float __a, float __b, float __c, float __d) {
554	return __spirv_ocl_rsqrt(__a * __a + __b * __b + __c * __c + __d * __d);
555	}
556	__DEVICE__ float rnormf(int __dim, const float *__a) {
557	float __r = 0;
558	while (__dim--) {
559	__r += __a[0] * __a[0];
560	++__a;
561	}
562
563	return __spirv_ocl_rsqrt(__r);
564	}
565	__DEVICE__ double rsqrt(double __a) { return __spirv_ocl_rsqrt(__a); }
566	__DEVICE__ float rsqrtf(float __a) { return __spirv_ocl_rsqrt(__a); }
567	__DEVICE__ double scalbn(double __a, int __b) {
568	return __spirv_ocl_ldexp(__a, __b);
569	}
570	__DEVICE__ float scalbnf(float __a, int __b) {
571	return __spirv_ocl_ldexp(__a, __b);
572	}
573	__DEVICE__ double scalbln(double __a, long __b) {
574	if (__b > INT_MAX)
575	return __a > 0 ? HUGE_VAL : -HUGE_VAL;
576	if (__b < INT_MIN)
577	return __a > 0 ? 0.0 : -0.0;
578	return scalbn(__a, (int)__b);
579	}
580	__DEVICE__ float scalblnf(float __a, long __b) {
581	if (__b > INT_MAX)
582	return __a > 0 ? HUGE_VALF : -HUGE_VALF;
583	if (__b < INT_MIN)
584	return __a > 0 ? 0.f : -0.f;
585	return scalbnf(__a, (int)__b);
586	}
587	__DEVICE__ double sin(double __a) { return __spirv_ocl_sin(__a); }
588	__DEVICE__ void sincos(double __a, double __s, double __c) {
589	*__s = __spirv_ocl_sincos(__a, __c);
590	}
591	__DEVICE__ void sincosf(float __a, float __s, float __c) {
592	*__s = __spirv_ocl_sincos(__a, __c);
593	}
594	__DEVICE__ void sincospi(double __a, double __s, double __c) {
595	*__s = __spirv_ocl_sinpi(__a);
596	*__c = __spirv_ocl_cospi(__a);
597	}
598	__DEVICE__ void sincospif(float __a, float __s, float __c) {
599	*__s = __spirv_ocl_sinpi(__a);
600	*__c = __spirv_ocl_cospi(__a);
601	}
602	__DEVICE__ float sinf(float __a) { return __spirv_ocl_sin(__a); }
603	__DEVICE__ double sinh(double __a) { return __spirv_ocl_sinh(__a); }
604	__DEVICE__ float sinhf(float __a) { return __spirv_ocl_sinh(__a); }
605	__DEVICE__ double sinpi(double __a) { return __spirv_ocl_sinpi(__a); }
606	__DEVICE__ float sinpif(float __a) { return __spirv_ocl_sinpi(__a); }
607	__DEVICE__ double sqrt(double __a) { return __spirv_ocl_sqrt(__a); }
608	__DEVICE__ float sqrtf(float __a) { return __spirv_ocl_sqrt(__a); }
609	__DEVICE__ double tan(double __a) { return __spirv_ocl_tan(__a); }
610	__DEVICE__ float tanf(float __a) { return __spirv_ocl_tan(__a); }
611	__DEVICE__ double tanh(double __a) { return __spirv_ocl_tanh(__a); }
612	__DEVICE__ float tanhf(float __a) { return __spirv_ocl_tanh(__a); }
613	__DEVICE__ double tgamma(double __a) { return __spirv_ocl_tgamma(__a); }
614	__DEVICE__ float tgammaf(float __a) { return __spirv_ocl_tgamma(__a); }
615	__DEVICE__ double trunc(double __a) { return __spirv_ocl_trunc(__a); }
616	__DEVICE__ float truncf(float __a) { return __spirv_ocl_trunc(__a); }
617	__DEVICE__ unsigned long long ullmax(unsigned long long __a,
618	unsigned long long __b) {
619	return __spirv_ocl_u_max(__a, __b);
620	}
621	__DEVICE__ unsigned long long ullmin(unsigned long long __a,
622	unsigned long long __b) {
623	return __spirv_ocl_u_min(__a, __b);
624	}
625	__DEVICE__ unsigned int umax(unsigned int __a, unsigned int __b) {
626	return __spirv_ocl_u_max(__a, __b);
627	}
628	__DEVICE__ unsigned int umin(unsigned int __a, unsigned int __b) {
629	return __spirv_ocl_u_min(__a, __b);
630	}
631
632	#if !defined(__cplusplus) && __STDC_VERSION__ >= 201112L
633	#define isfinite(__x) _Generic((__x), float: __finitef, double: __finite)(__x)
634	#define isinf(__x) _Generic((__x), float: __isinff, double: __isinf)(__x)
635	#define isnan(__x) _Generic((__x), float: __isnanf, double: __isnan)(__x)
636	#define signbit(__x) _Generic((__x), float: __signbitf, double: __signbit)(__x)
637	#endif // !defined(__cplusplus) && __STDC_VERSION__ >= 201112L
638
639	__DEVICE__
640	unsigned long __make_mantissa_base8(const char *__tagp) {
641	unsigned long __r = 0;
642	while (*__tagp != '\0') {
643	char __tmp = *__tagp;
644
645	if (__tmp >= '0' && __tmp <= '7')
646	__r = (__r * 8u) + __tmp - '0';
647	else
648	return 0;
649
650	++__tagp;
651	}
652
653	return __r;
654	}
655
656	__DEVICE__
657	unsigned long __make_mantissa_base10(const char *__tagp) {
658	unsigned long __r = 0;
659	while (*__tagp != '\0') {
660	char __tmp = *__tagp;
661
662	if (__tmp >= '0' && __tmp <= '9')
663	__r = (__r * 10u) + __tmp - '0';
664	else
665	return 0;
666
667	++__tagp;
668	}
669
670	return __r;
671	}
672
673	__DEVICE__
674	unsigned long __make_mantissa_base16(const char *__tagp) {
675	unsigned long __r = 0;
676	while (*__tagp != '\0') {
677	char __tmp = *__tagp;
678
679	if (__tmp >= '0' && __tmp <= '9')
680	__r = (__r * 16u) + __tmp - '0';
681	else if (__tmp >= 'a' && __tmp <= 'f')
682	__r = (__r * 16u) + __tmp - 'a' + 10;
683	else if (__tmp >= 'A' && __tmp <= 'F')
684	__r = (__r * 16u) + __tmp - 'A' + 10;
685	else
686	return 0;
687
688	++__tagp;
689	}
690
691	return __r;
692	}
693
694	__DEVICE__
695	unsigned long __make_mantissa(const char *__tagp) {
696	if (!__tagp)
697	return 0;
698	if (*__tagp == '0') {
699	++__tagp;
700
701	if (__tagp == 'x' \|\| __tagp == 'X')
702	return __make_mantissa_base16(++__tagp);
703	else
704	return __make_mantissa_base8(__tagp);
705	}
706
707	return __make_mantissa_base10(__tagp);
708	}
709
710	float nanf(const char *__tagp) {
711	return __spirv_ocl_nan((unsigned int)__make_mantissa(__tagp));
712	}
713	double nan(const char *__tagp) {
714	return __spirv_ocl_nan(__make_mantissa(__tagp));
715	}
716
717	#pragma pop_macro("__DEVICE__")
718	#endif // __CLANG_GPU_DISABLE_MATH_WRAPPERS
719	#endif // __CLANG_SPIRV_MATH_H__

lib/include/altivec.h+79-9

...	@@ -2117,7 +2117,7 @@ vec_cmpne(vector unsigned long long __a, vector unsigned long long __b) {	...	@@ -2117,7 +2117,7 @@ vec_cmpne(vector unsigned long long __a, vector unsigned long long __b) {
2117	}	2117	}
2118	#endif	2118	#endif
2119		2119
2120	#ifdef __VSX__	2120	#ifdef __POWER8_VECTOR__
2121	static __inline__ vector bool long long __ATTRS_o_ai	2121	static __inline__ vector bool long long __ATTRS_o_ai
2122	vec_cmpne(vector double __a, vector double __b) {	2122	vec_cmpne(vector double __a, vector double __b) {
2123	return (vector bool long long)	2123	return (vector bool long long)
...	@@ -6404,6 +6404,18 @@ vec_mulh(vector unsigned long long __a, vector unsigned long long __b) {	...	@@ -6404,6 +6404,18 @@ vec_mulh(vector unsigned long long __a, vector unsigned long long __b) {
6404	}	6404	}
6405	#endif	6405	#endif
6406		6406
		6407	#ifdef __FUTURE_VECTOR__
		6408	static __inline__ vector signed short
		6409	__ATTRS_o_ai vec_mulh(vector signed short __a, vector signed short __b) {
		6410	return __builtin_altivec_vmulhsh(__a, __b);
		6411	}
		6412
		6413	static __inline__ vector unsigned short __ATTRS_o_ai
		6414	vec_mulh(vector unsigned short __a, vector unsigned short __b) {
		6415	return __builtin_altivec_vmulhuh(__a, __b);
		6416	}
		6417	#endif
		6418
6407	/* vec_mulo */	6419	/* vec_mulo */
6408		6420
6409	static __inline__ vector short __ATTRS_o_ai vec_mulo(vector signed char __a,	6421	static __inline__ vector short __ATTRS_o_ai vec_mulo(vector signed char __a,
...	@@ -17809,6 +17821,7 @@ vec_xl(ptrdiff_t __offset, const unsigned __int128 *__ptr) {	...	@@ -17809,6 +17821,7 @@ vec_xl(ptrdiff_t __offset, const unsigned __int128 *__ptr) {
17809	/* vec_xl_be */	17821	/* vec_xl_be */
17810		17822
17811	#ifdef __LITTLE_ENDIAN__	17823	#ifdef __LITTLE_ENDIAN__
		17824	#ifdef __VSX__
17812	static __inline__ vector signed char __ATTRS_o_ai	17825	static __inline__ vector signed char __ATTRS_o_ai
17813	vec_xl_be(ptrdiff_t __offset, const signed char *__ptr) {	17826	vec_xl_be(ptrdiff_t __offset, const signed char *__ptr) {
17814	vector signed char __vec = (vector signed char)__builtin_vsx_lxvd2x_be(__offset, __ptr);	17827	vector signed char __vec = (vector signed char)__builtin_vsx_lxvd2x_be(__offset, __ptr);
...	@@ -17850,7 +17863,6 @@ vec_xl_be(signed long long __offset, const float *__ptr) {	...	@@ -17850,7 +17863,6 @@ vec_xl_be(signed long long __offset, const float *__ptr) {
17850	return (vector float)__builtin_vsx_lxvw4x_be(__offset, __ptr);	17863	return (vector float)__builtin_vsx_lxvw4x_be(__offset, __ptr);
17851	}	17864	}
17852		17865
17853	#ifdef __VSX__
17854	static __inline__ vector signed long long __ATTRS_o_ai	17866	static __inline__ vector signed long long __ATTRS_o_ai
17855	vec_xl_be(signed long long __offset, const signed long long *__ptr) {	17867	vec_xl_be(signed long long __offset, const signed long long *__ptr) {
17856	return (vector signed long long)__builtin_vsx_lxvd2x_be(__offset, __ptr);	17868	return (vector signed long long)__builtin_vsx_lxvd2x_be(__offset, __ptr);
...	@@ -17865,7 +17877,6 @@ static __inline__ vector double __ATTRS_o_ai	...	@@ -17865,7 +17877,6 @@ static __inline__ vector double __ATTRS_o_ai
17865	vec_xl_be(signed long long __offset, const double *__ptr) {	17877	vec_xl_be(signed long long __offset, const double *__ptr) {
17866	return (vector double)__builtin_vsx_lxvd2x_be(__offset, __ptr);	17878	return (vector double)__builtin_vsx_lxvd2x_be(__offset, __ptr);
17867	}	17879	}
17868	#endif
17869		17880
17870	#if defined(__POWER8_VECTOR__) && defined(__powerpc64__) && \	17881	#if defined(__POWER8_VECTOR__) && defined(__powerpc64__) && \
17871	defined(__SIZEOF_INT128__)	17882	defined(__SIZEOF_INT128__)
...	@@ -17879,8 +17890,9 @@ vec_xl_be(signed long long __offset, const unsigned __int128 *__ptr) {	...	@@ -17879,8 +17890,9 @@ vec_xl_be(signed long long __offset, const unsigned __int128 *__ptr) {
17879	return vec_xl(__offset, __ptr);	17890	return vec_xl(__offset, __ptr);
17880	}	17891	}
17881	#endif	17892	#endif
17882	#else	17893	#endif // __VSX__
17883	#define vec_xl_be vec_xl	17894	#else // ! __LITTLE_ENDIAN__
		17895	#define vec_xl_be vec_xl
17884	#endif	17896	#endif
17885		17897
17886	#if defined(__POWER10_VECTOR__) && defined(__VSX__) && \	17898	#if defined(__POWER10_VECTOR__) && defined(__VSX__) && \
...	@@ -18130,6 +18142,7 @@ vec_xst_trunc(vector unsigned __int128 __vec, ptrdiff_t __offset,	...	@@ -18130,6 +18142,7 @@ vec_xst_trunc(vector unsigned __int128 __vec, ptrdiff_t __offset,
18130	/* vec_xst_be */	18142	/* vec_xst_be */
18131		18143
18132	#ifdef __LITTLE_ENDIAN__	18144	#ifdef __LITTLE_ENDIAN__
		18145	#ifdef __VSX__
18133	static __inline__ void __ATTRS_o_ai vec_xst_be(vector signed char __vec,	18146	static __inline__ void __ATTRS_o_ai vec_xst_be(vector signed char __vec,
18134	signed long long __offset,	18147	signed long long __offset,
18135	signed char *__ptr) {	18148	signed char *__ptr) {
...	@@ -18186,7 +18199,6 @@ static __inline__ void __ATTRS_o_ai vec_xst_be(vector float __vec,	...	@@ -18186,7 +18199,6 @@ static __inline__ void __ATTRS_o_ai vec_xst_be(vector float __vec,
18186	__builtin_vsx_stxvw4x_be((vector int)__vec, __offset, __ptr);	18199	__builtin_vsx_stxvw4x_be((vector int)__vec, __offset, __ptr);
18187	}	18200	}
18188		18201
18189	#ifdef __VSX__
18190	static __inline__ void __ATTRS_o_ai vec_xst_be(vector signed long long __vec,	18202	static __inline__ void __ATTRS_o_ai vec_xst_be(vector signed long long __vec,
18191	signed long long __offset,	18203	signed long long __offset,
18192	signed long long *__ptr) {	18204	signed long long *__ptr) {
...	@@ -18204,7 +18216,6 @@ static __inline__ void __ATTRS_o_ai vec_xst_be(vector double __vec,	...	@@ -18204,7 +18216,6 @@ static __inline__ void __ATTRS_o_ai vec_xst_be(vector double __vec,
18204	double *__ptr) {	18216	double *__ptr) {
18205	__builtin_vsx_stxvd2x_be((vector double)__vec, __offset, __ptr);	18217	__builtin_vsx_stxvd2x_be((vector double)__vec, __offset, __ptr);
18206	}	18218	}
18207	#endif
18208		18219
18209	#if defined(__POWER8_VECTOR__) && defined(__powerpc64__) && \	18220	#if defined(__POWER8_VECTOR__) && defined(__powerpc64__) && \
18210	defined(__SIZEOF_INT128__)	18221	defined(__SIZEOF_INT128__)
...	@@ -18220,8 +18231,9 @@ static __inline__ void __ATTRS_o_ai vec_xst_be(vector unsigned __int128 __vec,	...	@@ -18220,8 +18231,9 @@ static __inline__ void __ATTRS_o_ai vec_xst_be(vector unsigned __int128 __vec,
18220	vec_xst(__vec, __offset, __ptr);	18231	vec_xst(__vec, __offset, __ptr);
18221	}	18232	}
18222	#endif	18233	#endif
18223	#else	18234	#endif // VSX
18224	#define vec_xst_be vec_xst	18235	#else // ! __LITTLE_ENDIAN__
		18236	#define vec_xst_be vec_xst
18225	#endif	18237	#endif
18226		18238
18227	#ifdef __POWER9_VECTOR__	18239	#ifdef __POWER9_VECTOR__
...	@@ -19314,6 +19326,64 @@ vec_sra(vector signed __int128 __a, vector unsigned __int128 __b) {	...	@@ -19314,6 +19326,64 @@ vec_sra(vector signed __int128 __a, vector unsigned __int128 __b) {
19314	#endif /* __SIZEOF_INT128__ */	19326	#endif /* __SIZEOF_INT128__ */
19315	#endif /* __POWER10_VECTOR__ */	19327	#endif /* __POWER10_VECTOR__ */
19316		19328
		19329	#ifdef __FUTURE_VECTOR__
		19330
		19331	/* vec_uncompress* - Deeply Compressed Weights builtins */
		19332
		19333	static __inline__ vector unsigned char __ATTRS_o_ai
		19334	vec_uncompresshn(vector unsigned char __a, vector unsigned char __b) {
		19335	return __builtin_altivec_vucmprhn(__a, __b);
		19336	}
		19337
		19338	static __inline__ vector unsigned char __ATTRS_o_ai
		19339	vec_uncompressln(vector unsigned char __a, vector unsigned char __b) {
		19340	return __builtin_altivec_vucmprln(__a, __b);
		19341	}
		19342
		19343	static __inline__ vector unsigned char __ATTRS_o_ai
		19344	vec_uncompresshb(vector unsigned char __a, vector unsigned char __b) {
		19345	return __builtin_altivec_vucmprhb(__a, __b);
		19346	}
		19347
		19348	static __inline__ vector unsigned char __ATTRS_o_ai
		19349	vec_uncompresslb(vector unsigned char __a, vector unsigned char __b) {
		19350	return __builtin_altivec_vucmprlb(__a, __b);
		19351	}
		19352
		19353	static __inline__ vector unsigned char __ATTRS_o_ai
		19354	vec_uncompresshh(vector unsigned char __a, vector unsigned char __b) {
		19355	return __builtin_altivec_vucmprhh(__a, __b);
		19356	}
		19357
		19358	static __inline__ vector unsigned char __ATTRS_o_ai
		19359	vec_uncompresslh(vector unsigned char __a, vector unsigned char __b) {
		19360	return __builtin_altivec_vucmprlh(__a, __b);
		19361	}
		19362
		19363	static __inline__ vector unsigned char __ATTRS_o_ai
		19364	vec_unpack_hsn_to_byte(vector unsigned char __a) {
		19365	return __builtin_altivec_vupkhsntob(__a);
		19366	}
		19367
		19368	static __inline__ vector unsigned char __ATTRS_o_ai
		19369	vec_unpack_lsn_to_byte(vector unsigned char __a) {
		19370	return __builtin_altivec_vupklsntob(__a);
		19371	}
		19372
		19373	#define vec_unpack_int4_to_bf16(__a, __imm) \
		19374	__builtin_altivec_vupkint4tobf16((__a), (__imm))
		19375
		19376	#define vec_unpack_int8_to_bf16(__a, __imm) \
		19377	__builtin_altivec_vupkint8tobf16((__a), (__imm))
		19378
		19379	#define vec_unpack_int4_to_fp32(__a, __imm) \
		19380	__builtin_altivec_vupkint4tofp32((__a), (__imm))
		19381
		19382	#define vec_unpack_int8_to_fp32(__a, __imm) \
		19383	__builtin_altivec_vupkint8tofp32((__a), (__imm))
		19384
		19385	#endif /* __FUTURE_VECTOR__ */
		19386
19317	#ifdef __POWER8_VECTOR__	19387	#ifdef __POWER8_VECTOR__
19318	#define __bcdadd(__a, __b, __ps) __builtin_ppc_bcdadd((__a), (__b), (__ps))	19388	#define __bcdadd(__a, __b, __ps) __builtin_ppc_bcdadd((__a), (__b), (__ps))
19319	#define __bcdsub(__a, __b, __ps) __builtin_ppc_bcdsub((__a), (__b), (__ps))	19389	#define __bcdsub(__a, __b, __ps) __builtin_ppc_bcdsub((__a), (__b), (__ps))

lib/include/amdhsa_abi.h created+83

...	@@ -0,0 +1,83 @@
1	//===-- amdhsa_abi.h - AMDHSA ABI definition utilities --------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef __AMDHSA_ABI_H
10	#define __AMDHSA_ABI_H
11
12	#include <stddef.h>
13	#include <stdint.h>
14
15	typedef struct __attribute__((aligned(8))) amdhsa_implicit_kernarg_v5 {
16	uint32_t block_count[3];
17	uint16_t group_size[3];
18	uint16_t remainder[3];
19	char reserved0[16];
20	uint64_t global_offset[3];
21	uint16_t grid_dims;
22	char reserved1[6];
23	__attribute__((opencl_global)) void *printf_buffer;
24	__attribute__((opencl_global)) void *hostcall_buffer;
25	__attribute__((opencl_global)) void *multigrid_sync_arg;
26	__attribute__((opencl_global)) void *heap_v1;
27	__attribute__((opencl_global)) void *default_queue;
28	__attribute__((opencl_global)) void *completion_action;
29	char reserved2[72];
30	uint32_t private_base; // Unused on gfx9+
31	uint32_t shared_base; // Unused on gfx9+
32	__attribute__((opencl_global)) void *queue_ptr;
33	char reserved3[48];
34	} amdhsa_implicit_kernarg_v5;
35
36	_Static_assert(sizeof(amdhsa_implicit_kernarg_v5) == 256, "wrong struct size");
37
38	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, block_count[0]) == 0,
39	"wrong offset");
40	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, block_count[1]) == 4,
41	"wrong offset");
42	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, block_count[2]) == 8,
43	"wrong offset");
44	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, group_size[0]) == 12,
45	"wrong offset");
46	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, group_size[1]) == 14,
47	"wrong offset");
48	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, group_size[2]) == 16,
49	"wrong offset");
50	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, remainder[0]) == 18,
51	"wrong offset");
52	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, remainder[1]) == 20,
53	"wrong offset");
54	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, remainder[2]) == 22,
55	"wrong offset");
56	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, global_offset[0]) == 40,
57	"wrong offset");
58	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, global_offset[1]) == 48,
59	"wrong offset");
60	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, global_offset[2]) == 56,
61	"wrong offset");
62	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, grid_dims) == 64,
63	"wrong offset");
64	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, printf_buffer) == 72,
65	"wrong offset");
66	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, hostcall_buffer) == 80,
67	"wrong offset");
68	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, multigrid_sync_arg) == 88,
69	"wrong offset");
70	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, heap_v1) == 96,
71	"wrong offset");
72	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, default_queue) == 104,
73	"wrong offset");
74	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, completion_action) == 112,
75	"wrong offset");
76	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, private_base) == 192,
77	"wrong offset");
78	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, shared_base) == 196,
79	"wrong offset");
80	_Static_assert(offsetof(amdhsa_implicit_kernarg_v5, queue_ptr) == 200,
81	"wrong offset");
82
83	#endif // __AMDHSA_ABI_H

lib/include/amo.h+89

...	@@ -124,6 +124,95 @@ static inline int64_t amo_ldat_sswap(int64_t *ptr, int64_t val) {	...	@@ -124,6 +124,95 @@ static inline int64_t amo_ldat_sswap(int64_t *ptr, int64_t val) {
124	return __builtin_amo_ldat_s(ptr, val, _AMO_LD_SWAP);	124	return __builtin_amo_ldat_s(ptr, val, _AMO_LD_SWAP);
125	}	125	}
126		126
		127	/* AMO Store Operation Codes (FC values) */
		128	enum _AMO_ST {
		129	_AMO_ST_ADD = 0x00, /* Store Add */
		130	_AMO_ST_XOR = 0x01, /* Store Xor */
		131	_AMO_ST_IOR = 0x02, /* Store Ior */
		132	_AMO_ST_AND = 0x03, /* Store And */
		133	_AMO_ST_UMAX = 0x04, /* Store Unsigned Maximum */
		134	_AMO_ST_SMAX = 0x05, /* Store Signed Maximum */
		135	_AMO_ST_UMIN = 0x06, /* Store Unsigned Minimum */
		136	_AMO_ST_SMIN = 0x07, /* Store Signed Minimum */
		137	_AMO_ST_TWIN = 0x18 /* Store Twin */
		138	};
		139
		140	/* 32-bit unsigned AMO store operations */
		141	static inline void amo_stwat_add(uint32_t *ptr, uint32_t val) {
		142	__builtin_amo_stwat(ptr, val, _AMO_ST_ADD);
		143	}
		144
		145	static inline void amo_stwat_xor(uint32_t *ptr, uint32_t val) {
		146	__builtin_amo_stwat(ptr, val, _AMO_ST_XOR);
		147	}
		148
		149	static inline void amo_stwat_ior(uint32_t *ptr, uint32_t val) {
		150	__builtin_amo_stwat(ptr, val, _AMO_ST_IOR);
		151	}
		152
		153	static inline void amo_stwat_and(uint32_t *ptr, uint32_t val) {
		154	__builtin_amo_stwat(ptr, val, _AMO_ST_AND);
		155	}
		156
		157	static inline void amo_stwat_umax(uint32_t *ptr, uint32_t val) {
		158	__builtin_amo_stwat(ptr, val, _AMO_ST_UMAX);
		159	}
		160
		161	static inline void amo_stwat_umin(uint32_t *ptr, uint32_t val) {
		162	__builtin_amo_stwat(ptr, val, _AMO_ST_UMIN);
		163	}
		164
		165	/* 32-bit signed AMO store operations */
		166	static inline void amo_stwat_sadd(int32_t *ptr, int32_t val) {
		167	__builtin_amo_stwat_s(ptr, val, _AMO_ST_ADD);
		168	}
		169
		170	static inline void amo_stwat_smax(int32_t *ptr, int32_t val) {
		171	__builtin_amo_stwat_s(ptr, val, _AMO_ST_SMAX);
		172	}
		173
		174	static inline void amo_stwat_smin(int32_t *ptr, int32_t val) {
		175	__builtin_amo_stwat_s(ptr, val, _AMO_ST_SMIN);
		176	}
		177
		178	/* 64-bit unsigned AMO store operations */
		179	static inline void amo_stdat_add(uint64_t *ptr, uint64_t val) {
		180	__builtin_amo_stdat(ptr, val, _AMO_ST_ADD);
		181	}
		182
		183	static inline void amo_stdat_xor(uint64_t *ptr, uint64_t val) {
		184	__builtin_amo_stdat(ptr, val, _AMO_ST_XOR);
		185	}
		186
		187	static inline void amo_stdat_ior(uint64_t *ptr, uint64_t val) {
		188	__builtin_amo_stdat(ptr, val, _AMO_ST_IOR);
		189	}
		190
		191	static inline void amo_stdat_and(uint64_t *ptr, uint64_t val) {
		192	__builtin_amo_stdat(ptr, val, _AMO_ST_AND);
		193	}
		194
		195	static inline void amo_stdat_umax(uint64_t *ptr, uint64_t val) {
		196	__builtin_amo_stdat(ptr, val, _AMO_ST_UMAX);
		197	}
		198
		199	static inline void amo_stdat_umin(uint64_t *ptr, uint64_t val) {
		200	__builtin_amo_stdat(ptr, val, _AMO_ST_UMIN);
		201	}
		202
		203	/* 64-bit signed AMO store operations */
		204	static inline void amo_stdat_sadd(int64_t *ptr, int64_t val) {
		205	__builtin_amo_stdat_s(ptr, val, _AMO_ST_ADD);
		206	}
		207
		208	static inline void amo_stdat_smax(int64_t *ptr, int64_t val) {
		209	__builtin_amo_stdat_s(ptr, val, _AMO_ST_SMAX);
		210	}
		211
		212	static inline void amo_stdat_smin(int64_t *ptr, int64_t val) {
		213	__builtin_amo_stdat_s(ptr, val, _AMO_ST_SMIN);
		214	}
		215
127	#ifdef __cplusplus	216	#ifdef __cplusplus
128	}	217	}
129	#endif	218	#endif

lib/include/amxtf32intrin.h deleted-108

...	@@ -1,108 +0,0 @@
1	/===------------- amxtf32intrin.h - AMX_TF32 intrinsics -- C++ -*---------===
2	*
3	* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	* See https://llvm.org/LICENSE.txt for license information.
5	* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	*
7	*===------------------------------------------------------------------------===
8	*/
9
10	#ifndef __IMMINTRIN_H
11	#error "Never use <amxtf32intrin.h> directly; include <immintrin.h> instead."
12	#endif // __IMMINTRIN_H
13
14	#ifndef __AMX_TF32INTRIN_H
15	#define __AMX_TF32INTRIN_H
16	#ifdef __x86_64__
17
18	#define __DEFAULT_FN_ATTRS_TF32 \
19	__attribute__((__always_inline__, __nodebug__, __target__("amx-tf32")))
20
21	/// Do Matrix Multiplication of \a a and \a b, and then do Matrix Plus
22	/// with \a srcdst.
23	/// All the calculation is base on float32 but with the lower 13-bit set to 0.
24	///
25	/// \headerfile <immintrin.h>
26	///
27	/// \code
28	/// void _tile_mmultf32ps(constexpr int srcdst, constexpr int a, \
29	/// constexpr int b);
30	/// \endcode
31	///
32	/// This intrinsic corresponds to the <c> TMMULTF32PS </c> instruction.
33	///
34	/// \param srcdst
35	/// The destination tile. Max size is 1024 Bytes.
36	/// \param a
37	/// The 1st source tile. Max size is 1024 Bytes.
38	/// \param b
39	/// The 2nd source tile. Max size is 1024 Bytes.
40	///
41	/// \code{.operation}
42	/// DEFINE zero_lower_mantissa_bits_fp32(x[31:0]) {
43	/// dword[12:0] := 0
44	/// dword[31:13] := x[31:13]
45	/// return dword
46	/// }
47	///
48	/// DEFINE silence_snan_fp32(x[31:0]) {
49	/// IF (x.exponent == 255 and x.fraction != 0 and x.fraction[22] == 0)
50	/// x.fraction[22] := 1
51	/// return x
52	/// }
53	///
54	/// elements_a := a.colsb / 4
55	/// elements_dest := srcdst.colsb / 4
56	///
57	/// FOR m = 0 TO (srcdst.rows-1)
58	/// tmp[511:0] := 0
59	/// FOR k = 0 TO (elements_a-1)
60	/// FOR n = 0 TO (elements_dest-1)
61	/// af := silence_snan_fp32(a.row[m].fp32[k])
62	/// bf := silence_snan_fp32(b.row[k].fp32[n])
63	/// tmp.fp32[n] += zero_lower_mantissa_bits_fp32(af)
64	/// * zero_lower_mantissa_bits_fp32(bf)
65	/// ENDFOR
66	/// ENDFOR
67	///
68	/// FOR n = 0 TO (elements_dest-1)
69	/// tmp.fp32[n] += srcdst.row[m].fp32[n]
70	/// ENDFOR
71	/// write_row_and_zero(srcdst, m, tmp, srcdst.colsb)
72	///
73	/// ENDFOR
74	///
75	/// zero_upper_rows(srcdst, srcdst.rows)
76	/// zero_tileconfig_start()
77	/// \endcode
78	#define _tile_mmultf32ps(srcdst, a, b) \
79	__builtin_ia32_tmmultf32ps((srcdst), (a), (b))
80
81	static __inline__ _tile1024i __DEFAULT_FN_ATTRS_TF32
82	_tile_mmultf32ps_internal(unsigned short m, unsigned short n, unsigned short k,
83	_tile1024i dst, _tile1024i src1, _tile1024i src2) {
84	return __builtin_ia32_tmmultf32ps_internal(m, n, k, dst, src1, src2);
85	}
86
87	/// Do Matrix Multiplication of src0 and src1, and then do Matrix Plus with dst.
88	/// All the calculation is base on float32 but with the lower 13-bit set to 0.
89	///
90	/// \headerfile <immintrin.h>
91	///
92	/// This intrinsic corresponds to the <c> TMMULTF32PS </c> instruction.
93	///
94	/// \param dst
95	/// The destination tile. Max size is 1024 Bytes.
96	/// \param src0
97	/// The 1st source tile. Max size is 1024 Bytes.
98	/// \param src1
99	/// The 2nd source tile. Max size is 1024 Bytes.
100	__DEFAULT_FN_ATTRS_TF32
101	static void __tile_mmultf32ps(__tile1024i *dst, __tile1024i src0,
102	__tile1024i src1) {
103	dst->tile = _tile_mmultf32ps_internal(src0.row, src1.col, src0.col, dst->tile,
104	src0.tile, src1.tile);
105	}
106
107	#endif // __x86_64__
108	#endif // __AMX_TF32INTRIN_H

lib/include/andes_vector.h+5

...	@@ -13,4 +13,9 @@	...	@@ -13,4 +13,9 @@
13		13
14	#pragma clang riscv intrinsic andes_vector	14	#pragma clang riscv intrinsic andes_vector
15		15
		16	#define __riscv_intrinsic_xandesvbfhcvt 1
		17	#define __riscv_intrinsic_xandesvdot 1
		18	#define __riscv_intrinsic_xandesvpackfph 1
		19	#define __riscv_intrinsic_xandesvsintload 1
		20
16	#endif //_ANDES_VECTOR_H_	21	#endif //_ANDES_VECTOR_H_

lib/include/arm64_neon.h created+21

...	@@ -0,0 +1,21 @@
1	/*===---- arm64_neon.h - ARM64 NEON intrinsics -----------------------------===
2	*
3	* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	* See https://llvm.org/LICENSE.txt for license information.
5	* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	*
7	*===-----------------------------------------------------------------------===
8	*/
9
10	/* Only include this if we're compiling for the windows platform. */
11	#ifndef _MSC_VER
12	#include_next <arm64_neon.h>
13	#else
14
15	#ifndef __ARM64_NEON_H
16	#define __ARM64_NEON_H
17
18	#include <arm_neon.h>
19
20	#endif /* __ARM64_NEON_H */
21	#endif /* _MSC_VER */

lib/include/arm64intr.h+10

...	@@ -15,6 +15,16 @@	...	@@ -15,6 +15,16 @@
15	#ifndef __ARM64INTR_H	15	#ifndef __ARM64INTR_H
16	#define __ARM64INTR_H	16	#define __ARM64INTR_H
17		17
		18	/* Encode an AArch64 system register for use with
		19	_ReadStatusReg/_WriteStatusReg. op0 must be 2 or 3; only the low bit is
		20	stored. */
		21	#define ARM64_SYSREG(op0, op1, CRn, CRm, op2) \
		22	((((op0) & 0x1) << 14) \| (((op1) & 0x7) << 11) \| (((CRn) & 0xF) << 7) \| \
		23	(((CRm) & 0xF) << 3) \| ((op2) & 0x7))
		24
		25	#define ARM64_FPCR ARM64_SYSREG(3, 3, 4, 4, 0)
		26	#define ARM64_FPSR ARM64_SYSREG(3, 3, 4, 4, 1)
		27
18	typedef enum	28	typedef enum
19	{	29	{
20	_ARM64_BARRIER_SY = 0xF,	30	_ARM64_BARRIER_SY = 0xF,

lib/include/arm_acle.h+1

...	@@ -115,6 +115,7 @@ __swp(uint32_t __x, volatile uint32_t *__p) {	...	@@ -115,6 +115,7 @@ __swp(uint32_t __x, volatile uint32_t *__p) {
115	#else	115	#else
116	#define __plix(cache_level, retention_policy, addr) \	116	#define __plix(cache_level, retention_policy, addr) \
117	__builtin_arm_prefetch(addr, 0, cache_level, retention_policy, 0)	117	__builtin_arm_prefetch(addr, 0, cache_level, retention_policy, 0)
		118	#define __pldir(addr) __builtin_arm_prefetch_ir(addr)
118	#endif	119	#endif
119		120
120	/* 7.7 NOP */	121	/* 7.7 NOP */

lib/include/arm_neon.h+3922-3754

...	@@ -145,1431 +145,125 @@ typedef struct poly64x2x4_t {	...	@@ -145,1431 +145,125 @@ typedef struct poly64x2x4_t {
145	#endif	145	#endif
146	#endif	146	#endif
147	#ifdef __LITTLE_ENDIAN__	147	#ifdef __LITTLE_ENDIAN__
148	#define splatq_lane_bf16(__p0, __p1) __extension__ ({ \	148	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfdotq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
149	bfloat16x8_t __ret; \	149	float32x4_t __ret;
150	bfloat16x4_t __s0 = __p0; \	150	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfdotq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
151	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_lane_bf16(__builtin_bit_cast(int8x8_t, __s0), __p1, 11)); \	151	return __ret;
152	__ret; \	152	}
153	})
154	#else
155	#define splatq_lane_bf16(__p0, __p1) __extension__ ({ \
156	bfloat16x8_t __ret; \
157	bfloat16x4_t __s0 = __p0; \
158	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
159	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_lane_bf16(__builtin_bit_cast(int8x8_t, __rev0), __p1, 11)); \
160	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
161	__ret; \
162	})
163	#define __noswap_splatq_lane_bf16(__p0, __p1) __extension__ ({ \
164	bfloat16x8_t __ret; \
165	bfloat16x4_t __s0 = __p0; \
166	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_lane_bf16(__builtin_bit_cast(int8x8_t, __s0), __p1, 11)); \
167	__ret; \
168	})
169	#endif
170
171	#ifdef __LITTLE_ENDIAN__
172	#define splat_lane_bf16(__p0, __p1) __extension__ ({ \
173	bfloat16x4_t __ret; \
174	bfloat16x4_t __s0 = __p0; \
175	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_lane_bf16(__builtin_bit_cast(int8x8_t, __s0), __p1, 11)); \
176	__ret; \
177	})
178	#else
179	#define splat_lane_bf16(__p0, __p1) __extension__ ({ \
180	bfloat16x4_t __ret; \
181	bfloat16x4_t __s0 = __p0; \
182	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
183	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_lane_bf16(__builtin_bit_cast(int8x8_t, __rev0), __p1, 11)); \
184	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
185	__ret; \
186	})
187	#define __noswap_splat_lane_bf16(__p0, __p1) __extension__ ({ \
188	bfloat16x4_t __ret; \
189	bfloat16x4_t __s0 = __p0; \
190	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_lane_bf16(__builtin_bit_cast(int8x8_t, __s0), __p1, 11)); \
191	__ret; \
192	})
193	#endif
194
195	#ifdef __LITTLE_ENDIAN__
196	#define splatq_laneq_bf16(__p0, __p1) __extension__ ({ \
197	bfloat16x8_t __ret; \
198	bfloat16x8_t __s0 = __p0; \
199	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_laneq_bf16(__builtin_bit_cast(int8x16_t, __s0), __p1, 43)); \
200	__ret; \
201	})
202	#else
203	#define splatq_laneq_bf16(__p0, __p1) __extension__ ({ \
204	bfloat16x8_t __ret; \
205	bfloat16x8_t __s0 = __p0; \
206	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
207	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_laneq_bf16(__builtin_bit_cast(int8x16_t, __rev0), __p1, 43)); \
208	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
209	__ret; \
210	})
211	#define __noswap_splatq_laneq_bf16(__p0, __p1) __extension__ ({ \
212	bfloat16x8_t __ret; \
213	bfloat16x8_t __s0 = __p0; \
214	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_laneq_bf16(__builtin_bit_cast(int8x16_t, __s0), __p1, 43)); \
215	__ret; \
216	})
217	#endif
218
219	#ifdef __LITTLE_ENDIAN__
220	#define splat_laneq_bf16(__p0, __p1) __extension__ ({ \
221	bfloat16x4_t __ret; \
222	bfloat16x8_t __s0 = __p0; \
223	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_laneq_bf16(__builtin_bit_cast(int8x16_t, __s0), __p1, 43)); \
224	__ret; \
225	})
226	#else
227	#define splat_laneq_bf16(__p0, __p1) __extension__ ({ \
228	bfloat16x4_t __ret; \
229	bfloat16x8_t __s0 = __p0; \
230	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
231	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_laneq_bf16(__builtin_bit_cast(int8x16_t, __rev0), __p1, 43)); \
232	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
233	__ret; \
234	})
235	#define __noswap_splat_laneq_bf16(__p0, __p1) __extension__ ({ \
236	bfloat16x4_t __ret; \
237	bfloat16x8_t __s0 = __p0; \
238	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_laneq_bf16(__builtin_bit_cast(int8x16_t, __s0), __p1, 43)); \
239	__ret; \
240	})
241	#endif
242
243	#ifdef __LITTLE_ENDIAN__
244	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfdotq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
245	float32x4_t __ret;
246	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfdotq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
247	return __ret;
248	}
249	#else
250	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfdotq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
251	float32x4_t __ret;
252	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
253	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
254	bfloat16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
255	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfdotq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
256	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
257	return __ret;
258	}
259	__ai __attribute__((target("bf16,neon"))) float32x4_t __noswap_vbfdotq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
260	float32x4_t __ret;
261	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfdotq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
262	return __ret;
263	}
264	#endif
265
266	#ifdef __LITTLE_ENDIAN__
267	__ai __attribute__((target("bf16,neon"))) float32x2_t vbfdot_f32(float32x2_t __p0, bfloat16x4_t __p1, bfloat16x4_t __p2) {
268	float32x2_t __ret;
269	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vbfdot_f32(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), __builtin_bit_cast(int8x8_t, __p2), 9));
270	return __ret;
271	}
272	#else
273	__ai __attribute__((target("bf16,neon"))) float32x2_t vbfdot_f32(float32x2_t __p0, bfloat16x4_t __p1, bfloat16x4_t __p2) {
274	float32x2_t __ret;
275	float32x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_32);
276	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
277	bfloat16x4_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_64_16);
278	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vbfdot_f32(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), __builtin_bit_cast(int8x8_t, __rev2), 9));
279	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_32);
280	return __ret;
281	}
282	__ai __attribute__((target("bf16,neon"))) float32x2_t __noswap_vbfdot_f32(float32x2_t __p0, bfloat16x4_t __p1, bfloat16x4_t __p2) {
283	float32x2_t __ret;
284	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vbfdot_f32(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), __builtin_bit_cast(int8x8_t, __p2), 9));
285	return __ret;
286	}
287	#endif
288
289	#ifdef __LITTLE_ENDIAN__
290	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmlalbq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
291	float32x4_t __ret;
292	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlalbq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
293	return __ret;
294	}
295	#else
296	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmlalbq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
297	float32x4_t __ret;
298	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
299	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
300	bfloat16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
301	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlalbq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
302	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
303	return __ret;
304	}
305	__ai __attribute__((target("bf16,neon"))) float32x4_t __noswap_vbfmlalbq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
306	float32x4_t __ret;
307	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlalbq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
308	return __ret;
309	}
310	#endif
311
312	#ifdef __LITTLE_ENDIAN__
313	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmlaltq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
314	float32x4_t __ret;
315	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlaltq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
316	return __ret;
317	}
318	#else
319	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmlaltq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
320	float32x4_t __ret;
321	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
322	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
323	bfloat16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
324	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlaltq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
325	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
326	return __ret;
327	}
328	__ai __attribute__((target("bf16,neon"))) float32x4_t __noswap_vbfmlaltq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
329	float32x4_t __ret;
330	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlaltq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
331	return __ret;
332	}
333	#endif
334
335	#ifdef __LITTLE_ENDIAN__
336	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmmlaq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
337	float32x4_t __ret;
338	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmmlaq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
339	return __ret;
340	}
341	#else
342	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmmlaq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
343	float32x4_t __ret;
344	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
345	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
346	bfloat16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
347	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmmlaq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
348	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
349	return __ret;
350	}
351	#endif
352
353	#ifdef __LITTLE_ENDIAN__
354	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcombine_bf16(bfloat16x4_t __p0, bfloat16x4_t __p1) {
355	bfloat16x8_t __ret;
356	__ret = __builtin_shufflevector(__p0, __p1, 0, 1, 2, 3, 4, 5, 6, 7);
357	return __ret;
358	}
359	#else
360	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcombine_bf16(bfloat16x4_t __p0, bfloat16x4_t __p1) {
361	bfloat16x8_t __ret;
362	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_16);
363	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
364	__ret = __builtin_shufflevector(__rev0, __rev1, 0, 1, 2, 3, 4, 5, 6, 7);
365	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
366	return __ret;
367	}
368	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t __noswap_vcombine_bf16(bfloat16x4_t __p0, bfloat16x4_t __p1) {
369	bfloat16x8_t __ret;
370	__ret = __builtin_shufflevector(__p0, __p1, 0, 1, 2, 3, 4, 5, 6, 7);
371	return __ret;
372	}
373	#endif
374
375	#define vcreate_bf16(__p0) __extension__ ({ \
376	bfloat16x4_t __ret; \
377	uint64_t __promote = __p0; \
378	__ret = __builtin_bit_cast(bfloat16x4_t, __promote); \
379	__ret; \
380	})
381	__ai __attribute__((target("bf16,neon"))) float32_t vcvtah_f32_bf16(bfloat16_t __p0) {
382	float32_t __ret;
383	__ret = __builtin_bit_cast(float32_t, (uint32_t)(__builtin_bit_cast(uint16_t, __p0)) << 16);
384	return __ret;
385	}
386	__ai __attribute__((target("bf16,neon"))) bfloat16_t vcvth_bf16_f32(float32_t __p0) {
387	bfloat16_t __ret;
388	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vcvth_bf16_f32(__p0));
389	return __ret;
390	}
391	#ifdef __LITTLE_ENDIAN__
392	#define vduph_lane_bf16(__p0, __p1) __extension__ ({ \
393	bfloat16_t __ret; \
394	bfloat16x4_t __s0 = __p0; \
395	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vduph_lane_bf16(__s0, __p1)); \
396	__ret; \
397	})
398	#else
399	#define vduph_lane_bf16(__p0, __p1) __extension__ ({ \
400	bfloat16_t __ret; \
401	bfloat16x4_t __s0 = __p0; \
402	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
403	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vduph_lane_bf16(__rev0, __p1)); \
404	__ret; \
405	})
406	#endif
407
408	#ifdef __LITTLE_ENDIAN__
409	#define vdupq_lane_bf16(__p0_0, __p1_0) __extension__ ({ \
410	bfloat16x8_t __ret_0; \
411	bfloat16x4_t __s0_0 = __p0_0; \
412	__ret_0 = splatq_lane_bf16(__s0_0, __p1_0); \
413	__ret_0; \
414	})
415	#else
416	#define vdupq_lane_bf16(__p0_1, __p1_1) __extension__ ({ \
417	bfloat16x8_t __ret_1; \
418	bfloat16x4_t __s0_1 = __p0_1; \
419	bfloat16x4_t __rev0_1; __rev0_1 = __builtin_shufflevector(__s0_1, __s0_1, __lane_reverse_64_16); \
420	__ret_1 = __noswap_splatq_lane_bf16(__rev0_1, __p1_1); \
421	__ret_1 = __builtin_shufflevector(__ret_1, __ret_1, __lane_reverse_128_16); \
422	__ret_1; \
423	})
424	#endif
425
426	#ifdef __LITTLE_ENDIAN__
427	#define vdup_lane_bf16(__p0_2, __p1_2) __extension__ ({ \
428	bfloat16x4_t __ret_2; \
429	bfloat16x4_t __s0_2 = __p0_2; \
430	__ret_2 = splat_lane_bf16(__s0_2, __p1_2); \
431	__ret_2; \
432	})
433	#else
434	#define vdup_lane_bf16(__p0_3, __p1_3) __extension__ ({ \
435	bfloat16x4_t __ret_3; \
436	bfloat16x4_t __s0_3 = __p0_3; \
437	bfloat16x4_t __rev0_3; __rev0_3 = __builtin_shufflevector(__s0_3, __s0_3, __lane_reverse_64_16); \
438	__ret_3 = __noswap_splat_lane_bf16(__rev0_3, __p1_3); \
439	__ret_3 = __builtin_shufflevector(__ret_3, __ret_3, __lane_reverse_64_16); \
440	__ret_3; \
441	})
442	#endif
443
444	#ifdef __LITTLE_ENDIAN__
445	#define vduph_laneq_bf16(__p0, __p1) __extension__ ({ \
446	bfloat16_t __ret; \
447	bfloat16x8_t __s0 = __p0; \
448	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vduph_laneq_bf16(__s0, __p1)); \
449	__ret; \
450	})
451	#else
452	#define vduph_laneq_bf16(__p0, __p1) __extension__ ({ \
453	bfloat16_t __ret; \
454	bfloat16x8_t __s0 = __p0; \
455	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
456	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vduph_laneq_bf16(__rev0, __p1)); \
457	__ret; \
458	})
459	#endif
460
461	#ifdef __LITTLE_ENDIAN__
462	#define vdupq_laneq_bf16(__p0_4, __p1_4) __extension__ ({ \
463	bfloat16x8_t __ret_4; \
464	bfloat16x8_t __s0_4 = __p0_4; \
465	__ret_4 = splatq_laneq_bf16(__s0_4, __p1_4); \
466	__ret_4; \
467	})
468	#else
469	#define vdupq_laneq_bf16(__p0_5, __p1_5) __extension__ ({ \
470	bfloat16x8_t __ret_5; \
471	bfloat16x8_t __s0_5 = __p0_5; \
472	bfloat16x8_t __rev0_5; __rev0_5 = __builtin_shufflevector(__s0_5, __s0_5, __lane_reverse_128_16); \
473	__ret_5 = __noswap_splatq_laneq_bf16(__rev0_5, __p1_5); \
474	__ret_5 = __builtin_shufflevector(__ret_5, __ret_5, __lane_reverse_128_16); \
475	__ret_5; \
476	})
477	#endif
478
479	#ifdef __LITTLE_ENDIAN__
480	#define vdup_laneq_bf16(__p0_6, __p1_6) __extension__ ({ \
481	bfloat16x4_t __ret_6; \
482	bfloat16x8_t __s0_6 = __p0_6; \
483	__ret_6 = splat_laneq_bf16(__s0_6, __p1_6); \
484	__ret_6; \
485	})
486	#else
487	#define vdup_laneq_bf16(__p0_7, __p1_7) __extension__ ({ \
488	bfloat16x4_t __ret_7; \
489	bfloat16x8_t __s0_7 = __p0_7; \
490	bfloat16x8_t __rev0_7; __rev0_7 = __builtin_shufflevector(__s0_7, __s0_7, __lane_reverse_128_16); \
491	__ret_7 = __noswap_splat_laneq_bf16(__rev0_7, __p1_7); \
492	__ret_7 = __builtin_shufflevector(__ret_7, __ret_7, __lane_reverse_64_16); \
493	__ret_7; \
494	})
495	#endif
496
497	#ifdef __LITTLE_ENDIAN__
498	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vdupq_n_bf16(bfloat16_t __p0) {
499	bfloat16x8_t __ret;
500	__ret = (bfloat16x8_t) {__p0, __p0, __p0, __p0, __p0, __p0, __p0, __p0};
501	return __ret;
502	}
503	#else
504	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vdupq_n_bf16(bfloat16_t __p0) {
505	bfloat16x8_t __ret;
506	__ret = (bfloat16x8_t) {__p0, __p0, __p0, __p0, __p0, __p0, __p0, __p0};
507	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
508	return __ret;
509	}
510	#endif
511
512	#ifdef __LITTLE_ENDIAN__
513	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vdup_n_bf16(bfloat16_t __p0) {
514	bfloat16x4_t __ret;
515	__ret = (bfloat16x4_t) {__p0, __p0, __p0, __p0};
516	return __ret;
517	}
518	#else
519	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vdup_n_bf16(bfloat16_t __p0) {
520	bfloat16x4_t __ret;
521	__ret = (bfloat16x4_t) {__p0, __p0, __p0, __p0};
522	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
523	return __ret;
524	}
525	#endif
526
527	#ifdef __LITTLE_ENDIAN__
528	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vget_high_bf16(bfloat16x8_t __p0) {
529	bfloat16x4_t __ret;
530	__ret = __builtin_shufflevector(__p0, __p0, 4, 5, 6, 7);
531	return __ret;
532	}
533	#else
534	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vget_high_bf16(bfloat16x8_t __p0) {
535	bfloat16x4_t __ret;
536	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
537	__ret = __builtin_shufflevector(__rev0, __rev0, 4, 5, 6, 7);
538	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
539	return __ret;
540	}
541	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t __noswap_vget_high_bf16(bfloat16x8_t __p0) {
542	bfloat16x4_t __ret;
543	__ret = __builtin_shufflevector(__p0, __p0, 4, 5, 6, 7);
544	return __ret;
545	}
546	#endif
547
548	#ifdef __LITTLE_ENDIAN__
549	#define vgetq_lane_bf16(__p0, __p1) __extension__ ({ \
550	bfloat16_t __ret; \
551	bfloat16x8_t __s0 = __p0; \
552	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vgetq_lane_bf16(__s0, __p1)); \
553	__ret; \
554	})
555	#else
556	#define vgetq_lane_bf16(__p0, __p1) __extension__ ({ \
557	bfloat16_t __ret; \
558	bfloat16x8_t __s0 = __p0; \
559	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
560	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vgetq_lane_bf16(__rev0, __p1)); \
561	__ret; \
562	})
563	#define __noswap_vgetq_lane_bf16(__p0, __p1) __extension__ ({ \
564	bfloat16_t __ret; \
565	bfloat16x8_t __s0 = __p0; \
566	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vgetq_lane_bf16(__s0, __p1)); \
567	__ret; \
568	})
569	#endif
570
571	#ifdef __LITTLE_ENDIAN__
572	#define vget_lane_bf16(__p0, __p1) __extension__ ({ \
573	bfloat16_t __ret; \
574	bfloat16x4_t __s0 = __p0; \
575	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vget_lane_bf16(__s0, __p1)); \
576	__ret; \
577	})
578	#else
579	#define vget_lane_bf16(__p0, __p1) __extension__ ({ \
580	bfloat16_t __ret; \
581	bfloat16x4_t __s0 = __p0; \
582	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
583	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vget_lane_bf16(__rev0, __p1)); \
584	__ret; \
585	})
586	#define __noswap_vget_lane_bf16(__p0, __p1) __extension__ ({ \
587	bfloat16_t __ret; \
588	bfloat16x4_t __s0 = __p0; \
589	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vget_lane_bf16(__s0, __p1)); \
590	__ret; \
591	})
592	#endif
593
594	#ifdef __LITTLE_ENDIAN__
595	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vget_low_bf16(bfloat16x8_t __p0) {
596	bfloat16x4_t __ret;
597	__ret = __builtin_shufflevector(__p0, __p0, 0, 1, 2, 3);
598	return __ret;
599	}
600	#else
601	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vget_low_bf16(bfloat16x8_t __p0) {
602	bfloat16x4_t __ret;
603	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
604	__ret = __builtin_shufflevector(__rev0, __rev0, 0, 1, 2, 3);
605	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
606	return __ret;
607	}
608	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t __noswap_vget_low_bf16(bfloat16x8_t __p0) {
609	bfloat16x4_t __ret;
610	__ret = __builtin_shufflevector(__p0, __p0, 0, 1, 2, 3);
611	return __ret;
612	}
613	#endif
614
615	#ifdef __LITTLE_ENDIAN__
616	#define vld1q_bf16(__p0) __extension__ ({ \
617	bfloat16x8_t __ret; \
618	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_bf16(__p0, 43)); \
619	__ret; \
620	})
621	#else
622	#define vld1q_bf16(__p0) __extension__ ({ \
623	bfloat16x8_t __ret; \
624	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_bf16(__p0, 43)); \
625	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
626	__ret; \
627	})
628	#endif
629
630	#ifdef __LITTLE_ENDIAN__
631	#define vld1_bf16(__p0) __extension__ ({ \
632	bfloat16x4_t __ret; \
633	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_bf16(__p0, 11)); \
634	__ret; \
635	})
636	#else
637	#define vld1_bf16(__p0) __extension__ ({ \
638	bfloat16x4_t __ret; \
639	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_bf16(__p0, 11)); \
640	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
641	__ret; \
642	})
643	#endif
644
645	#ifdef __LITTLE_ENDIAN__
646	#define vld1q_dup_bf16(__p0) __extension__ ({ \
647	bfloat16x8_t __ret; \
648	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_dup_bf16(__p0, 43)); \
649	__ret; \
650	})
651	#else
652	#define vld1q_dup_bf16(__p0) __extension__ ({ \
653	bfloat16x8_t __ret; \
654	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_dup_bf16(__p0, 43)); \
655	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
656	__ret; \
657	})
658	#endif
659
660	#ifdef __LITTLE_ENDIAN__
661	#define vld1_dup_bf16(__p0) __extension__ ({ \
662	bfloat16x4_t __ret; \
663	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_dup_bf16(__p0, 11)); \
664	__ret; \
665	})
666	#else
667	#define vld1_dup_bf16(__p0) __extension__ ({ \
668	bfloat16x4_t __ret; \
669	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_dup_bf16(__p0, 11)); \
670	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
671	__ret; \
672	})
673	#endif
674
675	#ifdef __LITTLE_ENDIAN__
676	#define vld1q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
677	bfloat16x8_t __ret; \
678	bfloat16x8_t __s1 = __p1; \
679	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __s1), __p2, 43)); \
680	__ret; \
681	})
682	#else
683	#define vld1q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
684	bfloat16x8_t __ret; \
685	bfloat16x8_t __s1 = __p1; \
686	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
687	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __rev1), __p2, 43)); \
688	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
689	__ret; \
690	})
691	#endif
692
693	#ifdef __LITTLE_ENDIAN__
694	#define vld1_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
695	bfloat16x4_t __ret; \
696	bfloat16x4_t __s1 = __p1; \
697	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __s1), __p2, 11)); \
698	__ret; \
699	})
700	#else
701	#define vld1_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
702	bfloat16x4_t __ret; \
703	bfloat16x4_t __s1 = __p1; \
704	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
705	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __rev1), __p2, 11)); \
706	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
707	__ret; \
708	})
709	#endif
710
711	#ifdef __LITTLE_ENDIAN__
712	#define vld1q_bf16_x2(__p0) __extension__ ({ \
713	bfloat16x8x2_t __ret; \
714	__builtin_neon_vld1q_bf16_x2(&__ret, __p0, 43); \
715	__ret; \
716	})
717	#else
718	#define vld1q_bf16_x2(__p0) __extension__ ({ \
719	bfloat16x8x2_t __ret; \
720	__builtin_neon_vld1q_bf16_x2(&__ret, __p0, 43); \
721	\
722	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
723	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
724	__ret; \
725	})
726	#endif
727
728	#ifdef __LITTLE_ENDIAN__
729	#define vld1_bf16_x2(__p0) __extension__ ({ \
730	bfloat16x4x2_t __ret; \
731	__builtin_neon_vld1_bf16_x2(&__ret, __p0, 11); \
732	__ret; \
733	})
734	#else
735	#define vld1_bf16_x2(__p0) __extension__ ({ \
736	bfloat16x4x2_t __ret; \
737	__builtin_neon_vld1_bf16_x2(&__ret, __p0, 11); \
738	\
739	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
740	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
741	__ret; \
742	})
743	#endif
744
745	#ifdef __LITTLE_ENDIAN__
746	#define vld1q_bf16_x3(__p0) __extension__ ({ \
747	bfloat16x8x3_t __ret; \
748	__builtin_neon_vld1q_bf16_x3(&__ret, __p0, 43); \
749	__ret; \
750	})
751	#else
752	#define vld1q_bf16_x3(__p0) __extension__ ({ \
753	bfloat16x8x3_t __ret; \
754	__builtin_neon_vld1q_bf16_x3(&__ret, __p0, 43); \
755	\
756	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
757	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
758	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
759	__ret; \
760	})
761	#endif
762
763	#ifdef __LITTLE_ENDIAN__
764	#define vld1_bf16_x3(__p0) __extension__ ({ \
765	bfloat16x4x3_t __ret; \
766	__builtin_neon_vld1_bf16_x3(&__ret, __p0, 11); \
767	__ret; \
768	})
769	#else
770	#define vld1_bf16_x3(__p0) __extension__ ({ \
771	bfloat16x4x3_t __ret; \
772	__builtin_neon_vld1_bf16_x3(&__ret, __p0, 11); \
773	\
774	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
775	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
776	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
777	__ret; \
778	})
779	#endif
780
781	#ifdef __LITTLE_ENDIAN__
782	#define vld1q_bf16_x4(__p0) __extension__ ({ \
783	bfloat16x8x4_t __ret; \
784	__builtin_neon_vld1q_bf16_x4(&__ret, __p0, 43); \
785	__ret; \
786	})
787	#else
788	#define vld1q_bf16_x4(__p0) __extension__ ({ \
789	bfloat16x8x4_t __ret; \
790	__builtin_neon_vld1q_bf16_x4(&__ret, __p0, 43); \
791	\
792	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
793	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
794	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
795	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_128_16); \
796	__ret; \
797	})
798	#endif
799
800	#ifdef __LITTLE_ENDIAN__
801	#define vld1_bf16_x4(__p0) __extension__ ({ \
802	bfloat16x4x4_t __ret; \
803	__builtin_neon_vld1_bf16_x4(&__ret, __p0, 11); \
804	__ret; \
805	})
806	#else
807	#define vld1_bf16_x4(__p0) __extension__ ({ \
808	bfloat16x4x4_t __ret; \
809	__builtin_neon_vld1_bf16_x4(&__ret, __p0, 11); \
810	\
811	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
812	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
813	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
814	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_64_16); \
815	__ret; \
816	})
817	#endif
818
819	#ifdef __LITTLE_ENDIAN__
820	#define vld2q_bf16(__p0) __extension__ ({ \
821	bfloat16x8x2_t __ret; \
822	__builtin_neon_vld2q_bf16(&__ret, __p0, 43); \
823	__ret; \
824	})
825	#else
826	#define vld2q_bf16(__p0) __extension__ ({ \
827	bfloat16x8x2_t __ret; \
828	__builtin_neon_vld2q_bf16(&__ret, __p0, 43); \
829	\
830	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
831	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
832	__ret; \
833	})
834	#endif
835
836	#ifdef __LITTLE_ENDIAN__
837	#define vld2_bf16(__p0) __extension__ ({ \
838	bfloat16x4x2_t __ret; \
839	__builtin_neon_vld2_bf16(&__ret, __p0, 11); \
840	__ret; \
841	})
842	#else
843	#define vld2_bf16(__p0) __extension__ ({ \
844	bfloat16x4x2_t __ret; \
845	__builtin_neon_vld2_bf16(&__ret, __p0, 11); \
846	\
847	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
848	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
849	__ret; \
850	})
851	#endif
852
853	#ifdef __LITTLE_ENDIAN__
854	#define vld2q_dup_bf16(__p0) __extension__ ({ \
855	bfloat16x8x2_t __ret; \
856	__builtin_neon_vld2q_dup_bf16(&__ret, __p0, 43); \
857	__ret; \
858	})
859	#else
860	#define vld2q_dup_bf16(__p0) __extension__ ({ \
861	bfloat16x8x2_t __ret; \
862	__builtin_neon_vld2q_dup_bf16(&__ret, __p0, 43); \
863	\
864	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
865	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
866	__ret; \
867	})
868	#endif
869
870	#ifdef __LITTLE_ENDIAN__
871	#define vld2_dup_bf16(__p0) __extension__ ({ \
872	bfloat16x4x2_t __ret; \
873	__builtin_neon_vld2_dup_bf16(&__ret, __p0, 11); \
874	__ret; \
875	})
876	#else
877	#define vld2_dup_bf16(__p0) __extension__ ({ \
878	bfloat16x4x2_t __ret; \
879	__builtin_neon_vld2_dup_bf16(&__ret, __p0, 11); \
880	\
881	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
882	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
883	__ret; \
884	})
885	#endif
886
887	#ifdef __LITTLE_ENDIAN__
888	#define vld2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
889	bfloat16x8x2_t __ret; \
890	bfloat16x8x2_t __s1 = __p1; \
891	__builtin_neon_vld2q_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __p2, 43); \
892	__ret; \
893	})
894	#else
895	#define vld2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
896	bfloat16x8x2_t __ret; \
897	bfloat16x8x2_t __s1 = __p1; \
898	bfloat16x8x2_t __rev1; \
899	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
900	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
901	__builtin_neon_vld2q_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __p2, 43); \
902	\
903	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
904	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
905	__ret; \
906	})
907	#endif
908
909	#ifdef __LITTLE_ENDIAN__
910	#define vld2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
911	bfloat16x4x2_t __ret; \
912	bfloat16x4x2_t __s1 = __p1; \
913	__builtin_neon_vld2_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __p2, 11); \
914	__ret; \
915	})
916	#else
917	#define vld2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
918	bfloat16x4x2_t __ret; \
919	bfloat16x4x2_t __s1 = __p1; \
920	bfloat16x4x2_t __rev1; \
921	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
922	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
923	__builtin_neon_vld2_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __p2, 11); \
924	\
925	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
926	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
927	__ret; \
928	})
929	#endif
930
931	#ifdef __LITTLE_ENDIAN__
932	#define vld3q_bf16(__p0) __extension__ ({ \
933	bfloat16x8x3_t __ret; \
934	__builtin_neon_vld3q_bf16(&__ret, __p0, 43); \
935	__ret; \
936	})
937	#else
938	#define vld3q_bf16(__p0) __extension__ ({ \
939	bfloat16x8x3_t __ret; \
940	__builtin_neon_vld3q_bf16(&__ret, __p0, 43); \
941	\
942	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
943	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
944	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
945	__ret; \
946	})
947	#endif
948
949	#ifdef __LITTLE_ENDIAN__
950	#define vld3_bf16(__p0) __extension__ ({ \
951	bfloat16x4x3_t __ret; \
952	__builtin_neon_vld3_bf16(&__ret, __p0, 11); \
953	__ret; \
954	})
955	#else
956	#define vld3_bf16(__p0) __extension__ ({ \
957	bfloat16x4x3_t __ret; \
958	__builtin_neon_vld3_bf16(&__ret, __p0, 11); \
959	\
960	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
961	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
962	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
963	__ret; \
964	})
965	#endif
966
967	#ifdef __LITTLE_ENDIAN__
968	#define vld3q_dup_bf16(__p0) __extension__ ({ \
969	bfloat16x8x3_t __ret; \
970	__builtin_neon_vld3q_dup_bf16(&__ret, __p0, 43); \
971	__ret; \
972	})
973	#else
974	#define vld3q_dup_bf16(__p0) __extension__ ({ \
975	bfloat16x8x3_t __ret; \
976	__builtin_neon_vld3q_dup_bf16(&__ret, __p0, 43); \
977	\
978	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
979	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
980	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
981	__ret; \
982	})
983	#endif
984
985	#ifdef __LITTLE_ENDIAN__
986	#define vld3_dup_bf16(__p0) __extension__ ({ \
987	bfloat16x4x3_t __ret; \
988	__builtin_neon_vld3_dup_bf16(&__ret, __p0, 11); \
989	__ret; \
990	})
991	#else
992	#define vld3_dup_bf16(__p0) __extension__ ({ \
993	bfloat16x4x3_t __ret; \
994	__builtin_neon_vld3_dup_bf16(&__ret, __p0, 11); \
995	\
996	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
997	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
998	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
999	__ret; \
1000	})
1001	#endif
1002
1003	#ifdef __LITTLE_ENDIAN__
1004	#define vld3q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1005	bfloat16x8x3_t __ret; \
1006	bfloat16x8x3_t __s1 = __p1; \
1007	__builtin_neon_vld3q_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __p2, 43); \
1008	__ret; \
1009	})
1010	#else
1011	#define vld3q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1012	bfloat16x8x3_t __ret; \
1013	bfloat16x8x3_t __s1 = __p1; \
1014	bfloat16x8x3_t __rev1; \
1015	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
1016	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
1017	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
1018	__builtin_neon_vld3q_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __p2, 43); \
1019	\
1020	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
1021	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
1022	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
1023	__ret; \
1024	})
1025	#endif
1026
1027	#ifdef __LITTLE_ENDIAN__
1028	#define vld3_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1029	bfloat16x4x3_t __ret; \
1030	bfloat16x4x3_t __s1 = __p1; \
1031	__builtin_neon_vld3_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __p2, 11); \
1032	__ret; \
1033	})
1034	#else
1035	#define vld3_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1036	bfloat16x4x3_t __ret; \
1037	bfloat16x4x3_t __s1 = __p1; \
1038	bfloat16x4x3_t __rev1; \
1039	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
1040	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
1041	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
1042	__builtin_neon_vld3_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __p2, 11); \
1043	\
1044	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
1045	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
1046	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
1047	__ret; \
1048	})
1049	#endif
1050
1051	#ifdef __LITTLE_ENDIAN__
1052	#define vld4q_bf16(__p0) __extension__ ({ \
1053	bfloat16x8x4_t __ret; \
1054	__builtin_neon_vld4q_bf16(&__ret, __p0, 43); \
1055	__ret; \
1056	})
1057	#else
1058	#define vld4q_bf16(__p0) __extension__ ({ \
1059	bfloat16x8x4_t __ret; \
1060	__builtin_neon_vld4q_bf16(&__ret, __p0, 43); \
1061	\
1062	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
1063	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
1064	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
1065	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_128_16); \
1066	__ret; \
1067	})
1068	#endif
1069
1070	#ifdef __LITTLE_ENDIAN__
1071	#define vld4_bf16(__p0) __extension__ ({ \
1072	bfloat16x4x4_t __ret; \
1073	__builtin_neon_vld4_bf16(&__ret, __p0, 11); \
1074	__ret; \
1075	})
1076	#else
1077	#define vld4_bf16(__p0) __extension__ ({ \
1078	bfloat16x4x4_t __ret; \
1079	__builtin_neon_vld4_bf16(&__ret, __p0, 11); \
1080	\
1081	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
1082	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
1083	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
1084	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_64_16); \
1085	__ret; \
1086	})
1087	#endif
1088
1089	#ifdef __LITTLE_ENDIAN__
1090	#define vld4q_dup_bf16(__p0) __extension__ ({ \
1091	bfloat16x8x4_t __ret; \
1092	__builtin_neon_vld4q_dup_bf16(&__ret, __p0, 43); \
1093	__ret; \
1094	})
1095	#else
1096	#define vld4q_dup_bf16(__p0) __extension__ ({ \
1097	bfloat16x8x4_t __ret; \
1098	__builtin_neon_vld4q_dup_bf16(&__ret, __p0, 43); \
1099	\
1100	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
1101	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
1102	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
1103	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_128_16); \
1104	__ret; \
1105	})
1106	#endif
1107
1108	#ifdef __LITTLE_ENDIAN__
1109	#define vld4_dup_bf16(__p0) __extension__ ({ \
1110	bfloat16x4x4_t __ret; \
1111	__builtin_neon_vld4_dup_bf16(&__ret, __p0, 11); \
1112	__ret; \
1113	})
1114	#else
1115	#define vld4_dup_bf16(__p0) __extension__ ({ \
1116	bfloat16x4x4_t __ret; \
1117	__builtin_neon_vld4_dup_bf16(&__ret, __p0, 11); \
1118	\
1119	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
1120	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
1121	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
1122	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_64_16); \
1123	__ret; \
1124	})
1125	#endif
1126
1127	#ifdef __LITTLE_ENDIAN__
1128	#define vld4q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1129	bfloat16x8x4_t __ret; \
1130	bfloat16x8x4_t __s1 = __p1; \
1131	__builtin_neon_vld4q_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __builtin_bit_cast(int8x16_t, __s1.val[3]), __p2, 43); \
1132	__ret; \
1133	})
1134	#else
1135	#define vld4q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1136	bfloat16x8x4_t __ret; \
1137	bfloat16x8x4_t __s1 = __p1; \
1138	bfloat16x8x4_t __rev1; \
1139	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
1140	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
1141	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
1142	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_128_16); \
1143	__builtin_neon_vld4q_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __builtin_bit_cast(int8x16_t, __rev1.val[3]), __p2, 43); \
1144	\
1145	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
1146	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
1147	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
1148	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_128_16); \
1149	__ret; \
1150	})
1151	#endif
1152
1153	#ifdef __LITTLE_ENDIAN__
1154	#define vld4_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1155	bfloat16x4x4_t __ret; \
1156	bfloat16x4x4_t __s1 = __p1; \
1157	__builtin_neon_vld4_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __builtin_bit_cast(int8x8_t, __s1.val[3]), __p2, 11); \
1158	__ret; \
1159	})
1160	#else
1161	#define vld4_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1162	bfloat16x4x4_t __ret; \
1163	bfloat16x4x4_t __s1 = __p1; \
1164	bfloat16x4x4_t __rev1; \
1165	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
1166	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
1167	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
1168	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_64_16); \
1169	__builtin_neon_vld4_lane_bf16(&__ret, __p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __builtin_bit_cast(int8x8_t, __rev1.val[3]), __p2, 11); \
1170	\
1171	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
1172	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
1173	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
1174	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_64_16); \
1175	__ret; \
1176	})
1177	#endif
1178
1179	#ifdef __LITTLE_ENDIAN__
1180	#define vsetq_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1181	bfloat16x8_t __ret; \
1182	bfloat16_t __s0 = __p0; \
1183	bfloat16x8_t __s1 = __p1; \
1184	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vsetq_lane_bf16(__s0, __s1, __p2)); \
1185	__ret; \
1186	})
1187	#else
1188	#define vsetq_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1189	bfloat16x8_t __ret; \
1190	bfloat16_t __s0 = __p0; \
1191	bfloat16x8_t __s1 = __p1; \
1192	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
1193	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vsetq_lane_bf16(__s0, __rev1, __p2)); \
1194	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
1195	__ret; \
1196	})
1197	#define __noswap_vsetq_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1198	bfloat16x8_t __ret; \
1199	bfloat16_t __s0 = __p0; \
1200	bfloat16x8_t __s1 = __p1; \
1201	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vsetq_lane_bf16(__s0, __s1, __p2)); \
1202	__ret; \
1203	})
1204	#endif
1205
1206	#ifdef __LITTLE_ENDIAN__
1207	#define vset_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1208	bfloat16x4_t __ret; \
1209	bfloat16_t __s0 = __p0; \
1210	bfloat16x4_t __s1 = __p1; \
1211	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vset_lane_bf16(__s0, __s1, __p2)); \
1212	__ret; \
1213	})
1214	#else
1215	#define vset_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1216	bfloat16x4_t __ret; \
1217	bfloat16_t __s0 = __p0; \
1218	bfloat16x4_t __s1 = __p1; \
1219	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
1220	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vset_lane_bf16(__s0, __rev1, __p2)); \
1221	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
1222	__ret; \
1223	})
1224	#define __noswap_vset_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1225	bfloat16x4_t __ret; \
1226	bfloat16_t __s0 = __p0; \
1227	bfloat16x4_t __s1 = __p1; \
1228	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vset_lane_bf16(__s0, __s1, __p2)); \
1229	__ret; \
1230	})
1231	#endif
1232
1233	#ifdef __LITTLE_ENDIAN__
1234	#define vst1q_bf16(__p0, __p1) __extension__ ({ \
1235	bfloat16x8_t __s1 = __p1; \
1236	__builtin_neon_vst1q_bf16(__p0, __builtin_bit_cast(int8x16_t, __s1), 43); \
1237	})
1238	#else
1239	#define vst1q_bf16(__p0, __p1) __extension__ ({ \
1240	bfloat16x8_t __s1 = __p1; \
1241	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
1242	__builtin_neon_vst1q_bf16(__p0, __builtin_bit_cast(int8x16_t, __rev1), 43); \
1243	})
1244	#endif
1245
1246	#ifdef __LITTLE_ENDIAN__
1247	#define vst1_bf16(__p0, __p1) __extension__ ({ \
1248	bfloat16x4_t __s1 = __p1; \
1249	__builtin_neon_vst1_bf16(__p0, __builtin_bit_cast(int8x8_t, __s1), 11); \
1250	})
1251	#else
1252	#define vst1_bf16(__p0, __p1) __extension__ ({ \
1253	bfloat16x4_t __s1 = __p1; \
1254	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
1255	__builtin_neon_vst1_bf16(__p0, __builtin_bit_cast(int8x8_t, __rev1), 11); \
1256	})
1257	#endif
1258
1259	#ifdef __LITTLE_ENDIAN__
1260	#define vst1q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1261	bfloat16x8_t __s1 = __p1; \
1262	__builtin_neon_vst1q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __s1), __p2, 43); \
1263	})
1264	#else
1265	#define vst1q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1266	bfloat16x8_t __s1 = __p1; \
1267	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
1268	__builtin_neon_vst1q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __rev1), __p2, 43); \
1269	})
1270	#endif
1271
1272	#ifdef __LITTLE_ENDIAN__
1273	#define vst1_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1274	bfloat16x4_t __s1 = __p1; \
1275	__builtin_neon_vst1_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __s1), __p2, 11); \
1276	})
1277	#else
1278	#define vst1_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1279	bfloat16x4_t __s1 = __p1; \
1280	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
1281	__builtin_neon_vst1_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __rev1), __p2, 11); \
1282	})
1283	#endif
1284
1285	#ifdef __LITTLE_ENDIAN__
1286	#define vst1q_bf16_x2(__p0, __p1) __extension__ ({ \
1287	bfloat16x8x2_t __s1 = __p1; \
1288	__builtin_neon_vst1q_bf16_x2(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), 43); \
1289	})
1290	#else
1291	#define vst1q_bf16_x2(__p0, __p1) __extension__ ({ \
1292	bfloat16x8x2_t __s1 = __p1; \
1293	bfloat16x8x2_t __rev1; \
1294	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
1295	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
1296	__builtin_neon_vst1q_bf16_x2(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), 43); \
1297	})
1298	#endif
1299
1300	#ifdef __LITTLE_ENDIAN__
1301	#define vst1_bf16_x2(__p0, __p1) __extension__ ({ \
1302	bfloat16x4x2_t __s1 = __p1; \
1303	__builtin_neon_vst1_bf16_x2(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), 11); \
1304	})
1305	#else
1306	#define vst1_bf16_x2(__p0, __p1) __extension__ ({ \
1307	bfloat16x4x2_t __s1 = __p1; \
1308	bfloat16x4x2_t __rev1; \
1309	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
1310	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
1311	__builtin_neon_vst1_bf16_x2(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), 11); \
1312	})
1313	#endif
1314
1315	#ifdef __LITTLE_ENDIAN__
1316	#define vst1q_bf16_x3(__p0, __p1) __extension__ ({ \
1317	bfloat16x8x3_t __s1 = __p1; \
1318	__builtin_neon_vst1q_bf16_x3(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), 43); \
1319	})
1320	#else
1321	#define vst1q_bf16_x3(__p0, __p1) __extension__ ({ \
1322	bfloat16x8x3_t __s1 = __p1; \
1323	bfloat16x8x3_t __rev1; \
1324	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
1325	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
1326	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
1327	__builtin_neon_vst1q_bf16_x3(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), 43); \
1328	})
1329	#endif
1330
1331	#ifdef __LITTLE_ENDIAN__
1332	#define vst1_bf16_x3(__p0, __p1) __extension__ ({ \
1333	bfloat16x4x3_t __s1 = __p1; \
1334	__builtin_neon_vst1_bf16_x3(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), 11); \
1335	})
1336	#else
1337	#define vst1_bf16_x3(__p0, __p1) __extension__ ({ \
1338	bfloat16x4x3_t __s1 = __p1; \
1339	bfloat16x4x3_t __rev1; \
1340	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
1341	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
1342	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
1343	__builtin_neon_vst1_bf16_x3(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), 11); \
1344	})
1345	#endif
1346
1347	#ifdef __LITTLE_ENDIAN__
1348	#define vst1q_bf16_x4(__p0, __p1) __extension__ ({ \
1349	bfloat16x8x4_t __s1 = __p1; \
1350	__builtin_neon_vst1q_bf16_x4(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __builtin_bit_cast(int8x16_t, __s1.val[3]), 43); \
1351	})
1352	#else
1353	#define vst1q_bf16_x4(__p0, __p1) __extension__ ({ \
1354	bfloat16x8x4_t __s1 = __p1; \
1355	bfloat16x8x4_t __rev1; \
1356	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
1357	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
1358	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
1359	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_128_16); \
1360	__builtin_neon_vst1q_bf16_x4(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __builtin_bit_cast(int8x16_t, __rev1.val[3]), 43); \
1361	})
1362	#endif
1363
1364	#ifdef __LITTLE_ENDIAN__
1365	#define vst1_bf16_x4(__p0, __p1) __extension__ ({ \
1366	bfloat16x4x4_t __s1 = __p1; \
1367	__builtin_neon_vst1_bf16_x4(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __builtin_bit_cast(int8x8_t, __s1.val[3]), 11); \
1368	})
1369	#else
1370	#define vst1_bf16_x4(__p0, __p1) __extension__ ({ \
1371	bfloat16x4x4_t __s1 = __p1; \
1372	bfloat16x4x4_t __rev1; \
1373	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
1374	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
1375	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
1376	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_64_16); \
1377	__builtin_neon_vst1_bf16_x4(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __builtin_bit_cast(int8x8_t, __rev1.val[3]), 11); \
1378	})
1379	#endif
1380
1381	#ifdef __LITTLE_ENDIAN__
1382	#define vst2q_bf16(__p0, __p1) __extension__ ({ \
1383	bfloat16x8x2_t __s1 = __p1; \
1384	__builtin_neon_vst2q_bf16(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), 43); \
1385	})
1386	#else
1387	#define vst2q_bf16(__p0, __p1) __extension__ ({ \
1388	bfloat16x8x2_t __s1 = __p1; \
1389	bfloat16x8x2_t __rev1; \
1390	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
1391	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
1392	__builtin_neon_vst2q_bf16(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), 43); \
1393	})
1394	#endif
1395
1396	#ifdef __LITTLE_ENDIAN__
1397	#define vst2_bf16(__p0, __p1) __extension__ ({ \
1398	bfloat16x4x2_t __s1 = __p1; \
1399	__builtin_neon_vst2_bf16(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), 11); \
1400	})
1401	#else
1402	#define vst2_bf16(__p0, __p1) __extension__ ({ \
1403	bfloat16x4x2_t __s1 = __p1; \
1404	bfloat16x4x2_t __rev1; \
1405	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
1406	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
1407	__builtin_neon_vst2_bf16(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), 11); \
1408	})
1409	#endif
1410
1411	#ifdef __LITTLE_ENDIAN__
1412	#define vst2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1413	bfloat16x8x2_t __s1 = __p1; \
1414	__builtin_neon_vst2q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __p2, 43); \
1415	})
1416	#else
1417	#define vst2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1418	bfloat16x8x2_t __s1 = __p1; \
1419	bfloat16x8x2_t __rev1; \
1420	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
1421	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
1422	__builtin_neon_vst2q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __p2, 43); \
1423	})
1424	#endif
1425
1426	#ifdef __LITTLE_ENDIAN__
1427	#define vst2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1428	bfloat16x4x2_t __s1 = __p1; \
1429	__builtin_neon_vst2_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __p2, 11); \
1430	})
1431	#else
1432	#define vst2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1433	bfloat16x4x2_t __s1 = __p1; \
1434	bfloat16x4x2_t __rev1; \
1435	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
1436	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
1437	__builtin_neon_vst2_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __p2, 11); \
1438	})
1439	#endif
1440
1441	#ifdef __LITTLE_ENDIAN__
1442	#define vst3q_bf16(__p0, __p1) __extension__ ({ \
1443	bfloat16x8x3_t __s1 = __p1; \
1444	__builtin_neon_vst3q_bf16(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), 43); \
1445	})
1446	#else
1447	#define vst3q_bf16(__p0, __p1) __extension__ ({ \
1448	bfloat16x8x3_t __s1 = __p1; \
1449	bfloat16x8x3_t __rev1; \
1450	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
1451	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
1452	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
1453	__builtin_neon_vst3q_bf16(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), 43); \
1454	})
1455	#endif
1456
1457	#ifdef __LITTLE_ENDIAN__
1458	#define vst3_bf16(__p0, __p1) __extension__ ({ \
1459	bfloat16x4x3_t __s1 = __p1; \
1460	__builtin_neon_vst3_bf16(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), 11); \
1461	})
1462	#else
1463	#define vst3_bf16(__p0, __p1) __extension__ ({ \
1464	bfloat16x4x3_t __s1 = __p1; \
1465	bfloat16x4x3_t __rev1; \
1466	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
1467	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
1468	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
1469	__builtin_neon_vst3_bf16(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), 11); \
1470	})
1471	#endif
1472
1473	#ifdef __LITTLE_ENDIAN__
1474	#define vst3q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1475	bfloat16x8x3_t __s1 = __p1; \
1476	__builtin_neon_vst3q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __p2, 43); \
1477	})
1478	#else
1479	#define vst3q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1480	bfloat16x8x3_t __s1 = __p1; \
1481	bfloat16x8x3_t __rev1; \
1482	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
1483	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
1484	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
1485	__builtin_neon_vst3q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __p2, 43); \
1486	})
1487	#endif
1488
1489	#ifdef __LITTLE_ENDIAN__
1490	#define vst3_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
1491	bfloat16x4x3_t __s1 = __p1; \
1492	__builtin_neon_vst3_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __p2, 11); \
1493	})
1494	#else	153	#else
1495	#define vst3_lane_bf16(__p0, __p1, __p2) __extension__ ({ \	154	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfdotq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
1496	bfloat16x4x3_t __s1 = __p1; \	155	float32x4_t __ret;
1497	bfloat16x4x3_t __rev1; \	156	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
1498	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \	157	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
1499	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \	158	bfloat16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
1500	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \	159	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfdotq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
1501	__builtin_neon_vst3_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __p2, 11); \	160	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
1502	})	161	return __ret;
		162	}
		163	__ai __attribute__((target("bf16,neon"))) float32x4_t __noswap_vbfdotq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
		164	float32x4_t __ret;
		165	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfdotq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
		166	return __ret;
		167	}
1503	#endif	168	#endif
1504		169
1505	#ifdef __LITTLE_ENDIAN__	170	#ifdef __LITTLE_ENDIAN__
1506	#define vst4q_bf16(__p0, __p1) __extension__ ({ \	171	__ai __attribute__((target("bf16,neon"))) float32x2_t vbfdot_f32(float32x2_t __p0, bfloat16x4_t __p1, bfloat16x4_t __p2) {
1507	bfloat16x8x4_t __s1 = __p1; \	172	float32x2_t __ret;
1508	__builtin_neon_vst4q_bf16(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __builtin_bit_cast(int8x16_t, __s1.val[3]), 43); \	173	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vbfdot_f32(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), __builtin_bit_cast(int8x8_t, __p2), 9));
1509	})	174	return __ret;
		175	}
1510	#else	176	#else
1511	#define vst4q_bf16(__p0, __p1) __extension__ ({ \	177	__ai __attribute__((target("bf16,neon"))) float32x2_t vbfdot_f32(float32x2_t __p0, bfloat16x4_t __p1, bfloat16x4_t __p2) {
1512	bfloat16x8x4_t __s1 = __p1; \	178	float32x2_t __ret;
1513	bfloat16x8x4_t __rev1; \	179	float32x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_32);
1514	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \	180	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
1515	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \	181	bfloat16x4_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_64_16);
1516	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \	182	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vbfdot_f32(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), __builtin_bit_cast(int8x8_t, __rev2), 9));
1517	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_128_16); \	183	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_32);
1518	__builtin_neon_vst4q_bf16(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __builtin_bit_cast(int8x16_t, __rev1.val[3]), 43); \	184	return __ret;
1519	})	185	}
		186	__ai __attribute__((target("bf16,neon"))) float32x2_t __noswap_vbfdot_f32(float32x2_t __p0, bfloat16x4_t __p1, bfloat16x4_t __p2) {
		187	float32x2_t __ret;
		188	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vbfdot_f32(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), __builtin_bit_cast(int8x8_t, __p2), 9));
		189	return __ret;
		190	}
1520	#endif	191	#endif
1521		192
1522	#ifdef __LITTLE_ENDIAN__	193	#ifdef __LITTLE_ENDIAN__
1523	#define vst4_bf16(__p0, __p1) __extension__ ({ \	194	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmlalbq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
1524	bfloat16x4x4_t __s1 = __p1; \	195	float32x4_t __ret;
1525	__builtin_neon_vst4_bf16(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __builtin_bit_cast(int8x8_t, __s1.val[3]), 11); \	196	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlalbq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
1526	})	197	return __ret;
		198	}
1527	#else	199	#else
1528	#define vst4_bf16(__p0, __p1) __extension__ ({ \	200	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmlalbq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
1529	bfloat16x4x4_t __s1 = __p1; \	201	float32x4_t __ret;
1530	bfloat16x4x4_t __rev1; \	202	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
1531	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \	203	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
1532	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \	204	bfloat16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
1533	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \	205	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlalbq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
1534	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_64_16); \	206	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
1535	__builtin_neon_vst4_bf16(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __builtin_bit_cast(int8x8_t, __rev1.val[3]), 11); \	207	return __ret;
1536	})	208	}
		209	__ai __attribute__((target("bf16,neon"))) float32x4_t __noswap_vbfmlalbq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
		210	float32x4_t __ret;
		211	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlalbq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
		212	return __ret;
		213	}
1537	#endif	214	#endif
1538		215
1539	#ifdef __LITTLE_ENDIAN__	216	#ifdef __LITTLE_ENDIAN__
1540	#define vst4q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \	217	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmlaltq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
1541	bfloat16x8x4_t __s1 = __p1; \	218	float32x4_t __ret;
1542	__builtin_neon_vst4q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __builtin_bit_cast(int8x16_t, __s1.val[3]), __p2, 43); \	219	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlaltq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
1543	})	220	return __ret;
		221	}
1544	#else	222	#else
1545	#define vst4q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \	223	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmlaltq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
1546	bfloat16x8x4_t __s1 = __p1; \	224	float32x4_t __ret;
1547	bfloat16x8x4_t __rev1; \	225	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
1548	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \	226	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
1549	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \	227	bfloat16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
1550	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \	228	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlaltq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
1551	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_128_16); \	229	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
1552	__builtin_neon_vst4q_lane_bf16(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __builtin_bit_cast(int8x16_t, __rev1.val[3]), __p2, 43); \	230	return __ret;
1553	})	231	}
		232	__ai __attribute__((target("bf16,neon"))) float32x4_t __noswap_vbfmlaltq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
		233	float32x4_t __ret;
		234	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmlaltq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
		235	return __ret;
		236	}
1554	#endif	237	#endif
1555		238
1556	#ifdef __LITTLE_ENDIAN__	239	#ifdef __LITTLE_ENDIAN__
1557	#define vst4_lane_bf16(__p0, __p1, __p2) __extension__ ({ \	240	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmmlaq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
1558	bfloat16x4x4_t __s1 = __p1; \	241	float32x4_t __ret;
1559	__builtin_neon_vst4_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __builtin_bit_cast(int8x8_t, __s1.val[3]), __p2, 11); \	242	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmmlaq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
1560	})	243	return __ret;
		244	}
1561	#else	245	#else
1562	#define vst4_lane_bf16(__p0, __p1, __p2) __extension__ ({ \	246	__ai __attribute__((target("bf16,neon"))) float32x4_t vbfmmlaq_f32(float32x4_t __p0, bfloat16x8_t __p1, bfloat16x8_t __p2) {
1563	bfloat16x4x4_t __s1 = __p1; \	247	float32x4_t __ret;
1564	bfloat16x4x4_t __rev1; \	248	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
1565	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \	249	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
1566	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \	250	bfloat16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
1567	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \	251	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vbfmmlaq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
1568	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_64_16); \	252	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
1569	__builtin_neon_vst4_lane_bf16(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __builtin_bit_cast(int8x8_t, __rev1.val[3]), __p2, 11); \	253	return __ret;
1570	})	254	}
1571	#endif	255	#endif
1572		256
		257	__ai __attribute__((target("bf16,neon"))) float32_t vcvtah_f32_bf16(bfloat16_t __p0) {
		258	float32_t __ret;
		259	__ret = __builtin_bit_cast(float32_t, (uint32_t)(__builtin_bit_cast(uint16_t, __p0)) << 16);
		260	return __ret;
		261	}
		262	__ai __attribute__((target("bf16,neon"))) bfloat16_t vcvth_bf16_f32(float32_t __p0) {
		263	bfloat16_t __ret;
		264	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vcvth_bf16_f32(__p0));
		265	return __ret;
		266	}
1573	#ifdef __LITTLE_ENDIAN__	267	#ifdef __LITTLE_ENDIAN__
1574	__ai __attribute__((target("dotprod,neon"))) uint32x4_t vdotq_u32(uint32x4_t __p0, uint8x16_t __p1, uint8x16_t __p2) {	268	__ai __attribute__((target("dotprod,neon"))) uint32x4_t vdotq_u32(uint32x4_t __p0, uint8x16_t __p1, uint8x16_t __p2) {
1575	uint32x4_t __ret;	269	uint32x4_t __ret;
...	@@ -3925,6 +2619,54 @@ __ai __attribute__((target("i8mm,neon"))) int32x4_t vusmmlaq_s32(int32x4_t __p0,	...	@@ -3925,6 +2619,54 @@ __ai __attribute__((target("i8mm,neon"))) int32x4_t vusmmlaq_s32(int32x4_t __p0,
3925	})	2619	})
3926	#endif	2620	#endif
3927		2621
		2622	#ifdef __LITTLE_ENDIAN__
		2623	#define splatq_lane_bf16(__p0, __p1) __extension__ ({ \
		2624	bfloat16x8_t __ret; \
		2625	bfloat16x4_t __s0 = __p0; \
		2626	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_lane_v(__builtin_bit_cast(int8x8_t, __s0), __p1, 11)); \
		2627	__ret; \
		2628	})
		2629	#else
		2630	#define splatq_lane_bf16(__p0, __p1) __extension__ ({ \
		2631	bfloat16x8_t __ret; \
		2632	bfloat16x4_t __s0 = __p0; \
		2633	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		2634	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_lane_v(__builtin_bit_cast(int8x8_t, __rev0), __p1, 11)); \
		2635	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		2636	__ret; \
		2637	})
		2638	#define __noswap_splatq_lane_bf16(__p0, __p1) __extension__ ({ \
		2639	bfloat16x8_t __ret; \
		2640	bfloat16x4_t __s0 = __p0; \
		2641	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_lane_v(__builtin_bit_cast(int8x8_t, __s0), __p1, 11)); \
		2642	__ret; \
		2643	})
		2644	#endif
		2645
		2646	#ifdef __LITTLE_ENDIAN__
		2647	#define splat_lane_bf16(__p0, __p1) __extension__ ({ \
		2648	bfloat16x4_t __ret; \
		2649	bfloat16x4_t __s0 = __p0; \
		2650	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_lane_v(__builtin_bit_cast(int8x8_t, __s0), __p1, 11)); \
		2651	__ret; \
		2652	})
		2653	#else
		2654	#define splat_lane_bf16(__p0, __p1) __extension__ ({ \
		2655	bfloat16x4_t __ret; \
		2656	bfloat16x4_t __s0 = __p0; \
		2657	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		2658	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_lane_v(__builtin_bit_cast(int8x8_t, __rev0), __p1, 11)); \
		2659	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
		2660	__ret; \
		2661	})
		2662	#define __noswap_splat_lane_bf16(__p0, __p1) __extension__ ({ \
		2663	bfloat16x4_t __ret; \
		2664	bfloat16x4_t __s0 = __p0; \
		2665	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_lane_v(__builtin_bit_cast(int8x8_t, __s0), __p1, 11)); \
		2666	__ret; \
		2667	})
		2668	#endif
		2669
3928	#ifdef __LITTLE_ENDIAN__	2670	#ifdef __LITTLE_ENDIAN__
3929	#define splat_laneq_p8(__p0, __p1) __extension__ ({ \	2671	#define splat_laneq_p8(__p0, __p1) __extension__ ({ \
3930	poly8x8_t __ret; \	2672	poly8x8_t __ret; \
...	@@ -4593,6 +3335,54 @@ __ai __attribute__((target("i8mm,neon"))) int32x4_t vusmmlaq_s32(int32x4_t __p0,	...	@@ -4593,6 +3335,54 @@ __ai __attribute__((target("i8mm,neon"))) int32x4_t vusmmlaq_s32(int32x4_t __p0,
4593	})	3335	})
4594	#endif	3336	#endif
4595		3337
		3338	#ifdef __LITTLE_ENDIAN__
		3339	#define splatq_laneq_bf16(__p0, __p1) __extension__ ({ \
		3340	bfloat16x8_t __ret; \
		3341	bfloat16x8_t __s0 = __p0; \
		3342	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_laneq_v(__builtin_bit_cast(int8x16_t, __s0), __p1, 43)); \
		3343	__ret; \
		3344	})
		3345	#else
		3346	#define splatq_laneq_bf16(__p0, __p1) __extension__ ({ \
		3347	bfloat16x8_t __ret; \
		3348	bfloat16x8_t __s0 = __p0; \
		3349	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		3350	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_laneq_v(__builtin_bit_cast(int8x16_t, __rev0), __p1, 43)); \
		3351	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		3352	__ret; \
		3353	})
		3354	#define __noswap_splatq_laneq_bf16(__p0, __p1) __extension__ ({ \
		3355	bfloat16x8_t __ret; \
		3356	bfloat16x8_t __s0 = __p0; \
		3357	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_splatq_laneq_v(__builtin_bit_cast(int8x16_t, __s0), __p1, 43)); \
		3358	__ret; \
		3359	})
		3360	#endif
		3361
		3362	#ifdef __LITTLE_ENDIAN__
		3363	#define splat_laneq_bf16(__p0, __p1) __extension__ ({ \
		3364	bfloat16x4_t __ret; \
		3365	bfloat16x8_t __s0 = __p0; \
		3366	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_laneq_v(__builtin_bit_cast(int8x16_t, __s0), __p1, 43)); \
		3367	__ret; \
		3368	})
		3369	#else
		3370	#define splat_laneq_bf16(__p0, __p1) __extension__ ({ \
		3371	bfloat16x4_t __ret; \
		3372	bfloat16x8_t __s0 = __p0; \
		3373	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		3374	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_laneq_v(__builtin_bit_cast(int8x16_t, __rev0), __p1, 43)); \
		3375	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
		3376	__ret; \
		3377	})
		3378	#define __noswap_splat_laneq_bf16(__p0, __p1) __extension__ ({ \
		3379	bfloat16x4_t __ret; \
		3380	bfloat16x8_t __s0 = __p0; \
		3381	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_splat_laneq_v(__builtin_bit_cast(int8x16_t, __s0), __p1, 43)); \
		3382	__ret; \
		3383	})
		3384	#endif
		3385
4596	#ifdef __LITTLE_ENDIAN__	3386	#ifdef __LITTLE_ENDIAN__
4597	__ai __attribute__((target("neon"))) uint8x16_t vabdq_u8(uint8x16_t __p0, uint8x16_t __p1) {	3387	__ai __attribute__((target("neon"))) uint8x16_t vabdq_u8(uint8x16_t __p0, uint8x16_t __p1) {
4598	uint8x16_t __ret;	3388	uint8x16_t __ret;
...	@@ -8505,6 +7295,28 @@ __ai __attribute__((target("neon"))) int16x8_t __noswap_vcombine_s16(int16x4_t _	...	@@ -8505,6 +7295,28 @@ __ai __attribute__((target("neon"))) int16x8_t __noswap_vcombine_s16(int16x4_t _
8505	}	7295	}
8506	#endif	7296	#endif
8507		7297
		7298	#ifdef __LITTLE_ENDIAN__
		7299	__ai __attribute__((target("neon"))) bfloat16x8_t vcombine_bf16(bfloat16x4_t __p0, bfloat16x4_t __p1) {
		7300	bfloat16x8_t __ret;
		7301	__ret = __builtin_shufflevector(__p0, __p1, 0, 1, 2, 3, 4, 5, 6, 7);
		7302	return __ret;
		7303	}
		7304	#else
		7305	__ai __attribute__((target("neon"))) bfloat16x8_t vcombine_bf16(bfloat16x4_t __p0, bfloat16x4_t __p1) {
		7306	bfloat16x8_t __ret;
		7307	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_16);
		7308	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
		7309	__ret = __builtin_shufflevector(__rev0, __rev1, 0, 1, 2, 3, 4, 5, 6, 7);
		7310	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
		7311	return __ret;
		7312	}
		7313	__ai __attribute__((target("neon"))) bfloat16x8_t __noswap_vcombine_bf16(bfloat16x4_t __p0, bfloat16x4_t __p1) {
		7314	bfloat16x8_t __ret;
		7315	__ret = __builtin_shufflevector(__p0, __p1, 0, 1, 2, 3, 4, 5, 6, 7);
		7316	return __ret;
		7317	}
		7318	#endif
		7319
8508	#define vcreate_p8(__p0) __extension__ ({ \	7320	#define vcreate_p8(__p0) __extension__ ({ \
8509	poly8x8_t __ret; \	7321	poly8x8_t __ret; \
8510	uint64_t __promote = __p0; \	7322	uint64_t __promote = __p0; \
...	@@ -8577,6 +7389,12 @@ __ai __attribute__((target("neon"))) int16x8_t __noswap_vcombine_s16(int16x4_t _	...	@@ -8577,6 +7389,12 @@ __ai __attribute__((target("neon"))) int16x8_t __noswap_vcombine_s16(int16x4_t _
8577	__ret = __builtin_bit_cast(int16x4_t, __promote); \	7389	__ret = __builtin_bit_cast(int16x4_t, __promote); \
8578	__ret; \	7390	__ret; \
8579	})	7391	})
		7392	#define vcreate_bf16(__p0) __extension__ ({ \
		7393	bfloat16x4_t __ret; \
		7394	uint64_t __promote = __p0; \
		7395	__ret = __builtin_bit_cast(bfloat16x4_t, __promote); \
		7396	__ret; \
		7397	})
8580	#ifdef __LITTLE_ENDIAN__	7398	#ifdef __LITTLE_ENDIAN__
8581	__ai __attribute__((target("neon"))) float32x4_t vcvtq_f32_u32(uint32x4_t __p0) {	7399	__ai __attribute__((target("neon"))) float32x4_t vcvtq_f32_u32(uint32x4_t __p0) {
8582	float32x4_t __ret;	7400	float32x4_t __ret;
...	@@ -8850,406 +7668,512 @@ __ai __attribute__((target("neon"))) uint32x2_t vcvt_u32_f32(float32x2_t __p0) {	...	@@ -8850,406 +7668,512 @@ __ai __attribute__((target("neon"))) uint32x2_t vcvt_u32_f32(float32x2_t __p0) {
8850	#endif	7668	#endif
8851		7669
8852	#ifdef __LITTLE_ENDIAN__	7670	#ifdef __LITTLE_ENDIAN__
8853	#define vdup_lane_p8(__p0_8, __p1_8) __extension__ ({ \	7671	#define vduph_lane_bf16(__p0, __p1) __extension__ ({ \
8854	poly8x8_t __ret_8; \	7672	bfloat16_t __ret; \
8855	poly8x8_t __s0_8 = __p0_8; \	7673	bfloat16x4_t __s0 = __p0; \
8856	__ret_8 = splat_lane_p8(__s0_8, __p1_8); \	7674	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vduph_lane_bf16(__s0, __p1)); \
		7675	__ret; \
		7676	})
		7677	#else
		7678	#define vduph_lane_bf16(__p0, __p1) __extension__ ({ \
		7679	bfloat16_t __ret; \
		7680	bfloat16x4_t __s0 = __p0; \
		7681	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		7682	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vduph_lane_bf16(__rev0, __p1)); \
		7683	__ret; \
		7684	})
		7685	#endif
		7686
		7687	#ifdef __LITTLE_ENDIAN__
		7688	#define vdup_lane_p8(__p0_0, __p1_0) __extension__ ({ \
		7689	poly8x8_t __ret_0; \
		7690	poly8x8_t __s0_0 = __p0_0; \
		7691	__ret_0 = splat_lane_p8(__s0_0, __p1_0); \
		7692	__ret_0; \
		7693	})
		7694	#else
		7695	#define vdup_lane_p8(__p0_1, __p1_1) __extension__ ({ \
		7696	poly8x8_t __ret_1; \
		7697	poly8x8_t __s0_1 = __p0_1; \
		7698	poly8x8_t __rev0_1; __rev0_1 = __builtin_shufflevector(__s0_1, __s0_1, __lane_reverse_64_8); \
		7699	__ret_1 = __noswap_splat_lane_p8(__rev0_1, __p1_1); \
		7700	__ret_1 = __builtin_shufflevector(__ret_1, __ret_1, __lane_reverse_64_8); \
		7701	__ret_1; \
		7702	})
		7703	#endif
		7704
		7705	#ifdef __LITTLE_ENDIAN__
		7706	#define vdup_lane_p16(__p0_2, __p1_2) __extension__ ({ \
		7707	poly16x4_t __ret_2; \
		7708	poly16x4_t __s0_2 = __p0_2; \
		7709	__ret_2 = splat_lane_p16(__s0_2, __p1_2); \
		7710	__ret_2; \
		7711	})
		7712	#else
		7713	#define vdup_lane_p16(__p0_3, __p1_3) __extension__ ({ \
		7714	poly16x4_t __ret_3; \
		7715	poly16x4_t __s0_3 = __p0_3; \
		7716	poly16x4_t __rev0_3; __rev0_3 = __builtin_shufflevector(__s0_3, __s0_3, __lane_reverse_64_16); \
		7717	__ret_3 = __noswap_splat_lane_p16(__rev0_3, __p1_3); \
		7718	__ret_3 = __builtin_shufflevector(__ret_3, __ret_3, __lane_reverse_64_16); \
		7719	__ret_3; \
		7720	})
		7721	#endif
		7722
		7723	#ifdef __LITTLE_ENDIAN__
		7724	#define vdupq_lane_p8(__p0_4, __p1_4) __extension__ ({ \
		7725	poly8x16_t __ret_4; \
		7726	poly8x8_t __s0_4 = __p0_4; \
		7727	__ret_4 = splatq_lane_p8(__s0_4, __p1_4); \
		7728	__ret_4; \
		7729	})
		7730	#else
		7731	#define vdupq_lane_p8(__p0_5, __p1_5) __extension__ ({ \
		7732	poly8x16_t __ret_5; \
		7733	poly8x8_t __s0_5 = __p0_5; \
		7734	poly8x8_t __rev0_5; __rev0_5 = __builtin_shufflevector(__s0_5, __s0_5, __lane_reverse_64_8); \
		7735	__ret_5 = __noswap_splatq_lane_p8(__rev0_5, __p1_5); \
		7736	__ret_5 = __builtin_shufflevector(__ret_5, __ret_5, __lane_reverse_128_8); \
		7737	__ret_5; \
		7738	})
		7739	#endif
		7740
		7741	#ifdef __LITTLE_ENDIAN__
		7742	#define vdupq_lane_p16(__p0_6, __p1_6) __extension__ ({ \
		7743	poly16x8_t __ret_6; \
		7744	poly16x4_t __s0_6 = __p0_6; \
		7745	__ret_6 = splatq_lane_p16(__s0_6, __p1_6); \
		7746	__ret_6; \
		7747	})
		7748	#else
		7749	#define vdupq_lane_p16(__p0_7, __p1_7) __extension__ ({ \
		7750	poly16x8_t __ret_7; \
		7751	poly16x4_t __s0_7 = __p0_7; \
		7752	poly16x4_t __rev0_7; __rev0_7 = __builtin_shufflevector(__s0_7, __s0_7, __lane_reverse_64_16); \
		7753	__ret_7 = __noswap_splatq_lane_p16(__rev0_7, __p1_7); \
		7754	__ret_7 = __builtin_shufflevector(__ret_7, __ret_7, __lane_reverse_128_16); \
		7755	__ret_7; \
		7756	})
		7757	#endif
		7758
		7759	#ifdef __LITTLE_ENDIAN__
		7760	#define vdupq_lane_u8(__p0_8, __p1_8) __extension__ ({ \
		7761	uint8x16_t __ret_8; \
		7762	uint8x8_t __s0_8 = __p0_8; \
		7763	__ret_8 = splatq_lane_u8(__s0_8, __p1_8); \
8857	__ret_8; \	7764	__ret_8; \
8858	})	7765	})
8859	#else	7766	#else
8860	#define vdup_lane_p8(__p0_9, __p1_9) __extension__ ({ \	7767	#define vdupq_lane_u8(__p0_9, __p1_9) __extension__ ({ \
8861	poly8x8_t __ret_9; \	7768	uint8x16_t __ret_9; \
8862	poly8x8_t __s0_9 = __p0_9; \	7769	uint8x8_t __s0_9 = __p0_9; \
8863	poly8x8_t __rev0_9; __rev0_9 = __builtin_shufflevector(__s0_9, __s0_9, __lane_reverse_64_8); \	7770	uint8x8_t __rev0_9; __rev0_9 = __builtin_shufflevector(__s0_9, __s0_9, __lane_reverse_64_8); \
8864	__ret_9 = __noswap_splat_lane_p8(__rev0_9, __p1_9); \	7771	__ret_9 = __noswap_splatq_lane_u8(__rev0_9, __p1_9); \
8865	__ret_9 = __builtin_shufflevector(__ret_9, __ret_9, __lane_reverse_64_8); \	7772	__ret_9 = __builtin_shufflevector(__ret_9, __ret_9, __lane_reverse_128_8); \
8866	__ret_9; \	7773	__ret_9; \
8867	})	7774	})
8868	#endif	7775	#endif
8869		7776
8870	#ifdef __LITTLE_ENDIAN__	7777	#ifdef __LITTLE_ENDIAN__
8871	#define vdup_lane_p16(__p0_10, __p1_10) __extension__ ({ \	7778	#define vdupq_lane_u32(__p0_10, __p1_10) __extension__ ({ \
8872	poly16x4_t __ret_10; \	7779	uint32x4_t __ret_10; \
8873	poly16x4_t __s0_10 = __p0_10; \	7780	uint32x2_t __s0_10 = __p0_10; \
8874	__ret_10 = splat_lane_p16(__s0_10, __p1_10); \	7781	__ret_10 = splatq_lane_u32(__s0_10, __p1_10); \
8875	__ret_10; \	7782	__ret_10; \
8876	})	7783	})
8877	#else	7784	#else
8878	#define vdup_lane_p16(__p0_11, __p1_11) __extension__ ({ \	7785	#define vdupq_lane_u32(__p0_11, __p1_11) __extension__ ({ \
8879	poly16x4_t __ret_11; \	7786	uint32x4_t __ret_11; \
8880	poly16x4_t __s0_11 = __p0_11; \	7787	uint32x2_t __s0_11 = __p0_11; \
8881	poly16x4_t __rev0_11; __rev0_11 = __builtin_shufflevector(__s0_11, __s0_11, __lane_reverse_64_16); \	7788	uint32x2_t __rev0_11; __rev0_11 = __builtin_shufflevector(__s0_11, __s0_11, __lane_reverse_64_32); \
8882	__ret_11 = __noswap_splat_lane_p16(__rev0_11, __p1_11); \	7789	__ret_11 = __noswap_splatq_lane_u32(__rev0_11, __p1_11); \
8883	__ret_11 = __builtin_shufflevector(__ret_11, __ret_11, __lane_reverse_64_16); \	7790	__ret_11 = __builtin_shufflevector(__ret_11, __ret_11, __lane_reverse_128_32); \
8884	__ret_11; \	7791	__ret_11; \
8885	})	7792	})
8886	#endif	7793	#endif
8887		7794
8888	#ifdef __LITTLE_ENDIAN__	7795	#ifdef __LITTLE_ENDIAN__
8889	#define vdupq_lane_p8(__p0_12, __p1_12) __extension__ ({ \	7796	#define vdupq_lane_u64(__p0_12, __p1_12) __extension__ ({ \
8890	poly8x16_t __ret_12; \	7797	uint64x2_t __ret_12; \
8891	poly8x8_t __s0_12 = __p0_12; \	7798	uint64x1_t __s0_12 = __p0_12; \
8892	__ret_12 = splatq_lane_p8(__s0_12, __p1_12); \	7799	__ret_12 = splatq_lane_u64(__s0_12, __p1_12); \
8893	__ret_12; \	7800	__ret_12; \
8894	})	7801	})
8895	#else	7802	#else
8896	#define vdupq_lane_p8(__p0_13, __p1_13) __extension__ ({ \	7803	#define vdupq_lane_u64(__p0_13, __p1_13) __extension__ ({ \
8897	poly8x16_t __ret_13; \	7804	uint64x2_t __ret_13; \
8898	poly8x8_t __s0_13 = __p0_13; \	7805	uint64x1_t __s0_13 = __p0_13; \
8899	poly8x8_t __rev0_13; __rev0_13 = __builtin_shufflevector(__s0_13, __s0_13, __lane_reverse_64_8); \	7806	__ret_13 = __noswap_splatq_lane_u64(__s0_13, __p1_13); \
8900	__ret_13 = __noswap_splatq_lane_p8(__rev0_13, __p1_13); \	7807	__ret_13 = __builtin_shufflevector(__ret_13, __ret_13, __lane_reverse_128_64); \
8901	__ret_13 = __builtin_shufflevector(__ret_13, __ret_13, __lane_reverse_128_8); \
8902	__ret_13; \	7808	__ret_13; \
8903	})	7809	})
8904	#endif	7810	#endif
8905		7811
8906	#ifdef __LITTLE_ENDIAN__	7812	#ifdef __LITTLE_ENDIAN__
8907	#define vdupq_lane_p16(__p0_14, __p1_14) __extension__ ({ \	7813	#define vdupq_lane_u16(__p0_14, __p1_14) __extension__ ({ \
8908	poly16x8_t __ret_14; \	7814	uint16x8_t __ret_14; \
8909	poly16x4_t __s0_14 = __p0_14; \	7815	uint16x4_t __s0_14 = __p0_14; \
8910	__ret_14 = splatq_lane_p16(__s0_14, __p1_14); \	7816	__ret_14 = splatq_lane_u16(__s0_14, __p1_14); \
8911	__ret_14; \	7817	__ret_14; \
8912	})	7818	})
8913	#else	7819	#else
8914	#define vdupq_lane_p16(__p0_15, __p1_15) __extension__ ({ \	7820	#define vdupq_lane_u16(__p0_15, __p1_15) __extension__ ({ \
8915	poly16x8_t __ret_15; \	7821	uint16x8_t __ret_15; \
8916	poly16x4_t __s0_15 = __p0_15; \	7822	uint16x4_t __s0_15 = __p0_15; \
8917	poly16x4_t __rev0_15; __rev0_15 = __builtin_shufflevector(__s0_15, __s0_15, __lane_reverse_64_16); \	7823	uint16x4_t __rev0_15; __rev0_15 = __builtin_shufflevector(__s0_15, __s0_15, __lane_reverse_64_16); \
8918	__ret_15 = __noswap_splatq_lane_p16(__rev0_15, __p1_15); \	7824	__ret_15 = __noswap_splatq_lane_u16(__rev0_15, __p1_15); \
8919	__ret_15 = __builtin_shufflevector(__ret_15, __ret_15, __lane_reverse_128_16); \	7825	__ret_15 = __builtin_shufflevector(__ret_15, __ret_15, __lane_reverse_128_16); \
8920	__ret_15; \	7826	__ret_15; \
8921	})	7827	})
8922	#endif	7828	#endif
8923		7829
8924	#ifdef __LITTLE_ENDIAN__	7830	#ifdef __LITTLE_ENDIAN__
8925	#define vdupq_lane_u8(__p0_16, __p1_16) __extension__ ({ \	7831	#define vdupq_lane_s8(__p0_16, __p1_16) __extension__ ({ \
8926	uint8x16_t __ret_16; \	7832	int8x16_t __ret_16; \
8927	uint8x8_t __s0_16 = __p0_16; \	7833	int8x8_t __s0_16 = __p0_16; \
8928	__ret_16 = splatq_lane_u8(__s0_16, __p1_16); \	7834	__ret_16 = splatq_lane_s8(__s0_16, __p1_16); \
8929	__ret_16; \	7835	__ret_16; \
8930	})	7836	})
8931	#else	7837	#else
8932	#define vdupq_lane_u8(__p0_17, __p1_17) __extension__ ({ \	7838	#define vdupq_lane_s8(__p0_17, __p1_17) __extension__ ({ \
8933	uint8x16_t __ret_17; \	7839	int8x16_t __ret_17; \
8934	uint8x8_t __s0_17 = __p0_17; \	7840	int8x8_t __s0_17 = __p0_17; \
8935	uint8x8_t __rev0_17; __rev0_17 = __builtin_shufflevector(__s0_17, __s0_17, __lane_reverse_64_8); \	7841	int8x8_t __rev0_17; __rev0_17 = __builtin_shufflevector(__s0_17, __s0_17, __lane_reverse_64_8); \
8936	__ret_17 = __noswap_splatq_lane_u8(__rev0_17, __p1_17); \	7842	__ret_17 = __noswap_splatq_lane_s8(__rev0_17, __p1_17); \
8937	__ret_17 = __builtin_shufflevector(__ret_17, __ret_17, __lane_reverse_128_8); \	7843	__ret_17 = __builtin_shufflevector(__ret_17, __ret_17, __lane_reverse_128_8); \
8938	__ret_17; \	7844	__ret_17; \
8939	})	7845	})
8940	#endif	7846	#endif
8941		7847
8942	#ifdef __LITTLE_ENDIAN__	7848	#ifdef __LITTLE_ENDIAN__
8943	#define vdupq_lane_u32(__p0_18, __p1_18) __extension__ ({ \	7849	#define vdupq_lane_f32(__p0_18, __p1_18) __extension__ ({ \
8944	uint32x4_t __ret_18; \	7850	float32x4_t __ret_18; \
8945	uint32x2_t __s0_18 = __p0_18; \	7851	float32x2_t __s0_18 = __p0_18; \
8946	__ret_18 = splatq_lane_u32(__s0_18, __p1_18); \	7852	__ret_18 = splatq_lane_f32(__s0_18, __p1_18); \
8947	__ret_18; \	7853	__ret_18; \
8948	})	7854	})
8949	#else	7855	#else
8950	#define vdupq_lane_u32(__p0_19, __p1_19) __extension__ ({ \	7856	#define vdupq_lane_f32(__p0_19, __p1_19) __extension__ ({ \
8951	uint32x4_t __ret_19; \	7857	float32x4_t __ret_19; \
8952	uint32x2_t __s0_19 = __p0_19; \	7858	float32x2_t __s0_19 = __p0_19; \
8953	uint32x2_t __rev0_19; __rev0_19 = __builtin_shufflevector(__s0_19, __s0_19, __lane_reverse_64_32); \	7859	float32x2_t __rev0_19; __rev0_19 = __builtin_shufflevector(__s0_19, __s0_19, __lane_reverse_64_32); \
8954	__ret_19 = __noswap_splatq_lane_u32(__rev0_19, __p1_19); \	7860	__ret_19 = __noswap_splatq_lane_f32(__rev0_19, __p1_19); \
8955	__ret_19 = __builtin_shufflevector(__ret_19, __ret_19, __lane_reverse_128_32); \	7861	__ret_19 = __builtin_shufflevector(__ret_19, __ret_19, __lane_reverse_128_32); \
8956	__ret_19; \	7862	__ret_19; \
8957	})	7863	})
8958	#endif	7864	#endif
8959		7865
8960	#ifdef __LITTLE_ENDIAN__	7866	#ifdef __LITTLE_ENDIAN__
8961	#define vdupq_lane_u64(__p0_20, __p1_20) __extension__ ({ \	7867	#define vdupq_lane_f16(__p0_20, __p1_20) __extension__ ({ \
8962	uint64x2_t __ret_20; \	7868	float16x8_t __ret_20; \
8963	uint64x1_t __s0_20 = __p0_20; \	7869	float16x4_t __s0_20 = __p0_20; \
8964	__ret_20 = splatq_lane_u64(__s0_20, __p1_20); \	7870	__ret_20 = splatq_lane_f16(__s0_20, __p1_20); \
8965	__ret_20; \	7871	__ret_20; \
8966	})	7872	})
8967	#else	7873	#else
8968	#define vdupq_lane_u64(__p0_21, __p1_21) __extension__ ({ \	7874	#define vdupq_lane_f16(__p0_21, __p1_21) __extension__ ({ \
8969	uint64x2_t __ret_21; \	7875	float16x8_t __ret_21; \
8970	uint64x1_t __s0_21 = __p0_21; \	7876	float16x4_t __s0_21 = __p0_21; \
8971	__ret_21 = __noswap_splatq_lane_u64(__s0_21, __p1_21); \	7877	float16x4_t __rev0_21; __rev0_21 = __builtin_shufflevector(__s0_21, __s0_21, __lane_reverse_64_16); \
8972	__ret_21 = __builtin_shufflevector(__ret_21, __ret_21, __lane_reverse_128_64); \	7878	__ret_21 = __noswap_splatq_lane_f16(__rev0_21, __p1_21); \
		7879	__ret_21 = __builtin_shufflevector(__ret_21, __ret_21, __lane_reverse_128_16); \
8973	__ret_21; \	7880	__ret_21; \
8974	})	7881	})
8975	#endif	7882	#endif
8976		7883
8977	#ifdef __LITTLE_ENDIAN__	7884	#ifdef __LITTLE_ENDIAN__
8978	#define vdupq_lane_u16(__p0_22, __p1_22) __extension__ ({ \	7885	#define vdupq_lane_s32(__p0_22, __p1_22) __extension__ ({ \
8979	uint16x8_t __ret_22; \	7886	int32x4_t __ret_22; \
8980	uint16x4_t __s0_22 = __p0_22; \	7887	int32x2_t __s0_22 = __p0_22; \
8981	__ret_22 = splatq_lane_u16(__s0_22, __p1_22); \	7888	__ret_22 = splatq_lane_s32(__s0_22, __p1_22); \
8982	__ret_22; \	7889	__ret_22; \
8983	})	7890	})
8984	#else	7891	#else
8985	#define vdupq_lane_u16(__p0_23, __p1_23) __extension__ ({ \	7892	#define vdupq_lane_s32(__p0_23, __p1_23) __extension__ ({ \
8986	uint16x8_t __ret_23; \	7893	int32x4_t __ret_23; \
8987	uint16x4_t __s0_23 = __p0_23; \	7894	int32x2_t __s0_23 = __p0_23; \
8988	uint16x4_t __rev0_23; __rev0_23 = __builtin_shufflevector(__s0_23, __s0_23, __lane_reverse_64_16); \	7895	int32x2_t __rev0_23; __rev0_23 = __builtin_shufflevector(__s0_23, __s0_23, __lane_reverse_64_32); \
8989	__ret_23 = __noswap_splatq_lane_u16(__rev0_23, __p1_23); \	7896	__ret_23 = __noswap_splatq_lane_s32(__rev0_23, __p1_23); \
8990	__ret_23 = __builtin_shufflevector(__ret_23, __ret_23, __lane_reverse_128_16); \	7897	__ret_23 = __builtin_shufflevector(__ret_23, __ret_23, __lane_reverse_128_32); \
8991	__ret_23; \	7898	__ret_23; \
8992	})	7899	})
8993	#endif	7900	#endif
8994		7901
8995	#ifdef __LITTLE_ENDIAN__	7902	#ifdef __LITTLE_ENDIAN__
8996	#define vdupq_lane_s8(__p0_24, __p1_24) __extension__ ({ \	7903	#define vdupq_lane_s64(__p0_24, __p1_24) __extension__ ({ \
8997	int8x16_t __ret_24; \	7904	int64x2_t __ret_24; \
8998	int8x8_t __s0_24 = __p0_24; \	7905	int64x1_t __s0_24 = __p0_24; \
8999	__ret_24 = splatq_lane_s8(__s0_24, __p1_24); \	7906	__ret_24 = splatq_lane_s64(__s0_24, __p1_24); \
9000	__ret_24; \	7907	__ret_24; \
9001	})	7908	})
9002	#else	7909	#else
9003	#define vdupq_lane_s8(__p0_25, __p1_25) __extension__ ({ \	7910	#define vdupq_lane_s64(__p0_25, __p1_25) __extension__ ({ \
9004	int8x16_t __ret_25; \	7911	int64x2_t __ret_25; \
9005	int8x8_t __s0_25 = __p0_25; \	7912	int64x1_t __s0_25 = __p0_25; \
9006	int8x8_t __rev0_25; __rev0_25 = __builtin_shufflevector(__s0_25, __s0_25, __lane_reverse_64_8); \	7913	__ret_25 = __noswap_splatq_lane_s64(__s0_25, __p1_25); \
9007	__ret_25 = __noswap_splatq_lane_s8(__rev0_25, __p1_25); \	7914	__ret_25 = __builtin_shufflevector(__ret_25, __ret_25, __lane_reverse_128_64); \
9008	__ret_25 = __builtin_shufflevector(__ret_25, __ret_25, __lane_reverse_128_8); \
9009	__ret_25; \	7915	__ret_25; \
9010	})	7916	})
9011	#endif	7917	#endif
9012		7918
9013	#ifdef __LITTLE_ENDIAN__	7919	#ifdef __LITTLE_ENDIAN__
9014	#define vdupq_lane_f32(__p0_26, __p1_26) __extension__ ({ \	7920	#define vdupq_lane_s16(__p0_26, __p1_26) __extension__ ({ \
9015	float32x4_t __ret_26; \	7921	int16x8_t __ret_26; \
9016	float32x2_t __s0_26 = __p0_26; \	7922	int16x4_t __s0_26 = __p0_26; \
9017	__ret_26 = splatq_lane_f32(__s0_26, __p1_26); \	7923	__ret_26 = splatq_lane_s16(__s0_26, __p1_26); \
9018	__ret_26; \	7924	__ret_26; \
9019	})	7925	})
9020	#else	7926	#else
9021	#define vdupq_lane_f32(__p0_27, __p1_27) __extension__ ({ \	7927	#define vdupq_lane_s16(__p0_27, __p1_27) __extension__ ({ \
9022	float32x4_t __ret_27; \	7928	int16x8_t __ret_27; \
9023	float32x2_t __s0_27 = __p0_27; \	7929	int16x4_t __s0_27 = __p0_27; \
9024	float32x2_t __rev0_27; __rev0_27 = __builtin_shufflevector(__s0_27, __s0_27, __lane_reverse_64_32); \	7930	int16x4_t __rev0_27; __rev0_27 = __builtin_shufflevector(__s0_27, __s0_27, __lane_reverse_64_16); \
9025	__ret_27 = __noswap_splatq_lane_f32(__rev0_27, __p1_27); \	7931	__ret_27 = __noswap_splatq_lane_s16(__rev0_27, __p1_27); \
9026	__ret_27 = __builtin_shufflevector(__ret_27, __ret_27, __lane_reverse_128_32); \	7932	__ret_27 = __builtin_shufflevector(__ret_27, __ret_27, __lane_reverse_128_16); \
9027	__ret_27; \	7933	__ret_27; \
9028	})	7934	})
9029	#endif	7935	#endif
9030		7936
9031	#ifdef __LITTLE_ENDIAN__	7937	#ifdef __LITTLE_ENDIAN__
9032	#define vdupq_lane_f16(__p0_28, __p1_28) __extension__ ({ \	7938	#define vdup_lane_u8(__p0_28, __p1_28) __extension__ ({ \
9033	float16x8_t __ret_28; \	7939	uint8x8_t __ret_28; \
9034	float16x4_t __s0_28 = __p0_28; \	7940	uint8x8_t __s0_28 = __p0_28; \
9035	__ret_28 = splatq_lane_f16(__s0_28, __p1_28); \	7941	__ret_28 = splat_lane_u8(__s0_28, __p1_28); \
9036	__ret_28; \	7942	__ret_28; \
9037	})	7943	})
9038	#else	7944	#else
9039	#define vdupq_lane_f16(__p0_29, __p1_29) __extension__ ({ \	7945	#define vdup_lane_u8(__p0_29, __p1_29) __extension__ ({ \
9040	float16x8_t __ret_29; \	7946	uint8x8_t __ret_29; \
9041	float16x4_t __s0_29 = __p0_29; \	7947	uint8x8_t __s0_29 = __p0_29; \
9042	float16x4_t __rev0_29; __rev0_29 = __builtin_shufflevector(__s0_29, __s0_29, __lane_reverse_64_16); \	7948	uint8x8_t __rev0_29; __rev0_29 = __builtin_shufflevector(__s0_29, __s0_29, __lane_reverse_64_8); \
9043	__ret_29 = __noswap_splatq_lane_f16(__rev0_29, __p1_29); \	7949	__ret_29 = __noswap_splat_lane_u8(__rev0_29, __p1_29); \
9044	__ret_29 = __builtin_shufflevector(__ret_29, __ret_29, __lane_reverse_128_16); \	7950	__ret_29 = __builtin_shufflevector(__ret_29, __ret_29, __lane_reverse_64_8); \
9045	__ret_29; \	7951	__ret_29; \
9046	})	7952	})
9047	#endif	7953	#endif
9048		7954
9049	#ifdef __LITTLE_ENDIAN__	7955	#ifdef __LITTLE_ENDIAN__
9050	#define vdupq_lane_s32(__p0_30, __p1_30) __extension__ ({ \	7956	#define vdup_lane_u32(__p0_30, __p1_30) __extension__ ({ \
9051	int32x4_t __ret_30; \	7957	uint32x2_t __ret_30; \
9052	int32x2_t __s0_30 = __p0_30; \	7958	uint32x2_t __s0_30 = __p0_30; \
9053	__ret_30 = splatq_lane_s32(__s0_30, __p1_30); \	7959	__ret_30 = splat_lane_u32(__s0_30, __p1_30); \
9054	__ret_30; \	7960	__ret_30; \
9055	})	7961	})
9056	#else	7962	#else
9057	#define vdupq_lane_s32(__p0_31, __p1_31) __extension__ ({ \	7963	#define vdup_lane_u32(__p0_31, __p1_31) __extension__ ({ \
9058	int32x4_t __ret_31; \	7964	uint32x2_t __ret_31; \
9059	int32x2_t __s0_31 = __p0_31; \	7965	uint32x2_t __s0_31 = __p0_31; \
9060	int32x2_t __rev0_31; __rev0_31 = __builtin_shufflevector(__s0_31, __s0_31, __lane_reverse_64_32); \	7966	uint32x2_t __rev0_31; __rev0_31 = __builtin_shufflevector(__s0_31, __s0_31, __lane_reverse_64_32); \
9061	__ret_31 = __noswap_splatq_lane_s32(__rev0_31, __p1_31); \	7967	__ret_31 = __noswap_splat_lane_u32(__rev0_31, __p1_31); \
9062	__ret_31 = __builtin_shufflevector(__ret_31, __ret_31, __lane_reverse_128_32); \	7968	__ret_31 = __builtin_shufflevector(__ret_31, __ret_31, __lane_reverse_64_32); \
9063	__ret_31; \	7969	__ret_31; \
9064	})	7970	})
9065	#endif	7971	#endif
9066		7972
9067	#ifdef __LITTLE_ENDIAN__	7973	#define vdup_lane_u64(__p0_32, __p1_32) __extension__ ({ \
9068	#define vdupq_lane_s64(__p0_32, __p1_32) __extension__ ({ \	7974	uint64x1_t __ret_32; \
9069	int64x2_t __ret_32; \	7975	uint64x1_t __s0_32 = __p0_32; \
9070	int64x1_t __s0_32 = __p0_32; \	7976	__ret_32 = splat_lane_u64(__s0_32, __p1_32); \
9071	__ret_32 = splatq_lane_s64(__s0_32, __p1_32); \
9072	__ret_32; \	7977	__ret_32; \
9073	})	7978	})
9074	#else	7979	#ifdef __LITTLE_ENDIAN__
9075	#define vdupq_lane_s64(__p0_33, __p1_33) __extension__ ({ \	7980	#define vdup_lane_u16(__p0_33, __p1_33) __extension__ ({ \
9076	int64x2_t __ret_33; \	7981	uint16x4_t __ret_33; \
9077	int64x1_t __s0_33 = __p0_33; \	7982	uint16x4_t __s0_33 = __p0_33; \
9078	__ret_33 = __noswap_splatq_lane_s64(__s0_33, __p1_33); \	7983	__ret_33 = splat_lane_u16(__s0_33, __p1_33); \
9079	__ret_33 = __builtin_shufflevector(__ret_33, __ret_33, __lane_reverse_128_64); \
9080	__ret_33; \	7984	__ret_33; \
9081	})	7985	})
		7986	#else
		7987	#define vdup_lane_u16(__p0_34, __p1_34) __extension__ ({ \
		7988	uint16x4_t __ret_34; \
		7989	uint16x4_t __s0_34 = __p0_34; \
		7990	uint16x4_t __rev0_34; __rev0_34 = __builtin_shufflevector(__s0_34, __s0_34, __lane_reverse_64_16); \
		7991	__ret_34 = __noswap_splat_lane_u16(__rev0_34, __p1_34); \
		7992	__ret_34 = __builtin_shufflevector(__ret_34, __ret_34, __lane_reverse_64_16); \
		7993	__ret_34; \
		7994	})
9082	#endif	7995	#endif
9083		7996
9084	#ifdef __LITTLE_ENDIAN__	7997	#ifdef __LITTLE_ENDIAN__
9085	#define vdupq_lane_s16(__p0_34, __p1_34) __extension__ ({ \	7998	#define vdup_lane_s8(__p0_35, __p1_35) __extension__ ({ \
9086	int16x8_t __ret_34; \	7999	int8x8_t __ret_35; \
9087	int16x4_t __s0_34 = __p0_34; \	8000	int8x8_t __s0_35 = __p0_35; \
9088	__ret_34 = splatq_lane_s16(__s0_34, __p1_34); \	8001	__ret_35 = splat_lane_s8(__s0_35, __p1_35); \
9089	__ret_34; \	8002	__ret_35; \
9090	})	8003	})
9091	#else	8004	#else
9092	#define vdupq_lane_s16(__p0_35, __p1_35) __extension__ ({ \	8005	#define vdup_lane_s8(__p0_36, __p1_36) __extension__ ({ \
9093	int16x8_t __ret_35; \	8006	int8x8_t __ret_36; \
9094	int16x4_t __s0_35 = __p0_35; \	8007	int8x8_t __s0_36 = __p0_36; \
9095	int16x4_t __rev0_35; __rev0_35 = __builtin_shufflevector(__s0_35, __s0_35, __lane_reverse_64_16); \	8008	int8x8_t __rev0_36; __rev0_36 = __builtin_shufflevector(__s0_36, __s0_36, __lane_reverse_64_8); \
9096	__ret_35 = __noswap_splatq_lane_s16(__rev0_35, __p1_35); \	8009	__ret_36 = __noswap_splat_lane_s8(__rev0_36, __p1_36); \
9097	__ret_35 = __builtin_shufflevector(__ret_35, __ret_35, __lane_reverse_128_16); \	8010	__ret_36 = __builtin_shufflevector(__ret_36, __ret_36, __lane_reverse_64_8); \
9098	__ret_35; \	8011	__ret_36; \
9099	})	8012	})
9100	#endif	8013	#endif
9101		8014
9102	#ifdef __LITTLE_ENDIAN__	8015	#ifdef __LITTLE_ENDIAN__
9103	#define vdup_lane_u8(__p0_36, __p1_36) __extension__ ({ \	8016	#define vdup_lane_f32(__p0_37, __p1_37) __extension__ ({ \
9104	uint8x8_t __ret_36; \	8017	float32x2_t __ret_37; \
9105	uint8x8_t __s0_36 = __p0_36; \	8018	float32x2_t __s0_37 = __p0_37; \
9106	__ret_36 = splat_lane_u8(__s0_36, __p1_36); \	8019	__ret_37 = splat_lane_f32(__s0_37, __p1_37); \
9107	__ret_36; \	8020	__ret_37; \
9108	})	8021	})
9109	#else	8022	#else
9110	#define vdup_lane_u8(__p0_37, __p1_37) __extension__ ({ \	8023	#define vdup_lane_f32(__p0_38, __p1_38) __extension__ ({ \
9111	uint8x8_t __ret_37; \	8024	float32x2_t __ret_38; \
9112	uint8x8_t __s0_37 = __p0_37; \	8025	float32x2_t __s0_38 = __p0_38; \
9113	uint8x8_t __rev0_37; __rev0_37 = __builtin_shufflevector(__s0_37, __s0_37, __lane_reverse_64_8); \	8026	float32x2_t __rev0_38; __rev0_38 = __builtin_shufflevector(__s0_38, __s0_38, __lane_reverse_64_32); \
9114	__ret_37 = __noswap_splat_lane_u8(__rev0_37, __p1_37); \	8027	__ret_38 = __noswap_splat_lane_f32(__rev0_38, __p1_38); \
9115	__ret_37 = __builtin_shufflevector(__ret_37, __ret_37, __lane_reverse_64_8); \	8028	__ret_38 = __builtin_shufflevector(__ret_38, __ret_38, __lane_reverse_64_32); \
9116	__ret_37; \	8029	__ret_38; \
9117	})	8030	})
9118	#endif	8031	#endif
9119		8032
9120	#ifdef __LITTLE_ENDIAN__	8033	#ifdef __LITTLE_ENDIAN__
9121	#define vdup_lane_u32(__p0_38, __p1_38) __extension__ ({ \	8034	#define vdup_lane_f16(__p0_39, __p1_39) __extension__ ({ \
9122	uint32x2_t __ret_38; \	8035	float16x4_t __ret_39; \
9123	uint32x2_t __s0_38 = __p0_38; \	8036	float16x4_t __s0_39 = __p0_39; \
9124	__ret_38 = splat_lane_u32(__s0_38, __p1_38); \	8037	__ret_39 = splat_lane_f16(__s0_39, __p1_39); \
9125	__ret_38; \	8038	__ret_39; \
9126	})	8039	})
9127	#else	8040	#else
9128	#define vdup_lane_u32(__p0_39, __p1_39) __extension__ ({ \	8041	#define vdup_lane_f16(__p0_40, __p1_40) __extension__ ({ \
9129	uint32x2_t __ret_39; \	8042	float16x4_t __ret_40; \
9130	uint32x2_t __s0_39 = __p0_39; \	8043	float16x4_t __s0_40 = __p0_40; \
9131	uint32x2_t __rev0_39; __rev0_39 = __builtin_shufflevector(__s0_39, __s0_39, __lane_reverse_64_32); \	8044	float16x4_t __rev0_40; __rev0_40 = __builtin_shufflevector(__s0_40, __s0_40, __lane_reverse_64_16); \
9132	__ret_39 = __noswap_splat_lane_u32(__rev0_39, __p1_39); \	8045	__ret_40 = __noswap_splat_lane_f16(__rev0_40, __p1_40); \
9133	__ret_39 = __builtin_shufflevector(__ret_39, __ret_39, __lane_reverse_64_32); \	8046	__ret_40 = __builtin_shufflevector(__ret_40, __ret_40, __lane_reverse_64_16); \
9134	__ret_39; \	8047	__ret_40; \
9135	})	8048	})
9136	#endif	8049	#endif
9137		8050
9138	#define vdup_lane_u64(__p0_40, __p1_40) __extension__ ({ \
9139	uint64x1_t __ret_40; \
9140	uint64x1_t __s0_40 = __p0_40; \
9141	__ret_40 = splat_lane_u64(__s0_40, __p1_40); \
9142	__ret_40; \
9143	})
9144	#ifdef __LITTLE_ENDIAN__	8051	#ifdef __LITTLE_ENDIAN__
9145	#define vdup_lane_u16(__p0_41, __p1_41) __extension__ ({ \	8052	#define vdup_lane_s32(__p0_41, __p1_41) __extension__ ({ \
9146	uint16x4_t __ret_41; \	8053	int32x2_t __ret_41; \
9147	uint16x4_t __s0_41 = __p0_41; \	8054	int32x2_t __s0_41 = __p0_41; \
9148	__ret_41 = splat_lane_u16(__s0_41, __p1_41); \	8055	__ret_41 = splat_lane_s32(__s0_41, __p1_41); \
9149	__ret_41; \	8056	__ret_41; \
9150	})	8057	})
9151	#else	8058	#else
9152	#define vdup_lane_u16(__p0_42, __p1_42) __extension__ ({ \	8059	#define vdup_lane_s32(__p0_42, __p1_42) __extension__ ({ \
9153	uint16x4_t __ret_42; \	8060	int32x2_t __ret_42; \
9154	uint16x4_t __s0_42 = __p0_42; \	8061	int32x2_t __s0_42 = __p0_42; \
9155	uint16x4_t __rev0_42; __rev0_42 = __builtin_shufflevector(__s0_42, __s0_42, __lane_reverse_64_16); \	8062	int32x2_t __rev0_42; __rev0_42 = __builtin_shufflevector(__s0_42, __s0_42, __lane_reverse_64_32); \
9156	__ret_42 = __noswap_splat_lane_u16(__rev0_42, __p1_42); \	8063	__ret_42 = __noswap_splat_lane_s32(__rev0_42, __p1_42); \
9157	__ret_42 = __builtin_shufflevector(__ret_42, __ret_42, __lane_reverse_64_16); \	8064	__ret_42 = __builtin_shufflevector(__ret_42, __ret_42, __lane_reverse_64_32); \
9158	__ret_42; \	8065	__ret_42; \
9159	})	8066	})
9160	#endif	8067	#endif
9161		8068
9162	#ifdef __LITTLE_ENDIAN__	8069	#define vdup_lane_s64(__p0_43, __p1_43) __extension__ ({ \
9163	#define vdup_lane_s8(__p0_43, __p1_43) __extension__ ({ \	8070	int64x1_t __ret_43; \
9164	int8x8_t __ret_43; \	8071	int64x1_t __s0_43 = __p0_43; \
9165	int8x8_t __s0_43 = __p0_43; \	8072	__ret_43 = splat_lane_s64(__s0_43, __p1_43); \
9166	__ret_43 = splat_lane_s8(__s0_43, __p1_43); \
9167	__ret_43; \	8073	__ret_43; \
9168	})	8074	})
9169	#else	8075	#ifdef __LITTLE_ENDIAN__
9170	#define vdup_lane_s8(__p0_44, __p1_44) __extension__ ({ \	8076	#define vdup_lane_s16(__p0_44, __p1_44) __extension__ ({ \
9171	int8x8_t __ret_44; \	8077	int16x4_t __ret_44; \
9172	int8x8_t __s0_44 = __p0_44; \	8078	int16x4_t __s0_44 = __p0_44; \
9173	int8x8_t __rev0_44; __rev0_44 = __builtin_shufflevector(__s0_44, __s0_44, __lane_reverse_64_8); \	8079	__ret_44 = splat_lane_s16(__s0_44, __p1_44); \
9174	__ret_44 = __noswap_splat_lane_s8(__rev0_44, __p1_44); \
9175	__ret_44 = __builtin_shufflevector(__ret_44, __ret_44, __lane_reverse_64_8); \
9176	__ret_44; \	8080	__ret_44; \
9177	})	8081	})
		8082	#else
		8083	#define vdup_lane_s16(__p0_45, __p1_45) __extension__ ({ \
		8084	int16x4_t __ret_45; \
		8085	int16x4_t __s0_45 = __p0_45; \
		8086	int16x4_t __rev0_45; __rev0_45 = __builtin_shufflevector(__s0_45, __s0_45, __lane_reverse_64_16); \
		8087	__ret_45 = __noswap_splat_lane_s16(__rev0_45, __p1_45); \
		8088	__ret_45 = __builtin_shufflevector(__ret_45, __ret_45, __lane_reverse_64_16); \
		8089	__ret_45; \
		8090	})
9178	#endif	8091	#endif
9179		8092
9180	#ifdef __LITTLE_ENDIAN__	8093	#ifdef __LITTLE_ENDIAN__
9181	#define vdup_lane_f32(__p0_45, __p1_45) __extension__ ({ \	8094	#define vdupq_lane_bf16(__p0_46, __p1_46) __extension__ ({ \
9182	float32x2_t __ret_45; \	8095	bfloat16x8_t __ret_46; \
9183	float32x2_t __s0_45 = __p0_45; \	8096	bfloat16x4_t __s0_46 = __p0_46; \
9184	__ret_45 = splat_lane_f32(__s0_45, __p1_45); \	8097	__ret_46 = splatq_lane_bf16(__s0_46, __p1_46); \
9185	__ret_45; \	8098	__ret_46; \
9186	})	8099	})
9187	#else	8100	#else
9188	#define vdup_lane_f32(__p0_46, __p1_46) __extension__ ({ \	8101	#define vdupq_lane_bf16(__p0_47, __p1_47) __extension__ ({ \
9189	float32x2_t __ret_46; \	8102	bfloat16x8_t __ret_47; \
9190	float32x2_t __s0_46 = __p0_46; \	8103	bfloat16x4_t __s0_47 = __p0_47; \
9191	float32x2_t __rev0_46; __rev0_46 = __builtin_shufflevector(__s0_46, __s0_46, __lane_reverse_64_32); \	8104	bfloat16x4_t __rev0_47; __rev0_47 = __builtin_shufflevector(__s0_47, __s0_47, __lane_reverse_64_16); \
9192	__ret_46 = __noswap_splat_lane_f32(__rev0_46, __p1_46); \	8105	__ret_47 = __noswap_splatq_lane_bf16(__rev0_47, __p1_47); \
9193	__ret_46 = __builtin_shufflevector(__ret_46, __ret_46, __lane_reverse_64_32); \	8106	__ret_47 = __builtin_shufflevector(__ret_47, __ret_47, __lane_reverse_128_16); \
9194	__ret_46; \	8107	__ret_47; \
9195	})	8108	})
9196	#endif	8109	#endif
9197		8110
9198	#ifdef __LITTLE_ENDIAN__	8111	#ifdef __LITTLE_ENDIAN__
9199	#define vdup_lane_f16(__p0_47, __p1_47) __extension__ ({ \	8112	#define vdup_lane_bf16(__p0_48, __p1_48) __extension__ ({ \
9200	float16x4_t __ret_47; \	8113	bfloat16x4_t __ret_48; \
9201	float16x4_t __s0_47 = __p0_47; \	8114	bfloat16x4_t __s0_48 = __p0_48; \
9202	__ret_47 = splat_lane_f16(__s0_47, __p1_47); \	8115	__ret_48 = splat_lane_bf16(__s0_48, __p1_48); \
9203	__ret_47; \	8116	__ret_48; \
9204	})	8117	})
9205	#else	8118	#else
9206	#define vdup_lane_f16(__p0_48, __p1_48) __extension__ ({ \	8119	#define vdup_lane_bf16(__p0_49, __p1_49) __extension__ ({ \
9207	float16x4_t __ret_48; \	8120	bfloat16x4_t __ret_49; \
9208	float16x4_t __s0_48 = __p0_48; \	8121	bfloat16x4_t __s0_49 = __p0_49; \
9209	float16x4_t __rev0_48; __rev0_48 = __builtin_shufflevector(__s0_48, __s0_48, __lane_reverse_64_16); \	8122	bfloat16x4_t __rev0_49; __rev0_49 = __builtin_shufflevector(__s0_49, __s0_49, __lane_reverse_64_16); \
9210	__ret_48 = __noswap_splat_lane_f16(__rev0_48, __p1_48); \	8123	__ret_49 = __noswap_splat_lane_bf16(__rev0_49, __p1_49); \
9211	__ret_48 = __builtin_shufflevector(__ret_48, __ret_48, __lane_reverse_64_16); \	8124	__ret_49 = __builtin_shufflevector(__ret_49, __ret_49, __lane_reverse_64_16); \
9212	__ret_48; \	8125	__ret_49; \
9213	})	8126	})
9214	#endif	8127	#endif
9215		8128
9216	#ifdef __LITTLE_ENDIAN__	8129	#ifdef __LITTLE_ENDIAN__
9217	#define vdup_lane_s32(__p0_49, __p1_49) __extension__ ({ \	8130	#define vduph_laneq_bf16(__p0, __p1) __extension__ ({ \
9218	int32x2_t __ret_49; \	8131	bfloat16_t __ret; \
9219	int32x2_t __s0_49 = __p0_49; \	8132	bfloat16x8_t __s0 = __p0; \
9220	__ret_49 = splat_lane_s32(__s0_49, __p1_49); \	8133	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vduph_laneq_bf16(__s0, __p1)); \
9221	__ret_49; \	8134	__ret; \
9222	})	8135	})
9223	#else	8136	#else
9224	#define vdup_lane_s32(__p0_50, __p1_50) __extension__ ({ \	8137	#define vduph_laneq_bf16(__p0, __p1) __extension__ ({ \
9225	int32x2_t __ret_50; \	8138	bfloat16_t __ret; \
9226	int32x2_t __s0_50 = __p0_50; \	8139	bfloat16x8_t __s0 = __p0; \
9227	int32x2_t __rev0_50; __rev0_50 = __builtin_shufflevector(__s0_50, __s0_50, __lane_reverse_64_32); \	8140	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
9228	__ret_50 = __noswap_splat_lane_s32(__rev0_50, __p1_50); \	8141	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vduph_laneq_bf16(__rev0, __p1)); \
9229	__ret_50 = __builtin_shufflevector(__ret_50, __ret_50, __lane_reverse_64_32); \	8142	__ret; \
9230	__ret_50; \
9231	})	8143	})
9232	#endif	8144	#endif
9233		8145
9234	#define vdup_lane_s64(__p0_51, __p1_51) __extension__ ({ \	8146	#ifdef __LITTLE_ENDIAN__
9235	int64x1_t __ret_51; \	8147	#define vdupq_laneq_bf16(__p0_50, __p1_50) __extension__ ({ \
9236	int64x1_t __s0_51 = __p0_51; \	8148	bfloat16x8_t __ret_50; \
9237	__ret_51 = splat_lane_s64(__s0_51, __p1_51); \	8149	bfloat16x8_t __s0_50 = __p0_50; \
		8150	__ret_50 = splatq_laneq_bf16(__s0_50, __p1_50); \
		8151	__ret_50; \
		8152	})
		8153	#else
		8154	#define vdupq_laneq_bf16(__p0_51, __p1_51) __extension__ ({ \
		8155	bfloat16x8_t __ret_51; \
		8156	bfloat16x8_t __s0_51 = __p0_51; \
		8157	bfloat16x8_t __rev0_51; __rev0_51 = __builtin_shufflevector(__s0_51, __s0_51, __lane_reverse_128_16); \
		8158	__ret_51 = __noswap_splatq_laneq_bf16(__rev0_51, __p1_51); \
		8159	__ret_51 = __builtin_shufflevector(__ret_51, __ret_51, __lane_reverse_128_16); \
9238	__ret_51; \	8160	__ret_51; \
9239	})	8161	})
		8162	#endif
		8163
9240	#ifdef __LITTLE_ENDIAN__	8164	#ifdef __LITTLE_ENDIAN__
9241	#define vdup_lane_s16(__p0_52, __p1_52) __extension__ ({ \	8165	#define vdup_laneq_bf16(__p0_52, __p1_52) __extension__ ({ \
9242	int16x4_t __ret_52; \	8166	bfloat16x4_t __ret_52; \
9243	int16x4_t __s0_52 = __p0_52; \	8167	bfloat16x8_t __s0_52 = __p0_52; \
9244	__ret_52 = splat_lane_s16(__s0_52, __p1_52); \	8168	__ret_52 = splat_laneq_bf16(__s0_52, __p1_52); \
9245	__ret_52; \	8169	__ret_52; \
9246	})	8170	})
9247	#else	8171	#else
9248	#define vdup_lane_s16(__p0_53, __p1_53) __extension__ ({ \	8172	#define vdup_laneq_bf16(__p0_53, __p1_53) __extension__ ({ \
9249	int16x4_t __ret_53; \	8173	bfloat16x4_t __ret_53; \
9250	int16x4_t __s0_53 = __p0_53; \	8174	bfloat16x8_t __s0_53 = __p0_53; \
9251	int16x4_t __rev0_53; __rev0_53 = __builtin_shufflevector(__s0_53, __s0_53, __lane_reverse_64_16); \	8175	bfloat16x8_t __rev0_53; __rev0_53 = __builtin_shufflevector(__s0_53, __s0_53, __lane_reverse_128_16); \
9252	__ret_53 = __noswap_splat_lane_s16(__rev0_53, __p1_53); \	8176	__ret_53 = __noswap_splat_laneq_bf16(__rev0_53, __p1_53); \
9253	__ret_53 = __builtin_shufflevector(__ret_53, __ret_53, __lane_reverse_64_16); \	8177	__ret_53 = __builtin_shufflevector(__ret_53, __ret_53, __lane_reverse_64_16); \
9254	__ret_53; \	8178	__ret_53; \
9255	})	8179	})
...	@@ -9599,6 +8523,36 @@ __ai __attribute__((target("neon"))) int16x4_t vdup_n_s16(int16_t __p0) {	...	@@ -9599,6 +8523,36 @@ __ai __attribute__((target("neon"))) int16x4_t vdup_n_s16(int16_t __p0) {
9599	}	8523	}
9600	#endif	8524	#endif
9601		8525
		8526	#ifdef __LITTLE_ENDIAN__
		8527	__ai __attribute__((target("neon"))) bfloat16x8_t vdupq_n_bf16(bfloat16_t __p0) {
		8528	bfloat16x8_t __ret;
		8529	__ret = (bfloat16x8_t) {__p0, __p0, __p0, __p0, __p0, __p0, __p0, __p0};
		8530	return __ret;
		8531	}
		8532	#else
		8533	__ai __attribute__((target("neon"))) bfloat16x8_t vdupq_n_bf16(bfloat16_t __p0) {
		8534	bfloat16x8_t __ret;
		8535	__ret = (bfloat16x8_t) {__p0, __p0, __p0, __p0, __p0, __p0, __p0, __p0};
		8536	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
		8537	return __ret;
		8538	}
		8539	#endif
		8540
		8541	#ifdef __LITTLE_ENDIAN__
		8542	__ai __attribute__((target("neon"))) bfloat16x4_t vdup_n_bf16(bfloat16_t __p0) {
		8543	bfloat16x4_t __ret;
		8544	__ret = (bfloat16x4_t) {__p0, __p0, __p0, __p0};
		8545	return __ret;
		8546	}
		8547	#else
		8548	__ai __attribute__((target("neon"))) bfloat16x4_t vdup_n_bf16(bfloat16_t __p0) {
		8549	bfloat16x4_t __ret;
		8550	__ret = (bfloat16x4_t) {__p0, __p0, __p0, __p0};
		8551	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
		8552	return __ret;
		8553	}
		8554	#endif
		8555
9602	#ifdef __LITTLE_ENDIAN__	8556	#ifdef __LITTLE_ENDIAN__
9603	__ai __attribute__((target("neon"))) uint8x16_t veorq_u8(uint8x16_t __p0, uint8x16_t __p1) {	8557	__ai __attribute__((target("neon"))) uint8x16_t veorq_u8(uint8x16_t __p0, uint8x16_t __p1) {
9604	uint8x16_t __ret;	8558	uint8x16_t __ret;
...	@@ -10558,6 +9512,27 @@ __ai __attribute__((target("neon"))) int16x4_t __noswap_vget_high_s16(int16x8_t	...	@@ -10558,6 +9512,27 @@ __ai __attribute__((target("neon"))) int16x4_t __noswap_vget_high_s16(int16x8_t
10558	}	9512	}
10559	#endif	9513	#endif
10560		9514
		9515	#ifdef __LITTLE_ENDIAN__
		9516	__ai __attribute__((target("neon"))) bfloat16x4_t vget_high_bf16(bfloat16x8_t __p0) {
		9517	bfloat16x4_t __ret;
		9518	__ret = __builtin_shufflevector(__p0, __p0, 4, 5, 6, 7);
		9519	return __ret;
		9520	}
		9521	#else
		9522	__ai __attribute__((target("neon"))) bfloat16x4_t vget_high_bf16(bfloat16x8_t __p0) {
		9523	bfloat16x4_t __ret;
		9524	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
		9525	__ret = __builtin_shufflevector(__rev0, __rev0, 4, 5, 6, 7);
		9526	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
		9527	return __ret;
		9528	}
		9529	__ai __attribute__((target("neon"))) bfloat16x4_t __noswap_vget_high_bf16(bfloat16x8_t __p0) {
		9530	bfloat16x4_t __ret;
		9531	__ret = __builtin_shufflevector(__p0, __p0, 4, 5, 6, 7);
		9532	return __ret;
		9533	}
		9534	#endif
		9535
10561	#ifdef __LITTLE_ENDIAN__	9536	#ifdef __LITTLE_ENDIAN__
10562	#define vget_lane_p8(__p0, __p1) __extension__ ({ \	9537	#define vget_lane_p8(__p0, __p1) __extension__ ({ \
10563	poly8_t __ret; \	9538	poly8_t __ret; \
...	@@ -11030,6 +10005,52 @@ __ai __attribute__((target("neon"))) int16x4_t __noswap_vget_high_s16(int16x8_t	...	@@ -11030,6 +10005,52 @@ __ai __attribute__((target("neon"))) int16x4_t __noswap_vget_high_s16(int16x8_t
11030	})	10005	})
11031	#endif	10006	#endif
11032		10007
		10008	#ifdef __LITTLE_ENDIAN__
		10009	#define vgetq_lane_bf16(__p0, __p1) __extension__ ({ \
		10010	bfloat16_t __ret; \
		10011	bfloat16x8_t __s0 = __p0; \
		10012	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vgetq_lane_bf16(__s0, __p1)); \
		10013	__ret; \
		10014	})
		10015	#else
		10016	#define vgetq_lane_bf16(__p0, __p1) __extension__ ({ \
		10017	bfloat16_t __ret; \
		10018	bfloat16x8_t __s0 = __p0; \
		10019	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		10020	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vgetq_lane_bf16(__rev0, __p1)); \
		10021	__ret; \
		10022	})
		10023	#define __noswap_vgetq_lane_bf16(__p0, __p1) __extension__ ({ \
		10024	bfloat16_t __ret; \
		10025	bfloat16x8_t __s0 = __p0; \
		10026	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vgetq_lane_bf16(__s0, __p1)); \
		10027	__ret; \
		10028	})
		10029	#endif
		10030
		10031	#ifdef __LITTLE_ENDIAN__
		10032	#define vget_lane_bf16(__p0, __p1) __extension__ ({ \
		10033	bfloat16_t __ret; \
		10034	bfloat16x4_t __s0 = __p0; \
		10035	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vget_lane_bf16(__s0, __p1)); \
		10036	__ret; \
		10037	})
		10038	#else
		10039	#define vget_lane_bf16(__p0, __p1) __extension__ ({ \
		10040	bfloat16_t __ret; \
		10041	bfloat16x4_t __s0 = __p0; \
		10042	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		10043	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vget_lane_bf16(__rev0, __p1)); \
		10044	__ret; \
		10045	})
		10046	#define __noswap_vget_lane_bf16(__p0, __p1) __extension__ ({ \
		10047	bfloat16_t __ret; \
		10048	bfloat16x4_t __s0 = __p0; \
		10049	__ret = __builtin_bit_cast(bfloat16_t, __builtin_neon_vget_lane_bf16(__s0, __p1)); \
		10050	__ret; \
		10051	})
		10052	#endif
		10053
11033	#ifdef __LITTLE_ENDIAN__	10054	#ifdef __LITTLE_ENDIAN__
11034	__ai __attribute__((target("neon"))) poly8x8_t vget_low_p8(poly8x16_t __p0) {	10055	__ai __attribute__((target("neon"))) poly8x8_t vget_low_p8(poly8x16_t __p0) {
11035	poly8x8_t __ret;	10056	poly8x8_t __ret;
...	@@ -11220,6 +10241,27 @@ __ai __attribute__((target("neon"))) int16x4_t vget_low_s16(int16x8_t __p0) {	...	@@ -11220,6 +10241,27 @@ __ai __attribute__((target("neon"))) int16x4_t vget_low_s16(int16x8_t __p0) {
11220	}	10241	}
11221	#endif	10242	#endif
11222		10243
		10244	#ifdef __LITTLE_ENDIAN__
		10245	__ai __attribute__((target("neon"))) bfloat16x4_t vget_low_bf16(bfloat16x8_t __p0) {
		10246	bfloat16x4_t __ret;
		10247	__ret = __builtin_shufflevector(__p0, __p0, 0, 1, 2, 3);
		10248	return __ret;
		10249	}
		10250	#else
		10251	__ai __attribute__((target("neon"))) bfloat16x4_t vget_low_bf16(bfloat16x8_t __p0) {
		10252	bfloat16x4_t __ret;
		10253	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
		10254	__ret = __builtin_shufflevector(__rev0, __rev0, 0, 1, 2, 3);
		10255	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
		10256	return __ret;
		10257	}
		10258	__ai __attribute__((target("neon"))) bfloat16x4_t __noswap_vget_low_bf16(bfloat16x8_t __p0) {
		10259	bfloat16x4_t __ret;
		10260	__ret = __builtin_shufflevector(__p0, __p0, 0, 1, 2, 3);
		10261	return __ret;
		10262	}
		10263	#endif
		10264
11223	#ifdef __LITTLE_ENDIAN__	10265	#ifdef __LITTLE_ENDIAN__
11224	__ai __attribute__((target("neon"))) uint8x16_t vhaddq_u8(uint8x16_t __p0, uint8x16_t __p1) {	10266	__ai __attribute__((target("neon"))) uint8x16_t vhaddq_u8(uint8x16_t __p0, uint8x16_t __p1) {
11225	uint8x16_t __ret;	10267	uint8x16_t __ret;
...	@@ -11938,6 +10980,36 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -11938,6 +10980,36 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
11938	})	10980	})
11939	#endif	10981	#endif
11940		10982
		10983	#ifdef __LITTLE_ENDIAN__
		10984	#define vld1q_bf16(__p0) __extension__ ({ \
		10985	bfloat16x8_t __ret; \
		10986	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_v(__p0, 43)); \
		10987	__ret; \
		10988	})
		10989	#else
		10990	#define vld1q_bf16(__p0) __extension__ ({ \
		10991	bfloat16x8_t __ret; \
		10992	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_v(__p0, 43)); \
		10993	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		10994	__ret; \
		10995	})
		10996	#endif
		10997
		10998	#ifdef __LITTLE_ENDIAN__
		10999	#define vld1_bf16(__p0) __extension__ ({ \
		11000	bfloat16x4_t __ret; \
		11001	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_v(__p0, 11)); \
		11002	__ret; \
		11003	})
		11004	#else
		11005	#define vld1_bf16(__p0) __extension__ ({ \
		11006	bfloat16x4_t __ret; \
		11007	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_v(__p0, 11)); \
		11008	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
		11009	__ret; \
		11010	})
		11011	#endif
		11012
11941	#ifdef __LITTLE_ENDIAN__	11013	#ifdef __LITTLE_ENDIAN__
11942	#define vld1_dup_p8(__p0) __extension__ ({ \	11014	#define vld1_dup_p8(__p0) __extension__ ({ \
11943	poly8x8_t __ret; \	11015	poly8x8_t __ret; \
...	@@ -12248,6 +11320,36 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -12248,6 +11320,36 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
12248	})	11320	})
12249	#endif	11321	#endif
12250		11322
		11323	#ifdef __LITTLE_ENDIAN__
		11324	#define vld1q_dup_bf16(__p0) __extension__ ({ \
		11325	bfloat16x8_t __ret; \
		11326	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_dup_v(__p0, 43)); \
		11327	__ret; \
		11328	})
		11329	#else
		11330	#define vld1q_dup_bf16(__p0) __extension__ ({ \
		11331	bfloat16x8_t __ret; \
		11332	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_dup_v(__p0, 43)); \
		11333	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		11334	__ret; \
		11335	})
		11336	#endif
		11337
		11338	#ifdef __LITTLE_ENDIAN__
		11339	#define vld1_dup_bf16(__p0) __extension__ ({ \
		11340	bfloat16x4_t __ret; \
		11341	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_dup_v(__p0, 11)); \
		11342	__ret; \
		11343	})
		11344	#else
		11345	#define vld1_dup_bf16(__p0) __extension__ ({ \
		11346	bfloat16x4_t __ret; \
		11347	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_dup_v(__p0, 11)); \
		11348	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
		11349	__ret; \
		11350	})
		11351	#endif
		11352
12251	#ifdef __LITTLE_ENDIAN__	11353	#ifdef __LITTLE_ENDIAN__
12252	#define vld1_lane_p8(__p0, __p1, __p2) __extension__ ({ \	11354	#define vld1_lane_p8(__p0, __p1, __p2) __extension__ ({ \
12253	poly8x8_t __ret; \	11355	poly8x8_t __ret; \
...	@@ -12620,6 +11722,42 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -12620,6 +11722,42 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
12620	})	11722	})
12621	#endif	11723	#endif
12622		11724
		11725	#ifdef __LITTLE_ENDIAN__
		11726	#define vld1q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		11727	bfloat16x8_t __ret; \
		11728	bfloat16x8_t __s1 = __p1; \
		11729	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __s1), __p2, 43)); \
		11730	__ret; \
		11731	})
		11732	#else
		11733	#define vld1q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		11734	bfloat16x8_t __ret; \
		11735	bfloat16x8_t __s1 = __p1; \
		11736	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
		11737	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vld1q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __rev1), __p2, 43)); \
		11738	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		11739	__ret; \
		11740	})
		11741	#endif
		11742
		11743	#ifdef __LITTLE_ENDIAN__
		11744	#define vld1_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		11745	bfloat16x4_t __ret; \
		11746	bfloat16x4_t __s1 = __p1; \
		11747	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_lane_v(__p0, __builtin_bit_cast(int8x8_t, __s1), __p2, 11)); \
		11748	__ret; \
		11749	})
		11750	#else
		11751	#define vld1_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		11752	bfloat16x4_t __ret; \
		11753	bfloat16x4_t __s1 = __p1; \
		11754	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
		11755	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vld1_lane_v(__p0, __builtin_bit_cast(int8x8_t, __rev1), __p2, 11)); \
		11756	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
		11757	__ret; \
		11758	})
		11759	#endif
		11760
12623	#ifdef __LITTLE_ENDIAN__	11761	#ifdef __LITTLE_ENDIAN__
12624	#define vld1_p8_x2(__p0) __extension__ ({ \	11762	#define vld1_p8_x2(__p0) __extension__ ({ \
12625	poly8x8x2_t __ret; \	11763	poly8x8x2_t __ret; \
...	@@ -12970,6 +12108,40 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -12970,6 +12108,40 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
12970	})	12108	})
12971	#endif	12109	#endif
12972		12110
		12111	#ifdef __LITTLE_ENDIAN__
		12112	#define vld1q_bf16_x2(__p0) __extension__ ({ \
		12113	bfloat16x8x2_t __ret; \
		12114	__builtin_neon_vld1q_x2_v(&__ret, __p0, 43); \
		12115	__ret; \
		12116	})
		12117	#else
		12118	#define vld1q_bf16_x2(__p0) __extension__ ({ \
		12119	bfloat16x8x2_t __ret; \
		12120	__builtin_neon_vld1q_x2_v(&__ret, __p0, 43); \
		12121	\
		12122	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		12123	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		12124	__ret; \
		12125	})
		12126	#endif
		12127
		12128	#ifdef __LITTLE_ENDIAN__
		12129	#define vld1_bf16_x2(__p0) __extension__ ({ \
		12130	bfloat16x4x2_t __ret; \
		12131	__builtin_neon_vld1_x2_v(&__ret, __p0, 11); \
		12132	__ret; \
		12133	})
		12134	#else
		12135	#define vld1_bf16_x2(__p0) __extension__ ({ \
		12136	bfloat16x4x2_t __ret; \
		12137	__builtin_neon_vld1_x2_v(&__ret, __p0, 11); \
		12138	\
		12139	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		12140	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		12141	__ret; \
		12142	})
		12143	#endif
		12144
12973	#ifdef __LITTLE_ENDIAN__	12145	#ifdef __LITTLE_ENDIAN__
12974	#define vld1_p8_x3(__p0) __extension__ ({ \	12146	#define vld1_p8_x3(__p0) __extension__ ({ \
12975	poly8x8x3_t __ret; \	12147	poly8x8x3_t __ret; \
...	@@ -13340,6 +12512,42 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -13340,6 +12512,42 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
13340	})	12512	})
13341	#endif	12513	#endif
13342		12514
		12515	#ifdef __LITTLE_ENDIAN__
		12516	#define vld1q_bf16_x3(__p0) __extension__ ({ \
		12517	bfloat16x8x3_t __ret; \
		12518	__builtin_neon_vld1q_x3_v(&__ret, __p0, 43); \
		12519	__ret; \
		12520	})
		12521	#else
		12522	#define vld1q_bf16_x3(__p0) __extension__ ({ \
		12523	bfloat16x8x3_t __ret; \
		12524	__builtin_neon_vld1q_x3_v(&__ret, __p0, 43); \
		12525	\
		12526	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		12527	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		12528	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
		12529	__ret; \
		12530	})
		12531	#endif
		12532
		12533	#ifdef __LITTLE_ENDIAN__
		12534	#define vld1_bf16_x3(__p0) __extension__ ({ \
		12535	bfloat16x4x3_t __ret; \
		12536	__builtin_neon_vld1_x3_v(&__ret, __p0, 11); \
		12537	__ret; \
		12538	})
		12539	#else
		12540	#define vld1_bf16_x3(__p0) __extension__ ({ \
		12541	bfloat16x4x3_t __ret; \
		12542	__builtin_neon_vld1_x3_v(&__ret, __p0, 11); \
		12543	\
		12544	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		12545	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		12546	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
		12547	__ret; \
		12548	})
		12549	#endif
		12550
13343	#ifdef __LITTLE_ENDIAN__	12551	#ifdef __LITTLE_ENDIAN__
13344	#define vld1_p8_x4(__p0) __extension__ ({ \	12552	#define vld1_p8_x4(__p0) __extension__ ({ \
13345	poly8x8x4_t __ret; \	12553	poly8x8x4_t __ret; \
...	@@ -13730,6 +12938,44 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -13730,6 +12938,44 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
13730	})	12938	})
13731	#endif	12939	#endif
13732		12940
		12941	#ifdef __LITTLE_ENDIAN__
		12942	#define vld1q_bf16_x4(__p0) __extension__ ({ \
		12943	bfloat16x8x4_t __ret; \
		12944	__builtin_neon_vld1q_x4_v(&__ret, __p0, 43); \
		12945	__ret; \
		12946	})
		12947	#else
		12948	#define vld1q_bf16_x4(__p0) __extension__ ({ \
		12949	bfloat16x8x4_t __ret; \
		12950	__builtin_neon_vld1q_x4_v(&__ret, __p0, 43); \
		12951	\
		12952	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		12953	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		12954	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
		12955	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_128_16); \
		12956	__ret; \
		12957	})
		12958	#endif
		12959
		12960	#ifdef __LITTLE_ENDIAN__
		12961	#define vld1_bf16_x4(__p0) __extension__ ({ \
		12962	bfloat16x4x4_t __ret; \
		12963	__builtin_neon_vld1_x4_v(&__ret, __p0, 11); \
		12964	__ret; \
		12965	})
		12966	#else
		12967	#define vld1_bf16_x4(__p0) __extension__ ({ \
		12968	bfloat16x4x4_t __ret; \
		12969	__builtin_neon_vld1_x4_v(&__ret, __p0, 11); \
		12970	\
		12971	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		12972	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		12973	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
		12974	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_64_16); \
		12975	__ret; \
		12976	})
		12977	#endif
		12978
13733	#ifdef __LITTLE_ENDIAN__	12979	#ifdef __LITTLE_ENDIAN__
13734	#define vld2_p8(__p0) __extension__ ({ \	12980	#define vld2_p8(__p0) __extension__ ({ \
13735	poly8x8x2_t __ret; \	12981	poly8x8x2_t __ret; \
...	@@ -14046,6 +13292,40 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -14046,6 +13292,40 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
14046	})	13292	})
14047	#endif	13293	#endif
14048		13294
		13295	#ifdef __LITTLE_ENDIAN__
		13296	#define vld2q_bf16(__p0) __extension__ ({ \
		13297	bfloat16x8x2_t __ret; \
		13298	__builtin_neon_vld2q_v(&__ret, __p0, 43); \
		13299	__ret; \
		13300	})
		13301	#else
		13302	#define vld2q_bf16(__p0) __extension__ ({ \
		13303	bfloat16x8x2_t __ret; \
		13304	__builtin_neon_vld2q_v(&__ret, __p0, 43); \
		13305	\
		13306	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		13307	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		13308	__ret; \
		13309	})
		13310	#endif
		13311
		13312	#ifdef __LITTLE_ENDIAN__
		13313	#define vld2_bf16(__p0) __extension__ ({ \
		13314	bfloat16x4x2_t __ret; \
		13315	__builtin_neon_vld2_v(&__ret, __p0, 11); \
		13316	__ret; \
		13317	})
		13318	#else
		13319	#define vld2_bf16(__p0) __extension__ ({ \
		13320	bfloat16x4x2_t __ret; \
		13321	__builtin_neon_vld2_v(&__ret, __p0, 11); \
		13322	\
		13323	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		13324	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		13325	__ret; \
		13326	})
		13327	#endif
		13328
14049	#ifdef __LITTLE_ENDIAN__	13329	#ifdef __LITTLE_ENDIAN__
14050	#define vld2_dup_p8(__p0) __extension__ ({ \	13330	#define vld2_dup_p8(__p0) __extension__ ({ \
14051	poly8x8x2_t __ret; \	13331	poly8x8x2_t __ret; \
...	@@ -14396,6 +13676,40 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -14396,6 +13676,40 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
14396	})	13676	})
14397	#endif	13677	#endif
14398		13678
		13679	#ifdef __LITTLE_ENDIAN__
		13680	#define vld2q_dup_bf16(__p0) __extension__ ({ \
		13681	bfloat16x8x2_t __ret; \
		13682	__builtin_neon_vld2q_dup_v(&__ret, __p0, 43); \
		13683	__ret; \
		13684	})
		13685	#else
		13686	#define vld2q_dup_bf16(__p0) __extension__ ({ \
		13687	bfloat16x8x2_t __ret; \
		13688	__builtin_neon_vld2q_dup_v(&__ret, __p0, 43); \
		13689	\
		13690	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		13691	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		13692	__ret; \
		13693	})
		13694	#endif
		13695
		13696	#ifdef __LITTLE_ENDIAN__
		13697	#define vld2_dup_bf16(__p0) __extension__ ({ \
		13698	bfloat16x4x2_t __ret; \
		13699	__builtin_neon_vld2_dup_v(&__ret, __p0, 11); \
		13700	__ret; \
		13701	})
		13702	#else
		13703	#define vld2_dup_bf16(__p0) __extension__ ({ \
		13704	bfloat16x4x2_t __ret; \
		13705	__builtin_neon_vld2_dup_v(&__ret, __p0, 11); \
		13706	\
		13707	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		13708	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		13709	__ret; \
		13710	})
		13711	#endif
		13712
14399	#ifdef __LITTLE_ENDIAN__	13713	#ifdef __LITTLE_ENDIAN__
14400	#define vld2_lane_p8(__p0, __p1, __p2) __extension__ ({ \	13714	#define vld2_lane_p8(__p0, __p1, __p2) __extension__ ({ \
14401	poly8x8x2_t __ret; \	13715	poly8x8x2_t __ret; \
...	@@ -14726,6 +14040,50 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -14726,6 +14040,50 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
14726	})	14040	})
14727	#endif	14041	#endif
14728		14042
		14043	#ifdef __LITTLE_ENDIAN__
		14044	#define vld2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		14045	bfloat16x8x2_t __ret; \
		14046	bfloat16x8x2_t __s1 = __p1; \
		14047	__builtin_neon_vld2q_lane_v(&__ret, __p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __p2, 43); \
		14048	__ret; \
		14049	})
		14050	#else
		14051	#define vld2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		14052	bfloat16x8x2_t __ret; \
		14053	bfloat16x8x2_t __s1 = __p1; \
		14054	bfloat16x8x2_t __rev1; \
		14055	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		14056	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		14057	__builtin_neon_vld2q_lane_v(&__ret, __p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __p2, 43); \
		14058	\
		14059	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		14060	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		14061	__ret; \
		14062	})
		14063	#endif
		14064
		14065	#ifdef __LITTLE_ENDIAN__
		14066	#define vld2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		14067	bfloat16x4x2_t __ret; \
		14068	bfloat16x4x2_t __s1 = __p1; \
		14069	__builtin_neon_vld2_lane_v(&__ret, __p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __p2, 11); \
		14070	__ret; \
		14071	})
		14072	#else
		14073	#define vld2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		14074	bfloat16x4x2_t __ret; \
		14075	bfloat16x4x2_t __s1 = __p1; \
		14076	bfloat16x4x2_t __rev1; \
		14077	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		14078	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		14079	__builtin_neon_vld2_lane_v(&__ret, __p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __p2, 11); \
		14080	\
		14081	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		14082	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		14083	__ret; \
		14084	})
		14085	#endif
		14086
14729	#ifdef __LITTLE_ENDIAN__	14087	#ifdef __LITTLE_ENDIAN__
14730	#define vld3_p8(__p0) __extension__ ({ \	14088	#define vld3_p8(__p0) __extension__ ({ \
14731	poly8x8x3_t __ret; \	14089	poly8x8x3_t __ret; \
...	@@ -15060,6 +14418,42 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -15060,6 +14418,42 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
15060	})	14418	})
15061	#endif	14419	#endif
15062		14420
		14421	#ifdef __LITTLE_ENDIAN__
		14422	#define vld3q_bf16(__p0) __extension__ ({ \
		14423	bfloat16x8x3_t __ret; \
		14424	__builtin_neon_vld3q_v(&__ret, __p0, 43); \
		14425	__ret; \
		14426	})
		14427	#else
		14428	#define vld3q_bf16(__p0) __extension__ ({ \
		14429	bfloat16x8x3_t __ret; \
		14430	__builtin_neon_vld3q_v(&__ret, __p0, 43); \
		14431	\
		14432	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		14433	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		14434	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
		14435	__ret; \
		14436	})
		14437	#endif
		14438
		14439	#ifdef __LITTLE_ENDIAN__
		14440	#define vld3_bf16(__p0) __extension__ ({ \
		14441	bfloat16x4x3_t __ret; \
		14442	__builtin_neon_vld3_v(&__ret, __p0, 11); \
		14443	__ret; \
		14444	})
		14445	#else
		14446	#define vld3_bf16(__p0) __extension__ ({ \
		14447	bfloat16x4x3_t __ret; \
		14448	__builtin_neon_vld3_v(&__ret, __p0, 11); \
		14449	\
		14450	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		14451	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		14452	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
		14453	__ret; \
		14454	})
		14455	#endif
		14456
15063	#ifdef __LITTLE_ENDIAN__	14457	#ifdef __LITTLE_ENDIAN__
15064	#define vld3_dup_p8(__p0) __extension__ ({ \	14458	#define vld3_dup_p8(__p0) __extension__ ({ \
15065	poly8x8x3_t __ret; \	14459	poly8x8x3_t __ret; \
...	@@ -15430,6 +14824,42 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -15430,6 +14824,42 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
15430	})	14824	})
15431	#endif	14825	#endif
15432		14826
		14827	#ifdef __LITTLE_ENDIAN__
		14828	#define vld3q_dup_bf16(__p0) __extension__ ({ \
		14829	bfloat16x8x3_t __ret; \
		14830	__builtin_neon_vld3q_dup_v(&__ret, __p0, 43); \
		14831	__ret; \
		14832	})
		14833	#else
		14834	#define vld3q_dup_bf16(__p0) __extension__ ({ \
		14835	bfloat16x8x3_t __ret; \
		14836	__builtin_neon_vld3q_dup_v(&__ret, __p0, 43); \
		14837	\
		14838	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		14839	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		14840	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
		14841	__ret; \
		14842	})
		14843	#endif
		14844
		14845	#ifdef __LITTLE_ENDIAN__
		14846	#define vld3_dup_bf16(__p0) __extension__ ({ \
		14847	bfloat16x4x3_t __ret; \
		14848	__builtin_neon_vld3_dup_v(&__ret, __p0, 11); \
		14849	__ret; \
		14850	})
		14851	#else
		14852	#define vld3_dup_bf16(__p0) __extension__ ({ \
		14853	bfloat16x4x3_t __ret; \
		14854	__builtin_neon_vld3_dup_v(&__ret, __p0, 11); \
		14855	\
		14856	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		14857	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		14858	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
		14859	__ret; \
		14860	})
		14861	#endif
		14862
15433	#ifdef __LITTLE_ENDIAN__	14863	#ifdef __LITTLE_ENDIAN__
15434	#define vld3_lane_p8(__p0, __p1, __p2) __extension__ ({ \	14864	#define vld3_lane_p8(__p0, __p1, __p2) __extension__ ({ \
15435	poly8x8x3_t __ret; \	14865	poly8x8x3_t __ret; \
...	@@ -15790,6 +15220,54 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -15790,6 +15220,54 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
15790	})	15220	})
15791	#endif	15221	#endif
15792		15222
		15223	#ifdef __LITTLE_ENDIAN__
		15224	#define vld3q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		15225	bfloat16x8x3_t __ret; \
		15226	bfloat16x8x3_t __s1 = __p1; \
		15227	__builtin_neon_vld3q_lane_v(&__ret, __p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __p2, 43); \
		15228	__ret; \
		15229	})
		15230	#else
		15231	#define vld3q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		15232	bfloat16x8x3_t __ret; \
		15233	bfloat16x8x3_t __s1 = __p1; \
		15234	bfloat16x8x3_t __rev1; \
		15235	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		15236	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		15237	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
		15238	__builtin_neon_vld3q_lane_v(&__ret, __p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __p2, 43); \
		15239	\
		15240	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		15241	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		15242	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
		15243	__ret; \
		15244	})
		15245	#endif
		15246
		15247	#ifdef __LITTLE_ENDIAN__
		15248	#define vld3_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		15249	bfloat16x4x3_t __ret; \
		15250	bfloat16x4x3_t __s1 = __p1; \
		15251	__builtin_neon_vld3_lane_v(&__ret, __p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __p2, 11); \
		15252	__ret; \
		15253	})
		15254	#else
		15255	#define vld3_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		15256	bfloat16x4x3_t __ret; \
		15257	bfloat16x4x3_t __s1 = __p1; \
		15258	bfloat16x4x3_t __rev1; \
		15259	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		15260	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		15261	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
		15262	__builtin_neon_vld3_lane_v(&__ret, __p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __p2, 11); \
		15263	\
		15264	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		15265	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		15266	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
		15267	__ret; \
		15268	})
		15269	#endif
		15270
15793	#ifdef __LITTLE_ENDIAN__	15271	#ifdef __LITTLE_ENDIAN__
15794	#define vld4_p8(__p0) __extension__ ({ \	15272	#define vld4_p8(__p0) __extension__ ({ \
15795	poly8x8x4_t __ret; \	15273	poly8x8x4_t __ret; \
...	@@ -16142,6 +15620,44 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -16142,6 +15620,44 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
16142	})	15620	})
16143	#endif	15621	#endif
16144		15622
		15623	#ifdef __LITTLE_ENDIAN__
		15624	#define vld4q_bf16(__p0) __extension__ ({ \
		15625	bfloat16x8x4_t __ret; \
		15626	__builtin_neon_vld4q_v(&__ret, __p0, 43); \
		15627	__ret; \
		15628	})
		15629	#else
		15630	#define vld4q_bf16(__p0) __extension__ ({ \
		15631	bfloat16x8x4_t __ret; \
		15632	__builtin_neon_vld4q_v(&__ret, __p0, 43); \
		15633	\
		15634	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		15635	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		15636	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
		15637	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_128_16); \
		15638	__ret; \
		15639	})
		15640	#endif
		15641
		15642	#ifdef __LITTLE_ENDIAN__
		15643	#define vld4_bf16(__p0) __extension__ ({ \
		15644	bfloat16x4x4_t __ret; \
		15645	__builtin_neon_vld4_v(&__ret, __p0, 11); \
		15646	__ret; \
		15647	})
		15648	#else
		15649	#define vld4_bf16(__p0) __extension__ ({ \
		15650	bfloat16x4x4_t __ret; \
		15651	__builtin_neon_vld4_v(&__ret, __p0, 11); \
		15652	\
		15653	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		15654	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		15655	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
		15656	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_64_16); \
		15657	__ret; \
		15658	})
		15659	#endif
		15660
16145	#ifdef __LITTLE_ENDIAN__	15661	#ifdef __LITTLE_ENDIAN__
16146	#define vld4_dup_p8(__p0) __extension__ ({ \	15662	#define vld4_dup_p8(__p0) __extension__ ({ \
16147	poly8x8x4_t __ret; \	15663	poly8x8x4_t __ret; \
...	@@ -16532,6 +16048,44 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -16532,6 +16048,44 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
16532	})	16048	})
16533	#endif	16049	#endif
16534		16050
		16051	#ifdef __LITTLE_ENDIAN__
		16052	#define vld4q_dup_bf16(__p0) __extension__ ({ \
		16053	bfloat16x8x4_t __ret; \
		16054	__builtin_neon_vld4q_dup_v(&__ret, __p0, 43); \
		16055	__ret; \
		16056	})
		16057	#else
		16058	#define vld4q_dup_bf16(__p0) __extension__ ({ \
		16059	bfloat16x8x4_t __ret; \
		16060	__builtin_neon_vld4q_dup_v(&__ret, __p0, 43); \
		16061	\
		16062	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		16063	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		16064	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
		16065	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_128_16); \
		16066	__ret; \
		16067	})
		16068	#endif
		16069
		16070	#ifdef __LITTLE_ENDIAN__
		16071	#define vld4_dup_bf16(__p0) __extension__ ({ \
		16072	bfloat16x4x4_t __ret; \
		16073	__builtin_neon_vld4_dup_v(&__ret, __p0, 11); \
		16074	__ret; \
		16075	})
		16076	#else
		16077	#define vld4_dup_bf16(__p0) __extension__ ({ \
		16078	bfloat16x4x4_t __ret; \
		16079	__builtin_neon_vld4_dup_v(&__ret, __p0, 11); \
		16080	\
		16081	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		16082	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		16083	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
		16084	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_64_16); \
		16085	__ret; \
		16086	})
		16087	#endif
		16088
16535	#ifdef __LITTLE_ENDIAN__	16089	#ifdef __LITTLE_ENDIAN__
16536	#define vld4_lane_p8(__p0, __p1, __p2) __extension__ ({ \	16090	#define vld4_lane_p8(__p0, __p1, __p2) __extension__ ({ \
16537	poly8x8x4_t __ret; \	16091	poly8x8x4_t __ret; \
...	@@ -16922,6 +16476,58 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4	...	@@ -16922,6 +16476,58 @@ __ai __attribute__((target("neon"))) int16x4_t vhsub_s16(int16x4_t __p0, int16x4
16922	})	16476	})
16923	#endif	16477	#endif
16924		16478
		16479	#ifdef __LITTLE_ENDIAN__
		16480	#define vld4q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		16481	bfloat16x8x4_t __ret; \
		16482	bfloat16x8x4_t __s1 = __p1; \
		16483	__builtin_neon_vld4q_lane_v(&__ret, __p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __builtin_bit_cast(int8x16_t, __s1.val[3]), __p2, 43); \
		16484	__ret; \
		16485	})
		16486	#else
		16487	#define vld4q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		16488	bfloat16x8x4_t __ret; \
		16489	bfloat16x8x4_t __s1 = __p1; \
		16490	bfloat16x8x4_t __rev1; \
		16491	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		16492	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		16493	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
		16494	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_128_16); \
		16495	__builtin_neon_vld4q_lane_v(&__ret, __p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __builtin_bit_cast(int8x16_t, __rev1.val[3]), __p2, 43); \
		16496	\
		16497	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_128_16); \
		16498	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_128_16); \
		16499	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_128_16); \
		16500	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_128_16); \
		16501	__ret; \
		16502	})
		16503	#endif
		16504
		16505	#ifdef __LITTLE_ENDIAN__
		16506	#define vld4_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		16507	bfloat16x4x4_t __ret; \
		16508	bfloat16x4x4_t __s1 = __p1; \
		16509	__builtin_neon_vld4_lane_v(&__ret, __p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __builtin_bit_cast(int8x8_t, __s1.val[3]), __p2, 11); \
		16510	__ret; \
		16511	})
		16512	#else
		16513	#define vld4_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		16514	bfloat16x4x4_t __ret; \
		16515	bfloat16x4x4_t __s1 = __p1; \
		16516	bfloat16x4x4_t __rev1; \
		16517	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		16518	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		16519	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
		16520	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_64_16); \
		16521	__builtin_neon_vld4_lane_v(&__ret, __p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __builtin_bit_cast(int8x8_t, __rev1.val[3]), __p2, 11); \
		16522	\
		16523	__ret.val[0] = __builtin_shufflevector(__ret.val[0], __ret.val[0], __lane_reverse_64_16); \
		16524	__ret.val[1] = __builtin_shufflevector(__ret.val[1], __ret.val[1], __lane_reverse_64_16); \
		16525	__ret.val[2] = __builtin_shufflevector(__ret.val[2], __ret.val[2], __lane_reverse_64_16); \
		16526	__ret.val[3] = __builtin_shufflevector(__ret.val[3], __ret.val[3], __lane_reverse_64_16); \
		16527	__ret; \
		16528	})
		16529	#endif
		16530
16925	#ifdef __LITTLE_ENDIAN__	16531	#ifdef __LITTLE_ENDIAN__
16926	__ai __attribute__((target("neon"))) uint8x16_t vmaxq_u8(uint8x16_t __p0, uint8x16_t __p1) {	16532	__ai __attribute__((target("neon"))) uint8x16_t vmaxq_u8(uint8x16_t __p0, uint8x16_t __p1) {
16927	uint8x16_t __ret;	16533	uint8x16_t __ret;
...	@@ -27576,6 +27182,60 @@ __ai __attribute__((target("neon"))) int8x8_t __noswap_vrsubhn_s16(int16x8_t __p	...	@@ -27576,6 +27182,60 @@ __ai __attribute__((target("neon"))) int8x8_t __noswap_vrsubhn_s16(int16x8_t __p
27576	})	27182	})
27577	#endif	27183	#endif
27578		27184
		27185	#ifdef __LITTLE_ENDIAN__
		27186	#define vsetq_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		27187	bfloat16x8_t __ret; \
		27188	bfloat16_t __s0 = __p0; \
		27189	bfloat16x8_t __s1 = __p1; \
		27190	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vsetq_lane_bf16(__s0, __s1, __p2)); \
		27191	__ret; \
		27192	})
		27193	#else
		27194	#define vsetq_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		27195	bfloat16x8_t __ret; \
		27196	bfloat16_t __s0 = __p0; \
		27197	bfloat16x8_t __s1 = __p1; \
		27198	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
		27199	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vsetq_lane_bf16(__s0, __rev1, __p2)); \
		27200	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		27201	__ret; \
		27202	})
		27203	#define __noswap_vsetq_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		27204	bfloat16x8_t __ret; \
		27205	bfloat16_t __s0 = __p0; \
		27206	bfloat16x8_t __s1 = __p1; \
		27207	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vsetq_lane_bf16(__s0, __s1, __p2)); \
		27208	__ret; \
		27209	})
		27210	#endif
		27211
		27212	#ifdef __LITTLE_ENDIAN__
		27213	#define vset_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		27214	bfloat16x4_t __ret; \
		27215	bfloat16_t __s0 = __p0; \
		27216	bfloat16x4_t __s1 = __p1; \
		27217	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vset_lane_bf16(__s0, __s1, __p2)); \
		27218	__ret; \
		27219	})
		27220	#else
		27221	#define vset_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		27222	bfloat16x4_t __ret; \
		27223	bfloat16_t __s0 = __p0; \
		27224	bfloat16x4_t __s1 = __p1; \
		27225	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
		27226	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vset_lane_bf16(__s0, __rev1, __p2)); \
		27227	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
		27228	__ret; \
		27229	})
		27230	#define __noswap_vset_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		27231	bfloat16x4_t __ret; \
		27232	bfloat16_t __s0 = __p0; \
		27233	bfloat16x4_t __s1 = __p1; \
		27234	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vset_lane_bf16(__s0, __s1, __p2)); \
		27235	__ret; \
		27236	})
		27237	#endif
		27238
27579	#ifdef __LITTLE_ENDIAN__	27239	#ifdef __LITTLE_ENDIAN__
27580	__ai __attribute__((target("neon"))) uint8x16_t vshlq_u8(uint8x16_t __p0, int8x16_t __p1) {	27240	__ai __attribute__((target("neon"))) uint8x16_t vshlq_u8(uint8x16_t __p0, int8x16_t __p1) {
27581	uint8x16_t __ret;	27241	uint8x16_t __ret;
...	@@ -30000,6 +29660,32 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -30000,6 +29660,32 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
30000	})	29660	})
30001	#endif	29661	#endif
30002		29662
		29663	#ifdef __LITTLE_ENDIAN__
		29664	#define vst1q_bf16(__p0, __p1) __extension__ ({ \
		29665	bfloat16x8_t __s1 = __p1; \
		29666	__builtin_neon_vst1q_v(__p0, __builtin_bit_cast(int8x16_t, __s1), 43); \
		29667	})
		29668	#else
		29669	#define vst1q_bf16(__p0, __p1) __extension__ ({ \
		29670	bfloat16x8_t __s1 = __p1; \
		29671	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
		29672	__builtin_neon_vst1q_v(__p0, __builtin_bit_cast(int8x16_t, __rev1), 43); \
		29673	})
		29674	#endif
		29675
		29676	#ifdef __LITTLE_ENDIAN__
		29677	#define vst1_bf16(__p0, __p1) __extension__ ({ \
		29678	bfloat16x4_t __s1 = __p1; \
		29679	__builtin_neon_vst1_v(__p0, __builtin_bit_cast(int8x8_t, __s1), 11); \
		29680	})
		29681	#else
		29682	#define vst1_bf16(__p0, __p1) __extension__ ({ \
		29683	bfloat16x4_t __s1 = __p1; \
		29684	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
		29685	__builtin_neon_vst1_v(__p0, __builtin_bit_cast(int8x8_t, __rev1), 11); \
		29686	})
		29687	#endif
		29688
30003	#ifdef __LITTLE_ENDIAN__	29689	#ifdef __LITTLE_ENDIAN__
30004	#define vst1_lane_p8(__p0, __p1, __p2) __extension__ ({ \	29690	#define vst1_lane_p8(__p0, __p1, __p2) __extension__ ({ \
30005	poly8x8_t __s1 = __p1; \	29691	poly8x8_t __s1 = __p1; \
...	@@ -30268,6 +29954,32 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -30268,6 +29954,32 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
30268	})	29954	})
30269	#endif	29955	#endif
30270		29956
		29957	#ifdef __LITTLE_ENDIAN__
		29958	#define vst1q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		29959	bfloat16x8_t __s1 = __p1; \
		29960	__builtin_neon_vst1q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __s1), __p2, 43); \
		29961	})
		29962	#else
		29963	#define vst1q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		29964	bfloat16x8_t __s1 = __p1; \
		29965	bfloat16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
		29966	__builtin_neon_vst1q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __rev1), __p2, 43); \
		29967	})
		29968	#endif
		29969
		29970	#ifdef __LITTLE_ENDIAN__
		29971	#define vst1_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		29972	bfloat16x4_t __s1 = __p1; \
		29973	__builtin_neon_vst1_lane_v(__p0, __builtin_bit_cast(int8x8_t, __s1), __p2, 11); \
		29974	})
		29975	#else
		29976	#define vst1_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		29977	bfloat16x4_t __s1 = __p1; \
		29978	bfloat16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
		29979	__builtin_neon_vst1_lane_v(__p0, __builtin_bit_cast(int8x8_t, __rev1), __p2, 11); \
		29980	})
		29981	#endif
		29982
30271	#ifdef __LITTLE_ENDIAN__	29983	#ifdef __LITTLE_ENDIAN__
30272	#define vst1_p8_x2(__p0, __p1) __extension__ ({ \	29984	#define vst1_p8_x2(__p0, __p1) __extension__ ({ \
30273	poly8x8x2_t __s1 = __p1; \	29985	poly8x8x2_t __s1 = __p1; \
...	@@ -30576,6 +30288,36 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -30576,6 +30288,36 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
30576	})	30288	})
30577	#endif	30289	#endif
30578		30290
		30291	#ifdef __LITTLE_ENDIAN__
		30292	#define vst1q_bf16_x2(__p0, __p1) __extension__ ({ \
		30293	bfloat16x8x2_t __s1 = __p1; \
		30294	__builtin_neon_vst1q_x2_v(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), 43); \
		30295	})
		30296	#else
		30297	#define vst1q_bf16_x2(__p0, __p1) __extension__ ({ \
		30298	bfloat16x8x2_t __s1 = __p1; \
		30299	bfloat16x8x2_t __rev1; \
		30300	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		30301	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		30302	__builtin_neon_vst1q_x2_v(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), 43); \
		30303	})
		30304	#endif
		30305
		30306	#ifdef __LITTLE_ENDIAN__
		30307	#define vst1_bf16_x2(__p0, __p1) __extension__ ({ \
		30308	bfloat16x4x2_t __s1 = __p1; \
		30309	__builtin_neon_vst1_x2_v(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), 11); \
		30310	})
		30311	#else
		30312	#define vst1_bf16_x2(__p0, __p1) __extension__ ({ \
		30313	bfloat16x4x2_t __s1 = __p1; \
		30314	bfloat16x4x2_t __rev1; \
		30315	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		30316	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		30317	__builtin_neon_vst1_x2_v(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), 11); \
		30318	})
		30319	#endif
		30320
30579	#ifdef __LITTLE_ENDIAN__	30321	#ifdef __LITTLE_ENDIAN__
30580	#define vst1_p8_x3(__p0, __p1) __extension__ ({ \	30322	#define vst1_p8_x3(__p0, __p1) __extension__ ({ \
30581	poly8x8x3_t __s1 = __p1; \	30323	poly8x8x3_t __s1 = __p1; \
...	@@ -30904,6 +30646,38 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -30904,6 +30646,38 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
30904	})	30646	})
30905	#endif	30647	#endif
30906		30648
		30649	#ifdef __LITTLE_ENDIAN__
		30650	#define vst1q_bf16_x3(__p0, __p1) __extension__ ({ \
		30651	bfloat16x8x3_t __s1 = __p1; \
		30652	__builtin_neon_vst1q_x3_v(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), 43); \
		30653	})
		30654	#else
		30655	#define vst1q_bf16_x3(__p0, __p1) __extension__ ({ \
		30656	bfloat16x8x3_t __s1 = __p1; \
		30657	bfloat16x8x3_t __rev1; \
		30658	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		30659	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		30660	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
		30661	__builtin_neon_vst1q_x3_v(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), 43); \
		30662	})
		30663	#endif
		30664
		30665	#ifdef __LITTLE_ENDIAN__
		30666	#define vst1_bf16_x3(__p0, __p1) __extension__ ({ \
		30667	bfloat16x4x3_t __s1 = __p1; \
		30668	__builtin_neon_vst1_x3_v(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), 11); \
		30669	})
		30670	#else
		30671	#define vst1_bf16_x3(__p0, __p1) __extension__ ({ \
		30672	bfloat16x4x3_t __s1 = __p1; \
		30673	bfloat16x4x3_t __rev1; \
		30674	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		30675	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		30676	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
		30677	__builtin_neon_vst1_x3_v(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), 11); \
		30678	})
		30679	#endif
		30680
30907	#ifdef __LITTLE_ENDIAN__	30681	#ifdef __LITTLE_ENDIAN__
30908	#define vst1_p8_x4(__p0, __p1) __extension__ ({ \	30682	#define vst1_p8_x4(__p0, __p1) __extension__ ({ \
30909	poly8x8x4_t __s1 = __p1; \	30683	poly8x8x4_t __s1 = __p1; \
...	@@ -31252,6 +31026,40 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -31252,6 +31026,40 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
31252	})	31026	})
31253	#endif	31027	#endif
31254		31028
		31029	#ifdef __LITTLE_ENDIAN__
		31030	#define vst1q_bf16_x4(__p0, __p1) __extension__ ({ \
		31031	bfloat16x8x4_t __s1 = __p1; \
		31032	__builtin_neon_vst1q_x4_v(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __builtin_bit_cast(int8x16_t, __s1.val[3]), 43); \
		31033	})
		31034	#else
		31035	#define vst1q_bf16_x4(__p0, __p1) __extension__ ({ \
		31036	bfloat16x8x4_t __s1 = __p1; \
		31037	bfloat16x8x4_t __rev1; \
		31038	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		31039	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		31040	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
		31041	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_128_16); \
		31042	__builtin_neon_vst1q_x4_v(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __builtin_bit_cast(int8x16_t, __rev1.val[3]), 43); \
		31043	})
		31044	#endif
		31045
		31046	#ifdef __LITTLE_ENDIAN__
		31047	#define vst1_bf16_x4(__p0, __p1) __extension__ ({ \
		31048	bfloat16x4x4_t __s1 = __p1; \
		31049	__builtin_neon_vst1_x4_v(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __builtin_bit_cast(int8x8_t, __s1.val[3]), 11); \
		31050	})
		31051	#else
		31052	#define vst1_bf16_x4(__p0, __p1) __extension__ ({ \
		31053	bfloat16x4x4_t __s1 = __p1; \
		31054	bfloat16x4x4_t __rev1; \
		31055	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		31056	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		31057	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
		31058	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_64_16); \
		31059	__builtin_neon_vst1_x4_v(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __builtin_bit_cast(int8x8_t, __rev1.val[3]), 11); \
		31060	})
		31061	#endif
		31062
31255	#ifdef __LITTLE_ENDIAN__	31063	#ifdef __LITTLE_ENDIAN__
31256	#define vst2_p8(__p0, __p1) __extension__ ({ \	31064	#define vst2_p8(__p0, __p1) __extension__ ({ \
31257	poly8x8x2_t __s1 = __p1; \	31065	poly8x8x2_t __s1 = __p1; \
...	@@ -31530,6 +31338,36 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -31530,6 +31338,36 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
31530	})	31338	})
31531	#endif	31339	#endif
31532		31340
		31341	#ifdef __LITTLE_ENDIAN__
		31342	#define vst2q_bf16(__p0, __p1) __extension__ ({ \
		31343	bfloat16x8x2_t __s1 = __p1; \
		31344	__builtin_neon_vst2q_v(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), 43); \
		31345	})
		31346	#else
		31347	#define vst2q_bf16(__p0, __p1) __extension__ ({ \
		31348	bfloat16x8x2_t __s1 = __p1; \
		31349	bfloat16x8x2_t __rev1; \
		31350	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		31351	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		31352	__builtin_neon_vst2q_v(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), 43); \
		31353	})
		31354	#endif
		31355
		31356	#ifdef __LITTLE_ENDIAN__
		31357	#define vst2_bf16(__p0, __p1) __extension__ ({ \
		31358	bfloat16x4x2_t __s1 = __p1; \
		31359	__builtin_neon_vst2_v(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), 11); \
		31360	})
		31361	#else
		31362	#define vst2_bf16(__p0, __p1) __extension__ ({ \
		31363	bfloat16x4x2_t __s1 = __p1; \
		31364	bfloat16x4x2_t __rev1; \
		31365	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		31366	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		31367	__builtin_neon_vst2_v(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), 11); \
		31368	})
		31369	#endif
		31370
31533	#ifdef __LITTLE_ENDIAN__	31371	#ifdef __LITTLE_ENDIAN__
31534	#define vst2_lane_p8(__p0, __p1, __p2) __extension__ ({ \	31372	#define vst2_lane_p8(__p0, __p1, __p2) __extension__ ({ \
31535	poly8x8x2_t __s1 = __p1; \	31373	poly8x8x2_t __s1 = __p1; \
...	@@ -31755,6 +31593,36 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -31755,6 +31593,36 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
31755	})	31593	})
31756	#endif	31594	#endif
31757		31595
		31596	#ifdef __LITTLE_ENDIAN__
		31597	#define vst2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		31598	bfloat16x8x2_t __s1 = __p1; \
		31599	__builtin_neon_vst2q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __p2, 43); \
		31600	})
		31601	#else
		31602	#define vst2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		31603	bfloat16x8x2_t __s1 = __p1; \
		31604	bfloat16x8x2_t __rev1; \
		31605	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		31606	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		31607	__builtin_neon_vst2q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __p2, 43); \
		31608	})
		31609	#endif
		31610
		31611	#ifdef __LITTLE_ENDIAN__
		31612	#define vst2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		31613	bfloat16x4x2_t __s1 = __p1; \
		31614	__builtin_neon_vst2_lane_v(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __p2, 11); \
		31615	})
		31616	#else
		31617	#define vst2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		31618	bfloat16x4x2_t __s1 = __p1; \
		31619	bfloat16x4x2_t __rev1; \
		31620	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		31621	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		31622	__builtin_neon_vst2_lane_v(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __p2, 11); \
		31623	})
		31624	#endif
		31625
31758	#ifdef __LITTLE_ENDIAN__	31626	#ifdef __LITTLE_ENDIAN__
31759	#define vst3_p8(__p0, __p1) __extension__ ({ \	31627	#define vst3_p8(__p0, __p1) __extension__ ({ \
31760	poly8x8x3_t __s1 = __p1; \	31628	poly8x8x3_t __s1 = __p1; \
...	@@ -32051,6 +31919,38 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -32051,6 +31919,38 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
32051	})	31919	})
32052	#endif	31920	#endif
32053		31921
		31922	#ifdef __LITTLE_ENDIAN__
		31923	#define vst3q_bf16(__p0, __p1) __extension__ ({ \
		31924	bfloat16x8x3_t __s1 = __p1; \
		31925	__builtin_neon_vst3q_v(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), 43); \
		31926	})
		31927	#else
		31928	#define vst3q_bf16(__p0, __p1) __extension__ ({ \
		31929	bfloat16x8x3_t __s1 = __p1; \
		31930	bfloat16x8x3_t __rev1; \
		31931	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		31932	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		31933	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
		31934	__builtin_neon_vst3q_v(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), 43); \
		31935	})
		31936	#endif
		31937
		31938	#ifdef __LITTLE_ENDIAN__
		31939	#define vst3_bf16(__p0, __p1) __extension__ ({ \
		31940	bfloat16x4x3_t __s1 = __p1; \
		31941	__builtin_neon_vst3_v(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), 11); \
		31942	})
		31943	#else
		31944	#define vst3_bf16(__p0, __p1) __extension__ ({ \
		31945	bfloat16x4x3_t __s1 = __p1; \
		31946	bfloat16x4x3_t __rev1; \
		31947	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		31948	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		31949	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
		31950	__builtin_neon_vst3_v(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), 11); \
		31951	})
		31952	#endif
		31953
32054	#ifdef __LITTLE_ENDIAN__	31954	#ifdef __LITTLE_ENDIAN__
32055	#define vst3_lane_p8(__p0, __p1, __p2) __extension__ ({ \	31955	#define vst3_lane_p8(__p0, __p1, __p2) __extension__ ({ \
32056	poly8x8x3_t __s1 = __p1; \	31956	poly8x8x3_t __s1 = __p1; \
...	@@ -32291,6 +32191,38 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -32291,6 +32191,38 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
32291	})	32191	})
32292	#endif	32192	#endif
32293		32193
		32194	#ifdef __LITTLE_ENDIAN__
		32195	#define vst3q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		32196	bfloat16x8x3_t __s1 = __p1; \
		32197	__builtin_neon_vst3q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __p2, 43); \
		32198	})
		32199	#else
		32200	#define vst3q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		32201	bfloat16x8x3_t __s1 = __p1; \
		32202	bfloat16x8x3_t __rev1; \
		32203	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		32204	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		32205	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
		32206	__builtin_neon_vst3q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __p2, 43); \
		32207	})
		32208	#endif
		32209
		32210	#ifdef __LITTLE_ENDIAN__
		32211	#define vst3_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		32212	bfloat16x4x3_t __s1 = __p1; \
		32213	__builtin_neon_vst3_lane_v(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __p2, 11); \
		32214	})
		32215	#else
		32216	#define vst3_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		32217	bfloat16x4x3_t __s1 = __p1; \
		32218	bfloat16x4x3_t __rev1; \
		32219	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		32220	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		32221	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
		32222	__builtin_neon_vst3_lane_v(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __p2, 11); \
		32223	})
		32224	#endif
		32225
32294	#ifdef __LITTLE_ENDIAN__	32226	#ifdef __LITTLE_ENDIAN__
32295	#define vst4_p8(__p0, __p1) __extension__ ({ \	32227	#define vst4_p8(__p0, __p1) __extension__ ({ \
32296	poly8x8x4_t __s1 = __p1; \	32228	poly8x8x4_t __s1 = __p1; \
...	@@ -32605,6 +32537,40 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -32605,6 +32537,40 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
32605	})	32537	})
32606	#endif	32538	#endif
32607		32539
		32540	#ifdef __LITTLE_ENDIAN__
		32541	#define vst4q_bf16(__p0, __p1) __extension__ ({ \
		32542	bfloat16x8x4_t __s1 = __p1; \
		32543	__builtin_neon_vst4q_v(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __builtin_bit_cast(int8x16_t, __s1.val[3]), 43); \
		32544	})
		32545	#else
		32546	#define vst4q_bf16(__p0, __p1) __extension__ ({ \
		32547	bfloat16x8x4_t __s1 = __p1; \
		32548	bfloat16x8x4_t __rev1; \
		32549	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		32550	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		32551	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
		32552	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_128_16); \
		32553	__builtin_neon_vst4q_v(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __builtin_bit_cast(int8x16_t, __rev1.val[3]), 43); \
		32554	})
		32555	#endif
		32556
		32557	#ifdef __LITTLE_ENDIAN__
		32558	#define vst4_bf16(__p0, __p1) __extension__ ({ \
		32559	bfloat16x4x4_t __s1 = __p1; \
		32560	__builtin_neon_vst4_v(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __builtin_bit_cast(int8x8_t, __s1.val[3]), 11); \
		32561	})
		32562	#else
		32563	#define vst4_bf16(__p0, __p1) __extension__ ({ \
		32564	bfloat16x4x4_t __s1 = __p1; \
		32565	bfloat16x4x4_t __rev1; \
		32566	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		32567	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		32568	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
		32569	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_64_16); \
		32570	__builtin_neon_vst4_v(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __builtin_bit_cast(int8x8_t, __rev1.val[3]), 11); \
		32571	})
		32572	#endif
		32573
32608	#ifdef __LITTLE_ENDIAN__	32574	#ifdef __LITTLE_ENDIAN__
32609	#define vst4_lane_p8(__p0, __p1, __p2) __extension__ ({ \	32575	#define vst4_lane_p8(__p0, __p1, __p2) __extension__ ({ \
32610	poly8x8x4_t __s1 = __p1; \	32576	poly8x8x4_t __s1 = __p1; \
...	@@ -32860,6 +32826,40 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_	...	@@ -32860,6 +32826,40 @@ __ai __attribute__((target("neon"))) int16x4_t vshl_s16(int16x4_t __p0, int16x4_
32860	})	32826	})
32861	#endif	32827	#endif
32862		32828
		32829	#ifdef __LITTLE_ENDIAN__
		32830	#define vst4q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		32831	bfloat16x8x4_t __s1 = __p1; \
		32832	__builtin_neon_vst4q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __s1.val[0]), __builtin_bit_cast(int8x16_t, __s1.val[1]), __builtin_bit_cast(int8x16_t, __s1.val[2]), __builtin_bit_cast(int8x16_t, __s1.val[3]), __p2, 43); \
		32833	})
		32834	#else
		32835	#define vst4q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		32836	bfloat16x8x4_t __s1 = __p1; \
		32837	bfloat16x8x4_t __rev1; \
		32838	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_128_16); \
		32839	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_128_16); \
		32840	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_128_16); \
		32841	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_128_16); \
		32842	__builtin_neon_vst4q_lane_v(__p0, __builtin_bit_cast(int8x16_t, __rev1.val[0]), __builtin_bit_cast(int8x16_t, __rev1.val[1]), __builtin_bit_cast(int8x16_t, __rev1.val[2]), __builtin_bit_cast(int8x16_t, __rev1.val[3]), __p2, 43); \
		32843	})
		32844	#endif
		32845
		32846	#ifdef __LITTLE_ENDIAN__
		32847	#define vst4_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		32848	bfloat16x4x4_t __s1 = __p1; \
		32849	__builtin_neon_vst4_lane_v(__p0, __builtin_bit_cast(int8x8_t, __s1.val[0]), __builtin_bit_cast(int8x8_t, __s1.val[1]), __builtin_bit_cast(int8x8_t, __s1.val[2]), __builtin_bit_cast(int8x8_t, __s1.val[3]), __p2, 11); \
		32850	})
		32851	#else
		32852	#define vst4_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		32853	bfloat16x4x4_t __s1 = __p1; \
		32854	bfloat16x4x4_t __rev1; \
		32855	__rev1.val[0] = __builtin_shufflevector(__s1.val[0], __s1.val[0], __lane_reverse_64_16); \
		32856	__rev1.val[1] = __builtin_shufflevector(__s1.val[1], __s1.val[1], __lane_reverse_64_16); \
		32857	__rev1.val[2] = __builtin_shufflevector(__s1.val[2], __s1.val[2], __lane_reverse_64_16); \
		32858	__rev1.val[3] = __builtin_shufflevector(__s1.val[3], __s1.val[3], __lane_reverse_64_16); \
		32859	__builtin_neon_vst4_lane_v(__p0, __builtin_bit_cast(int8x8_t, __rev1.val[0]), __builtin_bit_cast(int8x8_t, __rev1.val[1]), __builtin_bit_cast(int8x8_t, __rev1.val[2]), __builtin_bit_cast(int8x8_t, __rev1.val[3]), __p2, 11); \
		32860	})
		32861	#endif
		32862
32863	#ifdef __LITTLE_ENDIAN__	32863	#ifdef __LITTLE_ENDIAN__
32864	__ai __attribute__((target("neon"))) uint8x16_t vsubq_u8(uint8x16_t __p0, uint8x16_t __p1) {	32864	__ai __attribute__((target("neon"))) uint8x16_t vsubq_u8(uint8x16_t __p0, uint8x16_t __p1) {
32865	uint8x16_t __ret;	32865	uint8x16_t __ret;
...	@@ -37083,266 +37083,6 @@ __ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_low_bf16_f32(float3	...	@@ -37083,266 +37083,6 @@ __ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_low_bf16_f32(float3
37083	}	37083	}
37084	#endif	37084	#endif
37085		37085
37086	__ai __attribute__((target("bf16,neon"))) poly8x8_t vreinterpret_p8_bf16(bfloat16x4_t __p0) {
37087	poly8x8_t __ret;
37088	__ret = __builtin_bit_cast(poly8x8_t, __p0);
37089	return __ret;
37090	}
37091	__ai __attribute__((target("bf16,neon"))) poly64x1_t vreinterpret_p64_bf16(bfloat16x4_t __p0) {
37092	poly64x1_t __ret;
37093	__ret = __builtin_bit_cast(poly64x1_t, __p0);
37094	return __ret;
37095	}
37096	__ai __attribute__((target("bf16,neon"))) poly16x4_t vreinterpret_p16_bf16(bfloat16x4_t __p0) {
37097	poly16x4_t __ret;
37098	__ret = __builtin_bit_cast(poly16x4_t, __p0);
37099	return __ret;
37100	}
37101	__ai __attribute__((target("bf16,neon"))) poly8x16_t vreinterpretq_p8_bf16(bfloat16x8_t __p0) {
37102	poly8x16_t __ret;
37103	__ret = __builtin_bit_cast(poly8x16_t, __p0);
37104	return __ret;
37105	}
37106	__ai __attribute__((target("bf16,neon"))) poly64x2_t vreinterpretq_p64_bf16(bfloat16x8_t __p0) {
37107	poly64x2_t __ret;
37108	__ret = __builtin_bit_cast(poly64x2_t, __p0);
37109	return __ret;
37110	}
37111	__ai __attribute__((target("bf16,neon"))) poly16x8_t vreinterpretq_p16_bf16(bfloat16x8_t __p0) {
37112	poly16x8_t __ret;
37113	__ret = __builtin_bit_cast(poly16x8_t, __p0);
37114	return __ret;
37115	}
37116	__ai __attribute__((target("bf16,neon"))) uint8x16_t vreinterpretq_u8_bf16(bfloat16x8_t __p0) {
37117	uint8x16_t __ret;
37118	__ret = __builtin_bit_cast(uint8x16_t, __p0);
37119	return __ret;
37120	}
37121	__ai __attribute__((target("bf16,neon"))) uint32x4_t vreinterpretq_u32_bf16(bfloat16x8_t __p0) {
37122	uint32x4_t __ret;
37123	__ret = __builtin_bit_cast(uint32x4_t, __p0);
37124	return __ret;
37125	}
37126	__ai __attribute__((target("bf16,neon"))) uint64x2_t vreinterpretq_u64_bf16(bfloat16x8_t __p0) {
37127	uint64x2_t __ret;
37128	__ret = __builtin_bit_cast(uint64x2_t, __p0);
37129	return __ret;
37130	}
37131	__ai __attribute__((target("bf16,neon"))) uint16x8_t vreinterpretq_u16_bf16(bfloat16x8_t __p0) {
37132	uint16x8_t __ret;
37133	__ret = __builtin_bit_cast(uint16x8_t, __p0);
37134	return __ret;
37135	}
37136	__ai __attribute__((target("bf16,neon"))) int8x16_t vreinterpretq_s8_bf16(bfloat16x8_t __p0) {
37137	int8x16_t __ret;
37138	__ret = __builtin_bit_cast(int8x16_t, __p0);
37139	return __ret;
37140	}
37141	__ai __attribute__((target("bf16,neon"))) float32x4_t vreinterpretq_f32_bf16(bfloat16x8_t __p0) {
37142	float32x4_t __ret;
37143	__ret = __builtin_bit_cast(float32x4_t, __p0);
37144	return __ret;
37145	}
37146	__ai __attribute__((target("bf16,neon"))) float16x8_t vreinterpretq_f16_bf16(bfloat16x8_t __p0) {
37147	float16x8_t __ret;
37148	__ret = __builtin_bit_cast(float16x8_t, __p0);
37149	return __ret;
37150	}
37151	__ai __attribute__((target("bf16,neon"))) int32x4_t vreinterpretq_s32_bf16(bfloat16x8_t __p0) {
37152	int32x4_t __ret;
37153	__ret = __builtin_bit_cast(int32x4_t, __p0);
37154	return __ret;
37155	}
37156	__ai __attribute__((target("bf16,neon"))) int64x2_t vreinterpretq_s64_bf16(bfloat16x8_t __p0) {
37157	int64x2_t __ret;
37158	__ret = __builtin_bit_cast(int64x2_t, __p0);
37159	return __ret;
37160	}
37161	__ai __attribute__((target("bf16,neon"))) int16x8_t vreinterpretq_s16_bf16(bfloat16x8_t __p0) {
37162	int16x8_t __ret;
37163	__ret = __builtin_bit_cast(int16x8_t, __p0);
37164	return __ret;
37165	}
37166	__ai __attribute__((target("bf16,neon"))) uint8x8_t vreinterpret_u8_bf16(bfloat16x4_t __p0) {
37167	uint8x8_t __ret;
37168	__ret = __builtin_bit_cast(uint8x8_t, __p0);
37169	return __ret;
37170	}
37171	__ai __attribute__((target("bf16,neon"))) uint32x2_t vreinterpret_u32_bf16(bfloat16x4_t __p0) {
37172	uint32x2_t __ret;
37173	__ret = __builtin_bit_cast(uint32x2_t, __p0);
37174	return __ret;
37175	}
37176	__ai __attribute__((target("bf16,neon"))) uint64x1_t vreinterpret_u64_bf16(bfloat16x4_t __p0) {
37177	uint64x1_t __ret;
37178	__ret = __builtin_bit_cast(uint64x1_t, __p0);
37179	return __ret;
37180	}
37181	__ai __attribute__((target("bf16,neon"))) uint16x4_t vreinterpret_u16_bf16(bfloat16x4_t __p0) {
37182	uint16x4_t __ret;
37183	__ret = __builtin_bit_cast(uint16x4_t, __p0);
37184	return __ret;
37185	}
37186	__ai __attribute__((target("bf16,neon"))) int8x8_t vreinterpret_s8_bf16(bfloat16x4_t __p0) {
37187	int8x8_t __ret;
37188	__ret = __builtin_bit_cast(int8x8_t, __p0);
37189	return __ret;
37190	}
37191	__ai __attribute__((target("bf16,neon"))) float32x2_t vreinterpret_f32_bf16(bfloat16x4_t __p0) {
37192	float32x2_t __ret;
37193	__ret = __builtin_bit_cast(float32x2_t, __p0);
37194	return __ret;
37195	}
37196	__ai __attribute__((target("bf16,neon"))) float16x4_t vreinterpret_f16_bf16(bfloat16x4_t __p0) {
37197	float16x4_t __ret;
37198	__ret = __builtin_bit_cast(float16x4_t, __p0);
37199	return __ret;
37200	}
37201	__ai __attribute__((target("bf16,neon"))) int32x2_t vreinterpret_s32_bf16(bfloat16x4_t __p0) {
37202	int32x2_t __ret;
37203	__ret = __builtin_bit_cast(int32x2_t, __p0);
37204	return __ret;
37205	}
37206	__ai __attribute__((target("bf16,neon"))) int64x1_t vreinterpret_s64_bf16(bfloat16x4_t __p0) {
37207	int64x1_t __ret;
37208	__ret = __builtin_bit_cast(int64x1_t, __p0);
37209	return __ret;
37210	}
37211	__ai __attribute__((target("bf16,neon"))) int16x4_t vreinterpret_s16_bf16(bfloat16x4_t __p0) {
37212	int16x4_t __ret;
37213	__ret = __builtin_bit_cast(int16x4_t, __p0);
37214	return __ret;
37215	}
37216	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_p8(poly8x16_t __p0) {
37217	bfloat16x8_t __ret;
37218	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37219	return __ret;
37220	}
37221	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_p64(poly64x2_t __p0) {
37222	bfloat16x8_t __ret;
37223	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37224	return __ret;
37225	}
37226	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_p16(poly16x8_t __p0) {
37227	bfloat16x8_t __ret;
37228	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37229	return __ret;
37230	}
37231	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_u8(uint8x16_t __p0) {
37232	bfloat16x8_t __ret;
37233	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37234	return __ret;
37235	}
37236	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_u32(uint32x4_t __p0) {
37237	bfloat16x8_t __ret;
37238	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37239	return __ret;
37240	}
37241	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_u64(uint64x2_t __p0) {
37242	bfloat16x8_t __ret;
37243	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37244	return __ret;
37245	}
37246	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_u16(uint16x8_t __p0) {
37247	bfloat16x8_t __ret;
37248	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37249	return __ret;
37250	}
37251	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_s8(int8x16_t __p0) {
37252	bfloat16x8_t __ret;
37253	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37254	return __ret;
37255	}
37256	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_f32(float32x4_t __p0) {
37257	bfloat16x8_t __ret;
37258	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37259	return __ret;
37260	}
37261	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_f16(float16x8_t __p0) {
37262	bfloat16x8_t __ret;
37263	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37264	return __ret;
37265	}
37266	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_s32(int32x4_t __p0) {
37267	bfloat16x8_t __ret;
37268	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37269	return __ret;
37270	}
37271	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_s64(int64x2_t __p0) {
37272	bfloat16x8_t __ret;
37273	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37274	return __ret;
37275	}
37276	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_s16(int16x8_t __p0) {
37277	bfloat16x8_t __ret;
37278	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
37279	return __ret;
37280	}
37281	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_p8(poly8x8_t __p0) {
37282	bfloat16x4_t __ret;
37283	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37284	return __ret;
37285	}
37286	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_p64(poly64x1_t __p0) {
37287	bfloat16x4_t __ret;
37288	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37289	return __ret;
37290	}
37291	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_p16(poly16x4_t __p0) {
37292	bfloat16x4_t __ret;
37293	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37294	return __ret;
37295	}
37296	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_u8(uint8x8_t __p0) {
37297	bfloat16x4_t __ret;
37298	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37299	return __ret;
37300	}
37301	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_u32(uint32x2_t __p0) {
37302	bfloat16x4_t __ret;
37303	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37304	return __ret;
37305	}
37306	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_u64(uint64x1_t __p0) {
37307	bfloat16x4_t __ret;
37308	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37309	return __ret;
37310	}
37311	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_u16(uint16x4_t __p0) {
37312	bfloat16x4_t __ret;
37313	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37314	return __ret;
37315	}
37316	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_s8(int8x8_t __p0) {
37317	bfloat16x4_t __ret;
37318	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37319	return __ret;
37320	}
37321	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_f32(float32x2_t __p0) {
37322	bfloat16x4_t __ret;
37323	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37324	return __ret;
37325	}
37326	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_f16(float16x4_t __p0) {
37327	bfloat16x4_t __ret;
37328	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37329	return __ret;
37330	}
37331	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_s32(int32x2_t __p0) {
37332	bfloat16x4_t __ret;
37333	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37334	return __ret;
37335	}
37336	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_s64(int64x1_t __p0) {
37337	bfloat16x4_t __ret;
37338	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37339	return __ret;
37340	}
37341	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_s16(int16x4_t __p0) {
37342	bfloat16x4_t __ret;
37343	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
37344	return __ret;
37345	}
37346	#ifdef __LITTLE_ENDIAN__	37086	#ifdef __LITTLE_ENDIAN__
37347	#define vqdmulhq_lane_s32(__p0_214, __p1_214, __p2_214) __extension__ ({ \	37087	#define vqdmulhq_lane_s32(__p0_214, __p1_214, __p2_214) __extension__ ({ \
37348	int32x4_t __ret_214; \	37088	int32x4_t __ret_214; \
...	@@ -38831,6 +38571,266 @@ __ai __attribute__((target("neon"))) int16x4_t vreinterpret_s16_s64(int64x1_t __	...	@@ -38831,6 +38571,266 @@ __ai __attribute__((target("neon"))) int16x4_t vreinterpret_s16_s64(int64x1_t __
38831	__ret = __builtin_bit_cast(int16x4_t, __p0);	38571	__ret = __builtin_bit_cast(int16x4_t, __p0);
38832	return __ret;	38572	return __ret;
38833	}	38573	}
		38574	__ai __attribute__((target("neon"))) poly8x8_t vreinterpret_p8_bf16(bfloat16x4_t __p0) {
		38575	poly8x8_t __ret;
		38576	__ret = __builtin_bit_cast(poly8x8_t, __p0);
		38577	return __ret;
		38578	}
		38579	__ai __attribute__((target("neon"))) poly64x1_t vreinterpret_p64_bf16(bfloat16x4_t __p0) {
		38580	poly64x1_t __ret;
		38581	__ret = __builtin_bit_cast(poly64x1_t, __p0);
		38582	return __ret;
		38583	}
		38584	__ai __attribute__((target("neon"))) poly16x4_t vreinterpret_p16_bf16(bfloat16x4_t __p0) {
		38585	poly16x4_t __ret;
		38586	__ret = __builtin_bit_cast(poly16x4_t, __p0);
		38587	return __ret;
		38588	}
		38589	__ai __attribute__((target("neon"))) poly8x16_t vreinterpretq_p8_bf16(bfloat16x8_t __p0) {
		38590	poly8x16_t __ret;
		38591	__ret = __builtin_bit_cast(poly8x16_t, __p0);
		38592	return __ret;
		38593	}
		38594	__ai __attribute__((target("neon"))) poly64x2_t vreinterpretq_p64_bf16(bfloat16x8_t __p0) {
		38595	poly64x2_t __ret;
		38596	__ret = __builtin_bit_cast(poly64x2_t, __p0);
		38597	return __ret;
		38598	}
		38599	__ai __attribute__((target("neon"))) poly16x8_t vreinterpretq_p16_bf16(bfloat16x8_t __p0) {
		38600	poly16x8_t __ret;
		38601	__ret = __builtin_bit_cast(poly16x8_t, __p0);
		38602	return __ret;
		38603	}
		38604	__ai __attribute__((target("neon"))) uint8x16_t vreinterpretq_u8_bf16(bfloat16x8_t __p0) {
		38605	uint8x16_t __ret;
		38606	__ret = __builtin_bit_cast(uint8x16_t, __p0);
		38607	return __ret;
		38608	}
		38609	__ai __attribute__((target("neon"))) uint32x4_t vreinterpretq_u32_bf16(bfloat16x8_t __p0) {
		38610	uint32x4_t __ret;
		38611	__ret = __builtin_bit_cast(uint32x4_t, __p0);
		38612	return __ret;
		38613	}
		38614	__ai __attribute__((target("neon"))) uint64x2_t vreinterpretq_u64_bf16(bfloat16x8_t __p0) {
		38615	uint64x2_t __ret;
		38616	__ret = __builtin_bit_cast(uint64x2_t, __p0);
		38617	return __ret;
		38618	}
		38619	__ai __attribute__((target("neon"))) uint16x8_t vreinterpretq_u16_bf16(bfloat16x8_t __p0) {
		38620	uint16x8_t __ret;
		38621	__ret = __builtin_bit_cast(uint16x8_t, __p0);
		38622	return __ret;
		38623	}
		38624	__ai __attribute__((target("neon"))) int8x16_t vreinterpretq_s8_bf16(bfloat16x8_t __p0) {
		38625	int8x16_t __ret;
		38626	__ret = __builtin_bit_cast(int8x16_t, __p0);
		38627	return __ret;
		38628	}
		38629	__ai __attribute__((target("neon"))) float32x4_t vreinterpretq_f32_bf16(bfloat16x8_t __p0) {
		38630	float32x4_t __ret;
		38631	__ret = __builtin_bit_cast(float32x4_t, __p0);
		38632	return __ret;
		38633	}
		38634	__ai __attribute__((target("neon"))) float16x8_t vreinterpretq_f16_bf16(bfloat16x8_t __p0) {
		38635	float16x8_t __ret;
		38636	__ret = __builtin_bit_cast(float16x8_t, __p0);
		38637	return __ret;
		38638	}
		38639	__ai __attribute__((target("neon"))) int32x4_t vreinterpretq_s32_bf16(bfloat16x8_t __p0) {
		38640	int32x4_t __ret;
		38641	__ret = __builtin_bit_cast(int32x4_t, __p0);
		38642	return __ret;
		38643	}
		38644	__ai __attribute__((target("neon"))) int64x2_t vreinterpretq_s64_bf16(bfloat16x8_t __p0) {
		38645	int64x2_t __ret;
		38646	__ret = __builtin_bit_cast(int64x2_t, __p0);
		38647	return __ret;
		38648	}
		38649	__ai __attribute__((target("neon"))) int16x8_t vreinterpretq_s16_bf16(bfloat16x8_t __p0) {
		38650	int16x8_t __ret;
		38651	__ret = __builtin_bit_cast(int16x8_t, __p0);
		38652	return __ret;
		38653	}
		38654	__ai __attribute__((target("neon"))) uint8x8_t vreinterpret_u8_bf16(bfloat16x4_t __p0) {
		38655	uint8x8_t __ret;
		38656	__ret = __builtin_bit_cast(uint8x8_t, __p0);
		38657	return __ret;
		38658	}
		38659	__ai __attribute__((target("neon"))) uint32x2_t vreinterpret_u32_bf16(bfloat16x4_t __p0) {
		38660	uint32x2_t __ret;
		38661	__ret = __builtin_bit_cast(uint32x2_t, __p0);
		38662	return __ret;
		38663	}
		38664	__ai __attribute__((target("neon"))) uint64x1_t vreinterpret_u64_bf16(bfloat16x4_t __p0) {
		38665	uint64x1_t __ret;
		38666	__ret = __builtin_bit_cast(uint64x1_t, __p0);
		38667	return __ret;
		38668	}
		38669	__ai __attribute__((target("neon"))) uint16x4_t vreinterpret_u16_bf16(bfloat16x4_t __p0) {
		38670	uint16x4_t __ret;
		38671	__ret = __builtin_bit_cast(uint16x4_t, __p0);
		38672	return __ret;
		38673	}
		38674	__ai __attribute__((target("neon"))) int8x8_t vreinterpret_s8_bf16(bfloat16x4_t __p0) {
		38675	int8x8_t __ret;
		38676	__ret = __builtin_bit_cast(int8x8_t, __p0);
		38677	return __ret;
		38678	}
		38679	__ai __attribute__((target("neon"))) float32x2_t vreinterpret_f32_bf16(bfloat16x4_t __p0) {
		38680	float32x2_t __ret;
		38681	__ret = __builtin_bit_cast(float32x2_t, __p0);
		38682	return __ret;
		38683	}
		38684	__ai __attribute__((target("neon"))) float16x4_t vreinterpret_f16_bf16(bfloat16x4_t __p0) {
		38685	float16x4_t __ret;
		38686	__ret = __builtin_bit_cast(float16x4_t, __p0);
		38687	return __ret;
		38688	}
		38689	__ai __attribute__((target("neon"))) int32x2_t vreinterpret_s32_bf16(bfloat16x4_t __p0) {
		38690	int32x2_t __ret;
		38691	__ret = __builtin_bit_cast(int32x2_t, __p0);
		38692	return __ret;
		38693	}
		38694	__ai __attribute__((target("neon"))) int64x1_t vreinterpret_s64_bf16(bfloat16x4_t __p0) {
		38695	int64x1_t __ret;
		38696	__ret = __builtin_bit_cast(int64x1_t, __p0);
		38697	return __ret;
		38698	}
		38699	__ai __attribute__((target("neon"))) int16x4_t vreinterpret_s16_bf16(bfloat16x4_t __p0) {
		38700	int16x4_t __ret;
		38701	__ret = __builtin_bit_cast(int16x4_t, __p0);
		38702	return __ret;
		38703	}
		38704	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_p8(poly8x16_t __p0) {
		38705	bfloat16x8_t __ret;
		38706	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38707	return __ret;
		38708	}
		38709	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_p64(poly64x2_t __p0) {
		38710	bfloat16x8_t __ret;
		38711	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38712	return __ret;
		38713	}
		38714	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_p16(poly16x8_t __p0) {
		38715	bfloat16x8_t __ret;
		38716	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38717	return __ret;
		38718	}
		38719	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_u8(uint8x16_t __p0) {
		38720	bfloat16x8_t __ret;
		38721	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38722	return __ret;
		38723	}
		38724	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_u32(uint32x4_t __p0) {
		38725	bfloat16x8_t __ret;
		38726	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38727	return __ret;
		38728	}
		38729	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_u64(uint64x2_t __p0) {
		38730	bfloat16x8_t __ret;
		38731	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38732	return __ret;
		38733	}
		38734	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_u16(uint16x8_t __p0) {
		38735	bfloat16x8_t __ret;
		38736	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38737	return __ret;
		38738	}
		38739	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_s8(int8x16_t __p0) {
		38740	bfloat16x8_t __ret;
		38741	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38742	return __ret;
		38743	}
		38744	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_f32(float32x4_t __p0) {
		38745	bfloat16x8_t __ret;
		38746	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38747	return __ret;
		38748	}
		38749	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_f16(float16x8_t __p0) {
		38750	bfloat16x8_t __ret;
		38751	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38752	return __ret;
		38753	}
		38754	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_s32(int32x4_t __p0) {
		38755	bfloat16x8_t __ret;
		38756	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38757	return __ret;
		38758	}
		38759	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_s64(int64x2_t __p0) {
		38760	bfloat16x8_t __ret;
		38761	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38762	return __ret;
		38763	}
		38764	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_s16(int16x8_t __p0) {
		38765	bfloat16x8_t __ret;
		38766	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		38767	return __ret;
		38768	}
		38769	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_p8(poly8x8_t __p0) {
		38770	bfloat16x4_t __ret;
		38771	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38772	return __ret;
		38773	}
		38774	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_p64(poly64x1_t __p0) {
		38775	bfloat16x4_t __ret;
		38776	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38777	return __ret;
		38778	}
		38779	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_p16(poly16x4_t __p0) {
		38780	bfloat16x4_t __ret;
		38781	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38782	return __ret;
		38783	}
		38784	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_u8(uint8x8_t __p0) {
		38785	bfloat16x4_t __ret;
		38786	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38787	return __ret;
		38788	}
		38789	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_u32(uint32x2_t __p0) {
		38790	bfloat16x4_t __ret;
		38791	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38792	return __ret;
		38793	}
		38794	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_u64(uint64x1_t __p0) {
		38795	bfloat16x4_t __ret;
		38796	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38797	return __ret;
		38798	}
		38799	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_u16(uint16x4_t __p0) {
		38800	bfloat16x4_t __ret;
		38801	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38802	return __ret;
		38803	}
		38804	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_s8(int8x8_t __p0) {
		38805	bfloat16x4_t __ret;
		38806	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38807	return __ret;
		38808	}
		38809	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_f32(float32x2_t __p0) {
		38810	bfloat16x4_t __ret;
		38811	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38812	return __ret;
		38813	}
		38814	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_f16(float16x4_t __p0) {
		38815	bfloat16x4_t __ret;
		38816	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38817	return __ret;
		38818	}
		38819	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_s32(int32x2_t __p0) {
		38820	bfloat16x4_t __ret;
		38821	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38822	return __ret;
		38823	}
		38824	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_s64(int64x1_t __p0) {
		38825	bfloat16x4_t __ret;
		38826	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38827	return __ret;
		38828	}
		38829	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_s16(int16x4_t __p0) {
		38830	bfloat16x4_t __ret;
		38831	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		38832	return __ret;
		38833	}
38834	#endif	38834	#endif
38835	#if (__ARM_FP & 2)	38835	#if (__ARM_FP & 2)
38836	#ifdef __LITTLE_ENDIAN__	38836	#ifdef __LITTLE_ENDIAN__
...	@@ -41141,6 +41141,174 @@ __ai __attribute__((target("neon"))) float32x2_t vfms_f32(float32x2_t __p0, floa	...	@@ -41141,6 +41141,174 @@ __ai __attribute__((target("neon"))) float32x2_t vfms_f32(float32x2_t __p0, floa
41141		41141
41142	#endif	41142	#endif
41143	#if defined(__aarch64__)	41143	#if defined(__aarch64__)
		41144	#ifdef __LITTLE_ENDIAN__
		41145	__ai __attribute__((target("f16f32dot,neon"))) float32x4_t vdotq_f32_f16(float32x4_t __p0, float16x8_t __p1, float16x8_t __p2) {
		41146	float32x4_t __ret;
		41147	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vdotq_f32_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
		41148	return __ret;
		41149	}
		41150	#else
		41151	__ai __attribute__((target("f16f32dot,neon"))) float32x4_t vdotq_f32_f16(float32x4_t __p0, float16x8_t __p1, float16x8_t __p2) {
		41152	float32x4_t __ret;
		41153	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
		41154	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
		41155	float16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
		41156	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vdotq_f32_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
		41157	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
		41158	return __ret;
		41159	}
		41160	#endif
		41161
		41162	#ifdef __LITTLE_ENDIAN__
		41163	__ai __attribute__((target("f16f32dot,neon"))) float32x2_t vdot_f32_f16(float32x2_t __p0, float16x4_t __p1, float16x4_t __p2) {
		41164	float32x2_t __ret;
		41165	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vdot_f32_f16(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), __builtin_bit_cast(int8x8_t, __p2), 9));
		41166	return __ret;
		41167	}
		41168	#else
		41169	__ai __attribute__((target("f16f32dot,neon"))) float32x2_t vdot_f32_f16(float32x2_t __p0, float16x4_t __p1, float16x4_t __p2) {
		41170	float32x2_t __ret;
		41171	float32x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_32);
		41172	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
		41173	float16x4_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_64_16);
		41174	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vdot_f32_f16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), __builtin_bit_cast(int8x8_t, __rev2), 9));
		41175	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_32);
		41176	return __ret;
		41177	}
		41178	#endif
		41179
		41180	#ifdef __LITTLE_ENDIAN__
		41181	#define vdotq_lane_f32_f16(__p0, __p1, __p2, __p3) __extension__ ({ \
		41182	float32x4_t __ret; \
		41183	float32x4_t __s0 = __p0; \
		41184	float16x8_t __s1 = __p1; \
		41185	float16x4_t __s2 = __p2; \
		41186	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vdotq_lane_f32_f16(__builtin_bit_cast(int8x16_t, __s0), __builtin_bit_cast(int8x16_t, __s1), __builtin_bit_cast(int8x8_t, __s2), __p3, 41)); \
		41187	__ret; \
		41188	})
		41189	#else
		41190	#define vdotq_lane_f32_f16(__p0, __p1, __p2, __p3) __extension__ ({ \
		41191	float32x4_t __ret; \
		41192	float32x4_t __s0 = __p0; \
		41193	float16x8_t __s1 = __p1; \
		41194	float16x4_t __s2 = __p2; \
		41195	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_32); \
		41196	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
		41197	float16x4_t __rev2; __rev2 = __builtin_shufflevector(__s2, __s2, __lane_reverse_64_16); \
		41198	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vdotq_lane_f32_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x8_t, __rev2), __p3, 41)); \
		41199	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32); \
		41200	__ret; \
		41201	})
		41202	#endif
		41203
		41204	#ifdef __LITTLE_ENDIAN__
		41205	#define vdot_lane_f32_f16(__p0, __p1, __p2, __p3) __extension__ ({ \
		41206	float32x2_t __ret; \
		41207	float32x2_t __s0 = __p0; \
		41208	float16x4_t __s1 = __p1; \
		41209	float16x4_t __s2 = __p2; \
		41210	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vdot_lane_f32_f16(__builtin_bit_cast(int8x8_t, __s0), __builtin_bit_cast(int8x8_t, __s1), __builtin_bit_cast(int8x8_t, __s2), __p3, 9)); \
		41211	__ret; \
		41212	})
		41213	#else
		41214	#define vdot_lane_f32_f16(__p0, __p1, __p2, __p3) __extension__ ({ \
		41215	float32x2_t __ret; \
		41216	float32x2_t __s0 = __p0; \
		41217	float16x4_t __s1 = __p1; \
		41218	float16x4_t __s2 = __p2; \
		41219	float32x2_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_32); \
		41220	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
		41221	float16x4_t __rev2; __rev2 = __builtin_shufflevector(__s2, __s2, __lane_reverse_64_16); \
		41222	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vdot_lane_f32_f16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), __builtin_bit_cast(int8x8_t, __rev2), __p3, 9)); \
		41223	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_32); \
		41224	__ret; \
		41225	})
		41226	#endif
		41227
		41228	#ifdef __LITTLE_ENDIAN__
		41229	#define vdotq_laneq_f32_f16(__p0, __p1, __p2, __p3) __extension__ ({ \
		41230	float32x4_t __ret; \
		41231	float32x4_t __s0 = __p0; \
		41232	float16x8_t __s1 = __p1; \
		41233	float16x8_t __s2 = __p2; \
		41234	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vdotq_laneq_f32_f16(__builtin_bit_cast(int8x16_t, __s0), __builtin_bit_cast(int8x16_t, __s1), __builtin_bit_cast(int8x16_t, __s2), __p3, 41)); \
		41235	__ret; \
		41236	})
		41237	#else
		41238	#define vdotq_laneq_f32_f16(__p0, __p1, __p2, __p3) __extension__ ({ \
		41239	float32x4_t __ret; \
		41240	float32x4_t __s0 = __p0; \
		41241	float16x8_t __s1 = __p1; \
		41242	float16x8_t __s2 = __p2; \
		41243	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_32); \
		41244	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
		41245	float16x8_t __rev2; __rev2 = __builtin_shufflevector(__s2, __s2, __lane_reverse_128_16); \
		41246	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vdotq_laneq_f32_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), __p3, 41)); \
		41247	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32); \
		41248	__ret; \
		41249	})
		41250	#endif
		41251
		41252	#ifdef __LITTLE_ENDIAN__
		41253	#define vdot_laneq_f32_f16(__p0, __p1, __p2, __p3) __extension__ ({ \
		41254	float32x2_t __ret; \
		41255	float32x2_t __s0 = __p0; \
		41256	float16x4_t __s1 = __p1; \
		41257	float16x8_t __s2 = __p2; \
		41258	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vdot_laneq_f32_f16(__builtin_bit_cast(int8x8_t, __s0), __builtin_bit_cast(int8x8_t, __s1), __builtin_bit_cast(int8x16_t, __s2), __p3, 9)); \
		41259	__ret; \
		41260	})
		41261	#else
		41262	#define vdot_laneq_f32_f16(__p0, __p1, __p2, __p3) __extension__ ({ \
		41263	float32x2_t __ret; \
		41264	float32x2_t __s0 = __p0; \
		41265	float16x4_t __s1 = __p1; \
		41266	float16x8_t __s2 = __p2; \
		41267	float32x2_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_32); \
		41268	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
		41269	float16x8_t __rev2; __rev2 = __builtin_shufflevector(__s2, __s2, __lane_reverse_128_16); \
		41270	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vdot_laneq_f32_f16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), __p3, 9)); \
		41271	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_32); \
		41272	__ret; \
		41273	})
		41274	#endif
		41275
		41276	#ifdef __LITTLE_ENDIAN__
		41277	__ai __attribute__((target("f16f32mm,neon"))) float32x4_t vmmlaq_f32_f16(float32x4_t __p0, float16x8_t __p1, float16x8_t __p2) {
		41278	float32x4_t __ret;
		41279	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vmmlaq_f32_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 41));
		41280	return __ret;
		41281	}
		41282	#else
		41283	__ai __attribute__((target("f16f32mm,neon"))) float32x4_t vmmlaq_f32_f16(float32x4_t __p0, float16x8_t __p1, float16x8_t __p2) {
		41284	float32x4_t __ret;
		41285	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
		41286	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
		41287	float16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
		41288	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vmmlaq_f32_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 41));
		41289	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
		41290	return __ret;
		41291	}
		41292	#endif
		41293
		41294	#ifdef __LITTLE_ENDIAN__
		41295	__ai __attribute__((target("f16mm,neon"))) float16x8_t vmmlaq_f16(float16x8_t __p0, float16x8_t __p1, float16x8_t __p2) {
		41296	float16x8_t __ret;
		41297	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vmmlaq_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), __builtin_bit_cast(int8x16_t, __p2), 40));
		41298	return __ret;
		41299	}
		41300	#else
		41301	__ai __attribute__((target("f16mm,neon"))) float16x8_t vmmlaq_f16(float16x8_t __p0, float16x8_t __p1, float16x8_t __p2) {
		41302	float16x8_t __ret;
		41303	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
		41304	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
		41305	float16x8_t __rev2; __rev2 = __builtin_shufflevector(__p2, __p2, __lane_reverse_128_16);
		41306	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vmmlaq_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __builtin_bit_cast(int8x16_t, __rev2), 40));
		41307	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
		41308	return __ret;
		41309	}
		41310	#endif
		41311
41144	#ifdef __LITTLE_ENDIAN__	41312	#ifdef __LITTLE_ENDIAN__
41145	__ai __attribute__((target("f8f16mm,neon"))) float16x8_t vmmlaq_f16_mf8_fpm(float16x8_t __p0, mfloat8x16_t __p1, mfloat8x16_t __p2, fpm_t __p3) {	41313	__ai __attribute__((target("f8f16mm,neon"))) float16x8_t vmmlaq_f16_mf8_fpm(float16x8_t __p0, mfloat8x16_t __p1, mfloat8x16_t __p2, fpm_t __p3) {
41146	float16x8_t __ret;	41314	float16x8_t __ret;
...	@@ -42391,6 +42559,48 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa	...	@@ -42391,6 +42559,48 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa
42391	})	42559	})
42392	#endif	42560	#endif
42393		42561
		42562	#ifdef __LITTLE_ENDIAN__
		42563	#define vluti2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		42564	bfloat16x8_t __ret; \
		42565	bfloat16x8_t __s0 = __p0; \
		42566	uint8x8_t __s1 = __p1; \
		42567	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2q_lane_bf16(__builtin_bit_cast(int8x16_t, __s0), __builtin_bit_cast(int8x8_t, __s1), __p2, 43)); \
		42568	__ret; \
		42569	})
		42570	#else
		42571	#define vluti2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		42572	bfloat16x8_t __ret; \
		42573	bfloat16x8_t __s0 = __p0; \
		42574	uint8x8_t __s1 = __p1; \
		42575	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		42576	uint8x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_8); \
		42577	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2q_lane_bf16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), __p2, 43)); \
		42578	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		42579	__ret; \
		42580	})
		42581	#endif
		42582
		42583	#ifdef __LITTLE_ENDIAN__
		42584	#define vluti2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		42585	bfloat16x8_t __ret; \
		42586	bfloat16x4_t __s0 = __p0; \
		42587	uint8x8_t __s1 = __p1; \
		42588	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2_lane_bf16(__builtin_bit_cast(int8x8_t, __s0), __builtin_bit_cast(int8x8_t, __s1), __p2, 43)); \
		42589	__ret; \
		42590	})
		42591	#else
		42592	#define vluti2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
		42593	bfloat16x8_t __ret; \
		42594	bfloat16x4_t __s0 = __p0; \
		42595	uint8x8_t __s1 = __p1; \
		42596	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		42597	uint8x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_8); \
		42598	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2_lane_bf16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), __p2, 43)); \
		42599	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		42600	__ret; \
		42601	})
		42602	#endif
		42603
42394	#ifdef __LITTLE_ENDIAN__	42604	#ifdef __LITTLE_ENDIAN__
42395	#define vluti2_lane_p16(__p0, __p1, __p2) __extension__ ({ \	42605	#define vluti2_lane_p16(__p0, __p1, __p2) __extension__ ({ \
42396	poly16x8_t __ret; \	42606	poly16x8_t __ret; \
...	@@ -42559,6 +42769,48 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa	...	@@ -42559,6 +42769,48 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa
42559	})	42769	})
42560	#endif	42770	#endif
42561		42771
		42772	#ifdef __LITTLE_ENDIAN__
		42773	#define vluti2q_laneq_bf16(__p0, __p1, __p2) __extension__ ({ \
		42774	bfloat16x8_t __ret; \
		42775	bfloat16x8_t __s0 = __p0; \
		42776	uint8x16_t __s1 = __p1; \
		42777	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2q_laneq_bf16(__builtin_bit_cast(int8x16_t, __s0), __builtin_bit_cast(int8x16_t, __s1), __p2, 43)); \
		42778	__ret; \
		42779	})
		42780	#else
		42781	#define vluti2q_laneq_bf16(__p0, __p1, __p2) __extension__ ({ \
		42782	bfloat16x8_t __ret; \
		42783	bfloat16x8_t __s0 = __p0; \
		42784	uint8x16_t __s1 = __p1; \
		42785	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		42786	uint8x16_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_8); \
		42787	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2q_laneq_bf16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __p2, 43)); \
		42788	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		42789	__ret; \
		42790	})
		42791	#endif
		42792
		42793	#ifdef __LITTLE_ENDIAN__
		42794	#define vluti2_laneq_bf16(__p0, __p1, __p2) __extension__ ({ \
		42795	bfloat16x8_t __ret; \
		42796	bfloat16x4_t __s0 = __p0; \
		42797	uint8x16_t __s1 = __p1; \
		42798	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2_laneq_bf16(__builtin_bit_cast(int8x8_t, __s0), __builtin_bit_cast(int8x16_t, __s1), __p2, 43)); \
		42799	__ret; \
		42800	})
		42801	#else
		42802	#define vluti2_laneq_bf16(__p0, __p1, __p2) __extension__ ({ \
		42803	bfloat16x8_t __ret; \
		42804	bfloat16x4_t __s0 = __p0; \
		42805	uint8x16_t __s1 = __p1; \
		42806	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		42807	uint8x16_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_8); \
		42808	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2_laneq_bf16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __p2, 43)); \
		42809	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		42810	__ret; \
		42811	})
		42812	#endif
		42813
42562	#ifdef __LITTLE_ENDIAN__	42814	#ifdef __LITTLE_ENDIAN__
42563	#define vluti2_laneq_p8(__p0, __p1, __p2) __extension__ ({ \	42815	#define vluti2_laneq_p8(__p0, __p1, __p2) __extension__ ({ \
42564	poly8x16_t __ret; \	42816	poly8x16_t __ret; \
...	@@ -42979,6 +43231,29 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa	...	@@ -42979,6 +43231,29 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa
42979	})	43231	})
42980	#endif	43232	#endif
42981		43233
		43234	#ifdef __LITTLE_ENDIAN__
		43235	#define vluti4q_lane_bf16_x2(__p0, __p1, __p2) __extension__ ({ \
		43236	bfloat16x8_t __ret; \
		43237	bfloat16x8x2_t __s0 = __p0; \
		43238	uint8x8_t __s1 = __p1; \
		43239	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti4q_lane_bf16_x2(__builtin_bit_cast(int8x16_t, __s0.val[0]), __builtin_bit_cast(int8x16_t, __s0.val[1]), __builtin_bit_cast(int8x8_t, __s1), __p2, 43)); \
		43240	__ret; \
		43241	})
		43242	#else
		43243	#define vluti4q_lane_bf16_x2(__p0, __p1, __p2) __extension__ ({ \
		43244	bfloat16x8_t __ret; \
		43245	bfloat16x8x2_t __s0 = __p0; \
		43246	uint8x8_t __s1 = __p1; \
		43247	bfloat16x8x2_t __rev0; \
		43248	__rev0.val[0] = __builtin_shufflevector(__s0.val[0], __s0.val[0], __lane_reverse_128_16); \
		43249	__rev0.val[1] = __builtin_shufflevector(__s0.val[1], __s0.val[1], __lane_reverse_128_16); \
		43250	uint8x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_8); \
		43251	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti4q_lane_bf16_x2(__builtin_bit_cast(int8x16_t, __rev0.val[0]), __builtin_bit_cast(int8x16_t, __rev0.val[1]), __builtin_bit_cast(int8x8_t, __rev1), __p2, 43)); \
		43252	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		43253	__ret; \
		43254	})
		43255	#endif
		43256
42982	#ifdef __LITTLE_ENDIAN__	43257	#ifdef __LITTLE_ENDIAN__
42983	#define vluti4q_lane_p16_x2(__p0, __p1, __p2) __extension__ ({ \	43258	#define vluti4q_lane_p16_x2(__p0, __p1, __p2) __extension__ ({ \
42984	poly16x8_t __ret; \	43259	poly16x8_t __ret; \
...	@@ -43155,6 +43430,29 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa	...	@@ -43155,6 +43430,29 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa
43155	})	43430	})
43156	#endif	43431	#endif
43157		43432
		43433	#ifdef __LITTLE_ENDIAN__
		43434	#define vluti4q_laneq_bf16_x2(__p0, __p1, __p2) __extension__ ({ \
		43435	bfloat16x8_t __ret; \
		43436	bfloat16x8x2_t __s0 = __p0; \
		43437	uint8x16_t __s1 = __p1; \
		43438	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti4q_laneq_bf16_x2(__builtin_bit_cast(int8x16_t, __s0.val[0]), __builtin_bit_cast(int8x16_t, __s0.val[1]), __builtin_bit_cast(int8x16_t, __s1), __p2, 43)); \
		43439	__ret; \
		43440	})
		43441	#else
		43442	#define vluti4q_laneq_bf16_x2(__p0, __p1, __p2) __extension__ ({ \
		43443	bfloat16x8_t __ret; \
		43444	bfloat16x8x2_t __s0 = __p0; \
		43445	uint8x16_t __s1 = __p1; \
		43446	bfloat16x8x2_t __rev0; \
		43447	__rev0.val[0] = __builtin_shufflevector(__s0.val[0], __s0.val[0], __lane_reverse_128_16); \
		43448	__rev0.val[1] = __builtin_shufflevector(__s0.val[1], __s0.val[1], __lane_reverse_128_16); \
		43449	uint8x16_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_8); \
		43450	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti4q_laneq_bf16_x2(__builtin_bit_cast(int8x16_t, __rev0.val[0]), __builtin_bit_cast(int8x16_t, __rev0.val[1]), __builtin_bit_cast(int8x16_t, __rev1), __p2, 43)); \
		43451	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		43452	__ret; \
		43453	})
		43454	#endif
		43455
43158	#ifdef __LITTLE_ENDIAN__	43456	#ifdef __LITTLE_ENDIAN__
43159	#define vluti4q_laneq_p16_x2(__p0, __p1, __p2) __extension__ ({ \	43457	#define vluti4q_laneq_p16_x2(__p0, __p1, __p2) __extension__ ({ \
43160	poly16x8_t __ret; \	43458	poly16x8_t __ret; \
...	@@ -43247,136 +43545,6 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa	...	@@ -43247,136 +43545,6 @@ __ai __attribute__((target("fp8fma,neon"))) float16x8_t vmlaltq_f16_mf8_fpm(floa
43247	})	43545	})
43248	#endif	43546	#endif
43249		43547
43250	#ifdef __LITTLE_ENDIAN__
43251	#define vluti2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
43252	bfloat16x8_t __ret; \
43253	bfloat16x8_t __s0 = __p0; \
43254	uint8x8_t __s1 = __p1; \
43255	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2q_lane_bf16(__builtin_bit_cast(int8x16_t, __s0), __builtin_bit_cast(int8x8_t, __s1), __p2, 43)); \
43256	__ret; \
43257	})
43258	#else
43259	#define vluti2q_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
43260	bfloat16x8_t __ret; \
43261	bfloat16x8_t __s0 = __p0; \
43262	uint8x8_t __s1 = __p1; \
43263	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
43264	uint8x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_8); \
43265	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2q_lane_bf16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), __p2, 43)); \
43266	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
43267	__ret; \
43268	})
43269	#endif
43270
43271	#ifdef __LITTLE_ENDIAN__
43272	#define vluti2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
43273	bfloat16x8_t __ret; \
43274	bfloat16x4_t __s0 = __p0; \
43275	uint8x8_t __s1 = __p1; \
43276	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2_lane_bf16(__builtin_bit_cast(int8x8_t, __s0), __builtin_bit_cast(int8x8_t, __s1), __p2, 43)); \
43277	__ret; \
43278	})
43279	#else
43280	#define vluti2_lane_bf16(__p0, __p1, __p2) __extension__ ({ \
43281	bfloat16x8_t __ret; \
43282	bfloat16x4_t __s0 = __p0; \
43283	uint8x8_t __s1 = __p1; \
43284	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
43285	uint8x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_8); \
43286	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2_lane_bf16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), __p2, 43)); \
43287	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
43288	__ret; \
43289	})
43290	#endif
43291
43292	#ifdef __LITTLE_ENDIAN__
43293	#define vluti2q_laneq_bf16(__p0, __p1, __p2) __extension__ ({ \
43294	bfloat16x8_t __ret; \
43295	bfloat16x8_t __s0 = __p0; \
43296	uint8x16_t __s1 = __p1; \
43297	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2q_laneq_bf16(__builtin_bit_cast(int8x16_t, __s0), __builtin_bit_cast(int8x16_t, __s1), __p2, 43)); \
43298	__ret; \
43299	})
43300	#else
43301	#define vluti2q_laneq_bf16(__p0, __p1, __p2) __extension__ ({ \
43302	bfloat16x8_t __ret; \
43303	bfloat16x8_t __s0 = __p0; \
43304	uint8x16_t __s1 = __p1; \
43305	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
43306	uint8x16_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_8); \
43307	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2q_laneq_bf16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __p2, 43)); \
43308	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
43309	__ret; \
43310	})
43311	#endif
43312
43313	#ifdef __LITTLE_ENDIAN__
43314	#define vluti2_laneq_bf16(__p0, __p1, __p2) __extension__ ({ \
43315	bfloat16x8_t __ret; \
43316	bfloat16x4_t __s0 = __p0; \
43317	uint8x16_t __s1 = __p1; \
43318	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2_laneq_bf16(__builtin_bit_cast(int8x8_t, __s0), __builtin_bit_cast(int8x16_t, __s1), __p2, 43)); \
43319	__ret; \
43320	})
43321	#else
43322	#define vluti2_laneq_bf16(__p0, __p1, __p2) __extension__ ({ \
43323	bfloat16x8_t __ret; \
43324	bfloat16x4_t __s0 = __p0; \
43325	uint8x16_t __s1 = __p1; \
43326	bfloat16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
43327	uint8x16_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_8); \
43328	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti2_laneq_bf16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), __p2, 43)); \
43329	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
43330	__ret; \
43331	})
43332	#endif
43333
43334	#ifdef __LITTLE_ENDIAN__
43335	#define vluti4q_lane_bf16_x2(__p0, __p1, __p2) __extension__ ({ \
43336	bfloat16x8_t __ret; \
43337	bfloat16x8x2_t __s0 = __p0; \
43338	uint8x8_t __s1 = __p1; \
43339	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti4q_lane_bf16_x2(__builtin_bit_cast(int8x16_t, __s0.val[0]), __builtin_bit_cast(int8x16_t, __s0.val[1]), __builtin_bit_cast(int8x8_t, __s1), __p2, 43)); \
43340	__ret; \
43341	})
43342	#else
43343	#define vluti4q_lane_bf16_x2(__p0, __p1, __p2) __extension__ ({ \
43344	bfloat16x8_t __ret; \
43345	bfloat16x8x2_t __s0 = __p0; \
43346	uint8x8_t __s1 = __p1; \
43347	bfloat16x8x2_t __rev0; \
43348	__rev0.val[0] = __builtin_shufflevector(__s0.val[0], __s0.val[0], __lane_reverse_128_16); \
43349	__rev0.val[1] = __builtin_shufflevector(__s0.val[1], __s0.val[1], __lane_reverse_128_16); \
43350	uint8x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_8); \
43351	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti4q_lane_bf16_x2(__builtin_bit_cast(int8x16_t, __rev0.val[0]), __builtin_bit_cast(int8x16_t, __rev0.val[1]), __builtin_bit_cast(int8x8_t, __rev1), __p2, 43)); \
43352	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
43353	__ret; \
43354	})
43355	#endif
43356
43357	#ifdef __LITTLE_ENDIAN__
43358	#define vluti4q_laneq_bf16_x2(__p0, __p1, __p2) __extension__ ({ \
43359	bfloat16x8_t __ret; \
43360	bfloat16x8x2_t __s0 = __p0; \
43361	uint8x16_t __s1 = __p1; \
43362	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti4q_laneq_bf16_x2(__builtin_bit_cast(int8x16_t, __s0.val[0]), __builtin_bit_cast(int8x16_t, __s0.val[1]), __builtin_bit_cast(int8x16_t, __s1), __p2, 43)); \
43363	__ret; \
43364	})
43365	#else
43366	#define vluti4q_laneq_bf16_x2(__p0, __p1, __p2) __extension__ ({ \
43367	bfloat16x8_t __ret; \
43368	bfloat16x8x2_t __s0 = __p0; \
43369	uint8x16_t __s1 = __p1; \
43370	bfloat16x8x2_t __rev0; \
43371	__rev0.val[0] = __builtin_shufflevector(__s0.val[0], __s0.val[0], __lane_reverse_128_16); \
43372	__rev0.val[1] = __builtin_shufflevector(__s0.val[1], __s0.val[1], __lane_reverse_128_16); \
43373	uint8x16_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_8); \
43374	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vluti4q_laneq_bf16_x2(__builtin_bit_cast(int8x16_t, __rev0.val[0]), __builtin_bit_cast(int8x16_t, __rev0.val[1]), __builtin_bit_cast(int8x16_t, __rev1), __p2, 43)); \
43375	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
43376	__ret; \
43377	})
43378	#endif
43379
43380	#ifdef __LITTLE_ENDIAN__	43548	#ifdef __LITTLE_ENDIAN__
43381	#define splatq_lane_mf8(__p0, __p1) __extension__ ({ \	43549	#define splatq_lane_mf8(__p0, __p1) __extension__ ({ \
43382	mfloat8x16_t __ret; \	43550	mfloat8x16_t __ret; \
...	@@ -44171,698 +44339,324 @@ __ai __attribute__((target("neon"))) mfloat8x8x2_t vzip_mf8(mfloat8x8_t __p0, mf	...	@@ -44171,698 +44339,324 @@ __ai __attribute__((target("neon"))) mfloat8x8x2_t vzip_mf8(mfloat8x8_t __p0, mf
44171	#endif	44339	#endif
44172		44340
44173	#ifdef __LITTLE_ENDIAN__	44341	#ifdef __LITTLE_ENDIAN__
44174	__ai __attribute__((target("neon,faminmax"))) float64x2_t vamaxq_f64(float64x2_t __p0, float64x2_t __p1) {	44342	__ai __attribute__((target("neon,faminmax"))) float64x2_t vamaxq_f64(float64x2_t __p0, float64x2_t __p1) {
44175	float64x2_t __ret;	44343	float64x2_t __ret;
44176	__ret = __builtin_bit_cast(float64x2_t, __builtin_neon_vamaxq_f64(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 42));	44344	__ret = __builtin_bit_cast(float64x2_t, __builtin_neon_vamaxq_f64(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 42));
44177	return __ret;
44178	}
44179	#else
44180	__ai __attribute__((target("neon,faminmax"))) float64x2_t vamaxq_f64(float64x2_t __p0, float64x2_t __p1) {
44181	float64x2_t __ret;
44182	float64x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_64);
44183	float64x2_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_64);
44184	__ret = __builtin_bit_cast(float64x2_t, __builtin_neon_vamaxq_f64(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 42));
44185	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_64);
44186	return __ret;
44187	}
44188	#endif
44189
44190	#ifdef __LITTLE_ENDIAN__
44191	__ai __attribute__((target("neon,faminmax"))) float32x4_t vamaxq_f32(float32x4_t __p0, float32x4_t __p1) {
44192	float32x4_t __ret;
44193	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vamaxq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 41));
44194	return __ret;
44195	}
44196	#else
44197	__ai __attribute__((target("neon,faminmax"))) float32x4_t vamaxq_f32(float32x4_t __p0, float32x4_t __p1) {
44198	float32x4_t __ret;
44199	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
44200	float32x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_32);
44201	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vamaxq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 41));
44202	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
44203	return __ret;
44204	}
44205	#endif
44206
44207	#ifdef __LITTLE_ENDIAN__
44208	__ai __attribute__((target("neon,faminmax"))) float16x8_t vamaxq_f16(float16x8_t __p0, float16x8_t __p1) {
44209	float16x8_t __ret;
44210	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vamaxq_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 40));
44211	return __ret;
44212	}
44213	#else
44214	__ai __attribute__((target("neon,faminmax"))) float16x8_t vamaxq_f16(float16x8_t __p0, float16x8_t __p1) {
44215	float16x8_t __ret;
44216	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
44217	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
44218	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vamaxq_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 40));
44219	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
44220	return __ret;
44221	}
44222	#endif
44223
44224	#ifdef __LITTLE_ENDIAN__
44225	__ai __attribute__((target("neon,faminmax"))) float32x2_t vamax_f32(float32x2_t __p0, float32x2_t __p1) {
44226	float32x2_t __ret;
44227	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vamax_f32(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 9));
44228	return __ret;
44229	}
44230	#else
44231	__ai __attribute__((target("neon,faminmax"))) float32x2_t vamax_f32(float32x2_t __p0, float32x2_t __p1) {
44232	float32x2_t __ret;
44233	float32x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_32);
44234	float32x2_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_32);
44235	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vamax_f32(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 9));
44236	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_32);
44237	return __ret;
44238	}
44239	#endif
44240
44241	#ifdef __LITTLE_ENDIAN__
44242	__ai __attribute__((target("neon,faminmax"))) float16x4_t vamax_f16(float16x4_t __p0, float16x4_t __p1) {
44243	float16x4_t __ret;
44244	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vamax_f16(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 8));
44245	return __ret;
44246	}
44247	#else
44248	__ai __attribute__((target("neon,faminmax"))) float16x4_t vamax_f16(float16x4_t __p0, float16x4_t __p1) {
44249	float16x4_t __ret;
44250	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_16);
44251	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
44252	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vamax_f16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 8));
44253	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
44254	return __ret;
44255	}
44256	#endif
44257
44258	#ifdef __LITTLE_ENDIAN__
44259	__ai __attribute__((target("neon,faminmax"))) float64x2_t vaminq_f64(float64x2_t __p0, float64x2_t __p1) {
44260	float64x2_t __ret;
44261	__ret = __builtin_bit_cast(float64x2_t, __builtin_neon_vaminq_f64(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 42));
44262	return __ret;
44263	}
44264	#else
44265	__ai __attribute__((target("neon,faminmax"))) float64x2_t vaminq_f64(float64x2_t __p0, float64x2_t __p1) {
44266	float64x2_t __ret;
44267	float64x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_64);
44268	float64x2_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_64);
44269	__ret = __builtin_bit_cast(float64x2_t, __builtin_neon_vaminq_f64(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 42));
44270	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_64);
44271	return __ret;
44272	}
44273	#endif
44274
44275	#ifdef __LITTLE_ENDIAN__
44276	__ai __attribute__((target("neon,faminmax"))) float32x4_t vaminq_f32(float32x4_t __p0, float32x4_t __p1) {
44277	float32x4_t __ret;
44278	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vaminq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 41));
44279	return __ret;
44280	}
44281	#else
44282	__ai __attribute__((target("neon,faminmax"))) float32x4_t vaminq_f32(float32x4_t __p0, float32x4_t __p1) {
44283	float32x4_t __ret;
44284	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
44285	float32x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_32);
44286	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vaminq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 41));
44287	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
44288	return __ret;
44289	}
44290	#endif
44291
44292	#ifdef __LITTLE_ENDIAN__
44293	__ai __attribute__((target("neon,faminmax"))) float16x8_t vaminq_f16(float16x8_t __p0, float16x8_t __p1) {
44294	float16x8_t __ret;
44295	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vaminq_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 40));
44296	return __ret;
44297	}
44298	#else
44299	__ai __attribute__((target("neon,faminmax"))) float16x8_t vaminq_f16(float16x8_t __p0, float16x8_t __p1) {
44300	float16x8_t __ret;
44301	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
44302	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
44303	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vaminq_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 40));
44304	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
44305	return __ret;
44306	}
44307	#endif
44308
44309	#ifdef __LITTLE_ENDIAN__
44310	__ai __attribute__((target("neon,faminmax"))) float32x2_t vamin_f32(float32x2_t __p0, float32x2_t __p1) {
44311	float32x2_t __ret;
44312	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vamin_f32(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 9));
44313	return __ret;
44314	}
44315	#else
44316	__ai __attribute__((target("neon,faminmax"))) float32x2_t vamin_f32(float32x2_t __p0, float32x2_t __p1) {
44317	float32x2_t __ret;
44318	float32x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_32);
44319	float32x2_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_32);
44320	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vamin_f32(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 9));
44321	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_32);
44322	return __ret;
44323	}
44324	#endif
44325
44326	#ifdef __LITTLE_ENDIAN__
44327	__ai __attribute__((target("neon,faminmax"))) float16x4_t vamin_f16(float16x4_t __p0, float16x4_t __p1) {
44328	float16x4_t __ret;
44329	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vamin_f16(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 8));
44330	return __ret;
44331	}
44332	#else
44333	__ai __attribute__((target("neon,faminmax"))) float16x4_t vamin_f16(float16x4_t __p0, float16x4_t __p1) {
44334	float16x4_t __ret;
44335	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_16);
44336	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
44337	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vamin_f16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 8));
44338	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
44339	return __ret;
44340	}
44341	#endif
44342
44343	#endif
44344	#if defined(__aarch64__) \|\| defined(__arm64ec__)
44345	__ai __attribute__((target("aes,neon"))) poly128_t vmull_p64(poly64_t __p0, poly64_t __p1) {
44346	poly128_t __ret;
44347	__ret = __builtin_bit_cast(poly128_t, __builtin_neon_vmull_p64(__p0, __p1));
44348	return __ret;
44349	}
44350	#ifdef __LITTLE_ENDIAN__
44351	#define vcopyq_lane_bf16(__p0_234, __p1_234, __p2_234, __p3_234) __extension__ ({ \
44352	bfloat16x8_t __ret_234; \
44353	bfloat16x8_t __s0_234 = __p0_234; \
44354	bfloat16x4_t __s2_234 = __p2_234; \
44355	__ret_234 = vsetq_lane_bf16(vget_lane_bf16(__s2_234, __p3_234), __s0_234, __p1_234); \
44356	__ret_234; \
44357	})
44358	#else
44359	#define vcopyq_lane_bf16(__p0_235, __p1_235, __p2_235, __p3_235) __extension__ ({ \
44360	bfloat16x8_t __ret_235; \
44361	bfloat16x8_t __s0_235 = __p0_235; \
44362	bfloat16x4_t __s2_235 = __p2_235; \
44363	bfloat16x8_t __rev0_235; __rev0_235 = __builtin_shufflevector(__s0_235, __s0_235, __lane_reverse_128_16); \
44364	bfloat16x4_t __rev2_235; __rev2_235 = __builtin_shufflevector(__s2_235, __s2_235, __lane_reverse_64_16); \
44365	__ret_235 = __noswap_vsetq_lane_bf16(__noswap_vget_lane_bf16(__rev2_235, __p3_235), __rev0_235, __p1_235); \
44366	__ret_235 = __builtin_shufflevector(__ret_235, __ret_235, __lane_reverse_128_16); \
44367	__ret_235; \
44368	})
44369	#endif
44370
44371	#ifdef __LITTLE_ENDIAN__
44372	#define vcopy_lane_bf16(__p0_236, __p1_236, __p2_236, __p3_236) __extension__ ({ \
44373	bfloat16x4_t __ret_236; \
44374	bfloat16x4_t __s0_236 = __p0_236; \
44375	bfloat16x4_t __s2_236 = __p2_236; \
44376	__ret_236 = vset_lane_bf16(vget_lane_bf16(__s2_236, __p3_236), __s0_236, __p1_236); \
44377	__ret_236; \
44378	})
44379	#else
44380	#define vcopy_lane_bf16(__p0_237, __p1_237, __p2_237, __p3_237) __extension__ ({ \
44381	bfloat16x4_t __ret_237; \
44382	bfloat16x4_t __s0_237 = __p0_237; \
44383	bfloat16x4_t __s2_237 = __p2_237; \
44384	bfloat16x4_t __rev0_237; __rev0_237 = __builtin_shufflevector(__s0_237, __s0_237, __lane_reverse_64_16); \
44385	bfloat16x4_t __rev2_237; __rev2_237 = __builtin_shufflevector(__s2_237, __s2_237, __lane_reverse_64_16); \
44386	__ret_237 = __noswap_vset_lane_bf16(__noswap_vget_lane_bf16(__rev2_237, __p3_237), __rev0_237, __p1_237); \
44387	__ret_237 = __builtin_shufflevector(__ret_237, __ret_237, __lane_reverse_64_16); \
44388	__ret_237; \
44389	})
44390	#endif
44391
44392	#ifdef __LITTLE_ENDIAN__
44393	#define vcopyq_laneq_bf16(__p0_238, __p1_238, __p2_238, __p3_238) __extension__ ({ \
44394	bfloat16x8_t __ret_238; \
44395	bfloat16x8_t __s0_238 = __p0_238; \
44396	bfloat16x8_t __s2_238 = __p2_238; \
44397	__ret_238 = vsetq_lane_bf16(vgetq_lane_bf16(__s2_238, __p3_238), __s0_238, __p1_238); \
44398	__ret_238; \
44399	})
44400	#else
44401	#define vcopyq_laneq_bf16(__p0_239, __p1_239, __p2_239, __p3_239) __extension__ ({ \
44402	bfloat16x8_t __ret_239; \
44403	bfloat16x8_t __s0_239 = __p0_239; \
44404	bfloat16x8_t __s2_239 = __p2_239; \
44405	bfloat16x8_t __rev0_239; __rev0_239 = __builtin_shufflevector(__s0_239, __s0_239, __lane_reverse_128_16); \
44406	bfloat16x8_t __rev2_239; __rev2_239 = __builtin_shufflevector(__s2_239, __s2_239, __lane_reverse_128_16); \
44407	__ret_239 = __noswap_vsetq_lane_bf16(__noswap_vgetq_lane_bf16(__rev2_239, __p3_239), __rev0_239, __p1_239); \
44408	__ret_239 = __builtin_shufflevector(__ret_239, __ret_239, __lane_reverse_128_16); \
44409	__ret_239; \
44410	})
44411	#endif
44412
44413	#ifdef __LITTLE_ENDIAN__
44414	#define vcopy_laneq_bf16(__p0_240, __p1_240, __p2_240, __p3_240) __extension__ ({ \
44415	bfloat16x4_t __ret_240; \
44416	bfloat16x4_t __s0_240 = __p0_240; \
44417	bfloat16x8_t __s2_240 = __p2_240; \
44418	__ret_240 = vset_lane_bf16(vgetq_lane_bf16(__s2_240, __p3_240), __s0_240, __p1_240); \
44419	__ret_240; \
44420	})
44421	#else
44422	#define vcopy_laneq_bf16(__p0_241, __p1_241, __p2_241, __p3_241) __extension__ ({ \
44423	bfloat16x4_t __ret_241; \
44424	bfloat16x4_t __s0_241 = __p0_241; \
44425	bfloat16x8_t __s2_241 = __p2_241; \
44426	bfloat16x4_t __rev0_241; __rev0_241 = __builtin_shufflevector(__s0_241, __s0_241, __lane_reverse_64_16); \
44427	bfloat16x8_t __rev2_241; __rev2_241 = __builtin_shufflevector(__s2_241, __s2_241, __lane_reverse_128_16); \
44428	__ret_241 = __noswap_vset_lane_bf16(__noswap_vgetq_lane_bf16(__rev2_241, __p3_241), __rev0_241, __p1_241); \
44429	__ret_241 = __builtin_shufflevector(__ret_241, __ret_241, __lane_reverse_64_16); \
44430	__ret_241; \
44431	})
44432	#endif
44433
44434	#ifdef __LITTLE_ENDIAN__
44435	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vcvt_bf16_f32(float32x4_t __p0) {
44436	bfloat16x4_t __ret;
44437	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vcvt_bf16_f32(__builtin_bit_cast(int8x16_t, __p0), 11));
44438	return __ret;
44439	}
44440	#else
44441	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vcvt_bf16_f32(float32x4_t __p0) {
44442	bfloat16x4_t __ret;
44443	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
44444	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vcvt_bf16_f32(__builtin_bit_cast(int8x16_t, __rev0), 11));
44445	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
44446	return __ret;
44447	}
44448	#endif
44449
44450	#ifdef __LITTLE_ENDIAN__
44451	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_high_bf16_f32(bfloat16x8_t __p0, float32x4_t __p1) {
44452	bfloat16x8_t __ret;
44453	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vcvtq_high_bf16_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 43));
44454	return __ret;
44455	}
44456	#else
44457	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_high_bf16_f32(bfloat16x8_t __p0, float32x4_t __p1) {
44458	bfloat16x8_t __ret;
44459	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
44460	float32x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_32);
44461	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vcvtq_high_bf16_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 43));
44462	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
44463	return __ret;
44464	}
44465	#endif
44466
44467	#ifdef __LITTLE_ENDIAN__
44468	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_low_bf16_f32(float32x4_t __p0) {
44469	bfloat16x8_t __ret;
44470	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vcvtq_low_bf16_f32(__builtin_bit_cast(int8x16_t, __p0), 43));
44471	return __ret;
44472	}
44473	#else
44474	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_low_bf16_f32(float32x4_t __p0) {
44475	bfloat16x8_t __ret;
44476	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
44477	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vcvtq_low_bf16_f32(__builtin_bit_cast(int8x16_t, __rev0), 43));
44478	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
44479	return __ret;
44480	}
44481	#endif
44482
44483	__ai __attribute__((target("bf16,neon"))) poly8x8_t vreinterpret_p8_bf16(bfloat16x4_t __p0) {
44484	poly8x8_t __ret;
44485	__ret = __builtin_bit_cast(poly8x8_t, __p0);
44486	return __ret;
44487	}
44488	__ai __attribute__((target("bf16,neon"))) poly64x1_t vreinterpret_p64_bf16(bfloat16x4_t __p0) {
44489	poly64x1_t __ret;
44490	__ret = __builtin_bit_cast(poly64x1_t, __p0);
44491	return __ret;
44492	}
44493	__ai __attribute__((target("bf16,neon"))) poly16x4_t vreinterpret_p16_bf16(bfloat16x4_t __p0) {
44494	poly16x4_t __ret;
44495	__ret = __builtin_bit_cast(poly16x4_t, __p0);
44496	return __ret;
44497	}
44498	__ai __attribute__((target("bf16,neon"))) poly8x16_t vreinterpretq_p8_bf16(bfloat16x8_t __p0) {
44499	poly8x16_t __ret;
44500	__ret = __builtin_bit_cast(poly8x16_t, __p0);
44501	return __ret;
44502	}
44503	__ai __attribute__((target("bf16,neon"))) poly128_t vreinterpretq_p128_bf16(bfloat16x8_t __p0) {
44504	poly128_t __ret;
44505	__ret = __builtin_bit_cast(poly128_t, __p0);
44506	return __ret;
44507	}
44508	__ai __attribute__((target("bf16,neon"))) poly64x2_t vreinterpretq_p64_bf16(bfloat16x8_t __p0) {
44509	poly64x2_t __ret;
44510	__ret = __builtin_bit_cast(poly64x2_t, __p0);
44511	return __ret;
44512	}
44513	__ai __attribute__((target("bf16,neon"))) poly16x8_t vreinterpretq_p16_bf16(bfloat16x8_t __p0) {
44514	poly16x8_t __ret;
44515	__ret = __builtin_bit_cast(poly16x8_t, __p0);
44516	return __ret;
44517	}
44518	__ai __attribute__((target("bf16,neon"))) uint8x16_t vreinterpretq_u8_bf16(bfloat16x8_t __p0) {
44519	uint8x16_t __ret;
44520	__ret = __builtin_bit_cast(uint8x16_t, __p0);
44521	return __ret;
44522	}
44523	__ai __attribute__((target("bf16,neon"))) uint32x4_t vreinterpretq_u32_bf16(bfloat16x8_t __p0) {
44524	uint32x4_t __ret;
44525	__ret = __builtin_bit_cast(uint32x4_t, __p0);
44526	return __ret;
44527	}
44528	__ai __attribute__((target("bf16,neon"))) uint64x2_t vreinterpretq_u64_bf16(bfloat16x8_t __p0) {
44529	uint64x2_t __ret;
44530	__ret = __builtin_bit_cast(uint64x2_t, __p0);
44531	return __ret;
44532	}
44533	__ai __attribute__((target("bf16,neon"))) uint16x8_t vreinterpretq_u16_bf16(bfloat16x8_t __p0) {
44534	uint16x8_t __ret;
44535	__ret = __builtin_bit_cast(uint16x8_t, __p0);
44536	return __ret;
44537	}
44538	__ai __attribute__((target("bf16,neon"))) int8x16_t vreinterpretq_s8_bf16(bfloat16x8_t __p0) {
44539	int8x16_t __ret;
44540	__ret = __builtin_bit_cast(int8x16_t, __p0);
44541	return __ret;
44542	}
44543	__ai __attribute__((target("bf16,neon"))) float64x2_t vreinterpretq_f64_bf16(bfloat16x8_t __p0) {
44544	float64x2_t __ret;
44545	__ret = __builtin_bit_cast(float64x2_t, __p0);
44546	return __ret;
44547	}
44548	__ai __attribute__((target("bf16,neon"))) float32x4_t vreinterpretq_f32_bf16(bfloat16x8_t __p0) {
44549	float32x4_t __ret;
44550	__ret = __builtin_bit_cast(float32x4_t, __p0);
44551	return __ret;
44552	}
44553	__ai __attribute__((target("bf16,neon"))) float16x8_t vreinterpretq_f16_bf16(bfloat16x8_t __p0) {
44554	float16x8_t __ret;
44555	__ret = __builtin_bit_cast(float16x8_t, __p0);
44556	return __ret;
44557	}
44558	__ai __attribute__((target("bf16,neon"))) int32x4_t vreinterpretq_s32_bf16(bfloat16x8_t __p0) {
44559	int32x4_t __ret;
44560	__ret = __builtin_bit_cast(int32x4_t, __p0);
44561	return __ret;
44562	}
44563	__ai __attribute__((target("bf16,neon"))) int64x2_t vreinterpretq_s64_bf16(bfloat16x8_t __p0) {
44564	int64x2_t __ret;
44565	__ret = __builtin_bit_cast(int64x2_t, __p0);
44566	return __ret;
44567	}
44568	__ai __attribute__((target("bf16,neon"))) int16x8_t vreinterpretq_s16_bf16(bfloat16x8_t __p0) {
44569	int16x8_t __ret;
44570	__ret = __builtin_bit_cast(int16x8_t, __p0);
44571	return __ret;
44572	}
44573	__ai __attribute__((target("bf16,neon"))) uint8x8_t vreinterpret_u8_bf16(bfloat16x4_t __p0) {
44574	uint8x8_t __ret;
44575	__ret = __builtin_bit_cast(uint8x8_t, __p0);
44576	return __ret;
44577	}
44578	__ai __attribute__((target("bf16,neon"))) uint32x2_t vreinterpret_u32_bf16(bfloat16x4_t __p0) {
44579	uint32x2_t __ret;
44580	__ret = __builtin_bit_cast(uint32x2_t, __p0);
44581	return __ret;
44582	}
44583	__ai __attribute__((target("bf16,neon"))) uint64x1_t vreinterpret_u64_bf16(bfloat16x4_t __p0) {
44584	uint64x1_t __ret;
44585	__ret = __builtin_bit_cast(uint64x1_t, __p0);
44586	return __ret;
44587	}
44588	__ai __attribute__((target("bf16,neon"))) uint16x4_t vreinterpret_u16_bf16(bfloat16x4_t __p0) {
44589	uint16x4_t __ret;
44590	__ret = __builtin_bit_cast(uint16x4_t, __p0);
44591	return __ret;
44592	}
44593	__ai __attribute__((target("bf16,neon"))) int8x8_t vreinterpret_s8_bf16(bfloat16x4_t __p0) {
44594	int8x8_t __ret;
44595	__ret = __builtin_bit_cast(int8x8_t, __p0);
44596	return __ret;
44597	}
44598	__ai __attribute__((target("bf16,neon"))) float64x1_t vreinterpret_f64_bf16(bfloat16x4_t __p0) {
44599	float64x1_t __ret;
44600	__ret = __builtin_bit_cast(float64x1_t, __p0);
44601	return __ret;
44602	}
44603	__ai __attribute__((target("bf16,neon"))) float32x2_t vreinterpret_f32_bf16(bfloat16x4_t __p0) {
44604	float32x2_t __ret;
44605	__ret = __builtin_bit_cast(float32x2_t, __p0);
44606	return __ret;
44607	}
44608	__ai __attribute__((target("bf16,neon"))) float16x4_t vreinterpret_f16_bf16(bfloat16x4_t __p0) {
44609	float16x4_t __ret;
44610	__ret = __builtin_bit_cast(float16x4_t, __p0);
44611	return __ret;
44612	}
44613	__ai __attribute__((target("bf16,neon"))) int32x2_t vreinterpret_s32_bf16(bfloat16x4_t __p0) {
44614	int32x2_t __ret;
44615	__ret = __builtin_bit_cast(int32x2_t, __p0);
44616	return __ret;
44617	}
44618	__ai __attribute__((target("bf16,neon"))) int64x1_t vreinterpret_s64_bf16(bfloat16x4_t __p0) {
44619	int64x1_t __ret;
44620	__ret = __builtin_bit_cast(int64x1_t, __p0);
44621	return __ret;
44622	}
44623	__ai __attribute__((target("bf16,neon"))) int16x4_t vreinterpret_s16_bf16(bfloat16x4_t __p0) {
44624	int16x4_t __ret;
44625	__ret = __builtin_bit_cast(int16x4_t, __p0);
44626	return __ret;
44627	}
44628	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_p8(poly8x16_t __p0) {
44629	bfloat16x8_t __ret;
44630	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
44631	return __ret;
44632	}
44633	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_p128(poly128_t __p0) {
44634	bfloat16x8_t __ret;
44635	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
44636	return __ret;
44637	}
44638	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_p64(poly64x2_t __p0) {
44639	bfloat16x8_t __ret;
44640	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
44641	return __ret;	44345	return __ret;
44642	}	44346	}
44643	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_p16(poly16x8_t __p0) {	44347	#else
44644	bfloat16x8_t __ret;	44348	__ai __attribute__((target("neon,faminmax"))) float64x2_t vamaxq_f64(float64x2_t __p0, float64x2_t __p1) {
44645	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44349	float64x2_t __ret;
		44350	float64x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_64);
		44351	float64x2_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_64);
		44352	__ret = __builtin_bit_cast(float64x2_t, __builtin_neon_vamaxq_f64(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 42));
		44353	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_64);
44646	return __ret;	44354	return __ret;
44647	}	44355	}
44648	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_u8(uint8x16_t __p0) {	44356	#endif
44649	bfloat16x8_t __ret;	44357
44650	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44358	#ifdef __LITTLE_ENDIAN__
		44359	__ai __attribute__((target("neon,faminmax"))) float32x4_t vamaxq_f32(float32x4_t __p0, float32x4_t __p1) {
		44360	float32x4_t __ret;
		44361	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vamaxq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 41));
44651	return __ret;	44362	return __ret;
44652	}	44363	}
44653	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_u32(uint32x4_t __p0) {	44364	#else
44654	bfloat16x8_t __ret;	44365	__ai __attribute__((target("neon,faminmax"))) float32x4_t vamaxq_f32(float32x4_t __p0, float32x4_t __p1) {
44655	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44366	float32x4_t __ret;
		44367	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
		44368	float32x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_32);
		44369	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vamaxq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 41));
		44370	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
44656	return __ret;	44371	return __ret;
44657	}	44372	}
44658	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_u64(uint64x2_t __p0) {	44373	#endif
44659	bfloat16x8_t __ret;	44374
44660	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44375	#ifdef __LITTLE_ENDIAN__
		44376	__ai __attribute__((target("neon,faminmax"))) float16x8_t vamaxq_f16(float16x8_t __p0, float16x8_t __p1) {
		44377	float16x8_t __ret;
		44378	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vamaxq_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 40));
44661	return __ret;	44379	return __ret;
44662	}	44380	}
44663	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_u16(uint16x8_t __p0) {	44381	#else
44664	bfloat16x8_t __ret;	44382	__ai __attribute__((target("neon,faminmax"))) float16x8_t vamaxq_f16(float16x8_t __p0, float16x8_t __p1) {
44665	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44383	float16x8_t __ret;
		44384	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
		44385	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
		44386	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vamaxq_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 40));
		44387	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
44666	return __ret;	44388	return __ret;
44667	}	44389	}
44668	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_s8(int8x16_t __p0) {	44390	#endif
44669	bfloat16x8_t __ret;	44391
44670	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44392	#ifdef __LITTLE_ENDIAN__
		44393	__ai __attribute__((target("neon,faminmax"))) float32x2_t vamax_f32(float32x2_t __p0, float32x2_t __p1) {
		44394	float32x2_t __ret;
		44395	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vamax_f32(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 9));
44671	return __ret;	44396	return __ret;
44672	}	44397	}
44673	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_f64(float64x2_t __p0) {	44398	#else
44674	bfloat16x8_t __ret;	44399	__ai __attribute__((target("neon,faminmax"))) float32x2_t vamax_f32(float32x2_t __p0, float32x2_t __p1) {
44675	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44400	float32x2_t __ret;
		44401	float32x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_32);
		44402	float32x2_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_32);
		44403	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vamax_f32(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 9));
		44404	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_32);
44676	return __ret;	44405	return __ret;
44677	}	44406	}
44678	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_f32(float32x4_t __p0) {	44407	#endif
44679	bfloat16x8_t __ret;	44408
44680	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44409	#ifdef __LITTLE_ENDIAN__
		44410	__ai __attribute__((target("neon,faminmax"))) float16x4_t vamax_f16(float16x4_t __p0, float16x4_t __p1) {
		44411	float16x4_t __ret;
		44412	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vamax_f16(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 8));
44681	return __ret;	44413	return __ret;
44682	}	44414	}
44683	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_f16(float16x8_t __p0) {	44415	#else
44684	bfloat16x8_t __ret;	44416	__ai __attribute__((target("neon,faminmax"))) float16x4_t vamax_f16(float16x4_t __p0, float16x4_t __p1) {
44685	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44417	float16x4_t __ret;
		44418	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_16);
		44419	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
		44420	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vamax_f16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 8));
		44421	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
44686	return __ret;	44422	return __ret;
44687	}	44423	}
44688	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_s32(int32x4_t __p0) {	44424	#endif
44689	bfloat16x8_t __ret;	44425
44690	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44426	#ifdef __LITTLE_ENDIAN__
		44427	__ai __attribute__((target("neon,faminmax"))) float64x2_t vaminq_f64(float64x2_t __p0, float64x2_t __p1) {
		44428	float64x2_t __ret;
		44429	__ret = __builtin_bit_cast(float64x2_t, __builtin_neon_vaminq_f64(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 42));
44691	return __ret;	44430	return __ret;
44692	}	44431	}
44693	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_s64(int64x2_t __p0) {	44432	#else
44694	bfloat16x8_t __ret;	44433	__ai __attribute__((target("neon,faminmax"))) float64x2_t vaminq_f64(float64x2_t __p0, float64x2_t __p1) {
44695	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44434	float64x2_t __ret;
		44435	float64x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_64);
		44436	float64x2_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_64);
		44437	__ret = __builtin_bit_cast(float64x2_t, __builtin_neon_vaminq_f64(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 42));
		44438	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_64);
44696	return __ret;	44439	return __ret;
44697	}	44440	}
44698	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vreinterpretq_bf16_s16(int16x8_t __p0) {	44441	#endif
44699	bfloat16x8_t __ret;	44442
44700	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);	44443	#ifdef __LITTLE_ENDIAN__
		44444	__ai __attribute__((target("neon,faminmax"))) float32x4_t vaminq_f32(float32x4_t __p0, float32x4_t __p1) {
		44445	float32x4_t __ret;
		44446	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vaminq_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 41));
44701	return __ret;	44447	return __ret;
44702	}	44448	}
44703	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_p8(poly8x8_t __p0) {	44449	#else
44704	bfloat16x4_t __ret;	44450	__ai __attribute__((target("neon,faminmax"))) float32x4_t vaminq_f32(float32x4_t __p0, float32x4_t __p1) {
44705	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44451	float32x4_t __ret;
		44452	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
		44453	float32x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_32);
		44454	__ret = __builtin_bit_cast(float32x4_t, __builtin_neon_vaminq_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 41));
		44455	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_32);
44706	return __ret;	44456	return __ret;
44707	}	44457	}
44708	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_p64(poly64x1_t __p0) {	44458	#endif
44709	bfloat16x4_t __ret;	44459
44710	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44460	#ifdef __LITTLE_ENDIAN__
		44461	__ai __attribute__((target("neon,faminmax"))) float16x8_t vaminq_f16(float16x8_t __p0, float16x8_t __p1) {
		44462	float16x8_t __ret;
		44463	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vaminq_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 40));
44711	return __ret;	44464	return __ret;
44712	}	44465	}
44713	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_p16(poly16x4_t __p0) {	44466	#else
44714	bfloat16x4_t __ret;	44467	__ai __attribute__((target("neon,faminmax"))) float16x8_t vaminq_f16(float16x8_t __p0, float16x8_t __p1) {
44715	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44468	float16x8_t __ret;
		44469	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
		44470	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
		44471	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vaminq_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 40));
		44472	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
44716	return __ret;	44473	return __ret;
44717	}	44474	}
44718	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_u8(uint8x8_t __p0) {	44475	#endif
44719	bfloat16x4_t __ret;	44476
44720	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44477	#ifdef __LITTLE_ENDIAN__
		44478	__ai __attribute__((target("neon,faminmax"))) float32x2_t vamin_f32(float32x2_t __p0, float32x2_t __p1) {
		44479	float32x2_t __ret;
		44480	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vamin_f32(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 9));
44721	return __ret;	44481	return __ret;
44722	}	44482	}
44723	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_u32(uint32x2_t __p0) {	44483	#else
44724	bfloat16x4_t __ret;	44484	__ai __attribute__((target("neon,faminmax"))) float32x2_t vamin_f32(float32x2_t __p0, float32x2_t __p1) {
44725	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44485	float32x2_t __ret;
		44486	float32x2_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_32);
		44487	float32x2_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_32);
		44488	__ret = __builtin_bit_cast(float32x2_t, __builtin_neon_vamin_f32(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 9));
		44489	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_32);
44726	return __ret;	44490	return __ret;
44727	}	44491	}
44728	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_u64(uint64x1_t __p0) {	44492	#endif
44729	bfloat16x4_t __ret;	44493
44730	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44494	#ifdef __LITTLE_ENDIAN__
		44495	__ai __attribute__((target("neon,faminmax"))) float16x4_t vamin_f16(float16x4_t __p0, float16x4_t __p1) {
		44496	float16x4_t __ret;
		44497	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vamin_f16(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 8));
44731	return __ret;	44498	return __ret;
44732	}	44499	}
44733	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_u16(uint16x4_t __p0) {	44500	#else
44734	bfloat16x4_t __ret;	44501	__ai __attribute__((target("neon,faminmax"))) float16x4_t vamin_f16(float16x4_t __p0, float16x4_t __p1) {
44735	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44502	float16x4_t __ret;
		44503	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_16);
		44504	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
		44505	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vamin_f16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 8));
		44506	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
44736	return __ret;	44507	return __ret;
44737	}	44508	}
44738	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_s8(int8x8_t __p0) {	44509	#endif
44739	bfloat16x4_t __ret;	44510
44740	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44511	#endif
		44512	#if defined(__aarch64__) \|\| defined(__arm64ec__)
		44513	__ai __attribute__((target("aes,neon"))) poly128_t vmull_p64(poly64_t __p0, poly64_t __p1) {
		44514	poly128_t __ret;
		44515	__ret = __builtin_bit_cast(poly128_t, __builtin_neon_vmull_p64(__p0, __p1));
44741	return __ret;	44516	return __ret;
44742	}	44517	}
44743	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_f64(float64x1_t __p0) {	44518	#ifdef __LITTLE_ENDIAN__
		44519	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vcvt_bf16_f32(float32x4_t __p0) {
44744	bfloat16x4_t __ret;	44520	bfloat16x4_t __ret;
44745	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44521	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vcvt_bf16_f32(__builtin_bit_cast(int8x16_t, __p0), 11));
44746	return __ret;	44522	return __ret;
44747	}	44523	}
44748	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_f32(float32x2_t __p0) {	44524	#else
		44525	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vcvt_bf16_f32(float32x4_t __p0) {
44749	bfloat16x4_t __ret;	44526	bfloat16x4_t __ret;
44750	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44527	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
		44528	__ret = __builtin_bit_cast(bfloat16x4_t, __builtin_neon_vcvt_bf16_f32(__builtin_bit_cast(int8x16_t, __rev0), 11));
		44529	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
44751	return __ret;	44530	return __ret;
44752	}	44531	}
44753	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_f16(float16x4_t __p0) {	44532	#endif
44754	bfloat16x4_t __ret;	44533
44755	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44534	#ifdef __LITTLE_ENDIAN__
		44535	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_high_bf16_f32(bfloat16x8_t __p0, float32x4_t __p1) {
		44536	bfloat16x8_t __ret;
		44537	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vcvtq_high_bf16_f32(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 43));
44756	return __ret;	44538	return __ret;
44757	}	44539	}
44758	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_s32(int32x2_t __p0) {	44540	#else
44759	bfloat16x4_t __ret;	44541	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_high_bf16_f32(bfloat16x8_t __p0, float32x4_t __p1) {
44760	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44542	bfloat16x8_t __ret;
		44543	bfloat16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
		44544	float32x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_32);
		44545	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vcvtq_high_bf16_f32(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 43));
		44546	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
44761	return __ret;	44547	return __ret;
44762	}	44548	}
44763	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_s64(int64x1_t __p0) {	44549	#endif
44764	bfloat16x4_t __ret;	44550
44765	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44551	#ifdef __LITTLE_ENDIAN__
		44552	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_low_bf16_f32(float32x4_t __p0) {
		44553	bfloat16x8_t __ret;
		44554	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vcvtq_low_bf16_f32(__builtin_bit_cast(int8x16_t, __p0), 43));
44766	return __ret;	44555	return __ret;
44767	}	44556	}
44768	__ai __attribute__((target("bf16,neon"))) bfloat16x4_t vreinterpret_bf16_s16(int16x4_t __p0) {	44557	#else
44769	bfloat16x4_t __ret;	44558	__ai __attribute__((target("bf16,neon"))) bfloat16x8_t vcvtq_low_bf16_f32(float32x4_t __p0) {
44770	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);	44559	bfloat16x8_t __ret;
		44560	float32x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_32);
		44561	__ret = __builtin_bit_cast(bfloat16x8_t, __builtin_neon_vcvtq_low_bf16_f32(__builtin_bit_cast(int8x16_t, __rev0), 43));
		44562	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
44771	return __ret;	44563	return __ret;
44772	}	44564	}
		44565	#endif
		44566
44773	#ifdef __LITTLE_ENDIAN__	44567	#ifdef __LITTLE_ENDIAN__
44774	#define vdotq_laneq_u32(__p0_242, __p1_242, __p2_242, __p3_242) __extension__ ({ \	44568	#define vdotq_laneq_u32(__p0_234, __p1_234, __p2_234, __p3_234) __extension__ ({ \
44775	uint32x4_t __ret_242; \	44569	uint32x4_t __ret_234; \
44776	uint32x4_t __s0_242 = __p0_242; \	44570	uint32x4_t __s0_234 = __p0_234; \
44777	uint8x16_t __s1_242 = __p1_242; \	44571	uint8x16_t __s1_234 = __p1_234; \
44778	uint8x16_t __s2_242 = __p2_242; \	44572	uint8x16_t __s2_234 = __p2_234; \
44779	__ret_242 = vdotq_u32(__s0_242, __s1_242, __builtin_bit_cast(uint8x16_t, splatq_laneq_u32(__builtin_bit_cast(uint32x4_t, __s2_242), __p3_242))); \	44573	__ret_234 = vdotq_u32(__s0_234, __s1_234, __builtin_bit_cast(uint8x16_t, splatq_laneq_u32(__builtin_bit_cast(uint32x4_t, __s2_234), __p3_234))); \
44780	__ret_242; \	44574	__ret_234; \
44781	})	44575	})
44782	#else	44576	#else
44783	#define vdotq_laneq_u32(__p0_243, __p1_243, __p2_243, __p3_243) __extension__ ({ \	44577	#define vdotq_laneq_u32(__p0_235, __p1_235, __p2_235, __p3_235) __extension__ ({ \
44784	uint32x4_t __ret_243; \	44578	uint32x4_t __ret_235; \
44785	uint32x4_t __s0_243 = __p0_243; \	44579	uint32x4_t __s0_235 = __p0_235; \
44786	uint8x16_t __s1_243 = __p1_243; \	44580	uint8x16_t __s1_235 = __p1_235; \
44787	uint8x16_t __s2_243 = __p2_243; \	44581	uint8x16_t __s2_235 = __p2_235; \
44788	uint32x4_t __rev0_243; __rev0_243 = __builtin_shufflevector(__s0_243, __s0_243, __lane_reverse_128_32); \	44582	uint32x4_t __rev0_235; __rev0_235 = __builtin_shufflevector(__s0_235, __s0_235, __lane_reverse_128_32); \
44789	uint8x16_t __rev1_243; __rev1_243 = __builtin_shufflevector(__s1_243, __s1_243, __lane_reverse_128_8); \	44583	uint8x16_t __rev1_235; __rev1_235 = __builtin_shufflevector(__s1_235, __s1_235, __lane_reverse_128_8); \
44790	uint8x16_t __rev2_243; __rev2_243 = __builtin_shufflevector(__s2_243, __s2_243, __lane_reverse_128_8); \	44584	uint8x16_t __rev2_235; __rev2_235 = __builtin_shufflevector(__s2_235, __s2_235, __lane_reverse_128_8); \
44791	__ret_243 = __noswap_vdotq_u32(__rev0_243, __rev1_243, __builtin_bit_cast(uint8x16_t, __noswap_splatq_laneq_u32(__builtin_bit_cast(uint32x4_t, __rev2_243), __p3_243))); \	44585	__ret_235 = __noswap_vdotq_u32(__rev0_235, __rev1_235, __builtin_bit_cast(uint8x16_t, __noswap_splatq_laneq_u32(__builtin_bit_cast(uint32x4_t, __rev2_235), __p3_235))); \
44792	__ret_243 = __builtin_shufflevector(__ret_243, __ret_243, __lane_reverse_128_32); \	44586	__ret_235 = __builtin_shufflevector(__ret_235, __ret_235, __lane_reverse_128_32); \
44793	__ret_243; \	44587	__ret_235; \
44794	})	44588	})
44795	#endif	44589	#endif
44796		44590
44797	#ifdef __LITTLE_ENDIAN__	44591	#ifdef __LITTLE_ENDIAN__
44798	#define vdotq_laneq_s32(__p0_244, __p1_244, __p2_244, __p3_244) __extension__ ({ \	44592	#define vdotq_laneq_s32(__p0_236, __p1_236, __p2_236, __p3_236) __extension__ ({ \
44799	int32x4_t __ret_244; \	44593	int32x4_t __ret_236; \
44800	int32x4_t __s0_244 = __p0_244; \	44594	int32x4_t __s0_236 = __p0_236; \
44801	int8x16_t __s1_244 = __p1_244; \	44595	int8x16_t __s1_236 = __p1_236; \
44802	int8x16_t __s2_244 = __p2_244; \	44596	int8x16_t __s2_236 = __p2_236; \
44803	__ret_244 = vdotq_s32(__s0_244, __s1_244, __builtin_bit_cast(int8x16_t, splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_244), __p3_244))); \	44597	__ret_236 = vdotq_s32(__s0_236, __s1_236, __builtin_bit_cast(int8x16_t, splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_236), __p3_236))); \
44804	__ret_244; \	44598	__ret_236; \
44805	})	44599	})
44806	#else	44600	#else
44807	#define vdotq_laneq_s32(__p0_245, __p1_245, __p2_245, __p3_245) __extension__ ({ \	44601	#define vdotq_laneq_s32(__p0_237, __p1_237, __p2_237, __p3_237) __extension__ ({ \
44808	int32x4_t __ret_245; \	44602	int32x4_t __ret_237; \
44809	int32x4_t __s0_245 = __p0_245; \	44603	int32x4_t __s0_237 = __p0_237; \
44810	int8x16_t __s1_245 = __p1_245; \	44604	int8x16_t __s1_237 = __p1_237; \
44811	int8x16_t __s2_245 = __p2_245; \	44605	int8x16_t __s2_237 = __p2_237; \
44812	int32x4_t __rev0_245; __rev0_245 = __builtin_shufflevector(__s0_245, __s0_245, __lane_reverse_128_32); \	44606	int32x4_t __rev0_237; __rev0_237 = __builtin_shufflevector(__s0_237, __s0_237, __lane_reverse_128_32); \
44813	int8x16_t __rev1_245; __rev1_245 = __builtin_shufflevector(__s1_245, __s1_245, __lane_reverse_128_8); \	44607	int8x16_t __rev1_237; __rev1_237 = __builtin_shufflevector(__s1_237, __s1_237, __lane_reverse_128_8); \
44814	int8x16_t __rev2_245; __rev2_245 = __builtin_shufflevector(__s2_245, __s2_245, __lane_reverse_128_8); \	44608	int8x16_t __rev2_237; __rev2_237 = __builtin_shufflevector(__s2_237, __s2_237, __lane_reverse_128_8); \
44815	__ret_245 = __noswap_vdotq_s32(__rev0_245, __rev1_245, __builtin_bit_cast(int8x16_t, __noswap_splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_245), __p3_245))); \	44609	__ret_237 = __noswap_vdotq_s32(__rev0_237, __rev1_237, __builtin_bit_cast(int8x16_t, __noswap_splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_237), __p3_237))); \
44816	__ret_245 = __builtin_shufflevector(__ret_245, __ret_245, __lane_reverse_128_32); \	44610	__ret_237 = __builtin_shufflevector(__ret_237, __ret_237, __lane_reverse_128_32); \
44817	__ret_245; \	44611	__ret_237; \
44818	})	44612	})
44819	#endif	44613	#endif
44820		44614
44821	#ifdef __LITTLE_ENDIAN__	44615	#ifdef __LITTLE_ENDIAN__
44822	#define vdot_laneq_u32(__p0_246, __p1_246, __p2_246, __p3_246) __extension__ ({ \	44616	#define vdot_laneq_u32(__p0_238, __p1_238, __p2_238, __p3_238) __extension__ ({ \
44823	uint32x2_t __ret_246; \	44617	uint32x2_t __ret_238; \
44824	uint32x2_t __s0_246 = __p0_246; \	44618	uint32x2_t __s0_238 = __p0_238; \
44825	uint8x8_t __s1_246 = __p1_246; \	44619	uint8x8_t __s1_238 = __p1_238; \
44826	uint8x16_t __s2_246 = __p2_246; \	44620	uint8x16_t __s2_238 = __p2_238; \
44827	__ret_246 = vdot_u32(__s0_246, __s1_246, __builtin_bit_cast(uint8x8_t, splat_laneq_u32(__builtin_bit_cast(uint32x4_t, __s2_246), __p3_246))); \	44621	__ret_238 = vdot_u32(__s0_238, __s1_238, __builtin_bit_cast(uint8x8_t, splat_laneq_u32(__builtin_bit_cast(uint32x4_t, __s2_238), __p3_238))); \
44828	__ret_246; \	44622	__ret_238; \
44829	})	44623	})
44830	#else	44624	#else
44831	#define vdot_laneq_u32(__p0_247, __p1_247, __p2_247, __p3_247) __extension__ ({ \	44625	#define vdot_laneq_u32(__p0_239, __p1_239, __p2_239, __p3_239) __extension__ ({ \
44832	uint32x2_t __ret_247; \	44626	uint32x2_t __ret_239; \
44833	uint32x2_t __s0_247 = __p0_247; \	44627	uint32x2_t __s0_239 = __p0_239; \
44834	uint8x8_t __s1_247 = __p1_247; \	44628	uint8x8_t __s1_239 = __p1_239; \
44835	uint8x16_t __s2_247 = __p2_247; \	44629	uint8x16_t __s2_239 = __p2_239; \
44836	uint32x2_t __rev0_247; __rev0_247 = __builtin_shufflevector(__s0_247, __s0_247, __lane_reverse_64_32); \	44630	uint32x2_t __rev0_239; __rev0_239 = __builtin_shufflevector(__s0_239, __s0_239, __lane_reverse_64_32); \
44837	uint8x8_t __rev1_247; __rev1_247 = __builtin_shufflevector(__s1_247, __s1_247, __lane_reverse_64_8); \	44631	uint8x8_t __rev1_239; __rev1_239 = __builtin_shufflevector(__s1_239, __s1_239, __lane_reverse_64_8); \
44838	uint8x16_t __rev2_247; __rev2_247 = __builtin_shufflevector(__s2_247, __s2_247, __lane_reverse_128_8); \	44632	uint8x16_t __rev2_239; __rev2_239 = __builtin_shufflevector(__s2_239, __s2_239, __lane_reverse_128_8); \
44839	__ret_247 = __noswap_vdot_u32(__rev0_247, __rev1_247, __builtin_bit_cast(uint8x8_t, __noswap_splat_laneq_u32(__builtin_bit_cast(uint32x4_t, __rev2_247), __p3_247))); \	44633	__ret_239 = __noswap_vdot_u32(__rev0_239, __rev1_239, __builtin_bit_cast(uint8x8_t, __noswap_splat_laneq_u32(__builtin_bit_cast(uint32x4_t, __rev2_239), __p3_239))); \
44840	__ret_247 = __builtin_shufflevector(__ret_247, __ret_247, __lane_reverse_64_32); \	44634	__ret_239 = __builtin_shufflevector(__ret_239, __ret_239, __lane_reverse_64_32); \
44841	__ret_247; \	44635	__ret_239; \
44842	})	44636	})
44843	#endif	44637	#endif
44844		44638
44845	#ifdef __LITTLE_ENDIAN__	44639	#ifdef __LITTLE_ENDIAN__
44846	#define vdot_laneq_s32(__p0_248, __p1_248, __p2_248, __p3_248) __extension__ ({ \	44640	#define vdot_laneq_s32(__p0_240, __p1_240, __p2_240, __p3_240) __extension__ ({ \
44847	int32x2_t __ret_248; \	44641	int32x2_t __ret_240; \
44848	int32x2_t __s0_248 = __p0_248; \	44642	int32x2_t __s0_240 = __p0_240; \
44849	int8x8_t __s1_248 = __p1_248; \	44643	int8x8_t __s1_240 = __p1_240; \
44850	int8x16_t __s2_248 = __p2_248; \	44644	int8x16_t __s2_240 = __p2_240; \
44851	__ret_248 = vdot_s32(__s0_248, __s1_248, __builtin_bit_cast(int8x8_t, splat_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_248), __p3_248))); \	44645	__ret_240 = vdot_s32(__s0_240, __s1_240, __builtin_bit_cast(int8x8_t, splat_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_240), __p3_240))); \
44852	__ret_248; \	44646	__ret_240; \
44853	})	44647	})
44854	#else	44648	#else
44855	#define vdot_laneq_s32(__p0_249, __p1_249, __p2_249, __p3_249) __extension__ ({ \	44649	#define vdot_laneq_s32(__p0_241, __p1_241, __p2_241, __p3_241) __extension__ ({ \
44856	int32x2_t __ret_249; \	44650	int32x2_t __ret_241; \
44857	int32x2_t __s0_249 = __p0_249; \	44651	int32x2_t __s0_241 = __p0_241; \
44858	int8x8_t __s1_249 = __p1_249; \	44652	int8x8_t __s1_241 = __p1_241; \
44859	int8x16_t __s2_249 = __p2_249; \	44653	int8x16_t __s2_241 = __p2_241; \
44860	int32x2_t __rev0_249; __rev0_249 = __builtin_shufflevector(__s0_249, __s0_249, __lane_reverse_64_32); \	44654	int32x2_t __rev0_241; __rev0_241 = __builtin_shufflevector(__s0_241, __s0_241, __lane_reverse_64_32); \
44861	int8x8_t __rev1_249; __rev1_249 = __builtin_shufflevector(__s1_249, __s1_249, __lane_reverse_64_8); \	44655	int8x8_t __rev1_241; __rev1_241 = __builtin_shufflevector(__s1_241, __s1_241, __lane_reverse_64_8); \
44862	int8x16_t __rev2_249; __rev2_249 = __builtin_shufflevector(__s2_249, __s2_249, __lane_reverse_128_8); \	44656	int8x16_t __rev2_241; __rev2_241 = __builtin_shufflevector(__s2_241, __s2_241, __lane_reverse_128_8); \
44863	__ret_249 = __noswap_vdot_s32(__rev0_249, __rev1_249, __builtin_bit_cast(int8x8_t, __noswap_splat_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_249), __p3_249))); \	44657	__ret_241 = __noswap_vdot_s32(__rev0_241, __rev1_241, __builtin_bit_cast(int8x8_t, __noswap_splat_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_241), __p3_241))); \
44864	__ret_249 = __builtin_shufflevector(__ret_249, __ret_249, __lane_reverse_64_32); \	44658	__ret_241 = __builtin_shufflevector(__ret_241, __ret_241, __lane_reverse_64_32); \
44865	__ret_249; \	44659	__ret_241; \
44866	})	44660	})
44867	#endif	44661	#endif
44868		44662
...	@@ -45317,533 +45111,533 @@ __ai __attribute__((target("fullfp16,neon"))) float16x4_t vdiv_f16(float16x4_t _	...	@@ -45317,533 +45111,533 @@ __ai __attribute__((target("fullfp16,neon"))) float16x4_t vdiv_f16(float16x4_t _
45317	#endif	45111	#endif
45318		45112
45319	#ifdef __LITTLE_ENDIAN__	45113	#ifdef __LITTLE_ENDIAN__
45320	#define vfmsh_lane_f16(__p0_250, __p1_250, __p2_250, __p3_250) __extension__ ({ \	45114	#define vfmsh_lane_f16(__p0_242, __p1_242, __p2_242, __p3_242) __extension__ ({ \
45321	float16_t __ret_250; \	45115	float16_t __ret_242; \
45322	float16_t __s0_250 = __p0_250; \	45116	float16_t __s0_242 = __p0_242; \
45323	float16_t __s1_250 = __p1_250; \	45117	float16_t __s1_242 = __p1_242; \
45324	float16x4_t __s2_250 = __p2_250; \	45118	float16x4_t __s2_242 = __p2_242; \
45325	__ret_250 = vfmah_lane_f16(__s0_250, -__s1_250, __s2_250, __p3_250); \	45119	__ret_242 = vfmah_lane_f16(__s0_242, -__s1_242, __s2_242, __p3_242); \
		45120	__ret_242; \
		45121	})
		45122	#else
		45123	#define vfmsh_lane_f16(__p0_243, __p1_243, __p2_243, __p3_243) __extension__ ({ \
		45124	float16_t __ret_243; \
		45125	float16_t __s0_243 = __p0_243; \
		45126	float16_t __s1_243 = __p1_243; \
		45127	float16x4_t __s2_243 = __p2_243; \
		45128	float16x4_t __rev2_243; __rev2_243 = __builtin_shufflevector(__s2_243, __s2_243, __lane_reverse_64_16); \
		45129	__ret_243 = __noswap_vfmah_lane_f16(__s0_243, -__s1_243, __rev2_243, __p3_243); \
		45130	__ret_243; \
		45131	})
		45132	#endif
		45133
		45134	#ifdef __LITTLE_ENDIAN__
		45135	#define vfmsq_lane_f16(__p0_244, __p1_244, __p2_244, __p3_244) __extension__ ({ \
		45136	float16x8_t __ret_244; \
		45137	float16x8_t __s0_244 = __p0_244; \
		45138	float16x8_t __s1_244 = __p1_244; \
		45139	float16x4_t __s2_244 = __p2_244; \
		45140	__ret_244 = vfmaq_lane_f16(__s0_244, -__s1_244, __s2_244, __p3_244); \
		45141	__ret_244; \
		45142	})
		45143	#else
		45144	#define vfmsq_lane_f16(__p0_245, __p1_245, __p2_245, __p3_245) __extension__ ({ \
		45145	float16x8_t __ret_245; \
		45146	float16x8_t __s0_245 = __p0_245; \
		45147	float16x8_t __s1_245 = __p1_245; \
		45148	float16x4_t __s2_245 = __p2_245; \
		45149	float16x8_t __rev0_245; __rev0_245 = __builtin_shufflevector(__s0_245, __s0_245, __lane_reverse_128_16); \
		45150	float16x8_t __rev1_245; __rev1_245 = __builtin_shufflevector(__s1_245, __s1_245, __lane_reverse_128_16); \
		45151	float16x4_t __rev2_245; __rev2_245 = __builtin_shufflevector(__s2_245, __s2_245, __lane_reverse_64_16); \
		45152	__ret_245 = __noswap_vfmaq_lane_f16(__rev0_245, -__rev1_245, __rev2_245, __p3_245); \
		45153	__ret_245 = __builtin_shufflevector(__ret_245, __ret_245, __lane_reverse_128_16); \
		45154	__ret_245; \
		45155	})
		45156	#endif
		45157
		45158	#ifdef __LITTLE_ENDIAN__
		45159	#define vfms_lane_f16(__p0_246, __p1_246, __p2_246, __p3_246) __extension__ ({ \
		45160	float16x4_t __ret_246; \
		45161	float16x4_t __s0_246 = __p0_246; \
		45162	float16x4_t __s1_246 = __p1_246; \
		45163	float16x4_t __s2_246 = __p2_246; \
		45164	__ret_246 = vfma_lane_f16(__s0_246, -__s1_246, __s2_246, __p3_246); \
		45165	__ret_246; \
		45166	})
		45167	#else
		45168	#define vfms_lane_f16(__p0_247, __p1_247, __p2_247, __p3_247) __extension__ ({ \
		45169	float16x4_t __ret_247; \
		45170	float16x4_t __s0_247 = __p0_247; \
		45171	float16x4_t __s1_247 = __p1_247; \
		45172	float16x4_t __s2_247 = __p2_247; \
		45173	float16x4_t __rev0_247; __rev0_247 = __builtin_shufflevector(__s0_247, __s0_247, __lane_reverse_64_16); \
		45174	float16x4_t __rev1_247; __rev1_247 = __builtin_shufflevector(__s1_247, __s1_247, __lane_reverse_64_16); \
		45175	float16x4_t __rev2_247; __rev2_247 = __builtin_shufflevector(__s2_247, __s2_247, __lane_reverse_64_16); \
		45176	__ret_247 = __noswap_vfma_lane_f16(__rev0_247, -__rev1_247, __rev2_247, __p3_247); \
		45177	__ret_247 = __builtin_shufflevector(__ret_247, __ret_247, __lane_reverse_64_16); \
		45178	__ret_247; \
		45179	})
		45180	#endif
		45181
		45182	#ifdef __LITTLE_ENDIAN__
		45183	#define vfmsh_laneq_f16(__p0_248, __p1_248, __p2_248, __p3_248) __extension__ ({ \
		45184	float16_t __ret_248; \
		45185	float16_t __s0_248 = __p0_248; \
		45186	float16_t __s1_248 = __p1_248; \
		45187	float16x8_t __s2_248 = __p2_248; \
		45188	__ret_248 = vfmah_laneq_f16(__s0_248, -__s1_248, __s2_248, __p3_248); \
		45189	__ret_248; \
		45190	})
		45191	#else
		45192	#define vfmsh_laneq_f16(__p0_249, __p1_249, __p2_249, __p3_249) __extension__ ({ \
		45193	float16_t __ret_249; \
		45194	float16_t __s0_249 = __p0_249; \
		45195	float16_t __s1_249 = __p1_249; \
		45196	float16x8_t __s2_249 = __p2_249; \
		45197	float16x8_t __rev2_249; __rev2_249 = __builtin_shufflevector(__s2_249, __s2_249, __lane_reverse_128_16); \
		45198	__ret_249 = __noswap_vfmah_laneq_f16(__s0_249, -__s1_249, __rev2_249, __p3_249); \
		45199	__ret_249; \
		45200	})
		45201	#endif
		45202
		45203	#ifdef __LITTLE_ENDIAN__
		45204	#define vfmsq_laneq_f16(__p0_250, __p1_250, __p2_250, __p3_250) __extension__ ({ \
		45205	float16x8_t __ret_250; \
		45206	float16x8_t __s0_250 = __p0_250; \
		45207	float16x8_t __s1_250 = __p1_250; \
		45208	float16x8_t __s2_250 = __p2_250; \
		45209	__ret_250 = vfmaq_laneq_f16(__s0_250, -__s1_250, __s2_250, __p3_250); \
45326	__ret_250; \	45210	__ret_250; \
45327	})	45211	})
45328	#else	45212	#else
45329	#define vfmsh_lane_f16(__p0_251, __p1_251, __p2_251, __p3_251) __extension__ ({ \	45213	#define vfmsq_laneq_f16(__p0_251, __p1_251, __p2_251, __p3_251) __extension__ ({ \
45330	float16_t __ret_251; \	45214	float16x8_t __ret_251; \
45331	float16_t __s0_251 = __p0_251; \	45215	float16x8_t __s0_251 = __p0_251; \
45332	float16_t __s1_251 = __p1_251; \	45216	float16x8_t __s1_251 = __p1_251; \
45333	float16x4_t __s2_251 = __p2_251; \	45217	float16x8_t __s2_251 = __p2_251; \
45334	float16x4_t __rev2_251; __rev2_251 = __builtin_shufflevector(__s2_251, __s2_251, __lane_reverse_64_16); \	45218	float16x8_t __rev0_251; __rev0_251 = __builtin_shufflevector(__s0_251, __s0_251, __lane_reverse_128_16); \
45335	__ret_251 = __noswap_vfmah_lane_f16(__s0_251, -__s1_251, __rev2_251, __p3_251); \	45219	float16x8_t __rev1_251; __rev1_251 = __builtin_shufflevector(__s1_251, __s1_251, __lane_reverse_128_16); \
		45220	float16x8_t __rev2_251; __rev2_251 = __builtin_shufflevector(__s2_251, __s2_251, __lane_reverse_128_16); \
		45221	__ret_251 = __noswap_vfmaq_laneq_f16(__rev0_251, -__rev1_251, __rev2_251, __p3_251); \
		45222	__ret_251 = __builtin_shufflevector(__ret_251, __ret_251, __lane_reverse_128_16); \
45336	__ret_251; \	45223	__ret_251; \
45337	})	45224	})
45338	#endif	45225	#endif
45339		45226
45340	#ifdef __LITTLE_ENDIAN__	45227	#ifdef __LITTLE_ENDIAN__
45341	#define vfmsq_lane_f16(__p0_252, __p1_252, __p2_252, __p3_252) __extension__ ({ \	45228	#define vfms_laneq_f16(__p0_252, __p1_252, __p2_252, __p3_252) __extension__ ({ \
45342	float16x8_t __ret_252; \	45229	float16x4_t __ret_252; \
45343	float16x8_t __s0_252 = __p0_252; \	45230	float16x4_t __s0_252 = __p0_252; \
45344	float16x8_t __s1_252 = __p1_252; \	45231	float16x4_t __s1_252 = __p1_252; \
45345	float16x4_t __s2_252 = __p2_252; \	45232	float16x8_t __s2_252 = __p2_252; \
45346	__ret_252 = vfmaq_lane_f16(__s0_252, -__s1_252, __s2_252, __p3_252); \	45233	__ret_252 = vfma_laneq_f16(__s0_252, -__s1_252, __s2_252, __p3_252); \
45347	__ret_252; \	45234	__ret_252; \
45348	})	45235	})
45349	#else	45236	#else
45350	#define vfmsq_lane_f16(__p0_253, __p1_253, __p2_253, __p3_253) __extension__ ({ \	45237	#define vfms_laneq_f16(__p0_253, __p1_253, __p2_253, __p3_253) __extension__ ({ \
45351	float16x8_t __ret_253; \	45238	float16x4_t __ret_253; \
45352	float16x8_t __s0_253 = __p0_253; \	45239	float16x4_t __s0_253 = __p0_253; \
45353	float16x8_t __s1_253 = __p1_253; \	45240	float16x4_t __s1_253 = __p1_253; \
45354	float16x4_t __s2_253 = __p2_253; \	45241	float16x8_t __s2_253 = __p2_253; \
45355	float16x8_t __rev0_253; __rev0_253 = __builtin_shufflevector(__s0_253, __s0_253, __lane_reverse_128_16); \	45242	float16x4_t __rev0_253; __rev0_253 = __builtin_shufflevector(__s0_253, __s0_253, __lane_reverse_64_16); \
45356	float16x8_t __rev1_253; __rev1_253 = __builtin_shufflevector(__s1_253, __s1_253, __lane_reverse_128_16); \	45243	float16x4_t __rev1_253; __rev1_253 = __builtin_shufflevector(__s1_253, __s1_253, __lane_reverse_64_16); \
45357	float16x4_t __rev2_253; __rev2_253 = __builtin_shufflevector(__s2_253, __s2_253, __lane_reverse_64_16); \	45244	float16x8_t __rev2_253; __rev2_253 = __builtin_shufflevector(__s2_253, __s2_253, __lane_reverse_128_16); \
45358	__ret_253 = __noswap_vfmaq_lane_f16(__rev0_253, -__rev1_253, __rev2_253, __p3_253); \	45245	__ret_253 = __noswap_vfma_laneq_f16(__rev0_253, -__rev1_253, __rev2_253, __p3_253); \
45359	__ret_253 = __builtin_shufflevector(__ret_253, __ret_253, __lane_reverse_128_16); \	45246	__ret_253 = __builtin_shufflevector(__ret_253, __ret_253, __lane_reverse_64_16); \
45360	__ret_253; \	45247	__ret_253; \
45361	})	45248	})
45362	#endif	45249	#endif
45363		45250
45364	#ifdef __LITTLE_ENDIAN__	45251	#ifdef __LITTLE_ENDIAN__
45365	#define vfms_lane_f16(__p0_254, __p1_254, __p2_254, __p3_254) __extension__ ({ \	45252	#define vfmsq_n_f16(__p0, __p1, __p2) __extension__ ({ \
45366	float16x4_t __ret_254; \	45253	float16x8_t __ret; \
45367	float16x4_t __s0_254 = __p0_254; \	45254	float16x8_t __s0 = __p0; \
45368	float16x4_t __s1_254 = __p1_254; \	45255	float16x8_t __s1 = __p1; \
45369	float16x4_t __s2_254 = __p2_254; \	45256	float16_t __s2 = __p2; \
45370	__ret_254 = vfma_lane_f16(__s0_254, -__s1_254, __s2_254, __p3_254); \	45257	__ret = vfmaq_f16(__s0, -__s1, (float16x8_t) {__s2, __s2, __s2, __s2, __s2, __s2, __s2, __s2}); \
		45258	__ret; \
		45259	})
		45260	#else
		45261	#define vfmsq_n_f16(__p0, __p1, __p2) __extension__ ({ \
		45262	float16x8_t __ret; \
		45263	float16x8_t __s0 = __p0; \
		45264	float16x8_t __s1 = __p1; \
		45265	float16_t __s2 = __p2; \
		45266	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		45267	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
		45268	__ret = __noswap_vfmaq_f16(__rev0, -__rev1, (float16x8_t) {__s2, __s2, __s2, __s2, __s2, __s2, __s2, __s2}); \
		45269	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
		45270	__ret; \
		45271	})
		45272	#endif
		45273
		45274	#ifdef __LITTLE_ENDIAN__
		45275	#define vfms_n_f16(__p0, __p1, __p2) __extension__ ({ \
		45276	float16x4_t __ret; \
		45277	float16x4_t __s0 = __p0; \
		45278	float16x4_t __s1 = __p1; \
		45279	float16_t __s2 = __p2; \
		45280	__ret = vfma_f16(__s0, -__s1, (float16x4_t) {__s2, __s2, __s2, __s2}); \
		45281	__ret; \
		45282	})
		45283	#else
		45284	#define vfms_n_f16(__p0, __p1, __p2) __extension__ ({ \
		45285	float16x4_t __ret; \
		45286	float16x4_t __s0 = __p0; \
		45287	float16x4_t __s1 = __p1; \
		45288	float16_t __s2 = __p2; \
		45289	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		45290	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
		45291	__ret = __noswap_vfma_f16(__rev0, -__rev1, (float16x4_t) {__s2, __s2, __s2, __s2}); \
		45292	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
		45293	__ret; \
		45294	})
		45295	#endif
		45296
		45297	#ifdef __LITTLE_ENDIAN__
		45298	#define vmaxnmvq_f16(__p0) __extension__ ({ \
		45299	float16_t __ret; \
		45300	float16x8_t __s0 = __p0; \
		45301	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxnmvq_f16(__builtin_bit_cast(int8x16_t, __s0))); \
		45302	__ret; \
		45303	})
		45304	#else
		45305	#define vmaxnmvq_f16(__p0) __extension__ ({ \
		45306	float16_t __ret; \
		45307	float16x8_t __s0 = __p0; \
		45308	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		45309	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxnmvq_f16(__builtin_bit_cast(int8x16_t, __rev0))); \
		45310	__ret; \
		45311	})
		45312	#endif
		45313
		45314	#ifdef __LITTLE_ENDIAN__
		45315	#define vmaxnmv_f16(__p0) __extension__ ({ \
		45316	float16_t __ret; \
		45317	float16x4_t __s0 = __p0; \
		45318	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxnmv_f16(__builtin_bit_cast(int8x8_t, __s0))); \
		45319	__ret; \
		45320	})
		45321	#else
		45322	#define vmaxnmv_f16(__p0) __extension__ ({ \
		45323	float16_t __ret; \
		45324	float16x4_t __s0 = __p0; \
		45325	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		45326	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxnmv_f16(__builtin_bit_cast(int8x8_t, __rev0))); \
		45327	__ret; \
		45328	})
		45329	#endif
		45330
		45331	#ifdef __LITTLE_ENDIAN__
		45332	#define vmaxvq_f16(__p0) __extension__ ({ \
		45333	float16_t __ret; \
		45334	float16x8_t __s0 = __p0; \
		45335	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxvq_f16(__builtin_bit_cast(int8x16_t, __s0))); \
		45336	__ret; \
		45337	})
		45338	#else
		45339	#define vmaxvq_f16(__p0) __extension__ ({ \
		45340	float16_t __ret; \
		45341	float16x8_t __s0 = __p0; \
		45342	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		45343	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxvq_f16(__builtin_bit_cast(int8x16_t, __rev0))); \
		45344	__ret; \
		45345	})
		45346	#endif
		45347
		45348	#ifdef __LITTLE_ENDIAN__
		45349	#define vmaxv_f16(__p0) __extension__ ({ \
		45350	float16_t __ret; \
		45351	float16x4_t __s0 = __p0; \
		45352	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxv_f16(__builtin_bit_cast(int8x8_t, __s0))); \
		45353	__ret; \
		45354	})
		45355	#else
		45356	#define vmaxv_f16(__p0) __extension__ ({ \
		45357	float16_t __ret; \
		45358	float16x4_t __s0 = __p0; \
		45359	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		45360	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxv_f16(__builtin_bit_cast(int8x8_t, __rev0))); \
		45361	__ret; \
		45362	})
		45363	#endif
		45364
		45365	#ifdef __LITTLE_ENDIAN__
		45366	#define vminnmvq_f16(__p0) __extension__ ({ \
		45367	float16_t __ret; \
		45368	float16x8_t __s0 = __p0; \
		45369	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminnmvq_f16(__builtin_bit_cast(int8x16_t, __s0))); \
		45370	__ret; \
		45371	})
		45372	#else
		45373	#define vminnmvq_f16(__p0) __extension__ ({ \
		45374	float16_t __ret; \
		45375	float16x8_t __s0 = __p0; \
		45376	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		45377	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminnmvq_f16(__builtin_bit_cast(int8x16_t, __rev0))); \
		45378	__ret; \
		45379	})
		45380	#endif
		45381
		45382	#ifdef __LITTLE_ENDIAN__
		45383	#define vminnmv_f16(__p0) __extension__ ({ \
		45384	float16_t __ret; \
		45385	float16x4_t __s0 = __p0; \
		45386	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminnmv_f16(__builtin_bit_cast(int8x8_t, __s0))); \
		45387	__ret; \
		45388	})
		45389	#else
		45390	#define vminnmv_f16(__p0) __extension__ ({ \
		45391	float16_t __ret; \
		45392	float16x4_t __s0 = __p0; \
		45393	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		45394	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminnmv_f16(__builtin_bit_cast(int8x8_t, __rev0))); \
		45395	__ret; \
		45396	})
		45397	#endif
		45398
		45399	#ifdef __LITTLE_ENDIAN__
		45400	#define vminvq_f16(__p0) __extension__ ({ \
		45401	float16_t __ret; \
		45402	float16x8_t __s0 = __p0; \
		45403	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminvq_f16(__builtin_bit_cast(int8x16_t, __s0))); \
		45404	__ret; \
		45405	})
		45406	#else
		45407	#define vminvq_f16(__p0) __extension__ ({ \
		45408	float16_t __ret; \
		45409	float16x8_t __s0 = __p0; \
		45410	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
		45411	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminvq_f16(__builtin_bit_cast(int8x16_t, __rev0))); \
		45412	__ret; \
		45413	})
		45414	#endif
		45415
		45416	#ifdef __LITTLE_ENDIAN__
		45417	#define vminv_f16(__p0) __extension__ ({ \
		45418	float16_t __ret; \
		45419	float16x4_t __s0 = __p0; \
		45420	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminv_f16(__builtin_bit_cast(int8x8_t, __s0))); \
		45421	__ret; \
		45422	})
		45423	#else
		45424	#define vminv_f16(__p0) __extension__ ({ \
		45425	float16_t __ret; \
		45426	float16x4_t __s0 = __p0; \
		45427	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
		45428	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminv_f16(__builtin_bit_cast(int8x8_t, __rev0))); \
		45429	__ret; \
		45430	})
		45431	#endif
		45432
		45433	#ifdef __LITTLE_ENDIAN__
		45434	#define vmulq_laneq_f16(__p0_254, __p1_254, __p2_254) __extension__ ({ \
		45435	float16x8_t __ret_254; \
		45436	float16x8_t __s0_254 = __p0_254; \
		45437	float16x8_t __s1_254 = __p1_254; \
		45438	__ret_254 = __s0_254 * splatq_laneq_f16(__s1_254, __p2_254); \
45371	__ret_254; \	45439	__ret_254; \
45372	})	45440	})
45373	#else	45441	#else
45374	#define vfms_lane_f16(__p0_255, __p1_255, __p2_255, __p3_255) __extension__ ({ \	45442	#define vmulq_laneq_f16(__p0_255, __p1_255, __p2_255) __extension__ ({ \
45375	float16x4_t __ret_255; \	45443	float16x8_t __ret_255; \
45376	float16x4_t __s0_255 = __p0_255; \	45444	float16x8_t __s0_255 = __p0_255; \
45377	float16x4_t __s1_255 = __p1_255; \	45445	float16x8_t __s1_255 = __p1_255; \
45378	float16x4_t __s2_255 = __p2_255; \	45446	float16x8_t __rev0_255; __rev0_255 = __builtin_shufflevector(__s0_255, __s0_255, __lane_reverse_128_16); \
45379	float16x4_t __rev0_255; __rev0_255 = __builtin_shufflevector(__s0_255, __s0_255, __lane_reverse_64_16); \	45447	float16x8_t __rev1_255; __rev1_255 = __builtin_shufflevector(__s1_255, __s1_255, __lane_reverse_128_16); \
45380	float16x4_t __rev1_255; __rev1_255 = __builtin_shufflevector(__s1_255, __s1_255, __lane_reverse_64_16); \	45448	__ret_255 = __rev0_255 * __noswap_splatq_laneq_f16(__rev1_255, __p2_255); \
45381	float16x4_t __rev2_255; __rev2_255 = __builtin_shufflevector(__s2_255, __s2_255, __lane_reverse_64_16); \	45449	__ret_255 = __builtin_shufflevector(__ret_255, __ret_255, __lane_reverse_128_16); \
45382	__ret_255 = __noswap_vfma_lane_f16(__rev0_255, -__rev1_255, __rev2_255, __p3_255); \
45383	__ret_255 = __builtin_shufflevector(__ret_255, __ret_255, __lane_reverse_64_16); \
45384	__ret_255; \	45450	__ret_255; \
45385	})	45451	})
45386	#endif	45452	#endif
45387		45453
45388	#ifdef __LITTLE_ENDIAN__	45454	#ifdef __LITTLE_ENDIAN__
45389	#define vfmsh_laneq_f16(__p0_256, __p1_256, __p2_256, __p3_256) __extension__ ({ \	45455	#define vmul_laneq_f16(__p0_256, __p1_256, __p2_256) __extension__ ({ \
45390	float16_t __ret_256; \	45456	float16x4_t __ret_256; \
45391	float16_t __s0_256 = __p0_256; \	45457	float16x4_t __s0_256 = __p0_256; \
45392	float16_t __s1_256 = __p1_256; \	45458	float16x8_t __s1_256 = __p1_256; \
45393	float16x8_t __s2_256 = __p2_256; \	45459	__ret_256 = __s0_256 * splat_laneq_f16(__s1_256, __p2_256); \
45394	__ret_256 = vfmah_laneq_f16(__s0_256, -__s1_256, __s2_256, __p3_256); \
45395	__ret_256; \	45460	__ret_256; \
45396	})	45461	})
45397	#else	45462	#else
45398	#define vfmsh_laneq_f16(__p0_257, __p1_257, __p2_257, __p3_257) __extension__ ({ \	45463	#define vmul_laneq_f16(__p0_257, __p1_257, __p2_257) __extension__ ({ \
45399	float16_t __ret_257; \	45464	float16x4_t __ret_257; \
45400	float16_t __s0_257 = __p0_257; \	45465	float16x4_t __s0_257 = __p0_257; \
45401	float16_t __s1_257 = __p1_257; \	45466	float16x8_t __s1_257 = __p1_257; \
45402	float16x8_t __s2_257 = __p2_257; \	45467	float16x4_t __rev0_257; __rev0_257 = __builtin_shufflevector(__s0_257, __s0_257, __lane_reverse_64_16); \
45403	float16x8_t __rev2_257; __rev2_257 = __builtin_shufflevector(__s2_257, __s2_257, __lane_reverse_128_16); \	45468	float16x8_t __rev1_257; __rev1_257 = __builtin_shufflevector(__s1_257, __s1_257, __lane_reverse_128_16); \
45404	__ret_257 = __noswap_vfmah_laneq_f16(__s0_257, -__s1_257, __rev2_257, __p3_257); \	45469	__ret_257 = __rev0_257 * __noswap_splat_laneq_f16(__rev1_257, __p2_257); \
		45470	__ret_257 = __builtin_shufflevector(__ret_257, __ret_257, __lane_reverse_64_16); \
45405	__ret_257; \	45471	__ret_257; \
45406	})	45472	})
45407	#endif	45473	#endif
45408		45474
45409	#ifdef __LITTLE_ENDIAN__	45475	#ifdef __LITTLE_ENDIAN__
45410	#define vfmsq_laneq_f16(__p0_258, __p1_258, __p2_258, __p3_258) __extension__ ({ \	45476	__ai __attribute__((target("fullfp16,neon"))) float16x8_t vmulxq_f16(float16x8_t __p0, float16x8_t __p1) {
		45477	float16x8_t __ret;
		45478	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vmulxq_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 40));
		45479	return __ret;
		45480	}
		45481	#else
		45482	__ai __attribute__((target("fullfp16,neon"))) float16x8_t vmulxq_f16(float16x8_t __p0, float16x8_t __p1) {
		45483	float16x8_t __ret;
		45484	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
		45485	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
		45486	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vmulxq_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 40));
		45487	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
		45488	return __ret;
		45489	}
		45490	__ai __attribute__((target("fullfp16,neon"))) float16x8_t __noswap_vmulxq_f16(float16x8_t __p0, float16x8_t __p1) {
		45491	float16x8_t __ret;
		45492	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vmulxq_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 40));
		45493	return __ret;
		45494	}
		45495	#endif
		45496
		45497	#ifdef __LITTLE_ENDIAN__
		45498	__ai __attribute__((target("fullfp16,neon"))) float16x4_t vmulx_f16(float16x4_t __p0, float16x4_t __p1) {
		45499	float16x4_t __ret;
		45500	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vmulx_f16(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 8));
		45501	return __ret;
		45502	}
		45503	#else
		45504	__ai __attribute__((target("fullfp16,neon"))) float16x4_t vmulx_f16(float16x4_t __p0, float16x4_t __p1) {
		45505	float16x4_t __ret;
		45506	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_16);
		45507	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
		45508	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vmulx_f16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 8));
		45509	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
		45510	return __ret;
		45511	}
		45512	__ai __attribute__((target("fullfp16,neon"))) float16x4_t __noswap_vmulx_f16(float16x4_t __p0, float16x4_t __p1) {
		45513	float16x4_t __ret;
		45514	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vmulx_f16(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 8));
		45515	return __ret;
		45516	}
		45517	#endif
		45518
		45519	#ifdef __LITTLE_ENDIAN__
		45520	#define vmulxh_lane_f16(__p0, __p1, __p2) __extension__ ({ \
		45521	float16_t __ret; \
		45522	float16_t __s0 = __p0; \
		45523	float16x4_t __s1 = __p1; \
		45524	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmulxh_lane_f16(__s0, __s1, __p2)); \
		45525	__ret; \
		45526	})
		45527	#else
		45528	#define vmulxh_lane_f16(__p0, __p1, __p2) __extension__ ({ \
		45529	float16_t __ret; \
		45530	float16_t __s0 = __p0; \
		45531	float16x4_t __s1 = __p1; \
		45532	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
		45533	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmulxh_lane_f16(__s0, __rev1, __p2)); \
		45534	__ret; \
		45535	})
		45536	#endif
		45537
		45538	#ifdef __LITTLE_ENDIAN__
		45539	#define vmulxq_lane_f16(__p0_258, __p1_258, __p2_258) __extension__ ({ \
45411	float16x8_t __ret_258; \	45540	float16x8_t __ret_258; \
45412	float16x8_t __s0_258 = __p0_258; \	45541	float16x8_t __s0_258 = __p0_258; \
45413	float16x8_t __s1_258 = __p1_258; \	45542	float16x4_t __s1_258 = __p1_258; \
45414	float16x8_t __s2_258 = __p2_258; \	45543	__ret_258 = vmulxq_f16(__s0_258, splatq_lane_f16(__s1_258, __p2_258)); \
45415	__ret_258 = vfmaq_laneq_f16(__s0_258, -__s1_258, __s2_258, __p3_258); \
45416	__ret_258; \	45544	__ret_258; \
45417	})	45545	})
45418	#else	45546	#else
45419	#define vfmsq_laneq_f16(__p0_259, __p1_259, __p2_259, __p3_259) __extension__ ({ \	45547	#define vmulxq_lane_f16(__p0_259, __p1_259, __p2_259) __extension__ ({ \
45420	float16x8_t __ret_259; \	45548	float16x8_t __ret_259; \
45421	float16x8_t __s0_259 = __p0_259; \	45549	float16x8_t __s0_259 = __p0_259; \
45422	float16x8_t __s1_259 = __p1_259; \	45550	float16x4_t __s1_259 = __p1_259; \
45423	float16x8_t __s2_259 = __p2_259; \
45424	float16x8_t __rev0_259; __rev0_259 = __builtin_shufflevector(__s0_259, __s0_259, __lane_reverse_128_16); \	45551	float16x8_t __rev0_259; __rev0_259 = __builtin_shufflevector(__s0_259, __s0_259, __lane_reverse_128_16); \
45425	float16x8_t __rev1_259; __rev1_259 = __builtin_shufflevector(__s1_259, __s1_259, __lane_reverse_128_16); \	45552	float16x4_t __rev1_259; __rev1_259 = __builtin_shufflevector(__s1_259, __s1_259, __lane_reverse_64_16); \
45426	float16x8_t __rev2_259; __rev2_259 = __builtin_shufflevector(__s2_259, __s2_259, __lane_reverse_128_16); \	45553	__ret_259 = __noswap_vmulxq_f16(__rev0_259, __noswap_splatq_lane_f16(__rev1_259, __p2_259)); \
45427	__ret_259 = __noswap_vfmaq_laneq_f16(__rev0_259, -__rev1_259, __rev2_259, __p3_259); \
45428	__ret_259 = __builtin_shufflevector(__ret_259, __ret_259, __lane_reverse_128_16); \	45554	__ret_259 = __builtin_shufflevector(__ret_259, __ret_259, __lane_reverse_128_16); \
45429	__ret_259; \	45555	__ret_259; \
45430	})	45556	})
45431	#endif	45557	#endif
45432		45558
45433	#ifdef __LITTLE_ENDIAN__	45559	#ifdef __LITTLE_ENDIAN__
45434	#define vfms_laneq_f16(__p0_260, __p1_260, __p2_260, __p3_260) __extension__ ({ \	45560	#define vmulx_lane_f16(__p0_260, __p1_260, __p2_260) __extension__ ({ \
45435	float16x4_t __ret_260; \	45561	float16x4_t __ret_260; \
45436	float16x4_t __s0_260 = __p0_260; \	45562	float16x4_t __s0_260 = __p0_260; \
45437	float16x4_t __s1_260 = __p1_260; \	45563	float16x4_t __s1_260 = __p1_260; \
45438	float16x8_t __s2_260 = __p2_260; \	45564	__ret_260 = vmulx_f16(__s0_260, splat_lane_f16(__s1_260, __p2_260)); \
45439	__ret_260 = vfma_laneq_f16(__s0_260, -__s1_260, __s2_260, __p3_260); \
45440	__ret_260; \	45565	__ret_260; \
45441	})	45566	})
45442	#else	45567	#else
45443	#define vfms_laneq_f16(__p0_261, __p1_261, __p2_261, __p3_261) __extension__ ({ \	45568	#define vmulx_lane_f16(__p0_261, __p1_261, __p2_261) __extension__ ({ \
45444	float16x4_t __ret_261; \	45569	float16x4_t __ret_261; \
45445	float16x4_t __s0_261 = __p0_261; \	45570	float16x4_t __s0_261 = __p0_261; \
45446	float16x4_t __s1_261 = __p1_261; \	45571	float16x4_t __s1_261 = __p1_261; \
45447	float16x8_t __s2_261 = __p2_261; \
45448	float16x4_t __rev0_261; __rev0_261 = __builtin_shufflevector(__s0_261, __s0_261, __lane_reverse_64_16); \	45572	float16x4_t __rev0_261; __rev0_261 = __builtin_shufflevector(__s0_261, __s0_261, __lane_reverse_64_16); \
45449	float16x4_t __rev1_261; __rev1_261 = __builtin_shufflevector(__s1_261, __s1_261, __lane_reverse_64_16); \	45573	float16x4_t __rev1_261; __rev1_261 = __builtin_shufflevector(__s1_261, __s1_261, __lane_reverse_64_16); \
45450	float16x8_t __rev2_261; __rev2_261 = __builtin_shufflevector(__s2_261, __s2_261, __lane_reverse_128_16); \	45574	__ret_261 = __noswap_vmulx_f16(__rev0_261, __noswap_splat_lane_f16(__rev1_261, __p2_261)); \
45451	__ret_261 = __noswap_vfma_laneq_f16(__rev0_261, -__rev1_261, __rev2_261, __p3_261); \
45452	__ret_261 = __builtin_shufflevector(__ret_261, __ret_261, __lane_reverse_64_16); \	45575	__ret_261 = __builtin_shufflevector(__ret_261, __ret_261, __lane_reverse_64_16); \
45453	__ret_261; \	45576	__ret_261; \
45454	})	45577	})
45455	#endif	45578	#endif
45456		45579
45457	#ifdef __LITTLE_ENDIAN__	45580	#ifdef __LITTLE_ENDIAN__
45458	#define vfmsq_n_f16(__p0, __p1, __p2) __extension__ ({ \	45581	#define vmulxh_laneq_f16(__p0, __p1, __p2) __extension__ ({ \
45459	float16x8_t __ret; \	45582	float16_t __ret; \
45460	float16x8_t __s0 = __p0; \	45583	float16_t __s0 = __p0; \
45461	float16x8_t __s1 = __p1; \	45584	float16x8_t __s1 = __p1; \
45462	float16_t __s2 = __p2; \	45585	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmulxh_laneq_f16(__s0, __s1, __p2)); \
45463	__ret = vfmaq_f16(__s0, -__s1, (float16x8_t) {__s2, __s2, __s2, __s2, __s2, __s2, __s2, __s2}); \
45464	__ret; \	45586	__ret; \
45465	})	45587	})
45466	#else	45588	#else
45467	#define vfmsq_n_f16(__p0, __p1, __p2) __extension__ ({ \	45589	#define vmulxh_laneq_f16(__p0, __p1, __p2) __extension__ ({ \
45468	float16x8_t __ret; \	45590	float16_t __ret; \
45469	float16x8_t __s0 = __p0; \	45591	float16_t __s0 = __p0; \
45470	float16x8_t __s1 = __p1; \	45592	float16x8_t __s1 = __p1; \
45471	float16_t __s2 = __p2; \
45472	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
45473	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \	45593	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
45474	__ret = __noswap_vfmaq_f16(__rev0, -__rev1, (float16x8_t) {__s2, __s2, __s2, __s2, __s2, __s2, __s2, __s2}); \	45594	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmulxh_laneq_f16(__s0, __rev1, __p2)); \
45475	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16); \
45476	__ret; \
45477	})
45478	#endif
45479
45480	#ifdef __LITTLE_ENDIAN__
45481	#define vfms_n_f16(__p0, __p1, __p2) __extension__ ({ \
45482	float16x4_t __ret; \
45483	float16x4_t __s0 = __p0; \
45484	float16x4_t __s1 = __p1; \
45485	float16_t __s2 = __p2; \
45486	__ret = vfma_f16(__s0, -__s1, (float16x4_t) {__s2, __s2, __s2, __s2}); \
45487	__ret; \
45488	})
45489	#else
45490	#define vfms_n_f16(__p0, __p1, __p2) __extension__ ({ \
45491	float16x4_t __ret; \
45492	float16x4_t __s0 = __p0; \
45493	float16x4_t __s1 = __p1; \
45494	float16_t __s2 = __p2; \
45495	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
45496	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
45497	__ret = __noswap_vfma_f16(__rev0, -__rev1, (float16x4_t) {__s2, __s2, __s2, __s2}); \
45498	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16); \
45499	__ret; \
45500	})
45501	#endif
45502
45503	#ifdef __LITTLE_ENDIAN__
45504	#define vmaxnmvq_f16(__p0) __extension__ ({ \
45505	float16_t __ret; \
45506	float16x8_t __s0 = __p0; \
45507	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxnmvq_f16(__builtin_bit_cast(int8x16_t, __s0))); \
45508	__ret; \
45509	})
45510	#else
45511	#define vmaxnmvq_f16(__p0) __extension__ ({ \
45512	float16_t __ret; \
45513	float16x8_t __s0 = __p0; \
45514	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
45515	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxnmvq_f16(__builtin_bit_cast(int8x16_t, __rev0))); \
45516	__ret; \
45517	})
45518	#endif
45519
45520	#ifdef __LITTLE_ENDIAN__
45521	#define vmaxnmv_f16(__p0) __extension__ ({ \
45522	float16_t __ret; \
45523	float16x4_t __s0 = __p0; \
45524	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxnmv_f16(__builtin_bit_cast(int8x8_t, __s0))); \
45525	__ret; \
45526	})
45527	#else
45528	#define vmaxnmv_f16(__p0) __extension__ ({ \
45529	float16_t __ret; \
45530	float16x4_t __s0 = __p0; \
45531	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
45532	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxnmv_f16(__builtin_bit_cast(int8x8_t, __rev0))); \
45533	__ret; \
45534	})
45535	#endif
45536
45537	#ifdef __LITTLE_ENDIAN__
45538	#define vmaxvq_f16(__p0) __extension__ ({ \
45539	float16_t __ret; \
45540	float16x8_t __s0 = __p0; \
45541	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxvq_f16(__builtin_bit_cast(int8x16_t, __s0))); \
45542	__ret; \
45543	})
45544	#else
45545	#define vmaxvq_f16(__p0) __extension__ ({ \
45546	float16_t __ret; \
45547	float16x8_t __s0 = __p0; \
45548	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
45549	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxvq_f16(__builtin_bit_cast(int8x16_t, __rev0))); \
45550	__ret; \
45551	})
45552	#endif
45553
45554	#ifdef __LITTLE_ENDIAN__
45555	#define vmaxv_f16(__p0) __extension__ ({ \
45556	float16_t __ret; \
45557	float16x4_t __s0 = __p0; \
45558	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxv_f16(__builtin_bit_cast(int8x8_t, __s0))); \
45559	__ret; \
45560	})
45561	#else
45562	#define vmaxv_f16(__p0) __extension__ ({ \
45563	float16_t __ret; \
45564	float16x4_t __s0 = __p0; \
45565	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
45566	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmaxv_f16(__builtin_bit_cast(int8x8_t, __rev0))); \
45567	__ret; \
45568	})
45569	#endif
45570
45571	#ifdef __LITTLE_ENDIAN__
45572	#define vminnmvq_f16(__p0) __extension__ ({ \
45573	float16_t __ret; \
45574	float16x8_t __s0 = __p0; \
45575	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminnmvq_f16(__builtin_bit_cast(int8x16_t, __s0))); \
45576	__ret; \
45577	})
45578	#else
45579	#define vminnmvq_f16(__p0) __extension__ ({ \
45580	float16_t __ret; \
45581	float16x8_t __s0 = __p0; \
45582	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
45583	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminnmvq_f16(__builtin_bit_cast(int8x16_t, __rev0))); \
45584	__ret; \
45585	})
45586	#endif
45587
45588	#ifdef __LITTLE_ENDIAN__
45589	#define vminnmv_f16(__p0) __extension__ ({ \
45590	float16_t __ret; \
45591	float16x4_t __s0 = __p0; \
45592	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminnmv_f16(__builtin_bit_cast(int8x8_t, __s0))); \
45593	__ret; \
45594	})
45595	#else
45596	#define vminnmv_f16(__p0) __extension__ ({ \
45597	float16_t __ret; \
45598	float16x4_t __s0 = __p0; \
45599	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
45600	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminnmv_f16(__builtin_bit_cast(int8x8_t, __rev0))); \
45601	__ret; \
45602	})
45603	#endif
45604
45605	#ifdef __LITTLE_ENDIAN__
45606	#define vminvq_f16(__p0) __extension__ ({ \
45607	float16_t __ret; \
45608	float16x8_t __s0 = __p0; \
45609	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminvq_f16(__builtin_bit_cast(int8x16_t, __s0))); \
45610	__ret; \
45611	})
45612	#else
45613	#define vminvq_f16(__p0) __extension__ ({ \
45614	float16_t __ret; \
45615	float16x8_t __s0 = __p0; \
45616	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_128_16); \
45617	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminvq_f16(__builtin_bit_cast(int8x16_t, __rev0))); \
45618	__ret; \
45619	})
45620	#endif
45621
45622	#ifdef __LITTLE_ENDIAN__
45623	#define vminv_f16(__p0) __extension__ ({ \
45624	float16_t __ret; \
45625	float16x4_t __s0 = __p0; \
45626	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminv_f16(__builtin_bit_cast(int8x8_t, __s0))); \
45627	__ret; \
45628	})
45629	#else
45630	#define vminv_f16(__p0) __extension__ ({ \
45631	float16_t __ret; \
45632	float16x4_t __s0 = __p0; \
45633	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__s0, __s0, __lane_reverse_64_16); \
45634	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vminv_f16(__builtin_bit_cast(int8x8_t, __rev0))); \
45635	__ret; \	45595	__ret; \
45636	})	45596	})
45637	#endif	45597	#endif
45638		45598
45639	#ifdef __LITTLE_ENDIAN__	45599	#ifdef __LITTLE_ENDIAN__
45640	#define vmulq_laneq_f16(__p0_262, __p1_262, __p2_262) __extension__ ({ \	45600	#define vmulxq_laneq_f16(__p0_262, __p1_262, __p2_262) __extension__ ({ \
45641	float16x8_t __ret_262; \	45601	float16x8_t __ret_262; \
45642	float16x8_t __s0_262 = __p0_262; \	45602	float16x8_t __s0_262 = __p0_262; \
45643	float16x8_t __s1_262 = __p1_262; \	45603	float16x8_t __s1_262 = __p1_262; \
45644	__ret_262 = __s0_262 * splatq_laneq_f16(__s1_262, __p2_262); \	45604	__ret_262 = vmulxq_f16(__s0_262, splatq_laneq_f16(__s1_262, __p2_262)); \
45645	__ret_262; \	45605	__ret_262; \
45646	})	45606	})
45647	#else	45607	#else
45648	#define vmulq_laneq_f16(__p0_263, __p1_263, __p2_263) __extension__ ({ \	45608	#define vmulxq_laneq_f16(__p0_263, __p1_263, __p2_263) __extension__ ({ \
45649	float16x8_t __ret_263; \	45609	float16x8_t __ret_263; \
45650	float16x8_t __s0_263 = __p0_263; \	45610	float16x8_t __s0_263 = __p0_263; \
45651	float16x8_t __s1_263 = __p1_263; \	45611	float16x8_t __s1_263 = __p1_263; \
45652	float16x8_t __rev0_263; __rev0_263 = __builtin_shufflevector(__s0_263, __s0_263, __lane_reverse_128_16); \	45612	float16x8_t __rev0_263; __rev0_263 = __builtin_shufflevector(__s0_263, __s0_263, __lane_reverse_128_16); \
45653	float16x8_t __rev1_263; __rev1_263 = __builtin_shufflevector(__s1_263, __s1_263, __lane_reverse_128_16); \	45613	float16x8_t __rev1_263; __rev1_263 = __builtin_shufflevector(__s1_263, __s1_263, __lane_reverse_128_16); \
45654	__ret_263 = __rev0_263 * __noswap_splatq_laneq_f16(__rev1_263, __p2_263); \	45614	__ret_263 = __noswap_vmulxq_f16(__rev0_263, __noswap_splatq_laneq_f16(__rev1_263, __p2_263)); \
45655	__ret_263 = __builtin_shufflevector(__ret_263, __ret_263, __lane_reverse_128_16); \	45615	__ret_263 = __builtin_shufflevector(__ret_263, __ret_263, __lane_reverse_128_16); \
45656	__ret_263; \	45616	__ret_263; \
45657	})	45617	})
45658	#endif	45618	#endif
45659		45619
45660	#ifdef __LITTLE_ENDIAN__	45620	#ifdef __LITTLE_ENDIAN__
45661	#define vmul_laneq_f16(__p0_264, __p1_264, __p2_264) __extension__ ({ \	45621	#define vmulx_laneq_f16(__p0_264, __p1_264, __p2_264) __extension__ ({ \
45662	float16x4_t __ret_264; \	45622	float16x4_t __ret_264; \
45663	float16x4_t __s0_264 = __p0_264; \	45623	float16x4_t __s0_264 = __p0_264; \
45664	float16x8_t __s1_264 = __p1_264; \	45624	float16x8_t __s1_264 = __p1_264; \
45665	__ret_264 = __s0_264 * splat_laneq_f16(__s1_264, __p2_264); \	45625	__ret_264 = vmulx_f16(__s0_264, splat_laneq_f16(__s1_264, __p2_264)); \
45666	__ret_264; \	45626	__ret_264; \
45667	})	45627	})
45668	#else	45628	#else
45669	#define vmul_laneq_f16(__p0_265, __p1_265, __p2_265) __extension__ ({ \	45629	#define vmulx_laneq_f16(__p0_265, __p1_265, __p2_265) __extension__ ({ \
45670	float16x4_t __ret_265; \	45630	float16x4_t __ret_265; \
45671	float16x4_t __s0_265 = __p0_265; \	45631	float16x4_t __s0_265 = __p0_265; \
45672	float16x8_t __s1_265 = __p1_265; \	45632	float16x8_t __s1_265 = __p1_265; \
45673	float16x4_t __rev0_265; __rev0_265 = __builtin_shufflevector(__s0_265, __s0_265, __lane_reverse_64_16); \	45633	float16x4_t __rev0_265; __rev0_265 = __builtin_shufflevector(__s0_265, __s0_265, __lane_reverse_64_16); \
45674	float16x8_t __rev1_265; __rev1_265 = __builtin_shufflevector(__s1_265, __s1_265, __lane_reverse_128_16); \	45634	float16x8_t __rev1_265; __rev1_265 = __builtin_shufflevector(__s1_265, __s1_265, __lane_reverse_128_16); \
45675	__ret_265 = __rev0_265 * __noswap_splat_laneq_f16(__rev1_265, __p2_265); \	45635	__ret_265 = __noswap_vmulx_f16(__rev0_265, __noswap_splat_laneq_f16(__rev1_265, __p2_265)); \
45676	__ret_265 = __builtin_shufflevector(__ret_265, __ret_265, __lane_reverse_64_16); \	45636	__ret_265 = __builtin_shufflevector(__ret_265, __ret_265, __lane_reverse_64_16); \
45677	__ret_265; \	45637	__ret_265; \
45678	})	45638	})
45679	#endif	45639	#endif
45680		45640
45681	#ifdef __LITTLE_ENDIAN__
45682	__ai __attribute__((target("fullfp16,neon"))) float16x8_t vmulxq_f16(float16x8_t __p0, float16x8_t __p1) {
45683	float16x8_t __ret;
45684	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vmulxq_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 40));
45685	return __ret;
45686	}
45687	#else
45688	__ai __attribute__((target("fullfp16,neon"))) float16x8_t vmulxq_f16(float16x8_t __p0, float16x8_t __p1) {
45689	float16x8_t __ret;
45690	float16x8_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_128_16);
45691	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_128_16);
45692	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vmulxq_f16(__builtin_bit_cast(int8x16_t, __rev0), __builtin_bit_cast(int8x16_t, __rev1), 40));
45693	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_128_16);
45694	return __ret;
45695	}
45696	__ai __attribute__((target("fullfp16,neon"))) float16x8_t __noswap_vmulxq_f16(float16x8_t __p0, float16x8_t __p1) {
45697	float16x8_t __ret;
45698	__ret = __builtin_bit_cast(float16x8_t, __builtin_neon_vmulxq_f16(__builtin_bit_cast(int8x16_t, __p0), __builtin_bit_cast(int8x16_t, __p1), 40));
45699	return __ret;
45700	}
45701	#endif
45702
45703	#ifdef __LITTLE_ENDIAN__
45704	__ai __attribute__((target("fullfp16,neon"))) float16x4_t vmulx_f16(float16x4_t __p0, float16x4_t __p1) {
45705	float16x4_t __ret;
45706	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vmulx_f16(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 8));
45707	return __ret;
45708	}
45709	#else
45710	__ai __attribute__((target("fullfp16,neon"))) float16x4_t vmulx_f16(float16x4_t __p0, float16x4_t __p1) {
45711	float16x4_t __ret;
45712	float16x4_t __rev0; __rev0 = __builtin_shufflevector(__p0, __p0, __lane_reverse_64_16);
45713	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__p1, __p1, __lane_reverse_64_16);
45714	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vmulx_f16(__builtin_bit_cast(int8x8_t, __rev0), __builtin_bit_cast(int8x8_t, __rev1), 8));
45715	__ret = __builtin_shufflevector(__ret, __ret, __lane_reverse_64_16);
45716	return __ret;
45717	}
45718	__ai __attribute__((target("fullfp16,neon"))) float16x4_t __noswap_vmulx_f16(float16x4_t __p0, float16x4_t __p1) {
45719	float16x4_t __ret;
45720	__ret = __builtin_bit_cast(float16x4_t, __builtin_neon_vmulx_f16(__builtin_bit_cast(int8x8_t, __p0), __builtin_bit_cast(int8x8_t, __p1), 8));
45721	return __ret;
45722	}
45723	#endif
45724
45725	#ifdef __LITTLE_ENDIAN__
45726	#define vmulxh_lane_f16(__p0, __p1, __p2) __extension__ ({ \
45727	float16_t __ret; \
45728	float16_t __s0 = __p0; \
45729	float16x4_t __s1 = __p1; \
45730	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmulxh_lane_f16(__s0, __s1, __p2)); \
45731	__ret; \
45732	})
45733	#else
45734	#define vmulxh_lane_f16(__p0, __p1, __p2) __extension__ ({ \
45735	float16_t __ret; \
45736	float16_t __s0 = __p0; \
45737	float16x4_t __s1 = __p1; \
45738	float16x4_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_64_16); \
45739	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmulxh_lane_f16(__s0, __rev1, __p2)); \
45740	__ret; \
45741	})
45742	#endif
45743
45744	#ifdef __LITTLE_ENDIAN__
45745	#define vmulxq_lane_f16(__p0_266, __p1_266, __p2_266) __extension__ ({ \
45746	float16x8_t __ret_266; \
45747	float16x8_t __s0_266 = __p0_266; \
45748	float16x4_t __s1_266 = __p1_266; \
45749	__ret_266 = vmulxq_f16(__s0_266, splatq_lane_f16(__s1_266, __p2_266)); \
45750	__ret_266; \
45751	})
45752	#else
45753	#define vmulxq_lane_f16(__p0_267, __p1_267, __p2_267) __extension__ ({ \
45754	float16x8_t __ret_267; \
45755	float16x8_t __s0_267 = __p0_267; \
45756	float16x4_t __s1_267 = __p1_267; \
45757	float16x8_t __rev0_267; __rev0_267 = __builtin_shufflevector(__s0_267, __s0_267, __lane_reverse_128_16); \
45758	float16x4_t __rev1_267; __rev1_267 = __builtin_shufflevector(__s1_267, __s1_267, __lane_reverse_64_16); \
45759	__ret_267 = __noswap_vmulxq_f16(__rev0_267, __noswap_splatq_lane_f16(__rev1_267, __p2_267)); \
45760	__ret_267 = __builtin_shufflevector(__ret_267, __ret_267, __lane_reverse_128_16); \
45761	__ret_267; \
45762	})
45763	#endif
45764
45765	#ifdef __LITTLE_ENDIAN__
45766	#define vmulx_lane_f16(__p0_268, __p1_268, __p2_268) __extension__ ({ \
45767	float16x4_t __ret_268; \
45768	float16x4_t __s0_268 = __p0_268; \
45769	float16x4_t __s1_268 = __p1_268; \
45770	__ret_268 = vmulx_f16(__s0_268, splat_lane_f16(__s1_268, __p2_268)); \
45771	__ret_268; \
45772	})
45773	#else
45774	#define vmulx_lane_f16(__p0_269, __p1_269, __p2_269) __extension__ ({ \
45775	float16x4_t __ret_269; \
45776	float16x4_t __s0_269 = __p0_269; \
45777	float16x4_t __s1_269 = __p1_269; \
45778	float16x4_t __rev0_269; __rev0_269 = __builtin_shufflevector(__s0_269, __s0_269, __lane_reverse_64_16); \
45779	float16x4_t __rev1_269; __rev1_269 = __builtin_shufflevector(__s1_269, __s1_269, __lane_reverse_64_16); \
45780	__ret_269 = __noswap_vmulx_f16(__rev0_269, __noswap_splat_lane_f16(__rev1_269, __p2_269)); \
45781	__ret_269 = __builtin_shufflevector(__ret_269, __ret_269, __lane_reverse_64_16); \
45782	__ret_269; \
45783	})
45784	#endif
45785
45786	#ifdef __LITTLE_ENDIAN__
45787	#define vmulxh_laneq_f16(__p0, __p1, __p2) __extension__ ({ \
45788	float16_t __ret; \
45789	float16_t __s0 = __p0; \
45790	float16x8_t __s1 = __p1; \
45791	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmulxh_laneq_f16(__s0, __s1, __p2)); \
45792	__ret; \
45793	})
45794	#else
45795	#define vmulxh_laneq_f16(__p0, __p1, __p2) __extension__ ({ \
45796	float16_t __ret; \
45797	float16_t __s0 = __p0; \
45798	float16x8_t __s1 = __p1; \
45799	float16x8_t __rev1; __rev1 = __builtin_shufflevector(__s1, __s1, __lane_reverse_128_16); \
45800	__ret = __builtin_bit_cast(float16_t, __builtin_neon_vmulxh_laneq_f16(__s0, __rev1, __p2)); \
45801	__ret; \
45802	})
45803	#endif
45804
45805	#ifdef __LITTLE_ENDIAN__
45806	#define vmulxq_laneq_f16(__p0_270, __p1_270, __p2_270) __extension__ ({ \
45807	float16x8_t __ret_270; \
45808	float16x8_t __s0_270 = __p0_270; \
45809	float16x8_t __s1_270 = __p1_270; \
45810	__ret_270 = vmulxq_f16(__s0_270, splatq_laneq_f16(__s1_270, __p2_270)); \
45811	__ret_270; \
45812	})
45813	#else
45814	#define vmulxq_laneq_f16(__p0_271, __p1_271, __p2_271) __extension__ ({ \
45815	float16x8_t __ret_271; \
45816	float16x8_t __s0_271 = __p0_271; \
45817	float16x8_t __s1_271 = __p1_271; \
45818	float16x8_t __rev0_271; __rev0_271 = __builtin_shufflevector(__s0_271, __s0_271, __lane_reverse_128_16); \
45819	float16x8_t __rev1_271; __rev1_271 = __builtin_shufflevector(__s1_271, __s1_271, __lane_reverse_128_16); \
45820	__ret_271 = __noswap_vmulxq_f16(__rev0_271, __noswap_splatq_laneq_f16(__rev1_271, __p2_271)); \
45821	__ret_271 = __builtin_shufflevector(__ret_271, __ret_271, __lane_reverse_128_16); \
45822	__ret_271; \
45823	})
45824	#endif
45825
45826	#ifdef __LITTLE_ENDIAN__
45827	#define vmulx_laneq_f16(__p0_272, __p1_272, __p2_272) __extension__ ({ \
45828	float16x4_t __ret_272; \
45829	float16x4_t __s0_272 = __p0_272; \
45830	float16x8_t __s1_272 = __p1_272; \
45831	__ret_272 = vmulx_f16(__s0_272, splat_laneq_f16(__s1_272, __p2_272)); \
45832	__ret_272; \
45833	})
45834	#else
45835	#define vmulx_laneq_f16(__p0_273, __p1_273, __p2_273) __extension__ ({ \
45836	float16x4_t __ret_273; \
45837	float16x4_t __s0_273 = __p0_273; \
45838	float16x8_t __s1_273 = __p1_273; \
45839	float16x4_t __rev0_273; __rev0_273 = __builtin_shufflevector(__s0_273, __s0_273, __lane_reverse_64_16); \
45840	float16x8_t __rev1_273; __rev1_273 = __builtin_shufflevector(__s1_273, __s1_273, __lane_reverse_128_16); \
45841	__ret_273 = __noswap_vmulx_f16(__rev0_273, __noswap_splat_laneq_f16(__rev1_273, __p2_273)); \
45842	__ret_273 = __builtin_shufflevector(__ret_273, __ret_273, __lane_reverse_64_16); \
45843	__ret_273; \
45844	})
45845	#endif
45846
45847	#ifdef __LITTLE_ENDIAN__	45641	#ifdef __LITTLE_ENDIAN__
45848	#define vmulxq_n_f16(__p0, __p1) __extension__ ({ \	45642	#define vmulxq_n_f16(__p0, __p1) __extension__ ({ \
45849	float16x8_t __ret; \	45643	float16x8_t __ret; \
...	@@ -46068,98 +45862,98 @@ __ai __attribute__((target("fullfp16,neon"))) float16x4_t vsqrt_f16(float16x4_t	...	@@ -46068,98 +45862,98 @@ __ai __attribute__((target("fullfp16,neon"))) float16x4_t vsqrt_f16(float16x4_t
46068	#endif	45862	#endif
46069		45863
46070	#ifdef __LITTLE_ENDIAN__	45864	#ifdef __LITTLE_ENDIAN__
46071	#define vsudotq_laneq_s32(__p0_274, __p1_274, __p2_274, __p3_274) __extension__ ({ \	45865	#define vsudotq_laneq_s32(__p0_266, __p1_266, __p2_266, __p3_266) __extension__ ({ \
46072	int32x4_t __ret_274; \	45866	int32x4_t __ret_266; \
46073	int32x4_t __s0_274 = __p0_274; \	45867	int32x4_t __s0_266 = __p0_266; \
46074	int8x16_t __s1_274 = __p1_274; \	45868	int8x16_t __s1_266 = __p1_266; \
46075	uint8x16_t __s2_274 = __p2_274; \	45869	uint8x16_t __s2_266 = __p2_266; \
46076	__ret_274 = vusdotq_s32(__s0_274, __builtin_bit_cast(uint8x16_t, splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_274), __p3_274)), __s1_274); \	45870	__ret_266 = vusdotq_s32(__s0_266, __builtin_bit_cast(uint8x16_t, splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_266), __p3_266)), __s1_266); \
46077	__ret_274; \	45871	__ret_266; \
46078	})	45872	})
46079	#else	45873	#else
46080	#define vsudotq_laneq_s32(__p0_275, __p1_275, __p2_275, __p3_275) __extension__ ({ \	45874	#define vsudotq_laneq_s32(__p0_267, __p1_267, __p2_267, __p3_267) __extension__ ({ \
46081	int32x4_t __ret_275; \	45875	int32x4_t __ret_267; \
46082	int32x4_t __s0_275 = __p0_275; \	45876	int32x4_t __s0_267 = __p0_267; \
46083	int8x16_t __s1_275 = __p1_275; \	45877	int8x16_t __s1_267 = __p1_267; \
46084	uint8x16_t __s2_275 = __p2_275; \	45878	uint8x16_t __s2_267 = __p2_267; \
46085	int32x4_t __rev0_275; __rev0_275 = __builtin_shufflevector(__s0_275, __s0_275, __lane_reverse_128_32); \	45879	int32x4_t __rev0_267; __rev0_267 = __builtin_shufflevector(__s0_267, __s0_267, __lane_reverse_128_32); \
46086	int8x16_t __rev1_275; __rev1_275 = __builtin_shufflevector(__s1_275, __s1_275, __lane_reverse_128_8); \	45880	int8x16_t __rev1_267; __rev1_267 = __builtin_shufflevector(__s1_267, __s1_267, __lane_reverse_128_8); \
46087	uint8x16_t __rev2_275; __rev2_275 = __builtin_shufflevector(__s2_275, __s2_275, __lane_reverse_128_8); \	45881	uint8x16_t __rev2_267; __rev2_267 = __builtin_shufflevector(__s2_267, __s2_267, __lane_reverse_128_8); \
46088	__ret_275 = __noswap_vusdotq_s32(__rev0_275, __builtin_bit_cast(uint8x16_t, __noswap_splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_275), __p3_275)), __rev1_275); \	45882	__ret_267 = __noswap_vusdotq_s32(__rev0_267, __builtin_bit_cast(uint8x16_t, __noswap_splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_267), __p3_267)), __rev1_267); \
46089	__ret_275 = __builtin_shufflevector(__ret_275, __ret_275, __lane_reverse_128_32); \	45883	__ret_267 = __builtin_shufflevector(__ret_267, __ret_267, __lane_reverse_128_32); \
46090	__ret_275; \	45884	__ret_267; \
46091	})	45885	})
46092	#endif	45886	#endif
46093		45887
46094	#ifdef __LITTLE_ENDIAN__	45888	#ifdef __LITTLE_ENDIAN__
46095	#define vsudot_laneq_s32(__p0_276, __p1_276, __p2_276, __p3_276) __extension__ ({ \	45889	#define vsudot_laneq_s32(__p0_268, __p1_268, __p2_268, __p3_268) __extension__ ({ \
46096	int32x2_t __ret_276; \	45890	int32x2_t __ret_268; \
46097	int32x2_t __s0_276 = __p0_276; \	45891	int32x2_t __s0_268 = __p0_268; \
46098	int8x8_t __s1_276 = __p1_276; \	45892	int8x8_t __s1_268 = __p1_268; \
46099	uint8x16_t __s2_276 = __p2_276; \	45893	uint8x16_t __s2_268 = __p2_268; \
46100	__ret_276 = vusdot_s32(__s0_276, __builtin_bit_cast(uint8x8_t, splat_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_276), __p3_276)), __s1_276); \	45894	__ret_268 = vusdot_s32(__s0_268, __builtin_bit_cast(uint8x8_t, splat_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_268), __p3_268)), __s1_268); \
46101	__ret_276; \	45895	__ret_268; \
46102	})	45896	})
46103	#else	45897	#else
46104	#define vsudot_laneq_s32(__p0_277, __p1_277, __p2_277, __p3_277) __extension__ ({ \	45898	#define vsudot_laneq_s32(__p0_269, __p1_269, __p2_269, __p3_269) __extension__ ({ \
46105	int32x2_t __ret_277; \	45899	int32x2_t __ret_269; \
46106	int32x2_t __s0_277 = __p0_277; \	45900	int32x2_t __s0_269 = __p0_269; \
46107	int8x8_t __s1_277 = __p1_277; \	45901	int8x8_t __s1_269 = __p1_269; \
46108	uint8x16_t __s2_277 = __p2_277; \	45902	uint8x16_t __s2_269 = __p2_269; \
46109	int32x2_t __rev0_277; __rev0_277 = __builtin_shufflevector(__s0_277, __s0_277, __lane_reverse_64_32); \	45903	int32x2_t __rev0_269; __rev0_269 = __builtin_shufflevector(__s0_269, __s0_269, __lane_reverse_64_32); \
46110	int8x8_t __rev1_277; __rev1_277 = __builtin_shufflevector(__s1_277, __s1_277, __lane_reverse_64_8); \	45904	int8x8_t __rev1_269; __rev1_269 = __builtin_shufflevector(__s1_269, __s1_269, __lane_reverse_64_8); \
46111	uint8x16_t __rev2_277; __rev2_277 = __builtin_shufflevector(__s2_277, __s2_277, __lane_reverse_128_8); \	45905	uint8x16_t __rev2_269; __rev2_269 = __builtin_shufflevector(__s2_269, __s2_269, __lane_reverse_128_8); \
46112	__ret_277 = __noswap_vusdot_s32(__rev0_277, __builtin_bit_cast(uint8x8_t, __noswap_splat_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_277), __p3_277)), __rev1_277); \	45906	__ret_269 = __noswap_vusdot_s32(__rev0_269, __builtin_bit_cast(uint8x8_t, __noswap_splat_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_269), __p3_269)), __rev1_269); \
46113	__ret_277 = __builtin_shufflevector(__ret_277, __ret_277, __lane_reverse_64_32); \	45907	__ret_269 = __builtin_shufflevector(__ret_269, __ret_269, __lane_reverse_64_32); \
46114	__ret_277; \	45908	__ret_269; \
46115	})	45909	})
46116	#endif	45910	#endif
46117		45911
46118	#ifdef __LITTLE_ENDIAN__	45912	#ifdef __LITTLE_ENDIAN__
46119	#define vusdotq_laneq_s32(__p0_278, __p1_278, __p2_278, __p3_278) __extension__ ({ \	45913	#define vusdotq_laneq_s32(__p0_270, __p1_270, __p2_270, __p3_270) __extension__ ({ \
46120	int32x4_t __ret_278; \	45914	int32x4_t __ret_270; \
46121	int32x4_t __s0_278 = __p0_278; \	45915	int32x4_t __s0_270 = __p0_270; \
46122	uint8x16_t __s1_278 = __p1_278; \	45916	uint8x16_t __s1_270 = __p1_270; \
46123	int8x16_t __s2_278 = __p2_278; \	45917	int8x16_t __s2_270 = __p2_270; \
46124	__ret_278 = vusdotq_s32(__s0_278, __s1_278, __builtin_bit_cast(int8x16_t, splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_278), __p3_278))); \	45918	__ret_270 = vusdotq_s32(__s0_270, __s1_270, __builtin_bit_cast(int8x16_t, splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_270), __p3_270))); \
46125	__ret_278; \	45919	__ret_270; \
46126	})	45920	})
46127	#else	45921	#else
46128	#define vusdotq_laneq_s32(__p0_279, __p1_279, __p2_279, __p3_279) __extension__ ({ \	45922	#define vusdotq_laneq_s32(__p0_271, __p1_271, __p2_271, __p3_271) __extension__ ({ \
46129	int32x4_t __ret_279; \	45923	int32x4_t __ret_271; \
46130	int32x4_t __s0_279 = __p0_279; \	45924	int32x4_t __s0_271 = __p0_271; \
46131	uint8x16_t __s1_279 = __p1_279; \	45925	uint8x16_t __s1_271 = __p1_271; \
46132	int8x16_t __s2_279 = __p2_279; \	45926	int8x16_t __s2_271 = __p2_271; \
46133	int32x4_t __rev0_279; __rev0_279 = __builtin_shufflevector(__s0_279, __s0_279, __lane_reverse_128_32); \	45927	int32x4_t __rev0_271; __rev0_271 = __builtin_shufflevector(__s0_271, __s0_271, __lane_reverse_128_32); \
46134	uint8x16_t __rev1_279; __rev1_279 = __builtin_shufflevector(__s1_279, __s1_279, __lane_reverse_128_8); \	45928	uint8x16_t __rev1_271; __rev1_271 = __builtin_shufflevector(__s1_271, __s1_271, __lane_reverse_128_8); \
46135	int8x16_t __rev2_279; __rev2_279 = __builtin_shufflevector(__s2_279, __s2_279, __lane_reverse_128_8); \	45929	int8x16_t __rev2_271; __rev2_271 = __builtin_shufflevector(__s2_271, __s2_271, __lane_reverse_128_8); \
46136	__ret_279 = __noswap_vusdotq_s32(__rev0_279, __rev1_279, __builtin_bit_cast(int8x16_t, __noswap_splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_279), __p3_279))); \	45930	__ret_271 = __noswap_vusdotq_s32(__rev0_271, __rev1_271, __builtin_bit_cast(int8x16_t, __noswap_splatq_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_271), __p3_271))); \
46137	__ret_279 = __builtin_shufflevector(__ret_279, __ret_279, __lane_reverse_128_32); \	45931	__ret_271 = __builtin_shufflevector(__ret_271, __ret_271, __lane_reverse_128_32); \
46138	__ret_279; \	45932	__ret_271; \
46139	})	45933	})
46140	#endif	45934	#endif
46141		45935
46142	#ifdef __LITTLE_ENDIAN__	45936	#ifdef __LITTLE_ENDIAN__
46143	#define vusdot_laneq_s32(__p0_280, __p1_280, __p2_280, __p3_280) __extension__ ({ \	45937	#define vusdot_laneq_s32(__p0_272, __p1_272, __p2_272, __p3_272) __extension__ ({ \
46144	int32x2_t __ret_280; \	45938	int32x2_t __ret_272; \
46145	int32x2_t __s0_280 = __p0_280; \	45939	int32x2_t __s0_272 = __p0_272; \
46146	uint8x8_t __s1_280 = __p1_280; \	45940	uint8x8_t __s1_272 = __p1_272; \
46147	int8x16_t __s2_280 = __p2_280; \	45941	int8x16_t __s2_272 = __p2_272; \
46148	__ret_280 = vusdot_s32(__s0_280, __s1_280, __builtin_bit_cast(int8x8_t, splat_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_280), __p3_280))); \	45942	__ret_272 = vusdot_s32(__s0_272, __s1_272, __builtin_bit_cast(int8x8_t, splat_laneq_s32(__builtin_bit_cast(int32x4_t, __s2_272), __p3_272))); \
46149	__ret_280; \	45943	__ret_272; \
46150	})	45944	})
46151	#else	45945	#else
46152	#define vusdot_laneq_s32(__p0_281, __p1_281, __p2_281, __p3_281) __extension__ ({ \	45946	#define vusdot_laneq_s32(__p0_273, __p1_273, __p2_273, __p3_273) __extension__ ({ \
46153	int32x2_t __ret_281; \	45947	int32x2_t __ret_273; \
46154	int32x2_t __s0_281 = __p0_281; \	45948	int32x2_t __s0_273 = __p0_273; \
46155	uint8x8_t __s1_281 = __p1_281; \	45949	uint8x8_t __s1_273 = __p1_273; \
46156	int8x16_t __s2_281 = __p2_281; \	45950	int8x16_t __s2_273 = __p2_273; \
46157	int32x2_t __rev0_281; __rev0_281 = __builtin_shufflevector(__s0_281, __s0_281, __lane_reverse_64_32); \	45951	int32x2_t __rev0_273; __rev0_273 = __builtin_shufflevector(__s0_273, __s0_273, __lane_reverse_64_32); \
46158	uint8x8_t __rev1_281; __rev1_281 = __builtin_shufflevector(__s1_281, __s1_281, __lane_reverse_64_8); \	45952	uint8x8_t __rev1_273; __rev1_273 = __builtin_shufflevector(__s1_273, __s1_273, __lane_reverse_64_8); \
46159	int8x16_t __rev2_281; __rev2_281 = __builtin_shufflevector(__s2_281, __s2_281, __lane_reverse_128_8); \	45953	int8x16_t __rev2_273; __rev2_273 = __builtin_shufflevector(__s2_273, __s2_273, __lane_reverse_128_8); \
46160	__ret_281 = __noswap_vusdot_s32(__rev0_281, __rev1_281, __builtin_bit_cast(int8x8_t, __noswap_splat_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_281), __p3_281))); \	45954	__ret_273 = __noswap_vusdot_s32(__rev0_273, __rev1_273, __builtin_bit_cast(int8x8_t, __noswap_splat_laneq_s32(__builtin_bit_cast(int32x4_t, __rev2_273), __p3_273))); \
46161	__ret_281 = __builtin_shufflevector(__ret_281, __ret_281, __lane_reverse_64_32); \	45955	__ret_273 = __builtin_shufflevector(__ret_273, __ret_273, __lane_reverse_64_32); \
46162	__ret_281; \	45956	__ret_273; \
46163	})	45957	})
46164	#endif	45958	#endif
46165		45959
...	@@ -48579,974 +48373,1058 @@ __ai __attribute__((target("neon"))) float64x2_t vcombine_f64(float64x1_t __p0,	...	@@ -48579,974 +48373,1058 @@ __ai __attribute__((target("neon"))) float64x2_t vcombine_f64(float64x1_t __p0,
48579	#endif	48373	#endif
48580		48374
48581	#ifdef __LITTLE_ENDIAN__	48375	#ifdef __LITTLE_ENDIAN__
48582	#define vcopyq_lane_p8(__p0_282, __p1_282, __p2_282, __p3_282) __extension__ ({ \	48376	#define vcopyq_lane_p8(__p0_274, __p1_274, __p2_274, __p3_274) __extension__ ({ \
48583	poly8x16_t __ret_282; \	48377	poly8x16_t __ret_274; \
48584	poly8x16_t __s0_282 = __p0_282; \	48378	poly8x16_t __s0_274 = __p0_274; \
48585	poly8x8_t __s2_282 = __p2_282; \	48379	poly8x8_t __s2_274 = __p2_274; \
48586	__ret_282 = vsetq_lane_p8(vget_lane_p8(__s2_282, __p3_282), __s0_282, __p1_282); \	48380	__ret_274 = vsetq_lane_p8(vget_lane_p8(__s2_274, __p3_274), __s0_274, __p1_274); \
		48381	__ret_274; \
		48382	})
		48383	#else
		48384	#define vcopyq_lane_p8(__p0_275, __p1_275, __p2_275, __p3_275) __extension__ ({ \
		48385	poly8x16_t __ret_275; \
		48386	poly8x16_t __s0_275 = __p0_275; \
		48387	poly8x8_t __s2_275 = __p2_275; \
		48388	poly8x16_t __rev0_275; __rev0_275 = __builtin_shufflevector(__s0_275, __s0_275, __lane_reverse_128_8); \
		48389	poly8x8_t __rev2_275; __rev2_275 = __builtin_shufflevector(__s2_275, __s2_275, __lane_reverse_64_8); \
		48390	__ret_275 = __noswap_vsetq_lane_p8(__noswap_vget_lane_p8(__rev2_275, __p3_275), __rev0_275, __p1_275); \
		48391	__ret_275 = __builtin_shufflevector(__ret_275, __ret_275, __lane_reverse_128_8); \
		48392	__ret_275; \
		48393	})
		48394	#endif
		48395
		48396	#ifdef __LITTLE_ENDIAN__
		48397	#define vcopyq_lane_p16(__p0_276, __p1_276, __p2_276, __p3_276) __extension__ ({ \
		48398	poly16x8_t __ret_276; \
		48399	poly16x8_t __s0_276 = __p0_276; \
		48400	poly16x4_t __s2_276 = __p2_276; \
		48401	__ret_276 = vsetq_lane_p16(vget_lane_p16(__s2_276, __p3_276), __s0_276, __p1_276); \
		48402	__ret_276; \
		48403	})
		48404	#else
		48405	#define vcopyq_lane_p16(__p0_277, __p1_277, __p2_277, __p3_277) __extension__ ({ \
		48406	poly16x8_t __ret_277; \
		48407	poly16x8_t __s0_277 = __p0_277; \
		48408	poly16x4_t __s2_277 = __p2_277; \
		48409	poly16x8_t __rev0_277; __rev0_277 = __builtin_shufflevector(__s0_277, __s0_277, __lane_reverse_128_16); \
		48410	poly16x4_t __rev2_277; __rev2_277 = __builtin_shufflevector(__s2_277, __s2_277, __lane_reverse_64_16); \
		48411	__ret_277 = __noswap_vsetq_lane_p16(__noswap_vget_lane_p16(__rev2_277, __p3_277), __rev0_277, __p1_277); \
		48412	__ret_277 = __builtin_shufflevector(__ret_277, __ret_277, __lane_reverse_128_16); \
		48413	__ret_277; \
		48414	})
		48415	#endif
		48416
		48417	#ifdef __LITTLE_ENDIAN__
		48418	#define vcopyq_lane_u8(__p0_278, __p1_278, __p2_278, __p3_278) __extension__ ({ \
		48419	uint8x16_t __ret_278; \
		48420	uint8x16_t __s0_278 = __p0_278; \
		48421	uint8x8_t __s2_278 = __p2_278; \
		48422	__ret_278 = vsetq_lane_u8(vget_lane_u8(__s2_278, __p3_278), __s0_278, __p1_278); \
		48423	__ret_278; \
		48424	})
		48425	#else
		48426	#define vcopyq_lane_u8(__p0_279, __p1_279, __p2_279, __p3_279) __extension__ ({ \
		48427	uint8x16_t __ret_279; \
		48428	uint8x16_t __s0_279 = __p0_279; \
		48429	uint8x8_t __s2_279 = __p2_279; \
		48430	uint8x16_t __rev0_279; __rev0_279 = __builtin_shufflevector(__s0_279, __s0_279, __lane_reverse_128_8); \
		48431	uint8x8_t __rev2_279; __rev2_279 = __builtin_shufflevector(__s2_279, __s2_279, __lane_reverse_64_8); \
		48432	__ret_279 = __noswap_vsetq_lane_u8(__noswap_vget_lane_u8(__rev2_279, __p3_279), __rev0_279, __p1_279); \
		48433	__ret_279 = __builtin_shufflevector(__ret_279, __ret_279, __lane_reverse_128_8); \
		48434	__ret_279; \
		48435	})
		48436	#endif
		48437
		48438	#ifdef __LITTLE_ENDIAN__
		48439	#define vcopyq_lane_u32(__p0_280, __p1_280, __p2_280, __p3_280) __extension__ ({ \
		48440	uint32x4_t __ret_280; \
		48441	uint32x4_t __s0_280 = __p0_280; \
		48442	uint32x2_t __s2_280 = __p2_280; \
		48443	__ret_280 = vsetq_lane_u32(vget_lane_u32(__s2_280, __p3_280), __s0_280, __p1_280); \
		48444	__ret_280; \
		48445	})
		48446	#else
		48447	#define vcopyq_lane_u32(__p0_281, __p1_281, __p2_281, __p3_281) __extension__ ({ \
		48448	uint32x4_t __ret_281; \
		48449	uint32x4_t __s0_281 = __p0_281; \
		48450	uint32x2_t __s2_281 = __p2_281; \
		48451	uint32x4_t __rev0_281; __rev0_281 = __builtin_shufflevector(__s0_281, __s0_281, __lane_reverse_128_32); \
		48452	uint32x2_t __rev2_281; __rev2_281 = __builtin_shufflevector(__s2_281, __s2_281, __lane_reverse_64_32); \
		48453	__ret_281 = __noswap_vsetq_lane_u32(__noswap_vget_lane_u32(__rev2_281, __p3_281), __rev0_281, __p1_281); \
		48454	__ret_281 = __builtin_shufflevector(__ret_281, __ret_281, __lane_reverse_128_32); \
		48455	__ret_281; \
		48456	})
		48457	#endif
		48458
		48459	#ifdef __LITTLE_ENDIAN__
		48460	#define vcopyq_lane_u64(__p0_282, __p1_282, __p2_282, __p3_282) __extension__ ({ \
		48461	uint64x2_t __ret_282; \
		48462	uint64x2_t __s0_282 = __p0_282; \
		48463	uint64x1_t __s2_282 = __p2_282; \
		48464	__ret_282 = vsetq_lane_u64(vget_lane_u64(__s2_282, __p3_282), __s0_282, __p1_282); \
48587	__ret_282; \	48465	__ret_282; \
48588	})	48466	})
48589	#else	48467	#else
48590	#define vcopyq_lane_p8(__p0_283, __p1_283, __p2_283, __p3_283) __extension__ ({ \	48468	#define vcopyq_lane_u64(__p0_283, __p1_283, __p2_283, __p3_283) __extension__ ({ \
48591	poly8x16_t __ret_283; \	48469	uint64x2_t __ret_283; \
48592	poly8x16_t __s0_283 = __p0_283; \	48470	uint64x2_t __s0_283 = __p0_283; \
48593	poly8x8_t __s2_283 = __p2_283; \	48471	uint64x1_t __s2_283 = __p2_283; \
48594	poly8x16_t __rev0_283; __rev0_283 = __builtin_shufflevector(__s0_283, __s0_283, __lane_reverse_128_8); \	48472	uint64x2_t __rev0_283; __rev0_283 = __builtin_shufflevector(__s0_283, __s0_283, __lane_reverse_128_64); \
48595	poly8x8_t __rev2_283; __rev2_283 = __builtin_shufflevector(__s2_283, __s2_283, __lane_reverse_64_8); \	48473	__ret_283 = __noswap_vsetq_lane_u64(vget_lane_u64(__s2_283, __p3_283), __rev0_283, __p1_283); \
48596	__ret_283 = __noswap_vsetq_lane_p8(__noswap_vget_lane_p8(__rev2_283, __p3_283), __rev0_283, __p1_283); \	48474	__ret_283 = __builtin_shufflevector(__ret_283, __ret_283, __lane_reverse_128_64); \
48597	__ret_283 = __builtin_shufflevector(__ret_283, __ret_283, __lane_reverse_128_8); \
48598	__ret_283; \	48475	__ret_283; \
48599	})	48476	})
48600	#endif	48477	#endif
48601		48478
48602	#ifdef __LITTLE_ENDIAN__	48479	#ifdef __LITTLE_ENDIAN__
48603	#define vcopyq_lane_p16(__p0_284, __p1_284, __p2_284, __p3_284) __extension__ ({ \	48480	#define vcopyq_lane_u16(__p0_284, __p1_284, __p2_284, __p3_284) __extension__ ({ \
48604	poly16x8_t __ret_284; \	48481	uint16x8_t __ret_284; \
48605	poly16x8_t __s0_284 = __p0_284; \	48482	uint16x8_t __s0_284 = __p0_284; \
48606	poly16x4_t __s2_284 = __p2_284; \	48483	uint16x4_t __s2_284 = __p2_284; \
48607	__ret_284 = vsetq_lane_p16(vget_lane_p16(__s2_284, __p3_284), __s0_284, __p1_284); \	48484	__ret_284 = vsetq_lane_u16(vget_lane_u16(__s2_284, __p3_284), __s0_284, __p1_284); \
48608	__ret_284; \	48485	__ret_284; \
48609	})	48486	})
48610	#else	48487	#else
48611	#define vcopyq_lane_p16(__p0_285, __p1_285, __p2_285, __p3_285) __extension__ ({ \	48488	#define vcopyq_lane_u16(__p0_285, __p1_285, __p2_285, __p3_285) __extension__ ({ \
48612	poly16x8_t __ret_285; \	48489	uint16x8_t __ret_285; \
48613	poly16x8_t __s0_285 = __p0_285; \	48490	uint16x8_t __s0_285 = __p0_285; \
48614	poly16x4_t __s2_285 = __p2_285; \	48491	uint16x4_t __s2_285 = __p2_285; \
48615	poly16x8_t __rev0_285; __rev0_285 = __builtin_shufflevector(__s0_285, __s0_285, __lane_reverse_128_16); \	48492	uint16x8_t __rev0_285; __rev0_285 = __builtin_shufflevector(__s0_285, __s0_285, __lane_reverse_128_16); \
48616	poly16x4_t __rev2_285; __rev2_285 = __builtin_shufflevector(__s2_285, __s2_285, __lane_reverse_64_16); \	48493	uint16x4_t __rev2_285; __rev2_285 = __builtin_shufflevector(__s2_285, __s2_285, __lane_reverse_64_16); \
48617	__ret_285 = __noswap_vsetq_lane_p16(__noswap_vget_lane_p16(__rev2_285, __p3_285), __rev0_285, __p1_285); \	48494	__ret_285 = __noswap_vsetq_lane_u16(__noswap_vget_lane_u16(__rev2_285, __p3_285), __rev0_285, __p1_285); \
48618	__ret_285 = __builtin_shufflevector(__ret_285, __ret_285, __lane_reverse_128_16); \	48495	__ret_285 = __builtin_shufflevector(__ret_285, __ret_285, __lane_reverse_128_16); \
48619	__ret_285; \	48496	__ret_285; \
48620	})	48497	})
48621	#endif	48498	#endif
48622		48499
48623	#ifdef __LITTLE_ENDIAN__	48500	#ifdef __LITTLE_ENDIAN__
48624	#define vcopyq_lane_u8(__p0_286, __p1_286, __p2_286, __p3_286) __extension__ ({ \	48501	#define vcopyq_lane_s8(__p0_286, __p1_286, __p2_286, __p3_286) __extension__ ({ \
48625	uint8x16_t __ret_286; \	48502	int8x16_t __ret_286; \
48626	uint8x16_t __s0_286 = __p0_286; \	48503	int8x16_t __s0_286 = __p0_286; \
48627	uint8x8_t __s2_286 = __p2_286; \	48504	int8x8_t __s2_286 = __p2_286; \
48628	__ret_286 = vsetq_lane_u8(vget_lane_u8(__s2_286, __p3_286), __s0_286, __p1_286); \	48505	__ret_286 = vsetq_lane_s8(vget_lane_s8(__s2_286, __p3_286), __s0_286, __p1_286); \
48629	__ret_286; \	48506	__ret_286; \
48630	})	48507	})
48631	#else	48508	#else
48632	#define vcopyq_lane_u8(__p0_287, __p1_287, __p2_287, __p3_287) __extension__ ({ \	48509	#define vcopyq_lane_s8(__p0_287, __p1_287, __p2_287, __p3_287) __extension__ ({ \
48633	uint8x16_t __ret_287; \	48510	int8x16_t __ret_287; \
48634	uint8x16_t __s0_287 = __p0_287; \	48511	int8x16_t __s0_287 = __p0_287; \
48635	uint8x8_t __s2_287 = __p2_287; \	48512	int8x8_t __s2_287 = __p2_287; \
48636	uint8x16_t __rev0_287; __rev0_287 = __builtin_shufflevector(__s0_287, __s0_287, __lane_reverse_128_8); \	48513	int8x16_t __rev0_287; __rev0_287 = __builtin_shufflevector(__s0_287, __s0_287, __lane_reverse_128_8); \
48637	uint8x8_t __rev2_287; __rev2_287 = __builtin_shufflevector(__s2_287, __s2_287, __lane_reverse_64_8); \	48514	int8x8_t __rev2_287; __rev2_287 = __builtin_shufflevector(__s2_287, __s2_287, __lane_reverse_64_8); \
48638	__ret_287 = __noswap_vsetq_lane_u8(__noswap_vget_lane_u8(__rev2_287, __p3_287), __rev0_287, __p1_287); \	48515	__ret_287 = __noswap_vsetq_lane_s8(__noswap_vget_lane_s8(__rev2_287, __p3_287), __rev0_287, __p1_287); \
48639	__ret_287 = __builtin_shufflevector(__ret_287, __ret_287, __lane_reverse_128_8); \	48516	__ret_287 = __builtin_shufflevector(__ret_287, __ret_287, __lane_reverse_128_8); \
48640	__ret_287; \	48517	__ret_287; \
48641	})	48518	})
48642	#endif	48519	#endif
48643		48520
48644	#ifdef __LITTLE_ENDIAN__	48521	#ifdef __LITTLE_ENDIAN__
48645	#define vcopyq_lane_u32(__p0_288, __p1_288, __p2_288, __p3_288) __extension__ ({ \	48522	#define vcopyq_lane_f32(__p0_288, __p1_288, __p2_288, __p3_288) __extension__ ({ \
48646	uint32x4_t __ret_288; \	48523	float32x4_t __ret_288; \
48647	uint32x4_t __s0_288 = __p0_288; \	48524	float32x4_t __s0_288 = __p0_288; \
48648	uint32x2_t __s2_288 = __p2_288; \	48525	float32x2_t __s2_288 = __p2_288; \
48649	__ret_288 = vsetq_lane_u32(vget_lane_u32(__s2_288, __p3_288), __s0_288, __p1_288); \	48526	__ret_288 = vsetq_lane_f32(vget_lane_f32(__s2_288, __p3_288), __s0_288, __p1_288); \
48650	__ret_288; \	48527	__ret_288; \
48651	})	48528	})
48652	#else	48529	#else
48653	#define vcopyq_lane_u32(__p0_289, __p1_289, __p2_289, __p3_289) __extension__ ({ \	48530	#define vcopyq_lane_f32(__p0_289, __p1_289, __p2_289, __p3_289) __extension__ ({ \
48654	uint32x4_t __ret_289; \	48531	float32x4_t __ret_289; \
48655	uint32x4_t __s0_289 = __p0_289; \	48532	float32x4_t __s0_289 = __p0_289; \
48656	uint32x2_t __s2_289 = __p2_289; \	48533	float32x2_t __s2_289 = __p2_289; \
48657	uint32x4_t __rev0_289; __rev0_289 = __builtin_shufflevector(__s0_289, __s0_289, __lane_reverse_128_32); \	48534	float32x4_t __rev0_289; __rev0_289 = __builtin_shufflevector(__s0_289, __s0_289, __lane_reverse_128_32); \
48658	uint32x2_t __rev2_289; __rev2_289 = __builtin_shufflevector(__s2_289, __s2_289, __lane_reverse_64_32); \	48535	float32x2_t __rev2_289; __rev2_289 = __builtin_shufflevector(__s2_289, __s2_289, __lane_reverse_64_32); \
48659	__ret_289 = __noswap_vsetq_lane_u32(__noswap_vget_lane_u32(__rev2_289, __p3_289), __rev0_289, __p1_289); \	48536	__ret_289 = __noswap_vsetq_lane_f32(__noswap_vget_lane_f32(__rev2_289, __p3_289), __rev0_289, __p1_289); \
48660	__ret_289 = __builtin_shufflevector(__ret_289, __ret_289, __lane_reverse_128_32); \	48537	__ret_289 = __builtin_shufflevector(__ret_289, __ret_289, __lane_reverse_128_32); \
48661	__ret_289; \	48538	__ret_289; \
48662	})	48539	})
48663	#endif	48540	#endif
48664		48541
48665	#ifdef __LITTLE_ENDIAN__	48542	#ifdef __LITTLE_ENDIAN__
48666	#define vcopyq_lane_u64(__p0_290, __p1_290, __p2_290, __p3_290) __extension__ ({ \	48543	#define vcopyq_lane_s32(__p0_290, __p1_290, __p2_290, __p3_290) __extension__ ({ \
48667	uint64x2_t __ret_290; \	48544	int32x4_t __ret_290; \
48668	uint64x2_t __s0_290 = __p0_290; \	48545	int32x4_t __s0_290 = __p0_290; \
48669	uint64x1_t __s2_290 = __p2_290; \	48546	int32x2_t __s2_290 = __p2_290; \
48670	__ret_290 = vsetq_lane_u64(vget_lane_u64(__s2_290, __p3_290), __s0_290, __p1_290); \	48547	__ret_290 = vsetq_lane_s32(vget_lane_s32(__s2_290, __p3_290), __s0_290, __p1_290); \
48671	__ret_290; \	48548	__ret_290; \
48672	})	48549	})
48673	#else	48550	#else
48674	#define vcopyq_lane_u64(__p0_291, __p1_291, __p2_291, __p3_291) __extension__ ({ \	48551	#define vcopyq_lane_s32(__p0_291, __p1_291, __p2_291, __p3_291) __extension__ ({ \
48675	uint64x2_t __ret_291; \	48552	int32x4_t __ret_291; \
48676	uint64x2_t __s0_291 = __p0_291; \	48553	int32x4_t __s0_291 = __p0_291; \
48677	uint64x1_t __s2_291 = __p2_291; \	48554	int32x2_t __s2_291 = __p2_291; \
48678	uint64x2_t __rev0_291; __rev0_291 = __builtin_shufflevector(__s0_291, __s0_291, __lane_reverse_128_64); \	48555	int32x4_t __rev0_291; __rev0_291 = __builtin_shufflevector(__s0_291, __s0_291, __lane_reverse_128_32); \
48679	__ret_291 = __noswap_vsetq_lane_u64(vget_lane_u64(__s2_291, __p3_291), __rev0_291, __p1_291); \	48556	int32x2_t __rev2_291; __rev2_291 = __builtin_shufflevector(__s2_291, __s2_291, __lane_reverse_64_32); \
48680	__ret_291 = __builtin_shufflevector(__ret_291, __ret_291, __lane_reverse_128_64); \	48557	__ret_291 = __noswap_vsetq_lane_s32(__noswap_vget_lane_s32(__rev2_291, __p3_291), __rev0_291, __p1_291); \
		48558	__ret_291 = __builtin_shufflevector(__ret_291, __ret_291, __lane_reverse_128_32); \
48681	__ret_291; \	48559	__ret_291; \
48682	})	48560	})
48683	#endif	48561	#endif
48684		48562
48685	#ifdef __LITTLE_ENDIAN__	48563	#ifdef __LITTLE_ENDIAN__
48686	#define vcopyq_lane_u16(__p0_292, __p1_292, __p2_292, __p3_292) __extension__ ({ \	48564	#define vcopyq_lane_s64(__p0_292, __p1_292, __p2_292, __p3_292) __extension__ ({ \
48687	uint16x8_t __ret_292; \	48565	int64x2_t __ret_292; \
48688	uint16x8_t __s0_292 = __p0_292; \	48566	int64x2_t __s0_292 = __p0_292; \
48689	uint16x4_t __s2_292 = __p2_292; \	48567	int64x1_t __s2_292 = __p2_292; \
48690	__ret_292 = vsetq_lane_u16(vget_lane_u16(__s2_292, __p3_292), __s0_292, __p1_292); \	48568	__ret_292 = vsetq_lane_s64(vget_lane_s64(__s2_292, __p3_292), __s0_292, __p1_292); \
48691	__ret_292; \	48569	__ret_292; \
48692	})	48570	})
48693	#else	48571	#else
48694	#define vcopyq_lane_u16(__p0_293, __p1_293, __p2_293, __p3_293) __extension__ ({ \	48572	#define vcopyq_lane_s64(__p0_293, __p1_293, __p2_293, __p3_293) __extension__ ({ \
48695	uint16x8_t __ret_293; \	48573	int64x2_t __ret_293; \
48696	uint16x8_t __s0_293 = __p0_293; \	48574	int64x2_t __s0_293 = __p0_293; \
48697	uint16x4_t __s2_293 = __p2_293; \	48575	int64x1_t __s2_293 = __p2_293; \
48698	uint16x8_t __rev0_293; __rev0_293 = __builtin_shufflevector(__s0_293, __s0_293, __lane_reverse_128_16); \	48576	int64x2_t __rev0_293; __rev0_293 = __builtin_shufflevector(__s0_293, __s0_293, __lane_reverse_128_64); \
48699	uint16x4_t __rev2_293; __rev2_293 = __builtin_shufflevector(__s2_293, __s2_293, __lane_reverse_64_16); \	48577	__ret_293 = __noswap_vsetq_lane_s64(vget_lane_s64(__s2_293, __p3_293), __rev0_293, __p1_293); \
48700	__ret_293 = __noswap_vsetq_lane_u16(__noswap_vget_lane_u16(__rev2_293, __p3_293), __rev0_293, __p1_293); \	48578	__ret_293 = __builtin_shufflevector(__ret_293, __ret_293, __lane_reverse_128_64); \
48701	__ret_293 = __builtin_shufflevector(__ret_293, __ret_293, __lane_reverse_128_16); \
48702	__ret_293; \	48579	__ret_293; \
48703	})	48580	})
48704	#endif	48581	#endif
48705		48582
48706	#ifdef __LITTLE_ENDIAN__	48583	#ifdef __LITTLE_ENDIAN__
48707	#define vcopyq_lane_s8(__p0_294, __p1_294, __p2_294, __p3_294) __extension__ ({ \	48584	#define vcopyq_lane_mf8(__p0_294, __p1_294, __p2_294, __p3_294) __extension__ ({ \
48708	int8x16_t __ret_294; \	48585	mfloat8x16_t __ret_294; \
48709	int8x16_t __s0_294 = __p0_294; \	48586	mfloat8x16_t __s0_294 = __p0_294; \
48710	int8x8_t __s2_294 = __p2_294; \	48587	mfloat8x8_t __s2_294 = __p2_294; \
48711	__ret_294 = vsetq_lane_s8(vget_lane_s8(__s2_294, __p3_294), __s0_294, __p1_294); \	48588	__ret_294 = vsetq_lane_mf8(vget_lane_mf8(__s2_294, __p3_294), __s0_294, __p1_294); \
48712	__ret_294; \	48589	__ret_294; \
48713	})	48590	})
48714	#else	48591	#else
48715	#define vcopyq_lane_s8(__p0_295, __p1_295, __p2_295, __p3_295) __extension__ ({ \	48592	#define vcopyq_lane_mf8(__p0_295, __p1_295, __p2_295, __p3_295) __extension__ ({ \
48716	int8x16_t __ret_295; \	48593	mfloat8x16_t __ret_295; \
48717	int8x16_t __s0_295 = __p0_295; \	48594	mfloat8x16_t __s0_295 = __p0_295; \
48718	int8x8_t __s2_295 = __p2_295; \	48595	mfloat8x8_t __s2_295 = __p2_295; \
48719	int8x16_t __rev0_295; __rev0_295 = __builtin_shufflevector(__s0_295, __s0_295, __lane_reverse_128_8); \	48596	mfloat8x16_t __rev0_295; __rev0_295 = __builtin_shufflevector(__s0_295, __s0_295, __lane_reverse_128_8); \
48720	int8x8_t __rev2_295; __rev2_295 = __builtin_shufflevector(__s2_295, __s2_295, __lane_reverse_64_8); \	48597	mfloat8x8_t __rev2_295; __rev2_295 = __builtin_shufflevector(__s2_295, __s2_295, __lane_reverse_64_8); \
48721	__ret_295 = __noswap_vsetq_lane_s8(__noswap_vget_lane_s8(__rev2_295, __p3_295), __rev0_295, __p1_295); \	48598	__ret_295 = __noswap_vsetq_lane_mf8(__noswap_vget_lane_mf8(__rev2_295, __p3_295), __rev0_295, __p1_295); \
48722	__ret_295 = __builtin_shufflevector(__ret_295, __ret_295, __lane_reverse_128_8); \	48599	__ret_295 = __builtin_shufflevector(__ret_295, __ret_295, __lane_reverse_128_8); \
48723	__ret_295; \	48600	__ret_295; \
48724	})	48601	})
48725	#endif	48602	#endif
48726		48603
48727	#ifdef __LITTLE_ENDIAN__	48604	#ifdef __LITTLE_ENDIAN__
48728	#define vcopyq_lane_f32(__p0_296, __p1_296, __p2_296, __p3_296) __extension__ ({ \	48605	#define vcopyq_lane_s16(__p0_296, __p1_296, __p2_296, __p3_296) __extension__ ({ \
48729	float32x4_t __ret_296; \	48606	int16x8_t __ret_296; \
48730	float32x4_t __s0_296 = __p0_296; \	48607	int16x8_t __s0_296 = __p0_296; \
48731	float32x2_t __s2_296 = __p2_296; \	48608	int16x4_t __s2_296 = __p2_296; \
48732	__ret_296 = vsetq_lane_f32(vget_lane_f32(__s2_296, __p3_296), __s0_296, __p1_296); \	48609	__ret_296 = vsetq_lane_s16(vget_lane_s16(__s2_296, __p3_296), __s0_296, __p1_296); \
48733	__ret_296; \	48610	__ret_296; \
48734	})	48611	})
48735	#else	48612	#else
48736	#define vcopyq_lane_f32(__p0_297, __p1_297, __p2_297, __p3_297) __extension__ ({ \	48613	#define vcopyq_lane_s16(__p0_297, __p1_297, __p2_297, __p3_297) __extension__ ({ \
48737	float32x4_t __ret_297; \	48614	int16x8_t __ret_297; \
48738	float32x4_t __s0_297 = __p0_297; \	48615	int16x8_t __s0_297 = __p0_297; \
48739	float32x2_t __s2_297 = __p2_297; \	48616	int16x4_t __s2_297 = __p2_297; \
48740	float32x4_t __rev0_297; __rev0_297 = __builtin_shufflevector(__s0_297, __s0_297, __lane_reverse_128_32); \	48617	int16x8_t __rev0_297; __rev0_297 = __builtin_shufflevector(__s0_297, __s0_297, __lane_reverse_128_16); \
48741	float32x2_t __rev2_297; __rev2_297 = __builtin_shufflevector(__s2_297, __s2_297, __lane_reverse_64_32); \	48618	int16x4_t __rev2_297; __rev2_297 = __builtin_shufflevector(__s2_297, __s2_297, __lane_reverse_64_16); \
48742	__ret_297 = __noswap_vsetq_lane_f32(__noswap_vget_lane_f32(__rev2_297, __p3_297), __rev0_297, __p1_297); \	48619	__ret_297 = __noswap_vsetq_lane_s16(__noswap_vget_lane_s16(__rev2_297, __p3_297), __rev0_297, __p1_297); \
48743	__ret_297 = __builtin_shufflevector(__ret_297, __ret_297, __lane_reverse_128_32); \	48620	__ret_297 = __builtin_shufflevector(__ret_297, __ret_297, __lane_reverse_128_16); \
48744	__ret_297; \	48621	__ret_297; \
48745	})	48622	})
48746	#endif	48623	#endif
48747		48624
48748	#ifdef __LITTLE_ENDIAN__	48625	#ifdef __LITTLE_ENDIAN__
48749	#define vcopyq_lane_s32(__p0_298, __p1_298, __p2_298, __p3_298) __extension__ ({ \	48626	#define vcopyq_lane_bf16(__p0_298, __p1_298, __p2_298, __p3_298) __extension__ ({ \
48750	int32x4_t __ret_298; \	48627	bfloat16x8_t __ret_298; \
48751	int32x4_t __s0_298 = __p0_298; \	48628	bfloat16x8_t __s0_298 = __p0_298; \
48752	int32x2_t __s2_298 = __p2_298; \	48629	bfloat16x4_t __s2_298 = __p2_298; \
48753	__ret_298 = vsetq_lane_s32(vget_lane_s32(__s2_298, __p3_298), __s0_298, __p1_298); \	48630	__ret_298 = vsetq_lane_bf16(vget_lane_bf16(__s2_298, __p3_298), __s0_298, __p1_298); \
48754	__ret_298; \	48631	__ret_298; \
48755	})	48632	})
48756	#else	48633	#else
48757	#define vcopyq_lane_s32(__p0_299, __p1_299, __p2_299, __p3_299) __extension__ ({ \	48634	#define vcopyq_lane_bf16(__p0_299, __p1_299, __p2_299, __p3_299) __extension__ ({ \
48758	int32x4_t __ret_299; \	48635	bfloat16x8_t __ret_299; \
48759	int32x4_t __s0_299 = __p0_299; \	48636	bfloat16x8_t __s0_299 = __p0_299; \
48760	int32x2_t __s2_299 = __p2_299; \	48637	bfloat16x4_t __s2_299 = __p2_299; \
48761	int32x4_t __rev0_299; __rev0_299 = __builtin_shufflevector(__s0_299, __s0_299, __lane_reverse_128_32); \	48638	bfloat16x8_t __rev0_299; __rev0_299 = __builtin_shufflevector(__s0_299, __s0_299, __lane_reverse_128_16); \
48762	int32x2_t __rev2_299; __rev2_299 = __builtin_shufflevector(__s2_299, __s2_299, __lane_reverse_64_32); \	48639	bfloat16x4_t __rev2_299; __rev2_299 = __builtin_shufflevector(__s2_299, __s2_299, __lane_reverse_64_16); \
48763	__ret_299 = __noswap_vsetq_lane_s32(__noswap_vget_lane_s32(__rev2_299, __p3_299), __rev0_299, __p1_299); \	48640	__ret_299 = __noswap_vsetq_lane_bf16(__noswap_vget_lane_bf16(__rev2_299, __p3_299), __rev0_299, __p1_299); \
48764	__ret_299 = __builtin_shufflevector(__ret_299, __ret_299, __lane_reverse_128_32); \	48641	__ret_299 = __builtin_shufflevector(__ret_299, __ret_299, __lane_reverse_128_16); \
48765	__ret_299; \	48642	__ret_299; \
48766	})	48643	})
48767	#endif	48644	#endif
48768		48645
48769	#ifdef __LITTLE_ENDIAN__	48646	#ifdef __LITTLE_ENDIAN__
48770	#define vcopyq_lane_s64(__p0_300, __p1_300, __p2_300, __p3_300) __extension__ ({ \	48647	#define vcopy_lane_p8(__p0_300, __p1_300, __p2_300, __p3_300) __extension__ ({ \
48771	int64x2_t __ret_300; \	48648	poly8x8_t __ret_300; \
48772	int64x2_t __s0_300 = __p0_300; \	48649	poly8x8_t __s0_300 = __p0_300; \
48773	int64x1_t __s2_300 = __p2_300; \	48650	poly8x8_t __s2_300 = __p2_300; \
48774	__ret_300 = vsetq_lane_s64(vget_lane_s64(__s2_300, __p3_300), __s0_300, __p1_300); \	48651	__ret_300 = vset_lane_p8(vget_lane_p8(__s2_300, __p3_300), __s0_300, __p1_300); \
48775	__ret_300; \	48652	__ret_300; \
48776	})	48653	})
48777	#else	48654	#else
48778	#define vcopyq_lane_s64(__p0_301, __p1_301, __p2_301, __p3_301) __extension__ ({ \	48655	#define vcopy_lane_p8(__p0_301, __p1_301, __p2_301, __p3_301) __extension__ ({ \
48779	int64x2_t __ret_301; \	48656	poly8x8_t __ret_301; \
48780	int64x2_t __s0_301 = __p0_301; \	48657	poly8x8_t __s0_301 = __p0_301; \
48781	int64x1_t __s2_301 = __p2_301; \	48658	poly8x8_t __s2_301 = __p2_301; \
48782	int64x2_t __rev0_301; __rev0_301 = __builtin_shufflevector(__s0_301, __s0_301, __lane_reverse_128_64); \	48659	poly8x8_t __rev0_301; __rev0_301 = __builtin_shufflevector(__s0_301, __s0_301, __lane_reverse_64_8); \
48783	__ret_301 = __noswap_vsetq_lane_s64(vget_lane_s64(__s2_301, __p3_301), __rev0_301, __p1_301); \	48660	poly8x8_t __rev2_301; __rev2_301 = __builtin_shufflevector(__s2_301, __s2_301, __lane_reverse_64_8); \
48784	__ret_301 = __builtin_shufflevector(__ret_301, __ret_301, __lane_reverse_128_64); \	48661	__ret_301 = __noswap_vset_lane_p8(__noswap_vget_lane_p8(__rev2_301, __p3_301), __rev0_301, __p1_301); \
		48662	__ret_301 = __builtin_shufflevector(__ret_301, __ret_301, __lane_reverse_64_8); \
48785	__ret_301; \	48663	__ret_301; \
48786	})	48664	})
48787	#endif	48665	#endif
48788		48666
48789	#ifdef __LITTLE_ENDIAN__	48667	#ifdef __LITTLE_ENDIAN__
48790	#define vcopyq_lane_mf8(__p0_302, __p1_302, __p2_302, __p3_302) __extension__ ({ \	48668	#define vcopy_lane_p16(__p0_302, __p1_302, __p2_302, __p3_302) __extension__ ({ \
48791	mfloat8x16_t __ret_302; \	48669	poly16x4_t __ret_302; \
48792	mfloat8x16_t __s0_302 = __p0_302; \	48670	poly16x4_t __s0_302 = __p0_302; \
48793	mfloat8x8_t __s2_302 = __p2_302; \	48671	poly16x4_t __s2_302 = __p2_302; \
48794	__ret_302 = vsetq_lane_mf8(vget_lane_mf8(__s2_302, __p3_302), __s0_302, __p1_302); \	48672	__ret_302 = vset_lane_p16(vget_lane_p16(__s2_302, __p3_302), __s0_302, __p1_302); \
48795	__ret_302; \	48673	__ret_302; \
48796	})	48674	})
48797	#else	48675	#else
48798	#define vcopyq_lane_mf8(__p0_303, __p1_303, __p2_303, __p3_303) __extension__ ({ \	48676	#define vcopy_lane_p16(__p0_303, __p1_303, __p2_303, __p3_303) __extension__ ({ \
48799	mfloat8x16_t __ret_303; \	48677	poly16x4_t __ret_303; \
48800	mfloat8x16_t __s0_303 = __p0_303; \	48678	poly16x4_t __s0_303 = __p0_303; \
48801	mfloat8x8_t __s2_303 = __p2_303; \	48679	poly16x4_t __s2_303 = __p2_303; \
48802	mfloat8x16_t __rev0_303; __rev0_303 = __builtin_shufflevector(__s0_303, __s0_303, __lane_reverse_128_8); \	48680	poly16x4_t __rev0_303; __rev0_303 = __builtin_shufflevector(__s0_303, __s0_303, __lane_reverse_64_16); \
48803	mfloat8x8_t __rev2_303; __rev2_303 = __builtin_shufflevector(__s2_303, __s2_303, __lane_reverse_64_8); \	48681	poly16x4_t __rev2_303; __rev2_303 = __builtin_shufflevector(__s2_303, __s2_303, __lane_reverse_64_16); \
48804	__ret_303 = __noswap_vsetq_lane_mf8(__noswap_vget_lane_mf8(__rev2_303, __p3_303), __rev0_303, __p1_303); \	48682	__ret_303 = __noswap_vset_lane_p16(__noswap_vget_lane_p16(__rev2_303, __p3_303), __rev0_303, __p1_303); \
48805	__ret_303 = __builtin_shufflevector(__ret_303, __ret_303, __lane_reverse_128_8); \	48683	__ret_303 = __builtin_shufflevector(__ret_303, __ret_303, __lane_reverse_64_16); \
48806	__ret_303; \	48684	__ret_303; \
48807	})	48685	})
48808	#endif	48686	#endif
48809		48687
48810	#ifdef __LITTLE_ENDIAN__	48688	#ifdef __LITTLE_ENDIAN__
48811	#define vcopyq_lane_s16(__p0_304, __p1_304, __p2_304, __p3_304) __extension__ ({ \	48689	#define vcopy_lane_u8(__p0_304, __p1_304, __p2_304, __p3_304) __extension__ ({ \
48812	int16x8_t __ret_304; \	48690	uint8x8_t __ret_304; \
48813	int16x8_t __s0_304 = __p0_304; \	48691	uint8x8_t __s0_304 = __p0_304; \
48814	int16x4_t __s2_304 = __p2_304; \	48692	uint8x8_t __s2_304 = __p2_304; \
48815	__ret_304 = vsetq_lane_s16(vget_lane_s16(__s2_304, __p3_304), __s0_304, __p1_304); \	48693	__ret_304 = vset_lane_u8(vget_lane_u8(__s2_304, __p3_304), __s0_304, __p1_304); \
48816	__ret_304; \	48694	__ret_304; \
48817	})	48695	})
48818	#else	48696	#else
48819	#define vcopyq_lane_s16(__p0_305, __p1_305, __p2_305, __p3_305) __extension__ ({ \	48697	#define vcopy_lane_u8(__p0_305, __p1_305, __p2_305, __p3_305) __extension__ ({ \
48820	int16x8_t __ret_305; \	48698	uint8x8_t __ret_305; \
48821	int16x8_t __s0_305 = __p0_305; \	48699	uint8x8_t __s0_305 = __p0_305; \
48822	int16x4_t __s2_305 = __p2_305; \	48700	uint8x8_t __s2_305 = __p2_305; \
48823	int16x8_t __rev0_305; __rev0_305 = __builtin_shufflevector(__s0_305, __s0_305, __lane_reverse_128_16); \	48701	uint8x8_t __rev0_305; __rev0_305 = __builtin_shufflevector(__s0_305, __s0_305, __lane_reverse_64_8); \
48824	int16x4_t __rev2_305; __rev2_305 = __builtin_shufflevector(__s2_305, __s2_305, __lane_reverse_64_16); \	48702	uint8x8_t __rev2_305; __rev2_305 = __builtin_shufflevector(__s2_305, __s2_305, __lane_reverse_64_8); \
48825	__ret_305 = __noswap_vsetq_lane_s16(__noswap_vget_lane_s16(__rev2_305, __p3_305), __rev0_305, __p1_305); \	48703	__ret_305 = __noswap_vset_lane_u8(__noswap_vget_lane_u8(__rev2_305, __p3_305), __rev0_305, __p1_305); \
48826	__ret_305 = __builtin_shufflevector(__ret_305, __ret_305, __lane_reverse_128_16); \	48704	__ret_305 = __builtin_shufflevector(__ret_305, __ret_305, __lane_reverse_64_8); \
48827	__ret_305; \	48705	__ret_305; \
48828	})	48706	})
48829	#endif	48707	#endif
48830		48708
48831	#ifdef __LITTLE_ENDIAN__	48709	#ifdef __LITTLE_ENDIAN__
48832	#define vcopy_lane_p8(__p0_306, __p1_306, __p2_306, __p3_306) __extension__ ({ \	48710	#define vcopy_lane_u32(__p0_306, __p1_306, __p2_306, __p3_306) __extension__ ({ \
48833	poly8x8_t __ret_306; \	48711	uint32x2_t __ret_306; \
48834	poly8x8_t __s0_306 = __p0_306; \	48712	uint32x2_t __s0_306 = __p0_306; \
48835	poly8x8_t __s2_306 = __p2_306; \	48713	uint32x2_t __s2_306 = __p2_306; \
48836	__ret_306 = vset_lane_p8(vget_lane_p8(__s2_306, __p3_306), __s0_306, __p1_306); \	48714	__ret_306 = vset_lane_u32(vget_lane_u32(__s2_306, __p3_306), __s0_306, __p1_306); \
48837	__ret_306; \	48715	__ret_306; \
48838	})	48716	})
48839	#else	48717	#else
48840	#define vcopy_lane_p8(__p0_307, __p1_307, __p2_307, __p3_307) __extension__ ({ \	48718	#define vcopy_lane_u32(__p0_307, __p1_307, __p2_307, __p3_307) __extension__ ({ \
48841	poly8x8_t __ret_307; \	48719	uint32x2_t __ret_307; \
48842	poly8x8_t __s0_307 = __p0_307; \	48720	uint32x2_t __s0_307 = __p0_307; \
48843	poly8x8_t __s2_307 = __p2_307; \	48721	uint32x2_t __s2_307 = __p2_307; \
48844	poly8x8_t __rev0_307; __rev0_307 = __builtin_shufflevector(__s0_307, __s0_307, __lane_reverse_64_8); \	48722	uint32x2_t __rev0_307; __rev0_307 = __builtin_shufflevector(__s0_307, __s0_307, __lane_reverse_64_32); \
48845	poly8x8_t __rev2_307; __rev2_307 = __builtin_shufflevector(__s2_307, __s2_307, __lane_reverse_64_8); \	48723	uint32x2_t __rev2_307; __rev2_307 = __builtin_shufflevector(__s2_307, __s2_307, __lane_reverse_64_32); \
48846	__ret_307 = __noswap_vset_lane_p8(__noswap_vget_lane_p8(__rev2_307, __p3_307), __rev0_307, __p1_307); \	48724	__ret_307 = __noswap_vset_lane_u32(__noswap_vget_lane_u32(__rev2_307, __p3_307), __rev0_307, __p1_307); \
48847	__ret_307 = __builtin_shufflevector(__ret_307, __ret_307, __lane_reverse_64_8); \	48725	__ret_307 = __builtin_shufflevector(__ret_307, __ret_307, __lane_reverse_64_32); \
48848	__ret_307; \	48726	__ret_307; \
48849	})	48727	})
48850	#endif	48728	#endif
48851		48729
48852	#ifdef __LITTLE_ENDIAN__	48730	#define vcopy_lane_u64(__p0_308, __p1_308, __p2_308, __p3_308) __extension__ ({ \
48853	#define vcopy_lane_p16(__p0_308, __p1_308, __p2_308, __p3_308) __extension__ ({ \	48731	uint64x1_t __ret_308; \
48854	poly16x4_t __ret_308; \	48732	uint64x1_t __s0_308 = __p0_308; \
48855	poly16x4_t __s0_308 = __p0_308; \	48733	uint64x1_t __s2_308 = __p2_308; \
48856	poly16x4_t __s2_308 = __p2_308; \	48734	__ret_308 = vset_lane_u64(vget_lane_u64(__s2_308, __p3_308), __s0_308, __p1_308); \
48857	__ret_308 = vset_lane_p16(vget_lane_p16(__s2_308, __p3_308), __s0_308, __p1_308); \
48858	__ret_308; \	48735	__ret_308; \
48859	})	48736	})
48860	#else	48737	#ifdef __LITTLE_ENDIAN__
48861	#define vcopy_lane_p16(__p0_309, __p1_309, __p2_309, __p3_309) __extension__ ({ \	48738	#define vcopy_lane_u16(__p0_309, __p1_309, __p2_309, __p3_309) __extension__ ({ \
48862	poly16x4_t __ret_309; \	48739	uint16x4_t __ret_309; \
48863	poly16x4_t __s0_309 = __p0_309; \	48740	uint16x4_t __s0_309 = __p0_309; \
48864	poly16x4_t __s2_309 = __p2_309; \	48741	uint16x4_t __s2_309 = __p2_309; \
48865	poly16x4_t __rev0_309; __rev0_309 = __builtin_shufflevector(__s0_309, __s0_309, __lane_reverse_64_16); \	48742	__ret_309 = vset_lane_u16(vget_lane_u16(__s2_309, __p3_309), __s0_309, __p1_309); \
48866	poly16x4_t __rev2_309; __rev2_309 = __builtin_shufflevector(__s2_309, __s2_309, __lane_reverse_64_16); \
48867	__ret_309 = __noswap_vset_lane_p16(__noswap_vget_lane_p16(__rev2_309, __p3_309), __rev0_309, __p1_309); \
48868	__ret_309 = __builtin_shufflevector(__ret_309, __ret_309, __lane_reverse_64_16); \
48869	__ret_309; \	48743	__ret_309; \
48870	})	48744	})
		48745	#else
		48746	#define vcopy_lane_u16(__p0_310, __p1_310, __p2_310, __p3_310) __extension__ ({ \
		48747	uint16x4_t __ret_310; \
		48748	uint16x4_t __s0_310 = __p0_310; \
		48749	uint16x4_t __s2_310 = __p2_310; \
		48750	uint16x4_t __rev0_310; __rev0_310 = __builtin_shufflevector(__s0_310, __s0_310, __lane_reverse_64_16); \
		48751	uint16x4_t __rev2_310; __rev2_310 = __builtin_shufflevector(__s2_310, __s2_310, __lane_reverse_64_16); \
		48752	__ret_310 = __noswap_vset_lane_u16(__noswap_vget_lane_u16(__rev2_310, __p3_310), __rev0_310, __p1_310); \
		48753	__ret_310 = __builtin_shufflevector(__ret_310, __ret_310, __lane_reverse_64_16); \
		48754	__ret_310; \
		48755	})
48871	#endif	48756	#endif
48872		48757
48873	#ifdef __LITTLE_ENDIAN__	48758	#ifdef __LITTLE_ENDIAN__
48874	#define vcopy_lane_u8(__p0_310, __p1_310, __p2_310, __p3_310) __extension__ ({ \	48759	#define vcopy_lane_s8(__p0_311, __p1_311, __p2_311, __p3_311) __extension__ ({ \
48875	uint8x8_t __ret_310; \	48760	int8x8_t __ret_311; \
48876	uint8x8_t __s0_310 = __p0_310; \	48761	int8x8_t __s0_311 = __p0_311; \
48877	uint8x8_t __s2_310 = __p2_310; \	48762	int8x8_t __s2_311 = __p2_311; \
48878	__ret_310 = vset_lane_u8(vget_lane_u8(__s2_310, __p3_310), __s0_310, __p1_310); \	48763	__ret_311 = vset_lane_s8(vget_lane_s8(__s2_311, __p3_311), __s0_311, __p1_311); \
48879	__ret_310; \	48764	__ret_311; \
48880	})	48765	})
48881	#else	48766	#else
48882	#define vcopy_lane_u8(__p0_311, __p1_311, __p2_311, __p3_311) __extension__ ({ \	48767	#define vcopy_lane_s8(__p0_312, __p1_312, __p2_312, __p3_312) __extension__ ({ \
48883	uint8x8_t __ret_311; \	48768	int8x8_t __ret_312; \
48884	uint8x8_t __s0_311 = __p0_311; \	48769	int8x8_t __s0_312 = __p0_312; \
48885	uint8x8_t __s2_311 = __p2_311; \	48770	int8x8_t __s2_312 = __p2_312; \
48886	uint8x8_t __rev0_311; __rev0_311 = __builtin_shufflevector(__s0_311, __s0_311, __lane_reverse_64_8); \	48771	int8x8_t __rev0_312; __rev0_312 = __builtin_shufflevector(__s0_312, __s0_312, __lane_reverse_64_8); \
48887	uint8x8_t __rev2_311; __rev2_311 = __builtin_shufflevector(__s2_311, __s2_311, __lane_reverse_64_8); \	48772	int8x8_t __rev2_312; __rev2_312 = __builtin_shufflevector(__s2_312, __s2_312, __lane_reverse_64_8); \
48888	__ret_311 = __noswap_vset_lane_u8(__noswap_vget_lane_u8(__rev2_311, __p3_311), __rev0_311, __p1_311); \	48773	__ret_312 = __noswap_vset_lane_s8(__noswap_vget_lane_s8(__rev2_312, __p3_312), __rev0_312, __p1_312); \
48889	__ret_311 = __builtin_shufflevector(__ret_311, __ret_311, __lane_reverse_64_8); \	48774	__ret_312 = __builtin_shufflevector(__ret_312, __ret_312, __lane_reverse_64_8); \
48890	__ret_311; \	48775	__ret_312; \
48891	})	48776	})
48892	#endif	48777	#endif
48893		48778
48894	#ifdef __LITTLE_ENDIAN__	48779	#ifdef __LITTLE_ENDIAN__
48895	#define vcopy_lane_u32(__p0_312, __p1_312, __p2_312, __p3_312) __extension__ ({ \	48780	#define vcopy_lane_f32(__p0_313, __p1_313, __p2_313, __p3_313) __extension__ ({ \
48896	uint32x2_t __ret_312; \	48781	float32x2_t __ret_313; \
48897	uint32x2_t __s0_312 = __p0_312; \	48782	float32x2_t __s0_313 = __p0_313; \
48898	uint32x2_t __s2_312 = __p2_312; \	48783	float32x2_t __s2_313 = __p2_313; \
48899	__ret_312 = vset_lane_u32(vget_lane_u32(__s2_312, __p3_312), __s0_312, __p1_312); \	48784	__ret_313 = vset_lane_f32(vget_lane_f32(__s2_313, __p3_313), __s0_313, __p1_313); \
48900	__ret_312; \	48785	__ret_313; \
48901	})	48786	})
48902	#else	48787	#else
48903	#define vcopy_lane_u32(__p0_313, __p1_313, __p2_313, __p3_313) __extension__ ({ \	48788	#define vcopy_lane_f32(__p0_314, __p1_314, __p2_314, __p3_314) __extension__ ({ \
48904	uint32x2_t __ret_313; \	48789	float32x2_t __ret_314; \
48905	uint32x2_t __s0_313 = __p0_313; \	48790	float32x2_t __s0_314 = __p0_314; \
48906	uint32x2_t __s2_313 = __p2_313; \	48791	float32x2_t __s2_314 = __p2_314; \
48907	uint32x2_t __rev0_313; __rev0_313 = __builtin_shufflevector(__s0_313, __s0_313, __lane_reverse_64_32); \	48792	float32x2_t __rev0_314; __rev0_314 = __builtin_shufflevector(__s0_314, __s0_314, __lane_reverse_64_32); \
48908	uint32x2_t __rev2_313; __rev2_313 = __builtin_shufflevector(__s2_313, __s2_313, __lane_reverse_64_32); \	48793	float32x2_t __rev2_314; __rev2_314 = __builtin_shufflevector(__s2_314, __s2_314, __lane_reverse_64_32); \
48909	__ret_313 = __noswap_vset_lane_u32(__noswap_vget_lane_u32(__rev2_313, __p3_313), __rev0_313, __p1_313); \	48794	__ret_314 = __noswap_vset_lane_f32(__noswap_vget_lane_f32(__rev2_314, __p3_314), __rev0_314, __p1_314); \
48910	__ret_313 = __builtin_shufflevector(__ret_313, __ret_313, __lane_reverse_64_32); \	48795	__ret_314 = __builtin_shufflevector(__ret_314, __ret_314, __lane_reverse_64_32); \
48911	__ret_313; \	48796	__ret_314; \
48912	})	48797	})
48913	#endif	48798	#endif
48914		48799
48915	#define vcopy_lane_u64(__p0_314, __p1_314, __p2_314, __p3_314) __extension__ ({ \
48916	uint64x1_t __ret_314; \
48917	uint64x1_t __s0_314 = __p0_314; \
48918	uint64x1_t __s2_314 = __p2_314; \
48919	__ret_314 = vset_lane_u64(vget_lane_u64(__s2_314, __p3_314), __s0_314, __p1_314); \
48920	__ret_314; \
48921	})
48922	#ifdef __LITTLE_ENDIAN__	48800	#ifdef __LITTLE_ENDIAN__
48923	#define vcopy_lane_u16(__p0_315, __p1_315, __p2_315, __p3_315) __extension__ ({ \	48801	#define vcopy_lane_s32(__p0_315, __p1_315, __p2_315, __p3_315) __extension__ ({ \
48924	uint16x4_t __ret_315; \	48802	int32x2_t __ret_315; \
48925	uint16x4_t __s0_315 = __p0_315; \	48803	int32x2_t __s0_315 = __p0_315; \
48926	uint16x4_t __s2_315 = __p2_315; \	48804	int32x2_t __s2_315 = __p2_315; \
48927	__ret_315 = vset_lane_u16(vget_lane_u16(__s2_315, __p3_315), __s0_315, __p1_315); \	48805	__ret_315 = vset_lane_s32(vget_lane_s32(__s2_315, __p3_315), __s0_315, __p1_315); \
48928	__ret_315; \	48806	__ret_315; \
48929	})	48807	})
48930	#else	48808	#else
48931	#define vcopy_lane_u16(__p0_316, __p1_316, __p2_316, __p3_316) __extension__ ({ \	48809	#define vcopy_lane_s32(__p0_316, __p1_316, __p2_316, __p3_316) __extension__ ({ \
48932	uint16x4_t __ret_316; \	48810	int32x2_t __ret_316; \
48933	uint16x4_t __s0_316 = __p0_316; \	48811	int32x2_t __s0_316 = __p0_316; \
48934	uint16x4_t __s2_316 = __p2_316; \	48812	int32x2_t __s2_316 = __p2_316; \
48935	uint16x4_t __rev0_316; __rev0_316 = __builtin_shufflevector(__s0_316, __s0_316, __lane_reverse_64_16); \	48813	int32x2_t __rev0_316; __rev0_316 = __builtin_shufflevector(__s0_316, __s0_316, __lane_reverse_64_32); \
48936	uint16x4_t __rev2_316; __rev2_316 = __builtin_shufflevector(__s2_316, __s2_316, __lane_reverse_64_16); \	48814	int32x2_t __rev2_316; __rev2_316 = __builtin_shufflevector(__s2_316, __s2_316, __lane_reverse_64_32); \
48937	__ret_316 = __noswap_vset_lane_u16(__noswap_vget_lane_u16(__rev2_316, __p3_316), __rev0_316, __p1_316); \	48815	__ret_316 = __noswap_vset_lane_s32(__noswap_vget_lane_s32(__rev2_316, __p3_316), __rev0_316, __p1_316); \
48938	__ret_316 = __builtin_shufflevector(__ret_316, __ret_316, __lane_reverse_64_16); \	48816	__ret_316 = __builtin_shufflevector(__ret_316, __ret_316, __lane_reverse_64_32); \
48939	__ret_316; \	48817	__ret_316; \
48940	})	48818	})
48941	#endif	48819	#endif
48942		48820
48943	#ifdef __LITTLE_ENDIAN__	48821	#define vcopy_lane_s64(__p0_317, __p1_317, __p2_317, __p3_317) __extension__ ({ \
48944	#define vcopy_lane_s8(__p0_317, __p1_317, __p2_317, __p3_317) __extension__ ({ \	48822	int64x1_t __ret_317; \
48945	int8x8_t __ret_317; \	48823	int64x1_t __s0_317 = __p0_317; \
48946	int8x8_t __s0_317 = __p0_317; \	48824	int64x1_t __s2_317 = __p2_317; \
48947	int8x8_t __s2_317 = __p2_317; \	48825	__ret_317 = vset_lane_s64(vget_lane_s64(__s2_317, __p3_317), __s0_317, __p1_317); \
48948	__ret_317 = vset_lane_s8(vget_lane_s8(__s2_317, __p3_317), __s0_317, __p1_317); \
48949	__ret_317; \	48826	__ret_317; \
48950	})	48827	})
48951	#else	48828	#ifdef __LITTLE_ENDIAN__
48952	#define vcopy_lane_s8(__p0_318, __p1_318, __p2_318, __p3_318) __extension__ ({ \	48829	#define vcopy_lane_mf8(__p0_318, __p1_318, __p2_318, __p3_318) __extension__ ({ \
48953	int8x8_t __ret_318; \	48830	mfloat8x8_t __ret_318; \
48954	int8x8_t __s0_318 = __p0_318; \	48831	mfloat8x8_t __s0_318 = __p0_318; \
48955	int8x8_t __s2_318 = __p2_318; \	48832	mfloat8x8_t __s2_318 = __p2_318; \
48956	int8x8_t __rev0_318; __rev0_318 = __builtin_shufflevector(__s0_318, __s0_318, __lane_reverse_64_8); \	48833	__ret_318 = vset_lane_mf8(vget_lane_mf8(__s2_318, __p3_318), __s0_318, __p1_318); \
48957	int8x8_t __rev2_318; __rev2_318 = __builtin_shufflevector(__s2_318, __s2_318, __lane_reverse_64_8); \
48958	__ret_318 = __noswap_vset_lane_s8(__noswap_vget_lane_s8(__rev2_318, __p3_318), __rev0_318, __p1_318); \
48959	__ret_318 = __builtin_shufflevector(__ret_318, __ret_318, __lane_reverse_64_8); \
48960	__ret_318; \	48834	__ret_318; \
48961	})	48835	})
		48836	#else
		48837	#define vcopy_lane_mf8(__p0_319, __p1_319, __p2_319, __p3_319) __extension__ ({ \
		48838	mfloat8x8_t __ret_319; \
		48839	mfloat8x8_t __s0_319 = __p0_319; \
		48840	mfloat8x8_t __s2_319 = __p2_319; \
		48841	mfloat8x8_t __rev0_319; __rev0_319 = __builtin_shufflevector(__s0_319, __s0_319, __lane_reverse_64_8); \
		48842	mfloat8x8_t __rev2_319; __rev2_319 = __builtin_shufflevector(__s2_319, __s2_319, __lane_reverse_64_8); \
		48843	__ret_319 = __noswap_vset_lane_mf8(__noswap_vget_lane_mf8(__rev2_319, __p3_319), __rev0_319, __p1_319); \
		48844	__ret_319 = __builtin_shufflevector(__ret_319, __ret_319, __lane_reverse_64_8); \
		48845	__ret_319; \
		48846	})
48962	#endif	48847	#endif
48963		48848
48964	#ifdef __LITTLE_ENDIAN__	48849	#ifdef __LITTLE_ENDIAN__
48965	#define vcopy_lane_f32(__p0_319, __p1_319, __p2_319, __p3_319) __extension__ ({ \	48850	#define vcopy_lane_s16(__p0_320, __p1_320, __p2_320, __p3_320) __extension__ ({ \
48966	float32x2_t __ret_319; \	48851	int16x4_t __ret_320; \
48967	float32x2_t __s0_319 = __p0_319; \	48852	int16x4_t __s0_320 = __p0_320; \
48968	float32x2_t __s2_319 = __p2_319; \	48853	int16x4_t __s2_320 = __p2_320; \
48969	__ret_319 = vset_lane_f32(vget_lane_f32(__s2_319, __p3_319), __s0_319, __p1_319); \	48854	__ret_320 = vset_lane_s16(vget_lane_s16(__s2_320, __p3_320), __s0_320, __p1_320); \
48970	__ret_319; \	48855	__ret_320; \
48971	})	48856	})
48972	#else	48857	#else
48973	#define vcopy_lane_f32(__p0_320, __p1_320, __p2_320, __p3_320) __extension__ ({ \	48858	#define vcopy_lane_s16(__p0_321, __p1_321, __p2_321, __p3_321) __extension__ ({ \
48974	float32x2_t __ret_320; \	48859	int16x4_t __ret_321; \
48975	float32x2_t __s0_320 = __p0_320; \	48860	int16x4_t __s0_321 = __p0_321; \
48976	float32x2_t __s2_320 = __p2_320; \	48861	int16x4_t __s2_321 = __p2_321; \
48977	float32x2_t __rev0_320; __rev0_320 = __builtin_shufflevector(__s0_320, __s0_320, __lane_reverse_64_32); \	48862	int16x4_t __rev0_321; __rev0_321 = __builtin_shufflevector(__s0_321, __s0_321, __lane_reverse_64_16); \
48978	float32x2_t __rev2_320; __rev2_320 = __builtin_shufflevector(__s2_320, __s2_320, __lane_reverse_64_32); \	48863	int16x4_t __rev2_321; __rev2_321 = __builtin_shufflevector(__s2_321, __s2_321, __lane_reverse_64_16); \
48979	__ret_320 = __noswap_vset_lane_f32(__noswap_vget_lane_f32(__rev2_320, __p3_320), __rev0_320, __p1_320); \	48864	__ret_321 = __noswap_vset_lane_s16(__noswap_vget_lane_s16(__rev2_321, __p3_321), __rev0_321, __p1_321); \
48980	__ret_320 = __builtin_shufflevector(__ret_320, __ret_320, __lane_reverse_64_32); \	48865	__ret_321 = __builtin_shufflevector(__ret_321, __ret_321, __lane_reverse_64_16); \
48981	__ret_320; \	48866	__ret_321; \
48982	})	48867	})
48983	#endif	48868	#endif
48984		48869
48985	#ifdef __LITTLE_ENDIAN__	48870	#ifdef __LITTLE_ENDIAN__
48986	#define vcopy_lane_s32(__p0_321, __p1_321, __p2_321, __p3_321) __extension__ ({ \	48871	#define vcopy_lane_bf16(__p0_322, __p1_322, __p2_322, __p3_322) __extension__ ({ \
48987	int32x2_t __ret_321; \	48872	bfloat16x4_t __ret_322; \
48988	int32x2_t __s0_321 = __p0_321; \	48873	bfloat16x4_t __s0_322 = __p0_322; \
48989	int32x2_t __s2_321 = __p2_321; \	48874	bfloat16x4_t __s2_322 = __p2_322; \
48990	__ret_321 = vset_lane_s32(vget_lane_s32(__s2_321, __p3_321), __s0_321, __p1_321); \	48875	__ret_322 = vset_lane_bf16(vget_lane_bf16(__s2_322, __p3_322), __s0_322, __p1_322); \
48991	__ret_321; \	48876	__ret_322; \
48992	})	48877	})
48993	#else	48878	#else
48994	#define vcopy_lane_s32(__p0_322, __p1_322, __p2_322, __p3_322) __extension__ ({ \	48879	#define vcopy_lane_bf16(__p0_323, __p1_323, __p2_323, __p3_323) __extension__ ({ \
48995	int32x2_t __ret_322; \	48880	bfloat16x4_t __ret_323; \
48996	int32x2_t __s0_322 = __p0_322; \	48881	bfloat16x4_t __s0_323 = __p0_323; \
48997	int32x2_t __s2_322 = __p2_322; \	48882	bfloat16x4_t __s2_323 = __p2_323; \
48998	int32x2_t __rev0_322; __rev0_322 = __builtin_shufflevector(__s0_322, __s0_322, __lane_reverse_64_32); \	48883	bfloat16x4_t __rev0_323; __rev0_323 = __builtin_shufflevector(__s0_323, __s0_323, __lane_reverse_64_16); \
48999	int32x2_t __rev2_322; __rev2_322 = __builtin_shufflevector(__s2_322, __s2_322, __lane_reverse_64_32); \	48884	bfloat16x4_t __rev2_323; __rev2_323 = __builtin_shufflevector(__s2_323, __s2_323, __lane_reverse_64_16); \
49000	__ret_322 = __noswap_vset_lane_s32(__noswap_vget_lane_s32(__rev2_322, __p3_322), __rev0_322, __p1_322); \	48885	__ret_323 = __noswap_vset_lane_bf16(__noswap_vget_lane_bf16(__rev2_323, __p3_323), __rev0_323, __p1_323); \
49001	__ret_322 = __builtin_shufflevector(__ret_322, __ret_322, __lane_reverse_64_32); \	48886	__ret_323 = __builtin_shufflevector(__ret_323, __ret_323, __lane_reverse_64_16); \
49002	__ret_322; \	48887	__ret_323; \
49003	})	48888	})
49004	#endif	48889	#endif
49005		48890
49006	#define vcopy_lane_s64(__p0_323, __p1_323, __p2_323, __p3_323) __extension__ ({ \
49007	int64x1_t __ret_323; \
49008	int64x1_t __s0_323 = __p0_323; \
49009	int64x1_t __s2_323 = __p2_323; \
49010	__ret_323 = vset_lane_s64(vget_lane_s64(__s2_323, __p3_323), __s0_323, __p1_323); \
49011	__ret_323; \
49012	})
49013	#ifdef __LITTLE_ENDIAN__	48891	#ifdef __LITTLE_ENDIAN__
49014	#define vcopy_lane_mf8(__p0_324, __p1_324, __p2_324, __p3_324) __extension__ ({ \	48892	#define vcopyq_laneq_p8(__p0_324, __p1_324, __p2_324, __p3_324) __extension__ ({ \
49015	mfloat8x8_t __ret_324; \	48893	poly8x16_t __ret_324; \
49016	mfloat8x8_t __s0_324 = __p0_324; \	48894	poly8x16_t __s0_324 = __p0_324; \
49017	mfloat8x8_t __s2_324 = __p2_324; \	48895	poly8x16_t __s2_324 = __p2_324; \
49018	__ret_324 = vset_lane_mf8(vget_lane_mf8(__s2_324, __p3_324), __s0_324, __p1_324); \	48896	__ret_324 = vsetq_lane_p8(vgetq_lane_p8(__s2_324, __p3_324), __s0_324, __p1_324); \
49019	__ret_324; \	48897	__ret_324; \
49020	})	48898	})
49021	#else	48899	#else
49022	#define vcopy_lane_mf8(__p0_325, __p1_325, __p2_325, __p3_325) __extension__ ({ \	48900	#define vcopyq_laneq_p8(__p0_325, __p1_325, __p2_325, __p3_325) __extension__ ({ \
49023	mfloat8x8_t __ret_325; \	48901	poly8x16_t __ret_325; \
49024	mfloat8x8_t __s0_325 = __p0_325; \	48902	poly8x16_t __s0_325 = __p0_325; \
49025	mfloat8x8_t __s2_325 = __p2_325; \	48903	poly8x16_t __s2_325 = __p2_325; \
49026	mfloat8x8_t __rev0_325; __rev0_325 = __builtin_shufflevector(__s0_325, __s0_325, __lane_reverse_64_8); \	48904	poly8x16_t __rev0_325; __rev0_325 = __builtin_shufflevector(__s0_325, __s0_325, __lane_reverse_128_8); \
49027	mfloat8x8_t __rev2_325; __rev2_325 = __builtin_shufflevector(__s2_325, __s2_325, __lane_reverse_64_8); \	48905	poly8x16_t __rev2_325; __rev2_325 = __builtin_shufflevector(__s2_325, __s2_325, __lane_reverse_128_8); \
49028	__ret_325 = __noswap_vset_lane_mf8(__noswap_vget_lane_mf8(__rev2_325, __p3_325), __rev0_325, __p1_325); \	48906	__ret_325 = __noswap_vsetq_lane_p8(__noswap_vgetq_lane_p8(__rev2_325, __p3_325), __rev0_325, __p1_325); \
49029	__ret_325 = __builtin_shufflevector(__ret_325, __ret_325, __lane_reverse_64_8); \	48907	__ret_325 = __builtin_shufflevector(__ret_325, __ret_325, __lane_reverse_128_8); \
49030	__ret_325; \	48908	__ret_325; \
49031	})	48909	})
49032	#endif	48910	#endif
49033		48911
49034	#ifdef __LITTLE_ENDIAN__	48912	#ifdef __LITTLE_ENDIAN__
49035	#define vcopy_lane_s16(__p0_326, __p1_326, __p2_326, __p3_326) __extension__ ({ \	48913	#define vcopyq_laneq_p16(__p0_326, __p1_326, __p2_326, __p3_326) __extension__ ({ \
49036	int16x4_t __ret_326; \	48914	poly16x8_t __ret_326; \
49037	int16x4_t __s0_326 = __p0_326; \	48915	poly16x8_t __s0_326 = __p0_326; \
49038	int16x4_t __s2_326 = __p2_326; \	48916	poly16x8_t __s2_326 = __p2_326; \
49039	__ret_326 = vset_lane_s16(vget_lane_s16(__s2_326, __p3_326), __s0_326, __p1_326); \	48917	__ret_326 = vsetq_lane_p16(vgetq_lane_p16(__s2_326, __p3_326), __s0_326, __p1_326); \
49040	__ret_326; \	48918	__ret_326; \
49041	})	48919	})
49042	#else	48920	#else
49043	#define vcopy_lane_s16(__p0_327, __p1_327, __p2_327, __p3_327) __extension__ ({ \	48921	#define vcopyq_laneq_p16(__p0_327, __p1_327, __p2_327, __p3_327) __extension__ ({ \
49044	int16x4_t __ret_327; \	48922	poly16x8_t __ret_327; \
49045	int16x4_t __s0_327 = __p0_327; \	48923	poly16x8_t __s0_327 = __p0_327; \
49046	int16x4_t __s2_327 = __p2_327; \	48924	poly16x8_t __s2_327 = __p2_327; \
49047	int16x4_t __rev0_327; __rev0_327 = __builtin_shufflevector(__s0_327, __s0_327, __lane_reverse_64_16); \	48925	poly16x8_t __rev0_327; __rev0_327 = __builtin_shufflevector(__s0_327, __s0_327, __lane_reverse_128_16); \
49048	int16x4_t __rev2_327; __rev2_327 = __builtin_shufflevector(__s2_327, __s2_327, __lane_reverse_64_16); \	48926	poly16x8_t __rev2_327; __rev2_327 = __builtin_shufflevector(__s2_327, __s2_327, __lane_reverse_128_16); \
49049	__ret_327 = __noswap_vset_lane_s16(__noswap_vget_lane_s16(__rev2_327, __p3_327), __rev0_327, __p1_327); \	48927	__ret_327 = __noswap_vsetq_lane_p16(__noswap_vgetq_lane_p16(__rev2_327, __p3_327), __rev0_327, __p1_327); \
49050	__ret_327 = __builtin_shufflevector(__ret_327, __ret_327, __lane_reverse_64_16); \	48928	__ret_327 = __builtin_shufflevector(__ret_327, __ret_327, __lane_reverse_128_16); \
49051	__ret_327; \	48929	__ret_327; \
49052	})	48930	})
49053	#endif	48931	#endif
49054		48932
49055	#ifdef __LITTLE_ENDIAN__	48933	#ifdef __LITTLE_ENDIAN__
49056	#define vcopyq_laneq_p8(__p0_328, __p1_328, __p2_328, __p3_328) __extension__ ({ \	48934	#define vcopyq_laneq_u8(__p0_328, __p1_328, __p2_328, __p3_328) __extension__ ({ \
49057	poly8x16_t __ret_328; \	48935	uint8x16_t __ret_328; \
49058	poly8x16_t __s0_328 = __p0_328; \	48936	uint8x16_t __s0_328 = __p0_328; \
49059	poly8x16_t __s2_328 = __p2_328; \	48937	uint8x16_t __s2_328 = __p2_328; \
49060	__ret_328 = vsetq_lane_p8(vgetq_lane_p8(__s2_328, __p3_328), __s0_328, __p1_328); \	48938	__ret_328 = vsetq_lane_u8(vgetq_lane_u8(__s2_328, __p3_328), __s0_328, __p1_328); \
49061	__ret_328; \	48939	__ret_328; \
49062	})	48940	})
49063	#else	48941	#else
49064	#define vcopyq_laneq_p8(__p0_329, __p1_329, __p2_329, __p3_329) __extension__ ({ \	48942	#define vcopyq_laneq_u8(__p0_329, __p1_329, __p2_329, __p3_329) __extension__ ({ \
49065	poly8x16_t __ret_329; \	48943	uint8x16_t __ret_329; \
49066	poly8x16_t __s0_329 = __p0_329; \	48944	uint8x16_t __s0_329 = __p0_329; \
49067	poly8x16_t __s2_329 = __p2_329; \	48945	uint8x16_t __s2_329 = __p2_329; \
49068	poly8x16_t __rev0_329; __rev0_329 = __builtin_shufflevector(__s0_329, __s0_329, __lane_reverse_128_8); \	48946	uint8x16_t __rev0_329; __rev0_329 = __builtin_shufflevector(__s0_329, __s0_329, __lane_reverse_128_8); \
49069	poly8x16_t __rev2_329; __rev2_329 = __builtin_shufflevector(__s2_329, __s2_329, __lane_reverse_128_8); \	48947	uint8x16_t __rev2_329; __rev2_329 = __builtin_shufflevector(__s2_329, __s2_329, __lane_reverse_128_8); \
49070	__ret_329 = __noswap_vsetq_lane_p8(__noswap_vgetq_lane_p8(__rev2_329, __p3_329), __rev0_329, __p1_329); \	48948	__ret_329 = __noswap_vsetq_lane_u8(__noswap_vgetq_lane_u8(__rev2_329, __p3_329), __rev0_329, __p1_329); \
49071	__ret_329 = __builtin_shufflevector(__ret_329, __ret_329, __lane_reverse_128_8); \	48949	__ret_329 = __builtin_shufflevector(__ret_329, __ret_329, __lane_reverse_128_8); \
49072	__ret_329; \	48950	__ret_329; \
49073	})	48951	})
49074	#endif	48952	#endif
49075		48953
49076	#ifdef __LITTLE_ENDIAN__	48954	#ifdef __LITTLE_ENDIAN__
49077	#define vcopyq_laneq_p16(__p0_330, __p1_330, __p2_330, __p3_330) __extension__ ({ \	48955	#define vcopyq_laneq_u32(__p0_330, __p1_330, __p2_330, __p3_330) __extension__ ({ \
49078	poly16x8_t __ret_330; \	48956	uint32x4_t __ret_330; \
49079	poly16x8_t __s0_330 = __p0_330; \	48957	uint32x4_t __s0_330 = __p0_330; \
49080	poly16x8_t __s2_330 = __p2_330; \	48958	uint32x4_t __s2_330 = __p2_330; \
49081	__ret_330 = vsetq_lane_p16(vgetq_lane_p16(__s2_330, __p3_330), __s0_330, __p1_330); \	48959	__ret_330 = vsetq_lane_u32(vgetq_lane_u32(__s2_330, __p3_330), __s0_330, __p1_330); \
49082	__ret_330; \	48960	__ret_330; \
49083	})	48961	})
49084	#else	48962	#else
49085	#define vcopyq_laneq_p16(__p0_331, __p1_331, __p2_331, __p3_331) __extension__ ({ \	48963	#define vcopyq_laneq_u32(__p0_331, __p1_331, __p2_331, __p3_331) __extension__ ({ \
49086	poly16x8_t __ret_331; \	48964	uint32x4_t __ret_331; \
49087	poly16x8_t __s0_331 = __p0_331; \	48965	uint32x4_t __s0_331 = __p0_331; \
49088	poly16x8_t __s2_331 = __p2_331; \	48966	uint32x4_t __s2_331 = __p2_331; \
49089	poly16x8_t __rev0_331; __rev0_331 = __builtin_shufflevector(__s0_331, __s0_331, __lane_reverse_128_16); \	48967	uint32x4_t __rev0_331; __rev0_331 = __builtin_shufflevector(__s0_331, __s0_331, __lane_reverse_128_32); \
49090	poly16x8_t __rev2_331; __rev2_331 = __builtin_shufflevector(__s2_331, __s2_331, __lane_reverse_128_16); \	48968	uint32x4_t __rev2_331; __rev2_331 = __builtin_shufflevector(__s2_331, __s2_331, __lane_reverse_128_32); \
49091	__ret_331 = __noswap_vsetq_lane_p16(__noswap_vgetq_lane_p16(__rev2_331, __p3_331), __rev0_331, __p1_331); \	48969	__ret_331 = __noswap_vsetq_lane_u32(__noswap_vgetq_lane_u32(__rev2_331, __p3_331), __rev0_331, __p1_331); \
49092	__ret_331 = __builtin_shufflevector(__ret_331, __ret_331, __lane_reverse_128_16); \	48970	__ret_331 = __builtin_shufflevector(__ret_331, __ret_331, __lane_reverse_128_32); \
49093	__ret_331; \	48971	__ret_331; \
49094	})	48972	})
49095	#endif	48973	#endif
49096		48974
49097	#ifdef __LITTLE_ENDIAN__	48975	#ifdef __LITTLE_ENDIAN__
49098	#define vcopyq_laneq_u8(__p0_332, __p1_332, __p2_332, __p3_332) __extension__ ({ \	48976	#define vcopyq_laneq_u64(__p0_332, __p1_332, __p2_332, __p3_332) __extension__ ({ \
49099	uint8x16_t __ret_332; \	48977	uint64x2_t __ret_332; \
49100	uint8x16_t __s0_332 = __p0_332; \	48978	uint64x2_t __s0_332 = __p0_332; \
49101	uint8x16_t __s2_332 = __p2_332; \	48979	uint64x2_t __s2_332 = __p2_332; \
49102	__ret_332 = vsetq_lane_u8(vgetq_lane_u8(__s2_332, __p3_332), __s0_332, __p1_332); \	48980	__ret_332 = vsetq_lane_u64(vgetq_lane_u64(__s2_332, __p3_332), __s0_332, __p1_332); \
49103	__ret_332; \	48981	__ret_332; \
49104	})	48982	})
49105	#else	48983	#else
49106	#define vcopyq_laneq_u8(__p0_333, __p1_333, __p2_333, __p3_333) __extension__ ({ \	48984	#define vcopyq_laneq_u64(__p0_333, __p1_333, __p2_333, __p3_333) __extension__ ({ \
49107	uint8x16_t __ret_333; \	48985	uint64x2_t __ret_333; \
49108	uint8x16_t __s0_333 = __p0_333; \	48986	uint64x2_t __s0_333 = __p0_333; \
49109	uint8x16_t __s2_333 = __p2_333; \	48987	uint64x2_t __s2_333 = __p2_333; \
49110	uint8x16_t __rev0_333; __rev0_333 = __builtin_shufflevector(__s0_333, __s0_333, __lane_reverse_128_8); \	48988	uint64x2_t __rev0_333; __rev0_333 = __builtin_shufflevector(__s0_333, __s0_333, __lane_reverse_128_64); \
49111	uint8x16_t __rev2_333; __rev2_333 = __builtin_shufflevector(__s2_333, __s2_333, __lane_reverse_128_8); \	48989	uint64x2_t __rev2_333; __rev2_333 = __builtin_shufflevector(__s2_333, __s2_333, __lane_reverse_128_64); \
49112	__ret_333 = __noswap_vsetq_lane_u8(__noswap_vgetq_lane_u8(__rev2_333, __p3_333), __rev0_333, __p1_333); \	48990	__ret_333 = __noswap_vsetq_lane_u64(__noswap_vgetq_lane_u64(__rev2_333, __p3_333), __rev0_333, __p1_333); \
49113	__ret_333 = __builtin_shufflevector(__ret_333, __ret_333, __lane_reverse_128_8); \	48991	__ret_333 = __builtin_shufflevector(__ret_333, __ret_333, __lane_reverse_128_64); \
49114	__ret_333; \	48992	__ret_333; \
49115	})	48993	})
49116	#endif	48994	#endif
49117		48995
49118	#ifdef __LITTLE_ENDIAN__	48996	#ifdef __LITTLE_ENDIAN__
49119	#define vcopyq_laneq_u32(__p0_334, __p1_334, __p2_334, __p3_334) __extension__ ({ \	48997	#define vcopyq_laneq_u16(__p0_334, __p1_334, __p2_334, __p3_334) __extension__ ({ \
49120	uint32x4_t __ret_334; \	48998	uint16x8_t __ret_334; \
49121	uint32x4_t __s0_334 = __p0_334; \	48999	uint16x8_t __s0_334 = __p0_334; \
49122	uint32x4_t __s2_334 = __p2_334; \	49000	uint16x8_t __s2_334 = __p2_334; \
49123	__ret_334 = vsetq_lane_u32(vgetq_lane_u32(__s2_334, __p3_334), __s0_334, __p1_334); \	49001	__ret_334 = vsetq_lane_u16(vgetq_lane_u16(__s2_334, __p3_334), __s0_334, __p1_334); \
49124	__ret_334; \	49002	__ret_334; \
49125	})	49003	})
49126	#else	49004	#else
49127	#define vcopyq_laneq_u32(__p0_335, __p1_335, __p2_335, __p3_335) __extension__ ({ \	49005	#define vcopyq_laneq_u16(__p0_335, __p1_335, __p2_335, __p3_335) __extension__ ({ \
49128	uint32x4_t __ret_335; \	49006	uint16x8_t __ret_335; \
49129	uint32x4_t __s0_335 = __p0_335; \	49007	uint16x8_t __s0_335 = __p0_335; \
49130	uint32x4_t __s2_335 = __p2_335; \	49008	uint16x8_t __s2_335 = __p2_335; \
49131	uint32x4_t __rev0_335; __rev0_335 = __builtin_shufflevector(__s0_335, __s0_335, __lane_reverse_128_32); \	49009	uint16x8_t __rev0_335; __rev0_335 = __builtin_shufflevector(__s0_335, __s0_335, __lane_reverse_128_16); \
49132	uint32x4_t __rev2_335; __rev2_335 = __builtin_shufflevector(__s2_335, __s2_335, __lane_reverse_128_32); \	49010	uint16x8_t __rev2_335; __rev2_335 = __builtin_shufflevector(__s2_335, __s2_335, __lane_reverse_128_16); \
49133	__ret_335 = __noswap_vsetq_lane_u32(__noswap_vgetq_lane_u32(__rev2_335, __p3_335), __rev0_335, __p1_335); \	49011	__ret_335 = __noswap_vsetq_lane_u16(__noswap_vgetq_lane_u16(__rev2_335, __p3_335), __rev0_335, __p1_335); \
49134	__ret_335 = __builtin_shufflevector(__ret_335, __ret_335, __lane_reverse_128_32); \	49012	__ret_335 = __builtin_shufflevector(__ret_335, __ret_335, __lane_reverse_128_16); \
49135	__ret_335; \	49013	__ret_335; \
49136	})	49014	})
49137	#endif	49015	#endif
49138		49016
49139	#ifdef __LITTLE_ENDIAN__	49017	#ifdef __LITTLE_ENDIAN__
49140	#define vcopyq_laneq_u64(__p0_336, __p1_336, __p2_336, __p3_336) __extension__ ({ \	49018	#define vcopyq_laneq_s8(__p0_336, __p1_336, __p2_336, __p3_336) __extension__ ({ \
49141	uint64x2_t __ret_336; \	49019	int8x16_t __ret_336; \
49142	uint64x2_t __s0_336 = __p0_336; \	49020	int8x16_t __s0_336 = __p0_336; \
49143	uint64x2_t __s2_336 = __p2_336; \	49021	int8x16_t __s2_336 = __p2_336; \
49144	__ret_336 = vsetq_lane_u64(vgetq_lane_u64(__s2_336, __p3_336), __s0_336, __p1_336); \	49022	__ret_336 = vsetq_lane_s8(vgetq_lane_s8(__s2_336, __p3_336), __s0_336, __p1_336); \
49145	__ret_336; \	49023	__ret_336; \
49146	})	49024	})
49147	#else	49025	#else
49148	#define vcopyq_laneq_u64(__p0_337, __p1_337, __p2_337, __p3_337) __extension__ ({ \	49026	#define vcopyq_laneq_s8(__p0_337, __p1_337, __p2_337, __p3_337) __extension__ ({ \
49149	uint64x2_t __ret_337; \	49027	int8x16_t __ret_337; \
49150	uint64x2_t __s0_337 = __p0_337; \	49028	int8x16_t __s0_337 = __p0_337; \
49151	uint64x2_t __s2_337 = __p2_337; \	49029	int8x16_t __s2_337 = __p2_337; \
49152	uint64x2_t __rev0_337; __rev0_337 = __builtin_shufflevector(__s0_337, __s0_337, __lane_reverse_128_64); \	49030	int8x16_t __rev0_337; __rev0_337 = __builtin_shufflevector(__s0_337, __s0_337, __lane_reverse_128_8); \
49153	uint64x2_t __rev2_337; __rev2_337 = __builtin_shufflevector(__s2_337, __s2_337, __lane_reverse_128_64); \	49031	int8x16_t __rev2_337; __rev2_337 = __builtin_shufflevector(__s2_337, __s2_337, __lane_reverse_128_8); \
49154	__ret_337 = __noswap_vsetq_lane_u64(__noswap_vgetq_lane_u64(__rev2_337, __p3_337), __rev0_337, __p1_337); \	49032	__ret_337 = __noswap_vsetq_lane_s8(__noswap_vgetq_lane_s8(__rev2_337, __p3_337), __rev0_337, __p1_337); \
49155	__ret_337 = __builtin_shufflevector(__ret_337, __ret_337, __lane_reverse_128_64); \	49033	__ret_337 = __builtin_shufflevector(__ret_337, __ret_337, __lane_reverse_128_8); \
49156	__ret_337; \	49034	__ret_337; \
49157	})	49035	})
49158	#endif	49036	#endif
49159		49037
49160	#ifdef __LITTLE_ENDIAN__	49038	#ifdef __LITTLE_ENDIAN__
49161	#define vcopyq_laneq_u16(__p0_338, __p1_338, __p2_338, __p3_338) __extension__ ({ \	49039	#define vcopyq_laneq_f32(__p0_338, __p1_338, __p2_338, __p3_338) __extension__ ({ \
49162	uint16x8_t __ret_338; \	49040	float32x4_t __ret_338; \
49163	uint16x8_t __s0_338 = __p0_338; \	49041	float32x4_t __s0_338 = __p0_338; \
49164	uint16x8_t __s2_338 = __p2_338; \	49042	float32x4_t __s2_338 = __p2_338; \
49165	__ret_338 = vsetq_lane_u16(vgetq_lane_u16(__s2_338, __p3_338), __s0_338, __p1_338); \	49043	__ret_338 = vsetq_lane_f32(vgetq_lane_f32(__s2_338, __p3_338), __s0_338, __p1_338); \
49166	__ret_338; \	49044	__ret_338; \
49167	})	49045	})
49168	#else	49046	#else
49169	#define vcopyq_laneq_u16(__p0_339, __p1_339, __p2_339, __p3_339) __extension__ ({ \	49047	#define vcopyq_laneq_f32(__p0_339, __p1_339, __p2_339, __p3_339) __extension__ ({ \
49170	uint16x8_t __ret_339; \	49048	float32x4_t __ret_339; \
49171	uint16x8_t __s0_339 = __p0_339; \	49049	float32x4_t __s0_339 = __p0_339; \
49172	uint16x8_t __s2_339 = __p2_339; \	49050	float32x4_t __s2_339 = __p2_339; \
49173	uint16x8_t __rev0_339; __rev0_339 = __builtin_shufflevector(__s0_339, __s0_339, __lane_reverse_128_16); \	49051	float32x4_t __rev0_339; __rev0_339 = __builtin_shufflevector(__s0_339, __s0_339, __lane_reverse_128_32); \
49174	uint16x8_t __rev2_339; __rev2_339 = __builtin_shufflevector(__s2_339, __s2_339, __lane_reverse_128_16); \	49052	float32x4_t __rev2_339; __rev2_339 = __builtin_shufflevector(__s2_339, __s2_339, __lane_reverse_128_32); \
49175	__ret_339 = __noswap_vsetq_lane_u16(__noswap_vgetq_lane_u16(__rev2_339, __p3_339), __rev0_339, __p1_339); \	49053	__ret_339 = __noswap_vsetq_lane_f32(__noswap_vgetq_lane_f32(__rev2_339, __p3_339), __rev0_339, __p1_339); \
49176	__ret_339 = __builtin_shufflevector(__ret_339, __ret_339, __lane_reverse_128_16); \	49054	__ret_339 = __builtin_shufflevector(__ret_339, __ret_339, __lane_reverse_128_32); \
49177	__ret_339; \	49055	__ret_339; \
49178	})	49056	})
49179	#endif	49057	#endif
49180		49058
49181	#ifdef __LITTLE_ENDIAN__	49059	#ifdef __LITTLE_ENDIAN__
49182	#define vcopyq_laneq_s8(__p0_340, __p1_340, __p2_340, __p3_340) __extension__ ({ \	49060	#define vcopyq_laneq_s32(__p0_340, __p1_340, __p2_340, __p3_340) __extension__ ({ \
49183	int8x16_t __ret_340; \	49061	int32x4_t __ret_340; \
49184	int8x16_t __s0_340 = __p0_340; \	49062	int32x4_t __s0_340 = __p0_340; \
49185	int8x16_t __s2_340 = __p2_340; \	49063	int32x4_t __s2_340 = __p2_340; \
49186	__ret_340 = vsetq_lane_s8(vgetq_lane_s8(__s2_340, __p3_340), __s0_340, __p1_340); \	49064	__ret_340 = vsetq_lane_s32(vgetq_lane_s32(__s2_340, __p3_340), __s0_340, __p1_340); \
49187	__ret_340; \	49065	__ret_340; \
49188	})	49066	})
49189	#else	49067	#else
49190	#define vcopyq_laneq_s8(__p0_341, __p1_341, __p2_341, __p3_341) __extension__ ({ \	49068	#define vcopyq_laneq_s32(__p0_341, __p1_341, __p2_341, __p3_341) __extension__ ({ \
49191	int8x16_t __ret_341; \	49069	int32x4_t __ret_341; \
49192	int8x16_t __s0_341 = __p0_341; \	49070	int32x4_t __s0_341 = __p0_341; \
49193	int8x16_t __s2_341 = __p2_341; \	49071	int32x4_t __s2_341 = __p2_341; \
49194	int8x16_t __rev0_341; __rev0_341 = __builtin_shufflevector(__s0_341, __s0_341, __lane_reverse_128_8); \	49072	int32x4_t __rev0_341; __rev0_341 = __builtin_shufflevector(__s0_341, __s0_341, __lane_reverse_128_32); \
49195	int8x16_t __rev2_341; __rev2_341 = __builtin_shufflevector(__s2_341, __s2_341, __lane_reverse_128_8); \	49073	int32x4_t __rev2_341; __rev2_341 = __builtin_shufflevector(__s2_341, __s2_341, __lane_reverse_128_32); \
49196	__ret_341 = __noswap_vsetq_lane_s8(__noswap_vgetq_lane_s8(__rev2_341, __p3_341), __rev0_341, __p1_341); \	49074	__ret_341 = __noswap_vsetq_lane_s32(__noswap_vgetq_lane_s32(__rev2_341, __p3_341), __rev0_341, __p1_341); \
49197	__ret_341 = __builtin_shufflevector(__ret_341, __ret_341, __lane_reverse_128_8); \	49075	__ret_341 = __builtin_shufflevector(__ret_341, __ret_341, __lane_reverse_128_32); \
49198	__ret_341; \	49076	__ret_341; \
49199	})	49077	})
49200	#endif	49078	#endif
49201		49079
49202	#ifdef __LITTLE_ENDIAN__	49080	#ifdef __LITTLE_ENDIAN__
49203	#define vcopyq_laneq_f32(__p0_342, __p1_342, __p2_342, __p3_342) __extension__ ({ \	49081	#define vcopyq_laneq_s64(__p0_342, __p1_342, __p2_342, __p3_342) __extension__ ({ \
49204	float32x4_t __ret_342; \	49082	int64x2_t __ret_342; \
49205	float32x4_t __s0_342 = __p0_342; \	49083	int64x2_t __s0_342 = __p0_342; \
49206	float32x4_t __s2_342 = __p2_342; \	49084	int64x2_t __s2_342 = __p2_342; \
49207	__ret_342 = vsetq_lane_f32(vgetq_lane_f32(__s2_342, __p3_342), __s0_342, __p1_342); \	49085	__ret_342 = vsetq_lane_s64(vgetq_lane_s64(__s2_342, __p3_342), __s0_342, __p1_342); \
49208	__ret_342; \	49086	__ret_342; \
49209	})	49087	})
49210	#else	49088	#else
49211	#define vcopyq_laneq_f32(__p0_343, __p1_343, __p2_343, __p3_343) __extension__ ({ \	49089	#define vcopyq_laneq_s64(__p0_343, __p1_343, __p2_343, __p3_343) __extension__ ({ \
49212	float32x4_t __ret_343; \	49090	int64x2_t __ret_343; \
49213	float32x4_t __s0_343 = __p0_343; \	49091	int64x2_t __s0_343 = __p0_343; \
49214	float32x4_t __s2_343 = __p2_343; \	49092	int64x2_t __s2_343 = __p2_343; \
49215	float32x4_t __rev0_343; __rev0_343 = __builtin_shufflevector(__s0_343, __s0_343, __lane_reverse_128_32); \	49093	int64x2_t __rev0_343; __rev0_343 = __builtin_shufflevector(__s0_343, __s0_343, __lane_reverse_128_64); \
49216	float32x4_t __rev2_343; __rev2_343 = __builtin_shufflevector(__s2_343, __s2_343, __lane_reverse_128_32); \	49094	int64x2_t __rev2_343; __rev2_343 = __builtin_shufflevector(__s2_343, __s2_343, __lane_reverse_128_64); \
49217	__ret_343 = __noswap_vsetq_lane_f32(__noswap_vgetq_lane_f32(__rev2_343, __p3_343), __rev0_343, __p1_343); \	49095	__ret_343 = __noswap_vsetq_lane_s64(__noswap_vgetq_lane_s64(__rev2_343, __p3_343), __rev0_343, __p1_343); \
49218	__ret_343 = __builtin_shufflevector(__ret_343, __ret_343, __lane_reverse_128_32); \	49096	__ret_343 = __builtin_shufflevector(__ret_343, __ret_343, __lane_reverse_128_64); \
49219	__ret_343; \	49097	__ret_343; \
49220	})	49098	})
49221	#endif	49099	#endif
49222		49100
49223	#ifdef __LITTLE_ENDIAN__	49101	#ifdef __LITTLE_ENDIAN__
49224	#define vcopyq_laneq_s32(__p0_344, __p1_344, __p2_344, __p3_344) __extension__ ({ \	49102	#define vcopyq_laneq_mf8(__p0_344, __p1_344, __p2_344, __p3_344) __extension__ ({ \
49225	int32x4_t __ret_344; \	49103	mfloat8x16_t __ret_344; \
49226	int32x4_t __s0_344 = __p0_344; \	49104	mfloat8x16_t __s0_344 = __p0_344; \
49227	int32x4_t __s2_344 = __p2_344; \	49105	mfloat8x16_t __s2_344 = __p2_344; \
49228	__ret_344 = vsetq_lane_s32(vgetq_lane_s32(__s2_344, __p3_344), __s0_344, __p1_344); \	49106	__ret_344 = vsetq_lane_mf8(vgetq_lane_mf8(__s2_344, __p3_344), __s0_344, __p1_344); \
49229	__ret_344; \	49107	__ret_344; \
49230	})	49108	})
49231	#else	49109	#else
49232	#define vcopyq_laneq_s32(__p0_345, __p1_345, __p2_345, __p3_345) __extension__ ({ \	49110	#define vcopyq_laneq_mf8(__p0_345, __p1_345, __p2_345, __p3_345) __extension__ ({ \
49233	int32x4_t __ret_345; \	49111	mfloat8x16_t __ret_345; \
49234	int32x4_t __s0_345 = __p0_345; \	49112	mfloat8x16_t __s0_345 = __p0_345; \
49235	int32x4_t __s2_345 = __p2_345; \	49113	mfloat8x16_t __s2_345 = __p2_345; \
49236	int32x4_t __rev0_345; __rev0_345 = __builtin_shufflevector(__s0_345, __s0_345, __lane_reverse_128_32); \	49114	mfloat8x16_t __rev0_345; __rev0_345 = __builtin_shufflevector(__s0_345, __s0_345, __lane_reverse_128_8); \
49237	int32x4_t __rev2_345; __rev2_345 = __builtin_shufflevector(__s2_345, __s2_345, __lane_reverse_128_32); \	49115	mfloat8x16_t __rev2_345; __rev2_345 = __builtin_shufflevector(__s2_345, __s2_345, __lane_reverse_128_8); \
49238	__ret_345 = __noswap_vsetq_lane_s32(__noswap_vgetq_lane_s32(__rev2_345, __p3_345), __rev0_345, __p1_345); \	49116	__ret_345 = __noswap_vsetq_lane_mf8(__noswap_vgetq_lane_mf8(__rev2_345, __p3_345), __rev0_345, __p1_345); \
49239	__ret_345 = __builtin_shufflevector(__ret_345, __ret_345, __lane_reverse_128_32); \	49117	__ret_345 = __builtin_shufflevector(__ret_345, __ret_345, __lane_reverse_128_8); \
49240	__ret_345; \	49118	__ret_345; \
49241	})	49119	})
49242	#endif	49120	#endif
49243		49121
49244	#ifdef __LITTLE_ENDIAN__	49122	#ifdef __LITTLE_ENDIAN__
49245	#define vcopyq_laneq_s64(__p0_346, __p1_346, __p2_346, __p3_346) __extension__ ({ \	49123	#define vcopyq_laneq_s16(__p0_346, __p1_346, __p2_346, __p3_346) __extension__ ({ \
49246	int64x2_t __ret_346; \	49124	int16x8_t __ret_346; \
49247	int64x2_t __s0_346 = __p0_346; \	49125	int16x8_t __s0_346 = __p0_346; \
49248	int64x2_t __s2_346 = __p2_346; \	49126	int16x8_t __s2_346 = __p2_346; \
49249	__ret_346 = vsetq_lane_s64(vgetq_lane_s64(__s2_346, __p3_346), __s0_346, __p1_346); \	49127	__ret_346 = vsetq_lane_s16(vgetq_lane_s16(__s2_346, __p3_346), __s0_346, __p1_346); \
49250	__ret_346; \	49128	__ret_346; \
49251	})	49129	})
49252	#else	49130	#else
49253	#define vcopyq_laneq_s64(__p0_347, __p1_347, __p2_347, __p3_347) __extension__ ({ \	49131	#define vcopyq_laneq_s16(__p0_347, __p1_347, __p2_347, __p3_347) __extension__ ({ \
49254	int64x2_t __ret_347; \	49132	int16x8_t __ret_347; \
49255	int64x2_t __s0_347 = __p0_347; \	49133	int16x8_t __s0_347 = __p0_347; \
49256	int64x2_t __s2_347 = __p2_347; \	49134	int16x8_t __s2_347 = __p2_347; \
49257	int64x2_t __rev0_347; __rev0_347 = __builtin_shufflevector(__s0_347, __s0_347, __lane_reverse_128_64); \	49135	int16x8_t __rev0_347; __rev0_347 = __builtin_shufflevector(__s0_347, __s0_347, __lane_reverse_128_16); \
49258	int64x2_t __rev2_347; __rev2_347 = __builtin_shufflevector(__s2_347, __s2_347, __lane_reverse_128_64); \	49136	int16x8_t __rev2_347; __rev2_347 = __builtin_shufflevector(__s2_347, __s2_347, __lane_reverse_128_16); \
49259	__ret_347 = __noswap_vsetq_lane_s64(__noswap_vgetq_lane_s64(__rev2_347, __p3_347), __rev0_347, __p1_347); \	49137	__ret_347 = __noswap_vsetq_lane_s16(__noswap_vgetq_lane_s16(__rev2_347, __p3_347), __rev0_347, __p1_347); \
49260	__ret_347 = __builtin_shufflevector(__ret_347, __ret_347, __lane_reverse_128_64); \	49138	__ret_347 = __builtin_shufflevector(__ret_347, __ret_347, __lane_reverse_128_16); \
49261	__ret_347; \	49139	__ret_347; \
49262	})	49140	})
49263	#endif	49141	#endif
49264		49142
49265	#ifdef __LITTLE_ENDIAN__	49143	#ifdef __LITTLE_ENDIAN__
49266	#define vcopyq_laneq_mf8(__p0_348, __p1_348, __p2_348, __p3_348) __extension__ ({ \	49144	#define vcopyq_laneq_bf16(__p0_348, __p1_348, __p2_348, __p3_348) __extension__ ({ \
49267	mfloat8x16_t __ret_348; \	49145	bfloat16x8_t __ret_348; \
49268	mfloat8x16_t __s0_348 = __p0_348; \	49146	bfloat16x8_t __s0_348 = __p0_348; \
49269	mfloat8x16_t __s2_348 = __p2_348; \	49147	bfloat16x8_t __s2_348 = __p2_348; \
49270	__ret_348 = vsetq_lane_mf8(vgetq_lane_mf8(__s2_348, __p3_348), __s0_348, __p1_348); \	49148	__ret_348 = vsetq_lane_bf16(vgetq_lane_bf16(__s2_348, __p3_348), __s0_348, __p1_348); \
49271	__ret_348; \	49149	__ret_348; \
49272	})	49150	})
49273	#else	49151	#else
49274	#define vcopyq_laneq_mf8(__p0_349, __p1_349, __p2_349, __p3_349) __extension__ ({ \	49152	#define vcopyq_laneq_bf16(__p0_349, __p1_349, __p2_349, __p3_349) __extension__ ({ \
49275	mfloat8x16_t __ret_349; \	49153	bfloat16x8_t __ret_349; \
49276	mfloat8x16_t __s0_349 = __p0_349; \	49154	bfloat16x8_t __s0_349 = __p0_349; \
49277	mfloat8x16_t __s2_349 = __p2_349; \	49155	bfloat16x8_t __s2_349 = __p2_349; \
49278	mfloat8x16_t __rev0_349; __rev0_349 = __builtin_shufflevector(__s0_349, __s0_349, __lane_reverse_128_8); \	49156	bfloat16x8_t __rev0_349; __rev0_349 = __builtin_shufflevector(__s0_349, __s0_349, __lane_reverse_128_16); \
49279	mfloat8x16_t __rev2_349; __rev2_349 = __builtin_shufflevector(__s2_349, __s2_349, __lane_reverse_128_8); \	49157	bfloat16x8_t __rev2_349; __rev2_349 = __builtin_shufflevector(__s2_349, __s2_349, __lane_reverse_128_16); \
49280	__ret_349 = __noswap_vsetq_lane_mf8(__noswap_vgetq_lane_mf8(__rev2_349, __p3_349), __rev0_349, __p1_349); \	49158	__ret_349 = __noswap_vsetq_lane_bf16(__noswap_vgetq_lane_bf16(__rev2_349, __p3_349), __rev0_349, __p1_349); \
49281	__ret_349 = __builtin_shufflevector(__ret_349, __ret_349, __lane_reverse_128_8); \	49159	__ret_349 = __builtin_shufflevector(__ret_349, __ret_349, __lane_reverse_128_16); \
49282	__ret_349; \	49160	__ret_349; \
49283	})	49161	})
49284	#endif	49162	#endif
49285		49163
49286	#ifdef __LITTLE_ENDIAN__	49164	#ifdef __LITTLE_ENDIAN__
49287	#define vcopyq_laneq_s16(__p0_350, __p1_350, __p2_350, __p3_350) __extension__ ({ \	49165	#define vcopy_laneq_p8(__p0_350, __p1_350, __p2_350, __p3_350) __extension__ ({ \
49288	int16x8_t __ret_350; \	49166	poly8x8_t __ret_350; \
49289	int16x8_t __s0_350 = __p0_350; \	49167	poly8x8_t __s0_350 = __p0_350; \
49290	int16x8_t __s2_350 = __p2_350; \	49168	poly8x16_t __s2_350 = __p2_350; \
49291	__ret_350 = vsetq_lane_s16(vgetq_lane_s16(__s2_350, __p3_350), __s0_350, __p1_350); \	49169	__ret_350 = vset_lane_p8(vgetq_lane_p8(__s2_350, __p3_350), __s0_350, __p1_350); \
49292	__ret_350; \	49170	__ret_350; \
49293	})	49171	})
49294	#else	49172	#else
49295	#define vcopyq_laneq_s16(__p0_351, __p1_351, __p2_351, __p3_351) __extension__ ({ \	49173	#define vcopy_laneq_p8(__p0_351, __p1_351, __p2_351, __p3_351) __extension__ ({ \
49296	int16x8_t __ret_351; \	49174	poly8x8_t __ret_351; \
49297	int16x8_t __s0_351 = __p0_351; \	49175	poly8x8_t __s0_351 = __p0_351; \
49298	int16x8_t __s2_351 = __p2_351; \	49176	poly8x16_t __s2_351 = __p2_351; \
49299	int16x8_t __rev0_351; __rev0_351 = __builtin_shufflevector(__s0_351, __s0_351, __lane_reverse_128_16); \	49177	poly8x8_t __rev0_351; __rev0_351 = __builtin_shufflevector(__s0_351, __s0_351, __lane_reverse_64_8); \
49300	int16x8_t __rev2_351; __rev2_351 = __builtin_shufflevector(__s2_351, __s2_351, __lane_reverse_128_16); \	49178	poly8x16_t __rev2_351; __rev2_351 = __builtin_shufflevector(__s2_351, __s2_351, __lane_reverse_128_8); \
49301	__ret_351 = __noswap_vsetq_lane_s16(__noswap_vgetq_lane_s16(__rev2_351, __p3_351), __rev0_351, __p1_351); \	49179	__ret_351 = __noswap_vset_lane_p8(__noswap_vgetq_lane_p8(__rev2_351, __p3_351), __rev0_351, __p1_351); \
49302	__ret_351 = __builtin_shufflevector(__ret_351, __ret_351, __lane_reverse_128_16); \	49180	__ret_351 = __builtin_shufflevector(__ret_351, __ret_351, __lane_reverse_64_8); \
49303	__ret_351; \	49181	__ret_351; \
49304	})	49182	})
49305	#endif	49183	#endif
49306		49184
49307	#ifdef __LITTLE_ENDIAN__	49185	#ifdef __LITTLE_ENDIAN__
49308	#define vcopy_laneq_p8(__p0_352, __p1_352, __p2_352, __p3_352) __extension__ ({ \	49186	#define vcopy_laneq_p16(__p0_352, __p1_352, __p2_352, __p3_352) __extension__ ({ \
49309	poly8x8_t __ret_352; \	49187	poly16x4_t __ret_352; \
49310	poly8x8_t __s0_352 = __p0_352; \	49188	poly16x4_t __s0_352 = __p0_352; \
49311	poly8x16_t __s2_352 = __p2_352; \	49189	poly16x8_t __s2_352 = __p2_352; \
49312	__ret_352 = vset_lane_p8(vgetq_lane_p8(__s2_352, __p3_352), __s0_352, __p1_352); \	49190	__ret_352 = vset_lane_p16(vgetq_lane_p16(__s2_352, __p3_352), __s0_352, __p1_352); \
49313	__ret_352; \	49191	__ret_352; \
49314	})	49192	})
49315	#else	49193	#else
49316	#define vcopy_laneq_p8(__p0_353, __p1_353, __p2_353, __p3_353) __extension__ ({ \	49194	#define vcopy_laneq_p16(__p0_353, __p1_353, __p2_353, __p3_353) __extension__ ({ \
49317	poly8x8_t __ret_353; \	49195	poly16x4_t __ret_353; \
49318	poly8x8_t __s0_353 = __p0_353; \	49196	poly16x4_t __s0_353 = __p0_353; \
49319	poly8x16_t __s2_353 = __p2_353; \	49197	poly16x8_t __s2_353 = __p2_353; \
49320	poly8x8_t __rev0_353; __rev0_353 = __builtin_shufflevector(__s0_353, __s0_353, __lane_reverse_64_8); \	49198	poly16x4_t __rev0_353; __rev0_353 = __builtin_shufflevector(__s0_353, __s0_353, __lane_reverse_64_16); \
49321	poly8x16_t __rev2_353; __rev2_353 = __builtin_shufflevector(__s2_353, __s2_353, __lane_reverse_128_8); \	49199	poly16x8_t __rev2_353; __rev2_353 = __builtin_shufflevector(__s2_353, __s2_353, __lane_reverse_128_16); \
49322	__ret_353 = __noswap_vset_lane_p8(__noswap_vgetq_lane_p8(__rev2_353, __p3_353), __rev0_353, __p1_353); \	49200	__ret_353 = __noswap_vset_lane_p16(__noswap_vgetq_lane_p16(__rev2_353, __p3_353), __rev0_353, __p1_353); \
49323	__ret_353 = __builtin_shufflevector(__ret_353, __ret_353, __lane_reverse_64_8); \	49201	__ret_353 = __builtin_shufflevector(__ret_353, __ret_353, __lane_reverse_64_16); \
49324	__ret_353; \	49202	__ret_353; \
49325	})	49203	})
49326	#endif	49204	#endif
49327		49205
49328	#ifdef __LITTLE_ENDIAN__	49206	#ifdef __LITTLE_ENDIAN__
49329	#define vcopy_laneq_p16(__p0_354, __p1_354, __p2_354, __p3_354) __extension__ ({ \	49207	#define vcopy_laneq_u8(__p0_354, __p1_354, __p2_354, __p3_354) __extension__ ({ \
49330	poly16x4_t __ret_354; \	49208	uint8x8_t __ret_354; \
49331	poly16x4_t __s0_354 = __p0_354; \	49209	uint8x8_t __s0_354 = __p0_354; \
49332	poly16x8_t __s2_354 = __p2_354; \	49210	uint8x16_t __s2_354 = __p2_354; \
49333	__ret_354 = vset_lane_p16(vgetq_lane_p16(__s2_354, __p3_354), __s0_354, __p1_354); \	49211	__ret_354 = vset_lane_u8(vgetq_lane_u8(__s2_354, __p3_354), __s0_354, __p1_354); \
49334	__ret_354; \	49212	__ret_354; \
49335	})	49213	})
49336	#else	49214	#else
49337	#define vcopy_laneq_p16(__p0_355, __p1_355, __p2_355, __p3_355) __extension__ ({ \	49215	#define vcopy_laneq_u8(__p0_355, __p1_355, __p2_355, __p3_355) __extension__ ({ \
49338	poly16x4_t __ret_355; \	49216	uint8x8_t __ret_355; \
49339	poly16x4_t __s0_355 = __p0_355; \	49217	uint8x8_t __s0_355 = __p0_355; \
49340	poly16x8_t __s2_355 = __p2_355; \	49218	uint8x16_t __s2_355 = __p2_355; \
49341	poly16x4_t __rev0_355; __rev0_355 = __builtin_shufflevector(__s0_355, __s0_355, __lane_reverse_64_16); \	49219	uint8x8_t __rev0_355; __rev0_355 = __builtin_shufflevector(__s0_355, __s0_355, __lane_reverse_64_8); \
49342	poly16x8_t __rev2_355; __rev2_355 = __builtin_shufflevector(__s2_355, __s2_355, __lane_reverse_128_16); \	49220	uint8x16_t __rev2_355; __rev2_355 = __builtin_shufflevector(__s2_355, __s2_355, __lane_reverse_128_8); \
49343	__ret_355 = __noswap_vset_lane_p16(__noswap_vgetq_lane_p16(__rev2_355, __p3_355), __rev0_355, __p1_355); \	49221	__ret_355 = __noswap_vset_lane_u8(__noswap_vgetq_lane_u8(__rev2_355, __p3_355), __rev0_355, __p1_355); \
49344	__ret_355 = __builtin_shufflevector(__ret_355, __ret_355, __lane_reverse_64_16); \	49222	__ret_355 = __builtin_shufflevector(__ret_355, __ret_355, __lane_reverse_64_8); \
49345	__ret_355; \	49223	__ret_355; \
49346	})	49224	})
49347	#endif	49225	#endif
49348		49226
49349	#ifdef __LITTLE_ENDIAN__	49227	#ifdef __LITTLE_ENDIAN__
49350	#define vcopy_laneq_u8(__p0_356, __p1_356, __p2_356, __p3_356) __extension__ ({ \	49228	#define vcopy_laneq_u32(__p0_356, __p1_356, __p2_356, __p3_356) __extension__ ({ \
49351	uint8x8_t __ret_356; \	49229	uint32x2_t __ret_356; \
49352	uint8x8_t __s0_356 = __p0_356; \	49230	uint32x2_t __s0_356 = __p0_356; \
49353	uint8x16_t __s2_356 = __p2_356; \	49231	uint32x4_t __s2_356 = __p2_356; \
49354	__ret_356 = vset_lane_u8(vgetq_lane_u8(__s2_356, __p3_356), __s0_356, __p1_356); \	49232	__ret_356 = vset_lane_u32(vgetq_lane_u32(__s2_356, __p3_356), __s0_356, __p1_356); \
49355	__ret_356; \	49233	__ret_356; \
49356	})	49234	})
49357	#else	49235	#else
49358	#define vcopy_laneq_u8(__p0_357, __p1_357, __p2_357, __p3_357) __extension__ ({ \	49236	#define vcopy_laneq_u32(__p0_357, __p1_357, __p2_357, __p3_357) __extension__ ({ \
49359	uint8x8_t __ret_357; \	49237	uint32x2_t __ret_357; \
49360	uint8x8_t __s0_357 = __p0_357; \	49238	uint32x2_t __s0_357 = __p0_357; \
49361	uint8x16_t __s2_357 = __p2_357; \	49239	uint32x4_t __s2_357 = __p2_357; \
49362	uint8x8_t __rev0_357; __rev0_357 = __builtin_shufflevector(__s0_357, __s0_357, __lane_reverse_64_8); \	49240	uint32x2_t __rev0_357; __rev0_357 = __builtin_shufflevector(__s0_357, __s0_357, __lane_reverse_64_32); \
49363	uint8x16_t __rev2_357; __rev2_357 = __builtin_shufflevector(__s2_357, __s2_357, __lane_reverse_128_8); \	49241	uint32x4_t __rev2_357; __rev2_357 = __builtin_shufflevector(__s2_357, __s2_357, __lane_reverse_128_32); \
49364	__ret_357 = __noswap_vset_lane_u8(__noswap_vgetq_lane_u8(__rev2_357, __p3_357), __rev0_357, __p1_357); \	49242	__ret_357 = __noswap_vset_lane_u32(__noswap_vgetq_lane_u32(__rev2_357, __p3_357), __rev0_357, __p1_357); \
49365	__ret_357 = __builtin_shufflevector(__ret_357, __ret_357, __lane_reverse_64_8); \	49243	__ret_357 = __builtin_shufflevector(__ret_357, __ret_357, __lane_reverse_64_32); \
49366	__ret_357; \	49244	__ret_357; \
49367	})	49245	})
49368	#endif	49246	#endif
49369		49247
49370	#ifdef __LITTLE_ENDIAN__	49248	#ifdef __LITTLE_ENDIAN__
49371	#define vcopy_laneq_u32(__p0_358, __p1_358, __p2_358, __p3_358) __extension__ ({ \	49249	#define vcopy_laneq_u64(__p0_358, __p1_358, __p2_358, __p3_358) __extension__ ({ \
49372	uint32x2_t __ret_358; \	49250	uint64x1_t __ret_358; \
49373	uint32x2_t __s0_358 = __p0_358; \	49251	uint64x1_t __s0_358 = __p0_358; \
49374	uint32x4_t __s2_358 = __p2_358; \	49252	uint64x2_t __s2_358 = __p2_358; \
49375	__ret_358 = vset_lane_u32(vgetq_lane_u32(__s2_358, __p3_358), __s0_358, __p1_358); \	49253	__ret_358 = vset_lane_u64(vgetq_lane_u64(__s2_358, __p3_358), __s0_358, __p1_358); \
49376	__ret_358; \	49254	__ret_358; \
49377	})	49255	})
49378	#else	49256	#else
49379	#define vcopy_laneq_u32(__p0_359, __p1_359, __p2_359, __p3_359) __extension__ ({ \	49257	#define vcopy_laneq_u64(__p0_359, __p1_359, __p2_359, __p3_359) __extension__ ({ \
49380	uint32x2_t __ret_359; \	49258	uint64x1_t __ret_359; \
49381	uint32x2_t __s0_359 = __p0_359; \	49259	uint64x1_t __s0_359 = __p0_359; \
49382	uint32x4_t __s2_359 = __p2_359; \	49260	uint64x2_t __s2_359 = __p2_359; \
49383	uint32x2_t __rev0_359; __rev0_359 = __builtin_shufflevector(__s0_359, __s0_359, __lane_reverse_64_32); \	49261	uint64x2_t __rev2_359; __rev2_359 = __builtin_shufflevector(__s2_359, __s2_359, __lane_reverse_128_64); \
49384	uint32x4_t __rev2_359; __rev2_359 = __builtin_shufflevector(__s2_359, __s2_359, __lane_reverse_128_32); \	49262	__ret_359 = vset_lane_u64(__noswap_vgetq_lane_u64(__rev2_359, __p3_359), __s0_359, __p1_359); \
49385	__ret_359 = __noswap_vset_lane_u32(__noswap_vgetq_lane_u32(__rev2_359, __p3_359), __rev0_359, __p1_359); \
49386	__ret_359 = __builtin_shufflevector(__ret_359, __ret_359, __lane_reverse_64_32); \
49387	__ret_359; \	49263	__ret_359; \
49388	})	49264	})
49389	#endif	49265	#endif
49390		49266
49391	#ifdef __LITTLE_ENDIAN__	49267	#ifdef __LITTLE_ENDIAN__
49392	#define vcopy_laneq_u64(__p0_360, __p1_360, __p2_360, __p3_360) __extension__ ({ \	49268	#define vcopy_laneq_u16(__p0_360, __p1_360, __p2_360, __p3_360) __extension__ ({ \
49393	uint64x1_t __ret_360; \	49269	uint16x4_t __ret_360; \
49394	uint64x1_t __s0_360 = __p0_360; \	49270	uint16x4_t __s0_360 = __p0_360; \
49395	uint64x2_t __s2_360 = __p2_360; \	49271	uint16x8_t __s2_360 = __p2_360; \
49396	__ret_360 = vset_lane_u64(vgetq_lane_u64(__s2_360, __p3_360), __s0_360, __p1_360); \	49272	__ret_360 = vset_lane_u16(vgetq_lane_u16(__s2_360, __p3_360), __s0_360, __p1_360); \
49397	__ret_360; \	49273	__ret_360; \
49398	})	49274	})
49399	#else	49275	#else
49400	#define vcopy_laneq_u64(__p0_361, __p1_361, __p2_361, __p3_361) __extension__ ({ \	49276	#define vcopy_laneq_u16(__p0_361, __p1_361, __p2_361, __p3_361) __extension__ ({ \
49401	uint64x1_t __ret_361; \	49277	uint16x4_t __ret_361; \
49402	uint64x1_t __s0_361 = __p0_361; \	49278	uint16x4_t __s0_361 = __p0_361; \
49403	uint64x2_t __s2_361 = __p2_361; \	49279	uint16x8_t __s2_361 = __p2_361; \
49404	uint64x2_t __rev2_361; __rev2_361 = __builtin_shufflevector(__s2_361, __s2_361, __lane_reverse_128_64); \	49280	uint16x4_t __rev0_361; __rev0_361 = __builtin_shufflevector(__s0_361, __s0_361, __lane_reverse_64_16); \
49405	__ret_361 = vset_lane_u64(__noswap_vgetq_lane_u64(__rev2_361, __p3_361), __s0_361, __p1_361); \	49281	uint16x8_t __rev2_361; __rev2_361 = __builtin_shufflevector(__s2_361, __s2_361, __lane_reverse_128_16); \
		49282	__ret_361 = __noswap_vset_lane_u16(__noswap_vgetq_lane_u16(__rev2_361, __p3_361), __rev0_361, __p1_361); \
		49283	__ret_361 = __builtin_shufflevector(__ret_361, __ret_361, __lane_reverse_64_16); \
49406	__ret_361; \	49284	__ret_361; \
49407	})	49285	})
49408	#endif	49286	#endif
49409		49287
49410	#ifdef __LITTLE_ENDIAN__	49288	#ifdef __LITTLE_ENDIAN__
49411	#define vcopy_laneq_u16(__p0_362, __p1_362, __p2_362, __p3_362) __extension__ ({ \	49289	#define vcopy_laneq_s8(__p0_362, __p1_362, __p2_362, __p3_362) __extension__ ({ \
49412	uint16x4_t __ret_362; \	49290	int8x8_t __ret_362; \
49413	uint16x4_t __s0_362 = __p0_362; \	49291	int8x8_t __s0_362 = __p0_362; \
49414	uint16x8_t __s2_362 = __p2_362; \	49292	int8x16_t __s2_362 = __p2_362; \
49415	__ret_362 = vset_lane_u16(vgetq_lane_u16(__s2_362, __p3_362), __s0_362, __p1_362); \	49293	__ret_362 = vset_lane_s8(vgetq_lane_s8(__s2_362, __p3_362), __s0_362, __p1_362); \
49416	__ret_362; \	49294	__ret_362; \
49417	})	49295	})
49418	#else	49296	#else
49419	#define vcopy_laneq_u16(__p0_363, __p1_363, __p2_363, __p3_363) __extension__ ({ \	49297	#define vcopy_laneq_s8(__p0_363, __p1_363, __p2_363, __p3_363) __extension__ ({ \
49420	uint16x4_t __ret_363; \	49298	int8x8_t __ret_363; \
49421	uint16x4_t __s0_363 = __p0_363; \	49299	int8x8_t __s0_363 = __p0_363; \
49422	uint16x8_t __s2_363 = __p2_363; \	49300	int8x16_t __s2_363 = __p2_363; \
49423	uint16x4_t __rev0_363; __rev0_363 = __builtin_shufflevector(__s0_363, __s0_363, __lane_reverse_64_16); \	49301	int8x8_t __rev0_363; __rev0_363 = __builtin_shufflevector(__s0_363, __s0_363, __lane_reverse_64_8); \
49424	uint16x8_t __rev2_363; __rev2_363 = __builtin_shufflevector(__s2_363, __s2_363, __lane_reverse_128_16); \	49302	int8x16_t __rev2_363; __rev2_363 = __builtin_shufflevector(__s2_363, __s2_363, __lane_reverse_128_8); \
49425	__ret_363 = __noswap_vset_lane_u16(__noswap_vgetq_lane_u16(__rev2_363, __p3_363), __rev0_363, __p1_363); \	49303	__ret_363 = __noswap_vset_lane_s8(__noswap_vgetq_lane_s8(__rev2_363, __p3_363), __rev0_363, __p1_363); \
49426	__ret_363 = __builtin_shufflevector(__ret_363, __ret_363, __lane_reverse_64_16); \	49304	__ret_363 = __builtin_shufflevector(__ret_363, __ret_363, __lane_reverse_64_8); \
49427	__ret_363; \	49305	__ret_363; \
49428	})	49306	})
49429	#endif	49307	#endif
49430		49308
49431	#ifdef __LITTLE_ENDIAN__	49309	#ifdef __LITTLE_ENDIAN__
49432	#define vcopy_laneq_s8(__p0_364, __p1_364, __p2_364, __p3_364) __extension__ ({ \	49310	#define vcopy_laneq_f32(__p0_364, __p1_364, __p2_364, __p3_364) __extension__ ({ \
49433	int8x8_t __ret_364; \	49311	float32x2_t __ret_364; \
49434	int8x8_t __s0_364 = __p0_364; \	49312	float32x2_t __s0_364 = __p0_364; \
49435	int8x16_t __s2_364 = __p2_364; \	49313	float32x4_t __s2_364 = __p2_364; \
49436	__ret_364 = vset_lane_s8(vgetq_lane_s8(__s2_364, __p3_364), __s0_364, __p1_364); \	49314	__ret_364 = vset_lane_f32(vgetq_lane_f32(__s2_364, __p3_364), __s0_364, __p1_364); \
49437	__ret_364; \	49315	__ret_364; \
49438	})	49316	})
49439	#else	49317	#else
49440	#define vcopy_laneq_s8(__p0_365, __p1_365, __p2_365, __p3_365) __extension__ ({ \	49318	#define vcopy_laneq_f32(__p0_365, __p1_365, __p2_365, __p3_365) __extension__ ({ \
49441	int8x8_t __ret_365; \	49319	float32x2_t __ret_365; \
49442	int8x8_t __s0_365 = __p0_365; \	49320	float32x2_t __s0_365 = __p0_365; \
49443	int8x16_t __s2_365 = __p2_365; \	49321	float32x4_t __s2_365 = __p2_365; \
49444	int8x8_t __rev0_365; __rev0_365 = __builtin_shufflevector(__s0_365, __s0_365, __lane_reverse_64_8); \	49322	float32x2_t __rev0_365; __rev0_365 = __builtin_shufflevector(__s0_365, __s0_365, __lane_reverse_64_32); \
49445	int8x16_t __rev2_365; __rev2_365 = __builtin_shufflevector(__s2_365, __s2_365, __lane_reverse_128_8); \	49323	float32x4_t __rev2_365; __rev2_365 = __builtin_shufflevector(__s2_365, __s2_365, __lane_reverse_128_32); \
49446	__ret_365 = __noswap_vset_lane_s8(__noswap_vgetq_lane_s8(__rev2_365, __p3_365), __rev0_365, __p1_365); \	49324	__ret_365 = __noswap_vset_lane_f32(__noswap_vgetq_lane_f32(__rev2_365, __p3_365), __rev0_365, __p1_365); \
49447	__ret_365 = __builtin_shufflevector(__ret_365, __ret_365, __lane_reverse_64_8); \	49325	__ret_365 = __builtin_shufflevector(__ret_365, __ret_365, __lane_reverse_64_32); \
49448	__ret_365; \	49326	__ret_365; \
49449	})	49327	})
49450	#endif	49328	#endif
49451		49329
49452	#ifdef __LITTLE_ENDIAN__	49330	#ifdef __LITTLE_ENDIAN__
49453	#define vcopy_laneq_f32(__p0_366, __p1_366, __p2_366, __p3_366) __extension__ ({ \	49331	#define vcopy_laneq_s32(__p0_366, __p1_366, __p2_366, __p3_366) __extension__ ({ \
49454	float32x2_t __ret_366; \	49332	int32x2_t __ret_366; \
49455	float32x2_t __s0_366 = __p0_366; \	49333	int32x2_t __s0_366 = __p0_366; \
49456	float32x4_t __s2_366 = __p2_366; \	49334	int32x4_t __s2_366 = __p2_366; \
49457	__ret_366 = vset_lane_f32(vgetq_lane_f32(__s2_366, __p3_366), __s0_366, __p1_366); \	49335	__ret_366 = vset_lane_s32(vgetq_lane_s32(__s2_366, __p3_366), __s0_366, __p1_366); \
49458	__ret_366; \	49336	__ret_366; \
49459	})	49337	})
49460	#else	49338	#else
49461	#define vcopy_laneq_f32(__p0_367, __p1_367, __p2_367, __p3_367) __extension__ ({ \	49339	#define vcopy_laneq_s32(__p0_367, __p1_367, __p2_367, __p3_367) __extension__ ({ \
49462	float32x2_t __ret_367; \	49340	int32x2_t __ret_367; \
49463	float32x2_t __s0_367 = __p0_367; \	49341	int32x2_t __s0_367 = __p0_367; \
49464	float32x4_t __s2_367 = __p2_367; \	49342	int32x4_t __s2_367 = __p2_367; \
49465	float32x2_t __rev0_367; __rev0_367 = __builtin_shufflevector(__s0_367, __s0_367, __lane_reverse_64_32); \	49343	int32x2_t __rev0_367; __rev0_367 = __builtin_shufflevector(__s0_367, __s0_367, __lane_reverse_64_32); \
49466	float32x4_t __rev2_367; __rev2_367 = __builtin_shufflevector(__s2_367, __s2_367, __lane_reverse_128_32); \	49344	int32x4_t __rev2_367; __rev2_367 = __builtin_shufflevector(__s2_367, __s2_367, __lane_reverse_128_32); \
49467	__ret_367 = __noswap_vset_lane_f32(__noswap_vgetq_lane_f32(__rev2_367, __p3_367), __rev0_367, __p1_367); \	49345	__ret_367 = __noswap_vset_lane_s32(__noswap_vgetq_lane_s32(__rev2_367, __p3_367), __rev0_367, __p1_367); \
49468	__ret_367 = __builtin_shufflevector(__ret_367, __ret_367, __lane_reverse_64_32); \	49346	__ret_367 = __builtin_shufflevector(__ret_367, __ret_367, __lane_reverse_64_32); \
49469	__ret_367; \	49347	__ret_367; \
49470	})	49348	})
49471	#endif	49349	#endif
49472		49350
49473	#ifdef __LITTLE_ENDIAN__	49351	#ifdef __LITTLE_ENDIAN__
49474	#define vcopy_laneq_s32(__p0_368, __p1_368, __p2_368, __p3_368) __extension__ ({ \	49352	#define vcopy_laneq_s64(__p0_368, __p1_368, __p2_368, __p3_368) __extension__ ({ \
49475	int32x2_t __ret_368; \	49353	int64x1_t __ret_368; \
49476	int32x2_t __s0_368 = __p0_368; \	49354	int64x1_t __s0_368 = __p0_368; \
49477	int32x4_t __s2_368 = __p2_368; \	49355	int64x2_t __s2_368 = __p2_368; \
49478	__ret_368 = vset_lane_s32(vgetq_lane_s32(__s2_368, __p3_368), __s0_368, __p1_368); \	49356	__ret_368 = vset_lane_s64(vgetq_lane_s64(__s2_368, __p3_368), __s0_368, __p1_368); \
49479	__ret_368; \	49357	__ret_368; \
49480	})	49358	})
49481	#else	49359	#else
49482	#define vcopy_laneq_s32(__p0_369, __p1_369, __p2_369, __p3_369) __extension__ ({ \	49360	#define vcopy_laneq_s64(__p0_369, __p1_369, __p2_369, __p3_369) __extension__ ({ \
49483	int32x2_t __ret_369; \	49361	int64x1_t __ret_369; \
49484	int32x2_t __s0_369 = __p0_369; \	49362	int64x1_t __s0_369 = __p0_369; \
49485	int32x4_t __s2_369 = __p2_369; \	49363	int64x2_t __s2_369 = __p2_369; \
49486	int32x2_t __rev0_369; __rev0_369 = __builtin_shufflevector(__s0_369, __s0_369, __lane_reverse_64_32); \	49364	int64x2_t __rev2_369; __rev2_369 = __builtin_shufflevector(__s2_369, __s2_369, __lane_reverse_128_64); \
49487	int32x4_t __rev2_369; __rev2_369 = __builtin_shufflevector(__s2_369, __s2_369, __lane_reverse_128_32); \	49365	__ret_369 = vset_lane_s64(__noswap_vgetq_lane_s64(__rev2_369, __p3_369), __s0_369, __p1_369); \
49488	__ret_369 = __noswap_vset_lane_s32(__noswap_vgetq_lane_s32(__rev2_369, __p3_369), __rev0_369, __p1_369); \
49489	__ret_369 = __builtin_shufflevector(__ret_369, __ret_369, __lane_reverse_64_32); \
49490	__ret_369; \	49366	__ret_369; \
49491	})	49367	})
49492	#endif	49368	#endif
49493		49369
49494	#ifdef __LITTLE_ENDIAN__	49370	#ifdef __LITTLE_ENDIAN__
49495	#define vcopy_laneq_s64(__p0_370, __p1_370, __p2_370, __p3_370) __extension__ ({ \	49371	#define vcopy_laneq_mf8(__p0_370, __p1_370, __p2_370, __p3_370) __extension__ ({ \
49496	int64x1_t __ret_370; \	49372	mfloat8x8_t __ret_370; \
49497	int64x1_t __s0_370 = __p0_370; \	49373	mfloat8x8_t __s0_370 = __p0_370; \
49498	int64x2_t __s2_370 = __p2_370; \	49374	mfloat8x16_t __s2_370 = __p2_370; \
49499	__ret_370 = vset_lane_s64(vgetq_lane_s64(__s2_370, __p3_370), __s0_370, __p1_370); \	49375	__ret_370 = vset_lane_mf8(vgetq_lane_mf8(__s2_370, __p3_370), __s0_370, __p1_370); \
49500	__ret_370; \	49376	__ret_370; \
49501	})	49377	})
49502	#else	49378	#else
49503	#define vcopy_laneq_s64(__p0_371, __p1_371, __p2_371, __p3_371) __extension__ ({ \	49379	#define vcopy_laneq_mf8(__p0_371, __p1_371, __p2_371, __p3_371) __extension__ ({ \
49504	int64x1_t __ret_371; \	49380	mfloat8x8_t __ret_371; \
49505	int64x1_t __s0_371 = __p0_371; \	49381	mfloat8x8_t __s0_371 = __p0_371; \
49506	int64x2_t __s2_371 = __p2_371; \	49382	mfloat8x16_t __s2_371 = __p2_371; \
49507	int64x2_t __rev2_371; __rev2_371 = __builtin_shufflevector(__s2_371, __s2_371, __lane_reverse_128_64); \	49383	mfloat8x8_t __rev0_371; __rev0_371 = __builtin_shufflevector(__s0_371, __s0_371, __lane_reverse_64_8); \
49508	__ret_371 = vset_lane_s64(__noswap_vgetq_lane_s64(__rev2_371, __p3_371), __s0_371, __p1_371); \	49384	mfloat8x16_t __rev2_371; __rev2_371 = __builtin_shufflevector(__s2_371, __s2_371, __lane_reverse_128_8); \
		49385	__ret_371 = __noswap_vset_lane_mf8(__noswap_vgetq_lane_mf8(__rev2_371, __p3_371), __rev0_371, __p1_371); \
		49386	__ret_371 = __builtin_shufflevector(__ret_371, __ret_371, __lane_reverse_64_8); \
49509	__ret_371; \	49387	__ret_371; \
49510	})	49388	})
49511	#endif	49389	#endif
49512		49390
49513	#ifdef __LITTLE_ENDIAN__	49391	#ifdef __LITTLE_ENDIAN__
49514	#define vcopy_laneq_mf8(__p0_372, __p1_372, __p2_372, __p3_372) __extension__ ({ \	49392	#define vcopy_laneq_s16(__p0_372, __p1_372, __p2_372, __p3_372) __extension__ ({ \
49515	mfloat8x8_t __ret_372; \	49393	int16x4_t __ret_372; \
49516	mfloat8x8_t __s0_372 = __p0_372; \	49394	int16x4_t __s0_372 = __p0_372; \
49517	mfloat8x16_t __s2_372 = __p2_372; \	49395	int16x8_t __s2_372 = __p2_372; \
49518	__ret_372 = vset_lane_mf8(vgetq_lane_mf8(__s2_372, __p3_372), __s0_372, __p1_372); \	49396	__ret_372 = vset_lane_s16(vgetq_lane_s16(__s2_372, __p3_372), __s0_372, __p1_372); \
49519	__ret_372; \	49397	__ret_372; \
49520	})	49398	})
49521	#else	49399	#else
49522	#define vcopy_laneq_mf8(__p0_373, __p1_373, __p2_373, __p3_373) __extension__ ({ \	49400	#define vcopy_laneq_s16(__p0_373, __p1_373, __p2_373, __p3_373) __extension__ ({ \
49523	mfloat8x8_t __ret_373; \	49401	int16x4_t __ret_373; \
49524	mfloat8x8_t __s0_373 = __p0_373; \	49402	int16x4_t __s0_373 = __p0_373; \
49525	mfloat8x16_t __s2_373 = __p2_373; \	49403	int16x8_t __s2_373 = __p2_373; \
49526	mfloat8x8_t __rev0_373; __rev0_373 = __builtin_shufflevector(__s0_373, __s0_373, __lane_reverse_64_8); \	49404	int16x4_t __rev0_373; __rev0_373 = __builtin_shufflevector(__s0_373, __s0_373, __lane_reverse_64_16); \
49527	mfloat8x16_t __rev2_373; __rev2_373 = __builtin_shufflevector(__s2_373, __s2_373, __lane_reverse_128_8); \	49405	int16x8_t __rev2_373; __rev2_373 = __builtin_shufflevector(__s2_373, __s2_373, __lane_reverse_128_16); \
49528	__ret_373 = __noswap_vset_lane_mf8(__noswap_vgetq_lane_mf8(__rev2_373, __p3_373), __rev0_373, __p1_373); \	49406	__ret_373 = __noswap_vset_lane_s16(__noswap_vgetq_lane_s16(__rev2_373, __p3_373), __rev0_373, __p1_373); \
49529	__ret_373 = __builtin_shufflevector(__ret_373, __ret_373, __lane_reverse_64_8); \	49407	__ret_373 = __builtin_shufflevector(__ret_373, __ret_373, __lane_reverse_64_16); \
49530	__ret_373; \	49408	__ret_373; \
49531	})	49409	})
49532	#endif	49410	#endif
49533		49411
49534	#ifdef __LITTLE_ENDIAN__	49412	#ifdef __LITTLE_ENDIAN__
49535	#define vcopy_laneq_s16(__p0_374, __p1_374, __p2_374, __p3_374) __extension__ ({ \	49413	#define vcopy_laneq_bf16(__p0_374, __p1_374, __p2_374, __p3_374) __extension__ ({ \
49536	int16x4_t __ret_374; \	49414	bfloat16x4_t __ret_374; \
49537	int16x4_t __s0_374 = __p0_374; \	49415	bfloat16x4_t __s0_374 = __p0_374; \
49538	int16x8_t __s2_374 = __p2_374; \	49416	bfloat16x8_t __s2_374 = __p2_374; \
49539	__ret_374 = vset_lane_s16(vgetq_lane_s16(__s2_374, __p3_374), __s0_374, __p1_374); \	49417	__ret_374 = vset_lane_bf16(vgetq_lane_bf16(__s2_374, __p3_374), __s0_374, __p1_374); \
49540	__ret_374; \	49418	__ret_374; \
49541	})	49419	})
49542	#else	49420	#else
49543	#define vcopy_laneq_s16(__p0_375, __p1_375, __p2_375, __p3_375) __extension__ ({ \	49421	#define vcopy_laneq_bf16(__p0_375, __p1_375, __p2_375, __p3_375) __extension__ ({ \
49544	int16x4_t __ret_375; \	49422	bfloat16x4_t __ret_375; \
49545	int16x4_t __s0_375 = __p0_375; \	49423	bfloat16x4_t __s0_375 = __p0_375; \
49546	int16x8_t __s2_375 = __p2_375; \	49424	bfloat16x8_t __s2_375 = __p2_375; \
49547	int16x4_t __rev0_375; __rev0_375 = __builtin_shufflevector(__s0_375, __s0_375, __lane_reverse_64_16); \	49425	bfloat16x4_t __rev0_375; __rev0_375 = __builtin_shufflevector(__s0_375, __s0_375, __lane_reverse_64_16); \
49548	int16x8_t __rev2_375; __rev2_375 = __builtin_shufflevector(__s2_375, __s2_375, __lane_reverse_128_16); \	49426	bfloat16x8_t __rev2_375; __rev2_375 = __builtin_shufflevector(__s2_375, __s2_375, __lane_reverse_128_16); \
49549	__ret_375 = __noswap_vset_lane_s16(__noswap_vgetq_lane_s16(__rev2_375, __p3_375), __rev0_375, __p1_375); \	49427	__ret_375 = __noswap_vset_lane_bf16(__noswap_vgetq_lane_bf16(__rev2_375, __p3_375), __rev0_375, __p1_375); \
49550	__ret_375 = __builtin_shufflevector(__ret_375, __ret_375, __lane_reverse_64_16); \	49428	__ret_375 = __builtin_shufflevector(__ret_375, __ret_375, __lane_reverse_64_16); \
49551	__ret_375; \	49429	__ret_375; \
49552	})	49430	})
...	@@ -64144,6 +64022,296 @@ __ai __attribute__((target("neon"))) int16x4_t vreinterpret_s16_mf8(mfloat8x8_t	...	@@ -64144,6 +64022,296 @@ __ai __attribute__((target("neon"))) int16x4_t vreinterpret_s16_mf8(mfloat8x8_t
64144	__ret = __builtin_bit_cast(int16x4_t, __p0);	64022	__ret = __builtin_bit_cast(int16x4_t, __p0);
64145	return __ret;	64023	return __ret;
64146	}	64024	}
		64025	__ai __attribute__((target("neon"))) poly8x8_t vreinterpret_p8_bf16(bfloat16x4_t __p0) {
		64026	poly8x8_t __ret;
		64027	__ret = __builtin_bit_cast(poly8x8_t, __p0);
		64028	return __ret;
		64029	}
		64030	__ai __attribute__((target("neon"))) poly64x1_t vreinterpret_p64_bf16(bfloat16x4_t __p0) {
		64031	poly64x1_t __ret;
		64032	__ret = __builtin_bit_cast(poly64x1_t, __p0);
		64033	return __ret;
		64034	}
		64035	__ai __attribute__((target("neon"))) poly16x4_t vreinterpret_p16_bf16(bfloat16x4_t __p0) {
		64036	poly16x4_t __ret;
		64037	__ret = __builtin_bit_cast(poly16x4_t, __p0);
		64038	return __ret;
		64039	}
		64040	__ai __attribute__((target("neon"))) poly8x16_t vreinterpretq_p8_bf16(bfloat16x8_t __p0) {
		64041	poly8x16_t __ret;
		64042	__ret = __builtin_bit_cast(poly8x16_t, __p0);
		64043	return __ret;
		64044	}
		64045	__ai __attribute__((target("neon"))) poly128_t vreinterpretq_p128_bf16(bfloat16x8_t __p0) {
		64046	poly128_t __ret;
		64047	__ret = __builtin_bit_cast(poly128_t, __p0);
		64048	return __ret;
		64049	}
		64050	__ai __attribute__((target("neon"))) poly64x2_t vreinterpretq_p64_bf16(bfloat16x8_t __p0) {
		64051	poly64x2_t __ret;
		64052	__ret = __builtin_bit_cast(poly64x2_t, __p0);
		64053	return __ret;
		64054	}
		64055	__ai __attribute__((target("neon"))) poly16x8_t vreinterpretq_p16_bf16(bfloat16x8_t __p0) {
		64056	poly16x8_t __ret;
		64057	__ret = __builtin_bit_cast(poly16x8_t, __p0);
		64058	return __ret;
		64059	}
		64060	__ai __attribute__((target("neon"))) uint8x16_t vreinterpretq_u8_bf16(bfloat16x8_t __p0) {
		64061	uint8x16_t __ret;
		64062	__ret = __builtin_bit_cast(uint8x16_t, __p0);
		64063	return __ret;
		64064	}
		64065	__ai __attribute__((target("neon"))) uint32x4_t vreinterpretq_u32_bf16(bfloat16x8_t __p0) {
		64066	uint32x4_t __ret;
		64067	__ret = __builtin_bit_cast(uint32x4_t, __p0);
		64068	return __ret;
		64069	}
		64070	__ai __attribute__((target("neon"))) uint64x2_t vreinterpretq_u64_bf16(bfloat16x8_t __p0) {
		64071	uint64x2_t __ret;
		64072	__ret = __builtin_bit_cast(uint64x2_t, __p0);
		64073	return __ret;
		64074	}
		64075	__ai __attribute__((target("neon"))) uint16x8_t vreinterpretq_u16_bf16(bfloat16x8_t __p0) {
		64076	uint16x8_t __ret;
		64077	__ret = __builtin_bit_cast(uint16x8_t, __p0);
		64078	return __ret;
		64079	}
		64080	__ai __attribute__((target("neon"))) int8x16_t vreinterpretq_s8_bf16(bfloat16x8_t __p0) {
		64081	int8x16_t __ret;
		64082	__ret = __builtin_bit_cast(int8x16_t, __p0);
		64083	return __ret;
		64084	}
		64085	__ai __attribute__((target("neon"))) float64x2_t vreinterpretq_f64_bf16(bfloat16x8_t __p0) {
		64086	float64x2_t __ret;
		64087	__ret = __builtin_bit_cast(float64x2_t, __p0);
		64088	return __ret;
		64089	}
		64090	__ai __attribute__((target("neon"))) float32x4_t vreinterpretq_f32_bf16(bfloat16x8_t __p0) {
		64091	float32x4_t __ret;
		64092	__ret = __builtin_bit_cast(float32x4_t, __p0);
		64093	return __ret;
		64094	}
		64095	__ai __attribute__((target("neon"))) float16x8_t vreinterpretq_f16_bf16(bfloat16x8_t __p0) {
		64096	float16x8_t __ret;
		64097	__ret = __builtin_bit_cast(float16x8_t, __p0);
		64098	return __ret;
		64099	}
		64100	__ai __attribute__((target("neon"))) int32x4_t vreinterpretq_s32_bf16(bfloat16x8_t __p0) {
		64101	int32x4_t __ret;
		64102	__ret = __builtin_bit_cast(int32x4_t, __p0);
		64103	return __ret;
		64104	}
		64105	__ai __attribute__((target("neon"))) int64x2_t vreinterpretq_s64_bf16(bfloat16x8_t __p0) {
		64106	int64x2_t __ret;
		64107	__ret = __builtin_bit_cast(int64x2_t, __p0);
		64108	return __ret;
		64109	}
		64110	__ai __attribute__((target("neon"))) int16x8_t vreinterpretq_s16_bf16(bfloat16x8_t __p0) {
		64111	int16x8_t __ret;
		64112	__ret = __builtin_bit_cast(int16x8_t, __p0);
		64113	return __ret;
		64114	}
		64115	__ai __attribute__((target("neon"))) uint8x8_t vreinterpret_u8_bf16(bfloat16x4_t __p0) {
		64116	uint8x8_t __ret;
		64117	__ret = __builtin_bit_cast(uint8x8_t, __p0);
		64118	return __ret;
		64119	}
		64120	__ai __attribute__((target("neon"))) uint32x2_t vreinterpret_u32_bf16(bfloat16x4_t __p0) {
		64121	uint32x2_t __ret;
		64122	__ret = __builtin_bit_cast(uint32x2_t, __p0);
		64123	return __ret;
		64124	}
		64125	__ai __attribute__((target("neon"))) uint64x1_t vreinterpret_u64_bf16(bfloat16x4_t __p0) {
		64126	uint64x1_t __ret;
		64127	__ret = __builtin_bit_cast(uint64x1_t, __p0);
		64128	return __ret;
		64129	}
		64130	__ai __attribute__((target("neon"))) uint16x4_t vreinterpret_u16_bf16(bfloat16x4_t __p0) {
		64131	uint16x4_t __ret;
		64132	__ret = __builtin_bit_cast(uint16x4_t, __p0);
		64133	return __ret;
		64134	}
		64135	__ai __attribute__((target("neon"))) int8x8_t vreinterpret_s8_bf16(bfloat16x4_t __p0) {
		64136	int8x8_t __ret;
		64137	__ret = __builtin_bit_cast(int8x8_t, __p0);
		64138	return __ret;
		64139	}
		64140	__ai __attribute__((target("neon"))) float64x1_t vreinterpret_f64_bf16(bfloat16x4_t __p0) {
		64141	float64x1_t __ret;
		64142	__ret = __builtin_bit_cast(float64x1_t, __p0);
		64143	return __ret;
		64144	}
		64145	__ai __attribute__((target("neon"))) float32x2_t vreinterpret_f32_bf16(bfloat16x4_t __p0) {
		64146	float32x2_t __ret;
		64147	__ret = __builtin_bit_cast(float32x2_t, __p0);
		64148	return __ret;
		64149	}
		64150	__ai __attribute__((target("neon"))) float16x4_t vreinterpret_f16_bf16(bfloat16x4_t __p0) {
		64151	float16x4_t __ret;
		64152	__ret = __builtin_bit_cast(float16x4_t, __p0);
		64153	return __ret;
		64154	}
		64155	__ai __attribute__((target("neon"))) int32x2_t vreinterpret_s32_bf16(bfloat16x4_t __p0) {
		64156	int32x2_t __ret;
		64157	__ret = __builtin_bit_cast(int32x2_t, __p0);
		64158	return __ret;
		64159	}
		64160	__ai __attribute__((target("neon"))) int64x1_t vreinterpret_s64_bf16(bfloat16x4_t __p0) {
		64161	int64x1_t __ret;
		64162	__ret = __builtin_bit_cast(int64x1_t, __p0);
		64163	return __ret;
		64164	}
		64165	__ai __attribute__((target("neon"))) int16x4_t vreinterpret_s16_bf16(bfloat16x4_t __p0) {
		64166	int16x4_t __ret;
		64167	__ret = __builtin_bit_cast(int16x4_t, __p0);
		64168	return __ret;
		64169	}
		64170	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_p8(poly8x16_t __p0) {
		64171	bfloat16x8_t __ret;
		64172	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64173	return __ret;
		64174	}
		64175	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_p128(poly128_t __p0) {
		64176	bfloat16x8_t __ret;
		64177	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64178	return __ret;
		64179	}
		64180	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_p64(poly64x2_t __p0) {
		64181	bfloat16x8_t __ret;
		64182	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64183	return __ret;
		64184	}
		64185	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_p16(poly16x8_t __p0) {
		64186	bfloat16x8_t __ret;
		64187	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64188	return __ret;
		64189	}
		64190	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_u8(uint8x16_t __p0) {
		64191	bfloat16x8_t __ret;
		64192	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64193	return __ret;
		64194	}
		64195	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_u32(uint32x4_t __p0) {
		64196	bfloat16x8_t __ret;
		64197	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64198	return __ret;
		64199	}
		64200	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_u64(uint64x2_t __p0) {
		64201	bfloat16x8_t __ret;
		64202	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64203	return __ret;
		64204	}
		64205	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_u16(uint16x8_t __p0) {
		64206	bfloat16x8_t __ret;
		64207	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64208	return __ret;
		64209	}
		64210	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_s8(int8x16_t __p0) {
		64211	bfloat16x8_t __ret;
		64212	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64213	return __ret;
		64214	}
		64215	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_f64(float64x2_t __p0) {
		64216	bfloat16x8_t __ret;
		64217	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64218	return __ret;
		64219	}
		64220	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_f32(float32x4_t __p0) {
		64221	bfloat16x8_t __ret;
		64222	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64223	return __ret;
		64224	}
		64225	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_f16(float16x8_t __p0) {
		64226	bfloat16x8_t __ret;
		64227	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64228	return __ret;
		64229	}
		64230	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_s32(int32x4_t __p0) {
		64231	bfloat16x8_t __ret;
		64232	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64233	return __ret;
		64234	}
		64235	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_s64(int64x2_t __p0) {
		64236	bfloat16x8_t __ret;
		64237	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64238	return __ret;
		64239	}
		64240	__ai __attribute__((target("neon"))) bfloat16x8_t vreinterpretq_bf16_s16(int16x8_t __p0) {
		64241	bfloat16x8_t __ret;
		64242	__ret = __builtin_bit_cast(bfloat16x8_t, __p0);
		64243	return __ret;
		64244	}
		64245	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_p8(poly8x8_t __p0) {
		64246	bfloat16x4_t __ret;
		64247	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64248	return __ret;
		64249	}
		64250	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_p64(poly64x1_t __p0) {
		64251	bfloat16x4_t __ret;
		64252	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64253	return __ret;
		64254	}
		64255	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_p16(poly16x4_t __p0) {
		64256	bfloat16x4_t __ret;
		64257	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64258	return __ret;
		64259	}
		64260	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_u8(uint8x8_t __p0) {
		64261	bfloat16x4_t __ret;
		64262	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64263	return __ret;
		64264	}
		64265	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_u32(uint32x2_t __p0) {
		64266	bfloat16x4_t __ret;
		64267	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64268	return __ret;
		64269	}
		64270	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_u64(uint64x1_t __p0) {
		64271	bfloat16x4_t __ret;
		64272	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64273	return __ret;
		64274	}
		64275	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_u16(uint16x4_t __p0) {
		64276	bfloat16x4_t __ret;
		64277	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64278	return __ret;
		64279	}
		64280	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_s8(int8x8_t __p0) {
		64281	bfloat16x4_t __ret;
		64282	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64283	return __ret;
		64284	}
		64285	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_f64(float64x1_t __p0) {
		64286	bfloat16x4_t __ret;
		64287	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64288	return __ret;
		64289	}
		64290	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_f32(float32x2_t __p0) {
		64291	bfloat16x4_t __ret;
		64292	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64293	return __ret;
		64294	}
		64295	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_f16(float16x4_t __p0) {
		64296	bfloat16x4_t __ret;
		64297	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64298	return __ret;
		64299	}
		64300	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_s32(int32x2_t __p0) {
		64301	bfloat16x4_t __ret;
		64302	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64303	return __ret;
		64304	}
		64305	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_s64(int64x1_t __p0) {
		64306	bfloat16x4_t __ret;
		64307	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64308	return __ret;
		64309	}
		64310	__ai __attribute__((target("neon"))) bfloat16x4_t vreinterpret_bf16_s16(int16x4_t __p0) {
		64311	bfloat16x4_t __ret;
		64312	__ret = __builtin_bit_cast(bfloat16x4_t, __p0);
		64313	return __ret;
		64314	}
64147	__ai __attribute__((target("neon"))) uint64_t vrshld_u64(uint64_t __p0, int64_t __p1) {	64315	__ai __attribute__((target("neon"))) uint64_t vrshld_u64(uint64_t __p0, int64_t __p1) {
64148	uint64_t __ret;	64316	uint64_t __ret;
64149	__ret = __builtin_bit_cast(uint64_t, __builtin_neon_vrshld_u64(__p0, __p1));	64317	__ret = __builtin_bit_cast(uint64_t, __builtin_neon_vrshld_u64(__p0, __p1));

lib/include/arm_sme.h+12

...	@@ -3732,6 +3732,18 @@ __ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svzero_za64_vg4x2)))	...	@@ -3732,6 +3732,18 @@ __ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svzero_za64_vg4x2)))
3732	void svzero_za64_vg4x2(uint32_t);	3732	void svzero_za64_vg4x2(uint32_t);
3733	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svzero_za64_vg4x4)))	3733	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svzero_za64_vg4x4)))
3734	void svzero_za64_vg4x4(uint32_t);	3734	void svzero_za64_vg4x4(uint32_t);
		3735	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svluti6_zt_u8)))
		3736	svuint8_t svluti6_zt_u8(uint64_t, svuint8_t);
		3737	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svluti6_zt_s8)))
		3738	svint8_t svluti6_zt_s8(uint64_t, svuint8_t);
		3739	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svluti6_zt_mf8)))
		3740	svmfloat8_t svluti6_zt_mf8(uint64_t, svuint8_t);
		3741	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svluti6_zt_u8_x4)))
		3742	svuint8x4_t svluti6_zt_u8_x4(uint64_t, svuint8x3_t);
		3743	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svluti6_zt_s8_x4)))
		3744	svint8x4_t svluti6_zt_s8_x4(uint64_t, svuint8x3_t);
		3745	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sme_svluti6_zt_mf8_x4)))
		3746	svmfloat8x4_t svluti6_zt_mf8_x4(uint64_t, svuint8x3_t);
3735	#ifdef __cplusplus	3747	#ifdef __cplusplus
3736	} // extern "C"	3748	} // extern "C"
3737	#endif	3749	#endif

lib/include/arm_sve.h+420

...	@@ -4697,6 +4697,38 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svmul_f32_x4)))	...	@@ -4697,6 +4697,38 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svmul_f32_x4)))
4697	svfloat32x4_t svmul(svfloat32x4_t, svfloat32x4_t);	4697	svfloat32x4_t svmul(svfloat32x4_t, svfloat32x4_t);
4698	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svmul_f16_x4)))	4698	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svmul_f16_x4)))
4699	svfloat16x4_t svmul(svfloat16x4_t, svfloat16x4_t);	4699	svfloat16x4_t svmul(svfloat16x4_t, svfloat16x4_t);
		4700	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_u16_x4_u16_x2_u8_x2)))
		4701	svuint16x4_t svluti6_lane_u16_x4_u16_x2_u8_x2(svuint16x2_t, svuint8x2_t, uint64_t);
		4702	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_bf16_x4_bf16_x2_u8_x2)))
		4703	svbfloat16x4_t svluti6_lane_bf16_x4_bf16_x2_u8_x2(svbfloat16x2_t, svuint8x2_t, uint64_t);
		4704	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_f16_x4_f16_x2_u8_x2)))
		4705	svfloat16x4_t svluti6_lane_f16_x4_f16_x2_u8_x2(svfloat16x2_t, svuint8x2_t, uint64_t);
		4706	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_s16_x4_s16_x2_u8_x2)))
		4707	svint16x4_t svluti6_lane_s16_x4_s16_x2_u8_x2(svint16x2_t, svuint8x2_t, uint64_t);
		4708	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_u16_x4_u16_x2_u8_x3)))
		4709	svuint16x4_t svluti6_lane_u16_x4_u16_x2_u8_x3(svuint16x2_t, svuint8x3_t, uint64_t);
		4710	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_bf16_x4_bf16_x2_u8_x3)))
		4711	svbfloat16x4_t svluti6_lane_bf16_x4_bf16_x2_u8_x3(svbfloat16x2_t, svuint8x3_t, uint64_t);
		4712	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_f16_x4_f16_x2_u8_x3)))
		4713	svfloat16x4_t svluti6_lane_f16_x4_f16_x2_u8_x3(svfloat16x2_t, svuint8x3_t, uint64_t);
		4714	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_s16_x4_s16_x2_u8_x3)))
		4715	svint16x4_t svluti6_lane_s16_x4_s16_x2_u8_x3(svint16x2_t, svuint8x3_t, uint64_t);
		4716	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_u16_x4_u16_x2_u8_x2)))
		4717	svuint16x4_t svluti6_lane_u16_x4(svuint16x2_t, svuint8x2_t, uint64_t);
		4718	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_bf16_x4_bf16_x2_u8_x2)))
		4719	svbfloat16x4_t svluti6_lane_bf16_x4(svbfloat16x2_t, svuint8x2_t, uint64_t);
		4720	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_f16_x4_f16_x2_u8_x2)))
		4721	svfloat16x4_t svluti6_lane_f16_x4(svfloat16x2_t, svuint8x2_t, uint64_t);
		4722	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_s16_x4_s16_x2_u8_x2)))
		4723	svint16x4_t svluti6_lane_s16_x4(svint16x2_t, svuint8x2_t, uint64_t);
		4724	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_u16_x4_u16_x2_u8_x3)))
		4725	svuint16x4_t svluti6_lane_u16_x4(svuint16x2_t, svuint8x3_t, uint64_t);
		4726	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_bf16_x4_bf16_x2_u8_x3)))
		4727	svbfloat16x4_t svluti6_lane_bf16_x4(svbfloat16x2_t, svuint8x3_t, uint64_t);
		4728	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_f16_x4_f16_x2_u8_x3)))
		4729	svfloat16x4_t svluti6_lane_f16_x4(svfloat16x2_t, svuint8x3_t, uint64_t);
		4730	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_s16_x4_s16_x2_u8_x3)))
		4731	svint16x4_t svluti6_lane_s16_x4(svint16x2_t, svuint8x3_t, uint64_t);
4700	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svadda_f64)))	4732	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svadda_f64)))
4701	float64_t svadda_f64(svbool_t, float64_t, svfloat64_t);	4733	float64_t svadda_f64(svbool_t, float64_t, svfloat64_t);
4702	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svadda_f32)))	4734	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svadda_f32)))
...	@@ -7223,6 +7255,12 @@ __ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcreate2_b)))	...	@@ -7223,6 +7255,12 @@ __ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcreate2_b)))
7223	svboolx2_t svcreate2_b(svbool_t, svbool_t);	7255	svboolx2_t svcreate2_b(svbool_t, svbool_t);
7224	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcreate4_b)))	7256	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcreate4_b)))
7225	svboolx4_t svcreate4_b(svbool_t, svbool_t, svbool_t, svbool_t);	7257	svboolx4_t svcreate4_b(svbool_t, svbool_t, svbool_t, svbool_t);
		7258	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_f32_f16)))
		7259	svfloat32_t svdot_n_f32_f16(svfloat32_t, svfloat16_t, float16_t);
		7260	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_s32_s16)))
		7261	svint32_t svdot_n_s32_s16(svint32_t, svint16_t, int16_t);
		7262	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_u32_u16)))
		7263	svuint32_t svdot_n_u32_u16(svuint32_t, svuint16_t, uint16_t);
7226	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_f32_f16)))	7264	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_f32_f16)))
7227	svfloat32_t svdot_f32_f16(svfloat32_t, svfloat16_t, svfloat16_t);	7265	svfloat32_t svdot_f32_f16(svfloat32_t, svfloat16_t, svfloat16_t);
7228	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_s32_s16)))	7266	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_s32_s16)))
...	@@ -7341,6 +7379,12 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcreate2_b)))	...	@@ -7341,6 +7379,12 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcreate2_b)))
7341	svboolx2_t svcreate2(svbool_t, svbool_t);	7379	svboolx2_t svcreate2(svbool_t, svbool_t);
7342	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcreate4_b)))	7380	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcreate4_b)))
7343	svboolx4_t svcreate4(svbool_t, svbool_t, svbool_t, svbool_t);	7381	svboolx4_t svcreate4(svbool_t, svbool_t, svbool_t, svbool_t);
		7382	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_f32_f16)))
		7383	svfloat32_t svdot(svfloat32_t, svfloat16_t, float16_t);
		7384	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_s32_s16)))
		7385	svint32_t svdot(svint32_t, svint16_t, int16_t);
		7386	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_u32_u16)))
		7387	svuint32_t svdot(svuint32_t, svuint16_t, uint16_t);
7344	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_f32_f16)))	7388	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_f32_f16)))
7345	svfloat32_t svdot(svfloat32_t, svfloat16_t, svfloat16_t);	7389	svfloat32_t svdot(svfloat32_t, svfloat16_t, svfloat16_t);
7346	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_s32_s16)))	7390	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_s32_s16)))
...	@@ -9049,6 +9093,346 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svexpand_mf8)))	...	@@ -9049,6 +9093,346 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svexpand_mf8)))
9049	svmfloat8_t svexpand(svbool_t, svmfloat8_t);	9093	svmfloat8_t svexpand(svbool_t, svmfloat8_t);
9050	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svexpand_s16)))	9094	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svexpand_s16)))
9051	svint16_t svexpand(svbool_t, svint16_t);	9095	svint16_t svexpand(svbool_t, svint16_t);
		9096	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_s32)))
		9097	svint32_t svabal_n_s32(svint32_t, svint16_t, int16_t);
		9098	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_s64)))
		9099	svint64_t svabal_n_s64(svint64_t, svint32_t, int32_t);
		9100	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_s16)))
		9101	svint16_t svabal_n_s16(svint16_t, svint8_t, int8_t);
		9102	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_u32)))
		9103	svuint32_t svabal_n_u32(svuint32_t, svuint16_t, uint16_t);
		9104	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_u64)))
		9105	svuint64_t svabal_n_u64(svuint64_t, svuint32_t, uint32_t);
		9106	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_u16)))
		9107	svuint16_t svabal_n_u16(svuint16_t, svuint8_t, uint8_t);
		9108	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_s32)))
		9109	svint32_t svabal_s32(svint32_t, svint16_t, svint16_t);
		9110	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_s64)))
		9111	svint64_t svabal_s64(svint64_t, svint32_t, svint32_t);
		9112	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_s16)))
		9113	svint16_t svabal_s16(svint16_t, svint8_t, svint8_t);
		9114	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_u32)))
		9115	svuint32_t svabal_u32(svuint32_t, svuint16_t, svuint16_t);
		9116	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_u64)))
		9117	svuint64_t svabal_u64(svuint64_t, svuint32_t, svuint32_t);
		9118	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_u16)))
		9119	svuint16_t svabal_u16(svuint16_t, svuint8_t, svuint8_t);
		9120	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_u8)))
		9121	svuint8_t svaddqp_u8(svuint8_t, svuint8_t);
		9122	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_u32)))
		9123	svuint32_t svaddqp_u32(svuint32_t, svuint32_t);
		9124	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_u64)))
		9125	svuint64_t svaddqp_u64(svuint64_t, svuint64_t);
		9126	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_u16)))
		9127	svuint16_t svaddqp_u16(svuint16_t, svuint16_t);
		9128	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_s8)))
		9129	svint8_t svaddqp_s8(svint8_t, svint8_t);
		9130	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_s32)))
		9131	svint32_t svaddqp_s32(svint32_t, svint32_t);
		9132	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_s64)))
		9133	svint64_t svaddqp_s64(svint64_t, svint64_t);
		9134	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_s16)))
		9135	svint16_t svaddqp_s16(svint16_t, svint16_t);
		9136	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_u8)))
		9137	svuint8_t svaddsubp_u8(svuint8_t, svuint8_t);
		9138	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_u32)))
		9139	svuint32_t svaddsubp_u32(svuint32_t, svuint32_t);
		9140	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_u64)))
		9141	svuint64_t svaddsubp_u64(svuint64_t, svuint64_t);
		9142	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_u16)))
		9143	svuint16_t svaddsubp_u16(svuint16_t, svuint16_t);
		9144	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_s8)))
		9145	svint8_t svaddsubp_s8(svint8_t, svint8_t);
		9146	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_s32)))
		9147	svint32_t svaddsubp_s32(svint32_t, svint32_t);
		9148	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_s64)))
		9149	svint64_t svaddsubp_s64(svint64_t, svint64_t);
		9150	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_s16)))
		9151	svint16_t svaddsubp_s16(svint16_t, svint16_t);
		9152	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f64_s32)))
		9153	svfloat64_t svcvtb_f64_s32(svint32_t);
		9154	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f32_s16)))
		9155	svfloat32_t svcvtb_f32_s16(svint16_t);
		9156	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f16_s8)))
		9157	svfloat16_t svcvtb_f16_s8(svint8_t);
		9158	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f64_u32)))
		9159	svfloat64_t svcvtb_f64_u32(svuint32_t);
		9160	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f32_u16)))
		9161	svfloat32_t svcvtb_f32_u16(svuint16_t);
		9162	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f16_u8)))
		9163	svfloat16_t svcvtb_f16_u8(svuint8_t);
		9164	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_s32_f64_x2)))
		9165	svint32_t svcvtn_s32_f64_x2(svfloat64x2_t);
		9166	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_s16_f32_x2)))
		9167	svint16_t svcvtn_s16_f32_x2(svfloat32x2_t);
		9168	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_s8_f16_x2)))
		9169	svint8_t svcvtn_s8_f16_x2(svfloat16x2_t);
		9170	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_u32_f64_x2)))
		9171	svuint32_t svcvtn_u32_f64_x2(svfloat64x2_t);
		9172	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_u16_f32_x2)))
		9173	svuint16_t svcvtn_u16_f32_x2(svfloat32x2_t);
		9174	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_u8_f16_x2)))
		9175	svuint8_t svcvtn_u8_f16_x2(svfloat16x2_t);
		9176	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f64_s32)))
		9177	svfloat64_t svcvtt_f64_s32(svint32_t);
		9178	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f32_s16)))
		9179	svfloat32_t svcvtt_f32_s16(svint16_t);
		9180	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f16_s8)))
		9181	svfloat16_t svcvtt_f16_s8(svint8_t);
		9182	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f64_u32)))
		9183	svfloat64_t svcvtt_f64_u32(svuint32_t);
		9184	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f32_u16)))
		9185	svfloat32_t svcvtt_f32_u16(svuint16_t);
		9186	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f16_u8)))
		9187	svfloat16_t svcvtt_f16_u8(svuint8_t);
		9188	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_s16_s8)))
		9189	svint16_t svdot_n_s16_s8(svint16_t, svint8_t, int8_t);
		9190	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_u16_u8)))
		9191	svuint16_t svdot_n_u16_u8(svuint16_t, svuint8_t, uint8_t);
		9192	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_s16_s8)))
		9193	svint16_t svdot_s16_s8(svint16_t, svint8_t, svint8_t);
		9194	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_u16_u8)))
		9195	svuint16_t svdot_u16_u8(svuint16_t, svuint8_t, svuint8_t);
		9196	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_lane_s16_s8)))
		9197	svint16_t svdot_lane_s16_s8(svint16_t, svint8_t, svint8_t, uint64_t);
		9198	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_lane_u16_u8)))
		9199	svuint16_t svdot_lane_u16_u8(svuint16_t, svuint8_t, svuint8_t, uint64_t);
		9200	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqrshrn_n_s8_s16_x2)))
		9201	svint8_t svqrshrn_n_s8_s16_x2(svint16x2_t, uint64_t);
		9202	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqrshrn_n_u8_u16_x2)))
		9203	svuint8_t svqrshrn_n_u8_u16_x2(svuint16x2_t, uint64_t);
		9204	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqrshrun_n_u8_s16_x2)))
		9205	svuint8_t svqrshrun_n_u8_s16_x2(svint16x2_t, uint64_t);
		9206	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrn_n_s16_s32_x2)))
		9207	svint16_t svqshrn_n_s16_s32_x2(svint32x2_t, uint64_t);
		9208	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrn_n_s8_s16_x2)))
		9209	svint8_t svqshrn_n_s8_s16_x2(svint16x2_t, uint64_t);
		9210	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrn_n_u16_u32_x2)))
		9211	svuint16_t svqshrn_n_u16_u32_x2(svuint32x2_t, uint64_t);
		9212	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrn_n_u8_u16_x2)))
		9213	svuint8_t svqshrn_n_u8_u16_x2(svuint16x2_t, uint64_t);
		9214	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrun_n_u16_s32_x2)))
		9215	svuint16_t svqshrun_n_u16_s32_x2(svint32x2_t, uint64_t);
		9216	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrun_n_u8_s16_x2)))
		9217	svuint8_t svqshrun_n_u8_s16_x2(svint16x2_t, uint64_t);
		9218	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u8_m)))
		9219	svuint8_t svsubp_u8_m(svbool_t, svuint8_t, svuint8_t);
		9220	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u32_m)))
		9221	svuint32_t svsubp_u32_m(svbool_t, svuint32_t, svuint32_t);
		9222	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u64_m)))
		9223	svuint64_t svsubp_u64_m(svbool_t, svuint64_t, svuint64_t);
		9224	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u16_m)))
		9225	svuint16_t svsubp_u16_m(svbool_t, svuint16_t, svuint16_t);
		9226	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s8_m)))
		9227	svint8_t svsubp_s8_m(svbool_t, svint8_t, svint8_t);
		9228	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s32_m)))
		9229	svint32_t svsubp_s32_m(svbool_t, svint32_t, svint32_t);
		9230	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s64_m)))
		9231	svint64_t svsubp_s64_m(svbool_t, svint64_t, svint64_t);
		9232	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s16_m)))
		9233	svint16_t svsubp_s16_m(svbool_t, svint16_t, svint16_t);
		9234	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u8_x)))
		9235	svuint8_t svsubp_u8_x(svbool_t, svuint8_t, svuint8_t);
		9236	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u32_x)))
		9237	svuint32_t svsubp_u32_x(svbool_t, svuint32_t, svuint32_t);
		9238	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u64_x)))
		9239	svuint64_t svsubp_u64_x(svbool_t, svuint64_t, svuint64_t);
		9240	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u16_x)))
		9241	svuint16_t svsubp_u16_x(svbool_t, svuint16_t, svuint16_t);
		9242	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s8_x)))
		9243	svint8_t svsubp_s8_x(svbool_t, svint8_t, svint8_t);
		9244	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s32_x)))
		9245	svint32_t svsubp_s32_x(svbool_t, svint32_t, svint32_t);
		9246	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s64_x)))
		9247	svint64_t svsubp_s64_x(svbool_t, svint64_t, svint64_t);
		9248	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s16_x)))
		9249	svint16_t svsubp_s16_x(svbool_t, svint16_t, svint16_t);
		9250	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u8_z)))
		9251	svuint8_t svsubp_u8_z(svbool_t, svuint8_t, svuint8_t);
		9252	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u32_z)))
		9253	svuint32_t svsubp_u32_z(svbool_t, svuint32_t, svuint32_t);
		9254	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u64_z)))
		9255	svuint64_t svsubp_u64_z(svbool_t, svuint64_t, svuint64_t);
		9256	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u16_z)))
		9257	svuint16_t svsubp_u16_z(svbool_t, svuint16_t, svuint16_t);
		9258	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s8_z)))
		9259	svint8_t svsubp_s8_z(svbool_t, svint8_t, svint8_t);
		9260	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s32_z)))
		9261	svint32_t svsubp_s32_z(svbool_t, svint32_t, svint32_t);
		9262	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s64_z)))
		9263	svint64_t svsubp_s64_z(svbool_t, svint64_t, svint64_t);
		9264	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s16_z)))
		9265	svint16_t svsubp_s16_z(svbool_t, svint16_t, svint16_t);
		9266	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_s32)))
		9267	svint32_t svabal(svint32_t, svint16_t, int16_t);
		9268	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_s64)))
		9269	svint64_t svabal(svint64_t, svint32_t, int32_t);
		9270	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_s16)))
		9271	svint16_t svabal(svint16_t, svint8_t, int8_t);
		9272	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_u32)))
		9273	svuint32_t svabal(svuint32_t, svuint16_t, uint16_t);
		9274	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_u64)))
		9275	svuint64_t svabal(svuint64_t, svuint32_t, uint32_t);
		9276	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_n_u16)))
		9277	svuint16_t svabal(svuint16_t, svuint8_t, uint8_t);
		9278	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_s32)))
		9279	svint32_t svabal(svint32_t, svint16_t, svint16_t);
		9280	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_s64)))
		9281	svint64_t svabal(svint64_t, svint32_t, svint32_t);
		9282	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_s16)))
		9283	svint16_t svabal(svint16_t, svint8_t, svint8_t);
		9284	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_u32)))
		9285	svuint32_t svabal(svuint32_t, svuint16_t, svuint16_t);
		9286	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_u64)))
		9287	svuint64_t svabal(svuint64_t, svuint32_t, svuint32_t);
		9288	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabal_u16)))
		9289	svuint16_t svabal(svuint16_t, svuint8_t, svuint8_t);
		9290	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_u8)))
		9291	svuint8_t svaddqp(svuint8_t, svuint8_t);
		9292	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_u32)))
		9293	svuint32_t svaddqp(svuint32_t, svuint32_t);
		9294	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_u64)))
		9295	svuint64_t svaddqp(svuint64_t, svuint64_t);
		9296	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_u16)))
		9297	svuint16_t svaddqp(svuint16_t, svuint16_t);
		9298	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_s8)))
		9299	svint8_t svaddqp(svint8_t, svint8_t);
		9300	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_s32)))
		9301	svint32_t svaddqp(svint32_t, svint32_t);
		9302	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_s64)))
		9303	svint64_t svaddqp(svint64_t, svint64_t);
		9304	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddqp_s16)))
		9305	svint16_t svaddqp(svint16_t, svint16_t);
		9306	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_u8)))
		9307	svuint8_t svaddsubp(svuint8_t, svuint8_t);
		9308	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_u32)))
		9309	svuint32_t svaddsubp(svuint32_t, svuint32_t);
		9310	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_u64)))
		9311	svuint64_t svaddsubp(svuint64_t, svuint64_t);
		9312	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_u16)))
		9313	svuint16_t svaddsubp(svuint16_t, svuint16_t);
		9314	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_s8)))
		9315	svint8_t svaddsubp(svint8_t, svint8_t);
		9316	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_s32)))
		9317	svint32_t svaddsubp(svint32_t, svint32_t);
		9318	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_s64)))
		9319	svint64_t svaddsubp(svint64_t, svint64_t);
		9320	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaddsubp_s16)))
		9321	svint16_t svaddsubp(svint16_t, svint16_t);
		9322	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f64_s32)))
		9323	svfloat64_t svcvtb_f64(svint32_t);
		9324	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f32_s16)))
		9325	svfloat32_t svcvtb_f32(svint16_t);
		9326	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f16_s8)))
		9327	svfloat16_t svcvtb_f16(svint8_t);
		9328	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f64_u32)))
		9329	svfloat64_t svcvtb_f64(svuint32_t);
		9330	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f32_u16)))
		9331	svfloat32_t svcvtb_f32(svuint16_t);
		9332	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtb_f16_u8)))
		9333	svfloat16_t svcvtb_f16(svuint8_t);
		9334	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_s32_f64_x2)))
		9335	svint32_t svcvtn_s32(svfloat64x2_t);
		9336	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_s16_f32_x2)))
		9337	svint16_t svcvtn_s16(svfloat32x2_t);
		9338	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_s8_f16_x2)))
		9339	svint8_t svcvtn_s8(svfloat16x2_t);
		9340	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_u32_f64_x2)))
		9341	svuint32_t svcvtn_u32(svfloat64x2_t);
		9342	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_u16_f32_x2)))
		9343	svuint16_t svcvtn_u16(svfloat32x2_t);
		9344	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtn_u8_f16_x2)))
		9345	svuint8_t svcvtn_u8(svfloat16x2_t);
		9346	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f64_s32)))
		9347	svfloat64_t svcvtt_f64(svint32_t);
		9348	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f32_s16)))
		9349	svfloat32_t svcvtt_f32(svint16_t);
		9350	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f16_s8)))
		9351	svfloat16_t svcvtt_f16(svint8_t);
		9352	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f64_u32)))
		9353	svfloat64_t svcvtt_f64(svuint32_t);
		9354	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f32_u16)))
		9355	svfloat32_t svcvtt_f32(svuint16_t);
		9356	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svcvtt_f16_u8)))
		9357	svfloat16_t svcvtt_f16(svuint8_t);
		9358	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_s16_s8)))
		9359	svint16_t svdot(svint16_t, svint8_t, int8_t);
		9360	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_n_u16_u8)))
		9361	svuint16_t svdot(svuint16_t, svuint8_t, uint8_t);
		9362	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_s16_s8)))
		9363	svint16_t svdot(svint16_t, svint8_t, svint8_t);
		9364	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_u16_u8)))
		9365	svuint16_t svdot(svuint16_t, svuint8_t, svuint8_t);
		9366	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_lane_s16_s8)))
		9367	svint16_t svdot_lane(svint16_t, svint8_t, svint8_t, uint64_t);
		9368	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svdot_lane_u16_u8)))
		9369	svuint16_t svdot_lane(svuint16_t, svuint8_t, svuint8_t, uint64_t);
		9370	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqrshrn_n_s8_s16_x2)))
		9371	svint8_t svqrshrn_s8(svint16x2_t, uint64_t);
		9372	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqrshrn_n_u8_u16_x2)))
		9373	svuint8_t svqrshrn_u8(svuint16x2_t, uint64_t);
		9374	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqrshrun_n_u8_s16_x2)))
		9375	svuint8_t svqrshrun_u8(svint16x2_t, uint64_t);
		9376	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrn_n_s16_s32_x2)))
		9377	svint16_t svqshrn_s16(svint32x2_t, uint64_t);
		9378	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrn_n_s8_s16_x2)))
		9379	svint8_t svqshrn_s8(svint16x2_t, uint64_t);
		9380	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrn_n_u16_u32_x2)))
		9381	svuint16_t svqshrn_u16(svuint32x2_t, uint64_t);
		9382	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrn_n_u8_u16_x2)))
		9383	svuint8_t svqshrn_u8(svuint16x2_t, uint64_t);
		9384	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrun_n_u16_s32_x2)))
		9385	svuint16_t svqshrun_u16(svint32x2_t, uint64_t);
		9386	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svqshrun_n_u8_s16_x2)))
		9387	svuint8_t svqshrun_u8(svint16x2_t, uint64_t);
		9388	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u8_m)))
		9389	svuint8_t svsubp_m(svbool_t, svuint8_t, svuint8_t);
		9390	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u32_m)))
		9391	svuint32_t svsubp_m(svbool_t, svuint32_t, svuint32_t);
		9392	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u64_m)))
		9393	svuint64_t svsubp_m(svbool_t, svuint64_t, svuint64_t);
		9394	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u16_m)))
		9395	svuint16_t svsubp_m(svbool_t, svuint16_t, svuint16_t);
		9396	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s8_m)))
		9397	svint8_t svsubp_m(svbool_t, svint8_t, svint8_t);
		9398	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s32_m)))
		9399	svint32_t svsubp_m(svbool_t, svint32_t, svint32_t);
		9400	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s64_m)))
		9401	svint64_t svsubp_m(svbool_t, svint64_t, svint64_t);
		9402	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s16_m)))
		9403	svint16_t svsubp_m(svbool_t, svint16_t, svint16_t);
		9404	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u8_x)))
		9405	svuint8_t svsubp_x(svbool_t, svuint8_t, svuint8_t);
		9406	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u32_x)))
		9407	svuint32_t svsubp_x(svbool_t, svuint32_t, svuint32_t);
		9408	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u64_x)))
		9409	svuint64_t svsubp_x(svbool_t, svuint64_t, svuint64_t);
		9410	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u16_x)))
		9411	svuint16_t svsubp_x(svbool_t, svuint16_t, svuint16_t);
		9412	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s8_x)))
		9413	svint8_t svsubp_x(svbool_t, svint8_t, svint8_t);
		9414	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s32_x)))
		9415	svint32_t svsubp_x(svbool_t, svint32_t, svint32_t);
		9416	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s64_x)))
		9417	svint64_t svsubp_x(svbool_t, svint64_t, svint64_t);
		9418	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s16_x)))
		9419	svint16_t svsubp_x(svbool_t, svint16_t, svint16_t);
		9420	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u8_z)))
		9421	svuint8_t svsubp_z(svbool_t, svuint8_t, svuint8_t);
		9422	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u32_z)))
		9423	svuint32_t svsubp_z(svbool_t, svuint32_t, svuint32_t);
		9424	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u64_z)))
		9425	svuint64_t svsubp_z(svbool_t, svuint64_t, svuint64_t);
		9426	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_u16_z)))
		9427	svuint16_t svsubp_z(svbool_t, svuint16_t, svuint16_t);
		9428	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s8_z)))
		9429	svint8_t svsubp_z(svbool_t, svint8_t, svint8_t);
		9430	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s32_z)))
		9431	svint32_t svsubp_z(svbool_t, svint32_t, svint32_t);
		9432	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s64_z)))
		9433	svint64_t svsubp_z(svbool_t, svint64_t, svint64_t);
		9434	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsubp_s16_z)))
		9435	svint16_t svsubp_z(svbool_t, svint16_t, svint16_t);
9052	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaba_n_s8)))	9436	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaba_n_s8)))
9053	svint8_t svaba_n_s8(svint8_t, svint8_t, int8_t);	9437	svint8_t svaba_n_s8(svint8_t, svint8_t, int8_t);
9054	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaba_n_s32)))	9438	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svaba_n_s32)))
...	@@ -16581,6 +16965,10 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsub_bf16_x)))	...	@@ -16581,6 +16965,10 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsub_bf16_x)))
16581	svbfloat16_t svsub_x(svbool_t, svbfloat16_t, svbfloat16_t);	16965	svbfloat16_t svsub_x(svbool_t, svbfloat16_t, svbfloat16_t);
16582	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsub_bf16_z)))	16966	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svsub_bf16_z)))
16583	svbfloat16_t svsub_z(svbool_t, svbfloat16_t, svbfloat16_t);	16967	svbfloat16_t svsub_z(svbool_t, svbfloat16_t, svbfloat16_t);
		16968	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svmmla_bf16)))
		16969	svbfloat16_t svmmla_bf16(svbfloat16_t, svbfloat16_t, svbfloat16_t);
		16970	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svmmla_bf16)))
		16971	svbfloat16_t svmmla(svbfloat16_t, svbfloat16_t, svbfloat16_t);
16584	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svscale_n_bf16_m)))	16972	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svscale_n_bf16_m)))
16585	svbfloat16_t svscale_n_bf16_m(svbool_t, svbfloat16_t, int16_t);	16973	svbfloat16_t svscale_n_bf16_m(svbool_t, svbfloat16_t, int16_t);
16586	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svscale_n_bf16_x)))	16974	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svscale_n_bf16_x)))
...	@@ -19415,6 +19803,38 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svwhilelt_c64_s64))	...	@@ -19415,6 +19803,38 @@ __aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svwhilelt_c64_s64))
19415	svcount_t svwhilelt_c64(int64_t, int64_t, uint64_t);	19803	svcount_t svwhilelt_c64(int64_t, int64_t, uint64_t);
19416	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svwhilelt_c16_s64)))	19804	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svwhilelt_c16_s64)))
19417	svcount_t svwhilelt_c16(int64_t, int64_t, uint64_t);	19805	svcount_t svwhilelt_c16(int64_t, int64_t, uint64_t);
		19806	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svmmla_f16)))
		19807	svfloat16_t svmmla_f16(svfloat16_t, svfloat16_t, svfloat16_t);
		19808	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svmmla_f16)))
		19809	svfloat16_t svmmla(svfloat16_t, svfloat16_t, svfloat16_t);
		19810	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_u8_x2)))
		19811	svuint8_t svluti6_u8_x2(svuint8x2_t, svuint8_t);
		19812	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_s8_x2)))
		19813	svint8_t svluti6_s8_x2(svint8x2_t, svuint8_t);
		19814	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_mf8_x2)))
		19815	svmfloat8_t svluti6_mf8_x2(svmfloat8x2_t, svuint8_t);
		19816	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_u8_x2)))
		19817	svuint8_t svluti6(svuint8x2_t, svuint8_t);
		19818	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_s8_x2)))
		19819	svint8_t svluti6(svint8x2_t, svuint8_t);
		19820	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_mf8_x2)))
		19821	svmfloat8_t svluti6(svmfloat8x2_t, svuint8_t);
		19822	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_u16_x2)))
		19823	svuint16_t svluti6_lane_u16_x2(svuint16x2_t, svuint8_t, uint64_t);
		19824	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_bf16_x2)))
		19825	svbfloat16_t svluti6_lane_bf16_x2(svbfloat16x2_t, svuint8_t, uint64_t);
		19826	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_f16_x2)))
		19827	svfloat16_t svluti6_lane_f16_x2(svfloat16x2_t, svuint8_t, uint64_t);
		19828	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_s16_x2)))
		19829	svint16_t svluti6_lane_s16_x2(svint16x2_t, svuint8_t, uint64_t);
		19830	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_u16_x2)))
		19831	svuint16_t svluti6_lane(svuint16x2_t, svuint8_t, uint64_t);
		19832	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_bf16_x2)))
		19833	svbfloat16_t svluti6_lane(svbfloat16x2_t, svuint8_t, uint64_t);
		19834	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_f16_x2)))
		19835	svfloat16_t svluti6_lane(svfloat16x2_t, svuint8_t, uint64_t);
		19836	__aio __attribute__((__clang_arm_builtin_alias(__builtin_sve_svluti6_lane_s16_x2)))
		19837	svint16_t svluti6_lane(svint16x2_t, svuint8_t, uint64_t);
19418	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabd_n_f64_m)))	19838	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabd_n_f64_m)))
19419	svfloat64_t svabd_n_f64_m(svbool_t, svfloat64_t, float64_t);	19839	svfloat64_t svabd_n_f64_m(svbool_t, svfloat64_t, float64_t);
19420	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabd_n_f32_m)))	19840	__ai __attribute__((__clang_arm_builtin_alias(__builtin_sve_svabd_n_f32_m)))

lib/include/avx2intrin.h+4-5

lib/include/avx512bmmintrin.h created+174

...	@@ -0,0 +1,174 @@
1	/===-------- avx512bmmintrin.h - AVX512BMM intrinsics ------------------===
2	*
3	*
4	* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	* See https://llvm.org/LICENSE.txt for license information.
6	* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	*
8	*===---------------------------------------------------------------------===
9	*/
10
11	#ifndef __IMMINTRIN_H
12	#error "Never use <avx512bmmintrin.h> directly; include <immintrin.h> instead."
13	#endif
14
15	#ifndef _AVX512BMMINTRIN_H
16	#define _AVX512BMMINTRIN_H
17
18	/* Define the default attributes for the functions in this file. */
19	#define __DEFAULT_FN_ATTRS \
20	__attribute__((__always_inline__, __nodebug__, __target__("avx512bmm"), \
21	__min_vector_width__(512)))
22
23	#if defined(__cplusplus) && (__cplusplus >= 201103L)
24	#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS constexpr
25	#else
26	#define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS
27	#endif
28
29	/// Multiplies two 16x16 bit matrices using OR reduction and ORs the product
30	/// into a third 16x16 bit matrix (which is also the destination).
31	///
32	/// For the 512-bit ZMM form, each register contains two 16x16 (256-bit)
33	/// matrices in bits [255:0] and [511:256]. The operation performs:
34	/// \code{.operation}
35	/// for i in 0 to 15
36	/// for j in 0 to 15
37	/// reduction_bit = __C[16*i+j]
38	/// for k in 0 to 15
39	/// reduction_bit \|= __A[16i+k] & __B[16k+j]
40	/// end for k
41	/// dest[16*i+j] = reduction_bit
42	/// end for j
43	/// end for i
44	/// \endcode
45	///
46	/// \headerfile <immintrin.h>
47	///
48	/// This intrinsic corresponds to the <c> VBMACOR16X16X16 </c> instruction.
49	///
50	/// \param __A
51	/// A 512-bit vector containing two 16x16 bit matrices (one per 256-bit
52	/// lane).
53	/// \param __B
54	/// A 512-bit vector containing two 16x16 bit matrices (one per 256-bit
55	/// lane).
56	/// \param __C
57	/// A 512-bit accumulator vector containing the initial values to OR with.
58	/// \returns A 512-bit vector containing the accumulated result for each lane.
59	/// \note This instruction does not support masking.
60	static __inline __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
61	_mm512_bmacor16x16x16(__m512i __A, __m512i __B, __m512i __C) {
62	return (__m512i)__builtin_ia32_bmacor16x16x16_v32hi(
63	(__v32hi)__A, (__v32hi)__B, (__v32hi)__C);
64	}
65
66	/// Multiplies two 16x16 bit matrices using XOR reduction and XORs the product
67	/// into a third 16x16 bit matrix (which is also the destination).
68	///
69	/// For the 512-bit ZMM form, each register contains two 16x16 (256-bit)
70	/// matrices in bits [255:0] and [511:256]. The operation performs:
71	/// \code{.operation}
72	/// for i in 0 to 15
73	/// for j in 0 to 15
74	/// reduction_bit = __C[16*i+j]
75	/// for k in 0 to 15
76	/// reduction_bit ^= __A[16i+k] & __B[16k+j]
77	/// end for k
78	/// dest[16*i+j] = reduction_bit
79	/// end for j
80	/// end for i
81	/// \endcode
82	///
83	/// \headerfile <immintrin.h>
84	///
85	/// This intrinsic corresponds to the <c> VBMACXOR16X16X16 </c> instruction.
86	///
87	/// \param __A
88	/// A 512-bit vector containing two 16x16 bit matrices (one per 256-bit
89	/// lane).
90	/// \param __B
91	/// A 512-bit vector containing two 16x16 bit matrices (one per 256-bit
92	/// lane).
93	/// \param __C
94	/// A 512-bit accumulator vector containing the initial values to XOR with.
95	/// \returns A 512-bit vector containing the accumulated result for each lane.
96	/// \note This instruction does not support masking.
97	static __inline __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
98	_mm512_bmacxor16x16x16(__m512i __A, __m512i __B, __m512i __C) {
99	return (__m512i)__builtin_ia32_bmacxor16x16x16_v32hi(
100	(__v32hi)__A, (__v32hi)__B, (__v32hi)__C);
101	}
102
103	/// Reverses the bits within each byte of the source vector.
104	///
105	/// For each byte in the source, reverses the order of its 8 bits to generate
106	/// the corresponding destination byte. For example, 0b10110001 becomes
107	/// 0b10001101.
108	///
109	/// \headerfile <immintrin.h>
110	///
111	/// This intrinsic corresponds to the <c> VBITREV </c> instruction.
112	///
113	/// \param __A
114	/// A 512-bit vector of [64 x i8] where each byte will have its bits
115	/// reversed.
116	/// \returns A 512-bit vector of [64 x i8] with bit-reversed bytes.
117	static __inline __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
118	_mm512_bitrev_epi8(__m512i __A) {
119	return (__m512i)__builtin_elementwise_bitreverse((__v64qi)__A);
120	}
121
122	/// Reverses the bits within each byte of the source vector, using a writemask
123	/// to conditionally select elements.
124	///
125	/// For each byte position, if the corresponding mask bit is 1, the byte from
126	/// \a A has its bits reversed and stored in the result. If the mask bit is 0,
127	/// the corresponding byte from \a B is copied to the result (merge masking).
128	///
129	/// \headerfile <immintrin.h>
130	///
131	/// This intrinsic corresponds to the <c> VBITREV </c> instruction.
132	///
133	/// \param __U
134	/// A 64-bit mask value where each bit controls one byte (per 8-bit element).
135	/// A 1 performs bit reversal; a 0 selects the passthrough byte from __B.
136	/// \param __A
137	/// A 512-bit vector of [64 x i8] to be bit-reversed.
138	/// \param __B
139	/// A 512-bit vector of [64 x i8] providing passthrough values.
140	/// \returns A 512-bit vector combining bit-reversed and passthrough bytes.
141	static __inline __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
142	_mm512_mask_bitrev_epi8(__mmask64 __U, __m512i __A, __m512i __B) {
143	return (__m512i)__builtin_ia32_selectb_512(
144	(__mmask64)__U, (__v64qi)_mm512_bitrev_epi8(__A), (__v64qi)__B);
145	}
146
147	/// Reverses the bits within each byte of the source vector, zeroing elements
148	/// based on the writemask.
149	///
150	/// For each byte position, if the corresponding mask bit is 1, the byte from
151	/// \a A has its bits reversed and stored in the result. If the mask bit is 0,
152	/// the result byte is set to zero (zero masking).
153	///
154	/// \headerfile <immintrin.h>
155	///
156	/// This intrinsic corresponds to the <c> VBITREV </c> instruction.
157	///
158	/// \param __U
159	/// A 64-bit mask value where each bit controls one byte (per 8-bit element).
160	/// A 1 performs bit reversal; a 0 sets the byte to zero.
161	/// \param __A
162	/// A 512-bit vector of [64 x i8] to be bit-reversed.
163	/// \returns A 512-bit vector with bit-reversed or zeroed bytes.
164	static __inline __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
165	_mm512_maskz_bitrev_epi8(__mmask64 __U, __m512i __A) {
166	return (__m512i)__builtin_ia32_selectb_512((__mmask64)__U,
167	(__v64qi)_mm512_bitrev_epi8(__A),
168	(__v64qi)_mm512_setzero_si512());
169	}
170
171	#undef __DEFAULT_FN_ATTRS
172	#undef __DEFAULT_FN_ATTRS_CONSTEXPR
173
174	#endif

lib/include/avx512bmmvlintrin.h created+245

...	@@ -0,0 +1,245 @@
1	/*===------------- avx512bmmvlintrin.h - BMM intrinsics ------------------===
2	*
3	*
4	* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	* See https://llvm.org/LICENSE.txt for license information.
6	* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	*
8	*===-----------------------------------------------------------------------===
9	*/
10	#ifndef __IMMINTRIN_H
11	#error \
12	"Never use <avx512bmmvlintrin.h> directly; include <immintrin.h> instead."
13	#endif
14
15	#ifndef __BMMVLINTRIN_H
16	#define __BMMVLINTRIN_H
17
18	/* Define the default attributes for the functions in this file. */
19	#define __DEFAULT_FN_ATTRS128 \
20	__attribute__((__always_inline__, __nodebug__, \
21	__target__("avx512bmm,avx512vl"), __min_vector_width__(128)))
22	#define __DEFAULT_FN_ATTRS256 \
23	__attribute__((__always_inline__, __nodebug__, \
24	__target__("avx512bmm,avx512vl"), __min_vector_width__(256)))
25
26	#if defined(__cplusplus) && (__cplusplus >= 201103L)
27	#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128 constexpr
28	#define __DEFAULT_FN_ATTRS256_CONSTEXPR __DEFAULT_FN_ATTRS256 constexpr
29	#else
30	#define __DEFAULT_FN_ATTRS128_CONSTEXPR __DEFAULT_FN_ATTRS128
31	#define __DEFAULT_FN_ATTRS256_CONSTEXPR __DEFAULT_FN_ATTRS256
32	#endif
33
34	/// Multiplies two 16x16 bit matrices using OR reduction and ORs the product
35	/// into a third 16x16 bit matrix (which is also the destination).
36	///
37	/// For the 256-bit YMM form, the source registers/memory each contain a single
38	/// 16x16 (256-bit) matrix in bits [255:0]. The operation performs:
39	/// \code{.operation}
40	/// for i in 0 to 15
41	/// for j in 0 to 15
42	/// reduction_bit = __C[16*i+j]
43	/// for k in 0 to 15
44	/// reduction_bit \|= __A[16i+k] & __B[16k+j]
45	/// end for k
46	/// dest[16*i+j] = reduction_bit
47	/// end for j
48	/// end for i
49	/// \endcode
50	///
51	/// \headerfile <immintrin.h>
52	///
53	/// This intrinsic corresponds to the <c> VBMACOR16X16X16 </c> instruction.
54	///
55	/// \param __A
56	/// A 256-bit vector containing a 16x16 bit matrix.
57	/// \param __B
58	/// A 256-bit vector containing a 16x16 bit matrix.
59	/// \param __C
60	/// A 256-bit accumulator vector containing the initial values to OR with.
61	/// \returns A 256-bit vector containing the accumulated result.
62	/// \note This instruction does not support masking.
63	static __inline __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
64	_mm256_bmacor16x16x16(__m256i __A, __m256i __B, __m256i __C) {
65	return (__m256i)__builtin_ia32_bmacor16x16x16_v16hi(
66	(__v16hi)__A, (__v16hi)__B, (__v16hi)__C);
67	}
68
69	/// Multiplies two 16x16 bit matrices using XOR reduction and XORs the product
70	/// into a third 16x16 bit matrix (which is also the destination).
71	///
72	/// For the 256-bit YMM form, the source registers/memory each contain a single
73	/// 16x16 (256-bit) matrix in bits [255:0]. The operation performs:
74	/// \code{.operation}
75	/// for i in 0 to 15
76	/// for j in 0 to 15
77	/// reduction_bit = __C[16*i+j]
78	/// for k in 0 to 15
79	/// reduction_bit ^= __A[16i+k] & __B[16k+j]
80	/// end for k
81	/// dest[16*i+j] = reduction_bit
82	/// end for j
83	/// end for i
84	/// \endcode
85	///
86	/// \headerfile <immintrin.h>
87	///
88	/// This intrinsic corresponds to the <c> VBMACXOR16X16X16 </c> instruction.
89	///
90	/// \param __A
91	/// A 256-bit vector containing a 16x16 bit matrix.
92	/// \param __B
93	/// A 256-bit vector containing a 16x16 bit matrix.
94	/// \param __C
95	/// A 256-bit accumulator vector containing the initial values to XOR with.
96	/// \returns A 256-bit vector containing the accumulated result.
97	/// \note This instruction does not support masking.
98	static __inline __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
99	_mm256_bmacxor16x16x16(__m256i __A, __m256i __B, __m256i __C) {
100	return (__m256i)__builtin_ia32_bmacxor16x16x16_v16hi(
101	(__v16hi)__A, (__v16hi)__B, (__v16hi)__C);
102	}
103
104	/// Reverses the bits within each byte of the source vector.
105	///
106	/// For each byte in the source, reverses the order of its 8 bits to generate
107	/// the corresponding destination byte. For example, 0b10110001 becomes
108	/// 0b10001101.
109	///
110	/// \headerfile <immintrin.h>
111	///
112	/// This intrinsic corresponds to the <c> VBITREV </c> instruction.
113	///
114	/// \param __A
115	/// A 128-bit vector of [16 x i8] where each byte will have its bits
116	/// reversed.
117	/// \returns A 128-bit vector of [16 x i8] with bit-reversed bytes.
118	static __inline __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
119	_mm128_bitrev_epi8(__m128i __A) {
120	return (__m128i)__builtin_elementwise_bitreverse((__v16qi)__A);
121	}
122
123	/// Reverses the bits within each byte of the source vector.
124	///
125	/// For each byte in the source, reverses the order of its 8 bits to generate
126	/// the corresponding destination byte. For example, 0b10110001 becomes
127	/// 0b10001101.
128	///
129	/// \headerfile <immintrin.h>
130	///
131	/// This intrinsic corresponds to the <c> VBITREV </c> instruction.
132	///
133	/// \param __A
134	/// A 256-bit vector of [32 x i8] where each byte will have its bits
135	/// reversed.
136	/// \returns A 256-bit vector of [32 x i8] with bit-reversed bytes.
137	static __inline __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
138	_mm256_bitrev_epi8(__m256i __A) {
139	return (__m256i)__builtin_elementwise_bitreverse((__v32qi)__A);
140	}
141
142	/// Reverses the bits within each byte of the source vector, using a writemask
143	/// to conditionally select elements.
144	///
145	/// For each byte position, if the corresponding mask bit is 1, the byte from
146	/// \a A has its bits reversed and stored in the result. If the mask bit is 0,
147	/// the corresponding byte from \a B is copied to the result (merge masking).
148	///
149	/// \headerfile <immintrin.h>
150	///
151	/// This intrinsic corresponds to the <c> VBITREV </c> instruction.
152	///
153	/// \param __U
154	/// A 16-bit mask value where each bit controls one byte (per 8-bit element).
155	/// A 1 performs bit reversal; a 0 selects the passthrough byte from __B.
156	/// \param __A
157	/// A 128-bit vector of [16 x i8] to be bit-reversed.
158	/// \param __B
159	/// A 128-bit vector of [16 x i8] providing passthrough values.
160	/// \returns A 128-bit vector combining bit-reversed and passthrough bytes.
161	static __inline __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
162	_mm128_mask_bitrev_epi8(__mmask16 __U, __m128i __A, __m128i __B) {
163	return (__m128i)__builtin_ia32_selectb_128(
164	(__mmask16)__U, (__v16qi)_mm128_bitrev_epi8(__A), (__v16qi)__B);
165	}
166
167	/// Reverses the bits within each byte of the source vector, using a writemask
168	/// to conditionally select elements.
169	///
170	/// For each byte position, if the corresponding mask bit is 1, the byte from
171	/// \a A has its bits reversed and stored in the result. If the mask bit is 0,
172	/// the corresponding byte from \a B is copied to the result (merge masking).
173	///
174	/// \headerfile <immintrin.h>
175	///
176	/// This intrinsic corresponds to the <c> VBITREV </c> instruction.
177	///
178	/// \param __U
179	/// A 32-bit mask value where each bit controls one byte (per 8-bit element).
180	/// A 1 performs bit reversal; a 0 selects the passthrough byte from __B.
181	/// \param __A
182	/// A 256-bit vector of [32 x i8] to be bit-reversed.
183	/// \param __B
184	/// A 256-bit vector of [32 x i8] providing passthrough values.
185	/// \returns A 256-bit vector combining bit-reversed and passthrough bytes.
186	static __inline __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
187	_mm256_mask_bitrev_epi8(__mmask32 __U, __m256i __A, __m256i __B) {
188	return (__m256i)__builtin_ia32_selectb_256(
189	(__mmask32)__U, (__v32qi)_mm256_bitrev_epi8(__A), (__v32qi)__B);
190	}
191
192	/// Reverses the bits within each byte of the source vector, zeroing elements
193	/// based on the writemask.
194	///
195	/// For each byte position, if the corresponding mask bit is 1, the byte from
196	/// \a A has its bits reversed and stored in the result. If the mask bit is 0,
197	/// the result byte is set to zero (zero masking).
198	///
199	/// \headerfile <immintrin.h>
200	///
201	/// This intrinsic corresponds to the <c> VBITREV </c> instruction.
202	///
203	/// \param __U
204	/// A 16-bit mask value where each bit controls one byte (per 8-bit element).
205	/// A 1 performs bit reversal; a 0 sets the byte to zero.
206	/// \param __A
207	/// A 128-bit vector of [16 x i8] to be bit-reversed.
208	/// \returns A 128-bit vector with bit-reversed or zeroed bytes.
209	static __inline __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
210	_mm128_maskz_bitrev_epi8(__mmask16 __U, __m128i __A) {
211	return (__m128i)__builtin_ia32_selectb_128((__mmask16)__U,
212	(__v16qi)_mm128_bitrev_epi8(__A),
213	(__v16qi)_mm_setzero_si128());
214	}
215
216	/// Reverses the bits within each byte of the source vector, zeroing elements
217	/// based on the writemask.
218	///
219	/// For each byte position, if the corresponding mask bit is 1, the byte from
220	/// \a A has its bits reversed and stored in the result. If the mask bit is 0,
221	/// the result byte is set to zero (zero masking).
222	///
223	/// \headerfile <immintrin.h>
224	///
225	/// This intrinsic corresponds to the <c> VBITREV </c> instruction.
226	///
227	/// \param __U
228	/// A 32-bit mask value where each bit controls one byte (per 8-bit element).
229	/// A 1 performs bit reversal; a 0 sets the byte to zero.
230	/// \param __A
231	/// A 256-bit vector of [32 x i8] to be bit-reversed.
232	/// \returns A 256-bit vector with bit-reversed or zeroed bytes.
233	static __inline __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
234	_mm256_maskz_bitrev_epi8(__mmask32 __U, __m256i __A) {
235	return (__m256i)__builtin_ia32_selectb_256((__mmask32)__U,
236	(__v32qi)_mm256_bitrev_epi8(__A),
237	(__v32qi)_mm256_setzero_si256());
238	}
239
240	#undef __DEFAULT_FN_ATTRS128_CONSTEXPR
241	#undef __DEFAULT_FN_ATTRS256_CONSTEXPR
242	#undef __DEFAULT_FN_ATTRS128
243	#undef __DEFAULT_FN_ATTRS256
244
245	#endif

lib/include/avx512bwintrin.h+19-29

 @@ -1695,57 +1695,49 @@ _mm512_mask_storeu_epi8 (void *__P, __mmask64 __U, __m512i __A)
              (__mmask64) __U);
 }
-static __inline__ __mmask64 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask64 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_test_epi8_mask (__m512i __A, __m512i __B)
+_mm512_test_epi8_mask(__m512i __A, __m512i __B) {
-{
   return _mm512_cmpneq_epi8_mask (_mm512_and_epi32 (__A, __B),
                                   _mm512_setzero_si512());
 }
-static __inline__ __mmask64 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask64 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_test_epi8_mask (__mmask64 __U, __m512i __A, __m512i __B)
+_mm512_mask_test_epi8_mask(__mmask64 __U, __m512i __A, __m512i __B) {
-{
   return _mm512_mask_cmpneq_epi8_mask (__U, _mm512_and_epi32 (__A, __B),
                                        _mm512_setzero_si512());
 }
-static __inline__ __mmask32 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask32 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_test_epi16_mask (__m512i __A, __m512i __B)
+_mm512_test_epi16_mask(__m512i __A, __m512i __B) {
-{
   return _mm512_cmpneq_epi16_mask (_mm512_and_epi32 (__A, __B),
                                    _mm512_setzero_si512());
 }
-static __inline__ __mmask32 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask32 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_test_epi16_mask (__mmask32 __U, __m512i __A, __m512i __B)
+_mm512_mask_test_epi16_mask(__mmask32 __U, __m512i __A, __m512i __B) {
-{
   return _mm512_mask_cmpneq_epi16_mask (__U, _mm512_and_epi32 (__A, __B),
                                         _mm512_setzero_si512());
 }
-static __inline__ __mmask64 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask64 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_testn_epi8_mask (__m512i __A, __m512i __B)
+_mm512_testn_epi8_mask(__m512i __A, __m512i __B) {
-{
   return _mm512_cmpeq_epi8_mask (_mm512_and_epi32 (__A, __B), _mm512_setzero_si512());
 }
-static __inline__ __mmask64 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask64 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_testn_epi8_mask (__mmask64 __U, __m512i __A, __m512i __B)
+_mm512_mask_testn_epi8_mask(__mmask64 __U, __m512i __A, __m512i __B) {
-{
   return _mm512_mask_cmpeq_epi8_mask (__U, _mm512_and_epi32 (__A, __B),
                                       _mm512_setzero_si512());
 }
-static __inline__ __mmask32 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask32 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_testn_epi16_mask (__m512i __A, __m512i __B)
+_mm512_testn_epi16_mask(__m512i __A, __m512i __B) {
-{
   return _mm512_cmpeq_epi16_mask (_mm512_and_epi32 (__A, __B),
                                   _mm512_setzero_si512());
 }
-static __inline__ __mmask32 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask32 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_testn_epi16_mask (__mmask32 __U, __m512i __A, __m512i __B)
+_mm512_mask_testn_epi16_mask(__mmask32 __U, __m512i __A, __m512i __B) {
-{
   return _mm512_mask_cmpeq_epi16_mask (__U, _mm512_and_epi32 (__A, __B),
                                        _mm512_setzero_si512());
 }
 @@ -1880,11 +1872,9 @@ _mm512_mask_permutexvar_epi16(__m512i __W, __mmask32 __M, __m512i __A,
                                   (__v32hi)_mm512_dbsad_epu8((A), (B), (imm)), \
                                   (__v32hi)_mm512_setzero_si512()))
-static __inline__ __m512i __DEFAULT_FN_ATTRS512
+static __inline__ __m512i
-_mm512_sad_epu8 (__m512i __A, __m512i __B)
+    __DEFAULT_FN_ATTRS512_CONSTEXPR _mm512_sad_epu8(__m512i __A, __m512i __B) {
-{
+  return (__m512i)__builtin_ia32_psadbw512((__v64qu)__A, (__v64qu)__B);
- return (__m512i) __builtin_ia32_psadbw512 ((__v64qi) __A,
-               (__v64qi) __B);
 }
 #undef __DEFAULT_FN_ATTRS512

lib/include/avx512fintrin.h+62-89

 @@ -42,11 +42,12 @@ typedef unsigned char __mmask8;
 typedef unsigned short __mmask16;
 /* Rounding mode macros.  */
-#define _MM_FROUND_TO_NEAREST_INT   0x00
+#define _MM_FROUND_TO_NEAREST_INT 0x00
-#define _MM_FROUND_TO_NEG_INF       0x01
+#define _MM_FROUND_TO_NEAREST_TIES_EVEN 0x00
-#define _MM_FROUND_TO_POS_INF       0x02
+#define _MM_FROUND_TO_NEG_INF 0x01
-#define _MM_FROUND_TO_ZERO          0x03
+#define _MM_FROUND_TO_POS_INF 0x02
-#define _MM_FROUND_CUR_DIRECTION    0x04
+#define _MM_FROUND_TO_ZERO 0x03
+#define _MM_FROUND_CUR_DIRECTION 0x04
 /* Constants for integer comparison predicates */
 typedef enum {
 @@ -986,10 +987,8 @@ _mm512_maskz_max_ps(__mmask16 __U, __m512 __A, __m512 __B) {
                                              (__v16sf)_mm512_setzero_ps());
 }
-static __inline__ __m128 __DEFAULT_FN_ATTRS128 _mm_mask_max_ss(__m128 __W,
+static __inline__ __m128 __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                               __mmask8 __U,
+_mm_mask_max_ss(__m128 __W, __mmask8 __U, __m128 __A, __m128 __B) {
-                                                               __m128 __A,
-                                                               __m128 __B) {
   return (__m128) __builtin_ia32_maxss_round_mask ((__v4sf) __A,
                 (__v4sf) __B,
                 (__v4sf) __W,
 @@ -997,9 +996,8 @@ static __inline__ __m128 __DEFAULT_FN_ATTRS128 _mm_mask_max_ss(__m128 __W,
                 _MM_FROUND_CUR_DIRECTION);
 }
-static __inline__ __m128 __DEFAULT_FN_ATTRS128 _mm_maskz_max_ss(__mmask8 __U,
+static __inline__ __m128 __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                __m128 __A,
+_mm_maskz_max_ss(__mmask8 __U, __m128 __A, __m128 __B) {
-                                                                __m128 __B) {
   return (__m128) __builtin_ia32_maxss_round_mask ((__v4sf) __A,
                 (__v4sf) __B,
                 (__v4sf)  _mm_setzero_ps (),
 @@ -1025,10 +1023,8 @@ static __inline__ __m128 __DEFAULT_FN_ATTRS128 _mm_maskz_max_ss(__mmask8 __U,
                                            (__v4sf)_mm_setzero_ps(), \
                                            (__mmask8)(U), (int)(R)))
-static __inline__ __m128d __DEFAULT_FN_ATTRS128 _mm_mask_max_sd(__m128d __W,
+static __inline__ __m128d __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                __mmask8 __U,
+_mm_mask_max_sd(__m128d __W, __mmask8 __U, __m128d __A, __m128d __B) {
-                                                                __m128d __A,
-                                                                __m128d __B) {
   return (__m128d) __builtin_ia32_maxsd_round_mask ((__v2df) __A,
                 (__v2df) __B,
                 (__v2df) __W,
 @@ -1036,9 +1032,8 @@ static __inline__ __m128d __DEFAULT_FN_ATTRS128 _mm_mask_max_sd(__m128d __W,
                 _MM_FROUND_CUR_DIRECTION);
 }
-static __inline__ __m128d __DEFAULT_FN_ATTRS128 _mm_maskz_max_sd(__mmask8 __U,
+static __inline__ __m128d __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                 __m128d __A,
+_mm_maskz_max_sd(__mmask8 __U, __m128d __A, __m128d __B) {
-                                                                 __m128d __B) {
   return (__m128d) __builtin_ia32_maxsd_round_mask ((__v2df) __A,
                 (__v2df) __B,
                 (__v2df)  _mm_setzero_pd (),
 @@ -1208,10 +1203,8 @@ _mm512_maskz_min_ps(__mmask16 __U, __m512 __A, __m512 __B) {
                                              (__v16sf)_mm512_setzero_ps());
 }
-static __inline__ __m128 __DEFAULT_FN_ATTRS128 _mm_mask_min_ss(__m128 __W,
+static __inline__ __m128 __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                               __mmask8 __U,
+_mm_mask_min_ss(__m128 __W, __mmask8 __U, __m128 __A, __m128 __B) {
-                                                               __m128 __A,
-                                                               __m128 __B) {
   return (__m128) __builtin_ia32_minss_round_mask ((__v4sf) __A,
                 (__v4sf) __B,
                 (__v4sf) __W,
 @@ -1219,9 +1212,8 @@ static __inline__ __m128 __DEFAULT_FN_ATTRS128 _mm_mask_min_ss(__m128 __W,
                 _MM_FROUND_CUR_DIRECTION);
 }
-static __inline__ __m128 __DEFAULT_FN_ATTRS128 _mm_maskz_min_ss(__mmask8 __U,
+static __inline__ __m128 __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                __m128 __A,
+_mm_maskz_min_ss(__mmask8 __U, __m128 __A, __m128 __B) {
-                                                                __m128 __B) {
   return (__m128) __builtin_ia32_minss_round_mask ((__v4sf) __A,
                 (__v4sf) __B,
                 (__v4sf)  _mm_setzero_ps (),
 @@ -1247,10 +1239,8 @@ static __inline__ __m128 __DEFAULT_FN_ATTRS128 _mm_maskz_min_ss(__mmask8 __U,
                                            (__v4sf)_mm_setzero_ps(), \
                                            (__mmask8)(U), (int)(R)))
-static __inline__ __m128d __DEFAULT_FN_ATTRS128 _mm_mask_min_sd(__m128d __W,
+static __inline__ __m128d __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                __mmask8 __U,
+_mm_mask_min_sd(__m128d __W, __mmask8 __U, __m128d __A, __m128d __B) {
-                                                                __m128d __A,
-                                                                __m128d __B) {
   return (__m128d) __builtin_ia32_minsd_round_mask ((__v2df) __A,
                 (__v2df) __B,
                 (__v2df) __W,
 @@ -1258,9 +1248,8 @@ static __inline__ __m128d __DEFAULT_FN_ATTRS128 _mm_mask_min_sd(__m128d __W,
                 _MM_FROUND_CUR_DIRECTION);
 }
-static __inline__ __m128d __DEFAULT_FN_ATTRS128 _mm_maskz_min_sd(__mmask8 __U,
+static __inline__ __m128d __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                 __m128d __A,
+_mm_maskz_min_sd(__mmask8 __U, __m128d __A, __m128d __B) {
-                                                                 __m128d __B) {
   return (__m128d) __builtin_ia32_minsd_round_mask ((__v2df) __A,
                 (__v2df) __B,
                 (__v2df)  _mm_setzero_pd (),
 @@ -8108,68 +8097,60 @@ _mm512_stream_ps (void *__P, __m512 __A)
   __builtin_nontemporal_store((__v16sf_aligned)__A, (__v16sf_aligned*)__P);
 }
-static __inline__ __m512d __DEFAULT_FN_ATTRS512
+static __inline__ __m512d __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_compress_pd (__m512d __W, __mmask8 __U, __m512d __A)
+_mm512_mask_compress_pd(__m512d __W, __mmask8 __U, __m512d __A) {
-{
   return (__m512d) __builtin_ia32_compressdf512_mask ((__v8df) __A,
                   (__v8df) __W,
                   (__mmask8) __U);
 }
-static __inline__ __m512d __DEFAULT_FN_ATTRS512
+static __inline__ __m512d __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_maskz_compress_pd (__mmask8 __U, __m512d __A)
+_mm512_maskz_compress_pd(__mmask8 __U, __m512d __A) {
-{
   return (__m512d) __builtin_ia32_compressdf512_mask ((__v8df) __A,
                   (__v8df)
                   _mm512_setzero_pd (),
                   (__mmask8) __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS512
+static __inline__ __m512i __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_compress_epi64 (__m512i __W, __mmask8 __U, __m512i __A)
+_mm512_mask_compress_epi64(__m512i __W, __mmask8 __U, __m512i __A) {
-{
   return (__m512i) __builtin_ia32_compressdi512_mask ((__v8di) __A,
                   (__v8di) __W,
                   (__mmask8) __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS512
+static __inline__ __m512i __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_maskz_compress_epi64 (__mmask8 __U, __m512i __A)
+_mm512_maskz_compress_epi64(__mmask8 __U, __m512i __A) {
-{
   return (__m512i) __builtin_ia32_compressdi512_mask ((__v8di) __A,
                   (__v8di)
                   _mm512_setzero_si512 (),
                   (__mmask8) __U);
 }
-static __inline__ __m512 __DEFAULT_FN_ATTRS512
+static __inline__ __m512 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_compress_ps (__m512 __W, __mmask16 __U, __m512 __A)
+_mm512_mask_compress_ps(__m512 __W, __mmask16 __U, __m512 __A) {
-{
   return (__m512) __builtin_ia32_compresssf512_mask ((__v16sf) __A,
                  (__v16sf) __W,
                  (__mmask16) __U);
 }
-static __inline__ __m512 __DEFAULT_FN_ATTRS512
+static __inline__ __m512 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_maskz_compress_ps (__mmask16 __U, __m512 __A)
+_mm512_maskz_compress_ps(__mmask16 __U, __m512 __A) {
-{
   return (__m512) __builtin_ia32_compresssf512_mask ((__v16sf) __A,
                  (__v16sf)
                  _mm512_setzero_ps (),
                  (__mmask16) __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS512
+static __inline__ __m512i __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_compress_epi32 (__m512i __W, __mmask16 __U, __m512i __A)
+_mm512_mask_compress_epi32(__m512i __W, __mmask16 __U, __m512i __A) {
-{
   return (__m512i) __builtin_ia32_compresssi512_mask ((__v16si) __A,
                   (__v16si) __W,
                   (__mmask16) __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS512
+static __inline__ __m512i __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_maskz_compress_epi32 (__mmask16 __U, __m512i __A)
+_mm512_maskz_compress_epi32(__mmask16 __U, __m512i __A) {
-{
   return (__m512i) __builtin_ia32_compresssi512_mask ((__v16si) __A,
                   (__v16si)
                   _mm512_setzero_si512 (),
 @@ -8222,58 +8203,50 @@ _mm512_maskz_compress_epi32 (__mmask16 __U, __m512i __A)
 /* Bit Test */
-static __inline __mmask16 __DEFAULT_FN_ATTRS512
+static __inline __mmask16 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_test_epi32_mask (__m512i __A, __m512i __B)
+_mm512_test_epi32_mask(__m512i __A, __m512i __B) {
-{
   return _mm512_cmpneq_epi32_mask (_mm512_and_epi32(__A, __B),
                                    _mm512_setzero_si512());
 }
-static __inline__ __mmask16 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask16 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_test_epi32_mask (__mmask16 __U, __m512i __A, __m512i __B)
+_mm512_mask_test_epi32_mask(__mmask16 __U, __m512i __A, __m512i __B) {
-{
   return _mm512_mask_cmpneq_epi32_mask (__U, _mm512_and_epi32 (__A, __B),
                                         _mm512_setzero_si512());
 }
-static __inline __mmask8 __DEFAULT_FN_ATTRS512
+static __inline __mmask8 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_test_epi64_mask (__m512i __A, __m512i __B)
+_mm512_test_epi64_mask(__m512i __A, __m512i __B) {
-{
   return _mm512_cmpneq_epi64_mask (_mm512_and_epi32 (__A, __B),
                                    _mm512_setzero_si512());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_test_epi64_mask (__mmask8 __U, __m512i __A, __m512i __B)
+_mm512_mask_test_epi64_mask(__mmask8 __U, __m512i __A, __m512i __B) {
-{
   return _mm512_mask_cmpneq_epi64_mask (__U, _mm512_and_epi32 (__A, __B),
                                         _mm512_setzero_si512());
 }
-static __inline__ __mmask16 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask16 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_testn_epi32_mask (__m512i __A, __m512i __B)
+_mm512_testn_epi32_mask(__m512i __A, __m512i __B) {
-{
   return _mm512_cmpeq_epi32_mask (_mm512_and_epi32 (__A, __B),
                                   _mm512_setzero_si512());
 }
-static __inline__ __mmask16 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask16 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_testn_epi32_mask (__mmask16 __U, __m512i __A, __m512i __B)
+_mm512_mask_testn_epi32_mask(__mmask16 __U, __m512i __A, __m512i __B) {
-{
   return _mm512_mask_cmpeq_epi32_mask (__U, _mm512_and_epi32 (__A, __B),
                                        _mm512_setzero_si512());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_testn_epi64_mask (__m512i __A, __m512i __B)
+_mm512_testn_epi64_mask(__m512i __A, __m512i __B) {
-{
   return _mm512_cmpeq_epi64_mask (_mm512_and_epi32 (__A, __B),
                                   _mm512_setzero_si512());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS512
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS512_CONSTEXPR
-_mm512_mask_testn_epi64_mask (__mmask8 __U, __m512i __A, __m512i __B)
+_mm512_mask_testn_epi64_mask(__mmask8 __U, __m512i __A, __m512i __B) {
-{
   return _mm512_mask_cmpeq_epi64_mask (__U, _mm512_and_epi32 (__A, __B),
                                        _mm512_setzero_si512());
 }
 @@ -8403,7 +8376,7 @@ _mm_maskz_load_sd (__mmask8 __U, const double* __A)
                                        (__v16si)_mm512_shuffle_epi32((A), (I)), \
                                        (__v16si)_mm512_setzero_si512()))
-static __inline__ __m512d __DEFAULT_FN_ATTRS512
+static __inline__ __m512d __DEFAULT_FN_ATTRS512_CONSTEXPR
 _mm512_mask_expand_pd (__m512d __W, __mmask8 __U, __m512d __A)
 {
   return (__m512d) __builtin_ia32_expanddf512_mask ((__v8df) __A,
 @@ -8411,7 +8384,7 @@ _mm512_mask_expand_pd (__m512d __W, __mmask8 __U, __m512d __A)
                 (__mmask8) __U);
 }
-static __inline__ __m512d __DEFAULT_FN_ATTRS512
+static __inline__ __m512d __DEFAULT_FN_ATTRS512_CONSTEXPR
 _mm512_maskz_expand_pd (__mmask8 __U, __m512d __A)
 {
   return (__m512d) __builtin_ia32_expanddf512_mask ((__v8df) __A,
 @@ -8419,7 +8392,7 @@ _mm512_maskz_expand_pd (__mmask8 __U, __m512d __A)
                 (__mmask8) __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS512
+static __inline__ __m512i __DEFAULT_FN_ATTRS512_CONSTEXPR
 _mm512_mask_expand_epi64 (__m512i __W, __mmask8 __U, __m512i __A)
 {
   return (__m512i) __builtin_ia32_expanddi512_mask ((__v8di) __A,
 @@ -8427,7 +8400,7 @@ _mm512_mask_expand_epi64 (__m512i __W, __mmask8 __U, __m512i __A)
                 (__mmask8) __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS512
+static __inline__ __m512i __DEFAULT_FN_ATTRS512_CONSTEXPR
 _mm512_maskz_expand_epi64 ( __mmask8 __U, __m512i __A)
 {
   return (__m512i) __builtin_ia32_expanddi512_mask ((__v8di) __A,
 @@ -8499,7 +8472,7 @@ _mm512_maskz_expandloadu_epi32(__mmask16 __U, void const *__P)
               (__mmask16) __U);
 }
-static __inline__ __m512 __DEFAULT_FN_ATTRS512
+static __inline__ __m512 __DEFAULT_FN_ATTRS512_CONSTEXPR
 _mm512_mask_expand_ps (__m512 __W, __mmask16 __U, __m512 __A)
 {
   return (__m512) __builtin_ia32_expandsf512_mask ((__v16sf) __A,
 @@ -8507,7 +8480,7 @@ _mm512_mask_expand_ps (__m512 __W, __mmask16 __U, __m512 __A)
                (__mmask16) __U);
 }
-static __inline__ __m512 __DEFAULT_FN_ATTRS512
+static __inline__ __m512 __DEFAULT_FN_ATTRS512_CONSTEXPR
 _mm512_maskz_expand_ps (__mmask16 __U, __m512 __A)
 {
   return (__m512) __builtin_ia32_expandsf512_mask ((__v16sf) __A,
 @@ -8515,7 +8488,7 @@ _mm512_maskz_expand_ps (__mmask16 __U, __m512 __A)
                (__mmask16) __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS512
+static __inline__ __m512i __DEFAULT_FN_ATTRS512_CONSTEXPR
 _mm512_mask_expand_epi32 (__m512i __W, __mmask16 __U, __m512i __A)
 {
   return (__m512i) __builtin_ia32_expandsi512_mask ((__v16si) __A,
 @@ -8523,7 +8496,7 @@ _mm512_mask_expand_epi32 (__m512i __W, __mmask16 __U, __m512i __A)
                 (__mmask16) __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS512
+static __inline__ __m512i __DEFAULT_FN_ATTRS512_CONSTEXPR
 _mm512_maskz_expand_epi32 (__mmask16 __U, __m512i __A)
 {
   return (__m512i) __builtin_ia32_expandsi512_mask ((__v16si) __A,

lib/include/avx512fp16intrin.h+12-18

 @@ -720,25 +720,22 @@ _mm_maskz_div_sh(__mmask8 __U, __m128h __A, __m128h __B) {
       (__v8hf)(__m128h)(A), (__v8hf)(__m128h)(B), (__v8hf)_mm_setzero_ph(),    \
       (__mmask8)(U), (int)(R)))
-static __inline__ __m128h __DEFAULT_FN_ATTRS128 _mm_min_sh(__m128h __A,
+static __inline__ __m128h
-                                                           __m128h __B) {
+    __DEFAULT_FN_ATTRS128_CONSTEXPR _mm_min_sh(__m128h __A, __m128h __B) {
   return (__m128h)__builtin_ia32_minsh_round_mask(
       (__v8hf)__A, (__v8hf)__B, (__v8hf)_mm_setzero_ph(), (__mmask8)-1,
       _MM_FROUND_CUR_DIRECTION);
 }
-static __inline__ __m128h __DEFAULT_FN_ATTRS128 _mm_mask_min_sh(__m128h __W,
+static __inline__ __m128h __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                __mmask8 __U,
+_mm_mask_min_sh(__m128h __W, __mmask8 __U, __m128h __A, __m128h __B) {
-                                                                __m128h __A,
-                                                                __m128h __B) {
   return (__m128h)__builtin_ia32_minsh_round_mask((__v8hf)__A, (__v8hf)__B,
                                                   (__v8hf)__W, (__mmask8)__U,
                                                   _MM_FROUND_CUR_DIRECTION);
 }
-static __inline__ __m128h __DEFAULT_FN_ATTRS128 _mm_maskz_min_sh(__mmask8 __U,
+static __inline__ __m128h __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                 __m128h __A,
+_mm_maskz_min_sh(__mmask8 __U, __m128h __A, __m128h __B) {
-                                                                 __m128h __B) {
   return (__m128h)__builtin_ia32_minsh_round_mask(
       (__v8hf)__A, (__v8hf)__B, (__v8hf)_mm_setzero_ph(), (__mmask8)__U,
       _MM_FROUND_CUR_DIRECTION);
 @@ -759,25 +756,22 @@ static __inline__ __m128h __DEFAULT_FN_ATTRS128 _mm_maskz_min_sh(__mmask8 __U,
       (__v8hf)(__m128h)(A), (__v8hf)(__m128h)(B), (__v8hf)_mm_setzero_ph(),    \
       (__mmask8)(U), (int)(R)))
-static __inline__ __m128h __DEFAULT_FN_ATTRS128 _mm_max_sh(__m128h __A,
+static __inline__ __m128h
-                                                           __m128h __B) {
+    __DEFAULT_FN_ATTRS128_CONSTEXPR _mm_max_sh(__m128h __A, __m128h __B) {
   return (__m128h)__builtin_ia32_maxsh_round_mask(
       (__v8hf)__A, (__v8hf)__B, (__v8hf)_mm_setzero_ph(), (__mmask8)-1,
       _MM_FROUND_CUR_DIRECTION);
 }
-static __inline__ __m128h __DEFAULT_FN_ATTRS128 _mm_mask_max_sh(__m128h __W,
+static __inline__ __m128h __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                __mmask8 __U,
+_mm_mask_max_sh(__m128h __W, __mmask8 __U, __m128h __A, __m128h __B) {
-                                                                __m128h __A,
-                                                                __m128h __B) {
   return (__m128h)__builtin_ia32_maxsh_round_mask((__v8hf)__A, (__v8hf)__B,
                                                   (__v8hf)__W, (__mmask8)__U,
                                                   _MM_FROUND_CUR_DIRECTION);
 }
-static __inline__ __m128h __DEFAULT_FN_ATTRS128 _mm_maskz_max_sh(__mmask8 __U,
+static __inline__ __m128h __DEFAULT_FN_ATTRS128_CONSTEXPR
-                                                                 __m128h __A,
+_mm_maskz_max_sh(__mmask8 __U, __m128h __A, __m128h __B) {
-                                                                 __m128h __B) {
   return (__m128h)__builtin_ia32_maxsh_round_mask(
       (__v8hf)__A, (__v8hf)__B, (__v8hf)_mm_setzero_ph(), (__mmask8)__U,
       _MM_FROUND_CUR_DIRECTION);

lib/include/avx512vbmi2intrin.h+12-16

 @@ -25,33 +25,29 @@
 #define __DEFAULT_FN_ATTRS_CONSTEXPR __DEFAULT_FN_ATTRS
 #endif
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
-_mm512_mask_compress_epi16(__m512i __S, __mmask32 __U, __m512i __D)
+_mm512_mask_compress_epi16(__m512i __S, __mmask32 __U, __m512i __D) {
-{
   return (__m512i) __builtin_ia32_compresshi512_mask ((__v32hi) __D,
               (__v32hi) __S,
               __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
-_mm512_maskz_compress_epi16(__mmask32 __U, __m512i __D)
+_mm512_maskz_compress_epi16(__mmask32 __U, __m512i __D) {
-{
   return (__m512i) __builtin_ia32_compresshi512_mask ((__v32hi) __D,
               (__v32hi) _mm512_setzero_si512(),
               __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
-_mm512_mask_compress_epi8(__m512i __S, __mmask64 __U, __m512i __D)
+_mm512_mask_compress_epi8(__m512i __S, __mmask64 __U, __m512i __D) {
-{
   return (__m512i) __builtin_ia32_compressqi512_mask ((__v64qi) __D,
               (__v64qi) __S,
               __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
-_mm512_maskz_compress_epi8(__mmask64 __U, __m512i __D)
+_mm512_maskz_compress_epi8(__mmask64 __U, __m512i __D) {
-{
   return (__m512i) __builtin_ia32_compressqi512_mask ((__v64qi) __D,
               (__v64qi) _mm512_setzero_si512(),
               __U);
 @@ -71,7 +67,7 @@ _mm512_mask_compressstoreu_epi8(void *__P, __mmask64 __U, __m512i __D)
               __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
 _mm512_mask_expand_epi16(__m512i __S, __mmask32 __U, __m512i __D)
 {
   return (__m512i) __builtin_ia32_expandhi512_mask ((__v32hi) __D,
 @@ -79,7 +75,7 @@ _mm512_mask_expand_epi16(__m512i __S, __mmask32 __U, __m512i __D)
               __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
 _mm512_maskz_expand_epi16(__mmask32 __U, __m512i __D)
 {
   return (__m512i) __builtin_ia32_expandhi512_mask ((__v32hi) __D,
 @@ -87,7 +83,7 @@ _mm512_maskz_expand_epi16(__mmask32 __U, __m512i __D)
               __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
 _mm512_mask_expand_epi8(__m512i __S, __mmask64 __U, __m512i __D)
 {
   return (__m512i) __builtin_ia32_expandqi512_mask ((__v64qi) __D,
 @@ -95,7 +91,7 @@ _mm512_mask_expand_epi8(__m512i __S, __mmask64 __U, __m512i __D)
               __U);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS_CONSTEXPR
 _mm512_maskz_expand_epi8(__mmask64 __U, __m512i __D)
 {
   return (__m512i) __builtin_ia32_expandqi512_mask ((__v64qi) __D,

lib/include/avx512vlbwintrin.h+24-36

 @@ -2394,36 +2394,31 @@ _mm256_test_epi8_mask(__m256i __A, __m256i __B) {
                                   _mm256_setzero_si256());
 }
-static __inline__ __mmask32 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask32 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_test_epi8_mask (__mmask32 __U, __m256i __A, __m256i __B)
+_mm256_mask_test_epi8_mask(__mmask32 __U, __m256i __A, __m256i __B) {
-{
   return _mm256_mask_cmpneq_epi8_mask (__U, _mm256_and_si256(__A, __B),
                                        _mm256_setzero_si256());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_test_epi16_mask (__m128i __A, __m128i __B)
+_mm_test_epi16_mask(__m128i __A, __m128i __B) {
-{
   return _mm_cmpneq_epi16_mask (_mm_and_si128 (__A, __B), _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_test_epi16_mask (__mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_test_epi16_mask(__mmask8 __U, __m128i __A, __m128i __B) {
-{
   return _mm_mask_cmpneq_epi16_mask (__U, _mm_and_si128 (__A, __B),
                                      _mm_setzero_si128());
 }
-static __inline__ __mmask16 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask16 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_test_epi16_mask (__m256i __A, __m256i __B)
+_mm256_test_epi16_mask(__m256i __A, __m256i __B) {
-{
   return _mm256_cmpneq_epi16_mask (_mm256_and_si256 (__A, __B),
                                    _mm256_setzero_si256 ());
 }
-static __inline__ __mmask16 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask16 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_test_epi16_mask (__mmask16 __U, __m256i __A, __m256i __B)
+_mm256_mask_test_epi16_mask(__mmask16 __U, __m256i __A, __m256i __B) {
-{
   return _mm256_mask_cmpneq_epi16_mask (__U, _mm256_and_si256(__A, __B),
                                         _mm256_setzero_si256());
 }
 @@ -2433,49 +2428,42 @@ _mm_testn_epi8_mask(__m128i __A, __m128i __B) {
   return _mm_cmpeq_epi8_mask (_mm_and_si128 (__A, __B), _mm_setzero_si128());
 }
-static __inline__ __mmask16 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask16 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_testn_epi8_mask (__mmask16 __U, __m128i __A, __m128i __B)
+_mm_mask_testn_epi8_mask(__mmask16 __U, __m128i __A, __m128i __B) {
-{
   return _mm_mask_cmpeq_epi8_mask (__U, _mm_and_si128 (__A, __B),
                                   _mm_setzero_si128());
 }
-static __inline__ __mmask32 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask32 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_testn_epi8_mask (__m256i __A, __m256i __B)
+_mm256_testn_epi8_mask(__m256i __A, __m256i __B) {
-{
   return _mm256_cmpeq_epi8_mask (_mm256_and_si256 (__A, __B),
                                  _mm256_setzero_si256());
 }
-static __inline__ __mmask32 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask32 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_testn_epi8_mask (__mmask32 __U, __m256i __A, __m256i __B)
+_mm256_mask_testn_epi8_mask(__mmask32 __U, __m256i __A, __m256i __B) {
-{
   return _mm256_mask_cmpeq_epi8_mask (__U, _mm256_and_si256 (__A, __B),
                                       _mm256_setzero_si256());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_testn_epi16_mask (__m128i __A, __m128i __B)
+_mm_testn_epi16_mask(__m128i __A, __m128i __B) {
-{
   return _mm_cmpeq_epi16_mask (_mm_and_si128 (__A, __B), _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_testn_epi16_mask (__mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_testn_epi16_mask(__mmask8 __U, __m128i __A, __m128i __B) {
-{
   return _mm_mask_cmpeq_epi16_mask (__U, _mm_and_si128(__A, __B), _mm_setzero_si128());
 }
-static __inline__ __mmask16 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask16 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_testn_epi16_mask (__m256i __A, __m256i __B)
+_mm256_testn_epi16_mask(__m256i __A, __m256i __B) {
-{
   return _mm256_cmpeq_epi16_mask (_mm256_and_si256(__A, __B),
                                   _mm256_setzero_si256());
 }
-static __inline__ __mmask16 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask16 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_testn_epi16_mask (__mmask16 __U, __m256i __A, __m256i __B)
+_mm256_mask_testn_epi16_mask(__mmask16 __U, __m256i __A, __m256i __B) {
-{
   return _mm256_mask_cmpeq_epi16_mask (__U, _mm256_and_si256 (__A, __B),
                                        _mm256_setzero_si256());
 }

lib/include/avx512vlintrin.h+80-96

 @@ -1530,120 +1530,120 @@ _mm256_mask_blend_epi64(__mmask8 __U, __m256i __A, __m256i __W) {
                 (__v4di) __A);
 }
-static __inline__ __m128d __DEFAULT_FN_ATTRS128
+static __inline__ __m128d __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_compress_pd (__m128d __W, __mmask8 __U, __m128d __A) {
+_mm_mask_compress_pd(__m128d __W, __mmask8 __U, __m128d __A) {
   return (__m128d) __builtin_ia32_compressdf128_mask ((__v2df) __A,
                   (__v2df) __W,
                   (__mmask8) __U);
 }
-static __inline__ __m128d __DEFAULT_FN_ATTRS128
+static __inline__ __m128d __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_maskz_compress_pd (__mmask8 __U, __m128d __A) {
+_mm_maskz_compress_pd(__mmask8 __U, __m128d __A) {
   return (__m128d) __builtin_ia32_compressdf128_mask ((__v2df) __A,
                   (__v2df)
                   _mm_setzero_pd (),
                   (__mmask8) __U);
 }
-static __inline__ __m256d __DEFAULT_FN_ATTRS256
+static __inline__ __m256d __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_compress_pd (__m256d __W, __mmask8 __U, __m256d __A) {
+_mm256_mask_compress_pd(__m256d __W, __mmask8 __U, __m256d __A) {
   return (__m256d) __builtin_ia32_compressdf256_mask ((__v4df) __A,
                   (__v4df) __W,
                   (__mmask8) __U);
 }
-static __inline__ __m256d __DEFAULT_FN_ATTRS256
+static __inline__ __m256d __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_maskz_compress_pd (__mmask8 __U, __m256d __A) {
+_mm256_maskz_compress_pd(__mmask8 __U, __m256d __A) {
   return (__m256d) __builtin_ia32_compressdf256_mask ((__v4df) __A,
                   (__v4df)
                   _mm256_setzero_pd (),
                   (__mmask8) __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_compress_epi64 (__m128i __W, __mmask8 __U, __m128i __A) {
+_mm_mask_compress_epi64(__m128i __W, __mmask8 __U, __m128i __A) {
   return (__m128i) __builtin_ia32_compressdi128_mask ((__v2di) __A,
                   (__v2di) __W,
                   (__mmask8) __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_maskz_compress_epi64 (__mmask8 __U, __m128i __A) {
+_mm_maskz_compress_epi64(__mmask8 __U, __m128i __A) {
   return (__m128i) __builtin_ia32_compressdi128_mask ((__v2di) __A,
                   (__v2di)
                   _mm_setzero_si128 (),
                   (__mmask8) __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_compress_epi64 (__m256i __W, __mmask8 __U, __m256i __A) {
+_mm256_mask_compress_epi64(__m256i __W, __mmask8 __U, __m256i __A) {
   return (__m256i) __builtin_ia32_compressdi256_mask ((__v4di) __A,
                   (__v4di) __W,
                   (__mmask8) __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_maskz_compress_epi64 (__mmask8 __U, __m256i __A) {
+_mm256_maskz_compress_epi64(__mmask8 __U, __m256i __A) {
   return (__m256i) __builtin_ia32_compressdi256_mask ((__v4di) __A,
                   (__v4di)
                   _mm256_setzero_si256 (),
                   (__mmask8) __U);
 }
-static __inline__ __m128 __DEFAULT_FN_ATTRS128
+static __inline__ __m128 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_compress_ps (__m128 __W, __mmask8 __U, __m128 __A) {
+_mm_mask_compress_ps(__m128 __W, __mmask8 __U, __m128 __A) {
   return (__m128) __builtin_ia32_compresssf128_mask ((__v4sf) __A,
                  (__v4sf) __W,
                  (__mmask8) __U);
 }
-static __inline__ __m128 __DEFAULT_FN_ATTRS128
+static __inline__ __m128 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_maskz_compress_ps (__mmask8 __U, __m128 __A) {
+_mm_maskz_compress_ps(__mmask8 __U, __m128 __A) {
   return (__m128) __builtin_ia32_compresssf128_mask ((__v4sf) __A,
                  (__v4sf)
                  _mm_setzero_ps (),
                  (__mmask8) __U);
 }
-static __inline__ __m256 __DEFAULT_FN_ATTRS256
+static __inline__ __m256 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_compress_ps (__m256 __W, __mmask8 __U, __m256 __A) {
+_mm256_mask_compress_ps(__m256 __W, __mmask8 __U, __m256 __A) {
   return (__m256) __builtin_ia32_compresssf256_mask ((__v8sf) __A,
                  (__v8sf) __W,
                  (__mmask8) __U);
 }
-static __inline__ __m256 __DEFAULT_FN_ATTRS256
+static __inline__ __m256 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_maskz_compress_ps (__mmask8 __U, __m256 __A) {
+_mm256_maskz_compress_ps(__mmask8 __U, __m256 __A) {
   return (__m256) __builtin_ia32_compresssf256_mask ((__v8sf) __A,
                  (__v8sf)
                  _mm256_setzero_ps (),
                  (__mmask8) __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_compress_epi32 (__m128i __W, __mmask8 __U, __m128i __A) {
+_mm_mask_compress_epi32(__m128i __W, __mmask8 __U, __m128i __A) {
   return (__m128i) __builtin_ia32_compresssi128_mask ((__v4si) __A,
                   (__v4si) __W,
                   (__mmask8) __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_maskz_compress_epi32 (__mmask8 __U, __m128i __A) {
+_mm_maskz_compress_epi32(__mmask8 __U, __m128i __A) {
   return (__m128i) __builtin_ia32_compresssi128_mask ((__v4si) __A,
                   (__v4si)
                   _mm_setzero_si128 (),
                   (__mmask8) __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_compress_epi32 (__m256i __W, __mmask8 __U, __m256i __A) {
+_mm256_mask_compress_epi32(__m256i __W, __mmask8 __U, __m256i __A) {
   return (__m256i) __builtin_ia32_compresssi256_mask ((__v8si) __A,
                   (__v8si) __W,
                   (__mmask8) __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_maskz_compress_epi32 (__mmask8 __U, __m256i __A) {
+_mm256_maskz_compress_epi32(__mmask8 __U, __m256i __A) {
   return (__m256i) __builtin_ia32_compresssi256_mask ((__v8si) __A,
                   (__v8si)
                   _mm256_setzero_si256 (),
 @@ -2250,14 +2250,14 @@ _mm256_maskz_div_ps(__mmask8 __U, __m256 __A, __m256 __B) {
                                              (__v8sf)_mm256_setzero_ps());
 }
-static __inline__ __m128d __DEFAULT_FN_ATTRS128
+static __inline__ __m128d __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_mask_expand_pd (__m128d __W, __mmask8 __U, __m128d __A) {
   return (__m128d) __builtin_ia32_expanddf128_mask ((__v2df) __A,
                 (__v2df) __W,
                 (__mmask8) __U);
 }
-static __inline__ __m128d __DEFAULT_FN_ATTRS128
+static __inline__ __m128d __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_maskz_expand_pd (__mmask8 __U, __m128d __A) {
   return (__m128d) __builtin_ia32_expanddf128_mask ((__v2df) __A,
                  (__v2df)
 @@ -2265,14 +2265,14 @@ _mm_maskz_expand_pd (__mmask8 __U, __m128d __A) {
                  (__mmask8) __U);
 }
-static __inline__ __m256d __DEFAULT_FN_ATTRS256
+static __inline__ __m256d __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_mask_expand_pd (__m256d __W, __mmask8 __U, __m256d __A) {
   return (__m256d) __builtin_ia32_expanddf256_mask ((__v4df) __A,
                 (__v4df) __W,
                 (__mmask8) __U);
 }
-static __inline__ __m256d __DEFAULT_FN_ATTRS256
+static __inline__ __m256d __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_maskz_expand_pd (__mmask8 __U, __m256d __A) {
   return (__m256d) __builtin_ia32_expanddf256_mask ((__v4df) __A,
                  (__v4df)
 @@ -2280,14 +2280,14 @@ _mm256_maskz_expand_pd (__mmask8 __U, __m256d __A) {
                  (__mmask8) __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_mask_expand_epi64 (__m128i __W, __mmask8 __U, __m128i __A) {
   return (__m128i) __builtin_ia32_expanddi128_mask ((__v2di) __A,
                 (__v2di) __W,
                 (__mmask8) __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_maskz_expand_epi64 (__mmask8 __U, __m128i __A) {
   return (__m128i) __builtin_ia32_expanddi128_mask ((__v2di) __A,
                  (__v2di)
 @@ -2295,14 +2295,14 @@ _mm_maskz_expand_epi64 (__mmask8 __U, __m128i __A) {
                  (__mmask8) __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_mask_expand_epi64 (__m256i __W, __mmask8 __U, __m256i __A) {
   return (__m256i) __builtin_ia32_expanddi256_mask ((__v4di) __A,
                 (__v4di) __W,
                 (__mmask8) __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_maskz_expand_epi64 (__mmask8 __U, __m256i __A) {
   return (__m256i) __builtin_ia32_expanddi256_mask ((__v4di) __A,
                  (__v4di)
 @@ -2445,14 +2445,14 @@ _mm256_maskz_expandloadu_epi32 (__mmask8 __U, void const *__P) {
                __U);
 }
-static __inline__ __m128 __DEFAULT_FN_ATTRS128
+static __inline__ __m128 __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_mask_expand_ps (__m128 __W, __mmask8 __U, __m128 __A) {
   return (__m128) __builtin_ia32_expandsf128_mask ((__v4sf) __A,
                (__v4sf) __W,
                (__mmask8) __U);
 }
-static __inline__ __m128 __DEFAULT_FN_ATTRS128
+static __inline__ __m128 __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_maskz_expand_ps (__mmask8 __U, __m128 __A) {
   return (__m128) __builtin_ia32_expandsf128_mask ((__v4sf) __A,
                 (__v4sf)
 @@ -2460,14 +2460,14 @@ _mm_maskz_expand_ps (__mmask8 __U, __m128 __A) {
                 (__mmask8) __U);
 }
-static __inline__ __m256 __DEFAULT_FN_ATTRS256
+static __inline__ __m256 __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_mask_expand_ps (__m256 __W, __mmask8 __U, __m256 __A) {
   return (__m256) __builtin_ia32_expandsf256_mask ((__v8sf) __A,
                (__v8sf) __W,
                (__mmask8) __U);
 }
-static __inline__ __m256 __DEFAULT_FN_ATTRS256
+static __inline__ __m256 __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_maskz_expand_ps (__mmask8 __U, __m256 __A) {
   return (__m256) __builtin_ia32_expandsf256_mask ((__v8sf) __A,
                 (__v8sf)
 @@ -2475,14 +2475,14 @@ _mm256_maskz_expand_ps (__mmask8 __U, __m256 __A) {
                 (__mmask8) __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_mask_expand_epi32 (__m128i __W, __mmask8 __U, __m128i __A) {
   return (__m128i) __builtin_ia32_expandsi128_mask ((__v4si) __A,
                 (__v4si) __W,
                 (__mmask8) __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_maskz_expand_epi32 (__mmask8 __U, __m128i __A) {
   return (__m128i) __builtin_ia32_expandsi128_mask ((__v4si) __A,
                  (__v4si)
 @@ -2490,14 +2490,14 @@ _mm_maskz_expand_epi32 (__mmask8 __U, __m128i __A) {
                  (__mmask8) __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_mask_expand_epi32 (__m256i __W, __mmask8 __U, __m256i __A) {
   return (__m256i) __builtin_ia32_expandsi256_mask ((__v8si) __A,
                 (__v8si) __W,
                 (__mmask8) __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_maskz_expand_epi32 (__mmask8 __U, __m256i __A) {
   return (__m256i) __builtin_ia32_expandsi256_mask ((__v8si) __A,
                  (__v8si)
 @@ -5887,110 +5887,94 @@ _mm256_maskz_permutevar_ps(__mmask8 __U, __m256 __A, __m256i __C) {
                                           (__v8sf)_mm256_setzero_ps());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_test_epi32_mask (__m128i __A, __m128i __B)
+_mm_test_epi32_mask(__m128i __A, __m128i __B) {
-{
   return _mm_cmpneq_epi32_mask (_mm_and_si128 (__A, __B), _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_test_epi32_mask (__mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_test_epi32_mask(__mmask8 __U, __m128i __A, __m128i __B) {
-{
   return _mm_mask_cmpneq_epi32_mask (__U, _mm_and_si128 (__A, __B),
                                      _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_test_epi32_mask (__m256i __A, __m256i __B)
+_mm256_test_epi32_mask(__m256i __A, __m256i __B) {
-{
   return _mm256_cmpneq_epi32_mask (_mm256_and_si256 (__A, __B),
                                    _mm256_setzero_si256());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_test_epi32_mask (__mmask8 __U, __m256i __A, __m256i __B)
+_mm256_mask_test_epi32_mask(__mmask8 __U, __m256i __A, __m256i __B) {
-{
   return _mm256_mask_cmpneq_epi32_mask (__U, _mm256_and_si256 (__A, __B),
                                         _mm256_setzero_si256());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_test_epi64_mask (__m128i __A, __m128i __B)
+_mm_test_epi64_mask(__m128i __A, __m128i __B) {
-{
   return _mm_cmpneq_epi64_mask (_mm_and_si128 (__A, __B), _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_test_epi64_mask (__mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_test_epi64_mask(__mmask8 __U, __m128i __A, __m128i __B) {
-{
   return _mm_mask_cmpneq_epi64_mask (__U, _mm_and_si128 (__A, __B),
                                      _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_test_epi64_mask (__m256i __A, __m256i __B)
+_mm256_test_epi64_mask(__m256i __A, __m256i __B) {
-{
   return _mm256_cmpneq_epi64_mask (_mm256_and_si256 (__A, __B),
                                    _mm256_setzero_si256());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_test_epi64_mask (__mmask8 __U, __m256i __A, __m256i __B)
+_mm256_mask_test_epi64_mask(__mmask8 __U, __m256i __A, __m256i __B) {
-{
   return _mm256_mask_cmpneq_epi64_mask (__U, _mm256_and_si256 (__A, __B),
                                         _mm256_setzero_si256());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_testn_epi32_mask (__m128i __A, __m128i __B)
+_mm_testn_epi32_mask(__m128i __A, __m128i __B) {
-{
   return _mm_cmpeq_epi32_mask (_mm_and_si128 (__A, __B), _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_testn_epi32_mask (__mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_testn_epi32_mask(__mmask8 __U, __m128i __A, __m128i __B) {
-{
   return _mm_mask_cmpeq_epi32_mask (__U, _mm_and_si128 (__A, __B),
                                     _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_testn_epi32_mask (__m256i __A, __m256i __B)
+_mm256_testn_epi32_mask(__m256i __A, __m256i __B) {
-{
   return _mm256_cmpeq_epi32_mask (_mm256_and_si256 (__A, __B),
                                   _mm256_setzero_si256());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_testn_epi32_mask (__mmask8 __U, __m256i __A, __m256i __B)
+_mm256_mask_testn_epi32_mask(__mmask8 __U, __m256i __A, __m256i __B) {
-{
   return _mm256_mask_cmpeq_epi32_mask (__U, _mm256_and_si256 (__A, __B),
                                        _mm256_setzero_si256());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_testn_epi64_mask (__m128i __A, __m128i __B)
+_mm_testn_epi64_mask(__m128i __A, __m128i __B) {
-{
   return _mm_cmpeq_epi64_mask (_mm_and_si128 (__A, __B), _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS128
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_testn_epi64_mask (__mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_testn_epi64_mask(__mmask8 __U, __m128i __A, __m128i __B) {
-{
   return _mm_mask_cmpeq_epi64_mask (__U, _mm_and_si128 (__A, __B),
                                     _mm_setzero_si128());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_testn_epi64_mask (__m256i __A, __m256i __B)
+_mm256_testn_epi64_mask(__m256i __A, __m256i __B) {
-{
   return _mm256_cmpeq_epi64_mask (_mm256_and_si256 (__A, __B),
                                   _mm256_setzero_si256());
 }
-static __inline__ __mmask8 __DEFAULT_FN_ATTRS256
+static __inline__ __mmask8 __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_testn_epi64_mask (__mmask8 __U, __m256i __A, __m256i __B)
+_mm256_mask_testn_epi64_mask(__mmask8 __U, __m256i __A, __m256i __B) {
-{
   return _mm256_mask_cmpeq_epi64_mask (__U, _mm256_and_si256 (__A, __B),
                                        _mm256_setzero_si256());
 }

lib/include/avx512vlvbmi2intrin.h+24-32

 @@ -32,33 +32,29 @@
 #define __DEFAULT_FN_ATTRS256_CONSTEXPR __DEFAULT_FN_ATTRS256
 #endif
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_compress_epi16(__m128i __S, __mmask8 __U, __m128i __D)
+_mm_mask_compress_epi16(__m128i __S, __mmask8 __U, __m128i __D) {
-{
   return (__m128i) __builtin_ia32_compresshi128_mask ((__v8hi) __D,
               (__v8hi) __S,
               __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_maskz_compress_epi16(__mmask8 __U, __m128i __D)
+_mm_maskz_compress_epi16(__mmask8 __U, __m128i __D) {
-{
   return (__m128i) __builtin_ia32_compresshi128_mask ((__v8hi) __D,
               (__v8hi) _mm_setzero_si128(),
               __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_mask_compress_epi8(__m128i __S, __mmask16 __U, __m128i __D)
+_mm_mask_compress_epi8(__m128i __S, __mmask16 __U, __m128i __D) {
-{
   return (__m128i) __builtin_ia32_compressqi128_mask ((__v16qi) __D,
               (__v16qi) __S,
               __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
-_mm_maskz_compress_epi8(__mmask16 __U, __m128i __D)
+_mm_maskz_compress_epi8(__mmask16 __U, __m128i __D) {
-{
   return (__m128i) __builtin_ia32_compressqi128_mask ((__v16qi) __D,
               (__v16qi) _mm_setzero_si128(),
               __U);
 @@ -78,7 +74,7 @@ _mm_mask_compressstoreu_epi8(void *__P, __mmask16 __U, __m128i __D)
               __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_mask_expand_epi16(__m128i __S, __mmask8 __U, __m128i __D)
 {
   return (__m128i) __builtin_ia32_expandhi128_mask ((__v8hi) __D,
 @@ -86,7 +82,7 @@ _mm_mask_expand_epi16(__m128i __S, __mmask8 __U, __m128i __D)
               __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_maskz_expand_epi16(__mmask8 __U, __m128i __D)
 {
   return (__m128i) __builtin_ia32_expandhi128_mask ((__v8hi) __D,
 @@ -94,7 +90,7 @@ _mm_maskz_expand_epi16(__mmask8 __U, __m128i __D)
               __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_mask_expand_epi8(__m128i __S, __mmask16 __U, __m128i __D)
 {
   return (__m128i) __builtin_ia32_expandqi128_mask ((__v16qi) __D,
 @@ -102,7 +98,7 @@ _mm_mask_expand_epi8(__m128i __S, __mmask16 __U, __m128i __D)
               __U);
 }
-static __inline__ __m128i __DEFAULT_FN_ATTRS128
+static __inline__ __m128i __DEFAULT_FN_ATTRS128_CONSTEXPR
 _mm_maskz_expand_epi8(__mmask16 __U, __m128i __D)
 {
   return (__m128i) __builtin_ia32_expandqi128_mask ((__v16qi) __D,
 @@ -142,33 +138,29 @@ _mm_maskz_expandloadu_epi8(__mmask16 __U, void const *__P)
               __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_compress_epi16(__m256i __S, __mmask16 __U, __m256i __D)
+_mm256_mask_compress_epi16(__m256i __S, __mmask16 __U, __m256i __D) {
-{
   return (__m256i) __builtin_ia32_compresshi256_mask ((__v16hi) __D,
               (__v16hi) __S,
               __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_maskz_compress_epi16(__mmask16 __U, __m256i __D)
+_mm256_maskz_compress_epi16(__mmask16 __U, __m256i __D) {
-{
   return (__m256i) __builtin_ia32_compresshi256_mask ((__v16hi) __D,
               (__v16hi) _mm256_setzero_si256(),
               __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_mask_compress_epi8(__m256i __S, __mmask32 __U, __m256i __D)
+_mm256_mask_compress_epi8(__m256i __S, __mmask32 __U, __m256i __D) {
-{
   return (__m256i) __builtin_ia32_compressqi256_mask ((__v32qi) __D,
               (__v32qi) __S,
               __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
-_mm256_maskz_compress_epi8(__mmask32 __U, __m256i __D)
+_mm256_maskz_compress_epi8(__mmask32 __U, __m256i __D) {
-{
   return (__m256i) __builtin_ia32_compressqi256_mask ((__v32qi) __D,
               (__v32qi) _mm256_setzero_si256(),
               __U);
 @@ -188,7 +180,7 @@ _mm256_mask_compressstoreu_epi8(void *__P, __mmask32 __U, __m256i __D)
               __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_mask_expand_epi16(__m256i __S, __mmask16 __U, __m256i __D)
 {
   return (__m256i) __builtin_ia32_expandhi256_mask ((__v16hi) __D,
 @@ -196,7 +188,7 @@ _mm256_mask_expand_epi16(__m256i __S, __mmask16 __U, __m256i __D)
               __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_maskz_expand_epi16(__mmask16 __U, __m256i __D)
 {
   return (__m256i) __builtin_ia32_expandhi256_mask ((__v16hi) __D,
 @@ -204,7 +196,7 @@ _mm256_maskz_expand_epi16(__mmask16 __U, __m256i __D)
               __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_mask_expand_epi8(__m256i __S, __mmask32 __U, __m256i __D)
 {
   return (__m256i) __builtin_ia32_expandqi256_mask ((__v32qi) __D,
 @@ -212,7 +204,7 @@ _mm256_mask_expand_epi8(__m256i __S, __mmask32 __U, __m256i __D)
               __U);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
 _mm256_maskz_expand_epi8(__mmask32 __U, __m256i __D)
 {
   return (__m256i) __builtin_ia32_expandqi256_mask ((__v32qi) __D,

lib/include/avx512vlvnniintrin.h+29-34

 @@ -15,6 +15,16 @@
 #define __AVX512VLVNNIINTRIN_H
 /* Define the default attributes for the functions in this file. */
+#if defined(__cplusplus) && (__cplusplus >= 201103L)
+#define __DEFAULT_FN_ATTRS128                                                  \
+  __attribute__((__always_inline__, __nodebug__,                               \
+                 __target__("avx512vl,avx512vnni"),                            \
+                 __min_vector_width__(128))) constexpr
+#define __DEFAULT_FN_ATTRS256                                                  \
+  __attribute__((__always_inline__, __nodebug__,                               \
+                 __target__("avx512vl,avx512vnni"),                            \
+                 __min_vector_width__(256))) constexpr
+#else
 #define __DEFAULT_FN_ATTRS128                                                  \
   __attribute__((__always_inline__, __nodebug__,                               \
                  __target__("avx512vl,avx512vnni"),                            \
 @@ -23,6 +33,7 @@
   __attribute__((__always_inline__, __nodebug__,                               \
                  __target__("avx512vl,avx512vnni"),                            \
                  __min_vector_width__(256)))
+#endif
 /// Multiply groups of 4 adjacent pairs of unsigned 8-bit integers in \a A with
 /// corresponding signed 8-bit integers in \a B, producing 4 intermediate signed
 @@ -180,128 +191,112 @@
   ((__m128i)__builtin_ia32_vpdpwssds128((__v4si)(S), (__v8hi)(A), (__v8hi)(B)))
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_mask_dpbusd_epi32(__m256i __S, __mmask8 __U, __m256i __A, __m256i __B)
+_mm256_mask_dpbusd_epi32(__m256i __S, __mmask8 __U, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_selectd_256(__U,
                                      (__v8si)_mm256_dpbusd_epi32(__S, __A, __B),
                                      (__v8si)__S);
 }
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_maskz_dpbusd_epi32(__mmask8 __U, __m256i __S, __m256i __A, __m256i __B)
+_mm256_maskz_dpbusd_epi32(__mmask8 __U, __m256i __S, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_selectd_256(__U,
                                      (__v8si)_mm256_dpbusd_epi32(__S, __A, __B),
                                      (__v8si)_mm256_setzero_si256());
 }
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_mask_dpbusds_epi32(__m256i __S, __mmask8 __U, __m256i __A, __m256i __B)
+_mm256_mask_dpbusds_epi32(__m256i __S, __mmask8 __U, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_selectd_256(__U,
                                     (__v8si)_mm256_dpbusds_epi32(__S, __A, __B),
                                     (__v8si)__S);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256 _mm256_maskz_dpbusds_epi32(
-_mm256_maskz_dpbusds_epi32(__mmask8 __U, __m256i __S, __m256i __A, __m256i __B)
+    __mmask8 __U, __m256i __S, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_selectd_256(__U,
                                      (__v8si)_mm256_dpbusds_epi32(__S, __A, __B),
                                      (__v8si)_mm256_setzero_si256());
 }
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_mask_dpwssd_epi32(__m256i __S, __mmask8 __U, __m256i __A, __m256i __B)
+_mm256_mask_dpwssd_epi32(__m256i __S, __mmask8 __U, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_selectd_256(__U,
                                      (__v8si)_mm256_dpwssd_epi32(__S, __A, __B),
                                      (__v8si)__S);
 }
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_maskz_dpwssd_epi32(__mmask8 __U, __m256i __S, __m256i __A, __m256i __B)
+_mm256_maskz_dpwssd_epi32(__mmask8 __U, __m256i __S, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_selectd_256(__U,
                                      (__v8si)_mm256_dpwssd_epi32(__S, __A, __B),
                                      (__v8si)_mm256_setzero_si256());
 }
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_mask_dpwssds_epi32(__m256i __S, __mmask8 __U, __m256i __A, __m256i __B)
+_mm256_mask_dpwssds_epi32(__m256i __S, __mmask8 __U, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_selectd_256(__U,
                                     (__v8si)_mm256_dpwssds_epi32(__S, __A, __B),
                                     (__v8si)__S);
 }
-static __inline__ __m256i __DEFAULT_FN_ATTRS256
+static __inline__ __m256i __DEFAULT_FN_ATTRS256 _mm256_maskz_dpwssds_epi32(
-_mm256_maskz_dpwssds_epi32(__mmask8 __U, __m256i __S, __m256i __A, __m256i __B)
+    __mmask8 __U, __m256i __S, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_selectd_256(__U,
                                     (__v8si)_mm256_dpwssds_epi32(__S, __A, __B),
                                     (__v8si)_mm256_setzero_si256());
 }
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_mask_dpbusd_epi32(__m128i __S, __mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_dpbusd_epi32(__m128i __S, __mmask8 __U, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_selectd_128(__U,
                                         (__v4si)_mm_dpbusd_epi32(__S, __A, __B),
                                         (__v4si)__S);
 }
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_maskz_dpbusd_epi32(__mmask8 __U, __m128i __S, __m128i __A, __m128i __B)
+_mm_maskz_dpbusd_epi32(__mmask8 __U, __m128i __S, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_selectd_128(__U,
                                         (__v4si)_mm_dpbusd_epi32(__S, __A, __B),
                                         (__v4si)_mm_setzero_si128());
 }
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_mask_dpbusds_epi32(__m128i __S, __mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_dpbusds_epi32(__m128i __S, __mmask8 __U, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_selectd_128(__U,
                                        (__v4si)_mm_dpbusds_epi32(__S, __A, __B),
                                        (__v4si)__S);
 }
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_maskz_dpbusds_epi32(__mmask8 __U, __m128i __S, __m128i __A, __m128i __B)
+_mm_maskz_dpbusds_epi32(__mmask8 __U, __m128i __S, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_selectd_128(__U,
                                        (__v4si)_mm_dpbusds_epi32(__S, __A, __B),
                                        (__v4si)_mm_setzero_si128());
 }
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_mask_dpwssd_epi32(__m128i __S, __mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_dpwssd_epi32(__m128i __S, __mmask8 __U, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_selectd_128(__U,
                                         (__v4si)_mm_dpwssd_epi32(__S, __A, __B),
                                         (__v4si)__S);
 }
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_maskz_dpwssd_epi32(__mmask8 __U, __m128i __S, __m128i __A, __m128i __B)
+_mm_maskz_dpwssd_epi32(__mmask8 __U, __m128i __S, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_selectd_128(__U,
                                         (__v4si)_mm_dpwssd_epi32(__S, __A, __B),
                                         (__v4si)_mm_setzero_si128());
 }
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_mask_dpwssds_epi32(__m128i __S, __mmask8 __U, __m128i __A, __m128i __B)
+_mm_mask_dpwssds_epi32(__m128i __S, __mmask8 __U, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_selectd_128(__U,
                                        (__v4si)_mm_dpwssds_epi32(__S, __A, __B),
                                        (__v4si)__S);
 }
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_maskz_dpwssds_epi32(__mmask8 __U, __m128i __S, __m128i __A, __m128i __B)
+_mm_maskz_dpwssds_epi32(__mmask8 __U, __m128i __S, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_selectd_128(__U,
                                        (__v4si)_mm_dpwssds_epi32(__S, __A, __B),
                                        (__v4si)_mm_setzero_si128());

lib/include/avx512vnniintrin.h+32-35

 @@ -15,102 +15,99 @@
 #define __AVX512VNNIINTRIN_H
 /* Define the default attributes for the functions in this file. */
+#if defined(__cplusplus) && (__cplusplus >= 201103L)
+#define __DEFAULT_FN_ATTRS                                                     \
+  __attribute__((__always_inline__, __nodebug__, __target__("avx512vnni"),     \
+                 __min_vector_width__(512))) constexpr
+#else
 #define __DEFAULT_FN_ATTRS                                                     \
   __attribute__((__always_inline__, __nodebug__, __target__("avx512vnni"),     \
                  __min_vector_width__(512)))
+#endif
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_dpbusd_epi32(__m512i __S,
-_mm512_dpbusd_epi32(__m512i __S, __m512i __A, __m512i __B)
+                                                                 __m512i __A,
-{
+                                                                 __m512i __B) {
   return (__m512i)__builtin_ia32_vpdpbusd512((__v16si)__S, (__v64qu)__A,
                                              (__v64qi)__B);
 }
 static __inline__ __m512i __DEFAULT_FN_ATTRS
-_mm512_mask_dpbusd_epi32(__m512i __S, __mmask16 __U, __m512i __A, __m512i __B)
+_mm512_mask_dpbusd_epi32(__m512i __S, __mmask16 __U, __m512i __A, __m512i __B) {
-{
   return (__m512i)__builtin_ia32_selectd_512(__U,
                                     (__v16si)_mm512_dpbusd_epi32(__S, __A, __B),
                                     (__v16si)__S);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_maskz_dpbusd_epi32(
-_mm512_maskz_dpbusd_epi32(__mmask16 __U, __m512i __S, __m512i __A, __m512i __B)
+    __mmask16 __U, __m512i __S, __m512i __A, __m512i __B) {
-{
   return (__m512i)__builtin_ia32_selectd_512(__U,
                                     (__v16si)_mm512_dpbusd_epi32(__S, __A, __B),
                                     (__v16si)_mm512_setzero_si512());
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_dpbusds_epi32(__m512i __S,
-_mm512_dpbusds_epi32(__m512i __S, __m512i __A, __m512i __B)
+                                                                  __m512i __A,
-{
+                                                                  __m512i __B) {
   return (__m512i)__builtin_ia32_vpdpbusds512((__v16si)__S, (__v64qu)__A,
                                               (__v64qi)__B);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_mask_dpbusds_epi32(
-_mm512_mask_dpbusds_epi32(__m512i __S, __mmask16 __U, __m512i __A, __m512i __B)
+    __m512i __S, __mmask16 __U, __m512i __A, __m512i __B) {
-{
   return (__m512i)__builtin_ia32_selectd_512(__U,
                                    (__v16si)_mm512_dpbusds_epi32(__S, __A, __B),
                                    (__v16si)__S);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_maskz_dpbusds_epi32(
-_mm512_maskz_dpbusds_epi32(__mmask16 __U, __m512i __S, __m512i __A, __m512i __B)
+    __mmask16 __U, __m512i __S, __m512i __A, __m512i __B) {
-{
   return (__m512i)__builtin_ia32_selectd_512(__U,
                                    (__v16si)_mm512_dpbusds_epi32(__S, __A, __B),
                                    (__v16si)_mm512_setzero_si512());
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_dpwssd_epi32(__m512i __S,
-_mm512_dpwssd_epi32(__m512i __S, __m512i __A, __m512i __B)
+                                                                 __m512i __A,
-{
+                                                                 __m512i __B) {
   return (__m512i)__builtin_ia32_vpdpwssd512((__v16si)__S, (__v32hi)__A,
                                              (__v32hi)__B);
 }
 static __inline__ __m512i __DEFAULT_FN_ATTRS
-_mm512_mask_dpwssd_epi32(__m512i __S, __mmask16 __U, __m512i __A, __m512i __B)
+_mm512_mask_dpwssd_epi32(__m512i __S, __mmask16 __U, __m512i __A, __m512i __B) {
-{
   return (__m512i)__builtin_ia32_selectd_512(__U,
                                     (__v16si)_mm512_dpwssd_epi32(__S, __A, __B),
                                     (__v16si)__S);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_maskz_dpwssd_epi32(
-_mm512_maskz_dpwssd_epi32(__mmask16 __U, __m512i __S, __m512i __A, __m512i __B)
+    __mmask16 __U, __m512i __S, __m512i __A, __m512i __B) {
-{
   return (__m512i)__builtin_ia32_selectd_512(__U,
                                     (__v16si)_mm512_dpwssd_epi32(__S, __A, __B),
                                     (__v16si)_mm512_setzero_si512());
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_dpwssds_epi32(__m512i __S,
-_mm512_dpwssds_epi32(__m512i __S, __m512i __A, __m512i __B)
+                                                                  __m512i __A,
-{
+                                                                  __m512i __B) {
   return (__m512i)__builtin_ia32_vpdpwssds512((__v16si)__S, (__v32hi)__A,
                                               (__v32hi)__B);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_mask_dpwssds_epi32(
-_mm512_mask_dpwssds_epi32(__m512i __S, __mmask16 __U, __m512i __A, __m512i __B)
+    __m512i __S, __mmask16 __U, __m512i __A, __m512i __B) {
-{
   return (__m512i)__builtin_ia32_selectd_512(__U,
                                    (__v16si)_mm512_dpwssds_epi32(__S, __A, __B),
                                    (__v16si)__S);
 }
-static __inline__ __m512i __DEFAULT_FN_ATTRS
+static __inline__ __m512i __DEFAULT_FN_ATTRS _mm512_maskz_dpwssds_epi32(
-_mm512_maskz_dpwssds_epi32(__mmask16 __U, __m512i __S, __m512i __A, __m512i __B)
+    __mmask16 __U, __m512i __S, __m512i __A, __m512i __B) {
-{
   return (__m512i)__builtin_ia32_selectd_512(__U,
                                    (__v16si)_mm512_dpwssds_epi32(__S, __A, __B),
                                    (__v16si)_mm512_setzero_si512());
 }
 #undef __DEFAULT_FN_ATTRS
 #endif

lib/include/avx512vp2intersectintrin.h+1-1

...	@@ -22,7 +22,7 @@	...	@@ -22,7 +22,7 @@
22	*===-----------------------------------------------------------------------===	22	*===-----------------------------------------------------------------------===
23	*/	23	*/
24	#ifndef __IMMINTRIN_H	24	#ifndef __IMMINTRIN_H
25	#error "Never use <avx512vp2intersect.h> directly; include <immintrin.h> instead."	25	#error "Never use <avx512vp2intersectintrin.h> directly; include <immintrin.h> instead."
26	#endif	26	#endif
27		27
28	#ifndef _AVX512VP2INTERSECT_H	28	#ifndef _AVX512VP2INTERSECT_H

lib/include/avxvnniintrin.h+23-18

 @@ -40,8 +40,21 @@
 /* Intrinsics with _avx_ prefix are for compatibility with msvc. */
 /* Define the default attributes for the functions in this file. */
-#define __DEFAULT_FN_ATTRS256 __attribute__((__always_inline__, __nodebug__, __target__("avxvnni"), __min_vector_width__(256)))
+#if defined(__cplusplus) && (__cplusplus >= 201103L)
-#define __DEFAULT_FN_ATTRS128 __attribute__((__always_inline__, __nodebug__, __target__("avxvnni"), __min_vector_width__(128)))
+#define __DEFAULT_FN_ATTRS256                                                  \
+  __attribute__((__always_inline__, __nodebug__, __target__("avxvnni"),        \
+                 __min_vector_width__(256))) constexpr
+#define __DEFAULT_FN_ATTRS128                                                  \
+  __attribute__((__always_inline__, __nodebug__, __target__("avxvnni"),        \
+                 __min_vector_width__(128))) constexpr
+#else
+#define __DEFAULT_FN_ATTRS256                                                  \
+  __attribute__((__always_inline__, __nodebug__, __target__("avxvnni"),        \
+                 __min_vector_width__(256)))
+#define __DEFAULT_FN_ATTRS128                                                  \
+  __attribute__((__always_inline__, __nodebug__, __target__("avxvnni"),        \
+                 __min_vector_width__(128)))
+#endif
 /// Multiply groups of 4 adjacent pairs of unsigned 8-bit integers in \a __A with
 /// corresponding signed 8-bit integers in \a __B, producing 4 intermediate signed
 @@ -61,8 +74,7 @@
 ///    DST[MAX:256] := 0
 /// \endcode
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_dpbusd_avx_epi32(__m256i __S, __m256i __A, __m256i __B)
+_mm256_dpbusd_avx_epi32(__m256i __S, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_vpdpbusd256((__v8si)__S, (__v32qu)__A,
                                              (__v32qi)__B);
 }
 @@ -85,8 +97,7 @@ _mm256_dpbusd_avx_epi32(__m256i __S, __m256i __A, __m256i __B)
 ///    DST[MAX:256] := 0
 /// \endcode
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_dpbusds_avx_epi32(__m256i __S, __m256i __A, __m256i __B)
+_mm256_dpbusds_avx_epi32(__m256i __S, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_vpdpbusds256((__v8si)__S, (__v32qu)__A,
                                               (__v32qi)__B);
 }
 @@ -107,8 +118,7 @@ _mm256_dpbusds_avx_epi32(__m256i __S, __m256i __A, __m256i __B)
 ///    DST[MAX:256] := 0
 /// \endcode
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_dpwssd_avx_epi32(__m256i __S, __m256i __A, __m256i __B)
+_mm256_dpwssd_avx_epi32(__m256i __S, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_vpdpwssd256((__v8si)__S, (__v16hi)__A,
                                              (__v16hi)__B);
 }
 @@ -129,8 +139,7 @@ _mm256_dpwssd_avx_epi32(__m256i __S, __m256i __A, __m256i __B)
 ///    DST[MAX:256] := 0
 /// \endcode
 static __inline__ __m256i __DEFAULT_FN_ATTRS256
-_mm256_dpwssds_avx_epi32(__m256i __S, __m256i __A, __m256i __B)
+_mm256_dpwssds_avx_epi32(__m256i __S, __m256i __A, __m256i __B) {
-{
   return (__m256i)__builtin_ia32_vpdpwssds256((__v8si)__S, (__v16hi)__A,
                                               (__v16hi)__B);
 }
 @@ -153,8 +162,7 @@ _mm256_dpwssds_avx_epi32(__m256i __S, __m256i __A, __m256i __B)
 ///    DST[MAX:128] := 0
 /// \endcode
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_dpbusd_avx_epi32(__m128i __S, __m128i __A, __m128i __B)
+_mm_dpbusd_avx_epi32(__m128i __S, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_vpdpbusd128((__v4si)__S, (__v16qu)__A,
                                              (__v16qi)__B);
 }
 @@ -177,8 +185,7 @@ _mm_dpbusd_avx_epi32(__m128i __S, __m128i __A, __m128i __B)
 ///    DST[MAX:128] := 0
 /// \endcode
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_dpbusds_avx_epi32(__m128i __S, __m128i __A, __m128i __B)
+_mm_dpbusds_avx_epi32(__m128i __S, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_vpdpbusds128((__v4si)__S, (__v16qu)__A,
                                               (__v16qi)__B);
 }
 @@ -199,8 +206,7 @@ _mm_dpbusds_avx_epi32(__m128i __S, __m128i __A, __m128i __B)
 ///    DST[MAX:128] := 0
 /// \endcode
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_dpwssd_avx_epi32(__m128i __S, __m128i __A, __m128i __B)
+_mm_dpwssd_avx_epi32(__m128i __S, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_vpdpwssd128((__v4si)__S, (__v8hi)__A,
                                              (__v8hi)__B);
 }
 @@ -221,8 +227,7 @@ _mm_dpwssd_avx_epi32(__m128i __S, __m128i __A, __m128i __B)
 ///    DST[MAX:128] := 0
 /// \endcode
 static __inline__ __m128i __DEFAULT_FN_ATTRS128
-_mm_dpwssds_avx_epi32(__m128i __S, __m128i __A, __m128i __B)
+_mm_dpwssds_avx_epi32(__m128i __S, __m128i __A, __m128i __B) {
-{
   return (__m128i)__builtin_ia32_vpdpwssds128((__v4si)__S, (__v8hi)__A,
                                               (__v8hi)__B);
 }

lib/include/crc32intrin.h+10-8

 @@ -10,8 +10,14 @@
 #ifndef __CRC32INTRIN_H
 #define __CRC32INTRIN_H
+/// We only declare crc32 as a constexpr if we are compiling C++ code
+#if defined(__cplusplus) && (__cplusplus >= 201103L)
+#define __DEFAULT_FN_ATTRS                                                     \
+  __attribute__((__always_inline__, __nodebug__, __target__("crc32"))) constexpr
+#else
 #define __DEFAULT_FN_ATTRS                                                     \
   __attribute__((__always_inline__, __nodebug__, __target__("crc32")))
+#endif
 /// Adds the unsigned integer operand to the CRC-32C checksum of the
 ///    unsigned char operand.
 @@ -28,8 +34,7 @@
 /// \returns The result of adding operand \a __C to the CRC-32C checksum of
 ///    operand \a __D.
 static __inline__ unsigned int __DEFAULT_FN_ATTRS
-_mm_crc32_u8(unsigned int __C, unsigned char __D)
+_mm_crc32_u8(unsigned int __C, unsigned char __D) {
-{
   return __builtin_ia32_crc32qi(__C, __D);
 }
 @@ -48,8 +53,7 @@ _mm_crc32_u8(unsigned int __C, unsigned char __D)
 /// \returns The result of adding operand \a __C to the CRC-32C checksum of
 ///    operand \a __D.
 static __inline__ unsigned int __DEFAULT_FN_ATTRS
-_mm_crc32_u16(unsigned int __C, unsigned short __D)
+_mm_crc32_u16(unsigned int __C, unsigned short __D) {
-{
   return __builtin_ia32_crc32hi(__C, __D);
 }
 @@ -68,8 +72,7 @@ _mm_crc32_u16(unsigned int __C, unsigned short __D)
 /// \returns The result of adding operand \a __C to the CRC-32C checksum of
 ///    operand \a __D.
 static __inline__ unsigned int __DEFAULT_FN_ATTRS
-_mm_crc32_u32(unsigned int __C, unsigned int __D)
+_mm_crc32_u32(unsigned int __C, unsigned int __D) {
-{
   return __builtin_ia32_crc32si(__C, __D);
 }
 @@ -89,8 +92,7 @@ _mm_crc32_u32(unsigned int __C, unsigned int __D)
 /// \returns The result of adding operand \a __C to the CRC-32C checksum of
 ///    operand \a __D.
 static __inline__ unsigned long long __DEFAULT_FN_ATTRS
-_mm_crc32_u64(unsigned long long __C, unsigned long long __D)
+_mm_crc32_u64(unsigned long long __C, unsigned long long __D) {
-{
   return __builtin_ia32_crc32di(__C, __D);
 }
 #endif /* __x86_64__ */

lib/include/emmintrin.h+8-8

lib/include/endian.h created+91

...	@@ -0,0 +1,91 @@
1	//===-- Definition of macros from endian.h --------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef __CLANG_ENDIAN_H
10	#define __CLANG_ENDIAN_H
11
12	// If the system has an endian.h, let's use that instead.
13	#if __has_include_next(<endian.h>)
14	#include_next <endian.h>
15	#else
16
17	#include <stdint.h>
18
19	// Implementation taken from llvm libc endian-macros.h.
20	#ifdef __cplusplus
21	#define __CLANG_ENDIAN_CAST(cast, type, value) (cast<type>(value))
22	#else
23	#define __CLANG_ENDIAN_CAST(cast, type, value) ((type)(value))
24	#endif
25
26	#define LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__
27	#define BIG_ENDIAN __ORDER_BIG_ENDIAN__
28	#define PDP_ENDIAN __ORDER_PDP_ENDIAN__
29	#define BYTE_ORDER __BYTE_ORDER__
30
31	// Define some compatibility macros if they are not defined.
32	#ifndef __BYTE_ORDER
33	#define __BYTE_ORDER BYTE_ORDER
34	#endif
35	#ifndef __LITTLE_ENDIAN
36	#define __LITTLE_ENDIAN LITTLE_ENDIAN
37	#endif
38	#ifndef __BIG_ENDIAN
39	#define __BIG_ENDIAN BIG_ENDIAN
40	#endif
41	#ifndef __PDP_ENDIAN
42	#define __PDP_ENDIAN PDP_ENDIAN
43	#endif
44
45	#if BYTE_ORDER == LITTLE_ENDIAN
46
47	#define htobe16(x) \
48	__builtin_bswap16(__CLANG_ENDIAN_CAST(static_cast, uint16_t, x))
49	#define htobe32(x) \
50	__builtin_bswap32(__CLANG_ENDIAN_CAST(static_cast, uint32_t, x))
51	#define htobe64(x) \
52	__builtin_bswap64(__CLANG_ENDIAN_CAST(static_cast, uint64_t, x))
53	#define htole16(x) __CLANG_ENDIAN_CAST(static_cast, uint16_t, x)
54	#define htole32(x) __CLANG_ENDIAN_CAST(static_cast, uint32_t, x)
55	#define htole64(x) __CLANG_ENDIAN_CAST(static_cast, uint64_t, x)
56	#define be16toh(x) \
57	__builtin_bswap16(__CLANG_ENDIAN_CAST(static_cast, uint16_t, x))
58	#define be32toh(x) \
59	__builtin_bswap32(__CLANG_ENDIAN_CAST(static_cast, uint32_t, x))
60	#define be64toh(x) \
61	__builtin_bswap64(__CLANG_ENDIAN_CAST(static_cast, uint64_t, x))
62	#define le16toh(x) __CLANG_ENDIAN_CAST(static_cast, uint16_t, x)
63	#define le32toh(x) __CLANG_ENDIAN_CAST(static_cast, uint32_t, x)
64	#define le64toh(x) __CLANG_ENDIAN_CAST(static_cast, uint64_t, x)
65
66	#elif BYTE_ORDER == BIG_ENDIAN
67
68	#define htobe16(x) __CLANG_ENDIAN_CAST(static_cast, uint16_t, x)
69	#define htobe32(x) __CLANG_ENDIAN_CAST(static_cast, uint32_t, x)
70	#define htobe64(x) __CLANG_ENDIAN_CAST(static_cast, uint64_t, x)
71	#define htole16(x) \
72	__builtin_bswap16(__CLANG_ENDIAN_CAST(static_cast, uint16_t, x))
73	#define htole32(x) \
74	__builtin_bswap32(__CLANG_ENDIAN_CAST(static_cast, uint32_t, x))
75	#define htole64(x) \
76	__builtin_bswap64(__CLANG_ENDIAN_CAST(static_cast, uint64_t, x))
77	#define be16toh(x) __CLANG_ENDIAN_CAST(static_cast, uint16_t, x)
78	#define be32toh(x) __CLANG_ENDIAN_CAST(static_cast, uint32_t, x)
79	#define be64toh(x) __CLANG_ENDIAN_CAST(static_cast, uint64_t, x)
80	#define le16toh(x) \
81	__builtin_bswap16(__CLANG_ENDIAN_CAST(static_cast, uint16_t, x))
82	#define le32toh(x) \
83	__builtin_bswap32(__CLANG_ENDIAN_CAST(static_cast, uint32_t, x))
84	#define le64toh(x) \
85	__builtin_bswap64(__CLANG_ENDIAN_CAST(static_cast, uint64_t, x))
86
87	#else
88	#error "Unsupported endianness"
89	#endif
90	#endif // __has_include_next
91	#endif // __CLANG_ENDIAN_H

lib/include/hvx_hexagon_protos.h+102-80

 @@ -4577,8 +4577,9 @@
 #if __HVX_ARCH__ >= 73 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vdd32.sf=vadd(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_VectorPair Q6_Wsf_vadd_VbfVbf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_VectorPair Q6_Wsf_vadd_VbfVbf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX_DV Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX_DV
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Wsf_vadd_VbfVbf(Vu, Vv)                                             \
 @@ -4636,8 +4637,9 @@
 #if __HVX_ARCH__ >= 73 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vd32.bf=vcvt(Vu32.sf,Vv32.sf)
-   C Intrinsic Prototype: HVX_Vector Q6_Vbf_vcvt_VsfVsf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_Vector Q6_Vbf_vcvt_VsfVsf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Vbf_vcvt_VsfVsf(Vu, Vv)                                             \
 @@ -4647,8 +4649,9 @@
 #if __HVX_ARCH__ >= 73
 /* ==========================================================================
    Assembly Syntax:       Qd4=vcmp.gt(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_gt_VbfVbf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_gt_VbfVbf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VA Execution Slots:       SLOT0123
+   Instruction Type:      CVI_VA
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_gt_VbfVbf(Vu, Vv)                                            \
 @@ -4659,9 +4662,9 @@
 #if __HVX_ARCH__ >= 73
 /* ==========================================================================
    Assembly Syntax:       Qx4&=vcmp.gt(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_gtand_QVbfVbf(HVX_VectorPred
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_gtand_QVbfVbf(HVX_VectorPred Qx, HVX_Vector Vu, HVX_Vector Vv)
-   Qx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VA Execution
+   Instruction Type:      CVI_VA
-   Slots:       SLOT0123
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_gtand_QVbfVbf(Qx, Vu, Vv)                                    \
 @@ -4675,9 +4678,9 @@
 #if __HVX_ARCH__ >= 73
 /* ==========================================================================
    Assembly Syntax:       Qx4|=vcmp.gt(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_gtor_QVbfVbf(HVX_VectorPred
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_gtor_QVbfVbf(HVX_VectorPred Qx, HVX_Vector Vu, HVX_Vector Vv)
-   Qx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VA Execution
+   Instruction Type:      CVI_VA
-   Slots:       SLOT0123
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_gtor_QVbfVbf(Qx, Vu, Vv)                                     \
 @@ -4691,9 +4694,9 @@
 #if __HVX_ARCH__ >= 73
 /* ==========================================================================
    Assembly Syntax:       Qx4^=vcmp.gt(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_gtxacc_QVbfVbf(HVX_VectorPred
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_gtxacc_QVbfVbf(HVX_VectorPred Qx, HVX_Vector Vu, HVX_Vector Vv)
-   Qx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VA Execution
+   Instruction Type:      CVI_VA
-   Slots:       SLOT0123
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_gtxacc_QVbfVbf(Qx, Vu, Vv)                                   \
 @@ -4707,8 +4710,9 @@
 #if __HVX_ARCH__ >= 73 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vd32.bf=vmax(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_Vector Q6_Vbf_vmax_VbfVbf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_Vector Q6_Vbf_vmax_VbfVbf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX_LATE Execution Slots: SLOT23
+   Instruction Type:      CVI_VX_LATE
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Vbf_vmax_VbfVbf(Vu, Vv)                                             \
 @@ -4718,8 +4722,9 @@
 #if __HVX_ARCH__ >= 73 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vd32.bf=vmin(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_Vector Q6_Vbf_vmin_VbfVbf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_Vector Q6_Vbf_vmin_VbfVbf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX_LATE Execution Slots: SLOT23
+   Instruction Type:      CVI_VX_LATE
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Vbf_vmin_VbfVbf(Vu, Vv)                                             \
 @@ -4729,8 +4734,9 @@
 #if __HVX_ARCH__ >= 73 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vdd32.sf=vmpy(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_VectorPair Q6_Wsf_vmpy_VbfVbf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_VectorPair Q6_Wsf_vmpy_VbfVbf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX_DV Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX_DV
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Wsf_vmpy_VbfVbf(Vu, Vv)                                             \
 @@ -4740,9 +4746,9 @@
 #if __HVX_ARCH__ >= 73 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vxx32.sf+=vmpy(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_VectorPair Q6_Wsf_vmpyacc_WsfVbfVbf(HVX_VectorPair
+   C Intrinsic Prototype: HVX_VectorPair Q6_Wsf_vmpyacc_WsfVbfVbf(HVX_VectorPair Vxx, HVX_Vector Vu, HVX_Vector Vv)
-   Vxx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VX_DV Execution
+   Instruction Type:      CVI_VX_DV
-   Slots:       SLOT23
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Wsf_vmpyacc_WsfVbfVbf(Vxx, Vu, Vv)                                  \
 @@ -4752,8 +4758,9 @@
 #if __HVX_ARCH__ >= 73 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vdd32.sf=vsub(Vu32.bf,Vv32.bf)
-   C Intrinsic Prototype: HVX_VectorPair Q6_Wsf_vsub_VbfVbf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_VectorPair Q6_Wsf_vsub_VbfVbf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX_DV Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX_DV
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Wsf_vsub_VbfVbf(Vu, Vv)                                             \
 @@ -4775,9 +4782,9 @@
 #if __HVX_ARCH__ >= 79
 /* ==========================================================================
    Assembly Syntax:       Vx32|=vgetqfext(Vu32.x,Rt32)
-   C Intrinsic Prototype: HVX_Vector Q6_V_vgetqfextor_VVR(HVX_Vector Vx,
+   C Intrinsic Prototype: HVX_Vector Q6_V_vgetqfextor_VVR(HVX_Vector Vx, HVX_Vector Vu, Word32 Rt)
-   HVX_Vector Vu, Word32 Rt) Instruction Type:      CVI_VX Execution Slots:
+   Instruction Type:      CVI_VX
-   SLOT23
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_V_vgetqfextor_VVR(Vx, Vu, Rt)                                       \
 @@ -4810,8 +4817,9 @@
 #if __HVX_ARCH__ >= 79 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vdd32.hf=vadd(Vu32.f8,Vv32.f8)
-   C Intrinsic Prototype: HVX_VectorPair Q6_Whf_vadd_VV(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_VectorPair Q6_Whf_vadd_VV(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX_DV Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX_DV
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Whf_vadd_VV(Vu, Vv)                                                 \
 @@ -4821,8 +4829,9 @@
 #if __HVX_ARCH__ >= 79 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vd32.b=vcvt2(Vu32.hf,Vv32.hf)
-   C Intrinsic Prototype: HVX_Vector Q6_Vb_vcvt2_VhfVhf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_Vector Q6_Vb_vcvt2_VhfVhf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Vb_vcvt2_VhfVhf(Vu, Vv)                                             \
 @@ -4856,8 +4865,9 @@
 #if __HVX_ARCH__ >= 79 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vd32.ub=vcvt2(Vu32.hf,Vv32.hf)
-   C Intrinsic Prototype: HVX_Vector Q6_Vub_vcvt2_VhfVhf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_Vector Q6_Vub_vcvt2_VhfVhf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Vub_vcvt2_VhfVhf(Vu, Vv)                                            \
 @@ -4867,8 +4877,9 @@
 #if __HVX_ARCH__ >= 79 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vd32.f8=vcvt(Vu32.hf,Vv32.hf)
-   C Intrinsic Prototype: HVX_Vector Q6_V_vcvt_VhfVhf(HVX_Vector Vu, HVX_Vector
+   C Intrinsic Prototype: HVX_Vector Q6_V_vcvt_VhfVhf(HVX_Vector Vu, HVX_Vector Vv)
-   Vv) Instruction Type:      CVI_VX Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_V_vcvt_VhfVhf(Vu, Vv)                                               \
 @@ -4926,8 +4937,9 @@
 #if __HVX_ARCH__ >= 79
 /* ==========================================================================
    Assembly Syntax:       Vd32=vmerge(Vu32.x,Vv32.w)
-   C Intrinsic Prototype: HVX_Vector Q6_V_vmerge_VVw(HVX_Vector Vu, HVX_Vector
+   C Intrinsic Prototype: HVX_Vector Q6_V_vmerge_VVw(HVX_Vector Vu, HVX_Vector Vv)
-   Vv) Instruction Type:      CVI_VS Execution Slots:       SLOT0123
+   Instruction Type:      CVI_VS
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_V_vmerge_VVw(Vu, Vv)                                                \
 @@ -4937,8 +4949,9 @@
 #if __HVX_ARCH__ >= 79 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vdd32.hf=vmpy(Vu32.f8,Vv32.f8)
-   C Intrinsic Prototype: HVX_VectorPair Q6_Whf_vmpy_VV(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_VectorPair Q6_Whf_vmpy_VV(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX_DV Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX_DV
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Whf_vmpy_VV(Vu, Vv)                                                 \
 @@ -4948,9 +4961,9 @@
 #if __HVX_ARCH__ >= 79 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vxx32.hf+=vmpy(Vu32.f8,Vv32.f8)
-   C Intrinsic Prototype: HVX_VectorPair Q6_Whf_vmpyacc_WhfVV(HVX_VectorPair
+   C Intrinsic Prototype: HVX_VectorPair Q6_Whf_vmpyacc_WhfVV(HVX_VectorPair Vxx, HVX_Vector Vu, HVX_Vector Vv)
-   Vxx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VX_DV Execution
+   Instruction Type:      CVI_VX_DV
-   Slots:       SLOT23
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Whf_vmpyacc_WhfVV(Vxx, Vu, Vv)                                      \
 @@ -4960,8 +4973,9 @@
 #if __HVX_ARCH__ >= 79
 /* ==========================================================================
    Assembly Syntax:       Vd32.qf16=vmpy(Vu32.hf,Rt32.hf)
-   C Intrinsic Prototype: HVX_Vector Q6_Vqf16_vmpy_VhfRhf(HVX_Vector Vu, Word32
+   C Intrinsic Prototype: HVX_Vector Q6_Vqf16_vmpy_VhfRhf(HVX_Vector Vu, Word32 Rt)
-   Rt) Instruction Type:      CVI_VX_DV Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX_DV
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Vqf16_vmpy_VhfRhf(Vu, Rt)                                           \
 @@ -4971,8 +4985,9 @@
 #if __HVX_ARCH__ >= 79
 /* ==========================================================================
    Assembly Syntax:       Vd32.qf16=vmpy(Vu32.qf16,Rt32.hf)
-   C Intrinsic Prototype: HVX_Vector Q6_Vqf16_vmpy_Vqf16Rhf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_Vector Q6_Vqf16_vmpy_Vqf16Rhf(HVX_Vector Vu, Word32 Rt)
-   Word32 Rt) Instruction Type:      CVI_VX_DV Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX_DV
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Vqf16_vmpy_Vqf16Rhf(Vu, Rt)                                         \
 @@ -4982,8 +4997,9 @@
 #if __HVX_ARCH__ >= 79
 /* ==========================================================================
    Assembly Syntax:       Vd32.qf32=vmpy(Vu32.sf,Rt32.sf)
-   C Intrinsic Prototype: HVX_Vector Q6_Vqf32_vmpy_VsfRsf(HVX_Vector Vu, Word32
+   C Intrinsic Prototype: HVX_Vector Q6_Vqf32_vmpy_VsfRsf(HVX_Vector Vu, Word32 Rt)
-   Rt) Instruction Type:      CVI_VX_DV Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX_DV
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Vqf32_vmpy_VsfRsf(Vu, Rt)                                           \
 @@ -4993,8 +5009,9 @@
 #if __HVX_ARCH__ >= 79 && defined __HVX_IEEE_FP__
 /* ==========================================================================
    Assembly Syntax:       Vdd32.hf=vsub(Vu32.f8,Vv32.f8)
-   C Intrinsic Prototype: HVX_VectorPair Q6_Whf_vsub_VV(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_VectorPair Q6_Whf_vsub_VV(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VX_DV Execution Slots:       SLOT23
+   Instruction Type:      CVI_VX_DV
+   Execution Slots:       SLOT23
    ========================================================================== */
 #define Q6_Whf_vsub_VV(Vu, Vv)                                                 \
 @@ -5052,8 +5069,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Vd32=valign4(Vu32,Vv32,Rt8)
-   C Intrinsic Prototype: HVX_Vector Q6_V_valign4_VVR(HVX_Vector Vu, HVX_Vector
+   C Intrinsic Prototype: HVX_Vector Q6_V_valign4_VVR(HVX_Vector Vu, HVX_Vector Vv, Word32 Rt)
-   Vv, Word32 Rt) Instruction Type:      CVI_VA Execution Slots:       SLOT0123
+   Instruction Type:      CVI_VA
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_V_valign4_VVR(Vu, Vv, Rt)                                           \
 @@ -5159,8 +5177,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Qd4=vcmp.eq(Vu32.hf,Vv32.hf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eq_VhfVhf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eq_VhfVhf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VA Execution Slots:       SLOT0123
+   Instruction Type:      CVI_VA
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_eq_VhfVhf(Vu, Vv)                                            \
 @@ -5171,9 +5190,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Qx4&=vcmp.eq(Vu32.hf,Vv32.hf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqand_QVhfVhf(HVX_VectorPred
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqand_QVhfVhf(HVX_VectorPred Qx, HVX_Vector Vu, HVX_Vector Vv)
-   Qx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VA Execution
+   Instruction Type:      CVI_VA
-   Slots:       SLOT0123
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_eqand_QVhfVhf(Qx, Vu, Vv)                                    \
 @@ -5187,9 +5206,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Qx4|=vcmp.eq(Vu32.hf,Vv32.hf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqor_QVhfVhf(HVX_VectorPred
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqor_QVhfVhf(HVX_VectorPred Qx, HVX_Vector Vu, HVX_Vector Vv)
-   Qx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VA Execution
+   Instruction Type:      CVI_VA
-   Slots:       SLOT0123
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_eqor_QVhfVhf(Qx, Vu, Vv)                                     \
 @@ -5203,9 +5222,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Qx4^=vcmp.eq(Vu32.hf,Vv32.hf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqxacc_QVhfVhf(HVX_VectorPred
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqxacc_QVhfVhf(HVX_VectorPred Qx, HVX_Vector Vu, HVX_Vector Vv)
-   Qx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VA Execution
+   Instruction Type:      CVI_VA
-   Slots:       SLOT0123
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_eqxacc_QVhfVhf(Qx, Vu, Vv)                                   \
 @@ -5219,8 +5238,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Qd4=vcmp.eq(Vu32.sf,Vv32.sf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eq_VsfVsf(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eq_VsfVsf(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VA Execution Slots:       SLOT0123
+   Instruction Type:      CVI_VA
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_eq_VsfVsf(Vu, Vv)                                            \
 @@ -5231,9 +5251,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Qx4&=vcmp.eq(Vu32.sf,Vv32.sf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqand_QVsfVsf(HVX_VectorPred
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqand_QVsfVsf(HVX_VectorPred Qx, HVX_Vector Vu, HVX_Vector Vv)
-   Qx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VA Execution
+   Instruction Type:      CVI_VA
-   Slots:       SLOT0123
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_eqand_QVsfVsf(Qx, Vu, Vv)                                    \
 @@ -5247,9 +5267,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Qx4|=vcmp.eq(Vu32.sf,Vv32.sf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqor_QVsfVsf(HVX_VectorPred
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqor_QVsfVsf(HVX_VectorPred Qx, HVX_Vector Vu, HVX_Vector Vv)
-   Qx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VA Execution
+   Instruction Type:      CVI_VA
-   Slots:       SLOT0123
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_eqor_QVsfVsf(Qx, Vu, Vv)                                     \
 @@ -5263,9 +5283,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Qx4^=vcmp.eq(Vu32.sf,Vv32.sf)
-   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqxacc_QVsfVsf(HVX_VectorPred
+   C Intrinsic Prototype: HVX_VectorPred Q6_Q_vcmp_eqxacc_QVsfVsf(HVX_VectorPred Qx, HVX_Vector Vu, HVX_Vector Vv)
-   Qx, HVX_Vector Vu, HVX_Vector Vv) Instruction Type:      CVI_VA Execution
+   Instruction Type:      CVI_VA
-   Slots:       SLOT0123
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Q_vcmp_eqxacc_QVsfVsf(Qx, Vu, Vv)                                   \
 @@ -5375,8 +5395,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Vd32.qf16=vsub(Vu32.hf,Vv32.qf16)
-   C Intrinsic Prototype: HVX_Vector Q6_Vqf16_vsub_VhfVqf16(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_Vector Q6_Vqf16_vsub_VhfVqf16(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VS Execution Slots:       SLOT0123
+   Instruction Type:      CVI_VS
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Vqf16_vsub_VhfVqf16(Vu, Vv)                                         \
 @@ -5386,8 +5407,9 @@
 #if __HVX_ARCH__ >= 81
 /* ==========================================================================
    Assembly Syntax:       Vd32.qf32=vsub(Vu32.sf,Vv32.qf32)
-   C Intrinsic Prototype: HVX_Vector Q6_Vqf32_vsub_VsfVqf32(HVX_Vector Vu,
+   C Intrinsic Prototype: HVX_Vector Q6_Vqf32_vsub_VsfVqf32(HVX_Vector Vu, HVX_Vector Vv)
-   HVX_Vector Vv) Instruction Type:      CVI_VS Execution Slots:       SLOT0123
+   Instruction Type:      CVI_VS
+   Execution Slots:       SLOT0123
    ========================================================================== */
 #define Q6_Vqf32_vsub_VsfVqf32(Vu, Vv)                                         \

lib/include/immintrin.h+4-2

 @@ -58,6 +58,10 @@
 #include <avx512bitalgintrin.h>
+#include <avx512bmmintrin.h>
+#include <avx512bmmvlintrin.h>
 #include <avx512cdintrin.h>
 #include <avx512vpopcntdqintrin.h>
 @@ -479,8 +483,6 @@ _storebe_i64(void * __P, long long __D) {
 #include <amxavx512intrin.h>
-#include <amxtf32intrin.h>
 #include <avx512vp2intersectintrin.h>
 #include <avx512vlvp2intersectintrin.h>

lib/include/intrin.h+20-10

 @@ -44,8 +44,10 @@
 #if __x86_64__
 #define __LPTRINT_TYPE__ __int64
+#define __IPTRINT_TYPE__ __int64
 #else
 #define __LPTRINT_TYPE__ long
+#define __IPTRINT_TYPE__ int
 #endif
 #ifdef __cplusplus
 @@ -95,12 +97,12 @@ void __outdword(unsigned short, unsigned long);
 void __outdwordstring(unsigned short, unsigned long *, unsigned long);
 void __outword(unsigned short, unsigned short);
 void __outwordstring(unsigned short, unsigned short *, unsigned long);
-unsigned long __readcr0(void);
+unsigned __LPTRINT_TYPE__ __readcr0(void);
-unsigned long __readcr2(void);
+unsigned __LPTRINT_TYPE__ __readcr2(void);
 unsigned __LPTRINT_TYPE__ __readcr3(void);
 unsigned __LPTRINT_TYPE__ __readcr4(void);
-unsigned __int64 __readcr8(void);
+unsigned __LPTRINT_TYPE__ __readcr8(void);
-unsigned int __readdr(unsigned int);
+unsigned __IPTRINT_TYPE__ __readdr(unsigned int);
 #ifdef __i386__
 unsigned char __readfsbyte(unsigned long);
 unsigned short __readfsword(unsigned long);
 @@ -126,11 +128,12 @@ unsigned __int64 __ull_rshift(unsigned __int64, int);
 void __vmx_off(void);
 void __vmx_vmptrst(unsigned __int64 *);
 void __wbinvd(void);
-void __writecr0(unsigned int);
+void __writecr0(unsigned __IPTRINT_TYPE__);
-void __writecr3(unsigned __INTPTR_TYPE__);
+void __writecr2(unsigned __IPTRINT_TYPE__);
-void __writecr4(unsigned __INTPTR_TYPE__);
+void __writecr3(unsigned __IPTRINT_TYPE__);
-void __writecr8(unsigned __int64);
+void __writecr4(unsigned __IPTRINT_TYPE__);
-void __writedr(unsigned int, unsigned int);
+void __writecr8(unsigned __IPTRINT_TYPE__);
+void __writedr(unsigned int, unsigned __IPTRINT_TYPE__);
 void __writefsbyte(unsigned long, unsigned char);
 void __writefsdword(unsigned long, unsigned long);
 void __writefsqword(unsigned long, unsigned __int64);
 @@ -374,6 +377,9 @@ static __inline__ void __DEFAULT_FN_ATTRS __nop(void) {
 \*----------------------------------------------------------------------------*/
 #if defined(__aarch64__) || defined(__arm64ec__)
 unsigned __int64 __getReg(int);
+double __getRegFp(int _Reg);
+void __setReg(int, unsigned __int64);
+void __setRegFp(int, double);
 unsigned char _interlockedbittestandreset_acq(long volatile *, long);
 unsigned char _interlockedbittestandreset_nf(long volatile *, long);
 unsigned char _interlockedbittestandreset_rel(long volatile *, long);
 @@ -438,10 +444,13 @@ unsigned int _CountLeadingSigns(long);
 unsigned int _CountLeadingSigns64(__int64);
 unsigned int _CountOneBits(unsigned long);
 unsigned int _CountOneBits64(unsigned __int64);
+unsigned int _CountTrailingZeros(unsigned long);
+unsigned int _CountTrailingZeros64(unsigned __int64);
 unsigned int __hlt(unsigned int, ...);
 void __cdecl __prefetch(const void *);
+void __cdecl __prefetch2(const void *, unsigned char);
 #endif
 @@ -474,7 +483,7 @@ static __inline__ unsigned __LPTRINT_TYPE__ __DEFAULT_FN_ATTRS __readcr3(void) {
 }
 static __inline__ void __DEFAULT_FN_ATTRS
-__writecr3(unsigned __INTPTR_TYPE__ __cr3_val) {
+__writecr3(unsigned __IPTRINT_TYPE__ __cr3_val) {
   __asm__ ("mov {%0, %%cr3|cr3, %0}" : : "r"(__cr3_val) : "memory");
 }
 #endif
 @@ -484,6 +493,7 @@ __writecr3(unsigned __INTPTR_TYPE__ __cr3_val) {
 #endif
 #undef __LPTRINT_TYPE__
+#undef __IPTRINT_TYPE__
 #undef __DEFAULT_FN_ATTRS

lib/include/larchintrin.h+2

 @@ -120,10 +120,12 @@ extern __inline int
 #define __ibar(/*ui15*/ _1) __builtin_loongarch_ibar((_1))
+#ifdef __loongarch_hard_float
 #define __movfcsr2gr(/*ui5*/ _1) __builtin_loongarch_movfcsr2gr((_1));
 #define __movgr2fcsr(/*ui5*/ _1, _2)                                           \
   __builtin_loongarch_movgr2fcsr((_1), (unsigned int)_2);
+#endif
 #define __syscall(/*ui15*/ _1) __builtin_loongarch_syscall((_1))

lib/include/llvm_libc_wrappers/ctype.h+3-2

 @@ -9,13 +9,14 @@
 #ifndef __CLANG_LLVM_LIBC_WRAPPERS_CTYPE_H__
 #define __CLANG_LLVM_LIBC_WRAPPERS_CTYPE_H__
-#if !defined(_OPENMP) && !defined(__HIP__) && !defined(__CUDA__)
+#if !defined(_OPENMP) && !defined(__HIP__) && !defined(__CUDA__) &&            \
+    !defined(__SPIRV__)
 #error "This file is for GPU offloading compilation only"
 #endif
 #include_next <ctype.h>
-#if defined(__HIP__) || defined(__CUDA__)
+#if defined(__HIP__) || defined(__CUDA__) || defined(__SPIRV__)
 #define __LIBC_ATTRS __attribute__((device))
 #else
 #define __LIBC_ATTRS

lib/include/llvm_libc_wrappers/string.h+3-2

 @@ -9,13 +9,14 @@
 #ifndef __CLANG_LLVM_LIBC_WRAPPERS_STRING_H__
 #define __CLANG_LLVM_LIBC_WRAPPERS_STRING_H__
-#if !defined(_OPENMP) && !defined(__HIP__) && !defined(__CUDA__)
+#if !defined(_OPENMP) && !defined(__HIP__) && !defined(__CUDA__) &&            \
+    !defined(__SPIRV__)
 #error "This file is for GPU offloading compilation only"
 #endif
 #include_next <string.h>
-#if defined(__HIP__) || defined(__CUDA__)
+#if defined(__HIP__) || defined(__CUDA__) || defined(__SPIRV__)
 #define __LIBC_ATTRS __attribute__((device))
 #else
 #define __LIBC_ATTRS

lib/include/module.modulemap+16-1

...	@@ -21,10 +21,19 @@ module _Builtin_intrinsics [system] [extern_c] {	...	@@ -21,10 +21,19 @@ module _Builtin_intrinsics [system] [extern_c] {
21	export *	21	export *
22	}	22	}
23		23
		24	explicit module bf16 {
		25	header "arm_bf16.h"
		26	export *
		27	}
		28
		29	explicit module fp16 {
		30	header "arm_fp16.h"
		31	export *
		32	}
		33
24	explicit module neon {	34	explicit module neon {
25	requires neon	35	requires neon
26	header "arm_neon.h"	36	header "arm_neon.h"
27	header "arm_fp16.h"
28	export *	37	export *
29	}	38	}
30		39
...	@@ -41,6 +50,12 @@ module _Builtin_intrinsics [system] [extern_c] {	...	@@ -41,6 +50,12 @@ module _Builtin_intrinsics [system] [extern_c] {
41		50
42	header "arm64intr.h"	51	header "arm64intr.h"
43	export *	52	export *
		53
		54	explicit module neon {
		55	requires neon
		56	header "arm64_neon.h"
		57	export *
		58	}
44	}	59	}
45		60
46	explicit module intel {	61	explicit module intel {

lib/include/openmp_wrappers/__clang_openmp_device_functions.h+14

...	@@ -55,6 +55,20 @@ extern "C" {	...	@@ -55,6 +55,20 @@ extern "C" {
55	#pragma omp end declare variant	55	#pragma omp end declare variant
56	#endif	56	#endif
57		57
		58	#ifdef __SPIRV__
		59	#pragma omp begin declare variant match( \
		60	device = {arch(spirv64)}, implementation = {extension(match_any)})
		61
		62	#define __OPENMP_SPIRV__
		63
		64	/// Include declarations for libdevice functions.
		65	#include <__clang_spirv_libdevice_declares.h>
		66
		67	#undef __OPENMP_SPIRV__
		68
		69	#pragma omp end declare variant
		70	#endif
		71
58	#ifdef __cplusplus	72	#ifdef __cplusplus
59	} // extern "C"	73	} // extern "C"
60	#endif	74	#endif

lib/include/openmp_wrappers/complex+7-1

 @@ -29,6 +29,12 @@
 #undef __OPENMP_AMDGCN__
 #endif // __AMDGCN__
+#ifdef __SPIRV__
+#define __OPENMP_SPIRV__
+#include <__clang_cuda_complex_builtins.h>
+#undef __OPENMP_SPIRV__
+#endif // __SPIRV__
 #endif
 // Grab the host header too.
 @@ -45,7 +51,7 @@
 #ifndef _LIBCPP_STD_VER
 #pragma omp begin declare variant match(                                       \
-    device = {arch(amdgcn, nvptx, nvptx64)},                                   \
+    device = {arch(amdgcn, nvptx, nvptx64, spirv64)},                                   \
     implementation = {extension(match_any, allow_templates)})
 #include <complex_cmath.h>

lib/include/openmp_wrappers/complex.h+6

...	@@ -29,6 +29,12 @@	...	@@ -29,6 +29,12 @@
29	#undef __OPENMP_AMDGCN__	29	#undef __OPENMP_AMDGCN__
30	#endif	30	#endif
31		31
		32	#ifdef __SPIRV__
		33	#define __OPENMP_SPIRV__
		34	#include <__clang_cuda_complex_builtins.h>
		35	#undef __OPENMP_SPIRV__
		36	#endif // __SPIRV__
		37
32	#endif	38	#endif
33		39
34	// Grab the host header too.	40	// Grab the host header too.

lib/include/openmp_wrappers/math.h+10

...	@@ -58,4 +58,14 @@	...	@@ -58,4 +58,14 @@
58	#pragma omp end declare variant	58	#pragma omp end declare variant
59	#endif	59	#endif
60		60
		61	#ifdef __SPIRV__
		62	#pragma omp begin declare variant match(device = {arch(spirv64)})
		63
		64	#define __OPENMP_SPIRV__
		65	#include <__clang_spirv_math.h>
		66	#undef __OPENMP_SPIRV__
		67
		68	#pragma omp end declare variant
		69	#endif
		70
61	#endif	71	#endif

lib/include/ptrauth.h+90-12

 @@ -38,8 +38,7 @@ typedef enum {
      The extra data is always 0. */
   ptrauth_key_function_pointer = ptrauth_key_process_independent_code,
-  /* The key used to sign C++ v-table pointers.
+  /* The key used to sign pointers to C++ v-tables. */
-     The extra data is always 0. */
   ptrauth_key_cxx_vtable_pointer = ptrauth_key_process_independent_data,
   /* The key used to sign metadata pointers to Objective-C method-lists. */
 @@ -178,6 +177,56 @@ typedef __UINTPTR_TYPE__ ptrauth_generic_signature_t;
   __builtin_ptrauth_auth_and_resign(__value, __old_key, __old_data, __new_key, \
                                     __new_data)
+/* Authenticate a pointer using a PC-based signature scheme and resign
+   it using a different scheme.
+   If the result is subsequently authenticated using the new scheme, that
+   authentication is guaranteed to fail if and only if the initial
+   authentication failed.
+   The value must be an expression of pointer type.
+   The key must be a constant expression of type ptrauth_key.
+   The extra data must be an expression of pointer or integer type;
+   if an integer, it will be coerced to ptrauth_extra_data_t.
+   The oldpc must be an expression of pointer or integer type representing
+   the PC value where the original signature was created.
+   The result will have the same type as the original value.
+   This operation is guaranteed to not leave the intermediate value
+   available for attack before it is re-signed.
+   Do not pass a null pointer to this function. A null pointer
+   will not successfully authenticate. */
+#define ptrauth_auth_with_pc_and_resign(__value, __old_key, __old_data,        \
+                                        __old_pc, __new_key, __new_data)       \
+  __builtin_ptrauth_auth_with_pc_and_resign(__value, __old_key, __old_data,    \
+                                            __old_pc, __new_key, __new_data)
+/* Authenticate a pointer using one scheme, load 32bit value at offset addend
+   from the pointer, and add this value to the pointer, sign using specified
+   scheme.
+   If the result is subsequently authenticated using the new scheme, that
+   authentication is guaranteed to fail if and only if the initial
+   authentication failed.
+   The value must be an expression of pointer type.
+   The key must be a constant expression of type ptrauth_key.
+   The extra data must be an expression of pointer or integer type;
+   if an integer, it will be coerced to ptrauth_extra_data_t.
+   The addend must be an immediate ptrdiff_t value.
+   The result will have the same type as the original value.
+   This operation is guaranteed to not leave the intermediate value
+   available for attack before it is re-signed.
+   Do not pass a null pointer to this function. A null pointer
+   will not successfully authenticate. */
+#define ptrauth_auth_load_relative_and_sign(__value, __old_key, __old_data,    \
+                                            __new_key, __new_data, __offset)   \
+  __builtin_ptrauth_auth_load_relative_and_sign(                               \
+      __value, __old_key, __old_data, __new_key, __new_data, __offset)
 /* Authenticate a pointer using one scheme and resign it as a C
    function pointer.
 @@ -324,30 +373,38 @@ typedef __UINTPTR_TYPE__ ptrauth_generic_signature_t;
   __ptrauth(ptrauth_key_objc_class_ro_pointer, 1,                              \
             __ptrauth_objc_class_ro_discriminator)
+#if __has_feature(ptrauth_init_fini_address_discrimination)
+#define __ptrauth_init_fini_pointer                                            \
+  __ptrauth(ptrauth_key_init_fini_pointer, 1, __ptrauth_init_fini_discriminator)
+#else
+#define __ptrauth_init_fini_pointer                                            \
+  __ptrauth(ptrauth_key_init_fini_pointer, 0, __ptrauth_init_fini_discriminator)
+#endif
 #else
 #define ptrauth_strip(__value, __key)                                          \
-  ({                                                                           \
+  __extension__({                                                              \
     (void)__key;                                                               \
     __value;                                                                   \
   })
 #define ptrauth_blend_discriminator(__pointer, __integer)                      \
-  ({                                                                           \
+  __extension__({                                                              \
     (void)__pointer;                                                           \
     (void)__integer;                                                           \
     ((ptrauth_extra_data_t)0);                                                 \
   })
 #define ptrauth_sign_constant(__value, __key, __data)                          \
-  ({                                                                           \
+  __extension__({                                                              \
     (void)__key;                                                               \
     (void)__data;                                                              \
     __value;                                                                   \
   })
 #define ptrauth_sign_unauthenticated(__value, __key, __data)                   \
-  ({                                                                           \
+  __extension__({                                                              \
     (void)__key;                                                               \
     (void)__data;                                                              \
     __value;                                                                   \
 @@ -355,7 +412,7 @@ typedef __UINTPTR_TYPE__ ptrauth_generic_signature_t;
 #define ptrauth_auth_and_resign(__value, __old_key, __old_data, __new_key,     \
                                 __new_data)                                    \
-  ({                                                                           \
+  __extension__({                                                              \
     (void)__old_key;                                                           \
     (void)__old_data;                                                          \
     (void)__new_key;                                                           \
 @@ -363,22 +420,44 @@ typedef __UINTPTR_TYPE__ ptrauth_generic_signature_t;
     __value;                                                                   \
   })
+#define ptrauth_auth_with_pc_and_resign(__value, __old_key, __old_data,        \
+                                        __old_pc, __new_key, __new_data)       \
+  __extension__({                                                              \
+    (void)__old_key;                                                           \
+    (void)__old_data;                                                          \
+    (void)__old_pc;                                                            \
+    (void)__new_key;                                                           \
+    (void)__new_data;                                                          \
+    __value;                                                                   \
+  })
+#define ptrauth_auth_load_relative_and_sign(__value, __old_key, __old_data,    \
+                                            __new_key, __new_data, __offset)   \
+  __extension__({                                                              \
+    (void)__old_key;                                                           \
+    (void)__old_data;                                                          \
+    (void)__new_key;                                                           \
+    (void)__new_data;                                                          \
+    const char *__value_tmp = (const char *)(__value);                         \
+    (void *)(__value_tmp + *(const int *)(__value_tmp + (__offset)));          \
+  })
 #define ptrauth_auth_function(__value, __old_key, __old_data)                  \
-  ({                                                                           \
+  __extension__({                                                              \
     (void)__old_key;                                                           \
     (void)__old_data;                                                          \
     __value;                                                                   \
   })
 #define ptrauth_auth_data(__value, __old_key, __old_data)                      \
-  ({                                                                           \
+  __extension__({                                                              \
     (void)__old_key;                                                           \
     (void)__old_data;                                                          \
     __value;                                                                   \
   })
 #define ptrauth_string_discriminator(__string)                                 \
-  ({                                                                           \
+  __extension__({                                                              \
     (void)__string;                                                            \
     ((ptrauth_extra_data_t)0);                                                 \
   })
 @@ -388,13 +467,12 @@ typedef __UINTPTR_TYPE__ ptrauth_generic_signature_t;
   ((ptrauth_extra_data_t)0)
 #define ptrauth_sign_generic_data(__value, __data)                             \
-  ({                                                                           \
+  __extension__({                                                              \
     (void)__value;                                                             \
     (void)__data;                                                              \
     ((ptrauth_generic_signature_t)0);                                          \
   })
 #define ptrauth_cxx_vtable_pointer(key, address_discrimination,                \
                                    extra_discrimination...)

lib/include/riscv_bitmanip.h+7

...	@@ -16,6 +16,13 @@	...	@@ -16,6 +16,13 @@
16	extern "C" {	16	extern "C" {
17	#endif	17	#endif
18		18
		19	#define __riscv_intrinsic_b 1
		20	#define __riscv_intrinsic_zbb 1
		21	#define __riscv_intrinsic_zbc 1
		22	#define __riscv_intrinsic_zbkb 1
		23	#define __riscv_intrinsic_zbkc 1
		24	#define __riscv_intrinsic_zbkx 1
		25
19	#if defined(__riscv_zbb)	26	#if defined(__riscv_zbb)
20	static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))	27	static __inline__ uint32_t __attribute__((__always_inline__, __nodebug__))
21	__riscv_orc_b_32(uint32_t __x) {	28	__riscv_orc_b_32(uint32_t __x) {

lib/include/riscv_corev_alu.h+2

...	@@ -16,6 +16,8 @@	...	@@ -16,6 +16,8 @@
16	extern "C" {	16	extern "C" {
17	#endif	17	#endif
18		18
		19	#define __riscv_intrinsic_xcvalu 1
		20
19	#if defined(__riscv_xcvalu)	21	#if defined(__riscv_xcvalu)
20		22
21	#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))	23	#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))

lib/include/riscv_crypto.h+8

...	@@ -16,6 +16,14 @@	...	@@ -16,6 +16,14 @@
16	extern "C" {	16	extern "C" {
17	#endif	17	#endif
18		18
		19	#define __riscv_intrinsic_zkn 1
		20	#define __riscv_intrinsic_zknd 1
		21	#define __riscv_intrinsic_zkne 1
		22	#define __riscv_intrinsic_zknh 1
		23	#define __riscv_intrinsic_zks 1
		24	#define __riscv_intrinsic_zksed 1
		25	#define __riscv_intrinsic_zksh 1
		26
19	#if defined(__riscv_zknd)	27	#if defined(__riscv_zknd)
20	#if __riscv_xlen == 32	28	#if __riscv_xlen == 32
21	#define __riscv_aes32dsi(x, y, bs) __builtin_riscv_aes32dsi(x, y, bs)	29	#define __riscv_aes32dsi(x, y, bs) __builtin_riscv_aes32dsi(x, y, bs)

lib/include/riscv_mips.h+2

...	@@ -14,6 +14,8 @@	...	@@ -14,6 +14,8 @@
14	#error "This header is only meant to be used on riscv architecture"	14	#error "This header is only meant to be used on riscv architecture"
15	#endif	15	#endif
16		16
		17	#define __riscv_intrinsic_xmipsexectl 1
		18
17	#define __DEFAULT_FN_ATTRS \	19	#define __DEFAULT_FN_ATTRS \
18	__attribute__((__always_inline__, __nodebug__, __target__("xmipsexectl")))	20	__attribute__((__always_inline__, __nodebug__, __target__("xmipsexectl")))
19		21

lib/include/riscv_nds.h+3

...	@@ -16,6 +16,9 @@	...	@@ -16,6 +16,9 @@
16	extern "C" {	16	extern "C" {
17	#endif	17	#endif
18		18
		19	#define __riscv_intrinsic_xandesbfhcvt 1
		20	#define __riscv_intrinsic_xandesperf 1
		21
19	#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))	22	#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
20		23
21	#if defined(__riscv_xandesperf)	24	#if defined(__riscv_xandesperf)

lib/include/riscv_ntlh.h+2

...	@@ -10,6 +10,8 @@	...	@@ -10,6 +10,8 @@
10	#ifndef __RISCV_NTLH_H	10	#ifndef __RISCV_NTLH_H
11	#define __RISCV_NTLH_H	11	#define __RISCV_NTLH_H
12		12
		13	#define __riscv_intrinsic_zihintntl 1
		14
13	#ifndef __riscv_zihintntl	15	#ifndef __riscv_zihintntl
14	#error "NTLH intrinsics require the NTLH extension."	16	#error "NTLH intrinsics require the NTLH extension."
15	#endif	17	#endif

lib/include/riscv_packed_simd.h created+644

...	@@ -0,0 +1,644 @@
1	/*===---- riscv_packed_simd.h - RISC-V P intrinsics ------------------------===
2	*
3	* Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	* See https://llvm.org/LICENSE.txt for license information.
5	* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	*
7	*===-----------------------------------------------------------------------===
8	*/
9
10	#ifndef __RISCV_PACKED_SIMD_H
11	#define __RISCV_PACKED_SIMD_H
12
13	#include <stdint.h>
14
15	#if defined(__cplusplus)
16	extern "C" {
17	#endif
18
19	/* Packed SIMD Types */
20
21	typedef int8_t int8x4_t __attribute__((__vector_size__(4)));
22	typedef uint8_t uint8x4_t __attribute__((__vector_size__(4)));
23	typedef int16_t int16x2_t __attribute__((__vector_size__(4)));
24	typedef uint16_t uint16x2_t __attribute__((__vector_size__(4)));
25
26	typedef int8_t int8x8_t __attribute__((__vector_size__(8)));
27	typedef uint8_t uint8x8_t __attribute__((__vector_size__(8)));
28	typedef int16_t int16x4_t __attribute__((__vector_size__(8)));
29	typedef uint16_t uint16x4_t __attribute__((__vector_size__(8)));
30	typedef int32_t int32x2_t __attribute__((__vector_size__(8)));
31	typedef uint32_t uint32x2_t __attribute__((__vector_size__(8)));
32
33	#define __DEFAULT_FN_ATTRS __attribute__((__always_inline__, __nodebug__))
34
35	#define __packed_splat2(ty, x) ((ty){(x), (x)})
36	#define __packed_splat4(ty, x) ((ty){(x), (x), (x), (x)})
37	#define __packed_splat8(ty, x) ((ty){(x), (x), (x), (x), (x), (x), (x), (x)})
38
39	#define __packed_splat(name, ty, scalar_ty, splat) \
40	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(scalar_ty __x) { \
41	return splat(ty, __x); \
42	}
43
44	#define __packed_shift(name, ty, op, mask) \
45	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, \
46	unsigned __rs2) { \
47	return __rs1 op(__rs2 & (mask)); \
48	}
49	#define __packed_shift8(name, ty, op) __packed_shift(name, ty, op, 0x7)
50	#define __packed_shift16(name, ty, op) __packed_shift(name, ty, op, 0xf)
51	#define __packed_shift32(name, ty, op) __packed_shift(name, ty, op, 0x1f)
52
53	#define __packed_scalar_binary_op(name, ty, scalar_ty, op, splat) \
54	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, \
55	scalar_ty __rs2) { \
56	return __rs1 op splat(ty, __rs2); \
57	}
58
59	#define __packed_binary_op(name, ty, op) \
60	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, ty __rs2) { \
61	return __rs1 op __rs2; \
62	}
63
64	#define __packed_unary_op(name, ty, op) \
65	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
66	return op __rs1; \
67	}
68
69	#define __packed_binary_builtin(name, ty, builtin) \
70	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, ty __rs2) { \
71	return builtin(__rs1, __rs2); \
72	}
73
74	#define __packed_sh1add(name, ty) \
75	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, ty __rs2) { \
76	return (__rs1 << 1) + __rs2; \
77	}
78
79	/* TODO: switch to sadd_sat(__builtin_elementwise_shl_sat(a, 1), b) once a
80	* generic elementwise shl_sat builtin exists. sadd_sat(a, a) is equivalent
81	* for signed types and the backend's saturating_shl1 PatFrags matches both
82	* shapes. */
83	#define __packed_sh1sadd(name, ty) \
84	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, ty __rs2) { \
85	return __builtin_elementwise_add_sat( \
86	__builtin_elementwise_add_sat(__rs1, __rs1), __rs2); \
87	}
88
89	#define __packed_cmp(name, ty, rty, op) \
90	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, \
91	ty __rs2) { \
92	return (rty)(__rs1 op __rs2); \
93	}
94
95	#define __packed_pabs(name, ty, rty) \
96	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
97	return (rty)__builtin_elementwise_abs(__rs1); \
98	}
99
100	#define __packed_binary_builtin_cast(name, ty, rty, builtin) \
101	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, \
102	ty __rs2) { \
103	return (rty)builtin(__rs1, __rs2); \
104	}
105
106	#define __packed_reduction(name, rty, ty, builtin) \
107	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, \
108	rty __rs2) { \
109	return builtin(__rs1, __rs2); \
110	}
111
112	#define __packed_merge_builtin(name, ty, mask_ty, builtin) \
113	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, ty __rs2, \
114	mask_ty __rd) { \
115	return (ty)builtin(__rs1, __rs2, __rd); \
116	}
117
118	#define __packed_psabs(name, ty, builtin) \
119	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
120	return builtin(__rs1); \
121	}
122
123	#define __packed_widen_convert(name, rty, ty) \
124	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
125	return __builtin_convertvector(__rs1, rty); \
126	}
127	#define __packed_widen_high2(name, rty, ty) \
128	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
129	return (rty)__builtin_shufflevector((ty){0}, __rs1, 0, 2, 1, 3); \
130	}
131	#define __packed_widen_high4(name, rty, ty) \
132	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
133	return (rty)__builtin_shufflevector((ty){0}, __rs1, 0, 4, 1, 5, 2, 6, 3, \
134	7); \
135	}
136
137	/* Packed Reverse: reverse the order of the elements. Lowered to a single
138	* rev8/rev16/ppairoe.* by the backend's packed reverse-shuffle handling. */
139	#define __packed_reverse2(name, ty) \
140	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
141	return __builtin_shufflevector(__rs1, __rs1, 1, 0); \
142	}
143	#define __packed_reverse4(name, ty) \
144	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
145	return __builtin_shufflevector(__rs1, __rs1, 3, 2, 1, 0); \
146	}
147	#define __packed_reverse8(name, ty) \
148	static __inline__ ty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
149	return __builtin_shufflevector(__rs1, __rs1, 7, 6, 5, 4, 3, 2, 1, 0); \
150	}
151
152	#define __packed_zip2(name, rty, ty) \
153	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, \
154	ty __rs2) { \
155	return __builtin_shufflevector(__rs1, __rs2, 0, 2, 1, 3); \
156	}
157	#define __packed_zip4(name, rty, ty) \
158	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, \
159	ty __rs2) { \
160	return __builtin_shufflevector(__rs1, __rs2, 0, 4, 1, 5, 2, 6, 3, 7); \
161	}
162	#define __packed_unzipe2(name, rty, ty) \
163	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
164	return __builtin_shufflevector(__rs1, __rs1, 0, 2); \
165	}
166	#define __packed_unzipe4(name, rty, ty) \
167	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
168	return __builtin_shufflevector(__rs1, __rs1, 0, 2, 4, 6); \
169	}
170	#define __packed_unzipo2(name, rty, ty) \
171	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
172	return __builtin_shufflevector(__rs1, __rs1, 1, 3); \
173	}
174	#define __packed_unzipo4(name, rty, ty) \
175	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1) { \
176	return __builtin_shufflevector(__rs1, __rs1, 1, 3, 5, 7); \
177	}
178
179	#define __packed_abdsum(name, rty, ty, builtin) \
180	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(ty __rs1, \
181	ty __rs2) { \
182	return builtin(__rs1, __rs2); \
183	}
184
185	#define __packed_abdsum_acc(name, rty, ty, builtin) \
186	static __inline__ rty __DEFAULT_FN_ATTRS __riscv_##name(rty __rd, ty __rs1, \
187	ty __rs2) { \
188	return builtin(__rd, __rs1, __rs2); \
189	}
190
191	// clang-format off: macro call sites have no trailing semicolons, which
192	// confuses clang-format into a deeply nested expression.
193
194	/* Packed Splat (32-bit) */
195	__packed_splat(pmv_s_u8x4, uint8x4_t, uint8_t, __packed_splat4)
196	__packed_splat(pmv_s_i8x4, int8x4_t, int8_t, __packed_splat4)
197	__packed_splat(pmv_s_u16x2, uint16x2_t, uint16_t, __packed_splat2)
198	__packed_splat(pmv_s_i16x2, int16x2_t, int16_t, __packed_splat2)
199
200	/* Packed Splat (64-bit) */
201	__packed_splat(pmv_s_u8x8, uint8x8_t, uint8_t, __packed_splat8)
202	__packed_splat(pmv_s_i8x8, int8x8_t, int8_t, __packed_splat8)
203	__packed_splat(pmv_s_u16x4, uint16x4_t, uint16_t, __packed_splat4)
204	__packed_splat(pmv_s_i16x4, int16x4_t, int16_t, __packed_splat4)
205	__packed_splat(pmv_s_u32x2, uint32x2_t, uint32_t, __packed_splat2)
206	__packed_splat(pmv_s_i32x2, int32x2_t, int32_t, __packed_splat2)
207
208	/* Packed Addition and Subtraction (32-bit) */
209	__packed_binary_op(padd_i8x4, int8x4_t, +)
210	__packed_binary_op(padd_u8x4, uint8x4_t, +)
211	__packed_binary_op(padd_i16x2, int16x2_t, +)
212	__packed_binary_op(padd_u16x2, uint16x2_t, +)
213	__packed_binary_op(psub_i8x4, int8x4_t, -)
214	__packed_binary_op(psub_u8x4, uint8x4_t, -)
215	__packed_binary_op(psub_i16x2, int16x2_t, -)
216	__packed_binary_op(psub_u16x2, uint16x2_t, -)
217	__packed_unary_op(pneg_i8x4, int8x4_t, -)
218	__packed_unary_op(pneg_i16x2, int16x2_t, -)
219
220	/* Packed Addition and Subtraction (64-bit) */
221	__packed_binary_op(padd_i8x8, int8x8_t, +)
222	__packed_binary_op(padd_u8x8, uint8x8_t, +)
223	__packed_binary_op(padd_i16x4, int16x4_t, +)
224	__packed_binary_op(padd_u16x4, uint16x4_t, +)
225	__packed_binary_op(padd_i32x2, int32x2_t, +)
226	__packed_binary_op(padd_u32x2, uint32x2_t, +)
227	__packed_binary_op(psub_i8x8, int8x8_t, -)
228	__packed_binary_op(psub_u8x8, uint8x8_t, -)
229	__packed_binary_op(psub_i16x4, int16x4_t, -)
230	__packed_binary_op(psub_u16x4, uint16x4_t, -)
231	__packed_binary_op(psub_i32x2, int32x2_t, -)
232	__packed_binary_op(psub_u32x2, uint32x2_t, -)
233	__packed_unary_op(pneg_i8x8, int8x8_t, -)
234	__packed_unary_op(pneg_i16x4, int16x4_t, -)
235	__packed_unary_op(pneg_i32x2, int32x2_t, -)
236
237	/* Packed Addition with Scalar (32-bit) */
238	__packed_scalar_binary_op(padd_s_u8x4, uint8x4_t, uint8_t, +, __packed_splat4)
239	__packed_scalar_binary_op(padd_s_i8x4, int8x4_t, int8_t, +, __packed_splat4)
240	__packed_scalar_binary_op(padd_s_u16x2, uint16x2_t, uint16_t, +,
241	__packed_splat2)
242	__packed_scalar_binary_op(padd_s_i16x2, int16x2_t, int16_t, +,
243	__packed_splat2)
244
245	/* Packed Addition with Scalar (64-bit) */
246	__packed_scalar_binary_op(padd_s_u8x8, uint8x8_t, uint8_t, +, __packed_splat8)
247	__packed_scalar_binary_op(padd_s_i8x8, int8x8_t, int8_t, +, __packed_splat8)
248	__packed_scalar_binary_op(padd_s_u16x4, uint16x4_t, uint16_t, +,
249	__packed_splat4)
250	__packed_scalar_binary_op(padd_s_i16x4, int16x4_t, int16_t, +,
251	__packed_splat4)
252	__packed_scalar_binary_op(padd_s_u32x2, uint32x2_t, uint32_t, +,
253	__packed_splat2)
254	__packed_scalar_binary_op(padd_s_i32x2, int32x2_t, int32_t, +,
255	__packed_splat2)
256
257	/* Packed Saturating Addition and Subtraction (32-bit) */
258	__packed_binary_builtin(psadd_i8x4, int8x4_t, __builtin_elementwise_add_sat)
259	__packed_binary_builtin(psadd_i16x2, int16x2_t, __builtin_elementwise_add_sat)
260	__packed_binary_builtin(psaddu_u8x4, uint8x4_t, __builtin_elementwise_add_sat)
261	__packed_binary_builtin(psaddu_u16x2, uint16x2_t, __builtin_elementwise_add_sat)
262	__packed_binary_builtin(pssub_i8x4, int8x4_t, __builtin_elementwise_sub_sat)
263	__packed_binary_builtin(pssub_i16x2, int16x2_t, __builtin_elementwise_sub_sat)
264	__packed_binary_builtin(pssubu_u8x4, uint8x4_t, __builtin_elementwise_sub_sat)
265	__packed_binary_builtin(pssubu_u16x2, uint16x2_t, __builtin_elementwise_sub_sat)
266
267	/* Packed Saturating Addition and Subtraction (64-bit) */
268	__packed_binary_builtin(psadd_i8x8, int8x8_t, __builtin_elementwise_add_sat)
269	__packed_binary_builtin(psadd_i16x4, int16x4_t, __builtin_elementwise_add_sat)
270	__packed_binary_builtin(psadd_i32x2, int32x2_t, __builtin_elementwise_add_sat)
271	__packed_binary_builtin(psaddu_u8x8, uint8x8_t, __builtin_elementwise_add_sat)
272	__packed_binary_builtin(psaddu_u16x4, uint16x4_t, __builtin_elementwise_add_sat)
273	__packed_binary_builtin(psaddu_u32x2, uint32x2_t, __builtin_elementwise_add_sat)
274	__packed_binary_builtin(pssub_i8x8, int8x8_t, __builtin_elementwise_sub_sat)
275	__packed_binary_builtin(pssub_i16x4, int16x4_t, __builtin_elementwise_sub_sat)
276	__packed_binary_builtin(pssub_i32x2, int32x2_t, __builtin_elementwise_sub_sat)
277	__packed_binary_builtin(pssubu_u8x8, uint8x8_t, __builtin_elementwise_sub_sat)
278	__packed_binary_builtin(pssubu_u16x4, uint16x4_t, __builtin_elementwise_sub_sat)
279	__packed_binary_builtin(pssubu_u32x2, uint32x2_t, __builtin_elementwise_sub_sat)
280
281	/* Packed Shift-Add (32-bit) */
282	__packed_sh1add(psh1add_i16x2, int16x2_t)
283	__packed_sh1add(psh1add_u16x2, uint16x2_t)
284	__packed_sh1sadd(pssh1sadd_i16x2, int16x2_t)
285
286	/* Packed Shift-Add (64-bit) */
287	__packed_sh1add(psh1add_i16x4, int16x4_t)
288	__packed_sh1add(psh1add_u16x4, uint16x4_t)
289	__packed_sh1add(psh1add_i32x2, int32x2_t)
290	__packed_sh1add(psh1add_u32x2, uint32x2_t)
291	__packed_sh1sadd(pssh1sadd_i16x4, int16x4_t)
292	__packed_sh1sadd(pssh1sadd_i32x2, int32x2_t)
293
294	/* Packed Exchanged Addition and Subtraction (32-bit) */
295	__packed_binary_builtin(pas_x_i16x2, int16x2_t, __builtin_riscv_pas_x_i16x2)
296	__packed_binary_builtin(psa_x_i16x2, int16x2_t, __builtin_riscv_psa_x_i16x2)
297	__packed_binary_builtin(psas_x_i16x2, int16x2_t, __builtin_riscv_psas_x_i16x2)
298	__packed_binary_builtin(pssa_x_i16x2, int16x2_t, __builtin_riscv_pssa_x_i16x2)
299	__packed_binary_builtin(paas_x_i16x2, int16x2_t, __builtin_riscv_paas_x_i16x2)
300	__packed_binary_builtin(pasa_x_i16x2, int16x2_t, __builtin_riscv_pasa_x_i16x2)
301
302	/* Packed Exchanged Addition and Subtraction (64-bit) */
303	__packed_binary_builtin(pas_x_i16x4, int16x4_t, __builtin_riscv_pas_x_i16x4)
304	__packed_binary_builtin(psa_x_i16x4, int16x4_t, __builtin_riscv_psa_x_i16x4)
305	__packed_binary_builtin(psas_x_i16x4, int16x4_t, __builtin_riscv_psas_x_i16x4)
306	__packed_binary_builtin(pssa_x_i16x4, int16x4_t, __builtin_riscv_pssa_x_i16x4)
307	__packed_binary_builtin(paas_x_i16x4, int16x4_t, __builtin_riscv_paas_x_i16x4)
308	__packed_binary_builtin(pasa_x_i16x4, int16x4_t, __builtin_riscv_pasa_x_i16x4)
309	__packed_binary_builtin(pas_x_i32x2, int32x2_t, __builtin_riscv_pas_x_i32x2)
310	__packed_binary_builtin(psa_x_i32x2, int32x2_t, __builtin_riscv_psa_x_i32x2)
311	__packed_binary_builtin(psas_x_i32x2, int32x2_t, __builtin_riscv_psas_x_i32x2)
312	__packed_binary_builtin(pssa_x_i32x2, int32x2_t, __builtin_riscv_pssa_x_i32x2)
313	__packed_binary_builtin(paas_x_i32x2, int32x2_t, __builtin_riscv_paas_x_i32x2)
314	__packed_binary_builtin(pasa_x_i32x2, int32x2_t, __builtin_riscv_pasa_x_i32x2)
315
316	/* Packed Minimum and Maximum (32-bit) */
317	__packed_binary_builtin(pmin_i8x4, int8x4_t, __builtin_elementwise_min)
318	__packed_binary_builtin(pmin_i16x2, int16x2_t, __builtin_elementwise_min)
319	__packed_binary_builtin(pminu_u8x4, uint8x4_t, __builtin_elementwise_min)
320	__packed_binary_builtin(pminu_u16x2, uint16x2_t, __builtin_elementwise_min)
321	__packed_binary_builtin(pmax_i8x4, int8x4_t, __builtin_elementwise_max)
322	__packed_binary_builtin(pmax_i16x2, int16x2_t, __builtin_elementwise_max)
323	__packed_binary_builtin(pmaxu_u8x4, uint8x4_t, __builtin_elementwise_max)
324	__packed_binary_builtin(pmaxu_u16x2, uint16x2_t, __builtin_elementwise_max)
325
326	/* Packed Minimum and Maximum (64-bit) */
327	__packed_binary_builtin(pmin_i8x8, int8x8_t, __builtin_elementwise_min)
328	__packed_binary_builtin(pmin_i16x4, int16x4_t, __builtin_elementwise_min)
329	__packed_binary_builtin(pmin_i32x2, int32x2_t, __builtin_elementwise_min)
330	__packed_binary_builtin(pminu_u8x8, uint8x8_t, __builtin_elementwise_min)
331	__packed_binary_builtin(pminu_u16x4, uint16x4_t, __builtin_elementwise_min)
332	__packed_binary_builtin(pminu_u32x2, uint32x2_t, __builtin_elementwise_min)
333	__packed_binary_builtin(pmax_i8x8, int8x8_t, __builtin_elementwise_max)
334	__packed_binary_builtin(pmax_i16x4, int16x4_t, __builtin_elementwise_max)
335	__packed_binary_builtin(pmax_i32x2, int32x2_t, __builtin_elementwise_max)
336	__packed_binary_builtin(pmaxu_u8x8, uint8x8_t, __builtin_elementwise_max)
337	__packed_binary_builtin(pmaxu_u16x4, uint16x4_t, __builtin_elementwise_max)
338	__packed_binary_builtin(pmaxu_u32x2, uint32x2_t, __builtin_elementwise_max)
339
340	/* Packed Comparison (32-bit) */
341	__packed_cmp(pmseq_i8x4_u8x4, int8x4_t, uint8x4_t, ==)
342	__packed_cmp(pmseq_u8x4_u8x4, uint8x4_t, uint8x4_t, ==)
343	__packed_cmp(pmsne_i8x4_u8x4, int8x4_t, uint8x4_t, !=)
344	__packed_cmp(pmsne_u8x4_u8x4, uint8x4_t, uint8x4_t, !=)
345	__packed_cmp(pmslt_u8x4, int8x4_t, uint8x4_t, <)
346	__packed_cmp(pmsltu_u8x4, uint8x4_t, uint8x4_t, <)
347	__packed_cmp(pmsgt_u8x4, int8x4_t, uint8x4_t, >)
348	__packed_cmp(pmsgtu_u8x4, uint8x4_t, uint8x4_t, >)
349	__packed_cmp(pmsge_u8x4, int8x4_t, uint8x4_t, >=)
350	__packed_cmp(pmsgeu_u8x4, uint8x4_t, uint8x4_t, >=)
351	__packed_cmp(pmsle_u8x4, int8x4_t, uint8x4_t, <=)
352	__packed_cmp(pmsleu_u8x4, uint8x4_t, uint8x4_t, <=)
353	__packed_cmp(pmseq_i16x2_u16x2, int16x2_t, uint16x2_t, ==)
354	__packed_cmp(pmseq_u16x2_u16x2, uint16x2_t, uint16x2_t, ==)
355	__packed_cmp(pmsne_i16x2_u16x2, int16x2_t, uint16x2_t, !=)
356	__packed_cmp(pmsne_u16x2_u16x2, uint16x2_t, uint16x2_t, !=)
357	__packed_cmp(pmslt_u16x2, int16x2_t, uint16x2_t, <)
358	__packed_cmp(pmsltu_u16x2, uint16x2_t, uint16x2_t, <)
359	__packed_cmp(pmsgt_u16x2, int16x2_t, uint16x2_t, >)
360	__packed_cmp(pmsgtu_u16x2, uint16x2_t, uint16x2_t, >)
361	__packed_cmp(pmsge_u16x2, int16x2_t, uint16x2_t, >=)
362	__packed_cmp(pmsgeu_u16x2, uint16x2_t, uint16x2_t, >=)
363	__packed_cmp(pmsle_u16x2, int16x2_t, uint16x2_t, <=)
364	__packed_cmp(pmsleu_u16x2, uint16x2_t, uint16x2_t, <=)
365
366	/* Packed Comparison (64-bit) */
367	__packed_cmp(pmseq_i8x8_u8x8, int8x8_t, uint8x8_t, ==)
368	__packed_cmp(pmseq_u8x8_u8x8, uint8x8_t, uint8x8_t, ==)
369	__packed_cmp(pmsne_i8x8_u8x8, int8x8_t, uint8x8_t, !=)
370	__packed_cmp(pmsne_u8x8_u8x8, uint8x8_t, uint8x8_t, !=)
371	__packed_cmp(pmslt_u8x8, int8x8_t, uint8x8_t, <)
372	__packed_cmp(pmsltu_u8x8, uint8x8_t, uint8x8_t, <)
373	__packed_cmp(pmsgt_u8x8, int8x8_t, uint8x8_t, >)
374	__packed_cmp(pmsgtu_u8x8, uint8x8_t, uint8x8_t, >)
375	__packed_cmp(pmsge_u8x8, int8x8_t, uint8x8_t, >=)
376	__packed_cmp(pmsgeu_u8x8, uint8x8_t, uint8x8_t, >=)
377	__packed_cmp(pmsle_u8x8, int8x8_t, uint8x8_t, <=)
378	__packed_cmp(pmsleu_u8x8, uint8x8_t, uint8x8_t, <=)
379	__packed_cmp(pmseq_i16x4_u16x4, int16x4_t, uint16x4_t, ==)
380	__packed_cmp(pmseq_u16x4_u16x4, uint16x4_t, uint16x4_t, ==)
381	__packed_cmp(pmsne_i16x4_u16x4, int16x4_t, uint16x4_t, !=)
382	__packed_cmp(pmsne_u16x4_u16x4, uint16x4_t, uint16x4_t, !=)
383	__packed_cmp(pmslt_u16x4, int16x4_t, uint16x4_t, <)
384	__packed_cmp(pmsltu_u16x4, uint16x4_t, uint16x4_t, <)
385	__packed_cmp(pmsgt_u16x4, int16x4_t, uint16x4_t, >)
386	__packed_cmp(pmsgtu_u16x4, uint16x4_t, uint16x4_t, >)
387	__packed_cmp(pmsge_u16x4, int16x4_t, uint16x4_t, >=)
388	__packed_cmp(pmsgeu_u16x4, uint16x4_t, uint16x4_t, >=)
389	__packed_cmp(pmsle_u16x4, int16x4_t, uint16x4_t, <=)
390	__packed_cmp(pmsleu_u16x4, uint16x4_t, uint16x4_t, <=)
391	__packed_cmp(pmseq_i32x2_u32x2, int32x2_t, uint32x2_t, ==)
392	__packed_cmp(pmseq_u32x2_u32x2, uint32x2_t, uint32x2_t, ==)
393	__packed_cmp(pmsne_i32x2_u32x2, int32x2_t, uint32x2_t, !=)
394	__packed_cmp(pmsne_u32x2_u32x2, uint32x2_t, uint32x2_t, !=)
395	__packed_cmp(pmslt_u32x2, int32x2_t, uint32x2_t, <)
396	__packed_cmp(pmsltu_u32x2, uint32x2_t, uint32x2_t, <)
397	__packed_cmp(pmsgt_u32x2, int32x2_t, uint32x2_t, >)
398	__packed_cmp(pmsgtu_u32x2, uint32x2_t, uint32x2_t, >)
399	__packed_cmp(pmsge_u32x2, int32x2_t, uint32x2_t, >=)
400	__packed_cmp(pmsgeu_u32x2, uint32x2_t, uint32x2_t, >=)
401	__packed_cmp(pmsle_u32x2, int32x2_t, uint32x2_t, <=)
402	__packed_cmp(pmsleu_u32x2, uint32x2_t, uint32x2_t, <=)
403
404	/* Packed Shifts (32-bit) */
405	__packed_shift8(psll_s_u8x4, uint8x4_t, <<)
406	__packed_shift8(psll_s_i8x4, int8x4_t, <<)
407	__packed_shift16(psll_s_u16x2, uint16x2_t, <<)
408	__packed_shift16(psll_s_i16x2, int16x2_t, <<)
409	__packed_shift8(psrl_s_u8x4, uint8x4_t, >>)
410	__packed_shift16(psrl_s_u16x2, uint16x2_t, >>)
411	__packed_shift8(psra_s_i8x4, int8x4_t, >>)
412	__packed_shift16(psra_s_i16x2, int16x2_t, >>)
413
414	/* Packed Shifts (64-bit) */
415	__packed_shift8(psll_s_u8x8, uint8x8_t, <<)
416	__packed_shift8(psll_s_i8x8, int8x8_t, <<)
417	__packed_shift16(psll_s_u16x4, uint16x4_t, <<)
418	__packed_shift16(psll_s_i16x4, int16x4_t, <<)
419	__packed_shift32(psll_s_u32x2, uint32x2_t, <<)
420	__packed_shift32(psll_s_i32x2, int32x2_t, <<)
421	__packed_shift8(psrl_s_u8x8, uint8x8_t, >>)
422	__packed_shift16(psrl_s_u16x4, uint16x4_t, >>)
423	__packed_shift32(psrl_s_u32x2, uint32x2_t, >>)
424	__packed_shift8(psra_s_i8x8, int8x8_t, >>)
425	__packed_shift16(psra_s_i16x4, int16x4_t, >>)
426	__packed_shift32(psra_s_i32x2, int32x2_t, >>)
427
428	/* Packed Logical Operations (32-bit) */
429	__packed_binary_op(pand_i8x4, int8x4_t, &)
430	__packed_binary_op(pand_u8x4, uint8x4_t, &)
431	__packed_binary_op(pand_i16x2, int16x2_t, &)
432	__packed_binary_op(pand_u16x2, uint16x2_t, &)
433	__packed_binary_op(por_i8x4, int8x4_t, \|)
434	__packed_binary_op(por_u8x4, uint8x4_t, \|)
435	__packed_binary_op(por_i16x2, int16x2_t, \|)
436	__packed_binary_op(por_u16x2, uint16x2_t, \|)
437	__packed_binary_op(pxor_i8x4, int8x4_t, ^)
438	__packed_binary_op(pxor_u8x4, uint8x4_t, ^)
439	__packed_binary_op(pxor_i16x2, int16x2_t, ^)
440	__packed_binary_op(pxor_u16x2, uint16x2_t, ^)
441	__packed_unary_op(pnot_i8x4, int8x4_t, ~)
442	__packed_unary_op(pnot_u8x4, uint8x4_t, ~)
443	__packed_unary_op(pnot_i16x2, int16x2_t, ~)
444	__packed_unary_op(pnot_u16x2, uint16x2_t, ~)
445
446	/* Packed Logical Operations (64-bit) */
447	__packed_binary_op(pand_i8x8, int8x8_t, &)
448	__packed_binary_op(pand_u8x8, uint8x8_t, &)
449	__packed_binary_op(pand_i16x4, int16x4_t, &)
450	__packed_binary_op(pand_u16x4, uint16x4_t, &)
451	__packed_binary_op(pand_i32x2, int32x2_t, &)
452	__packed_binary_op(pand_u32x2, uint32x2_t, &)
453	__packed_binary_op(por_i8x8, int8x8_t, \|)
454	__packed_binary_op(por_u8x8, uint8x8_t, \|)
455	__packed_binary_op(por_i16x4, int16x4_t, \|)
456	__packed_binary_op(por_u16x4, uint16x4_t, \|)
457	__packed_binary_op(por_i32x2, int32x2_t, \|)
458	__packed_binary_op(por_u32x2, uint32x2_t, \|)
459	__packed_binary_op(pxor_i8x8, int8x8_t, ^)
460	__packed_binary_op(pxor_u8x8, uint8x8_t, ^)
461	__packed_binary_op(pxor_i16x4, int16x4_t, ^)
462	__packed_binary_op(pxor_u16x4, uint16x4_t, ^)
463	__packed_binary_op(pxor_i32x2, int32x2_t, ^)
464	__packed_binary_op(pxor_u32x2, uint32x2_t, ^)
465	__packed_unary_op(pnot_i8x8, int8x8_t, ~)
466	__packed_unary_op(pnot_u8x8, uint8x8_t, ~)
467	__packed_unary_op(pnot_i16x4, int16x4_t, ~)
468	__packed_unary_op(pnot_u16x4, uint16x4_t, ~)
469	__packed_unary_op(pnot_i32x2, int32x2_t, ~)
470	__packed_unary_op(pnot_u32x2, uint32x2_t, ~)
471
472	/* Packed Widening Convert */
473	__packed_widen_convert(pwcvt_i16x4, int16x4_t, int8x4_t)
474	__packed_widen_convert(pwcvt_i32x2, int32x2_t, int16x2_t)
475	__packed_widen_convert(pwcvtu_u16x4, uint16x4_t, uint8x4_t)
476	__packed_widen_convert(pwcvtu_u32x2, uint32x2_t, uint16x2_t)
477	__packed_widen_high4(pwcvth_i16x4, int16x4_t, int8x4_t)
478	__packed_widen_high4(pwcvth_u16x4, uint16x4_t, uint8x4_t)
479	__packed_widen_high2(pwcvth_i32x2, int32x2_t, int16x2_t)
480	__packed_widen_high2(pwcvth_u32x2, uint32x2_t, uint16x2_t)
481
482	/* Packed Reverse (32-bit) */
483	__packed_reverse4(prev_i8x4, int8x4_t)
484	__packed_reverse4(prev_u8x4, uint8x4_t)
485	__packed_reverse2(prev_i16x2, int16x2_t)
486	__packed_reverse2(prev_u16x2, uint16x2_t)
487
488	/* Packed Reverse (64-bit) */
489	__packed_reverse8(prev_i8x8, int8x8_t)
490	__packed_reverse8(prev_u8x8, uint8x8_t)
491	__packed_reverse4(prev_i16x4, int16x4_t)
492	__packed_reverse4(prev_u16x4, uint16x4_t)
493	__packed_reverse2(prev_i32x2, int32x2_t)
494	__packed_reverse2(prev_u32x2, uint32x2_t)
495
496	/* Packed Zip */
497	__packed_zip4(pzip_i8x8, int8x8_t, int8x4_t)
498	__packed_zip4(pzip_u8x8, uint8x8_t, uint8x4_t)
499	__packed_zip2(pzip_i16x4, int16x4_t, int16x2_t)
500	__packed_zip2(pzip_u16x4, uint16x4_t, uint16x2_t)
501
502	/* Packed Unzip */
503	__packed_unzipe4(punzipe_i8x4, int8x4_t, int8x8_t)
504	__packed_unzipo4(punzipo_i8x4, int8x4_t, int8x8_t)
505	__packed_unzipe4(punzipe_u8x4, uint8x4_t, uint8x8_t)
506	__packed_unzipo4(punzipo_u8x4, uint8x4_t, uint8x8_t)
507	__packed_unzipe2(punzipe_i16x2, int16x2_t, int16x4_t)
508	__packed_unzipo2(punzipo_i16x2, int16x2_t, int16x4_t)
509	__packed_unzipe2(punzipe_u16x2, uint16x2_t, uint16x4_t)
510	__packed_unzipo2(punzipo_u16x2, uint16x2_t, uint16x4_t)
511
512	/* Packed Averaging Addition and Subtraction (32-bit) */
513	__packed_binary_builtin(paadd_i8x4, int8x4_t, __builtin_riscv_paadd_i8x4)
514	__packed_binary_builtin(paadd_i16x2, int16x2_t, __builtin_riscv_paadd_i16x2)
515	__packed_binary_builtin(paaddu_u8x4, uint8x4_t, __builtin_riscv_paaddu_u8x4)
516	__packed_binary_builtin(paaddu_u16x2, uint16x2_t, __builtin_riscv_paaddu_u16x2)
517	__packed_binary_builtin(pasub_i8x4, int8x4_t, __builtin_riscv_pasub_i8x4)
518	__packed_binary_builtin(pasub_i16x2, int16x2_t, __builtin_riscv_pasub_i16x2)
519	__packed_binary_builtin(pasubu_u8x4, uint8x4_t, __builtin_riscv_pasubu_u8x4)
520	__packed_binary_builtin(pasubu_u16x2, uint16x2_t, __builtin_riscv_pasubu_u16x2)
521
522	/* Packed Averaging Addition and Subtraction (64-bit) */
523	__packed_binary_builtin(paadd_i8x8, int8x8_t, __builtin_riscv_paadd_i8x8)
524	__packed_binary_builtin(paadd_i16x4, int16x4_t, __builtin_riscv_paadd_i16x4)
525	__packed_binary_builtin(paadd_i32x2, int32x2_t, __builtin_riscv_paadd_i32x2)
526	__packed_binary_builtin(paaddu_u8x8, uint8x8_t, __builtin_riscv_paaddu_u8x8)
527	__packed_binary_builtin(paaddu_u16x4, uint16x4_t, __builtin_riscv_paaddu_u16x4)
528	__packed_binary_builtin(paaddu_u32x2, uint32x2_t, __builtin_riscv_paaddu_u32x2)
529	__packed_binary_builtin(pasub_i8x8, int8x8_t, __builtin_riscv_pasub_i8x8)
530	__packed_binary_builtin(pasub_i16x4, int16x4_t, __builtin_riscv_pasub_i16x4)
531	__packed_binary_builtin(pasub_i32x2, int32x2_t, __builtin_riscv_pasub_i32x2)
532	__packed_binary_builtin(pasubu_u8x8, uint8x8_t, __builtin_riscv_pasubu_u8x8)
533	__packed_binary_builtin(pasubu_u16x4, uint16x4_t, __builtin_riscv_pasubu_u16x4)
534	__packed_binary_builtin(pasubu_u32x2, uint32x2_t, __builtin_riscv_pasubu_u32x2)
535
536	/* Packed Absolute Value and Absolute Difference (32-bit) */
537	__packed_pabs(pabs_i8x4, int8x4_t, uint8x4_t)
538	__packed_pabs(pabs_i16x2, int16x2_t, uint16x2_t)
539	__packed_binary_builtin_cast(pabd_i8x4, int8x4_t, uint8x4_t, __builtin_riscv_pabd_i8x4)
540	__packed_binary_builtin_cast(pabd_i16x2, int16x2_t, uint16x2_t, __builtin_riscv_pabd_i16x2)
541	__packed_binary_builtin_cast(pabdu_u8x4, uint8x4_t, uint8x4_t, __builtin_riscv_pabdu_u8x4)
542	__packed_binary_builtin_cast(pabdu_u16x2, uint16x2_t, uint16x2_t, __builtin_riscv_pabdu_u16x2)
543
544	/* Packed Absolute Value and Absolute Difference (64-bit) */
545	__packed_pabs(pabs_i8x8, int8x8_t, uint8x8_t)
546	__packed_pabs(pabs_i16x4, int16x4_t, uint16x4_t)
547	__packed_binary_builtin_cast(pabd_i8x8, int8x8_t, uint8x8_t, __builtin_riscv_pabd_i8x8)
548	__packed_binary_builtin_cast(pabd_i16x4, int16x4_t, uint16x4_t, __builtin_riscv_pabd_i16x4)
549	__packed_binary_builtin_cast(pabdu_u8x8, uint8x8_t, uint8x8_t, __builtin_riscv_pabdu_u8x8)
550	__packed_binary_builtin_cast(pabdu_u16x4, uint16x4_t, uint16x4_t, __builtin_riscv_pabdu_u16x4)
551
552	/* Packed Reduction Sum (32-bit) */
553	__packed_reduction(predsum_i8x4_i32, int32_t, int8x4_t, __builtin_riscv_predsum_i8x4_i32)
554	__packed_reduction(predsumu_u8x4_u32, uint32_t, uint8x4_t, __builtin_riscv_predsumu_u8x4_u32)
555	__packed_reduction(predsum_i16x2_i32, int32_t, int16x2_t, __builtin_riscv_predsum_i16x2_i32)
556	__packed_reduction(predsumu_u16x2_u32, uint32_t, uint16x2_t, __builtin_riscv_predsumu_u16x2_u32)
557
558	/* Packed Reduction Sum (64-bit) */
559	__packed_reduction(predsum_i8x8_i32, int32_t, int8x8_t, __builtin_riscv_predsum_i8x8_i32)
560	__packed_reduction(predsumu_u8x8_u32, uint32_t, uint8x8_t, __builtin_riscv_predsumu_u8x8_u32)
561	__packed_reduction(predsum_i16x4_i32, int32_t, int16x4_t, __builtin_riscv_predsum_i16x4_i32)
562	__packed_reduction(predsumu_u16x4_u32, uint32_t, uint16x4_t, __builtin_riscv_predsumu_u16x4_u32)
563	__packed_reduction(predsum_i8x8_i64, int64_t, int8x8_t, __builtin_riscv_predsum_i8x8_i64)
564	__packed_reduction(predsumu_u8x8_u64, uint64_t, uint8x8_t, __builtin_riscv_predsumu_u8x8_u64)
565	__packed_reduction(predsum_i16x4_i64, int64_t, int16x4_t, __builtin_riscv_predsum_i16x4_i64)
566	__packed_reduction(predsumu_u16x4_u64, uint64_t, uint16x4_t, __builtin_riscv_predsumu_u16x4_u64)
567	__packed_reduction(predsum_i32x2_i64, int64_t, int32x2_t, __builtin_riscv_predsum_i32x2_i64)
568	__packed_reduction(predsumu_u32x2_u64, uint64_t, uint32x2_t, __builtin_riscv_predsumu_u32x2_u64)
569
570	/* Packed Merge (32-bit) */
571	__packed_merge_builtin(pmerge_u8x4, uint8x4_t, uint8x4_t, __builtin_riscv_pmerge_u8x4)
572	__packed_merge_builtin(pmerge_i8x4, int8x4_t, uint8x4_t, __builtin_riscv_pmerge_i8x4)
573	__packed_merge_builtin(pmerge_u16x2, uint16x2_t, uint16x2_t, __builtin_riscv_pmerge_u16x2)
574	__packed_merge_builtin(pmerge_i16x2, int16x2_t, uint16x2_t, __builtin_riscv_pmerge_i16x2)
575
576	/* Packed Merge (64-bit) */
577	__packed_merge_builtin(pmerge_u8x8, uint8x8_t, uint8x8_t, __builtin_riscv_pmerge_u8x8)
578	__packed_merge_builtin(pmerge_i8x8, int8x8_t, uint8x8_t, __builtin_riscv_pmerge_i8x8)
579	__packed_merge_builtin(pmerge_u16x4, uint16x4_t, uint16x4_t, __builtin_riscv_pmerge_u16x4)
580	__packed_merge_builtin(pmerge_i16x4, int16x4_t, uint16x4_t, __builtin_riscv_pmerge_i16x4)
581	__packed_merge_builtin(pmerge_u32x2, uint32x2_t, uint32x2_t, __builtin_riscv_pmerge_u32x2)
582	__packed_merge_builtin(pmerge_i32x2, int32x2_t, uint32x2_t, __builtin_riscv_pmerge_i32x2)
583
584	/* Packed Absolute Difference Sum (32-bit) */
585	__packed_abdsum(pabdsumu_u8x4_u32, uint32_t, uint8x4_t, __builtin_riscv_pabdsumu_u8x4_u32)
586	__packed_abdsum_acc(pabdsumau_u8x4_u32, uint32_t, uint8x4_t, __builtin_riscv_pabdsumau_u8x4_u32)
587
588	/* Packed Absolute Difference Sum (64-bit) */
589	__packed_abdsum(pabdsumu_u8x8_u32, uint32_t, uint8x8_t, __builtin_riscv_pabdsumu_u8x8_u32)
590	__packed_abdsum(pabdsumu_u8x8_u64, uint64_t, uint8x8_t, __builtin_riscv_pabdsumu_u8x8_u64)
591	__packed_abdsum_acc(pabdsumau_u8x8_u32, uint32_t, uint8x8_t, __builtin_riscv_pabdsumau_u8x8_u32)
592	__packed_abdsum_acc(pabdsumau_u8x8_u64, uint64_t, uint8x8_t, __builtin_riscv_pabdsumau_u8x8_u64)
593
594	/* Packed Saturating Absolute Value (32-bit) */
595	__packed_psabs(psabs_i8x4, int8x4_t, __builtin_riscv_psabs_i8x4)
596	__packed_psabs(psabs_i16x2, int16x2_t, __builtin_riscv_psabs_i16x2)
597
598	/* Packed Saturating Absolute Value (64-bit) */
599	__packed_psabs(psabs_i8x8, int8x8_t, __builtin_riscv_psabs_i8x8)
600	__packed_psabs(psabs_i16x4, int16x4_t, __builtin_riscv_psabs_i16x4)
601
602	// clang-format on
603
604	#undef __packed_splat2
605	#undef __packed_splat4
606	#undef __packed_splat8
607	#undef __packed_splat
608	#undef __packed_shift
609	#undef __packed_shift8
610	#undef __packed_shift16
611	#undef __packed_shift32
612	#undef __packed_scalar_binary_op
613	#undef __packed_binary_op
614	#undef __packed_unary_op
615	#undef __packed_binary_builtin
616	#undef __packed_sh1add
617	#undef __packed_sh1sadd
618	#undef __packed_cmp
619	#undef __packed_pabs
620	#undef __packed_binary_builtin_cast
621	#undef __packed_reduction
622	#undef __packed_merge_builtin
623	#undef __packed_psabs
624	#undef __packed_widen_convert
625	#undef __packed_widen_high2
626	#undef __packed_widen_high4
627	#undef __packed_reverse2
628	#undef __packed_reverse4
629	#undef __packed_reverse8
630	#undef __packed_zip2
631	#undef __packed_zip4
632	#undef __packed_unzipe2
633	#undef __packed_unzipe4
634	#undef __packed_unzipo2
635	#undef __packed_unzipo4
636	#undef __packed_abdsum
637	#undef __packed_abdsum_acc
638	#undef __DEFAULT_FN_ATTRS
639
640	#if defined(__cplusplus)
641	}
642	#endif
643
644	#endif /* __RISCV_PACKED_SIMD_H */

lib/include/riscv_vector.h+43

...	@@ -20,6 +20,35 @@ extern "C" {	...	@@ -20,6 +20,35 @@ extern "C" {
20		20
21	#pragma clang riscv intrinsic vector	21	#pragma clang riscv intrinsic vector
22		22
		23	#define __riscv_intrinsic_v 1
		24	#define __riscv_intrinsic_zvabd 1
		25	#define __riscv_intrinsic_zvbb 1
		26	#define __riscv_intrinsic_zvbc 1
		27	#define __riscv_intrinsic_zvdot4a8i 1
		28	#define __riscv_intrinsic_zve32f 1
		29	#define __riscv_intrinsic_zve32x 1
		30	#define __riscv_intrinsic_zve64d 1
		31	#define __riscv_intrinsic_zve64f 1
		32	#define __riscv_intrinsic_zve64x 1
		33	#define __riscv_intrinsic_zvfbfa 1
		34	#define __riscv_intrinsic_zvfbfmin 1
		35	#define __riscv_intrinsic_zvfbfwma 1
		36	#define __riscv_intrinsic_zvfh 1
		37	#define __riscv_intrinsic_zvfhmin 1
		38	#define __riscv_intrinsic_zvfofp8min 1
		39	#define __riscv_intrinsic_zvkb 1
		40	#define __riscv_intrinsic_zvkg 1
		41	#define __riscv_intrinsic_zvkn 1
		42	#define __riscv_intrinsic_zvknc 1
		43	#define __riscv_intrinsic_zvkned 1
		44	#define __riscv_intrinsic_zvkng 1
		45	#define __riscv_intrinsic_zvknha 1
		46	#define __riscv_intrinsic_zvknhb 1
		47	#define __riscv_intrinsic_zvks 1
		48	#define __riscv_intrinsic_zvksc 1
		49	#define __riscv_intrinsic_zvksed 1
		50	#define __riscv_intrinsic_zvksg 1
		51	#define __riscv_intrinsic_zvksh 1
23		52
24	enum __RISCV_FRM {	53	enum __RISCV_FRM {
25	__RISCV_FRM_RNE = 0,	54	__RISCV_FRM_RNE = 0,
...	@@ -415,6 +444,20 @@ typedef __rvv_bfloat16m2x4_t vbfloat16m2x4_t;	...	@@ -415,6 +444,20 @@ typedef __rvv_bfloat16m2x4_t vbfloat16m2x4_t;
415	typedef __rvv_bfloat16m4_t vbfloat16m4_t;	444	typedef __rvv_bfloat16m4_t vbfloat16m4_t;
416	typedef __rvv_bfloat16m4x2_t vbfloat16m4x2_t;	445	typedef __rvv_bfloat16m4x2_t vbfloat16m4x2_t;
417	typedef __rvv_bfloat16m8_t vbfloat16m8_t;	446	typedef __rvv_bfloat16m8_t vbfloat16m8_t;
		447	typedef __rvv_float8e4m3mf8_t vfloat8e4m3mf8_t;
		448	typedef __rvv_float8e4m3mf4_t vfloat8e4m3mf4_t;
		449	typedef __rvv_float8e4m3mf2_t vfloat8e4m3mf2_t;
		450	typedef __rvv_float8e4m3m1_t vfloat8e4m3m1_t;
		451	typedef __rvv_float8e4m3m2_t vfloat8e4m3m2_t;
		452	typedef __rvv_float8e4m3m4_t vfloat8e4m3m4_t;
		453	typedef __rvv_float8e4m3m8_t vfloat8e4m3m8_t;
		454	typedef __rvv_float8e5m2mf8_t vfloat8e5m2mf8_t;
		455	typedef __rvv_float8e5m2mf4_t vfloat8e5m2mf4_t;
		456	typedef __rvv_float8e5m2mf2_t vfloat8e5m2mf2_t;
		457	typedef __rvv_float8e5m2m1_t vfloat8e5m2m1_t;
		458	typedef __rvv_float8e5m2m2_t vfloat8e5m2m2_t;
		459	typedef __rvv_float8e5m2m4_t vfloat8e5m2m4_t;
		460	typedef __rvv_float8e5m2m8_t vfloat8e5m2m8_t;
418		461
419	#ifdef __cplusplus	462	#ifdef __cplusplus
420	}	463	}

lib/include/sifive_vector.h+18

...	@@ -13,6 +13,24 @@	...	@@ -13,6 +13,24 @@
13		13
14	#pragma clang riscv intrinsic sifive_vector	14	#pragma clang riscv intrinsic sifive_vector
15		15
		16	#define __riscv_intrinsic_xsfmm32a16f 1
		17	#define __riscv_intrinsic_xsfmm32a32f 1
		18	#define __riscv_intrinsic_xsfmm32a8f 1
		19	#define __riscv_intrinsic_xsfmm32a8i 1
		20	#define __riscv_intrinsic_xsfmm32a 1
		21	#define __riscv_intrinsic_xsfmm64a64f 1
		22	#define __riscv_intrinsic_xsfmmbase 1
		23	#define __riscv_intrinsic_xsfvcp 1
		24	#define __riscv_intrinsic_xsfvfbfexp16e 1
		25	#define __riscv_intrinsic_xsfvfexp16e 1
		26	#define __riscv_intrinsic_xsfvfexp32e 1
		27	#define __riscv_intrinsic_xsfvfexpa 1
		28	#define __riscv_intrinsic_xsfvfexpa64e 1
		29	#define __riscv_intrinsic_xsfvfnrclipxfqf 1
		30	#define __riscv_intrinsic_xsfvfwmaccqqq 1
		31	#define __riscv_intrinsic_xsfvqmaccdod 1
		32	#define __riscv_intrinsic_xsfvqmaccqoq 1
		33
16	#define __riscv_sf_vc_x_se_u8mf4(p27_26, p24_20, p11_7, rs1, vl) \	34	#define __riscv_sf_vc_x_se_u8mf4(p27_26, p24_20, p11_7, rs1, vl) \
17	__riscv_sf_vc_x_se(p27_26, p24_20, p11_7, (uint8_t)rs1, 8, 6, vl)	35	__riscv_sf_vc_x_se(p27_26, p24_20, p11_7, (uint8_t)rs1, 8, 6, vl)
18	#define __riscv_sf_vc_x_se_u8mf2(p27_26, p24_20, p11_7, rs1, vl) \	36	#define __riscv_sf_vc_x_se_u8mf2(p27_26, p24_20, p11_7, rs1, vl) \

lib/include/spirvintrin.h+2-29

...	@@ -27,9 +27,6 @@ _Pragma("omp begin declare variant match(device = {arch(spirv64)})");	...	@@ -27,9 +27,6 @@ _Pragma("omp begin declare variant match(device = {arch(spirv64)})");
27	#define __gpu_global __attribute__((address_space(1)))	27	#define __gpu_global __attribute__((address_space(1)))
28	#define __gpu_generic __attribute__((address_space(4)))	28	#define __gpu_generic __attribute__((address_space(4)))
29		29
30	// Attribute to declare a function as a kernel.
31	#define __gpu_kernel __attribute__((device_kernel, visibility("protected")))
32
33	// Returns the number of workgroups in the 'x' dimension of the grid.	30	// Returns the number of workgroups in the 'x' dimension of the grid.
34	_DEFAULT_FN_ATTRS static __inline__ uint32_t __gpu_num_blocks_x(void) {	31	_DEFAULT_FN_ATTRS static __inline__ uint32_t __gpu_num_blocks_x(void) {
35	return __builtin_spirv_num_workgroups(0);	32	return __builtin_spirv_num_workgroups(0);
...	@@ -146,37 +143,13 @@ __gpu_shuffle_idx_u32(uint64_t __lane_mask, uint32_t __idx, uint32_t __x,	...	@@ -146,37 +143,13 @@ __gpu_shuffle_idx_u32(uint64_t __lane_mask, uint32_t __idx, uint32_t __x,
146	return __builtin_spirv_subgroup_shuffle(__x, __lane);	143	return __builtin_spirv_subgroup_shuffle(__x, __lane);
147	}	144	}
148		145
149	// Returns a bitmask marking all lanes that have the same value of __x.
150	_DEFAULT_FN_ATTRS static __inline__ uint64_t
151	__gpu_match_any_u32(uint64_t __lane_mask, uint32_t __x) {
152	return __gpu_match_any_u32_impl(__lane_mask, __x);
153	}
154
155	// Returns a bitmask marking all lanes that have the same value of __x.
156	_DEFAULT_FN_ATTRS static __inline__ uint64_t
157	__gpu_match_any_u64(uint64_t __lane_mask, uint64_t __x) {
158	return __gpu_match_any_u64_impl(__lane_mask, __x);
159	}
160
161	// Returns the current lane mask if every lane contains __x.
162	_DEFAULT_FN_ATTRS static __inline__ uint64_t
163	__gpu_match_all_u32(uint64_t __lane_mask, uint32_t __x) {
164	return __gpu_match_all_u32_impl(__lane_mask, __x);
165	}
166
167	// Returns the current lane mask if every lane contains __x.
168	_DEFAULT_FN_ATTRS static __inline__ uint64_t
169	__gpu_match_all_u64(uint64_t __lane_mask, uint64_t __x) {
170	return __gpu_match_all_u64_impl(__lane_mask, __x);
171	}
172
173	// SPIR-V does not expose this, always return false.	146	// SPIR-V does not expose this, always return false.
174	_DEFAULT_FN_ATTRS static __inline__ bool __gpu_is_ptr_local(void *ptr) {	147	_DEFAULT_FN_ATTRS static __inline__ bool __gpu_is_ptr_local(const void *ptr) {
175	return 0;	148	return 0;
176	}	149	}
177		150
178	// SPIR-V does not expose this, always return false.	151	// SPIR-V does not expose this, always return false.
179	_DEFAULT_FN_ATTRS static __inline__ bool __gpu_is_ptr_private(void *ptr) {	152	_DEFAULT_FN_ATTRS static __inline__ bool __gpu_is_ptr_private(const void *ptr) {
180	return 0;	153	return 0;
181	}	154	}
182		155

lib/include/stdint.h+5-14

 @@ -805,25 +805,16 @@ typedef __UINTMAX_TYPE__ uintmax_t;
 #endif
 /* C99 7.18.3 Limits of other integer types. */
-#define SIG_ATOMIC_MIN __INTN_MIN(__SIG_ATOMIC_WIDTH__)
+#define SIG_ATOMIC_MIN __SIG_ATOMIC_MIN__
-#define SIG_ATOMIC_MAX __INTN_MAX(__SIG_ATOMIC_WIDTH__)
+#define SIG_ATOMIC_MAX __SIG_ATOMIC_MAX__
-#ifdef __WINT_UNSIGNED__
+#define WINT_MIN __WINT_MIN__
-# define WINT_MIN       __UINTN_C(__WINT_WIDTH__, 0)
+#define WINT_MAX __WINT_MAX__
-# define WINT_MAX       __UINTN_MAX(__WINT_WIDTH__)
-#else
-# define WINT_MIN       __INTN_MIN(__WINT_WIDTH__)
-# define WINT_MAX       __INTN_MAX(__WINT_WIDTH__)
-#endif
 #ifndef WCHAR_MAX
 # define WCHAR_MAX __WCHAR_MAX__
 #endif
 #ifndef WCHAR_MIN
-# if __WCHAR_MAX__ == __INTN_MAX(__WCHAR_WIDTH__)
+#define WCHAR_MIN __WCHAR_MIN__
-#  define WCHAR_MIN __INTN_MIN(__WCHAR_WIDTH__)
-# else
-#  define WCHAR_MIN __UINTN_C(__WCHAR_WIDTH__, 0)
-# endif
 #endif
 /* 7.18.4.2 Macros for greatest-width integer constants. */

lib/include/vecintrin.h+1-1

...	@@ -207,7 +207,7 @@ vec_insert(unsigned long long __scalar, __vector unsigned long long __vec,	...	@@ -207,7 +207,7 @@ vec_insert(unsigned long long __scalar, __vector unsigned long long __vec,
207	#if __ARCH__ >= 12	207	#if __ARCH__ >= 12
208	static inline __ATTRS_o_ai __vector float	208	static inline __ATTRS_o_ai __vector float
209	vec_insert(float __scalar, __vector float __vec, int __index) {	209	vec_insert(float __scalar, __vector float __vec, int __index) {
210	__vec[__index & 1] = __scalar;	210	__vec[__index & 3] = __scalar;
211	return __vec;	211	return __vec;
212	}	212	}
213	#endif	213	#endif

lib/include/wasm_simd128.h+17

...	@@ -45,6 +45,7 @@ typedef int __i32x2 __attribute__((__vector_size__(8), __aligned__(8)));	...	@@ -45,6 +45,7 @@ typedef int __i32x2 __attribute__((__vector_size__(8), __aligned__(8)));
45	typedef unsigned int __u32x2	45	typedef unsigned int __u32x2
46	__attribute__((__vector_size__(8), __aligned__(8)));	46	__attribute__((__vector_size__(8), __aligned__(8)));
47	typedef float __f32x2 __attribute__((__vector_size__(8), __aligned__(8)));	47	typedef float __f32x2 __attribute__((__vector_size__(8), __aligned__(8)));
		48	typedef __fp16 __f16x4 __attribute__((__vector_size__(8), __aligned__(8)));
48		49
49	#define __DEFAULT_FN_ATTRS \	50	#define __DEFAULT_FN_ATTRS \
50	__attribute__((__always_inline__, __nodebug__, __target__("simd128"), \	51	__attribute__((__always_inline__, __nodebug__, __target__("simd128"), \
...	@@ -2010,6 +2011,22 @@ static __inline__ v128_t __FP16_FN_ATTRS wasm_f16x8_convert_u16x8(v128_t __a) {	...	@@ -2010,6 +2011,22 @@ static __inline__ v128_t __FP16_FN_ATTRS wasm_f16x8_convert_u16x8(v128_t __a) {
2010	return (v128_t) __builtin_convertvector((__u16x8)__a, __f16x8);	2011	return (v128_t) __builtin_convertvector((__u16x8)__a, __f16x8);
2011	}	2012	}
2012		2013
		2014	static __inline__ v128_t __FP16_FN_ATTRS
		2015	wasm_f32x4_promote_low_f16x8(v128_t __a) {
		2016	return (v128_t) __builtin_convertvector(
		2017	(__f16x4){((__f16x8)__a)[0], ((__f16x8)__a)[1], ((__f16x8)__a)[2],
		2018	((__f16x8)__a)[3]},
		2019	__f32x4);
		2020	}
		2021
		2022	static __inline__ v128_t __FP16_FN_ATTRS
		2023	wasm_f16x8_demote_f32x4_zero(v128_t __a) {
		2024	return (v128_t) __builtin_convertvector(
		2025	__builtin_shufflevector((__f32x4)__a, (__f32x4){0, 0, 0, 0}, 0, 1, 2, 3,
		2026	4, 5, 6, 7),
		2027	__f16x8);
		2028	}
		2029
2013	static __inline__ v128_t __FP16_FN_ATTRS wasm_f16x8_relaxed_madd(v128_t __a,	2030	static __inline__ v128_t __FP16_FN_ATTRS wasm_f16x8_relaxed_madd(v128_t __a,
2014	v128_t __b,	2031	v128_t __b,
2015	v128_t __c) {	2032	v128_t __c) {

lib/include/xmmintrin.h+8-7

 @@ -341,7 +341,8 @@ _mm_rsqrt_ps(__m128 __a)
 /// \returns A 128-bit vector of [4 x float] whose lower 32 bits contain the
 ///    minimum value between both operands. The upper 96 bits are copied from
 ///    the upper 96 bits of the first source operand.
-static __inline__ __m128 __DEFAULT_FN_ATTRS _mm_min_ss(__m128 __a, __m128 __b) {
+static __inline__ __m128 __DEFAULT_FN_ATTRS_CONSTEXPR _mm_min_ss(__m128 __a,
+                                                                 __m128 __b) {
   return __builtin_ia32_minss((__v4sf)__a, (__v4sf)__b);
 }
 @@ -384,7 +385,8 @@ static __inline__ __m128 __DEFAULT_FN_ATTRS_CONSTEXPR _mm_min_ps(__m128 __a,
 /// \returns A 128-bit vector of [4 x float] whose lower 32 bits contain the
 ///    maximum value between both operands. The upper 96 bits are copied from
 ///    the upper 96 bits of the first source operand.
-static __inline__ __m128 __DEFAULT_FN_ATTRS _mm_max_ss(__m128 __a, __m128 __b) {
+static __inline__ __m128 __DEFAULT_FN_ATTRS_CONSTEXPR _mm_max_ss(__m128 __a,
+                                                                 __m128 __b) {
   return __builtin_ia32_maxss((__v4sf)__a, (__v4sf)__b);
 }
 @@ -2569,11 +2571,10 @@ _mm_avg_pu16(__m64 __a, __m64 __b) {
 /// \returns A 64-bit integer vector whose lower 16 bits contain the sums of the
 ///    sets of absolute differences between both operands. The upper bits are
 ///    cleared.
-static __inline__ __m64 __DEFAULT_FN_ATTRS_SSE2
+static __inline__ __m64 __DEFAULT_FN_ATTRS_SSE2_CONSTEXPR
-_mm_sad_pu8(__m64 __a, __m64 __b)
+_mm_sad_pu8(__m64 __a, __m64 __b) {
-{
+  return __trunc64(__builtin_ia32_psadbw128((__v16qu)__zext128(__a),
-  return __trunc64(__builtin_ia32_psadbw128((__v16qi)__zext128(__a),
+                                            (__v16qu)__zext128(__b)));
-                                            (__v16qi)__zext128(__b)));
 }
 #if defined(__cplusplus)

lib/libc/include/any-darwin-any/os/os_sync_wait_on_address.h created+378

...	@@ -0,0 +1,378 @@
1	/*
2	* Copyright (c) 2016 Apple Inc. All rights reserved.
3	*
4	* @APPLE_APACHE_LICENSE_HEADER_START@
5	*
6	* Licensed under the Apache License, Version 2.0 (the "License");
7	* you may not use this file except in compliance with the License.
8	* You may obtain a copy of the License at
9	*
10	* http://www.apache.org/licenses/LICENSE-2.0
11	*
12	* Unless required by applicable law or agreed to in writing, software
13	* distributed under the License is distributed on an "AS IS" BASIS,
14	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15	* See the License for the specific language governing permissions and
16	* limitations under the License.
17	*
18	* @APPLE_APACHE_LICENSE_HEADER_END@
19	*/
20
21	#ifndef __OS_SYNC_WAIT_ON_ADDRESS__
22	#define __OS_SYNC_WAIT_ON_ADDRESS__
23
24	#include <Availability.h>
25	#include <stddef.h>
26	#include <stdint.h>
27	#include <os/base.h>
28	#include <os/clock.h>
29
30	OS_ASSUME_NONNULL_BEGIN
31
32	/*! @header
33	* Low-level Darwin's futex style APIs.
34	*/
35
36	__BEGIN_DECLS
37
38	#define OS_WAIT_ON_ADDR_AVAILABILITY \
39	__API_AVAILABLE(macos(14.4), ios(17.4), tvos(17.4), watchos(10.4))
40
41	/*!
42	* @typedef os_sync_wait_on_address_flags_t
43	*
44	* @const OS_SYNC_WAIT_ON_ADDRESS_NONE
45	* This flag should be used as a default flag when no other flags listed below
46	* are required.
47	*
48	* @const OS_SYNC_WAIT_ON_ADDRESS_SHARED
49	* This flag should be used when synchronizing among multiple processes by
50	* placing the @addr passed to os_sync_wait_on_address and its variants
51	* in a shared memory region.
52	*
53	* When using this flag, it is important to pass OS_SYNC_WAKE_BY_ADDRESS_SHARED
54	* flag along with the exact same @addr to os_sync_wake_by_address_any and
55	* its variants to correctly find and wake up blocked waiters on the @addr.
56	*
57	* This flag should not be used when synchronizing among multiple threads of
58	* a single process. It allows the kernel to perform performance optimizations
59	* as the @addr is local to the calling process.
60	*/
61	OS_OPTIONS(os_sync_wait_on_address_flags, uint32_t,
62	OS_SYNC_WAIT_ON_ADDRESS_NONE
63	OS_WAIT_ON_ADDR_AVAILABILITY = 0x00000000,
64	OS_SYNC_WAIT_ON_ADDRESS_SHARED
65	OS_WAIT_ON_ADDR_AVAILABILITY = 0x00000001,
66	);
67
68	/*!
69	* @function os_sync_wait_on_address
70	*
71	* This function provides an atomic compare-and-wait functionality that
72	* can be used to implement other higher level synchronization primitives.
73	*
74	* It reads a value from @addr, compares it to expected @value and blocks
75	* the calling thread if they are equal. This sequence of operations is
76	* done atomically with respect to other concurrent operations that can
77	* be performed on this @addr by other threads using this same function
78	* or os_sync_wake_by_addr variants. At this point, the blocked calling
79	* thread is considered to be a waiter on this @addr, waiting to be woken
80	* up by a call to os_sync_wake_by_addr variants. If the value at @addr
81	* turns out to be different than expected, the calling thread returns
82	* immediately without blocking.
83	*
84	* This function is expected to be used for implementing synchronization
85	* primitives that do not have a sense of ownership (e.g. condition
86	* variables, semaphores) as it does not provide priority inversion avoidance.
87	* For locking primitives, it is recommended that you use existing OS
88	* primitives such as os_unfair_lock API family / pthread mutex or
89	* std::mutex.
90	*
91	* @param addr
92	* The userspace address to be used for atomic compare-and-wait.
93	* This address must be aligned to @size.
94	*
95	* @param value
96	* The value expected at @addr.
97	*
98	* @param size
99	* The size of @value, in bytes. This can be either 4 or 8 today.
100	* For @value of @size 4 bytes, the upper 4 bytes of @value are ignored.
101	*
102	* @param flags
103	* Flags to alter behavior of os_sync_wait_on_address.
104	* See os_sync_wait_on_address_flags_t.
105	*
106	* @return
107	* If the calling thread is woken up by a call to os_sync_wake_by_addr
108	* variants or the value at @addr is different than expected, this function
109	* returns successfully and the return value indicates the number
110	* of outstanding waiters blocked on this address.
111	* In the event of an error, returns -1 with errno set to indicate the error.
112	*
113	* EINVAL : Invalid flags or size.
114	* EINVAL : The @addr passed is NULL or misaligned.
115	* EINVAL : The operation associated with existing kernel state
116	* at this @addr is inconsistent with what the caller
117	* has requested.
118	* It is important to make sure consistent values are
119	* passed across wait and wake APIs for @addr, @size
120	* and the shared memory specification
121	* (See os_sync_wait_on_address_flags_t).
122	*
123	* It is possible for the os_sync_wait_on_address and its variants to perform
124	* an early return in the event of following errors where user may want to
125	* re-try the wait operation. E.g. low memory conditions could cause such early
126	* return.
127	* It is important to read the current value at the @addr before re-trying
128	* to ensure that the new value still requires waiting on @addr.
129	*
130	* ENOMEM : Unable to allocate memory for kernel internal data
131	* structures.
132	* EINTR : The syscall was interrupted / spurious wake up.
133	* EFAULT : Unable to read value from the @addr. Kernel copyin failed.
134	* It is possible to receive EFAULT error in following cases:
135	* 1. The @addr is an invalid address. This is a programmer error.
136	* 2. The @addr is valid; but, this is a transient error such as
137	* due to low memory conditions. User may want to re-try the wait
138	* operation.
139	* Following code snippet illustrates a possible re-try loop.
140	* <code>
141	* retry:
142	* current = atomic_load_explicit(addr, memory_order_relaxed);
143	* if (current != expected) {
144	* int ret = os_sync_wait_on_address(addr, current, size, flags);
145	* if ((ret < 0) && ((errno == EINTR) \|\| (errno == EFAULT))) {
146	* goto retry;
147	* }
148	* }
149	* </code>
150	*/
151	OS_WAIT_ON_ADDR_AVAILABILITY
152	OS_EXPORT OS_NOTHROW OS_NONNULL_ALL
153	int
154	os_sync_wait_on_address(void *addr,
155	uint64_t value,
156	size_t size,
157	os_sync_wait_on_address_flags_t flags);
158
159	/*!
160	* @function os_sync_wait_on_address_with_deadline
161	*
162	* This function is a variant of os_sync_wait_on_address that
163	* allows the calling thread to specify a deadline
164	* until which it is willing to block.
165	*
166	* @param addr
167	* The userspace address to be used for atomic compare-and-wait.
168	* This address must be aligned to @size.
169	*
170	* @param value
171	* The value expected at @addr.
172	*
173	* @param size
174	* The size of @value, in bytes. This can be either 4 or 8 today.
175	* For @value of @size 4 bytes, the upper 4 bytes of @value are ignored.
176	*
177	* @param flags
178	* Flags to alter behavior of os_sync_wait_on_address_with_deadline.
179	* See os_sync_wait_on_address_flags_t.
180	*
181	* @param clockid
182	* This value anchors @deadline argument to a specific clock id.
183	* See os_clockid_t.
184	*
185	* @param deadline
186	* This value is used to specify a deadline until which the calling
187	* thread is willing to block.
188	* Passing zero for the @deadline results in an error being returned.
189	* It is recommended to use os_sync_wait_on_address API to block
190	* indefinitely until woken up by a call to os_sync_wake_by_address_any
191	* or os_sync_wake_by_address_all APIs.
192	*
193	* @return
194	* If the calling thread is woken up by a call to os_sync_wake_by_addr
195	* variants or the value at @addr is different than expected, this function
196	* returns successfully and the return value indicates the number
197	* of outstanding waiters blocked on this address.
198	* In the event of an error, returns -1 with errno set to indicate the error.
199	*
200	* In addition to errors returned by os_sync_wait_on_address, this function
201	* can return the following additional error codes.
202	*
203	* EINVAL : Invalid clock id.
204	* EINVAL : The @deadline passed is 0.
205	* ETIMEDOUT : Deadline expired.
206	*/
207	OS_WAIT_ON_ADDR_AVAILABILITY
208	OS_EXPORT OS_NOTHROW OS_NONNULL_ALL
209	int
210	os_sync_wait_on_address_with_deadline(void *addr,
211	uint64_t value,
212	size_t size,
213	os_sync_wait_on_address_flags_t flags,
214	os_clockid_t clockid,
215	uint64_t deadline);
216
217	/*!
218	* @function os_sync_wait_on_address_with_timeout
219	*
220	* This function is a variant of os_sync_wait_on_address that
221	* allows the calling thread to specify a timeout
222	* until which it is willing to block.
223	*
224	* @param addr
225	* The userspace address to be used for atomic compare-and-wait.
226	* This address must be aligned to @size.
227	*
228	* @param value
229	* The value expected at @addr.
230	*
231	* @param size
232	* The size of @value, in bytes. This can be either 4 or 8 today.
233	* For @value of @size 4 bytes, the upper 4 bytes of @value are ignored.
234	*
235	* @param flags
236	* Flags to alter behavior of os_sync_wait_on_address_with_timeout.
237	* See os_sync_wait_on_address_flags_t.
238	*
239	* @param clockid
240	* This value anchors @timeout_ns argument to a specific clock id.
241	* See os_clockid_t.
242	*
243	* @param timeout_ns
244	* This value is used to specify a timeout in nanoseconds until which
245	* the calling thread is willing to block.
246	* Passing zero for the @timeout_ns results in an error being returned.
247	* It is recommended to use os_sync_wait_on_address API to block
248	* indefinitely until woken up by a call to os_sync_wake_by_address_any
249	* or os_sync_wake_by_address_all APIs.
250	*
251	* @return
252	* If the calling thread is woken up by a call to os_sync_wake_by_address
253	* variants or the value at @addr is different than expected, this function
254	* returns successfully and the return value indicates the number
255	* of outstanding waiters blocked on this address.
256	* In the event of an error, returns -1 with errno set to indicate the error.
257	*
258	* In addition to errors returned by os_sync_wait_on_address, this function
259	* can return the following additional error codes.
260	*
261	* EINVAL : Invalid clock id.
262	* EINVAL : The @timeout_ns passed is 0.
263	* ETIMEDOUT : Timeout expired.
264	*/
265	OS_WAIT_ON_ADDR_AVAILABILITY
266	OS_EXPORT OS_NOTHROW OS_NONNULL_ALL
267	int
268	os_sync_wait_on_address_with_timeout(void *addr,
269	uint64_t value,
270	size_t size,
271	os_sync_wait_on_address_flags_t flags,
272	os_clockid_t clockid,
273	uint64_t timeout_ns);
274
275	/*!
276	* @typedef os_sync_wake_by_address_flags_t
277	*
278	* @const OS_SYNC_WAKE_BY_ADDRESS_NONE
279	* This flag should be used as a default flag when no other flags listed below
280	* are required.
281	*
282	* @const OS_SYNC_WAKE_BY_ADDRESS_SHARED
283	* This flag should be used when synchronizing among multiple processes by
284	* placing the @addr passed to os_sync_wake_by_address_any and its variants
285	* in a shared memory region.
286	*
287	* When using this flag, it is important to pass OS_SYNC_WAIT_ON_ADDRESS_SHARED
288	* flag along with the exact same @addr to os_sync_wait_on_address and
289	* its variants to correctly find and wake up blocked waiters on the @addr.
290	*
291	* This flag should not be used when synchronizing among multiple threads of
292	* a single process. It allows the kernel to perform performance optimizations
293	* as the @addr is local the calling process.
294	*/
295	OS_OPTIONS(os_sync_wake_by_address_flags, uint32_t,
296	OS_SYNC_WAKE_BY_ADDRESS_NONE
297	OS_WAIT_ON_ADDR_AVAILABILITY = 0x00000000,
298	OS_SYNC_WAKE_BY_ADDRESS_SHARED
299	OS_WAIT_ON_ADDR_AVAILABILITY = 0x00000001,
300	);
301
302	/*!
303	* @function os_sync_wake_by_address_any
304	*
305	* This function wakes up one waiter out of all those blocked in os_sync_wait_on_address
306	* or its variants on the @addr. No guarantee is provided about which
307	* specific waiter is woken up.
308	*
309	* @param addr
310	* The userspace address to be used for waking up the blocked waiter.
311	* It should be same as what is passed to os_sync_wait_on_address or its variants.
312	*
313	* @param size
314	* The size of lock value, in bytes. This can be either 4 or 8 today.
315	* It should be same as what is passed to os_sync_wait_on_address or its variants.
316	*
317	* @param flags
318	* Flags to alter behavior of os_sync_wake_by_address_any.
319	* See os_sync_wake_by_address_flags_t.
320	*
321	* @return
322	* Returns 0 on success.
323	* In the event of an error, returns -1 with errno set to indicate the error.
324	*
325	* EINVAL : Invalid flags or size.
326	* EINVAL : The @addr passed is NULL.
327	* EINVAL : The operation associated with existing kernel state
328	* at this @addr is inconsistent with what caller
329	* has requested.
330	* It is important to make sure consistent values are
331	* passed across wait and wake APIs for @addr, @size
332	* and the shared memory specification
333	* (See os_sync_wake_by_address_flags_t).
334	* ENOENT : No waiter(s) found waiting on the @addr.
335	*/
336	OS_WAIT_ON_ADDR_AVAILABILITY
337	OS_EXPORT OS_NOTHROW OS_NONNULL_ALL
338	int
339	os_sync_wake_by_address_any(void *addr,
340	size_t size,
341	os_sync_wake_by_address_flags_t flags);
342
343	/*!
344	* @function os_sync_wake_by_address_all
345	*
346	* This function is a variant of os_sync_wake_by_address_any that wakes up all waiters
347	* blocked in os_sync_wait_on_address or its variants.
348	*
349	* @param addr
350	* The userspace address to be used for waking up the blocked waiters.
351	* It should be same as what is passed to os_sync_wait_on_address or its variants.
352	*
353	* @param size
354	* The size of lock value, in bytes. This can be either 4 or 8 today.
355	* It should be same as what is passed to os_sync_wait_on_address or its variants.
356	*
357	* @param flags
358	* Flags to alter behavior of os_sync_wake_by_address_all.
359	* See os_sync_wake_by_address_flags_t.
360	*
361	* @return
362	* Returns 0 on success.
363	* In the event of an error, returns -1 with errno set to indicate the error.
364	*
365	* This function returns same error codes as returned by os_sync_wait_on_address.
366	*/
367	OS_WAIT_ON_ADDR_AVAILABILITY
368	OS_EXPORT OS_NOTHROW OS_NONNULL_ALL
369	int
370	os_sync_wake_by_address_all(void *addr,
371	size_t size,
372	os_sync_wake_by_address_flags_t flags);
373
374	__END_DECLS
375
376	OS_ASSUME_NONNULL_END
377
378	#endif // __OS_SYNC_WAIT_ON_ADDRESS__

lib/libc/include/generic-netbsd/machine/signal.h+1-2

...	@@ -33,8 +33,7 @@	...	@@ -33,8 +33,7 @@
33	#define _RISCV_SIGNAL_H_	33	#define _RISCV_SIGNAL_H_
34		34
35	#ifndef _LOCORE	35	#ifndef _LOCORE
36	// zig patch: Clang does not define __SIG_ATOMIC_TYPE__	36	typedef __SIG_ATOMIC_TYPE__ sig_atomic_t;
37	typedef int sig_atomic_t;
38	#endif	37	#endif
39		38
40	#endif /* _RISCV_SIGNAL_H_ */	39	#endif /* _RISCV_SIGNAL_H_ */

lib/libc/include/generic-netbsd/riscv/signal.h+1-2

...	@@ -33,8 +33,7 @@	...	@@ -33,8 +33,7 @@
33	#define _RISCV_SIGNAL_H_	33	#define _RISCV_SIGNAL_H_
34		34
35	#ifndef _LOCORE	35	#ifndef _LOCORE
36	// zig patch: Clang does not define __SIG_ATOMIC_TYPE__	36	typedef __SIG_ATOMIC_TYPE__ sig_atomic_t;
37	typedef int sig_atomic_t;
38	#endif	37	#endif
39		38
40	#endif /* _RISCV_SIGNAL_H_ */	39	#endif /* _RISCV_SIGNAL_H_ */

lib/libc/include/generic-netbsd/riscv/wchar_limits.h+1-11

...	@@ -1,13 +1,3 @@	...	@@ -1,13 +1,3 @@
1	/* $NetBSD: wchar_limits.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */	1	/* $NetBSD: wchar_limits.h,v 1.1 2014/09/19 17:36:26 matt Exp $ */
2		2
3	// zig patch: https://github.com/llvm/llvm-project/issues/199678	3	#include <sys/common_wchar_limits.h>
4	#ifndef _RISCV_WCHAR_LIMITS_H_
5	#define _RISCV_WCHAR_LIMITS_H_
6
7	#define WCHAR_MIN (-0x7fffffff-1) /* wchar_t */
8	#define WCHAR_MAX 0x7fffffff /* wchar_t */
9
10	#define WINT_MIN (-0x7fffffff-1) /* wint_t */
11	#define WINT_MAX 0x7fffffff /* wint_t */
12
13	#endif /* !_RISCV_WCHAR_LIMITS_H_ */

lib/libc/include/riscv32-netbsd-none/machine/wchar_limits.h deleted-4

...	@@ -1,4 +0,0 @@
1	/* $NetBSD: wchar_limits.h,v 1.2 2005/12/11 12:17:12 christos Exp $ */
2
3	// zig patch: https://github.com/llvm/llvm-project/issues/199678
4	#include <riscv/wchar_limits.h>

lib/libc/include/riscv64-netbsd-none/machine/wchar_limits.h deleted-4

...	@@ -1,4 +0,0 @@
1	/* $NetBSD: wchar_limits.h,v 1.2 2005/12/11 12:17:12 christos Exp $ */
2
3	// zig patch: https://github.com/llvm/llvm-project/issues/199678
4	#include <riscv/wchar_limits.h>

lib/libcxx/include/__algorithm/clamp.h+4-2

 @@ -17,9 +17,10 @@
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_STD_VER >= 17
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 17
 template <class _Tp, class _Compare>
 [[nodiscard]] inline _LIBCPP_HIDE_FROM_ABI constexpr const _Tp&
 clamp(_LIBCPP_LIFETIMEBOUND const _Tp& __v,
 @@ -37,8 +38,9 @@ clamp(_LIBCPP_LIFETIMEBOUND const _Tp& __v,
       _LIBCPP_LIFETIMEBOUND const _Tp& __hi) {
   return std::clamp(__v, __lo, __hi, __less<>());
 }
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___ALGORITHM_CLAMP_H

lib/libcxx/include/__algorithm/copy.h+16-15

 @@ -11,6 +11,7 @@
 #include <__algorithm/copy_move_common.h>
 #include <__algorithm/for_each_segment.h>
+#include <__algorithm/in_out_result.h>
 #include <__algorithm/min.h>
 #include <__algorithm/specialized_algorithms.h>
 #include <__config>
 @@ -19,7 +20,6 @@
 #include <__type_traits/common_type.h>
 #include <__type_traits/enable_if.h>
 #include <__utility/move.h>
-#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -35,7 +35,8 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
 copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result);
 template <class _InIter, class _Sent, class _OutIter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter> __copy(_InIter, _Sent, _OutIter);
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
+    __copy(_InIter, _Sent, _OutIter);
 struct __copy_impl {
   template <class _InIter,
 @@ -45,7 +46,7 @@ struct __copy_impl {
                                                    __iterator_pair<_InIter, _Sent>,
                                                    __single_iterator<_OutIter> >::__has_algorithm,
                           int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _Sent __last, _OutIter __result) const {
     while (__first != __last) {
       *__result = *__first;
 @@ -53,7 +54,7 @@ struct __copy_impl {
       ++__result;
     }
-    return std::make_pair(std::move(__first), std::move(__result));
+    return {std::move(__first), std::move(__result)};
   }
   template <class _InIter,
 @@ -63,20 +64,20 @@ struct __copy_impl {
                                                   __iterator_pair<_InIter, _Sent>,
                                                   __single_iterator<_OutIter> >::__has_algorithm,
                           int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 static pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 static __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _Sent __last, _OutIter __result) {
     return __specialized_algorithm<_Algorithm::__copy, __iterator_pair<_InIter, _Sent>, __single_iterator<_OutIter> >()(
         std::move(__first), std::move(__last), std::move(__result));
   }
   template <class _InIter, class _OutIter, __enable_if_t<__is_segmented_iterator_v<_InIter>, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _InIter __last, _OutIter __result) const {
     using __local_iterator = typename __segmented_iterator_traits<_InIter>::__local_iterator;
     std::__for_each_segment(__first, __last, [&__result](__local_iterator __lfirst, __local_iterator __llast) {
-      __result = std::__copy(std::move(__lfirst), std::move(__llast), std::move(__result)).second;
+      __result = std::__copy(std::move(__lfirst), std::move(__llast), std::move(__result)).__out_;
     });
-    return std::make_pair(__last, std::move(__result));
+    return {__last, std::move(__result)};
   }
   template <class _InIter,
 @@ -84,14 +85,14 @@ struct __copy_impl {
             __enable_if_t<__has_random_access_iterator_category<_InIter>::value &&
                               !__is_segmented_iterator_v<_InIter> && __is_segmented_iterator_v<_OutIter>,
                           int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _InIter __last, _OutIter __result) const {
     using _Traits = __segmented_iterator_traits<_OutIter>;
     using _DiffT =
         typename common_type<__iterator_difference_type<_InIter>, __iterator_difference_type<_OutIter> >::type;
     if (__first == __last)
-      return std::make_pair(std::move(__first), std::move(__result));
+      return {std::move(__first), std::move(__result)};
     auto __local_first      = _Traits::__local(__result);
     auto __segment_iterator = _Traits::__segment(__result);
 @@ -99,10 +100,10 @@ struct __copy_impl {
       auto __local_last = _Traits::__end(__segment_iterator);
       auto __size       = std::min<_DiffT>(__local_last - __local_first, __last - __first);
       auto __iters      = std::__copy(__first, __first + __size, __local_first);
-      __first           = std::move(__iters.first);
+      __first           = std::move(__iters.__in_);
       if (__first == __last)
-        return std::make_pair(std::move(__first), _Traits::__compose(__segment_iterator, std::move(__iters.second)));
+        return {std::move(__first), _Traits::__compose(__segment_iterator, std::move(__iters.__out_))};
       __local_first = _Traits::__begin(++__segment_iterator);
     }
 @@ -110,14 +111,14 @@ struct __copy_impl {
   // At this point, the iterators have been unwrapped so any `contiguous_iterator` has been unwrapped to a pointer.
   template <class _In, class _Out, __enable_if_t<__can_lower_copy_assignment_to_memmove<_In, _Out>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In*, _Out*>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_In*, _Out*>
   operator()(_In* __first, _In* __last, _Out* __result) const {
     return std::__copy_trivial_impl(__first, __last, __result);
   }
 };
 template <class _InIter, class _Sent, class _OutIter>
-pair<_InIter, _OutIter> inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
+__in_out_result<_InIter, _OutIter> inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
 __copy(_InIter __first, _Sent __last, _OutIter __result) {
   return std::__copy_move_unwrap_iters<__copy_impl>(std::move(__first), std::move(__last), std::move(__result));
 }
 @@ -125,7 +126,7 @@ __copy(_InIter __first, _Sent __last, _OutIter __result) {
 template <class _InputIterator, class _OutputIterator>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
 copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {
-  return std::__copy(__first, __last, __result).second;
+  return std::__copy(__first, __last, __result).__out_;
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/copy_backward.h+18-17

 @@ -12,6 +12,7 @@
 #include <__algorithm/copy_move_common.h>
 #include <__algorithm/copy_n.h>
 #include <__algorithm/for_each_segment.h>
+#include <__algorithm/in_out_result.h>
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/min.h>
 #include <__config>
 @@ -23,7 +24,6 @@
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_constructible.h>
 #include <__utility/move.h>
-#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -35,7 +35,7 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InIter, _OutIter>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<_InIter, _OutIter>
 __copy_backward(_InIter __first, _Sent __last, _OutIter __result);
 template <class _Cp, bool _IsConst>
 @@ -159,7 +159,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __bit_iterator<_Cp, false> _
 template <class _AlgPolicy>
 struct __copy_backward_impl {
   template <class _InIter, class _Sent, class _OutIter>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _Sent __last, _OutIter __result) const {
     auto __last_iter          = _IterOps<_AlgPolicy>::next(__first, __last);
     auto __original_last_iter = __last_iter;
 @@ -168,17 +168,17 @@ struct __copy_backward_impl {
       *--__result = *--__last_iter;
     }
-    return std::make_pair(std::move(__original_last_iter), std::move(__result));
+    return {std::move(__original_last_iter), std::move(__result)};
   }
   template <class _InIter, class _OutIter, __enable_if_t<__is_segmented_iterator_v<_InIter>, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _InIter __last, _OutIter __result) const {
     using __local_iterator = typename __segmented_iterator_traits<_InIter>::__local_iterator;
     std::__for_each_segment_backward(__first, __last, [&__result](__local_iterator __lfirst, __local_iterator __llast) {
-      __result = std::__copy_backward<_AlgPolicy>(std::move(__lfirst), std::move(__llast), std::move(__result)).second;
+      __result = std::__copy_backward<_AlgPolicy>(std::move(__lfirst), std::move(__llast), std::move(__result)).__out_;
     });
-    return std::make_pair(__last, std::move(__result));
+    return {__last, std::move(__result)};
   }
   template <class _InIter,
 @@ -186,7 +186,7 @@ struct __copy_backward_impl {
             __enable_if_t<__has_random_access_iterator_category<_InIter>::value &&
                               !__is_segmented_iterator_v<_InIter> && __is_segmented_iterator_v<_OutIter>,
                           int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _InIter __last, _OutIter __result) const {
     using _Traits           = __segmented_iterator_traits<_OutIter>;
     auto __orig_last        = __last;
 @@ -194,7 +194,7 @@ struct __copy_backward_impl {
     // When the range contains no elements, __result might not be a valid iterator
     if (__first == __last)
-      return std::make_pair(__first, __result);
+      return {__first, __result};
     auto __local_last = _Traits::__local(__result);
     while (true) {
 @@ -203,36 +203,37 @@ struct __copy_backward_impl {
       auto __local_first = _Traits::__begin(__segment_iterator);
       auto __size        = std::min<_DiffT>(__local_last - __local_first, __last - __first);
-      auto __iter        = std::__copy_backward<_AlgPolicy>(__last - __size, __last, __local_last).second;
+      auto __iter        = std::__copy_backward<_AlgPolicy>(__last - __size, __last, __local_last).__out_;
       __last -= __size;
       if (__first == __last)
-        return std::make_pair(std::move(__orig_last), _Traits::__compose(__segment_iterator, std::move(__iter)));
+        return {std::move(__orig_last), _Traits::__compose(__segment_iterator, std::move(__iter))};
       --__segment_iterator;
       __local_last = _Traits::__end(__segment_iterator);
     }
   }
   template <class _Cp, bool _IsConst>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__bit_iterator<_Cp, _IsConst>, __bit_iterator<_Cp, false> >
+  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<__bit_iterator<_Cp, _IsConst>, __bit_iterator<_Cp, false> >
   operator()(__bit_iterator<_Cp, _IsConst> __first,
              __bit_iterator<_Cp, _IsConst> __last,
              __bit_iterator<_Cp, false> __result) {
     if (__last.__ctz_ == __result.__ctz_)
-      return std::make_pair(__last, std::__copy_backward_aligned(__first, __last, __result));
+      return {__last, std::__copy_backward_aligned(__first, __last, __result)};
-    return std::make_pair(__last, std::__copy_backward_unaligned(__first, __last, __result));
+    return {__last, std::__copy_backward_unaligned(__first, __last, __result)};
   }
   // At this point, the iterators have been unwrapped so any `contiguous_iterator` has been unwrapped to a pointer.
   template <class _In, class _Out, __enable_if_t<__can_lower_copy_assignment_to_memmove<_In, _Out>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In*, _Out*>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_In*, _Out*>
   operator()(_In* __first, _In* __last, _Out* __result) const {
     return std::__copy_backward_trivial_impl(__first, __last, __result);
   }
 };
 template <class _AlgPolicy, class _BidirectionalIterator1, class _Sentinel, class _BidirectionalIterator2>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_BidirectionalIterator1, _BidirectionalIterator2>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<_BidirectionalIterator1, _BidirectionalIterator2>
 __copy_backward(_BidirectionalIterator1 __first, _Sentinel __last, _BidirectionalIterator2 __result) {
   return std::__copy_move_unwrap_iters<__copy_backward_impl<_AlgPolicy> >(
       std::move(__first), std::move(__last), std::move(__result));
 @@ -245,7 +246,7 @@ copy_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last, _
                     std::is_copy_constructible<_BidirectionalIterator1>::value,
                 "Iterators must be copy constructible.");
-  return std::__copy_backward<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result)).second;
+  return std::__copy_backward<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result)).__out_;
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/copy_if.h+4-3

 @@ -9,6 +9,7 @@
 #ifndef _LIBCPP___ALGORITHM_COPY_IF_H
 #define _LIBCPP___ALGORITHM_COPY_IF_H
+#include <__algorithm/in_out_result.h>
 #include <__config>
 #include <__functional/identity.h>
 #include <__type_traits/invoke.h>
 @@ -25,7 +26,7 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _InIter, class _Sent, class _OutIter, class _Proj, class _Pred>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
 __copy_if(_InIter __first, _Sent __last, _OutIter __result, _Pred& __pred, _Proj& __proj) {
   for (; __first != __last; ++__first) {
     if (std::__invoke(__pred, std::__invoke(__proj, *__first))) {
 @@ -33,14 +34,14 @@ __copy_if(_InIter __first, _Sent __last, _OutIter __result, _Pred& __pred, _Proj
       ++__result;
     }
   }
-  return std::make_pair(std::move(__first), std::move(__result));
+  return {std::move(__first), std::move(__result)};
 }
 template <class _InputIterator, class _OutputIterator, class _Predicate>
 inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
 copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Predicate __pred) {
   __identity __proj;
-  return std::__copy_if(__first, __last, __result, __pred, __proj).second;
+  return std::__copy_if(__first, __last, __result, __pred, __proj).__out_;
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/copy_move_common.h+9-12

 @@ -9,21 +9,18 @@
 #ifndef _LIBCPP___ALGORITHM_COPY_MOVE_COMMON_H
 #define _LIBCPP___ALGORITHM_COPY_MOVE_COMMON_H
+#include <__algorithm/in_out_result.h>
 #include <__algorithm/unwrap_iter.h>
 #include <__algorithm/unwrap_range.h>
 #include <__config>
 #include <__cstddef/size_t.h>
-#include <__iterator/iterator_traits.h>
-#include <__memory/pointer_traits.h>
 #include <__string/constexpr_c_functions.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_always_bitcastable.h>
-#include <__type_traits/is_constant_evaluated.h>
 #include <__type_traits/is_constructible.h>
 #include <__type_traits/is_trivially_assignable.h>
 #include <__type_traits/is_volatile.h>
 #include <__utility/move.h>
-#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -57,24 +54,24 @@ struct __can_lower_move_assignment_to_memmove {
 // `memmove` algorithms implementation.
 template <class _In, class _Out>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In*, _Out*>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_In*, _Out*>
 __copy_trivial_impl(_In* __first, _In* __last, _Out* __result) {
   const size_t __n = static_cast<size_t>(__last - __first);
   std::__constexpr_memmove(__result, __first, __element_count(__n));
-  return std::make_pair(__last, __result + __n);
+  return {__last, __result + __n};
 }
 template <class _In, class _Out>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In*, _Out*>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_In*, _Out*>
 __copy_backward_trivial_impl(_In* __first, _In* __last, _Out* __result) {
   const size_t __n = static_cast<size_t>(__last - __first);
   __result -= __n;
   std::__constexpr_memmove(__result, __first, __element_count(__n));
-  return std::make_pair(__last, __result);
+  return {__last, __result};
 }
 // Iterator unwrapping and dispatching to the correct overload.
 @@ -88,12 +85,12 @@ template <class _Algorithm,
           class _Sent,
           class _OutIter,
           __enable_if_t<__can_rewrap<_InIter, _OutIter>::value, int> = 0>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 pair<_InIter, _OutIter>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 __in_out_result<_InIter, _OutIter>
 __copy_move_unwrap_iters(_InIter __first, _Sent __last, _OutIter __out_first) {
   auto __range  = std::__unwrap_range(__first, std::move(__last));
   auto __result = _Algorithm()(std::move(__range.first), std::move(__range.second), std::__unwrap_iter(__out_first));
-  return std::make_pair(std::__rewrap_range<_Sent>(std::move(__first), std::move(__result.first)),
+  return {std::__rewrap_range<_Sent>(std::move(__first), std::move(__result.__in_)),
-                        std::__rewrap_iter(std::move(__out_first), std::move(__result.second)));
+          std::__rewrap_iter(std::move(__out_first), std::move(__result.__out_))};
 }
 template <class _Algorithm,
 @@ -101,7 +98,7 @@ template <class _Algorithm,
           class _Sent,
           class _OutIter,
           __enable_if_t<!__can_rewrap<_InIter, _OutIter>::value, int> = 0>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 pair<_InIter, _OutIter>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 __in_out_result<_InIter, _OutIter>
 __copy_move_unwrap_iters(_InIter __first, _Sent __last, _OutIter __out_first) {
   return _Algorithm()(std::move(__first), std::move(__last), std::move(__out_first));
 }

lib/libcxx/include/__algorithm/copy_n.h+5-5

...	@@ -10,13 +10,13 @@	...	@@ -10,13 +10,13 @@
10	#define _LIBCPP___ALGORITHM_COPY_N_H	10	#define _LIBCPP___ALGORITHM_COPY_N_H
11		11
12	#include <__algorithm/copy.h>	12	#include <__algorithm/copy.h>
		13	#include <__algorithm/in_out_result.h>
13	#include <__algorithm/iterator_operations.h>	14	#include <__algorithm/iterator_operations.h>
14	#include <__config>	15	#include <__config>
15	#include <__iterator/iterator_traits.h>	16	#include <__iterator/iterator_traits.h>
16	#include <__type_traits/enable_if.h>	17	#include <__type_traits/enable_if.h>
17	#include <__utility/convert_to_integral.h>	18	#include <__utility/convert_to_integral.h>
18	#include <__utility/move.h>	19	#include <__utility/move.h>
19	#include <__utility/pair.h>
20		20
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
22	# pragma GCC system_header	22	# pragma GCC system_header
...	@@ -31,7 +31,7 @@ template <class _AlgPolicy,	...	@@ -31,7 +31,7 @@ template <class _AlgPolicy,
31	class _InIter,	31	class _InIter,
32	class _OutIter,	32	class _OutIter,
33	__enable_if_t<__has_random_access_iterator_category<_InIter>::value, int> = 0>	33	__enable_if_t<__has_random_access_iterator_category<_InIter>::value, int> = 0>
34	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InIter, _OutIter>	34	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<_InIter, _OutIter>
35	__copy_n(_InIter __first, typename _IterOps<_AlgPolicy>::template __difference_type<_InIter> __n, _OutIter __result) {	35	__copy_n(_InIter __first, typename _IterOps<_AlgPolicy>::template __difference_type<_InIter> __n, _OutIter __result) {
36	return std::__copy(__first, __first + __n, std::move(__result));	36	return std::__copy(__first, __first + __n, std::move(__result));
37	}	37	}
...	@@ -40,7 +40,7 @@ template <class _AlgPolicy,	...	@@ -40,7 +40,7 @@ template <class _AlgPolicy,
40	class _InIter,	40	class _InIter,
41	class _OutIter,	41	class _OutIter,
42	__enable_if_t<!__has_random_access_iterator_category<_InIter>::value, int> = 0>	42	__enable_if_t<!__has_random_access_iterator_category<_InIter>::value, int> = 0>
43	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InIter, _OutIter>	43	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<_InIter, _OutIter>
44	__copy_n(_InIter __first, typename _IterOps<_AlgPolicy>::template __difference_type<_InIter> __n, _OutIter __result) {	44	__copy_n(_InIter __first, typename _IterOps<_AlgPolicy>::template __difference_type<_InIter> __n, _OutIter __result) {
45	while (__n != 0) {	45	while (__n != 0) {
46	__result = __first;	46	__result = __first;
...	@@ -48,7 +48,7 @@ __copy_n(_InIter __first, typename _IterOps<_AlgPolicy>::template __difference_t	...	@@ -48,7 +48,7 @@ __copy_n(_InIter __first, typename _IterOps<_AlgPolicy>::template __difference_t
48	++__result;	48	++__result;
49	--__n;	49	--__n;
50	}	50	}
51	return std::make_pair(std::move(__first), std::move(__result));	51	return {std::move(__first), std::move(__result)};
52	}	52	}
53		53
54	// The InputIterator case is handled specially here because it's been written in a way to avoid incrementing __first	54	// The InputIterator case is handled specially here because it's been written in a way to avoid incrementing __first
...	@@ -84,7 +84,7 @@ copy_n(_InputIterator __first, _Size __n, _OutputIterator __result) {	...	@@ -84,7 +84,7 @@ copy_n(_InputIterator __first, _Size __n, _OutputIterator __result) {
84	using _IntegralSize = decltype(std::__convert_to_integral(__n));	84	using _IntegralSize = decltype(std::__convert_to_integral(__n));
85	_IntegralSize __converted = __n;	85	_IntegralSize __converted = __n;
86	return std::__copy_n<_ClassicAlgPolicy>(__first, __iterator_difference_type<_InputIterator>(__converted), __result)	86	return std::__copy_n<_ClassicAlgPolicy>(__first, __iterator_difference_type<_InputIterator>(__converted), __result)
87	.second;	87	.__out_;
88	}	88	}
89		89
90	_LIBCPP_END_NAMESPACE_STD	90	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/equal.h+58-13

...	@@ -11,15 +11,16 @@	...	@@ -11,15 +11,16 @@
11	#define _LIBCPP___ALGORITHM_EQUAL_H	11	#define _LIBCPP___ALGORITHM_EQUAL_H
12		12
13	#include <__algorithm/comp.h>	13	#include <__algorithm/comp.h>
		14	#include <__algorithm/find_segment_if.h>
14	#include <__algorithm/min.h>	15	#include <__algorithm/min.h>
15	#include <__algorithm/unwrap_iter.h>	16	#include <__algorithm/unwrap_iter.h>
16	#include <__config>	17	#include <__config>
17	#include <__functional/identity.h>	18	#include <__functional/identity.h>
18	#include <__fwd/bit_reference.h>	19	#include <__fwd/bit_reference.h>
19	#include <__iterator/distance.h>
20	#include <__iterator/iterator_traits.h>	20	#include <__iterator/iterator_traits.h>
21	#include <__memory/pointer_traits.h>	21	#include <__iterator/segmented_iterator.h>
22	#include <__string/constexpr_c_functions.h>	22	#include <__string/constexpr_c_functions.h>
		23	#include <__type_traits/common_type.h>
23	#include <__type_traits/desugars_to.h>	24	#include <__type_traits/desugars_to.h>
24	#include <__type_traits/enable_if.h>	25	#include <__type_traits/enable_if.h>
25	#include <__type_traits/invoke.h>	26	#include <__type_traits/invoke.h>
...	@@ -27,6 +28,7 @@	...	@@ -27,6 +28,7 @@
27	#include <__type_traits/is_same.h>	28	#include <__type_traits/is_same.h>
28	#include <__type_traits/is_volatile.h>	29	#include <__type_traits/is_volatile.h>
29	#include <__utility/move.h>	30	#include <__utility/move.h>
		31	#include <__utility/unreachable.h>
30		32
31	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	33	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
32	# pragma GCC system_header	34	# pragma GCC system_header
...	@@ -177,15 +179,6 @@ template <class _Cp,	...	@@ -177,15 +179,6 @@ template <class _Cp,
177	return std::__equal_unaligned(__first1, __last1, __first2);	179	return std::__equal_unaligned(__first1, __last1, __first2);
178	}	180	}
179		181
180	template <class _InIter1, class _Sent1, class _InIter2, class _Pred, class _Proj1, class _Proj2>
181	[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool __equal_iter_impl(
182	_InIter1 __first1, _Sent1 __last1, _InIter2 __first2, _Pred& __pred, _Proj1& __proj1, _Proj2& __proj2) {
183	for (; __first1 != __last1; ++__first1, (void)++__first2)
184	if (!std::__invoke(__pred, std::__invoke(__proj1, __first1), std::__invoke(__proj2, __first2)))
185	return false;
186	return true;
187	}
188
189	template <class _Tp,	182	template <class _Tp,
190	class _Up,	183	class _Up,
191	class _BinaryPredicate,	184	class _BinaryPredicate,
...	@@ -200,6 +193,58 @@ __equal_iter_impl(_Tp* __first1, _Tp* __last1, _Up* __first2, _BinaryPredicate&,	...	@@ -200,6 +193,58 @@ __equal_iter_impl(_Tp* __first1, _Tp* __last1, _Up* __first2, _BinaryPredicate&,
200	return std::__constexpr_memcmp_equal(__first1, __first2, __element_count(__last1 - __first1));	193	return std::__constexpr_memcmp_equal(__first1, __first2, __element_count(__last1 - __first1));
201	}	194	}
202		195
		196	template <class _InIter1, class _Sent1, class _InIter2, class _Pred, class _Proj1, class _Proj2>
		197	[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool __equal_iter_impl(
		198	_InIter1 __first1, _Sent1 __last1, _InIter2 __first2, _Pred& __pred, _Proj1& __proj1, _Proj2& __proj2) {
		199	#ifndef _LIBCPP_CXX03_LANG
		200	if constexpr (__has_random_access_iterator_category<_InIter1>::value &&
		201	__has_random_access_iterator_category<_InIter2>::value) {
		202	if constexpr (is_same<_InIter1, _Sent1>::value && __is_segmented_iterator_v<_InIter1>) {
		203	using __local_iterator_t = typename __segmented_iterator_traits<_InIter1>::__local_iterator;
		204	bool __is_equal = true;
		205	std::__find_segment_if(__first1, __last1, [&](__local_iterator_t __lfirst, __local_iterator_t __llast) {
		206	if (std::__equal_iter_impl(
		207	std::__unwrap_iter(__lfirst), std::__unwrap_iter(__llast), __first2, __pred, __proj1, __proj2)) {
		208	__first2 += __llast - __lfirst;
		209	return __llast;
		210	}
		211	__is_equal = false;
		212	return __lfirst;
		213	});
		214	return __is_equal;
		215	} else if constexpr (__is_segmented_iterator_v<_InIter2>) {
		216	using _Traits = __segmented_iterator_traits<_InIter2>;
		217	using _DiffT =
		218	typename common_type<__iterator_difference_type<_InIter1>, __iterator_difference_type<_InIter2> >::type;
		219
		220	if (__first1 == __last1)
		221	return true;
		222
		223	auto __local_first = _Traits::__local(__first2);
		224	auto __segment_iterator = _Traits::__segment(__first2);
		225
		226	while (true) {
		227	auto __local_last = _Traits::__end(__segment_iterator);
		228	auto __size = std::min<_DiffT>(__local_last - __local_first, __last1 - __first1);
		229	if (!std::__equal_iter_impl(
		230	__first1, __first1 + __size, std::__unwrap_iter(__local_first), __pred, __proj1, __proj2))
		231	return false;
		232
		233	__first1 += __size;
		234	if (__first1 == __last1)
		235	return true;
		236
		237	__local_first = _Traits::__begin(++__segment_iterator);
		238	}
		239	}
		240	}
		241	#endif
		242	for (; __first1 != __last1; ++__first1, (void)++__first2)
		243	if (!std::__invoke(__pred, std::__invoke(__proj1, __first1), std::__invoke(__proj2, __first2)))
		244	return false;
		245	return true;
		246	}
		247
203	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>	248	template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
204	[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool	249	[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool
205	equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _BinaryPredicate __pred) {	250	equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _BinaryPredicate __pred) {
...	@@ -247,11 +292,11 @@ equal(_InputIterator1 __first1,	...	@@ -247,11 +292,11 @@ equal(_InputIterator1 __first1,
247	_InputIterator2 __first2,	292	_InputIterator2 __first2,
248	_InputIterator2 __last2,	293	_InputIterator2 __last2,
249	_BinaryPredicate __pred) {	294	_BinaryPredicate __pred) {
250	static constexpr bool __both_random_access =	295	constexpr bool __both_random_access =
251	__has_random_access_iterator_category<_InputIterator1>::value &&	296	__has_random_access_iterator_category<_InputIterator1>::value &&
252	__has_random_access_iterator_category<_InputIterator2>::value;	297	__has_random_access_iterator_category<_InputIterator2>::value;
253	if constexpr (__both_random_access) {	298	if constexpr (__both_random_access) {
254	if (std::distance(__first1, __last1) != std::distance(__first2, __last2))	299	if (__last1 - __first1 != __last2 - __first2)
255	return false;	300	return false;
256	}	301	}
257	__identity __proj;	302	__identity __proj;

lib/libcxx/include/__algorithm/find.h+13-14

 @@ -10,6 +10,7 @@
 #ifndef _LIBCPP___ALGORITHM_FIND_H
 #define _LIBCPP___ALGORITHM_FIND_H
+#include <__algorithm/find_if.h>
 #include <__algorithm/find_segment_if.h>
 #include <__algorithm/min.h>
 #include <__algorithm/simd_utils.h>
 @@ -47,17 +48,18 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 // generic implementation
 template <class _Iter, class _Sent, class _Tp, class _Proj>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Iter
-__find_loop(_Iter __first, _Sent __last, const _Tp& __value, _Proj& __proj) {
+__find_generic(_Iter __first, _Sent __last, const _Tp& __value, _Proj& __proj) {
-  for (; __first != __last; ++__first)
+  return std::__find_if(
-    if (std::__invoke(__proj, *__first) == __value)
+      std::move(__first),
-      break;
+      std::move(__last),
-  return __first;
+      [&]<class _ValT>(_ValT&& __val) -> bool { return __val == __value; },
+      __proj);
 }
 template <class _Iter, class _Sent, class _Tp, class _Proj>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Iter
 __find(_Iter __first, _Sent __last, const _Tp& __value, _Proj& __proj) {
-  return std::__find_loop(std::move(__first), std::move(__last), __value, __proj);
+  return std::__find_generic(std::move(__first), std::move(__last), __value, __proj);
 }
 #if _LIBCPP_VECTORIZE_ALGORITHMS
 @@ -108,7 +110,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp* __find_vectorized(_Tp* __first, _Tp* __last,
   }
   __identity __proj;
-  return std::__find_loop(__first, __last, __value, __proj);
+  return std::__find_generic(__first, __last, __value, __proj);
 }
 #endif
 @@ -138,7 +140,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp* __find(_Tp* __first, _T
 #  endif
   else {
     __identity __proj;
-    return std::__find_loop(__first, __last, __value, __proj);
+    return std::__find_generic(__first, __last, __value, __proj);
   }
 }
 #endif
 @@ -216,13 +218,10 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _SegmentedIterator
 __find(_SegmentedIterator __first, _SegmentedIterator __last, const _Tp& __value, _Proj& __proj) {
   using __local_iterator = typename __segmented_iterator_traits<_SegmentedIterator>::__local_iterator;
   return std::__find_segment_if(
-      std::move(__first),
+      std::move(__first), std::move(__last), [&__value, &__proj](__local_iterator __lfirst, __local_iterator __llast) {
-      std::move(__last),
-      [&__value](__local_iterator __lfirst, __local_iterator __llast, _Proj& __lproj) {
         return std::__rewrap_iter(
-            __lfirst, std::__find(std::__unwrap_iter(__lfirst), std::__unwrap_iter(__llast), __value, __lproj));
+            __lfirst, std::__find(std::__unwrap_iter(__lfirst), std::__unwrap_iter(__llast), __value, __proj));
-      },
+      });
-      __proj);
 }
 // public API

lib/libcxx/include/__algorithm/find_if.h+22-4

...	@@ -11,6 +11,9 @@	...	@@ -11,6 +11,9 @@
11	#define _LIBCPP___ALGORITHM_FIND_IF_H	11	#define _LIBCPP___ALGORITHM_FIND_IF_H
12		12
13	#include <__config>	13	#include <__config>
		14	#include <__functional/identity.h>
		15	#include <__memory/valid_range.h>
		16	#include <__type_traits/invoke.h>
14		17
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header	19	# pragma GCC system_header
...	@@ -18,13 +21,28 @@	...	@@ -18,13 +21,28 @@
18		21
19	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
20		23
		24	template <class _Iter, class _Sent, class _Pred, class _Proj>
		25	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 _Iter
		26	__find_if(_Iter __first, _Sent __last, _Pred&& __pred, _Proj&& __proj) {
		27	// Don't make the valid range assumption for empty ranges since using unaligned sentinel
		28	// values to implement iterators of empty ranges is a common occurence.
		29	if (__first == __last)
		30	return __first;
		31
		32	std::__assume_valid_range(__first, __last);
		33
		34	do {
		35	if (std::__invoke(__pred, std::__invoke(__proj, *__first)))
		36	break;
		37	++__first;
		38	} while (__first != __last);
		39	return __first;
		40	}
		41
21	template <class _InputIterator, class _Predicate>	42	template <class _InputIterator, class _Predicate>
22	[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator	43	[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
23	find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {	44	find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
24	for (; __first != __last; ++__first)	45	return std::__find_if(__first, __last, __pred, __identity());
25	if (__pred(*__first))
26	break;
27	return __first;
28	}	46	}
29		47
30	_LIBCPP_END_NAMESPACE_STD	48	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/find_if_not.h+20-4

 @@ -10,23 +10,39 @@
 #ifndef _LIBCPP___ALGORITHM_FIND_IF_NOT_H
 #define _LIBCPP___ALGORITHM_FIND_IF_NOT_H
+#include <__algorithm/find_if.h>
 #include <__config>
+#include <__functional/identity.h>
+#include <__type_traits/invoke.h>
+#include <__utility/move.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
+_LIBCPP_PUSH_MACROS
+#include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
+template <class _Iter, class _Sent, class _Pred, class _Proj>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Iter
+__find_if_not(_Iter __first, _Sent __last, _Pred&& __pred, _Proj&& __proj) {
+  return std::__find_if(
+      std::move(__first),
+      std::move(__last),
+      [&]<class _ValT>(_ValT&& __val) -> bool { return !std::__invoke(__pred, __val); },
+      __proj);
+}
 template <class _InputIterator, class _Predicate>
 [[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
 find_if_not(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
-  for (; __first != __last; ++__first)
+  return std::__find_if_not(__first, __last, __pred, __identity());
-    if (!__pred(*__first))
-      break;
-  return __first;
 }
 _LIBCPP_END_NAMESPACE_STD
+_LIBCPP_POP_MACROS
 #endif // _LIBCPP___ALGORITHM_FIND_IF_NOT_H

lib/libcxx/include/__algorithm/find_segment_if.h+8-9

 @@ -19,14 +19,13 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 // __find_segment_if is a utility function for optimizing iteration over segmented iterators linearly.
-// [__first, __last) has to be a segmented range. __pred is expected to take a range of local iterators and the __proj.
+// [__first, __last) has to be a segmented range. __pred is expected to take a range of local iterators.
 // It returns an iterator to the first element that satisfies the predicate, or a one-past-the-end iterator if there was
-// no match. __proj may be anything that should be passed to __pred, but is expected to be a projection to support
+// no match.
-// ranges algorithms, or __identity for classic algorithms.
-template <class _SegmentedIterator, class _Pred, class _Proj>
+template <class _SegmentedIterator, class _Pred>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _SegmentedIterator
-__find_segment_if(_SegmentedIterator __first, _SegmentedIterator __last, _Pred __pred, _Proj& __proj) {
+__find_segment_if(_SegmentedIterator __first, _SegmentedIterator __last, _Pred __pred) {
   using _Traits = __segmented_iterator_traits<_SegmentedIterator>;
   auto __sfirst = _Traits::__segment(__first);
 @@ -34,11 +33,11 @@ __find_segment_if(_SegmentedIterator __first, _SegmentedIterator __last, _Pred _
   // We are in a single segment, so we might not be at the beginning or end
   if (__sfirst == __slast)
-    return _Traits::__compose(__sfirst, __pred(_Traits::__local(__first), _Traits::__local(__last), __proj));
+    return _Traits::__compose(__sfirst, __pred(_Traits::__local(__first), _Traits::__local(__last)));
   { // We have more than one segment. Iterate over the first segment, since we might not start at the beginning
     auto __llast = _Traits::__end(__sfirst);
-    auto __liter = __pred(_Traits::__local(__first), __llast, __proj);
+    auto __liter = __pred(_Traits::__local(__first), __llast);
     if (__liter != __llast)
       return _Traits::__compose(__sfirst, __liter);
   }
 @@ -47,14 +46,14 @@ __find_segment_if(_SegmentedIterator __first, _SegmentedIterator __last, _Pred _
   // Iterate over the segments which are guaranteed to be completely in the range
   while (__sfirst != __slast) {
     auto __llast = _Traits::__end(__sfirst);
-    auto __liter = __pred(_Traits::__begin(__sfirst), _Traits::__end(__sfirst), __proj);
+    auto __liter = __pred(_Traits::__begin(__sfirst), _Traits::__end(__sfirst));
     if (__liter != __llast)
       return _Traits::__compose(__sfirst, __liter);
     ++__sfirst;
   }
   // Iterate over the last segment
-  return _Traits::__compose(__sfirst, __pred(_Traits::__begin(__sfirst), _Traits::__local(__last), __proj));
+  return _Traits::__compose(__sfirst, __pred(_Traits::__begin(__sfirst), _Traits::__local(__last)));
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/for_each.h+1-1

...	@@ -26,7 +26,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -26,7 +26,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
26		26
27	template <class _InputIterator, class _Sent, class _Func, class _Proj>	27	template <class _InputIterator, class _Sent, class _Func, class _Proj>
28	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator	28	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _InputIterator
29	__for_each(_InputIterator __first, _Sent __last, _Func& __func, _Proj& __proj) {	29	__for_each(_InputIterator __first, _Sent __last, _Func&& __func, _Proj& __proj) {
30	#ifndef _LIBCPP_CXX03_LANG	30	#ifndef _LIBCPP_CXX03_LANG
31	if constexpr (using _SpecialAlg =	31	if constexpr (using _SpecialAlg =
32	__specialized_algorithm<_Algorithm::__for_each, __iterator_pair<_InputIterator, _Sent>>;	32	__specialized_algorithm<_Algorithm::__for_each, __iterator_pair<_InputIterator, _Sent>>;

lib/libcxx/include/__algorithm/for_each_n.h+3-2

lib/libcxx/include/__algorithm/generate_n.h+5-2

 @@ -29,8 +29,11 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator
 __generate_n(_OutputIterator __first, _Size __orig_n, _Generator& __gen) {
   using __iter_ref = decltype(*__first);
   __identity __proj;
-  auto __f = [&](__iter_ref __element) { std::forward<__iter_ref>(__element) = __gen(); };
+  return std::__for_each_n(
-  return std::__for_each_n(std::move(__first), __orig_n, __f, __proj);
+      std::move(__first),
+      __orig_n,
+      [&](__iter_ref __element) { std::forward<__iter_ref>(__element) = __gen(); },
+      __proj);
 }
 template <class _OutputIterator, class _Size, class _Generator>

lib/libcxx/include/__algorithm/in_out_result.h+14

...	@@ -49,6 +49,20 @@ struct in_out_result {	...	@@ -49,6 +49,20 @@ struct in_out_result {
49		49
50	#endif // _LIBCPP_STD_VER >= 20	50	#endif // _LIBCPP_STD_VER >= 20
51		51
		52	template <class _InIter, class _OutIter>
		53	struct __in_out_result {
		54	_InIter __in_;
		55	_OutIter __out_;
		56
		57	#if _LIBCPP_STD_VER >= 20
		58	template <class _InIter2, class _OutIter2>
		59	requires convertible_to<_InIter, _InIter2> && convertible_to<_OutIter, _OutIter2>
		60	constexpr operator ranges::in_out_result<_InIter2, _OutIter2>() && {
		61	return {std::move(__in_), std::move(__out_)};
		62	}
		63	#endif
		64	};
		65
52	_LIBCPP_END_NAMESPACE_STD	66	_LIBCPP_END_NAMESPACE_STD
53		67
54	_LIBCPP_POP_MACROS	68	_LIBCPP_POP_MACROS

lib/libcxx/include/__algorithm/lexicographical_compare_three_way.h+4-4

 @@ -27,10 +27,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // Fast path for random access iterators which computes the number of loop iterations up-front and
 // then skips the iterator comparisons inside the loop.
 template <class _InputIterator1, class _InputIterator2, class _Cmp>
 @@ -116,10 +116,10 @@ template <class _InputIterator1, class _InputIterator2>
       std::move(__first1), std::move(__last1), std::move(__first2), std::move(__last2), std::compare_three_way());
 }
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H

lib/libcxx/include/__algorithm/lower_bound.h+5-4

 @@ -56,11 +56,11 @@ template <class _AlgPolicy, class _Iter, class _Type, class _Proj, class _Comp>
 // would yield \Omega(n*log(n)) comparisons and, for non-random-access iterators, \Omega(n^2) iterator increments,
 // whereas the one-sided version will yield O(n) operations on both counts, with a \Omega(log(n)) bound on the number of
 // comparisons.
-template <class _AlgPolicy, class _ForwardIterator, class _Sent, class _Type, class _Proj, class _Comp>
+template <class _AlgPolicy, class _ForwardIterator, class _Sent, class _Type, class _Comp>
 [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _ForwardIterator
-__lower_bound_onesided(_ForwardIterator __first, _Sent __last, const _Type& __value, _Comp& __comp, _Proj& __proj) {
+__lower_bound_onesided(_ForwardIterator __first, _Sent __last, const _Type& __value, _Comp& __comp) {
   // step = 0, ensuring we can always short-circuit when distance is 1 later on
-  if (__first == __last || !std::__invoke(__comp, std::__invoke(__proj, *__first), __value))
+  if (__first == __last || !std::__invoke(__comp, *__first, __value))
     return __first;
   using _Distance = typename iterator_traits<_ForwardIterator>::difference_type;
 @@ -69,11 +69,12 @@ __lower_bound_onesided(_ForwardIterator __first, _Sent __last, const _Type& __va
     auto __dist = __step - _IterOps<_AlgPolicy>::__advance_to(__it, __step, __last);
     // once we reach the last range where needle can be we must start
     // looking inwards, bisecting that range
-    if (__it == __last || !std::__invoke(__comp, std::__invoke(__proj, *__it), __value)) {
+    if (__it == __last || !std::__invoke(__comp, *__it, __value)) {
       // we've already checked the previous value and it was less, we can save
       // one comparison by skipping bisection
       if (__dist == 1)
         return __it;
+      __identity __proj;
       return std::__lower_bound_bisecting<_AlgPolicy>(__first, __value, __dist, __comp, __proj);
     }
     // range not found, move forward!

lib/libcxx/include/__algorithm/move.h+16-15

 @@ -12,6 +12,7 @@
 #include <__algorithm/copy.h>
 #include <__algorithm/copy_move_common.h>
 #include <__algorithm/for_each_segment.h>
+#include <__algorithm/in_out_result.h>
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/min.h>
 #include <__config>
 @@ -22,7 +23,6 @@
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_constructible.h>
 #include <__utility/move.h>
-#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -34,30 +34,30 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
 __move(_InIter __first, _Sent __last, _OutIter __result);
 template <class _AlgPolicy>
 struct __move_impl {
   template <class _InIter, class _Sent, class _OutIter>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _Sent __last, _OutIter __result) const {
     while (__first != __last) {
       *__result = _IterOps<_AlgPolicy>::__iter_move(__first);
       ++__first;
       ++__result;
     }
-    return std::make_pair(std::move(__first), std::move(__result));
+    return {std::move(__first), std::move(__result)};
   }
   template <class _InIter, class _OutIter, __enable_if_t<__is_segmented_iterator_v<_InIter>, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _InIter __last, _OutIter __result) const {
     using __local_iterator = typename __segmented_iterator_traits<_InIter>::__local_iterator;
     std::__for_each_segment(__first, __last, [&__result](__local_iterator __lfirst, __local_iterator __llast) {
-      __result = std::__move<_AlgPolicy>(__lfirst, __llast, std::move(__result)).second;
+      __result = std::__move<_AlgPolicy>(__lfirst, __llast, std::move(__result)).__out_;
     });
-    return std::make_pair(__last, std::move(__result));
+    return {__last, std::move(__result)};
   }
   template <class _InIter,
 @@ -65,14 +65,14 @@ struct __move_impl {
             __enable_if_t<__has_random_access_iterator_category<_InIter>::value &&
                               !__is_segmented_iterator_v<_InIter> && __is_segmented_iterator_v<_OutIter>,
                           int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _InIter __last, _OutIter __result) const {
     using _Traits = __segmented_iterator_traits<_OutIter>;
     using _DiffT =
         typename common_type<__iterator_difference_type<_InIter>, __iterator_difference_type<_OutIter> >::type;
     if (__first == __last)
-      return std::make_pair(std::move(__first), std::move(__result));
+      return {std::move(__first), std::move(__result)};
     auto __local_first      = _Traits::__local(__result);
     auto __segment_iterator = _Traits::__segment(__result);
 @@ -80,17 +80,18 @@ struct __move_impl {
       auto __local_last = _Traits::__end(__segment_iterator);
       auto __size       = std::min<_DiffT>(__local_last - __local_first, __last - __first);
       auto __iters      = std::__move<_AlgPolicy>(__first, __first + __size, __local_first);
-      __first           = std::move(__iters.first);
+      __first           = std::move(__iters.__in_);
       if (__first == __last)
-        return std::make_pair(std::move(__first), _Traits::__compose(__segment_iterator, std::move(__iters.second)));
+        return {std::move(__first), _Traits::__compose(__segment_iterator, std::move(__iters.__out_))};
       __local_first = _Traits::__begin(++__segment_iterator);
     }
   }
   template <class _Cp, bool _IsConst>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__bit_iterator<_Cp, _IsConst>, __bit_iterator<_Cp, false> >
+  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<__bit_iterator<_Cp, _IsConst>, __bit_iterator<_Cp, false> >
   operator()(__bit_iterator<_Cp, _IsConst> __first,
              __bit_iterator<_Cp, _IsConst> __last,
              __bit_iterator<_Cp, false> __result) {
 @@ -99,14 +100,14 @@ struct __move_impl {
   // At this point, the iterators have been unwrapped so any `contiguous_iterator` has been unwrapped to a pointer.
   template <class _In, class _Out, __enable_if_t<__can_lower_move_assignment_to_memmove<_In, _Out>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In*, _Out*>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_In*, _Out*>
   operator()(_In* __first, _In* __last, _Out* __result) const {
     return std::__copy_trivial_impl(__first, __last, __result);
   }
 };
 template <class _AlgPolicy, class _InIter, class _Sent, class _OutIter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
 __move(_InIter __first, _Sent __last, _OutIter __result) {
   return std::__copy_move_unwrap_iters<__move_impl<_AlgPolicy> >(
       std::move(__first), std::move(__last), std::move(__result));
 @@ -118,7 +119,7 @@ move(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {
   static_assert(is_copy_constructible<_InputIterator>::value, "Iterators has to be copy constructible.");
   static_assert(is_copy_constructible<_OutputIterator>::value, "The output iterator has to be copy constructible.");
-  return std::__move<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result)).second;
+  return std::__move<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result)).__out_;
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/move_backward.h+16-14

 @@ -12,6 +12,7 @@
 #include <__algorithm/copy_backward.h>
 #include <__algorithm/copy_move_common.h>
 #include <__algorithm/for_each_segment.h>
+#include <__algorithm/in_out_result.h>
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/min.h>
 #include <__config>
 @@ -34,13 +35,13 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _AlgPolicy, class _BidirectionalIterator1, class _Sentinel, class _BidirectionalIterator2>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_BidirectionalIterator1, _BidirectionalIterator2>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<_BidirectionalIterator1, _BidirectionalIterator2>
 __move_backward(_BidirectionalIterator1 __first, _Sentinel __last, _BidirectionalIterator2 __result);
 template <class _AlgPolicy>
 struct __move_backward_impl {
   template <class _InIter, class _Sent, class _OutIter>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _Sent __last, _OutIter __result) const {
     auto __last_iter          = _IterOps<_AlgPolicy>::next(__first, __last);
     auto __original_last_iter = __last_iter;
 @@ -49,17 +50,17 @@ struct __move_backward_impl {
       *--__result = _IterOps<_AlgPolicy>::__iter_move(--__last_iter);
     }
-    return std::make_pair(std::move(__original_last_iter), std::move(__result));
+    return {std::move(__original_last_iter), std::move(__result)};
   }
   template <class _InIter, class _OutIter, __enable_if_t<__is_segmented_iterator_v<_InIter>, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _InIter __last, _OutIter __result) const {
     using __local_iterator = typename __segmented_iterator_traits<_InIter>::__local_iterator;
     std::__for_each_segment_backward(__first, __last, [&__result](__local_iterator __lfirst, __local_iterator __llast) {
-      __result = std::__move_backward<_AlgPolicy>(std::move(__lfirst), std::move(__llast), std::move(__result)).second;
+      __result = std::__move_backward<_AlgPolicy>(std::move(__lfirst), std::move(__llast), std::move(__result)).__out_;
     });
-    return std::make_pair(__last, std::move(__result));
+    return {__last, std::move(__result)};
   }
   template <class _InIter,
 @@ -67,7 +68,7 @@ struct __move_backward_impl {
             __enable_if_t<__has_random_access_iterator_category<_InIter>::value &&
                               !__is_segmented_iterator_v<_InIter> && __is_segmented_iterator_v<_OutIter>,
                           int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_InIter, _OutIter>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_InIter, _OutIter>
   operator()(_InIter __first, _InIter __last, _OutIter __result) const {
     using _Traits = __segmented_iterator_traits<_OutIter>;
     using _DiffT =
 @@ -75,7 +76,7 @@ struct __move_backward_impl {
     // When the range contains no elements, __result might not be a valid iterator
     if (__first == __last)
-      return std::make_pair(__first, __result);
+      return {__first, __result};
     auto __orig_last = __last;
 @@ -84,18 +85,19 @@ struct __move_backward_impl {
     while (true) {
       auto __local_first = _Traits::__begin(__segment_iterator);
       auto __size        = std::min<_DiffT>(__local_last - __local_first, __last - __first);
-      auto __iter        = std::__move_backward<_AlgPolicy>(__last - __size, __last, __local_last).second;
+      auto __iter        = std::__move_backward<_AlgPolicy>(__last - __size, __last, __local_last).__out_;
       __last -= __size;
       if (__first == __last)
-        return std::make_pair(std::move(__orig_last), _Traits::__compose(__segment_iterator, std::move(__iter)));
+        return {std::move(__orig_last), _Traits::__compose(__segment_iterator, std::move(__iter))};
       __local_last = _Traits::__end(--__segment_iterator);
     }
   }
   template <class _Cp, bool _IsConst>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__bit_iterator<_Cp, _IsConst>, __bit_iterator<_Cp, false> >
+  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<__bit_iterator<_Cp, _IsConst>, __bit_iterator<_Cp, false> >
   operator()(__bit_iterator<_Cp, _IsConst> __first,
              __bit_iterator<_Cp, _IsConst> __last,
              __bit_iterator<_Cp, false> __result) {
 @@ -104,14 +106,14 @@ struct __move_backward_impl {
   // At this point, the iterators have been unwrapped so any `contiguous_iterator` has been unwrapped to a pointer.
   template <class _In, class _Out, __enable_if_t<__can_lower_move_assignment_to_memmove<_In, _Out>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<_In*, _Out*>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __in_out_result<_In*, _Out*>
   operator()(_In* __first, _In* __last, _Out* __result) const {
     return std::__copy_backward_trivial_impl(__first, __last, __result);
   }
 };
 template <class _AlgPolicy, class _BidirectionalIterator1, class _Sentinel, class _BidirectionalIterator2>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_BidirectionalIterator1, _BidirectionalIterator2>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<_BidirectionalIterator1, _BidirectionalIterator2>
 __move_backward(_BidirectionalIterator1 __first, _Sentinel __last, _BidirectionalIterator2 __result) {
   static_assert(std::is_copy_constructible<_BidirectionalIterator1>::value &&
                     std::is_copy_constructible<_BidirectionalIterator1>::value,
 @@ -124,7 +126,7 @@ __move_backward(_BidirectionalIterator1 __first, _Sentinel __last, _Bidirectiona
 template <class _BidirectionalIterator1, class _BidirectionalIterator2>
 inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _BidirectionalIterator2
 move_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last, _BidirectionalIterator2 __result) {
-  return std::__move_backward<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result)).second;
+  return std::__move_backward<_ClassicAlgPolicy>(std::move(__first), std::move(__last), std::move(__result)).__out_;
 }
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/out_value_result.h+4-4

 @@ -21,10 +21,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <class _OutIter1, class _ValType1>
 @@ -47,10 +47,10 @@ struct out_value_result {
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___ALGORITHM_OUT_VALUE_RESULT_H

lib/libcxx/include/__algorithm/partial_sort_copy.h+5-4

...	@@ -11,6 +11,7 @@	...	@@ -11,6 +11,7 @@
11		11
12	#include <__algorithm/comp.h>	12	#include <__algorithm/comp.h>
13	#include <__algorithm/comp_ref_type.h>	13	#include <__algorithm/comp_ref_type.h>
		14	#include <__algorithm/in_out_result.h>
14	#include <__algorithm/iterator_operations.h>	15	#include <__algorithm/iterator_operations.h>
15	#include <__algorithm/make_heap.h>	16	#include <__algorithm/make_heap.h>
16	#include <__algorithm/make_projected.h>	17	#include <__algorithm/make_projected.h>
...	@@ -41,7 +42,8 @@ template <class _AlgPolicy,	...	@@ -41,7 +42,8 @@ template <class _AlgPolicy,
41	class _Sentinel2,	42	class _Sentinel2,
42	class _Proj1,	43	class _Proj1,
43	class _Proj2>	44	class _Proj2>
44	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InputIterator, _RandomAccessIterator> __partial_sort_copy(	45	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<_InputIterator, _RandomAccessIterator>
		46	__partial_sort_copy(
45	_InputIterator __first,	47	_InputIterator __first,
46	_Sentinel1 __last,	48	_Sentinel1 __last,
47	_RandomAccessIterator __result_first,	49	_RandomAccessIterator __result_first,
...	@@ -65,8 +67,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InputIterator, _Random	...	@@ -65,8 +67,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_InputIterator, _Random
65	std::__sort_heap<_AlgPolicy>(__result_first, __r, __projected_comp);	67	std::__sort_heap<_AlgPolicy>(__result_first, __r, __projected_comp);
66	}	68	}
67		69
68	return pair<_InputIterator, _RandomAccessIterator>(	70	return {_IterOps<_AlgPolicy>::next(std::move(__first), std::move(__last)), std::move(__r)};
69	_IterOps<_AlgPolicy>::next(std::move(__first), std::move(__last)), std::move(__r));
70	}	71	}
71		72
72	template <class _InputIterator, class _RandomAccessIterator, class _Compare>	73	template <class _InputIterator, class _RandomAccessIterator, class _Compare>
...	@@ -87,7 +88,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _RandomAccessIterator	...	@@ -87,7 +88,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _RandomAccessIterator
87	static_cast<__comp_ref_type<_Compare> >(__comp),	88	static_cast<__comp_ref_type<_Compare> >(__comp),
88	__identity(),	89	__identity(),
89	__identity());	90	__identity());
90	return __result.second;	91	return __result.__out_;
91	}	92	}
92		93
93	template <class _InputIterator, class _RandomAccessIterator>	94	template <class _InputIterator, class _RandomAccessIterator>

lib/libcxx/include/__algorithm/pstl.h+90

...	@@ -293,6 +293,54 @@ find(_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __l	...	@@ -293,6 +293,54 @@ find(_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __l
293	std::forward<_ExecutionPolicy>(__policy), std::move(__first), std::move(__last), __value);	293	std::forward<_ExecutionPolicy>(__policy), std::move(__first), std::move(__last), __value);
294	}	294	}
295		295
		296	template <class _ExecutionPolicy,
		297	class _ForwardIterator1,
		298	class _ForwardIterator2,
		299	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
		300	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
		301	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _ForwardIterator1 find_first_of(
		302	_ExecutionPolicy&& __policy,
		303	_ForwardIterator1 __first1,
		304	_ForwardIterator1 __last1,
		305	_ForwardIterator2 __first2,
		306	_ForwardIterator2 __last2) {
		307	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator1, "find_first_of requires ForwardIterators");
		308	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator2, "find_first_of requires ForwardIterators");
		309	using _Implementation = __pstl::__dispatch<__pstl::__find_first_of, __pstl::__current_configuration, _RawPolicy>;
		310	return __pstl::__handle_exception<_Implementation>(
		311	std::forward<_ExecutionPolicy>(__policy),
		312	std::move(__first1),
		313	std::move(__last1),
		314	std::move(__first2),
		315	std::move(__last2),
		316	std::equal_to<>{});
		317	}
		318
		319	template <class _ExecutionPolicy,
		320	class _ForwardIterator1,
		321	class _ForwardIterator2,
		322	class _BinaryPredicate,
		323	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
		324	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
		325	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _ForwardIterator1 find_first_of(
		326	_ExecutionPolicy&& __policy,
		327	_ForwardIterator1 __first1,
		328	_ForwardIterator1 __last1,
		329	_ForwardIterator2 __first2,
		330	_ForwardIterator2 __last2,
		331	_BinaryPredicate __pred) {
		332	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator1, "find_first_of requires ForwardIterators");
		333	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator2, "find_first_of requires ForwardIterators");
		334	using _Implementation = __pstl::__dispatch<__pstl::__find_first_of, __pstl::__current_configuration, _RawPolicy>;
		335	return __pstl::__handle_exception<_Implementation>(
		336	std::forward<_ExecutionPolicy>(__policy),
		337	std::move(__first1),
		338	std::move(__last1),
		339	std::move(__first2),
		340	std::move(__last2),
		341	std::move(__pred));
		342	}
		343
296	template <class _ExecutionPolicy,	344	template <class _ExecutionPolicy,
297	class _ForwardIterator,	345	class _ForwardIterator,
298	class _Function,	346	class _Function,
...	@@ -347,6 +395,23 @@ generate_n(_ExecutionPolicy&& __policy, _ForwardIterator __first, _Size __n, _Ge	...	@@ -347,6 +395,23 @@ generate_n(_ExecutionPolicy&& __policy, _ForwardIterator __first, _Size __n, _Ge
347	std::forward<_ExecutionPolicy>(__policy), std::move(__first), std::move(__n), std::move(__gen));	395	std::forward<_ExecutionPolicy>(__policy), std::move(__first), std::move(__n), std::move(__gen));
348	}	396	}
349		397
		398	template <class _ExecutionPolicy,
		399	class _BidirectionalIterator,
		400	class _ForwardIterator,
		401	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
		402	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
		403	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _ForwardIterator reverse_copy(
		404	_ExecutionPolicy&& __policy,
		405	_BidirectionalIterator __first,
		406	_BidirectionalIterator __last,
		407	_ForwardIterator __result) {
		408	_LIBCPP_REQUIRE_CPP17_BIDIRECTIONAL_ITERATOR(_BidirectionalIterator, "reverse_copy requires a BidirectionalIterator");
		409	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator, "reverse_copy requires a ForwardIterator");
		410	using _Implementation = __pstl::__dispatch<__pstl::__reverse_copy, __pstl::__current_configuration, _RawPolicy>;
		411	return __pstl::__handle_exception<_Implementation>(
		412	std::forward<_ExecutionPolicy>(__policy), std::move(__first), std::move(__last), std::move(__result));
		413	}
		414
350	template <class _ExecutionPolicy,	415	template <class _ExecutionPolicy,
351	class _ForwardIterator,	416	class _ForwardIterator,
352	class _Predicate,	417	class _Predicate,
...	@@ -654,6 +719,31 @@ _LIBCPP_HIDE_FROM_ABI _ForwardOutIterator transform(	...	@@ -654,6 +719,31 @@ _LIBCPP_HIDE_FROM_ABI _ForwardOutIterator transform(
654	std::move(__op));	719	std::move(__op));
655	}	720	}
656		721
		722	template <class _ExecutionPolicy,
		723	class _ForwardIterator,
		724	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
		725	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
		726	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool
		727	is_sorted(_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __last) {
		728	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator, "is_sorted requires ForwardIterators");
		729	using _Implementation = __pstl::__dispatch<__pstl::__is_sorted, __pstl::__current_configuration, _RawPolicy>;
		730	return __pstl::__handle_exception<_Implementation>(
		731	std::forward<_ExecutionPolicy>(__policy), std::move(__first), std::move(__last), less{});
		732	}
		733
		734	template <class _ExecutionPolicy,
		735	class _ForwardIterator,
		736	class _Comp,
		737	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
		738	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
		739	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool
		740	is_sorted(_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __last, _Comp __comp) {
		741	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator, "is_sorted requires ForwardIterators");
		742	using _Implementation = __pstl::__dispatch<__pstl::__is_sorted, __pstl::__current_configuration, _RawPolicy>;
		743	return __pstl::__handle_exception<_Implementation>(
		744	std::forward<_ExecutionPolicy>(__policy), std::move(__first), std::move(__last), std::move(__comp));
		745	}
		746
657	_LIBCPP_END_NAMESPACE_STD	747	_LIBCPP_END_NAMESPACE_STD
658		748
659	#endif // _LIBCPP_HAS_EXPERIMENTAL_PSTL && _LIBCPP_STD_VER >= 17	749	#endif // _LIBCPP_HAS_EXPERIMENTAL_PSTL && _LIBCPP_STD_VER >= 17

lib/libcxx/include/__algorithm/radix_sort.h+4-4

 @@ -67,10 +67,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 14
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _InputIterator, class _OutputIterator>
 _LIBCPP_HIDE_FROM_ABI constexpr pair<_OutputIterator, __iterator_value_type<_InputIterator>>
 __partial_sum_max(_InputIterator __first, _InputIterator __last, _OutputIterator __result) {
 @@ -422,10 +422,10 @@ __radix_sort(_RandomAccessIterator1 __first, _RandomAccessIterator1 __last, _Ran
   std::__radix_sort(__first, __last, __buffer, __identity{}, __low_byte_fn{});
 }
-#endif // _LIBCPP_STD_VER >= 14
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 14
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___ALGORITHM_RADIX_SORT_H

lib/libcxx/include/__algorithm/ranges_copy.h+2-4

 @@ -41,16 +41,14 @@ struct __copy {
     requires indirectly_copyable<_InIter, _OutIter>
   _LIBCPP_HIDE_FROM_ABI constexpr copy_result<_InIter, _OutIter>
   operator()(_InIter __first, _Sent __last, _OutIter __result) const {
-    auto __ret = std::__copy(std::move(__first), std::move(__last), std::move(__result));
+    return std::__copy(std::move(__first), std::move(__last), std::move(__result));
-    return {std::move(__ret.first), std::move(__ret.second)};
   }
   template <input_range _Range, weakly_incrementable _OutIter>
     requires indirectly_copyable<iterator_t<_Range>, _OutIter>
   _LIBCPP_HIDE_FROM_ABI constexpr copy_result<borrowed_iterator_t<_Range>, _OutIter>
   operator()(_Range&& __r, _OutIter __result) const {
-    auto __ret = std::__copy(ranges::begin(__r), ranges::end(__r), std::move(__result));
+    return std::__copy(ranges::begin(__r), ranges::end(__r), std::move(__result));
-    return {std::move(__ret.first), std::move(__ret.second)};
   }
 };

lib/libcxx/include/__algorithm/ranges_copy_backward.h+2-4

 @@ -40,16 +40,14 @@ struct __copy_backward {
     requires indirectly_copyable<_InIter1, _InIter2>
   _LIBCPP_HIDE_FROM_ABI constexpr copy_backward_result<_InIter1, _InIter2>
   operator()(_InIter1 __first, _Sent1 __last, _InIter2 __result) const {
-    auto __ret = std::__copy_backward<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__result));
+    return std::__copy_backward<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__result));
-    return {std::move(__ret.first), std::move(__ret.second)};
   }
   template <bidirectional_range _Range, bidirectional_iterator _Iter>
     requires indirectly_copyable<iterator_t<_Range>, _Iter>
   _LIBCPP_HIDE_FROM_ABI constexpr copy_backward_result<borrowed_iterator_t<_Range>, _Iter>
   operator()(_Range&& __r, _Iter __result) const {
-    auto __ret = std::__copy_backward<_RangeAlgPolicy>(ranges::begin(__r), ranges::end(__r), std::move(__result));
+    return std::__copy_backward<_RangeAlgPolicy>(ranges::begin(__r), ranges::end(__r), std::move(__result));
-    return {std::move(__ret.first), std::move(__ret.second)};
   }
 };

lib/libcxx/include/__algorithm/ranges_copy_if.h+2-4

...	@@ -46,8 +46,7 @@ struct __copy_if {	...	@@ -46,8 +46,7 @@ struct __copy_if {
46	requires indirectly_copyable<_Iter, _OutIter>	46	requires indirectly_copyable<_Iter, _OutIter>
47	_LIBCPP_HIDE_FROM_ABI constexpr copy_if_result<_Iter, _OutIter>	47	_LIBCPP_HIDE_FROM_ABI constexpr copy_if_result<_Iter, _OutIter>
48	operator()(_Iter __first, _Sent __last, _OutIter __result, _Pred __pred, _Proj __proj = {}) const {	48	operator()(_Iter __first, _Sent __last, _OutIter __result, _Pred __pred, _Proj __proj = {}) const {
49	auto __res = std::__copy_if(std::move(__first), std::move(__last), std::move(__result), __pred, __proj);	49	return std::__copy_if(std::move(__first), std::move(__last), std::move(__result), __pred, __proj);
50	return {std::move(__res.first), std::move(__res.second)};
51	}	50	}
52		51
53	template <input_range _Range,	52	template <input_range _Range,
...	@@ -57,8 +56,7 @@ struct __copy_if {	...	@@ -57,8 +56,7 @@ struct __copy_if {
57	requires indirectly_copyable<iterator_t<_Range>, _OutIter>	56	requires indirectly_copyable<iterator_t<_Range>, _OutIter>
58	_LIBCPP_HIDE_FROM_ABI constexpr copy_if_result<borrowed_iterator_t<_Range>, _OutIter>	57	_LIBCPP_HIDE_FROM_ABI constexpr copy_if_result<borrowed_iterator_t<_Range>, _OutIter>
59	operator()(_Range&& __r, _OutIter __result, _Pred __pred, _Proj __proj = {}) const {	58	operator()(_Range&& __r, _OutIter __result, _Pred __pred, _Proj __proj = {}) const {
60	auto __res = std::__copy_if(ranges::begin(__r), ranges::end(__r), std::move(__result), __pred, __proj);	59	return std::__copy_if(ranges::begin(__r), ranges::end(__r), std::move(__result), __pred, __proj);
61	return {std::move(__res.first), std::move(__res.second)};
62	}	60	}
63	};	61	};
64		62

lib/libcxx/include/__algorithm/ranges_copy_n.h+5-6

 @@ -24,10 +24,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <class _Ip, class _Op>
 @@ -38,8 +38,7 @@ struct __copy_n {
     requires indirectly_copyable<_Ip, _Op>
   _LIBCPP_HIDE_FROM_ABI constexpr copy_n_result<_Ip, _Op>
   operator()(_Ip __first, iter_difference_t<_Ip> __n, _Op __result) const {
-    auto __res = std::__copy_n<_RangeAlgPolicy>(std::move(__first), __n, std::move(__result));
+    return std::__copy_n<_RangeAlgPolicy>(std::move(__first), __n, std::move(__result));
-    return {std::move(__res.first), std::move(__res.second)};
   }
 };
 @@ -48,10 +47,10 @@ inline constexpr auto copy_n = __copy_n{};
 } // namespace __cpo
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___ALGORITHM_RANGES_COPY_N_H

lib/libcxx/include/__algorithm/ranges_equal.h+2-2

...	@@ -50,7 +50,7 @@ struct __equal {	...	@@ -50,7 +50,7 @@ struct __equal {
50	_Pred __pred = {},	50	_Pred __pred = {},
51	_Proj1 __proj1 = {},	51	_Proj1 __proj1 = {},
52	_Proj2 __proj2 = {}) const {	52	_Proj2 __proj2 = {}) const {
53	static constexpr bool __both_sized = sized_sentinel_for<_Sent1, _Iter1> && sized_sentinel_for<_Sent2, _Iter2>;	53	constexpr bool __both_sized = sized_sentinel_for<_Sent1, _Iter1> && sized_sentinel_for<_Sent2, _Iter2>;
54	if constexpr (__both_sized) {	54	if constexpr (__both_sized) {
55	if (__last1 - __first1 != __last2 - __first2)	55	if (__last1 - __first1 != __last2 - __first2)
56	return false;	56	return false;
...	@@ -71,7 +71,7 @@ struct __equal {	...	@@ -71,7 +71,7 @@ struct __equal {
71	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>	71	requires indirectly_comparable<iterator_t<_Range1>, iterator_t<_Range2>, _Pred, _Proj1, _Proj2>
72	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool operator()(	72	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool operator()(
73	_Range1&& __range1, _Range2&& __range2, _Pred __pred = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const {	73	_Range1&& __range1, _Range2&& __range2, _Pred __pred = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const {
74	static constexpr bool __both_sized = sized_range<_Range1> && sized_range<_Range2>;	74	constexpr bool __both_sized = sized_range<_Range1> && sized_range<_Range2>;
75	if constexpr (__both_sized) {	75	if constexpr (__both_sized) {
76	if (ranges::size(__range1) != ranges::size(__range2))	76	if (ranges::size(__range1) != ranges::size(__range2))
77	return false;	77	return false;

lib/libcxx/include/__algorithm/ranges_find_if.h+3-12

 @@ -9,10 +9,10 @@
 #ifndef _LIBCPP___ALGORITHM_RANGES_FIND_IF_H
 #define _LIBCPP___ALGORITHM_RANGES_FIND_IF_H
+#include <__algorithm/find_if.h>
 #include <__config>
 #include <__functional/identity.h>
 #include <__functional/invoke.h>
-#include <__functional/ranges_operations.h>
 #include <__iterator/concepts.h>
 #include <__iterator/projected.h>
 #include <__ranges/access.h>
 @@ -33,15 +33,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
-template <class _Ip, class _Sp, class _Pred, class _Proj>
-_LIBCPP_HIDE_FROM_ABI constexpr _Ip __find_if_impl(_Ip __first, _Sp __last, _Pred& __pred, _Proj& __proj) {
-  for (; __first != __last; ++__first) {
-    if (std::invoke(__pred, std::invoke(__proj, *__first)))
-      break;
-  }
-  return __first;
-}
 struct __find_if {
   template <input_iterator _Ip,
             sentinel_for<_Ip> _Sp,
 @@ -49,13 +40,13 @@ struct __find_if {
             indirect_unary_predicate<projected<_Ip, _Proj>> _Pred>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Ip
   operator()(_Ip __first, _Sp __last, _Pred __pred, _Proj __proj = {}) const {
-    return ranges::__find_if_impl(std::move(__first), std::move(__last), __pred, __proj);
+    return std::__find_if(std::move(__first), std::move(__last), __pred, __proj);
   }
   template <input_range _Rp, class _Proj = identity, indirect_unary_predicate<projected<iterator_t<_Rp>, _Proj>> _Pred>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr borrowed_iterator_t<_Rp>
   operator()(_Rp&& __r, _Pred __pred, _Proj __proj = {}) const {
-    return ranges::__find_if_impl(ranges::begin(__r), ranges::end(__r), __pred, __proj);
+    return std::__find_if(ranges::begin(__r), ranges::end(__r), __pred, __proj);
   }
 };

lib/libcxx/include/__algorithm/ranges_find_if_not.h+3-8

 @@ -9,17 +9,14 @@
 #ifndef _LIBCPP___ALGORITHM_RANGES_FIND_IF_NOT_H
 #define _LIBCPP___ALGORITHM_RANGES_FIND_IF_NOT_H
-#include <__algorithm/ranges_find_if.h>
+#include <__algorithm/find_if_not.h>
 #include <__config>
 #include <__functional/identity.h>
-#include <__functional/invoke.h>
-#include <__functional/ranges_operations.h>
 #include <__iterator/concepts.h>
 #include <__iterator/projected.h>
 #include <__ranges/access.h>
 #include <__ranges/concepts.h>
 #include <__ranges/dangling.h>
-#include <__utility/forward.h>
 #include <__utility/move.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -41,15 +38,13 @@ struct __find_if_not {
             indirect_unary_predicate<projected<_Ip, _Proj>> _Pred>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Ip
   operator()(_Ip __first, _Sp __last, _Pred __pred, _Proj __proj = {}) const {
-    auto __pred2 = [&](auto&& __e) -> bool { return !std::invoke(__pred, std::forward<decltype(__e)>(__e)); };
+    return std::__find_if_not(std::move(__first), std::move(__last), __pred, __proj);
-    return ranges::__find_if_impl(std::move(__first), std::move(__last), __pred2, __proj);
   }
   template <input_range _Rp, class _Proj = identity, indirect_unary_predicate<projected<iterator_t<_Rp>, _Proj>> _Pred>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr borrowed_iterator_t<_Rp>
   operator()(_Rp&& __r, _Pred __pred, _Proj __proj = {}) const {
-    auto __pred2 = [&](auto&& __e) -> bool { return !std::invoke(__pred, std::forward<decltype(__e)>(__e)); };
+    return std::__find_if_not(ranges::begin(__r), ranges::end(__r), __pred, __proj);
-    return ranges::__find_if_impl(ranges::begin(__r), ranges::end(__r), __pred2, __proj);
   }
 };

lib/libcxx/include/__algorithm/ranges_fold.h+145-4

...	@@ -10,17 +10,21 @@	...	@@ -10,17 +10,21 @@
10	#ifndef _LIBCPP___ALGORITHM_RANGES_FOLD_H	10	#ifndef _LIBCPP___ALGORITHM_RANGES_FOLD_H
11	#define _LIBCPP___ALGORITHM_RANGES_FOLD_H	11	#define _LIBCPP___ALGORITHM_RANGES_FOLD_H
12		12
		13	#include <__algorithm/for_each.h>
13	#include <__concepts/assignable.h>	14	#include <__concepts/assignable.h>
14	#include <__concepts/constructible.h>	15	#include <__concepts/constructible.h>
15	#include <__concepts/convertible_to.h>	16	#include <__concepts/convertible_to.h>
16	#include <__concepts/invocable.h>	17	#include <__concepts/invocable.h>
17	#include <__concepts/movable.h>	18	#include <__concepts/movable.h>
18	#include <__config>	19	#include <__config>
		20	#include <__functional/identity.h>
19	#include <__functional/invoke.h>	21	#include <__functional/invoke.h>
20	#include <__functional/reference_wrapper.h>	22	#include <__functional/reference_wrapper.h>
21	#include <__iterator/concepts.h>	23	#include <__iterator/concepts.h>
22	#include <__iterator/iterator_traits.h>	24	#include <__iterator/iterator_traits.h>
23	#include <__iterator/next.h>	25	#include <__iterator/next.h>
		26	#include <__iterator/prev.h>
		27	#include <__iterator/reverse_iterator.h>
24	#include <__ranges/access.h>	28	#include <__ranges/access.h>
25	#include <__ranges/concepts.h>	29	#include <__ranges/concepts.h>
26	#include <__ranges/dangling.h>	30	#include <__ranges/dangling.h>
...	@@ -28,6 +32,7 @@	...	@@ -28,6 +32,7 @@
28	#include <__type_traits/invoke.h>	32	#include <__type_traits/invoke.h>
29	#include <__utility/forward.h>	33	#include <__utility/forward.h>
30	#include <__utility/move.h>	34	#include <__utility/move.h>
		35	#include <optional>
31		36
32	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	37	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
33	# pragma GCC system_header	38	# pragma GCC system_header
...	@@ -62,6 +67,9 @@ struct in_value_result {	...	@@ -62,6 +67,9 @@ struct in_value_result {
62	template <class _Ip, class _Tp>	67	template <class _Ip, class _Tp>
63	using fold_left_with_iter_result = in_value_result<_Ip, _Tp>;	68	using fold_left_with_iter_result = in_value_result<_Ip, _Tp>;
64		69
		70	template <class _Ip, class _Tp>
		71	using fold_left_first_with_iter_result = in_value_result<_Ip, _Tp>;
		72
65	template <class _Fp, class _Tp, class _Ip, class _Rp, class _Up = decay_t<_Rp>>	73	template <class _Fp, class _Tp, class _Ip, class _Rp, class _Up = decay_t<_Rp>>
66	concept __indirectly_binary_left_foldable_impl =	74	concept __indirectly_binary_left_foldable_impl =
67	convertible_to<_Rp, _Up> && //	75	convertible_to<_Rp, _Up> && //
...	@@ -77,6 +85,22 @@ concept __indirectly_binary_left_foldable =	...	@@ -77,6 +85,22 @@ concept __indirectly_binary_left_foldable =
77	invocable<_Fp&, _Tp, iter_reference_t<_Ip>> && //	85	invocable<_Fp&, _Tp, iter_reference_t<_Ip>> && //
78	__indirectly_binary_left_foldable_impl<_Fp, _Tp, _Ip, invoke_result_t<_Fp&, _Tp, iter_reference_t<_Ip>>>;	86	__indirectly_binary_left_foldable_impl<_Fp, _Tp, _Ip, invoke_result_t<_Fp&, _Tp, iter_reference_t<_Ip>>>;
79		87
		88	template <class _Func>
		89	struct __flipped {
		90	_Func __func;
		91
		92	template <class _Tp, class _Up>
		93	requires invocable<_Func&, _Up, _Tp>
		94	invoke_result_t<_Func&, _Up, _Tp> operator()(_Tp&&, _Up&&);
		95	};
		96
		97	template <class _Func, class _Tp, class _Iter>
		98	concept __indirectly_binary_right_foldable =
		99	__indirectly_binary_left_foldable_impl<__flipped<_Func>,
		100	_Tp,
		101	_Iter,
		102	invoke_result_t<_Func&, _Tp, iter_reference_t<_Iter>>>;
		103
80	struct __fold_left_with_iter {	104	struct __fold_left_with_iter {
81	template <input_iterator _Ip, sentinel_for<_Ip> _Sp, class _Tp, __indirectly_binary_left_foldable<_Tp, _Ip> _Fp>	105	template <input_iterator _Ip, sentinel_for<_Ip> _Sp, class _Tp, __indirectly_binary_left_foldable<_Tp, _Ip> _Fp>
82	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Ip __first, _Sp __last, _Tp __init, _Fp __f) {	106	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Ip __first, _Sp __last, _Tp __init, _Fp __f) {
...	@@ -87,11 +111,17 @@ struct __fold_left_with_iter {	...	@@ -87,11 +111,17 @@ struct __fold_left_with_iter {
87	}	111	}
88		112
89	_Up __result = std::invoke(__f, std::move(__init), *__first);	113	_Up __result = std::invoke(__f, std::move(__init), *__first);
90	for (++__first; __first != __last; ++__first) {	114	++__first;
91	__result = std::invoke(__f, std::move(__result), *__first);	115	__identity __proj;
92	}	116	auto __end = std::__for_each(
		117	std::move(__first),
		118	std::move(__last),
		119	[&](auto&& __element) {
		120	__result = std::invoke(__f, std::move(__result), std::forward<decltype(__element)>(__element));
		121	},
		122	__proj);
93		123
94	return fold_left_with_iter_result<_Ip, _Up>{std::move(__first), std::move(__result)};	124	return fold_left_with_iter_result<_Ip, _Up>{std::move(__end), std::move(__result)};
95	}	125	}
96		126
97	template <input_range _Rp, class _Tp, __indirectly_binary_left_foldable<_Tp, iterator_t<_Rp>> _Fp>	127	template <input_range _Rp, class _Tp, __indirectly_binary_left_foldable<_Tp, iterator_t<_Rp>> _Fp>
...	@@ -118,6 +148,117 @@ struct __fold_left {	...	@@ -118,6 +148,117 @@ struct __fold_left {
118	};	148	};
119		149
120	inline constexpr auto fold_left = __fold_left();	150	inline constexpr auto fold_left = __fold_left();
		151
		152	struct __fold_left_first_with_iter {
		153	template <input_iterator _Iter,
		154	sentinel_for<_Iter> _Sent,
		155	__indirectly_binary_left_foldable<iter_value_t<_Iter>, _Iter> _Func>
		156	requires constructible_from<iter_value_t<_Iter>, iter_reference_t<_Iter>>
		157	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Iter __first, _Sent __last, _Func __func) {
		158	using _Up = decltype(fold_left(std::move(__first), __last, iter_value_t<_Iter>(*__first), __func));
		159
		160	if (__first == __last)
		161	return fold_left_first_with_iter_result<_Iter, optional<_Up>>{std::move(__first), optional<_Up>()};
		162
		163	_Up __result(*__first);
		164	++__first;
		165	__identity __proj;
		166	auto __end = std::__for_each(
		167	std::move(__first),
		168	std::move(__last),
		169	[&](auto&& __element) {
		170	__result = std::invoke(__func, std::move(__result), std::forward<decltype(__element)>(__element));
		171	},
		172	__proj);
		173
		174	return fold_left_first_with_iter_result<_Iter, optional<_Up>>{std::move(__end), optional<_Up>(std::move(__result))};
		175	}
		176
		177	template <input_range _Range, __indirectly_binary_left_foldable<range_value_t<_Range>, iterator_t<_Range>> _Func>
		178	requires constructible_from<range_value_t<_Range>, range_reference_t<_Range>>
		179	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Range&& __range, _Func __func) {
		180	auto __result = operator()(ranges::begin(__range), ranges::end(__range), std::ref(__func));
		181
		182	using _Up = decltype(fold_left(
		183	ranges::begin(__range), ranges::end(__range), range_value_t<_Range>(*ranges::begin(__range)), __func));
		184	return fold_left_first_with_iter_result<borrowed_iterator_t<_Range>, optional<_Up>>{
		185	std::move(__result.in), std::move(__result.value)};
		186	}
		187	};
		188
		189	inline constexpr auto fold_left_first_with_iter = __fold_left_first_with_iter();
		190
		191	struct __fold_left_first {
		192	template <input_iterator _Iter,
		193	sentinel_for<_Iter> _Sent,
		194	__indirectly_binary_left_foldable<iter_value_t<_Iter>, _Iter> _Func>
		195	requires constructible_from<iter_value_t<_Iter>, iter_reference_t<_Iter>>
		196	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Iter __first, _Sent __last, _Func __func) {
		197	return fold_left_first_with_iter(std::move(__first), std::move(__last), std::ref(__func)).value;
		198	}
		199
		200	template <input_range _Range, __indirectly_binary_left_foldable<range_value_t<_Range>, iterator_t<_Range>> _Func>
		201	requires constructible_from<range_value_t<_Range>, range_reference_t<_Range>>
		202	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Range&& __range, _Func __func) {
		203	return fold_left_first_with_iter(ranges::begin(__range), ranges::end(__range), std::ref(__func)).value;
		204	}
		205	};
		206
		207	inline constexpr auto fold_left_first = __fold_left_first();
		208
		209	struct __fold_right {
		210	template <bidirectional_iterator _Iter,
		211	sentinel_for<_Iter> _Sp,
		212	class _Tp,
		213	__indirectly_binary_right_foldable<_Tp, _Iter> _Func>
		214	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto
		215	operator()(_Iter __first, _Sp __last, _Tp __init, _Func __func) {
		216	using _Up = decay_t<invoke_result_t<_Func&, iter_reference_t<_Iter>, _Tp>>;
		217
		218	if (__first == __last)
		219	return _Up(std::move(__init));
		220
		221	_Iter __tail = ranges::next(__first, __last);
		222	--__tail;
		223	_Up __result = std::invoke(__func, *__tail, std::move(__init));
		224	std::for_each(std::make_reverse_iterator(__tail), std::make_reverse_iterator(__first), [&](auto&& __element) {
		225	__result = std::invoke(__func, std::forward<decltype(__element)>(__element), std::move(__result));
		226	});
		227
		228	return __result;
		229	}
		230
		231	template <bidirectional_range _Range, class _Tp, __indirectly_binary_right_foldable<_Tp, iterator_t<_Range>> _Func>
		232	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Range&& __range, _Tp __init, _Func __func) {
		233	return operator()(ranges::begin(__range), ranges::end(__range), std::move(__init), std::ref(__func));
		234	}
		235	};
		236
		237	inline constexpr auto fold_right = __fold_right();
		238
		239	struct __fold_right_last {
		240	template <bidirectional_iterator _Iter,
		241	sentinel_for<_Iter> _Sp,
		242	__indirectly_binary_right_foldable<iter_value_t<_Iter>, _Iter> _Func>
		243	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Iter __first, _Sp __last, _Func __func) {
		244	using _Up = decltype(fold_right(__first, __last, iter_value_t<_Iter>(*__first), __func));
		245
		246	if (__first == __last)
		247	return optional<_Up>();
		248
		249	_Iter __tail = ranges::prev(ranges::next(__first, __last));
		250	return optional<_Up>(
		251	in_place, ranges::fold_right(std::move(__first), __tail, iter_value_t<_Iter>(*__tail), std::move(__func)));
		252	}
		253
		254	template <bidirectional_range _Range,
		255	__indirectly_binary_right_foldable<range_value_t<_Range>, iterator_t<_Range>> _Func>
		256	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Range&& __range, _Func __func) {
		257	return operator()(ranges::begin(__range), ranges::end(__range), std::ref(__func));
		258	}
		259	};
		260
		261	inline constexpr auto fold_right_last = __fold_right_last();
121	} // namespace ranges	262	} // namespace ranges
122		263
123	#endif // _LIBCPP_STD_VER >= 23	264	#endif // _LIBCPP_STD_VER >= 23

lib/libcxx/include/__algorithm/ranges_move.h+2-9

 @@ -36,25 +36,18 @@ template <class _InIter, class _OutIter>
 using move_result = in_out_result<_InIter, _OutIter>;
 struct __move {
-  template <class _InIter, class _Sent, class _OutIter>
-  _LIBCPP_HIDE_FROM_ABI constexpr static move_result<_InIter, _OutIter>
-  __move_impl(_InIter __first, _Sent __last, _OutIter __result) {
-    auto __ret = std::__move<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__result));
-    return {std::move(__ret.first), std::move(__ret.second)};
-  }
   template <input_iterator _InIter, sentinel_for<_InIter> _Sent, weakly_incrementable _OutIter>
     requires indirectly_movable<_InIter, _OutIter>
   _LIBCPP_HIDE_FROM_ABI constexpr move_result<_InIter, _OutIter>
   operator()(_InIter __first, _Sent __last, _OutIter __result) const {
-    return __move_impl(std::move(__first), std::move(__last), std::move(__result));
+    return std::__move<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__result));
   }
   template <input_range _Range, weakly_incrementable _OutIter>
     requires indirectly_movable<iterator_t<_Range>, _OutIter>
   _LIBCPP_HIDE_FROM_ABI constexpr move_result<borrowed_iterator_t<_Range>, _OutIter>
   operator()(_Range&& __range, _OutIter __result) const {
-    return __move_impl(ranges::begin(__range), ranges::end(__range), std::move(__result));
+    return std::__move<_RangeAlgPolicy>(ranges::begin(__range), ranges::end(__range), std::move(__result));
   }
 };

lib/libcxx/include/__algorithm/ranges_move_backward.h+2-9

 @@ -38,25 +38,18 @@ template <class _InIter, class _OutIter>
 using move_backward_result = in_out_result<_InIter, _OutIter>;
 struct __move_backward {
-  template <class _InIter, class _Sent, class _OutIter>
-  _LIBCPP_HIDE_FROM_ABI constexpr static move_backward_result<_InIter, _OutIter>
-  __move_backward_impl(_InIter __first, _Sent __last, _OutIter __result) {
-    auto __ret = std::__move_backward<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__result));
-    return {std::move(__ret.first), std::move(__ret.second)};
-  }
   template <bidirectional_iterator _InIter, sentinel_for<_InIter> _Sent, bidirectional_iterator _OutIter>
     requires indirectly_movable<_InIter, _OutIter>
   _LIBCPP_HIDE_FROM_ABI constexpr move_backward_result<_InIter, _OutIter>
   operator()(_InIter __first, _Sent __last, _OutIter __result) const {
-    return __move_backward_impl(std::move(__first), std::move(__last), std::move(__result));
+    return std::__move_backward<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__result));
   }
   template <bidirectional_range _Range, bidirectional_iterator _Iter>
     requires indirectly_movable<iterator_t<_Range>, _Iter>
   _LIBCPP_HIDE_FROM_ABI constexpr move_backward_result<borrowed_iterator_t<_Range>, _Iter>
   operator()(_Range&& __range, _Iter __result) const {
-    return __move_backward_impl(ranges::begin(__range), ranges::end(__range), std::move(__result));
+    return std::__move_backward<_RangeAlgPolicy>(ranges::begin(__range), ranges::end(__range), std::move(__result));
   }
 };

lib/libcxx/include/__algorithm/ranges_partial_sort_copy.h+2-4

...	@@ -60,7 +60,7 @@ struct __partial_sort_copy {	...	@@ -60,7 +60,7 @@ struct __partial_sort_copy {
60	_Comp __comp = {},	60	_Comp __comp = {},
61	_Proj1 __proj1 = {},	61	_Proj1 __proj1 = {},
62	_Proj2 __proj2 = {}) const {	62	_Proj2 __proj2 = {}) const {
63	auto __result = std::__partial_sort_copy<_RangeAlgPolicy>(	63	return std::__partial_sort_copy<_RangeAlgPolicy>(
64	std::move(__first),	64	std::move(__first),
65	std::move(__last),	65	std::move(__last),
66	std::move(__result_first),	66	std::move(__result_first),
...	@@ -68,7 +68,6 @@ struct __partial_sort_copy {	...	@@ -68,7 +68,6 @@ struct __partial_sort_copy {
68	__comp,	68	__comp,
69	__proj1,	69	__proj1,
70	__proj2);	70	__proj2);
71	return {std::move(__result.first), std::move(__result.second)};
72	}	71	}
73		72
74	template <input_range _Range1,	73	template <input_range _Range1,
...	@@ -84,7 +83,7 @@ struct __partial_sort_copy {	...	@@ -84,7 +83,7 @@ struct __partial_sort_copy {
84	_LIBCPP_HIDE_FROM_ABI constexpr partial_sort_copy_result<borrowed_iterator_t<_Range1>, borrowed_iterator_t<_Range2>>	83	_LIBCPP_HIDE_FROM_ABI constexpr partial_sort_copy_result<borrowed_iterator_t<_Range1>, borrowed_iterator_t<_Range2>>
85	operator()(	84	operator()(
86	_Range1&& __range, _Range2&& __result_range, _Comp __comp = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const {	85	_Range1&& __range, _Range2&& __result_range, _Comp __comp = {}, _Proj1 __proj1 = {}, _Proj2 __proj2 = {}) const {
87	auto __result = std::__partial_sort_copy<_RangeAlgPolicy>(	86	return std::__partial_sort_copy<_RangeAlgPolicy>(
88	ranges::begin(__range),	87	ranges::begin(__range),
89	ranges::end(__range),	88	ranges::end(__range),
90	ranges::begin(__result_range),	89	ranges::begin(__result_range),
...	@@ -92,7 +91,6 @@ struct __partial_sort_copy {	...	@@ -92,7 +91,6 @@ struct __partial_sort_copy {
92	__comp,	91	__comp,
93	__proj1,	92	__proj1,
94	__proj2);	93	__proj2);
95	return {std::move(__result.first), std::move(__result.second)};
96	}	94	}
97	};	95	};
98		96

lib/libcxx/include/__algorithm/ranges_remove_if.h+2-3

lib/libcxx/include/__algorithm/ranges_reverse_copy.h+2-1

...	@@ -18,6 +18,7 @@	...	@@ -18,6 +18,7 @@
18	#include <__ranges/access.h>	18	#include <__ranges/access.h>
19	#include <__ranges/concepts.h>	19	#include <__ranges/concepts.h>
20	#include <__ranges/dangling.h>	20	#include <__ranges/dangling.h>
		21	#include <__ranges/reverse_view.h>
21	#include <__ranges/subrange.h>	22	#include <__ranges/subrange.h>
22	#include <__utility/move.h>	23	#include <__utility/move.h>
23		24
...	@@ -49,7 +50,7 @@ struct __reverse_copy {	...	@@ -49,7 +50,7 @@ struct __reverse_copy {
49	requires indirectly_copyable<iterator_t<_Range>, _OutIter>	50	requires indirectly_copyable<iterator_t<_Range>, _OutIter>
50	_LIBCPP_HIDE_FROM_ABI constexpr reverse_copy_result<borrowed_iterator_t<_Range>, _OutIter>	51	_LIBCPP_HIDE_FROM_ABI constexpr reverse_copy_result<borrowed_iterator_t<_Range>, _OutIter>
51	operator()(_Range&& __range, _OutIter __result) const {	52	operator()(_Range&& __range, _OutIter __result) const {
52	auto __ret = ranges::copy(std::__reverse_range(__range), std::move(__result));	53	auto __ret = ranges::copy(__range \| views::reverse, std::move(__result));
53	return {ranges::next(ranges::begin(__range), ranges::end(__range)), std::move(__ret.out)};	54	return {ranges::next(ranges::begin(__range), ranges::end(__range)), std::move(__ret.out)};
54	}	55	}
55	};	56	};

lib/libcxx/include/__algorithm/ranges_set_difference.h+2-7

 @@ -14,16 +14,13 @@
 #include <__algorithm/set_difference.h>
 #include <__config>
 #include <__functional/identity.h>
-#include <__functional/invoke.h>
 #include <__functional/ranges_operations.h>
 #include <__iterator/concepts.h>
 #include <__iterator/mergeable.h>
 #include <__ranges/access.h>
 #include <__ranges/concepts.h>
 #include <__ranges/dangling.h>
-#include <__type_traits/decay.h>
 #include <__utility/move.h>
-#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -60,9 +57,8 @@ struct __set_difference {
       _Comp __comp   = {},
       _Proj1 __proj1 = {},
       _Proj2 __proj2 = {}) const {
-    auto __ret = std::__set_difference(
+    return std::__set_difference(
         __first1, __last1, __first2, __last2, __result, ranges::__make_projected_comp(__comp, __proj1, __proj2));
-    return {std::move(__ret.first), std::move(__ret.second)};
   }
   template <input_range _Range1,
 @@ -79,14 +75,13 @@ struct __set_difference {
              _Comp __comp   = {},
              _Proj1 __proj1 = {},
              _Proj2 __proj2 = {}) const {
-    auto __ret = std::__set_difference(
+    return std::__set_difference(
         ranges::begin(__range1),
         ranges::end(__range1),
         ranges::begin(__range2),
         ranges::end(__range2),
         __result,
         ranges::__make_projected_comp(__comp, __proj1, __proj2));
-    return {std::move(__ret.first), std::move(__ret.second)};
   }
 };

lib/libcxx/include/__algorithm/ranges_shift_left.h created+73

...	@@ -0,0 +1,73 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___ALGORITHM_RANGES_SHIFT_LEFT_H
10	#define _LIBCPP___ALGORITHM_RANGES_SHIFT_LEFT_H
11
12	#include <__algorithm/iterator_operations.h>
13	#include <__algorithm/shift_left.h>
14	#include <__config>
15	#include <__iterator/concepts.h>
16	#include <__iterator/distance.h>
17	#include <__iterator/incrementable_traits.h>
18	#include <__iterator/permutable.h>
19	#include <__ranges/access.h>
20	#include <__ranges/concepts.h>
21	#include <__ranges/subrange.h>
22	#include <__utility/move.h>
23
24	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
25	# pragma GCC system_header
26	#endif
27
28	_LIBCPP_PUSH_MACROS
29	#include <__undef_macros>
30
31	_LIBCPP_BEGIN_NAMESPACE_STD
32
33	#if _LIBCPP_STD_VER >= 23
34
35	namespace ranges {
36	namespace __shift_left {
37
38	struct __fn {
39	template <permutable _Iter, sentinel_for<_Iter> _Sent>
40	_LIBCPP_HIDE_FROM_ABI static constexpr subrange<_Iter>
41	operator()(_Iter __first, _Sent __last, iter_difference_t<_Iter> __n) {
42	auto __ret = std::__shift_left<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__n));
43	return {std::move(__ret.first), std::move(__ret.second)};
44	}
45
46	template <forward_range _Range>
47	requires permutable<iterator_t<_Range>>
48	_LIBCPP_HIDE_FROM_ABI static constexpr borrowed_subrange_t<_Range>
49	operator()(_Range&& __range, range_difference_t<_Range> __n) {
50	if constexpr (sized_range<_Range>) {
51	if (__n >= ranges::distance(__range)) {
52	return {ranges::begin(__range), ranges::begin(__range)};
53	}
54	}
55
56	auto __ret = std::__shift_left<_RangeAlgPolicy>(ranges::begin(__range), ranges::end(__range), std::move(__n));
57	return {std::move(__ret.first), std::move(__ret.second)};
58	}
59	};
60	} // namespace __shift_left
61
62	inline namespace __cpo {
63	inline constexpr auto shift_left = __shift_left::__fn{};
64	} // namespace __cpo
65	} // namespace ranges
66
67	#endif // _LIBCPP_STD_VER >= 23
68
69	_LIBCPP_END_NAMESPACE_STD
70
71	_LIBCPP_POP_MACROS
72
73	#endif // _LIBCPP___ALGORITHM_RANGES_SHIFT_LEFT_H

lib/libcxx/include/__algorithm/ranges_shift_right.h created+76

...	@@ -0,0 +1,76 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___ALGORITHM_RANGES_SHIFT_RIGHT_H
10	#define _LIBCPP___ALGORITHM_RANGES_SHIFT_RIGHT_H
11
12	#include <__algorithm/iterator_operations.h>
13	#include <__algorithm/shift_right.h>
14	#include <__config>
15	#include <__iterator/concepts.h>
16	#include <__iterator/distance.h>
17	#include <__iterator/incrementable_traits.h>
18	#include <__iterator/permutable.h>
19	#include <__ranges/access.h>
20	#include <__ranges/concepts.h>
21	#include <__ranges/subrange.h>
22	#include <__utility/move.h>
23
24	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
25	# pragma GCC system_header
26	#endif
27
28	_LIBCPP_PUSH_MACROS
29	#include <__undef_macros>
30
31	_LIBCPP_BEGIN_NAMESPACE_STD
32
33	#if _LIBCPP_STD_VER >= 23
34
35	namespace ranges {
36	namespace __shift_right {
37
38	struct __fn {
39	template <permutable _Iter, sentinel_for<_Iter> _Sent>
40	_LIBCPP_HIDE_FROM_ABI static constexpr subrange<_Iter>
41	operator()(_Iter __first, _Sent __last, iter_difference_t<_Iter> __n) {
42	auto __ret = std::__shift_right<_RangeAlgPolicy>(std::move(__first), std::move(__last), std::move(__n));
43	return {std::move(__ret.first), std::move(__ret.second)};
44	}
45
46	template <forward_range _Range>
47	requires permutable<iterator_t<_Range>>
48	_LIBCPP_HIDE_FROM_ABI static constexpr borrowed_subrange_t<_Range>
49	operator()(_Range&& __range, range_difference_t<_Range> __n) {
50	if constexpr (sized_range<_Range>) {
51	if (__n >= ranges::distance(__range)) {
52	auto __iter = ranges::begin(__range);
53	auto __end = ranges::end(__range);
54	ranges::advance(__iter, __end);
55	return {__iter, std::move(__iter)};
56	}
57	}
58
59	auto __ret = std::__shift_right<_RangeAlgPolicy>(ranges::begin(__range), ranges::end(__range), std::move(__n));
60	return {std::move(__ret.first), std::move(__ret.second)};
61	}
62	};
63	} // namespace __shift_right
64
65	inline namespace __cpo {
66	inline constexpr auto shift_right = __shift_right::__fn{};
67	} // namespace __cpo
68	} // namespace ranges
69
70	#endif // _LIBCPP_STD_VER >= 23
71
72	_LIBCPP_END_NAMESPACE_STD
73
74	_LIBCPP_POP_MACROS
75
76	#endif // _LIBCPP___ALGORITHM_RANGES_SHIFT_RIGHT_H

lib/libcxx/include/__algorithm/ranges_swap_ranges.h+30-3

...	@@ -11,6 +11,7 @@	...	@@ -11,6 +11,7 @@
11		11
12	#include <__algorithm/in_in_result.h>	12	#include <__algorithm/in_in_result.h>
13	#include <__algorithm/iterator_operations.h>	13	#include <__algorithm/iterator_operations.h>
		14	#include <__algorithm/min.h>
14	#include <__algorithm/swap_ranges.h>	15	#include <__algorithm/swap_ranges.h>
15	#include <__config>	16	#include <__config>
16	#include <__iterator/concepts.h>	17	#include <__iterator/concepts.h>
...	@@ -18,7 +19,9 @@	...	@@ -18,7 +19,9 @@
18	#include <__ranges/access.h>	19	#include <__ranges/access.h>
19	#include <__ranges/concepts.h>	20	#include <__ranges/concepts.h>
20	#include <__ranges/dangling.h>	21	#include <__ranges/dangling.h>
		22	#include <__type_traits/is_same.h>
21	#include <__utility/move.h>	23	#include <__utility/move.h>
		24	#include <__utility/pair.h>
22		25
23	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	26	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
24	# pragma GCC system_header	27	# pragma GCC system_header
...	@@ -41,9 +44,33 @@ struct __swap_ranges {	...	@@ -41,9 +44,33 @@ struct __swap_ranges {
41	requires indirectly_swappable<_I1, _I2>	44	requires indirectly_swappable<_I1, _I2>
42	_LIBCPP_HIDE_FROM_ABI constexpr swap_ranges_result<_I1, _I2>	45	_LIBCPP_HIDE_FROM_ABI constexpr swap_ranges_result<_I1, _I2>
43	operator()(_I1 __first1, _S1 __last1, _I2 __first2, _S2 __last2) const {	46	operator()(_I1 __first1, _S1 __last1, _I2 __first2, _S2 __last2) const {
44	auto __ret = std::__swap_ranges<_RangeAlgPolicy>(	47	if constexpr (sized_sentinel_for<_I1, _S1> && sized_sentinel_for<_I2, _S2> &&
45	std::move(__first1), std::move(__last1), std::move(__first2), std::move(__last2));	48	(random_access_iterator<_I1> \|\| random_access_iterator<_I2> \|\|
46	return {std::move(__ret.first), std::move(__ret.second)};	49	(is_same_v<_I1, _S1> && is_same_v<_I2, _S2>))) {
		50	auto __offset = std::min(__last1 - __first1, __last2 - __first2);
		51
		52	auto __ret = [&] {
		53	if constexpr (random_access_iterator<_I1>)
		54	return std::__swap_ranges<_RangeAlgPolicy>(__first1, __first1 + __offset, std::move(__first2));
		55	else if constexpr (random_access_iterator<_I2>)
		56	return std::__swap_ranges<_RangeAlgPolicy>(__first2, __first2 + __offset, std::move(__first1));
		57	else if (__last2 - __first2 < __last1 - __first1) {
		58	auto __reversed =
		59	std::__swap_ranges<_RangeAlgPolicy>(std::move(__first2), std::move(__last2), std::move(__first1));
		60	return std::pair<_I1, _I2>(std::move(__reversed.second), std::move(__reversed.first));
		61	} else
		62	return std::__swap_ranges<_RangeAlgPolicy>(std::move(__first1), std::move(__last1), std::move(__first2));
		63	}();
		64	return {std::move(__ret.first), std::move(__ret.second)};
		65	} else {
		66	while (__first1 != __last1 && __first2 != __last2) {
		67	ranges::iter_swap(__first1, __first2);
		68	++__first1;
		69	++__first2;
		70	}
		71
		72	return {std::move(__first1), std::move(__first2)};
		73	}
47	}	74	}
48		75
49	template <input_range _R1, input_range _R2>	76	template <input_range _R1, input_range _R2>

lib/libcxx/include/__algorithm/ranges_unique_copy.h+2-5

 @@ -26,7 +26,6 @@
 #include <__ranges/dangling.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
-#include <__utility/pair.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -73,13 +72,12 @@ struct __unique_copy {
               indirectly_copyable_storable<_InIter, _OutIter>)
   _LIBCPP_HIDE_FROM_ABI constexpr unique_copy_result<_InIter, _OutIter>
   operator()(_InIter __first, _Sent __last, _OutIter __result, _Comp __comp = {}, _Proj __proj = {}) const {
-    auto __ret = std::__unique_copy<_RangeAlgPolicy>(
+    return std::__unique_copy<_RangeAlgPolicy>(
         std::move(__first),
         std::move(__last),
         std::move(__result),
         std::__make_projected(__comp, __proj),
         __algo_tag_t<_InIter, _OutIter>());
-    return {std::move(__ret.first), std::move(__ret.second)};
   }
   template <input_range _Range,
 @@ -92,13 +90,12 @@ struct __unique_copy {
               indirectly_copyable_storable<iterator_t<_Range>, _OutIter>)
   _LIBCPP_HIDE_FROM_ABI constexpr unique_copy_result<borrowed_iterator_t<_Range>, _OutIter>
   operator()(_Range&& __range, _OutIter __result, _Comp __comp = {}, _Proj __proj = {}) const {
-    auto __ret = std::__unique_copy<_RangeAlgPolicy>(
+    return std::__unique_copy<_RangeAlgPolicy>(
         ranges::begin(__range),
         ranges::end(__range),
         std::move(__result),
         std::__make_projected(__comp, __proj),
         __algo_tag_t<iterator_t<_Range>, _OutIter>());
-    return {std::move(__ret.first), std::move(__ret.second)};
   }
 };

lib/libcxx/include/__algorithm/rotate.h+2-2

...	@@ -39,7 +39,7 @@ __rotate_left(_ForwardIterator __first, _ForwardIterator __last) {	...	@@ -39,7 +39,7 @@ __rotate_left(_ForwardIterator __first, _ForwardIterator __last) {
39	using _Ops = _IterOps<_AlgPolicy>;	39	using _Ops = _IterOps<_AlgPolicy>;
40		40
41	value_type __tmp = _Ops::__iter_move(__first);	41	value_type __tmp = _Ops::__iter_move(__first);
42	_ForwardIterator __lm1 = std::__move<_AlgPolicy>(_Ops::next(__first), __last, __first).second;	42	_ForwardIterator __lm1 = std::__move<_AlgPolicy>(_Ops::next(__first), __last, __first).__out_;
43	*__lm1 = std::move(__tmp);	43	*__lm1 = std::move(__tmp);
44	return __lm1;	44	return __lm1;
45	}	45	}
...	@@ -52,7 +52,7 @@ __rotate_right(_BidirectionalIterator __first, _BidirectionalIterator __last) {	...	@@ -52,7 +52,7 @@ __rotate_right(_BidirectionalIterator __first, _BidirectionalIterator __last) {
52		52
53	_BidirectionalIterator __lm1 = _Ops::prev(__last);	53	_BidirectionalIterator __lm1 = _Ops::prev(__last);
54	value_type __tmp = _Ops::__iter_move(__lm1);	54	value_type __tmp = _Ops::__iter_move(__lm1);
55	_BidirectionalIterator __fp1 = std::__move_backward<_AlgPolicy>(__first, __lm1, std::move(__last)).second;	55	_BidirectionalIterator __fp1 = std::__move_backward<_AlgPolicy>(__first, __lm1, std::move(__last)).__out_;
56	*__first = std::move(__tmp);	56	*__first = std::move(__tmp);
57	return __fp1;	57	return __fp1;
58	}	58	}

lib/libcxx/include/__algorithm/set_difference.h+5-6

...	@@ -12,12 +12,10 @@	...	@@ -12,12 +12,10 @@
12	#include <__algorithm/comp.h>	12	#include <__algorithm/comp.h>
13	#include <__algorithm/comp_ref_type.h>	13	#include <__algorithm/comp_ref_type.h>
14	#include <__algorithm/copy.h>	14	#include <__algorithm/copy.h>
		15	#include <__algorithm/in_out_result.h>
15	#include <__config>	16	#include <__config>
16	#include <__functional/identity.h>
17	#include <__iterator/iterator_traits.h>
18	#include <__type_traits/remove_cvref.h>	17	#include <__type_traits/remove_cvref.h>
19	#include <__utility/move.h>	18	#include <__utility/move.h>
20	#include <__utility/pair.h>
21		19
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23	# pragma GCC system_header	21	# pragma GCC system_header
...	@@ -29,7 +27,8 @@ _LIBCPP_PUSH_MACROS	...	@@ -29,7 +27,8 @@ _LIBCPP_PUSH_MACROS
29	_LIBCPP_BEGIN_NAMESPACE_STD	27	_LIBCPP_BEGIN_NAMESPACE_STD
30		28
31	template <class _Comp, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>	29	template <class _Comp, class _InIter1, class _Sent1, class _InIter2, class _Sent2, class _OutIter>
32	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__remove_cvref_t<_InIter1>, __remove_cvref_t<_OutIter> >	30	_LIBCPP_HIDE_FROM_ABI
		31	_LIBCPP_CONSTEXPR_SINCE_CXX20 __in_out_result<__remove_cvref_t<_InIter1>, __remove_cvref_t<_OutIter> >
33	__set_difference(	32	__set_difference(
34	_InIter1&& __first1, _Sent1&& __last1, _InIter2&& __first2, _Sent2&& __last2, _OutIter&& __result, _Comp&& __comp) {	33	_InIter1&& __first1, _Sent1&& __last1, _InIter2&& __first2, _Sent2&& __last2, _OutIter&& __result, _Comp&& __comp) {
35	while (__first1 != __last1 && __first2 != __last2) {	34	while (__first1 != __last1 && __first2 != __last2) {
...	@@ -56,7 +55,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_d	...	@@ -56,7 +55,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_d
56	_OutputIterator __result,	55	_OutputIterator __result,
57	_Compare __comp) {	56	_Compare __comp) {
58	return std::__set_difference<__comp_ref_type<_Compare> >(__first1, __last1, __first2, __last2, __result, __comp)	57	return std::__set_difference<__comp_ref_type<_Compare> >(__first1, __last1, __first2, __last2, __result, __comp)
59	.second;	58	.__out_;
60	}	59	}
61		60
62	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>	61	template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
...	@@ -66,7 +65,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_d	...	@@ -66,7 +65,7 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator set_d
66	_InputIterator2 __first2,	65	_InputIterator2 __first2,
67	_InputIterator2 __last2,	66	_InputIterator2 __last2,
68	_OutputIterator __result) {	67	_OutputIterator __result) {
69	return std::__set_difference(__first1, __last1, __first2, __last2, __result, __less<>()).second;	68	return std::__set_difference(__first1, __last1, __first2, __last2, __result, __less<>()).__out_;
70	}	69	}
71		70
72	_LIBCPP_END_NAMESPACE_STD	71	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/set_intersection.h+2-5

 @@ -96,12 +96,10 @@ __set_intersection(
     _Compare&& __comp,
     std::forward_iterator_tag,
     std::forward_iterator_tag) {
-  _LIBCPP_CONSTEXPR std::__identity __proj;
   bool __prev_may_be_equal = false;
   while (__first2 != __last2) {
-    _InForwardIter1 __first1_next =
+    _InForwardIter1 __first1_next = std::__lower_bound_onesided<_AlgPolicy>(__first1, __last1, *__first2, __comp);
-        std::__lower_bound_onesided<_AlgPolicy>(__first1, __last1, *__first2, __comp, __proj);
     std::swap(__first1_next, __first1);
     // keeping in mind that a==b iff !(a<b) && !(b<a):
     // if we can't advance __first1, that means !(*__first1 < *_first2), therefore __may_be_equal==true
 @@ -110,8 +108,7 @@ __set_intersection(
     if (__first1 == __last1)
       break;
-    _InForwardIter2 __first2_next =
+    _InForwardIter2 __first2_next = std::__lower_bound_onesided<_AlgPolicy>(__first2, __last2, *__first1, __comp);
-        std::__lower_bound_onesided<_AlgPolicy>(__first2, __last2, *__first1, __comp, __proj);
     std::swap(__first2_next, __first2);
     std::__set_intersection_add_output_if_equal(
         __first2 == __first2_next, __first1, __first2, __result, __prev_may_be_equal);

lib/libcxx/include/__algorithm/set_symmetric_difference.h+2-2

...	@@ -46,7 +46,7 @@ __set_symmetric_difference(	...	@@ -46,7 +46,7 @@ __set_symmetric_difference(
46	if (__first2 == __last2) {	46	if (__first2 == __last2) {
47	auto __ret1 = std::__copy(std::move(__first1), std::move(__last1), std::move(__result));	47	auto __ret1 = std::__copy(std::move(__first1), std::move(__last1), std::move(__result));
48	return __set_symmetric_difference_result<_InIter1, _InIter2, _OutIter>(	48	return __set_symmetric_difference_result<_InIter1, _InIter2, _OutIter>(
49	std::move(__ret1.first), std::move(__first2), std::move((__ret1.second)));	49	std::move(__ret1.__in_), std::move(__first2), std::move((__ret1.__out_)));
50	}	50	}
51	if (__comp(__first1, __first2)) {	51	if (__comp(__first1, __first2)) {
52	__result = __first1;	52	__result = __first1;
...	@@ -64,7 +64,7 @@ __set_symmetric_difference(	...	@@ -64,7 +64,7 @@ __set_symmetric_difference(
64	}	64	}
65	auto __ret2 = std::__copy(std::move(__first2), std::move(__last2), std::move(__result));	65	auto __ret2 = std::__copy(std::move(__first2), std::move(__last2), std::move(__result));
66	return __set_symmetric_difference_result<_InIter1, _InIter2, _OutIter>(	66	return __set_symmetric_difference_result<_InIter1, _InIter2, _OutIter>(
67	std::move(__first1), std::move(__ret2.first), std::move((__ret2.second)));	67	std::move(__first1), std::move(__ret2.__in_), std::move((__ret2.__out_)));
68	}	68	}
69		69
70	template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>	70	template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>

lib/libcxx/include/__algorithm/set_union.h+2-2

...	@@ -45,7 +45,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __set_union_result<_InIter1,	...	@@ -45,7 +45,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __set_union_result<_InIter1,
45	if (__first2 == __last2) {	45	if (__first2 == __last2) {
46	auto __ret1 = std::__copy(std::move(__first1), std::move(__last1), std::move(__result));	46	auto __ret1 = std::__copy(std::move(__first1), std::move(__last1), std::move(__result));
47	return __set_union_result<_InIter1, _InIter2, _OutIter>(	47	return __set_union_result<_InIter1, _InIter2, _OutIter>(
48	std::move(__ret1.first), std::move(__first2), std::move((__ret1.second)));	48	std::move(__ret1.__in_), std::move(__first2), std::move((__ret1.__out_)));
49	}	49	}
50	if (__comp(__first2, __first1)) {	50	if (__comp(__first2, __first1)) {
51	__result = __first2;	51	__result = __first2;
...	@@ -60,7 +60,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __set_union_result<_InIter1,	...	@@ -60,7 +60,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __set_union_result<_InIter1,
60	}	60	}
61	auto __ret2 = std::__copy(std::move(__first2), std::move(__last2), std::move(__result));	61	auto __ret2 = std::__copy(std::move(__first2), std::move(__last2), std::move(__result));
62	return __set_union_result<_InIter1, _InIter2, _OutIter>(	62	return __set_union_result<_InIter1, _InIter2, _OutIter>(
63	std::move(__first1), std::move(__ret2.first), std::move((__ret2.second)));	63	std::move(__first1), std::move(__ret2.__in_), std::move((__ret2.__out_)));
64	}	64	}
65		65
66	template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>	66	template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>

lib/libcxx/include/__algorithm/shift_left.h+30-13

...	@@ -9,9 +9,14 @@	...	@@ -9,9 +9,14 @@
9	#ifndef _LIBCPP___ALGORITHM_SHIFT_LEFT_H	9	#ifndef _LIBCPP___ALGORITHM_SHIFT_LEFT_H
10	#define _LIBCPP___ALGORITHM_SHIFT_LEFT_H	10	#define _LIBCPP___ALGORITHM_SHIFT_LEFT_H
11		11
		12	#include <__algorithm/iterator_operations.h>
12	#include <__algorithm/move.h>	13	#include <__algorithm/move.h>
		14	#include <__assert>
13	#include <__config>	15	#include <__config>
		16	#include <__iterator/concepts.h>
14	#include <__iterator/iterator_traits.h>	17	#include <__iterator/iterator_traits.h>
		18	#include <__utility/move.h>
		19	#include <__utility/pair.h>
15		20
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header	22	# pragma GCC system_header
...	@@ -24,30 +29,42 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -24,30 +29,42 @@ _LIBCPP_BEGIN_NAMESPACE_STD
24		29
25	#if _LIBCPP_STD_VER >= 20	30	#if _LIBCPP_STD_VER >= 20
26		31
27	template <class _ForwardIterator>	32	template <class _AlgPolicy, class _Iter, class _Sent>
28	inline _LIBCPP_HIDE_FROM_ABI constexpr _ForwardIterator	33	_LIBCPP_HIDE_FROM_ABI constexpr pair<_Iter, _Iter>
29	shift_left(_ForwardIterator __first,	34	__shift_left(_Iter __first, _Sent __last, typename _IterOps<_AlgPolicy>::template __difference_type<_Iter> __n) {
30	_ForwardIterator __last,	35	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__n >= 0, "n must be greater than or equal to 0");
31	typename iterator_traits<_ForwardIterator>::difference_type __n) {	36
32	if (__n == 0) {	37	if (__n == 0) {
33	return __last;	38	_Iter __end = _IterOps<_AlgPolicy>::next(__first, __last);
		39	return {std::move(__first), std::move(__end)};
34	}	40	}
35		41
36	_ForwardIterator __m = __first;	42	_Iter __m = __first;
37	if constexpr (__has_random_access_iterator_category<_ForwardIterator>::value) {	43	if constexpr (sized_sentinel_for<_Sent, _Iter>) {
38	if (__n >= __last - __first) {	44	auto __size = _IterOps<_AlgPolicy>::distance(__first, __last);
39	return __first;	45	if (__n >= __size) {
		46	return {__first, std::move(__first)};
40	}	47	}
41	__m += __n;	48	_IterOps<_AlgPolicy>::advance(__m, __n);
42	} else {	49	} else {
43	for (; __n > 0; --__n) {	50	for (; __n > 0; --__n) {
44	if (__m == __last) {	51	if (__m == __last) {
45	return __first;	52	return {__first, std::move(__first)};
46	}	53	}
47	++__m;	54	++__m;
48	}	55	}
49	}	56	}
50	return std::move(__m, __last, __first);	57
		58	_Iter __result = std::__move<_AlgPolicy>(__m, __last, __first).__out_;
		59	return {std::move(__first), std::move(__result)};
		60	}
		61
		62	template <class _ForwardIterator>
		63	_LIBCPP_HIDE_FROM_ABI constexpr _ForwardIterator
		64	shift_left(_ForwardIterator __first,
		65	_ForwardIterator __last,
		66	typename iterator_traits<_ForwardIterator>::difference_type __n) {
		67	return std::__shift_left<_ClassicAlgPolicy>(std::move(__first), std::move(__last), __n).second;
51	}	68	}
52		69
53	#endif // _LIBCPP_STD_VER >= 20	70	#endif // _LIBCPP_STD_VER >= 20

lib/libcxx/include/__algorithm/shift_right.h+53-27

...	@@ -9,11 +9,17 @@	...	@@ -9,11 +9,17 @@
9	#ifndef _LIBCPP___ALGORITHM_SHIFT_RIGHT_H	9	#ifndef _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
10	#define _LIBCPP___ALGORITHM_SHIFT_RIGHT_H	10	#define _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
11		11
		12	#include <__algorithm/iterator_operations.h>
12	#include <__algorithm/move.h>	13	#include <__algorithm/move.h>
13	#include <__algorithm/move_backward.h>	14	#include <__algorithm/move_backward.h>
14	#include <__algorithm/swap_ranges.h>	15	#include <__algorithm/swap_ranges.h>
		16	#include <__assert>
		17	#include <__concepts/derived_from.h>
15	#include <__config>	18	#include <__config>
		19	#include <__iterator/concepts.h>
16	#include <__iterator/iterator_traits.h>	20	#include <__iterator/iterator_traits.h>
		21	#include <__utility/move.h>
		22	#include <__utility/pair.h>
17	#include <__utility/swap.h>	23	#include <__utility/swap.h>
18		24
19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	25	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -27,36 +33,48 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -27,36 +33,48 @@ _LIBCPP_BEGIN_NAMESPACE_STD
27		33
28	#if _LIBCPP_STD_VER >= 20	34	#if _LIBCPP_STD_VER >= 20
29		35
30	template <class _ForwardIterator>	36	template <class _AlgPolicy, class _Iter, class _Sent>
31	inline _LIBCPP_HIDE_FROM_ABI constexpr _ForwardIterator	37	_LIBCPP_HIDE_FROM_ABI constexpr pair<_Iter, _Iter>
32	shift_right(_ForwardIterator __first,	38	__shift_right(_Iter __first, _Sent __last, typename _IterOps<_AlgPolicy>::template __difference_type<_Iter> __n) {
33	_ForwardIterator __last,	39	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__n >= 0, "Providing a negative shift amount to shift_right is UB");
34	typename iterator_traits<_ForwardIterator>::difference_type __n) {
35	if (__n == 0) {	40	if (__n == 0) {
36	return __first;	41	_Iter __end = _IterOps<_AlgPolicy>::next(__first, __last);
		42	return pair<_Iter, _Iter>(std::move(__first), std::move(__end));
37	}	43	}
38		44
39	if constexpr (__has_random_access_iterator_category<_ForwardIterator>::value) {	45	using _IterCategory = typename _IterOps<_AlgPolicy>::template __iterator_category<_Iter>;
40	decltype(__n) __d = __last - __first;	46
41	if (__n >= __d) {	47	if constexpr (derived_from<_IterCategory, random_access_iterator_tag>) {
42	return __last;	48	_Iter __end = _IterOps<_AlgPolicy>::next(__first, __last);
		49	auto __size = __end - __first;
		50	if (__n >= __size) {
		51	return pair<_Iter, _Iter>(__end, std::move(__end));
		52	}
		53	_Iter __m = __first;
		54	_IterOps<_AlgPolicy>::advance(__m, (__size - __n));
		55	auto __ret = std::__move_backward<_AlgPolicy>(std::move(__first), std::move(__m), __end);
		56	return pair<_Iter, _Iter>(std::move(__ret.__out_), std::move(__end));
		57	} else if constexpr (derived_from<_IterCategory, bidirectional_iterator_tag>) {
		58	_Iter __end = _IterOps<_AlgPolicy>::next(__first, __last);
		59	if constexpr (sized_sentinel_for<_Sent, _Iter>) {
		60	if (__n >= ranges::distance(__first, __last)) {
		61	return pair<_Iter, _Iter>(__end, std::move(__end));
		62	}
43	}	63	}
44	_ForwardIterator __m = __first + (__d - __n);	64	_Iter __m = __end;
45	return std::move_backward(__first, __m, __last);
46	} else if constexpr (__has_bidirectional_iterator_category<_ForwardIterator>::value) {
47	_ForwardIterator __m = __last;
48	for (; __n > 0; --__n) {	65	for (; __n > 0; --__n) {
49	if (__m == __first) {	66	if (__m == __first) {
50	return __last;	67	return pair<_Iter, _Iter>(__end, std::move(__end));
51	}	68	}
52	--__m;	69	--__m;
53	}	70	}
54	return std::move_backward(__first, __m, __last);	71	auto __ret = std::__move_backward<_AlgPolicy>(std::move(__first), std::move(__m), __end);
		72	return pair<_Iter, _Iter>(std::move(__ret.__out_), std::move(__end));
55	} else {	73	} else {
56	_ForwardIterator __ret = __first;	74	_Iter __ret = __first;
57	for (; __n > 0; --__n) {	75	for (; __n > 0; --__n) {
58	if (__ret == __last) {	76	if (__ret == __last) {
59	return __last;	77	return pair<_Iter, _Iter>(__ret, std::move(__ret));
60	}	78	}
61	++__ret;	79	++__ret;
62	}	80	}
...	@@ -64,28 +82,28 @@ shift_right(_ForwardIterator __first,	...	@@ -64,28 +82,28 @@ shift_right(_ForwardIterator __first,
64	// We have an __n-element scratch space from __first to __ret.	82	// We have an __n-element scratch space from __first to __ret.
65	// Slide an __n-element window [__trail, __lead) from left to right.	83	// Slide an __n-element window [__trail, __lead) from left to right.
66	// We're essentially doing swap_ranges(__first, __ret, __trail, __lead)	84	// We're essentially doing swap_ranges(__first, __ret, __trail, __lead)
67	// over and over; but once __lead reaches __last we needn't bother	85	// over and over; but once __lead reaches __end we needn't bother
68	// to save the values of elements [__trail, __last).	86	// to save the values of elements [__trail, __end).
69		87
70	auto __trail = __first;	88	auto __trail = __first;
71	auto __lead = __ret;	89	auto __lead = __ret;
72	while (__trail != __ret) {	90	while (__trail != __ret) {
73	if (__lead == __last) {	91	if (__lead == __last) {
74	std::move(__first, __trail, __ret);	92	std::__move<_AlgPolicy>(std::move(__first), std::move(__trail), __ret);
75	return __ret;	93	return pair<_Iter, _Iter>(__ret, std::move(__lead));
76	}	94	}
77	++__trail;	95	++__trail;
78	++__lead;	96	++__lead;
79	}	97	}
80		98
81	_ForwardIterator __mid = __first;	99	_Iter __mid = __first;
82	while (true) {	100	while (true) {
83	if (__lead == __last) {	101	if (__lead == __last) {
84	__trail = std::move(__mid, __ret, __trail);	102	__trail = std::__move<_AlgPolicy>(__mid, __ret, __trail).__out_;
85	std::move(__first, __mid, __trail);	103	std::__move<_AlgPolicy>(std::move(__first), std::move(__mid), std::move(__trail));
86	return __ret;	104	return pair<_Iter, _Iter>(__ret, std::move(__lead));
87	}	105	}
88	swap(__mid, __trail);	106	_IterOps<_AlgPolicy>::iter_swap(__mid, __trail);
89	++__mid;	107	++__mid;
90	++__trail;	108	++__trail;
91	++__lead;	109	++__lead;
...	@@ -96,6 +114,14 @@ shift_right(_ForwardIterator __first,	...	@@ -96,6 +114,14 @@ shift_right(_ForwardIterator __first,
96	}	114	}
97	}	115	}
98		116
		117	template <class _ForwardIterator>
		118	_LIBCPP_HIDE_FROM_ABI constexpr _ForwardIterator
		119	shift_right(_ForwardIterator __first,
		120	_ForwardIterator __last,
		121	typename iterator_traits<_ForwardIterator>::difference_type __n) {
		122	return std::__shift_right<_ClassicAlgPolicy>(std::move(__first), std::move(__last), __n).first;
		123	}
		124
99	#endif // _LIBCPP_STD_VER >= 20	125	#endif // _LIBCPP_STD_VER >= 20
100		126
101	_LIBCPP_END_NAMESPACE_STD	127	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/shuffle.h+2

...	@@ -28,6 +28,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -28,6 +28,7 @@ _LIBCPP_PUSH_MACROS
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
30		30
		31	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
31	class _LIBCPP_EXPORTED_FROM_ABI __libcpp_debug_randomizer {	32	class _LIBCPP_EXPORTED_FROM_ABI __libcpp_debug_randomizer {
32	public:	33	public:
33	_LIBCPP_HIDE_FROM_ABI __libcpp_debug_randomizer() {	34	_LIBCPP_HIDE_FROM_ABI __libcpp_debug_randomizer() {
...	@@ -160,6 +161,7 @@ shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last, _UniformRan	...	@@ -160,6 +161,7 @@ shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last, _UniformRan
160	std::move(__first), std::move(__last), std::forward<_UniformRandomNumberGenerator>(__g));	161	std::move(__first), std::move(__last), std::forward<_UniformRandomNumberGenerator>(__g));
161	}	162	}
162		163
		164	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
163	_LIBCPP_END_NAMESPACE_STD	165	_LIBCPP_END_NAMESPACE_STD
164		166
165	_LIBCPP_POP_MACROS	167	_LIBCPP_POP_MACROS

lib/libcxx/include/__algorithm/simd_utils.h+4-12

 @@ -90,6 +90,9 @@ inline constexpr size_t __native_vector_size = 1;
 template <class _ArithmeticT, size_t _Np>
 using __simd_vector __attribute__((__ext_vector_type__(_Np))) _LIBCPP_NODEBUG = _ArithmeticT;
+_LIBCPP_DIAGNOSTIC_PUSH
+_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wpsabi")
 template <class _VecT>
 inline constexpr size_t __simd_vector_size_v = []<bool _False = false>() -> size_t {
   static_assert(_False, "Not a vector!");
 @@ -115,8 +118,6 @@ template <class _VecT, class _Iter>
 }
 // Load the first _Np elements, zero the rest
-_LIBCPP_DIAGNOSTIC_PUSH
-_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wpsabi")
 template <class _VecT, size_t _Np, class _Iter>
 [[__nodiscard__]] _LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _VecT __partial_load(_Iter __iter) noexcept {
   return [=]<size_t... _LoadIndices, size_t... _ZeroIndices>(
 @@ -125,16 +126,6 @@ template <class _VecT, size_t _Np, class _Iter>
   }(make_index_sequence<_Np>{}, make_index_sequence<__simd_vector_size_v<_VecT> - _Np>{});
 }
-// Create a vector where every elements is __val
-template <class _VecT>
-[[__nodiscard__]] _LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _VecT
-__broadcast(__simd_vector_underlying_type_t<_VecT> __val) {
-  return [&]<std::size_t... _Indices>(index_sequence<_Indices...>) {
-    return _VecT{((void)_Indices, __val)...};
-  }(make_index_sequence<__simd_vector_size_v<_VecT>>());
-}
-_LIBCPP_DIAGNOSTIC_POP
 template <class _Tp, size_t _Np>
 [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool __any_of(__simd_vector<_Tp, _Np> __vec) noexcept {
   return __builtin_reduce_or(__builtin_convertvector(__vec, __simd_vector<bool, _Np>));
 @@ -183,6 +174,7 @@ template <class _Tp, size_t _Np>
 [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_t __find_first_not_set(__simd_vector<_Tp, _Np> __vec) noexcept {
   return std::__find_first_set(~__vec);
 }
+_LIBCPP_DIAGNOSTIC_POP
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__algorithm/sort.h+2

...	@@ -828,6 +828,7 @@ void __introsort(_RandomAccessIterator __first,	...	@@ -828,6 +828,7 @@ void __introsort(_RandomAccessIterator __first,
828	}	828	}
829	}	829	}
830		830
		831	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
831	template <class _Comp, class _RandomAccessIterator>	832	template <class _Comp, class _RandomAccessIterator>
832	void __sort(_RandomAccessIterator, _RandomAccessIterator, _Comp);	833	void __sort(_RandomAccessIterator, _RandomAccessIterator, _Comp);
833		834
...	@@ -856,6 +857,7 @@ extern template _LIBCPP_EXPORTED_FROM_ABI void __sort<__less<float>&, float*>(fl	...	@@ -856,6 +857,7 @@ extern template _LIBCPP_EXPORTED_FROM_ABI void __sort<__less<float>&, float*>(fl
856	extern template _LIBCPP_EXPORTED_FROM_ABI void __sort<__less<double>&, double>(double, double*, __less<double>&);	857	extern template _LIBCPP_EXPORTED_FROM_ABI void __sort<__less<double>&, double>(double, double*, __less<double>&);
857	extern template _LIBCPP_EXPORTED_FROM_ABI void	858	extern template _LIBCPP_EXPORTED_FROM_ABI void
858	__sort<__less<long double>&, long double>(long double, long double*, __less<long double>&);	859	__sort<__less<long double>&, long double>(long double, long double*, __less<long double>&);
		860	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
859		861
860	template <class _AlgPolicy, class _RandomAccessIterator, class _Comp>	862	template <class _AlgPolicy, class _RandomAccessIterator, class _Comp>
861	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void	863	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void

lib/libcxx/include/__algorithm/specialized_algorithms.h+1

...	@@ -21,6 +21,7 @@ namespace _Algorithm {	...	@@ -21,6 +21,7 @@ namespace _Algorithm {
21	struct __copy {};	21	struct __copy {};
22	struct __fill_n {};	22	struct __fill_n {};
23	struct __for_each {};	23	struct __for_each {};
		24	struct __swap_ranges {};
24	} // namespace _Algorithm	25	} // namespace _Algorithm
25		26
26	template <class>	27	template <class>

lib/libcxx/include/__algorithm/swap_ranges.h+24-178

...	@@ -10,12 +10,11 @@	...	@@ -10,12 +10,11 @@
10	#define _LIBCPP___ALGORITHM_SWAP_RANGES_H	10	#define _LIBCPP___ALGORITHM_SWAP_RANGES_H
11		11
12	#include <__algorithm/iterator_operations.h>	12	#include <__algorithm/iterator_operations.h>
13	#include <__algorithm/min.h>	13	#include <__algorithm/specialized_algorithms.h>
14	#include <__config>	14	#include <__config>
15	#include <__fwd/bit_reference.h>	15	#include <__type_traits/enable_if.h>
16	#include <__utility/move.h>	16	#include <__utility/move.h>
17	#include <__utility/pair.h>	17	#include <__utility/pair.h>
18	#include <__utility/swap.h>
19		18
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header	20	# pragma GCC system_header
...	@@ -26,189 +25,36 @@ _LIBCPP_PUSH_MACROS	...	@@ -26,189 +25,36 @@ _LIBCPP_PUSH_MACROS
26		25
27	_LIBCPP_BEGIN_NAMESPACE_STD	26	_LIBCPP_BEGIN_NAMESPACE_STD
28		27
29	template <class _Cl, class _Cr>	28	template <
30	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cr, false> __swap_ranges_aligned(	29	class _AlgPolicy,
31	__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl, false> __last, __bit_iterator<_Cr, false> __result) {	30	class _Iter1,
32	using _I1 = __bit_iterator<_Cl, false>;	31	class _Sent1,
33	using difference_type = typename _I1::difference_type;	32	class _Iter2,
34	using __storage_type = typename _I1::__storage_type;	33	class _SpecialAlg =
35		34	__specialized_algorithm<_Algorithm::__swap_ranges, __iterator_pair<_Iter1, _Sent1>, __single_iterator<_Iter2> >,
36	const int __bits_per_word = _I1::__bits_per_word;	35	__enable_if_t<_SpecialAlg::__has_algorithm, int> = 0>
37	difference_type __n = __last - __first;	36	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_Iter1, _Iter2>
38	if (__n > 0) {	37	__swap_ranges(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2) {
39	// do first word	38	return _SpecialAlg()(std::move(__first1), std::move(__last1), std::move(__first2));
40	if (__first.__ctz_ != 0) {
41	unsigned __clz = __bits_per_word - __first.__ctz_;
42	difference_type __dn = std::min(static_cast<difference_type>(__clz), __n);
43	__n -= __dn;
44	__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
45	__storage_type __b1 = *__first.__seg_ & __m;
46	*__first.__seg_ &= ~__m;
47	__storage_type __b2 = *__result.__seg_ & __m;
48	*__result.__seg_ &= ~__m;
49	*__result.__seg_ \|= __b1;
50	*__first.__seg_ \|= __b2;
51	__result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
52	__result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_) % __bits_per_word);
53	++__first.__seg_;
54	// __first.__ctz_ = 0;
55	}
56	// __first.__ctz_ == 0;
57	// do middle words
58	for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_, ++__result.__seg_)
59	swap(__first.__seg_, __result.__seg_);
60	// do last word
61	if (__n > 0) {
62	__storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
63	__storage_type __b1 = *__first.__seg_ & __m;
64	*__first.__seg_ &= ~__m;
65	__storage_type __b2 = *__result.__seg_ & __m;
66	*__result.__seg_ &= ~__m;
67	*__result.__seg_ \|= __b1;
68	*__first.__seg_ \|= __b2;
69	__result.__ctz_ = static_cast<unsigned>(__n);
70	}
71	}
72	return __result;
73	}
74
75	template <class _Cl, class _Cr>
76	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cr, false> __swap_ranges_unaligned(
77	__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl, false> __last, __bit_iterator<_Cr, false> __result) {
78	using _I1 = __bit_iterator<_Cl, false>;
79	using difference_type = typename _I1::difference_type;
80	using __storage_type = typename _I1::__storage_type;
81
82	const int __bits_per_word = _I1::__bits_per_word;
83	difference_type __n = __last - __first;
84	if (__n > 0) {
85	// do first word
86	if (__first.__ctz_ != 0) {
87	unsigned __clz_f = __bits_per_word - __first.__ctz_;
88	difference_type __dn = std::min(static_cast<difference_type>(__clz_f), __n);
89	__n -= __dn;
90	__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
91	__storage_type __b1 = *__first.__seg_ & __m;
92	*__first.__seg_ &= ~__m;
93	unsigned __clz_r = __bits_per_word - __result.__ctz_;
94	__storage_type __ddn = std::min<__storage_type>(__dn, __clz_r);
95	__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
96	__storage_type __b2 = *__result.__seg_ & __m;
97	*__result.__seg_ &= ~__m;
98	if (__result.__ctz_ > __first.__ctz_) {
99	unsigned __s = __result.__ctz_ - __first.__ctz_;
100	*__result.__seg_ \|= __b1 << __s;
101	*__first.__seg_ \|= __b2 >> __s;
102	} else {
103	unsigned __s = __first.__ctz_ - __result.__ctz_;
104	*__result.__seg_ \|= __b1 >> __s;
105	*__first.__seg_ \|= __b2 << __s;
106	}
107	__result.__seg_ += (__ddn + __result.__ctz_) / __bits_per_word;
108	__result.__ctz_ = static_cast<unsigned>((__ddn + __result.__ctz_) % __bits_per_word);
109	__dn -= __ddn;
110	if (__dn > 0) {
111	__m = ~__storage_type(0) >> (__bits_per_word - __dn);
112	__b2 = *__result.__seg_ & __m;
113	*__result.__seg_ &= ~__m;
114	unsigned __s = __first.__ctz_ + __ddn;
115	*__result.__seg_ \|= __b1 >> __s;
116	*__first.__seg_ \|= __b2 << __s;
117	__result.__ctz_ = static_cast<unsigned>(__dn);
118	}
119	++__first.__seg_;
120	// __first.__ctz_ = 0;
121	}
122	// __first.__ctz_ == 0;
123	// do middle words
124	__storage_type __m = ~__storage_type(0) << __result.__ctz_;
125	unsigned __clz_r = __bits_per_word - __result.__ctz_;
126	for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_) {
127	__storage_type __b1 = *__first.__seg_;
128	__storage_type __b2 = *__result.__seg_ & __m;
129	*__result.__seg_ &= ~__m;
130	*__result.__seg_ \|= __b1 << __result.__ctz_;
131	*__first.__seg_ = __b2 >> __result.__ctz_;
132	++__result.__seg_;
133	__b2 = *__result.__seg_ & ~__m;
134	*__result.__seg_ &= __m;
135	*__result.__seg_ \|= __b1 >> __clz_r;
136	*__first.__seg_ \|= __b2 << __clz_r;
137	}
138	// do last word
139	if (__n > 0) {
140	__m = ~__storage_type(0) >> (__bits_per_word - __n);
141	__storage_type __b1 = *__first.__seg_ & __m;
142	*__first.__seg_ &= ~__m;
143	__storage_type __dn = std::min<__storage_type>(__n, __clz_r);
144	__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
145	__storage_type __b2 = *__result.__seg_ & __m;
146	*__result.__seg_ &= ~__m;
147	*__result.__seg_ \|= __b1 << __result.__ctz_;
148	*__first.__seg_ \|= __b2 >> __result.__ctz_;
149	__result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
150	__result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_) % __bits_per_word);
151	__n -= __dn;
152	if (__n > 0) {
153	__m = ~__storage_type(0) >> (__bits_per_word - __n);
154	__b2 = *__result.__seg_ & __m;
155	*__result.__seg_ &= ~__m;
156	*__result.__seg_ \|= __b1 >> __dn;
157	*__first.__seg_ \|= __b2 << __dn;
158	__result.__ctz_ = static_cast<unsigned>(__n);
159	}
160	}
161	}
162	return __result;
163	}
164
165	// 2+1 iterators: size2 >= size1; used by std::swap_ranges.
166	template <class, class _Cl, class _Cr>
167	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__bit_iterator<_Cl, false>, __bit_iterator<_Cr, false> >
168	__swap_ranges(__bit_iterator<_Cl, false> __first1,
169	__bit_iterator<_Cl, false> __last1,
170	__bit_iterator<_Cr, false> __first2) {
171	if (__first1.__ctz_ == __first2.__ctz_)
172	return std::make_pair(__last1, std::__swap_ranges_aligned(__first1, __last1, __first2));
173	return std::make_pair(__last1, std::__swap_ranges_unaligned(__first1, __last1, __first2));
174	}
175
176	// 2+2 iterators: used by std::ranges::swap_ranges.
177	template <class _AlgPolicy, class _Cl, class _Cr>
178	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__bit_iterator<_Cl, false>, __bit_iterator<_Cr, false> >
179	__swap_ranges(__bit_iterator<_Cl, false> __first1,
180	__bit_iterator<_Cl, false> __last1,
181	__bit_iterator<_Cr, false> __first2,
182	__bit_iterator<_Cr, false> __last2) {
183	if (__last1 - __first1 < __last2 - __first2)
184	return std::make_pair(__last1, std::__swap_ranges<_AlgPolicy>(__first1, __last1, __first2).second);
185	return std::make_pair(std::__swap_ranges<_AlgPolicy>(__first2, __last2, __first1).second, __last2);
186	}
187
188	// 2+2 iterators: the shorter size will be used.
189	template <class _AlgPolicy, class _ForwardIterator1, class _Sentinel1, class _ForwardIterator2, class _Sentinel2>
190	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_ForwardIterator1, _ForwardIterator2>
191	__swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2 __first2, _Sentinel2 __last2) {
192	while (__first1 != __last1 && __first2 != __last2) {
193	_IterOps<_AlgPolicy>::iter_swap(__first1, __first2);
194	++__first1;
195	++__first2;
196	}
197
198	return pair<_ForwardIterator1, _ForwardIterator2>(std::move(__first1), std::move(__first2));
199	}	39	}
200		40
201	// 2+1 iterators: size2 >= size1.	41	template <
202	template <class _AlgPolicy, class _ForwardIterator1, class _Sentinel1, class _ForwardIterator2>	42	class _AlgPolicy,
203	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_ForwardIterator1, _ForwardIterator2>	43	class _Iter1,
204	__swap_ranges(_ForwardIterator1 __first1, _Sentinel1 __last1, _ForwardIterator2 __first2) {	44	class _Sent1,
		45	class _Iter2,
		46	class _SpecialAlg =
		47	__specialized_algorithm<_Algorithm::__swap_ranges, __iterator_pair<_Iter1, _Sent1>, __single_iterator<_Iter2> >,
		48	__enable_if_t<!_SpecialAlg::__has_algorithm, int> = 0>
		49	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_Iter1, _Iter2>
		50	__swap_ranges(_Iter1 __first1, _Sent1 __last1, _Iter2 __first2) {
205	while (__first1 != __last1) {	51	while (__first1 != __last1) {
206	_IterOps<_AlgPolicy>::iter_swap(__first1, __first2);	52	_IterOps<_AlgPolicy>::iter_swap(__first1, __first2);
207	++__first1;	53	++__first1;
208	++__first2;	54	++__first2;
209	}	55	}
210		56
211	return pair<_ForwardIterator1, _ForwardIterator2>(std::move(__first1), std::move(__first2));	57	return pair<_Iter1, _Iter2>(std::move(__first1), std::move(__first2));
212	}	58	}
213		59
214	template <class _ForwardIterator1, class _ForwardIterator2>	60	template <class _ForwardIterator1, class _ForwardIterator2>

lib/libcxx/include/__algorithm/three_way_comp_ref_type.h+4-4

 @@ -19,10 +19,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Comp>
 struct __debug_three_way_comp {
   _Comp& __comp_;
 @@ -67,8 +67,8 @@ template <class _Comp>
 using __three_way_comp_ref_type _LIBCPP_NODEBUG = _Comp&;
 #  endif
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H

lib/libcxx/include/__algorithm/unique_copy.h+8-8

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#define _LIBCPP___ALGORITHM_UNIQUE_COPY_H	10	#define _LIBCPP___ALGORITHM_UNIQUE_COPY_H
11		11
12	#include <__algorithm/comp.h>	12	#include <__algorithm/comp.h>
		13	#include <__algorithm/in_out_result.h>
13	#include <__algorithm/iterator_operations.h>	14	#include <__algorithm/iterator_operations.h>
14	#include <__config>	15	#include <__config>
15	#include <__iterator/iterator_traits.h>	16	#include <__iterator/iterator_traits.h>
...	@@ -17,7 +18,6 @@	...	@@ -17,7 +18,6 @@
17	#include <__type_traits/is_base_of.h>	18	#include <__type_traits/is_base_of.h>
18	#include <__type_traits/is_same.h>	19	#include <__type_traits/is_same.h>
19	#include <__utility/move.h>	20	#include <__utility/move.h>
20	#include <__utility/pair.h>
21		21
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23	# pragma GCC system_header	23	# pragma GCC system_header
...	@@ -37,7 +37,7 @@ struct __read_from_tmp_value_tag {};	...	@@ -37,7 +37,7 @@ struct __read_from_tmp_value_tag {};
37	} // namespace __unique_copy_tags	37	} // namespace __unique_copy_tags
38		38
39	template <class _AlgPolicy, class _BinaryPredicate, class _InputIterator, class _Sent, class _OutputIterator>	39	template <class _AlgPolicy, class _BinaryPredicate, class _InputIterator, class _Sent, class _OutputIterator>
40	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _OutputIterator>	40	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __in_out_result<_InputIterator, _OutputIterator>
41	__unique_copy(_InputIterator __first,	41	__unique_copy(_InputIterator __first,
42	_Sent __last,	42	_Sent __last,
43	_OutputIterator __result,	43	_OutputIterator __result,
...	@@ -55,11 +55,11 @@ __unique_copy(_InputIterator __first,	...	@@ -55,11 +55,11 @@ __unique_copy(_InputIterator __first,
55	}	55	}
56	}	56	}
57	}	57	}
58	return pair<_InputIterator, _OutputIterator>(std::move(__first), std::move(__result));	58	return {std::move(__first), std::move(__result)};
59	}	59	}
60		60
61	template <class _AlgPolicy, class _BinaryPredicate, class _ForwardIterator, class _Sent, class _OutputIterator>	61	template <class _AlgPolicy, class _BinaryPredicate, class _ForwardIterator, class _Sent, class _OutputIterator>
62	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pair<_ForwardIterator, _OutputIterator>	62	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __in_out_result<_ForwardIterator, _OutputIterator>
63	__unique_copy(_ForwardIterator __first,	63	__unique_copy(_ForwardIterator __first,
64	_Sent __last,	64	_Sent __last,
65	_OutputIterator __result,	65	_OutputIterator __result,
...	@@ -77,11 +77,11 @@ __unique_copy(_ForwardIterator __first,	...	@@ -77,11 +77,11 @@ __unique_copy(_ForwardIterator __first,
77	}	77	}
78	}	78	}
79	}	79	}
80	return pair<_ForwardIterator, _OutputIterator>(std::move(__first), std::move(__result));	80	return {std::move(__first), std::move(__result)};
81	}	81	}
82		82
83	template <class _AlgPolicy, class _BinaryPredicate, class _InputIterator, class _Sent, class _InputAndOutputIterator>	83	template <class _AlgPolicy, class _BinaryPredicate, class _InputIterator, class _Sent, class _InputAndOutputIterator>
84	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _InputAndOutputIterator>	84	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __in_out_result<_InputIterator, _InputAndOutputIterator>
85	__unique_copy(_InputIterator __first,	85	__unique_copy(_InputIterator __first,
86	_Sent __last,	86	_Sent __last,
87	_InputAndOutputIterator __result,	87	_InputAndOutputIterator __result,
...	@@ -94,7 +94,7 @@ __unique_copy(_InputIterator __first,	...	@@ -94,7 +94,7 @@ __unique_copy(_InputIterator __first,
94	++__result = __first;	94	++__result = __first;
95	++__result;	95	++__result;
96	}	96	}
97	return pair<_InputIterator, _InputAndOutputIterator>(std::move(__first), std::move(__result));	97	return {std::move(__first), std::move(__result)};
98	}	98	}
99		99
100	template <class _InputIterator, class _OutputIterator, class _BinaryPredicate>	100	template <class _InputIterator, class _OutputIterator, class _BinaryPredicate>
...	@@ -111,7 +111,7 @@ unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __res	...	@@ -111,7 +111,7 @@ unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __res
111	__unique_copy_tags::__read_from_tmp_value_tag> >;	111	__unique_copy_tags::__read_from_tmp_value_tag> >;
112	return std::__unique_copy<_ClassicAlgPolicy>(	112	return std::__unique_copy<_ClassicAlgPolicy>(
113	std::move(__first), std::move(__last), std::move(__result), __pred, __algo_tag())	113	std::move(__first), std::move(__last), std::move(__result), __pred, __algo_tag())
114	.second;	114	.__out_;
115	}	115	}
116		116
117	template <class _InputIterator, class _OutputIterator>	117	template <class _InputIterator, class _OutputIterator>

lib/libcxx/include/__algorithm/unwrap_iter.h+8-10

 @@ -57,21 +57,19 @@ struct __unwrap_iter_impl<_Iter, true> {
   }
 };
-template <class _Iter,
+template <class _Iter, class _Impl = __unwrap_iter_impl<_Iter> >
-          class _Impl                                             = __unwrap_iter_impl<_Iter>,
-          __enable_if_t<is_copy_constructible<_Iter>::value, int> = 0>
 inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 decltype(_Impl::__unwrap(std::declval<_Iter>()))
 __unwrap_iter(_Iter __i) _NOEXCEPT {
-  return _Impl::__unwrap(__i);
-}
 // Allow input_iterators to be passed to __unwrap_iter (but not __rewrap_iter)
 #if _LIBCPP_STD_VER >= 20
-template <class _Iter, __enable_if_t<!is_copy_constructible<_Iter>::value, int> = 0>
+  if constexpr (!is_copy_constructible_v<_Iter>) {
-inline _LIBCPP_HIDE_FROM_ABI constexpr _Iter __unwrap_iter(_Iter __i) noexcept {
+    return __i;
-  return __i;
+  } else
-}
 #endif
+  {
+    return _Impl::__unwrap(__i);
+  }
+}
 template <class _OrigIter, class _Iter, class _Impl = __unwrap_iter_impl<_OrigIter> >
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _OrigIter __rewrap_iter(_OrigIter __orig_iter, _Iter __iter) _NOEXCEPT {

lib/libcxx/include/__algorithm/unwrap_range.h+13-42

...	@@ -10,10 +10,9 @@	...	@@ -10,10 +10,9 @@
10	#define _LIBCPP___ALGORITHM_UNWRAP_RANGE_H	10	#define _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
11		11
12	#include <__algorithm/unwrap_iter.h>	12	#include <__algorithm/unwrap_iter.h>
13	#include <__concepts/constructible.h>
14	#include <__config>	13	#include <__config>
15	#include <__iterator/concepts.h>	14	#include <__iterator/concepts.h>
16	#include <__iterator/next.h>	15	#include <__type_traits/is_same.h>
17	#include <__utility/declval.h>	16	#include <__utility/declval.h>
18	#include <__utility/move.h>	17	#include <__utility/move.h>
19	#include <__utility/pair.h>	18	#include <__utility/pair.h>
...	@@ -33,52 +32,24 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -33,52 +32,24 @@ _LIBCPP_BEGIN_NAMESPACE_STD
33		32
34	#if _LIBCPP_STD_VER >= 20	33	#if _LIBCPP_STD_VER >= 20
35	template <class _Iter, class _Sent>	34	template <class _Iter, class _Sent>
36	struct __unwrap_range_impl {	35	_LIBCPP_HIDE_FROM_ABI constexpr auto __unwrap_range(_Iter __first, _Sent __last) {
37	_LIBCPP_HIDE_FROM_ABI static constexpr auto __unwrap(_Iter __first, _Sent __sent)	36	if constexpr (is_same_v<_Iter, _Sent>)
38	requires random_access_iterator<_Iter> && sized_sentinel_for<_Sent, _Iter>
39	{
40	auto __last = ranges::next(__first, __sent);
41	return pair{std::__unwrap_iter(std::move(__first)), std::__unwrap_iter(std::move(__last))};	37	return pair{std::__unwrap_iter(std::move(__first)), std::__unwrap_iter(std::move(__last))};
42	}	38	else if constexpr (random_access_iterator<_Iter> && sized_sentinel_for<_Sent, _Iter>) {
43		39	auto __iter_last = __first + (__last - __first);
44	_LIBCPP_HIDE_FROM_ABI static constexpr auto __unwrap(_Iter __first, _Sent __last) {	40	return pair{std::__unwrap_iter(std::move(__first)), std::__unwrap_iter(std::move(__iter_last))};
		41	} else
45	return pair{std::move(__first), std::move(__last)};	42	return pair{std::move(__first), std::move(__last)};
46	}
47
48	_LIBCPP_HIDE_FROM_ABI static constexpr auto
49	__rewrap(_Iter __orig_iter, decltype(std::__unwrap_iter(std::move(__orig_iter))) __iter)
50	requires random_access_iterator<_Iter> && sized_sentinel_for<_Sent, _Iter>
51	{
52	return std::__rewrap_iter(std::move(__orig_iter), std::move(__iter));
53	}
54
55	_LIBCPP_HIDE_FROM_ABI static constexpr auto __rewrap(const _Iter&, _Iter __iter)
56	requires(!(random_access_iterator<_Iter> && sized_sentinel_for<_Sent, _Iter>))
57	{
58	return __iter;
59	}
60	};
61
62	template <class _Iter>
63	struct __unwrap_range_impl<_Iter, _Iter> {
64	_LIBCPP_HIDE_FROM_ABI static constexpr auto __unwrap(_Iter __first, _Iter __last) {
65	return pair{std::__unwrap_iter(std::move(__first)), std::__unwrap_iter(std::move(__last))};
66	}
67
68	_LIBCPP_HIDE_FROM_ABI static constexpr auto
69	__rewrap(_Iter __orig_iter, decltype(std::__unwrap_iter(__orig_iter)) __iter) {
70	return std::__rewrap_iter(std::move(__orig_iter), std::move(__iter));
71	}
72	};
73
74	template <class _Iter, class _Sent>
75	_LIBCPP_HIDE_FROM_ABI constexpr auto __unwrap_range(_Iter __first, _Sent __last) {
76	return __unwrap_range_impl<_Iter, _Sent>::__unwrap(std::move(__first), std::move(__last));
77	}	43	}
78		44
79	template < class _Sent, class _Iter, class _Unwrapped>	45	template < class _Sent, class _Iter, class _Unwrapped>
80	_LIBCPP_HIDE_FROM_ABI constexpr _Iter __rewrap_range(_Iter __orig_iter, _Unwrapped __iter) {	46	_LIBCPP_HIDE_FROM_ABI constexpr _Iter __rewrap_range(_Iter __orig_iter, _Unwrapped __iter) {
81	return __unwrap_range_impl<_Iter, _Sent>::__rewrap(std::move(__orig_iter), std::move(__iter));	47	if constexpr (is_same_v<_Iter, _Sent>)
		48	return std::__rewrap_iter(std::move(__orig_iter), std::move(__iter));
		49	else if constexpr (random_access_iterator<_Iter> && sized_sentinel_for<_Sent, _Iter>)
		50	return std::__rewrap_iter(std::move(__orig_iter), std::move(__iter));
		51	else
		52	return __iter;
82	}	53	}
83	#else // _LIBCPP_STD_VER >= 20	54	#else // _LIBCPP_STD_VER >= 20
84	template <class _Iter, class _Unwrapped = decltype(std::__unwrap_iter(std::declval<_Iter>()))>	55	template <class _Iter, class _Unwrapped = decltype(std::__unwrap_iter(std::declval<_Iter>()))>

lib/libcxx/include/__assert+1-1

...	@@ -20,7 +20,7 @@	...	@@ -20,7 +20,7 @@
20	#define _LIBCPP_ASSERT(expression, message) \	20	#define _LIBCPP_ASSERT(expression, message) \
21	(__builtin_expect(static_cast<bool>(expression), 1) \	21	(__builtin_expect(static_cast<bool>(expression), 1) \
22	? (void)0 \	22	? (void)0 \
23	: _LIBCPP_ASSERTION_HANDLER(__FILE__ ":" _LIBCPP_TOSTRING( \	23	: _LIBCPP_ASSERTION_HANDLER(__FILE_NAME__ ":" _LIBCPP_TOSTRING( \
24	__LINE__) ": libc++ Hardening assertion " _LIBCPP_TOSTRING(expression) " failed: " message "\n"))	24	__LINE__) ": libc++ Hardening assertion " _LIBCPP_TOSTRING(expression) " failed: " message "\n"))
25		25
26	// WARNING: __builtin_assume can currently inhibit optimizations. Only add assumptions with a clear	26	// WARNING: __builtin_assume can currently inhibit optimizations. Only add assumptions with a clear

lib/libcxx/include/__atomic/atomic.h+2-4

 @@ -26,9 +26,7 @@
 #include <__type_traits/is_nothrow_constructible.h>
 #include <__type_traits/is_same.h>
 #include <__type_traits/is_trivially_copyable.h>
-#include <__type_traits/remove_const.h>
 #include <__type_traits/remove_pointer.h>
-#include <__type_traits/remove_volatile.h>
 #include <__utility/forward.h>
 #include <cstring>
 @@ -297,13 +295,13 @@ struct atomic<_Tp*> : public __atomic_base<_Tp*> {
   }
   _LIBCPP_HIDE_FROM_ABI _Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT {
-    // __atomic_fetch_add accepts function pointers, guard against them.
+    // __atomic_fetch_sub accepts function pointers, guard against them.
     static_assert(!is_function<__remove_pointer_t<_Tp> >::value, "Pointer to function isn't allowed");
     return std::__cxx_atomic_fetch_sub(std::addressof(this->__a_), __op, __m);
   }
   _LIBCPP_HIDE_FROM_ABI _Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT {
-    // __atomic_fetch_add accepts function pointers, guard against them.
+    // __atomic_fetch_sub accepts function pointers, guard against them.
     static_assert(!is_function<__remove_pointer_t<_Tp> >::value, "Pointer to function isn't allowed");
     return std::__cxx_atomic_fetch_sub(std::addressof(this->__a_), __op, __m);
   }

lib/libcxx/include/__atomic/atomic_flag.h+14-20

 @@ -11,14 +11,10 @@
 #include <__atomic/atomic_sync.h>
 #include <__atomic/atomic_waitable_traits.h>
-#include <__atomic/contention_t.h>
 #include <__atomic/memory_order.h>
 #include <__atomic/support.h>
-#include <__chrono/duration.h>
 #include <__config>
 #include <__memory/addressof.h>
-#include <__thread/support.h>
-#include <cstdint>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -27,34 +23,34 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 struct atomic_flag {
-  __cxx_atomic_impl<_LIBCPP_ATOMIC_FLAG_TYPE> __a_;
+  __cxx_atomic_impl<bool> __a_;
   _LIBCPP_HIDE_FROM_ABI bool test(memory_order __m = memory_order_seq_cst) const volatile _NOEXCEPT {
-    return _LIBCPP_ATOMIC_FLAG_TYPE(true) == __cxx_atomic_load(&__a_, __m);
+    return __cxx_atomic_load(&__a_, __m);
   }
   _LIBCPP_HIDE_FROM_ABI bool test(memory_order __m = memory_order_seq_cst) const _NOEXCEPT {
-    return _LIBCPP_ATOMIC_FLAG_TYPE(true) == __cxx_atomic_load(&__a_, __m);
+    return __cxx_atomic_load(&__a_, __m);
   }
   _LIBCPP_HIDE_FROM_ABI bool test_and_set(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT {
-    return __cxx_atomic_exchange(&__a_, _LIBCPP_ATOMIC_FLAG_TYPE(true), __m);
+    return __cxx_atomic_exchange(&__a_, true, __m);
   }
   _LIBCPP_HIDE_FROM_ABI bool test_and_set(memory_order __m = memory_order_seq_cst) _NOEXCEPT {
-    return __cxx_atomic_exchange(&__a_, _LIBCPP_ATOMIC_FLAG_TYPE(true), __m);
+    return __cxx_atomic_exchange(&__a_, true, __m);
   }
   _LIBCPP_HIDE_FROM_ABI void clear(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT {
-    __cxx_atomic_store(&__a_, _LIBCPP_ATOMIC_FLAG_TYPE(false), __m);
+    __cxx_atomic_store(&__a_, false, __m);
   }
   _LIBCPP_HIDE_FROM_ABI void clear(memory_order __m = memory_order_seq_cst) _NOEXCEPT {
-    __cxx_atomic_store(&__a_, _LIBCPP_ATOMIC_FLAG_TYPE(false), __m);
+    __cxx_atomic_store(&__a_, false, __m);
   }
 #if _LIBCPP_STD_VER >= 20
   _LIBCPP_HIDE_FROM_ABI void wait(bool __v, memory_order __m = memory_order_seq_cst) const volatile _NOEXCEPT {
-    std::__atomic_wait(*this, _LIBCPP_ATOMIC_FLAG_TYPE(__v), __m);
+    std::__atomic_wait(*this, __v, __m);
   }
   _LIBCPP_HIDE_FROM_ABI void wait(bool __v, memory_order __m = memory_order_seq_cst) const _NOEXCEPT {
-    std::__atomic_wait(*this, _LIBCPP_ATOMIC_FLAG_TYPE(__v), __m);
+    std::__atomic_wait(*this, __v, __m);
   }
   _LIBCPP_HIDE_FROM_ABI void notify_one() volatile _NOEXCEPT { std::__atomic_notify_one(*this); }
   _LIBCPP_HIDE_FROM_ABI void notify_one() _NOEXCEPT { std::__atomic_notify_one(*this); }
 @@ -78,23 +74,21 @@ struct atomic_flag {
 #if _LIBCPP_STD_VER >= 20
 template <>
 struct __atomic_waitable_traits<atomic_flag> {
-  using __value_type _LIBCPP_NODEBUG = _LIBCPP_ATOMIC_FLAG_TYPE;
+  using __value_type _LIBCPP_NODEBUG = bool;
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_ATOMIC_FLAG_TYPE __atomic_load(const atomic_flag& __a, memory_order __order) {
+  static _LIBCPP_HIDE_FROM_ABI bool __atomic_load(const atomic_flag& __a, memory_order __order) {
     return std::__cxx_atomic_load(&__a.__a_, __order);
   }
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_ATOMIC_FLAG_TYPE
+  static _LIBCPP_HIDE_FROM_ABI bool __atomic_load(const volatile atomic_flag& __a, memory_order __order) {
-  __atomic_load(const volatile atomic_flag& __a, memory_order __order) {
     return std::__cxx_atomic_load(&__a.__a_, __order);
   }
-  static _LIBCPP_HIDE_FROM_ABI const __cxx_atomic_impl<_LIBCPP_ATOMIC_FLAG_TYPE>*
+  static _LIBCPP_HIDE_FROM_ABI const __cxx_atomic_impl<bool>* __atomic_contention_address(const atomic_flag& __a) {
-  __atomic_contention_address(const atomic_flag& __a) {
     return std::addressof(__a.__a_);
   }
-  static _LIBCPP_HIDE_FROM_ABI const volatile __cxx_atomic_impl<_LIBCPP_ATOMIC_FLAG_TYPE>*
+  static _LIBCPP_HIDE_FROM_ABI const volatile __cxx_atomic_impl<bool>*
   __atomic_contention_address(const volatile atomic_flag& __a) {
     return std::addressof(__a.__a_);
   }

lib/libcxx/include/__atomic/atomic_ref.h+14-5

 @@ -30,9 +30,10 @@
 #include <__cstddef/byte.h>
 #include <__cstddef/ptrdiff_t.h>
 #include <__memory/addressof.h>
+#include <__memory/is_sufficiently_aligned.h>
+#include <__type_traits/copy_cv.h>
 #include <__type_traits/has_unique_object_representation.h>
 #include <__type_traits/is_trivially_copyable.h>
-#include <cstdint>
 #include <cstring>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -224,7 +225,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI void notify_one() const noexcept { std::__atomic_notify_one(*this); }
   _LIBCPP_HIDE_FROM_ABI void notify_all() const noexcept { std::__atomic_notify_all(*this); }
 #  if _LIBCPP_STD_VER >= 26
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp* address() const noexcept { return __ptr_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr __copy_cv_t<_Tp, void>* address() const noexcept { return __ptr_; }
 #  endif
 protected:
 @@ -254,10 +255,12 @@ struct atomic_ref : public __atomic_ref_base<_Tp> {
   _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp& __obj) : __base(__obj) {
     _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(
-        reinterpret_cast<uintptr_t>(std::addressof(__obj)) % __base::required_alignment == 0,
+        std::__is_sufficiently_aligned<__base::required_alignment>(std::addressof(__obj)),
         "atomic_ref ctor: referenced object must be aligned to required_alignment");
   }
+  _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp&&) = delete;
   _LIBCPP_HIDE_FROM_ABI atomic_ref(const atomic_ref&) noexcept = default;
   _LIBCPP_HIDE_FROM_ABI _Tp operator=(_Tp __desired) const noexcept { return __base::operator=(__desired); }
 @@ -274,10 +277,12 @@ struct atomic_ref<_Tp> : public __atomic_ref_base<_Tp> {
   _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp& __obj) : __base(__obj) {
     _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(
-        reinterpret_cast<uintptr_t>(std::addressof(__obj)) % __base::required_alignment == 0,
+        std::__is_sufficiently_aligned<__base::required_alignment>(std::addressof(__obj)),
         "atomic_ref ctor: referenced object must be aligned to required_alignment");
   }
+  _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp&&) = delete;
   _LIBCPP_HIDE_FROM_ABI atomic_ref(const atomic_ref&) noexcept = default;
   _LIBCPP_HIDE_FROM_ABI _Tp operator=(_Tp __desired) const noexcept { return __base::operator=(__desired); }
 @@ -320,10 +325,12 @@ struct atomic_ref<_Tp> : public __atomic_ref_base<_Tp> {
   _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp& __obj) : __base(__obj) {
     _LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(
-        reinterpret_cast<uintptr_t>(std::addressof(__obj)) % __base::required_alignment == 0,
+        std::__is_sufficiently_aligned<__base::required_alignment>(std::addressof(__obj)),
         "atomic_ref ctor: referenced object must be aligned to required_alignment");
   }
+  _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp&&) = delete;
   _LIBCPP_HIDE_FROM_ABI atomic_ref(const atomic_ref&) noexcept = default;
   _LIBCPP_HIDE_FROM_ABI _Tp operator=(_Tp __desired) const noexcept { return __base::operator=(__desired); }
 @@ -367,6 +374,8 @@ struct atomic_ref<_Tp*> : public __atomic_ref_base<_Tp*> {
   _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp*& __ptr) : __base(__ptr) {}
+  _LIBCPP_HIDE_FROM_ABI explicit atomic_ref(_Tp*&&) = delete;
   _LIBCPP_HIDE_FROM_ABI _Tp* operator=(_Tp* __desired) const noexcept { return __base::operator=(__desired); }
   atomic_ref& operator=(const atomic_ref&) = delete;

lib/libcxx/include/__atomic/atomic_sync.h+8-9

 @@ -12,28 +12,25 @@
 #include <__atomic/atomic_waitable_traits.h>
 #include <__atomic/contention_t.h>
 #include <__atomic/memory_order.h>
-#include <__atomic/to_gcc_order.h>
 #include <__chrono/duration.h>
 #include <__config>
 #include <__memory/addressof.h>
 #include <__thread/poll_with_backoff.h>
-#include <__type_traits/conjunction.h>
 #include <__type_traits/decay.h>
-#include <__type_traits/invoke.h>
-#include <__type_traits/is_same.h>
-#include <__type_traits/void_t.h>
-#include <__utility/declval.h>
 #include <cstring>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_STD_VER >= 20
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 20
 #  if _LIBCPP_HAS_THREADS
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 #    if !_LIBCPP_AVAILABILITY_HAS_NEW_SYNC
 // old dylib interface kept for backwards compatibility
 @@ -79,6 +76,8 @@ _LIBCPP_AVAILABILITY_NEW_SYNC _LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_one
 template <std::size_t _Size>
 _LIBCPP_AVAILABILITY_NEW_SYNC _LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_all_native(const void*) _NOEXCEPT;
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 #    if _LIBCPP_AVAILABILITY_HAS_NEW_SYNC
 template <class _AtomicWaitable, class _Poll>
 @@ -260,8 +259,8 @@ _LIBCPP_HIDE_FROM_ABI void __atomic_wait(_AtomicWaitable& __a, _Tp __val, memory
   });
 }
-#endif // C++20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___ATOMIC_ATOMIC_SYNC_H

lib/libcxx/include/__atomic/atomic_sync_timed.h+9-14

 @@ -12,20 +12,12 @@
 #include <__atomic/atomic_waitable_traits.h>
 #include <__atomic/contention_t.h>
 #include <__atomic/memory_order.h>
-#include <__atomic/to_gcc_order.h>
 #include <__chrono/duration.h>
 #include <__config>
 #include <__memory/addressof.h>
 #include <__thread/poll_with_backoff.h>
 #include <__thread/timed_backoff_policy.h>
-#include <__type_traits/conjunction.h>
 #include <__type_traits/decay.h>
-#include <__type_traits/has_unique_object_representation.h>
-#include <__type_traits/invoke.h>
-#include <__type_traits/is_same.h>
-#include <__type_traits/is_trivially_copyable.h>
-#include <__type_traits/void_t.h>
-#include <__utility/declval.h>
 #include <cstdint>
 #include <cstring>
 @@ -33,11 +25,13 @@
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 20
+#  if _LIBCPP_AVAILABILITY_HAS_NEW_SYNC
-#  if _LIBCPP_HAS_THREADS && _LIBCPP_AVAILABILITY_HAS_NEW_SYNC
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_AVAILABILITY_NEW_SYNC
 _LIBCPP_EXPORTED_FROM_ABI __cxx_contention_t __atomic_monitor_global(void const* __address) _NOEXCEPT;
 @@ -49,6 +43,7 @@ _LIBCPP_AVAILABILITY_NEW_SYNC _LIBCPP_EXPORTED_FROM_ABI void __atomic_wait_globa
 template <std::size_t _Size>
 _LIBCPP_AVAILABILITY_NEW_SYNC _LIBCPP_EXPORTED_FROM_ABI void
 __atomic_wait_native_with_timeout(void const* __address, void const* __old_value, uint64_t __timeout_ns) _NOEXCEPT;
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 template <class _AtomicWaitable, class _Poll, class _Rep, class _Period>
 struct __atomic_wait_timed_backoff_impl {
 @@ -116,7 +111,7 @@ _LIBCPP_HIDE_FROM_ABI bool __atomic_wait_unless_with_timeout(
   return __poll_result == __poll_with_backoff_results::__poll_success;
 }
-#  elif _LIBCPP_HAS_THREADS // _LIBCPP_HAS_THREADS && _LIBCPP_AVAILABILITY_HAS_NEW_SYNC
+#  else // _LIBCPP_AVAILABILITY_HAS_NEW_SYNC
 template <class _AtomicWaitable, class _Poll, class _Rep, class _Period>
 _LIBCPP_HIDE_FROM_ABI bool __atomic_wait_unless_with_timeout(
 @@ -135,10 +130,10 @@ _LIBCPP_HIDE_FROM_ABI bool __atomic_wait_unless_with_timeout(
   return __res == __poll_with_backoff_results::__poll_success;
 }
-#  endif // _LIBCPP_HAS_THREADS && _LIBCPP_AVAILABILITY_HAS_NEW_SYNC
+#  endif // _LIBCPP_AVAILABILITY_HAS_NEW_SYNC
-#endif // C++20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
 #endif // _LIBCPP___ATOMIC_ATOMIC_SYNC_TIMED_H

lib/libcxx/include/__atomic/atomic_waitable_traits.h+4-6

 @@ -16,18 +16,16 @@
 #include <__type_traits/has_unique_object_representation.h>
 #include <__type_traits/is_same.h>
 #include <__type_traits/is_trivially_copyable.h>
-#include <__type_traits/void_t.h>
-#include <__utility/declval.h>
 #include <cstring>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // The customisation points to enable the following functions:
 // - __atomic_wait
 // - __atomic_wait_unless
 @@ -96,8 +94,8 @@ concept __has_native_atomic_wait = is_same_v<_Tp, __cxx_contention_t>;
 #  endif // _LIBCPP_ABI_ATOMIC_WAIT_NATIVE_BY_SIZE
-#endif // C++20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___ATOMIC_ATOMIC_WAITABLE_TRAITS_H

lib/libcxx/include/__atomic/contention_t.h+4-4

lib/libcxx/include/__atomic/floating_point_helper.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 _LIBCPP_HIDE_FROM_ABI constexpr bool __is_fp80_long_double() {
   // Only x87-fp80 long double has 64-bit mantissa
 @@ -48,8 +48,8 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool __has_rmw_builtin() {
 #  endif
 }
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___ATOMIC_FLOATING_POINT_HELPER_H

lib/libcxx/include/__atomic/support.h+2-2

...	@@ -102,9 +102,9 @@	...	@@ -102,9 +102,9 @@
102	// clang-format on	102	// clang-format on
103	//	103	//
104		104
105	#if _LIBCPP_HAS_GCC_ATOMIC_IMP	105	#ifdef _LIBCPP_COMPILER_GCC
106	# include <__atomic/support/gcc.h>	106	# include <__atomic/support/gcc.h>
107	#elif _LIBCPP_HAS_C_ATOMIC_IMP	107	#else
108	# include <__atomic/support/c11.h>	108	# include <__atomic/support/c11.h>
109	#endif	109	#endif
110		110

lib/libcxx/include/__bit/bit_cast.h+6-6

 @@ -17,18 +17,16 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #ifndef _LIBCPP_CXX03_LANG
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _ToType, class _FromType>
 [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr _ToType __bit_cast(const _FromType& __from) noexcept {
   return __builtin_bit_cast(_ToType, __from);
 }
-#endif // _LIBCPP_CXX03_LANG
+#  if _LIBCPP_STD_VER >= 20
-#if _LIBCPP_STD_VER >= 20
 template <class _ToType, class _FromType>
   requires(sizeof(_ToType) == sizeof(_FromType) && is_trivially_copyable_v<_ToType> &&
 @@ -37,8 +35,10 @@ template <class _ToType, class _FromType>
   return __builtin_bit_cast(_ToType, __from);
 }
-#endif // _LIBCPP_STD_VER >= 20
+#  endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_CXX03_LANG
 #endif // _LIBCPP___BIT_BIT_CAST_H

lib/libcxx/include/__bit/bit_ceil.h+4-3

 @@ -19,10 +19,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp __bit_ceil(_Tp __t) noexcept {
   if (__t < 2)
 @@ -47,8 +47,9 @@ template <__unsigned_integer _Tp>
 }
 #  endif // _LIBCPP_STD_VER >= 20
-#endif   // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___BIT_BIT_CEIL_H

lib/libcxx/include/__bit/byteswap.h+25-6

 @@ -12,7 +12,11 @@
 #include <__concepts/arithmetic.h>
 #include <__config>
+#include <__type_traits/is_same.h>
+#include <__type_traits/remove_cv.h>
+#include <climits>
 #include <cstdint>
+#include <limits>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -24,26 +28,41 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <integral _Tp>
 [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp byteswap(_Tp __val) noexcept {
+  // [bit.byteswap]/Mandates: T does not have padding bits.
+  // bool is grandfathered: every shipping implementation admits it and the
+  // size-1 identity path can't shuffle padding bits into value positions.
+  // LWG 4583 proposes relaxing this to allow byte-aligned padding (e.g.
+  // _BitInt(48) where 2 whole bytes are padding); revisit once it resolves.
+  static_assert(is_same_v<remove_cv_t<_Tp>, bool> ||
+                    numeric_limits<_Tp>::digits + numeric_limits<_Tp>::is_signed == sizeof(_Tp) * CHAR_BIT,
+                "std::byteswap requires T to have no padding bits");
   if constexpr (sizeof(_Tp) == 1) {
     return __val;
+#  if __has_builtin(__builtin_bswapg)
+  } else {
+    return __builtin_bswapg(__val);
+  }
+#  else
   } else if constexpr (sizeof(_Tp) == 2) {
     return __builtin_bswap16(__val);
   } else if constexpr (sizeof(_Tp) == 4) {
     return __builtin_bswap32(__val);
   } else if constexpr (sizeof(_Tp) == 8) {
     return __builtin_bswap64(__val);
-#  if _LIBCPP_HAS_INT128
+#    if _LIBCPP_HAS_INT128
   } else if constexpr (sizeof(_Tp) == 16) {
-#    if __has_builtin(__builtin_bswap128)
+#      if __has_builtin(__builtin_bswap128)
     return __builtin_bswap128(__val);
-#    else
+#      else
-    return static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val))) << 64 |
+    return (static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val))) << 64) |
            static_cast<_Tp>(byteswap(static_cast<uint64_t>(__val >> 64)));
-#    endif // __has_builtin(__builtin_bswap128)
+#      endif // __has_builtin(__builtin_bswap128)
-#  endif   // _LIBCPP_HAS_INT128
+#    endif   // _LIBCPP_HAS_INT128
   } else {
     static_assert(sizeof(_Tp) == 0, "byteswap is unimplemented for integral types of this size");
   }
+#  endif     // __has_builtin(__builtin_bswapg)
 }
 #endif // _LIBCPP_STD_VER >= 23

lib/libcxx/include/__bit_reference+164-23

...	@@ -16,10 +16,10 @@	...	@@ -16,10 +16,10 @@
16	#include <__algorithm/copy_n.h>	16	#include <__algorithm/copy_n.h>
17	#include <__algorithm/equal.h>	17	#include <__algorithm/equal.h>
18	#include <__algorithm/fill_n.h>	18	#include <__algorithm/fill_n.h>
		19	#include <__algorithm/in_out_result.h>
19	#include <__algorithm/min.h>	20	#include <__algorithm/min.h>
20	#include <__algorithm/rotate.h>	21	#include <__algorithm/rotate.h>
21	#include <__algorithm/specialized_algorithms.h>	22	#include <__algorithm/specialized_algorithms.h>
22	#include <__algorithm/swap_ranges.h>
23	#include <__assert>	23	#include <__assert>
24	#include <__bit/countr.h>	24	#include <__bit/countr.h>
25	#include <__compare/ordering.h>	25	#include <__compare/ordering.h>
...	@@ -35,7 +35,6 @@	...	@@ -35,7 +35,6 @@
35	#include <__type_traits/desugars_to.h>	35	#include <__type_traits/desugars_to.h>
36	#include <__type_traits/enable_if.h>	36	#include <__type_traits/enable_if.h>
37	#include <__type_traits/is_constant_evaluated.h>	37	#include <__type_traits/is_constant_evaluated.h>
38	#include <__type_traits/is_same.h>
39	#include <__type_traits/is_unsigned.h>	38	#include <__type_traits/is_unsigned.h>
40	#include <__type_traits/void_t.h>	39	#include <__type_traits/void_t.h>
41	#include <__utility/pair.h>	40	#include <__utility/pair.h>
...	@@ -166,9 +165,6 @@ public:	...	@@ -166,9 +165,6 @@ public:
166	}	165	}
167		166
168	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void flip() _NOEXCEPT { *__seg_ ^= __mask_; }	167	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void flip() _NOEXCEPT { *__seg_ ^= __mask_; }
169	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cp, false> operator&() const _NOEXCEPT {
170	return __bit_iterator<_Cp, false>(__seg_, static_cast<unsigned>(std::__countr_zero(__mask_)));
171	}
172		168
173	private:	169	private:
174	_LIBCPP_HIDE_FROM_ABI	170	_LIBCPP_HIDE_FROM_ABI
...	@@ -340,7 +336,7 @@ public:	...	@@ -340,7 +336,7 @@ public:
340	}	336	}
341	#endif	337	#endif
342		338
343	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference operator*() const _NOEXCEPT {	339	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference operator*() const _NOEXCEPT {
344	_LIBCPP_ASSERT_INTERNAL(__ctz_ < __bits_per_word, "Dereferencing an invalid __bit_iterator.");	340	_LIBCPP_ASSERT_INTERNAL(__ctz_ < __bits_per_word, "Dereferencing an invalid __bit_iterator.");
345	return __conditional_t<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> >(	341	return __conditional_t<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> >(
346	__seg_, __storage_type(1) << __ctz_);	342	__seg_, __storage_type(1) << __ctz_);
...	@@ -393,29 +389,32 @@ public:	...	@@ -393,29 +389,32 @@ public:
393	return *this += -__n;	389	return *this += -__n;
394	}	390	}
395		391
396	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator operator+(difference_type __n) const {	392	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator
		393	operator+(difference_type __n) const {
397	__bit_iterator __t(*this);	394	__bit_iterator __t(*this);
398	__t += __n;	395	__t += __n;
399	return __t;	396	return __t;
400	}	397	}
401		398
402	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator operator-(difference_type __n) const {	399	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator
		400	operator-(difference_type __n) const {
403	__bit_iterator __t(*this);	401	__bit_iterator __t(*this);
404	__t -= __n;	402	__t -= __n;
405	return __t;	403	return __t;
406	}	404	}
407		405
408	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator	406	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator
409	operator+(difference_type __n, const __bit_iterator& __it) {	407	operator+(difference_type __n, const __bit_iterator& __it) {
410	return __it + __n;	408	return __it + __n;
411	}	409	}
412		410
413	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 friend difference_type	411	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 friend difference_type
414	operator-(const __bit_iterator& __x, const __bit_iterator& __y) {	412	operator-(const __bit_iterator& __x, const __bit_iterator& __y) {
415	return (__x.__seg_ - __y.__seg_) * __bits_per_word + __x.__ctz_ - __y.__ctz_;	413	return (__x.__seg_ - __y.__seg_) * __bits_per_word + __x.__ctz_ - __y.__ctz_;
416	}	414	}
417		415
418	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference operator[](difference_type __n) const {	416	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 reference
		417	operator[](difference_type __n) const {
419	return (this + __n);	418	return (this + __n);
420	}	419	}
421		420
...	@@ -487,15 +486,6 @@ private:	...	@@ -487,15 +486,6 @@ private:
487	__bit_iterator<_Dp, _IC> __first, __bit_iterator<_Dp, _IC> __last, __bit_iterator<_Dp, false> __result);	486	__bit_iterator<_Dp, _IC> __first, __bit_iterator<_Dp, _IC> __last, __bit_iterator<_Dp, false> __result);
488	template <class _AlgPolicy>	487	template <class _AlgPolicy>
489	friend struct __copy_backward_impl;	488	friend struct __copy_backward_impl;
490	template <class _Cl, class _Cr>
491	_LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator<_Cr, false>
492	__swap_ranges_aligned(__bit_iterator<_Cl, false>, __bit_iterator<_Cl, false>, __bit_iterator<_Cr, false>);
493	template <class _Cl, class _Cr>
494	_LIBCPP_CONSTEXPR_SINCE_CXX20 friend __bit_iterator<_Cr, false>
495	__swap_ranges_unaligned(__bit_iterator<_Cl, false>, __bit_iterator<_Cl, false>, __bit_iterator<_Cr, false>);
496	template <class, class _Cl, class _Cr>
497	_LIBCPP_CONSTEXPR_SINCE_CXX20 friend pair<__bit_iterator<_Cl, false>, __bit_iterator<_Cr, false> >
498	__swap_ranges(__bit_iterator<_Cl, false>, __bit_iterator<_Cl, false>, __bit_iterator<_Cr, false>);
499	template <class, class _Dp>	489	template <class, class _Dp>
500	_LIBCPP_CONSTEXPR_SINCE_CXX20 friend pair<__bit_iterator<_Dp, false>, __bit_iterator<_Dp, false> >	490	_LIBCPP_CONSTEXPR_SINCE_CXX20 friend pair<__bit_iterator<_Dp, false>, __bit_iterator<_Dp, false> >
501	__rotate(__bit_iterator<_Dp, false>, __bit_iterator<_Dp, false>, __bit_iterator<_Dp, false>);	491	__rotate(__bit_iterator<_Dp, false>, __bit_iterator<_Dp, false>, __bit_iterator<_Dp, false>);
...	@@ -718,13 +708,164 @@ struct __specialized_algorithm<_Algorithm::__copy,	...	@@ -718,13 +708,164 @@ struct __specialized_algorithm<_Algorithm::__copy,
718	}	708	}
719		709
720	_LIBCPP_HIDE_FROM_ABI	710	_LIBCPP_HIDE_FROM_ABI
721	_LIBCPP_CONSTEXPR_SINCE_CXX20 static pair<__bit_iterator<_Cp, _IsConst>, __bit_iterator<_Cp, false> >	711	_LIBCPP_CONSTEXPR_SINCE_CXX20 static __in_out_result<__bit_iterator<_Cp, _IsConst>, __bit_iterator<_Cp, false> >
722	operator()(__bit_iterator<_Cp, _IsConst> __first,	712	operator()(__bit_iterator<_Cp, _IsConst> __first,
723	__bit_iterator<_Cp, _IsConst> __last,	713	__bit_iterator<_Cp, _IsConst> __last,
724	__bit_iterator<_Cp, false> __result) {	714	__bit_iterator<_Cp, false> __result) {
725	if (__first.__ctz_ == __result.__ctz_)	715	if (__first.__ctz_ == __result.__ctz_)
726	return std::make_pair(__last, __aligned_impl(__first, __last, __result));	716	return {__last, __aligned_impl(__first, __last, __result)};
727	return std::make_pair(__last, __unaligned_impl(__first, __last, __result));	717	return {__last, __unaligned_impl(__first, __last, __result)};
		718	}
		719	};
		720
		721	template <class _Cl, class _Cr>
		722	struct __specialized_algorithm<_Algorithm::__swap_ranges,
		723	__iterator_pair<__bit_iterator<_Cl, false>, __bit_iterator<_Cl, false> >,
		724	__single_iterator<__bit_iterator<_Cr, false> > > {
		725	static const bool __has_algorithm = true;
		726
		727	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cr, false> __aligned_impl(
		728	__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl, false> __last, __bit_iterator<_Cr, false> __result) {
		729	using _I1 = __bit_iterator<_Cl, false>;
		730	using difference_type = typename _I1::difference_type;
		731	using __storage_type = typename _I1::__storage_type;
		732
		733	const int __bits_per_word = _I1::__bits_per_word;
		734	difference_type __n = __last - __first;
		735	if (__n > 0) {
		736	// do first word
		737	if (__first.__ctz_ != 0) {
		738	unsigned __clz = __bits_per_word - __first.__ctz_;
		739	difference_type __dn = std::min(static_cast<difference_type>(__clz), __n);
		740	__n -= __dn;
		741	__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
		742	__storage_type __b1 = *__first.__seg_ & __m;
		743	*__first.__seg_ &= ~__m;
		744	__storage_type __b2 = *__result.__seg_ & __m;
		745	*__result.__seg_ &= ~__m;
		746	*__result.__seg_ \|= __b1;
		747	*__first.__seg_ \|= __b2;
		748	__result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
		749	__result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_) % __bits_per_word);
		750	++__first.__seg_;
		751	// __first.__ctz_ = 0;
		752	}
		753	// __first.__ctz_ == 0;
		754	// do middle words
		755	for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_, ++__result.__seg_)
		756	swap(__first.__seg_, __result.__seg_);
		757	// do last word
		758	if (__n > 0) {
		759	__storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
		760	__storage_type __b1 = *__first.__seg_ & __m;
		761	*__first.__seg_ &= ~__m;
		762	__storage_type __b2 = *__result.__seg_ & __m;
		763	*__result.__seg_ &= ~__m;
		764	*__result.__seg_ \|= __b1;
		765	*__first.__seg_ \|= __b2;
		766	__result.__ctz_ = static_cast<unsigned>(__n);
		767	}
		768	}
		769	return __result;
		770	}
		771
		772	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX20 __bit_iterator<_Cr, false> __unaligned_impl(
		773	__bit_iterator<_Cl, false> __first, __bit_iterator<_Cl, false> __last, __bit_iterator<_Cr, false> __result) {
		774	using _I1 = __bit_iterator<_Cl, false>;
		775	using difference_type = typename _I1::difference_type;
		776	using __storage_type = typename _I1::__storage_type;
		777
		778	const int __bits_per_word = _I1::__bits_per_word;
		779	difference_type __n = __last - __first;
		780	if (__n > 0) {
		781	// do first word
		782	if (__first.__ctz_ != 0) {
		783	unsigned __clz_f = __bits_per_word - __first.__ctz_;
		784	difference_type __dn = std::min(static_cast<difference_type>(__clz_f), __n);
		785	__n -= __dn;
		786	__storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
		787	__storage_type __b1 = *__first.__seg_ & __m;
		788	*__first.__seg_ &= ~__m;
		789	unsigned __clz_r = __bits_per_word - __result.__ctz_;
		790	__storage_type __ddn = std::min<__storage_type>(__dn, __clz_r);
		791	__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
		792	__storage_type __b2 = *__result.__seg_ & __m;
		793	*__result.__seg_ &= ~__m;
		794	if (__result.__ctz_ > __first.__ctz_) {
		795	unsigned __s = __result.__ctz_ - __first.__ctz_;
		796	*__result.__seg_ \|= __b1 << __s;
		797	*__first.__seg_ \|= __b2 >> __s;
		798	} else {
		799	unsigned __s = __first.__ctz_ - __result.__ctz_;
		800	*__result.__seg_ \|= __b1 >> __s;
		801	*__first.__seg_ \|= __b2 << __s;
		802	}
		803	__result.__seg_ += (__ddn + __result.__ctz_) / __bits_per_word;
		804	__result.__ctz_ = static_cast<unsigned>((__ddn + __result.__ctz_) % __bits_per_word);
		805	__dn -= __ddn;
		806	if (__dn > 0) {
		807	__m = ~__storage_type(0) >> (__bits_per_word - __dn);
		808	__b2 = *__result.__seg_ & __m;
		809	*__result.__seg_ &= ~__m;
		810	unsigned __s = __first.__ctz_ + __ddn;
		811	*__result.__seg_ \|= __b1 >> __s;
		812	*__first.__seg_ \|= __b2 << __s;
		813	__result.__ctz_ = static_cast<unsigned>(__dn);
		814	}
		815	++__first.__seg_;
		816	// __first.__ctz_ = 0;
		817	}
		818	// __first.__ctz_ == 0;
		819	// do middle words
		820	__storage_type __m = ~__storage_type(0) << __result.__ctz_;
		821	unsigned __clz_r = __bits_per_word - __result.__ctz_;
		822	for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_) {
		823	__storage_type __b1 = *__first.__seg_;
		824	__storage_type __b2 = *__result.__seg_ & __m;
		825	*__result.__seg_ &= ~__m;
		826	*__result.__seg_ \|= __b1 << __result.__ctz_;
		827	*__first.__seg_ = __b2 >> __result.__ctz_;
		828	++__result.__seg_;
		829	__b2 = *__result.__seg_ & ~__m;
		830	*__result.__seg_ &= __m;
		831	*__result.__seg_ \|= __b1 >> __clz_r;
		832	*__first.__seg_ \|= __b2 << __clz_r;
		833	}
		834	// do last word
		835	if (__n > 0) {
		836	__m = ~__storage_type(0) >> (__bits_per_word - __n);
		837	__storage_type __b1 = *__first.__seg_ & __m;
		838	*__first.__seg_ &= ~__m;
		839	__storage_type __dn = std::min<__storage_type>(__n, __clz_r);
		840	__m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
		841	__storage_type __b2 = *__result.__seg_ & __m;
		842	*__result.__seg_ &= ~__m;
		843	*__result.__seg_ \|= __b1 << __result.__ctz_;
		844	*__first.__seg_ \|= __b2 >> __result.__ctz_;
		845	__result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
		846	__result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_) % __bits_per_word);
		847	__n -= __dn;
		848	if (__n > 0) {
		849	__m = ~__storage_type(0) >> (__bits_per_word - __n);
		850	__b2 = *__result.__seg_ & __m;
		851	*__result.__seg_ &= ~__m;
		852	*__result.__seg_ \|= __b1 >> __dn;
		853	*__first.__seg_ \|= __b2 << __dn;
		854	__result.__ctz_ = static_cast<unsigned>(__n);
		855	}
		856	}
		857	}
		858	return __result;
		859	}
		860
		861	_LIBCPP_HIDE_FROM_ABI static
		862	_LIBCPP_CONSTEXPR_SINCE_CXX20 pair<__bit_iterator<_Cl, false>, __bit_iterator<_Cr, false> >
		863	operator()(__bit_iterator<_Cl, false> __first1,
		864	__bit_iterator<_Cl, false> __last1,
		865	__bit_iterator<_Cr, false> __first2) {
		866	if (__first1.__ctz_ == __first2.__ctz_)
		867	return std::make_pair(__last1, __aligned_impl(__first1, __last1, __first2));
		868	return std::make_pair(__last1, __unaligned_impl(__first1, __last1, __first2));
728	}	869	}
729	};	870	};
730		871

lib/libcxx/include/__charconv/from_chars_floating_point.h+2

...	@@ -35,6 +35,7 @@ struct __from_chars_result {	...	@@ -35,6 +35,7 @@ struct __from_chars_result {
35	errc __ec;	35	errc __ec;
36	};	36	};
37		37
		38	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
38	template <class _Fp>	39	template <class _Fp>
39	_LIBCPP_EXPORTED_FROM_ABI __from_chars_result<_Fp> __from_chars_floating_point(	40	_LIBCPP_EXPORTED_FROM_ABI __from_chars_result<_Fp> __from_chars_floating_point(
40	_LIBCPP_NOESCAPE const char* __first, _LIBCPP_NOESCAPE const char* __last, chars_format __fmt);	41	_LIBCPP_NOESCAPE const char* __first, _LIBCPP_NOESCAPE const char* __last, chars_format __fmt);
...	@@ -44,6 +45,7 @@ extern template __from_chars_result<float> __from_chars_floating_point(	...	@@ -44,6 +45,7 @@ extern template __from_chars_result<float> __from_chars_floating_point(
44		45
45	extern template __from_chars_result<double> __from_chars_floating_point(	46	extern template __from_chars_result<double> __from_chars_floating_point(
46	_LIBCPP_NOESCAPE const char* __first, _LIBCPP_NOESCAPE const char* __last, chars_format __fmt);	47	_LIBCPP_NOESCAPE const char* __first, _LIBCPP_NOESCAPE const char* __last, chars_format __fmt);
		48	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
47		49
48	template <class _Fp>	50	template <class _Fp>
49	_LIBCPP_HIDE_FROM_ABI from_chars_result	51	_LIBCPP_HIDE_FROM_ABI from_chars_result

lib/libcxx/include/__charconv/from_chars_integral.h+1-4

 @@ -10,12 +10,10 @@
 #ifndef _LIBCPP___CHARCONV_FROM_CHARS_INTEGRAL_H
 #define _LIBCPP___CHARCONV_FROM_CHARS_INTEGRAL_H
-#include <__algorithm/copy_n.h>
 #include <__assert>
 #include <__charconv/from_chars_result.h>
 #include <__charconv/traits.h>
 #include <__config>
-#include <__memory/addressof.h>
 #include <__system_error/errc.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_integral.h>
 @@ -56,8 +54,7 @@ __sign_combinator(_It __first, _It __last, _Tp& __value, _Fn __f, _Ts... __args)
   if (__neg) {
     if (__x <= std::__complement(std::__to_unsigned_like(__tl::min()))) {
-      __x = std::__complement(__x);
+      __value = std::__complement(__x);
-      std::copy_n(std::addressof(__x), 1, std::addressof(__value));
       return __r;
     }
   } else {

lib/libcxx/include/__charconv/to_chars.h-4

...	@@ -18,8 +18,4 @@	...	@@ -18,8 +18,4 @@
18	# pragma GCC system_header	18	# pragma GCC system_header
19	#endif	19	#endif
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	_LIBCPP_END_NAMESPACE_STD
24
25	#endif // _LIBCPP___CHARCONV_TO_CHARS	21	#endif // _LIBCPP___CHARCONV_TO_CHARS

lib/libcxx/include/__charconv/to_chars_floating_point.h+2

...	@@ -19,6 +19,7 @@	...	@@ -19,6 +19,7 @@
19	#endif	19	#endif
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
		22	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
22		23
23	#if _LIBCPP_STD_VER >= 17	24	#if _LIBCPP_STD_VER >= 17
24		25
...	@@ -50,6 +51,7 @@ _LIBCPP_AVAILABILITY_TO_CHARS_FLOATING_POINT _LIBCPP_EXPORTED_FROM_ABI to_chars_	...	@@ -50,6 +51,7 @@ _LIBCPP_AVAILABILITY_TO_CHARS_FLOATING_POINT _LIBCPP_EXPORTED_FROM_ABI to_chars_
50	to_chars(char* __first, char* __last, long double __value, chars_format __fmt, int __precision);	51	to_chars(char* __first, char* __last, long double __value, chars_format __fmt, int __precision);
51	#endif // _LIBCPP_STD_VER >= 17	52	#endif // _LIBCPP_STD_VER >= 17
52		53
		54	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
53	_LIBCPP_END_NAMESPACE_STD	55	_LIBCPP_END_NAMESPACE_STD
54		56
55	#endif // _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H	57	#endif // _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H

lib/libcxx/include/__chrono/convert_to_tm.h+4-1

 @@ -127,7 +127,10 @@ _LIBCPP_HIDE_FROM_ABI _Tm __convert_to_tm(chrono::tai_time<_Duration> __tp) {
 template <class _Tm, class _Duration>
 _LIBCPP_HIDE_FROM_ABI _Tm __convert_to_tm(chrono::gps_time<_Duration> __tp) {
-  return std::__convert_to_tm<_Tm>(chrono::utc_clock::to_sys(chrono::gps_clock::to_utc(__tp)));
+  using _Rp = common_type_t<_Duration, chrono::seconds>;
+  // The time between the GPS epoch (1980-01-06) and UNIX epoch (1970-01-01).
+  constexpr chrono::seconds __offset{3657 * 24 * 60 * 60};
+  return std::__convert_to_tm<_Tm>(chrono::sys_time<_Rp>{__tp.time_since_epoch() + __offset});
 }
 #    endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB

lib/libcxx/include/__chrono/day.h+8-6

 @@ -55,7 +55,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr day& operator+=(const days& __dd) noexcept;
   _LIBCPP_HIDE_FROM_ABI constexpr day& operator-=(const days& __dd) noexcept;
   _LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator unsigned() const noexcept { return __d_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __d_ >= 1 && __d_ <= 31; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __d_ >= 1 && __d_ <= 31; }
 };
 _LIBCPP_HIDE_FROM_ABI inline constexpr bool operator==(const day& __lhs, const day& __rhs) noexcept {
 @@ -66,19 +66,19 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr strong_ordering operator<=>(const day& __
   return static_cast<unsigned>(__lhs) <=> static_cast<unsigned>(__rhs);
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr day operator+(const day& __lhs, const days& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr day operator+(const day& __lhs, const days& __rhs) noexcept {
   return day(static_cast<unsigned>(__lhs) + __rhs.count());
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr day operator+(const days& __lhs, const day& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr day operator+(const days& __lhs, const day& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr day operator-(const day& __lhs, const days& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr day operator-(const day& __lhs, const days& __rhs) noexcept {
   return __lhs + -__rhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr days operator-(const day& __lhs, const day& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr days operator-(const day& __lhs, const day& __rhs) noexcept {
   return days(static_cast<int>(static_cast<unsigned>(__lhs)) - static_cast<int>(static_cast<unsigned>(__rhs)));
 }
 @@ -98,7 +98,9 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr day& day::operator-=(const days& __dd) no
 template <>
 struct hash<chrono::day> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::day& __d) noexcept { return static_cast<unsigned>(__d); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::day& __d) noexcept {
+    return static_cast<unsigned>(__d);
+  }
 };
 #  endif // _LIBCPP_STD_VER >= 26

lib/libcxx/include/__chrono/duration.h+12-38

 @@ -19,6 +19,7 @@
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_convertible.h>
 #include <__type_traits/is_floating_point.h>
+#include <__type_traits/is_unqualified.h>
 #include <limits>
 #include <ratio>
 @@ -164,6 +165,7 @@ template <class _ToDuration, class _Rep, class _Period, enable_if_t<__is_duratio
 template <class _Rep, class _Period>
 class duration {
+  static_assert(__is_unqualified_v<_Rep>, "A duration representation cannot be qualified");
   static_assert(!__is_duration_v<_Rep>, "A duration representation can not be a duration");
   static_assert(__is_ratio_v<_Period>, "Second template parameter of duration must be a std::ratio");
   static_assert(_Period::num > 0, "duration period must be positive");
 @@ -291,35 +293,21 @@ typedef duration<long long, nano> nanoseconds;
 typedef duration<long long, micro> microseconds;
 typedef duration<long long, milli> milliseconds;
 typedef duration<long long > seconds;
-typedef duration< long, ratio< 60> > minutes;
+typedef duration<long, ratio<60> > minutes;
-typedef duration< long, ratio<3600> > hours;
+typedef duration<long, ratio<60 * 60> > hours;
 #if _LIBCPP_STD_VER >= 20
-typedef duration< int, ratio_multiply<ratio<24>, hours::period>> days;
+typedef duration<int, ratio<60 * 60 * 24>> days;
-typedef duration< int, ratio_multiply<ratio<7>, days::period>> weeks;
+typedef duration<int, ratio<60 * 60 * 24 * 7>> weeks;
-typedef duration< int, ratio_multiply<ratio<146097, 400>, days::period>> years;
+typedef duration<int, ratio<static_cast<int>(365.2425 * 60 * 60 * 24)>> years;
-typedef duration< int, ratio_divide<years::period, ratio<12>>> months;
+typedef duration<int, ratio<static_cast<int>(365.2425 * 60 * 60 * 24) / 12>> months;
 #endif
 // Duration ==
-template <class _LhsDuration, class _RhsDuration>
-struct __duration_eq {
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs) const {
-    typedef typename common_type<_LhsDuration, _RhsDuration>::type _Ct;
-    return _Ct(__lhs).count() == _Ct(__rhs).count();
-  }
-};
-template <class _LhsDuration>
-struct __duration_eq<_LhsDuration, _LhsDuration> {
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs) const {
-    return __lhs.count() == __rhs.count();
-  }
-};
 template <class _Rep1, class _Period1, class _Rep2, class _Period2>
 inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool
 operator==(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
-  return __duration_eq<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >()(__lhs, __rhs);
+  using _Ct = typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type;
+  return _Ct(__lhs).count() == _Ct(__rhs).count();
 }
 #if _LIBCPP_STD_VER <= 17
 @@ -336,25 +324,11 @@ operator!=(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period
 // Duration <
-template <class _LhsDuration, class _RhsDuration>
-struct __duration_lt {
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs) const {
-    typedef typename common_type<_LhsDuration, _RhsDuration>::type _Ct;
-    return _Ct(__lhs).count() < _Ct(__rhs).count();
-  }
-};
-template <class _LhsDuration>
-struct __duration_lt<_LhsDuration, _LhsDuration> {
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs) const {
-    return __lhs.count() < __rhs.count();
-  }
-};
 template <class _Rep1, class _Period1, class _Rep2, class _Period2>
 inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool
 operator<(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs) {
-  return __duration_lt<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >()(__lhs, __rhs);
+  using _Ct = typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type;
+  return _Ct(__lhs).count() < _Ct(__rhs).count();
 }
 // Duration >

lib/libcxx/include/__chrono/exception.h+2

...	@@ -31,6 +31,7 @@	...	@@ -31,6 +31,7 @@
31	# endif	31	# endif
32		32
33	_LIBCPP_BEGIN_NAMESPACE_STD	33	_LIBCPP_BEGIN_NAMESPACE_STD
		34	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
34		35
35	# if _LIBCPP_STD_VER >= 20	36	# if _LIBCPP_STD_VER >= 20
36		37
...	@@ -128,6 +129,7 @@ template <class _Duration>	...	@@ -128,6 +129,7 @@ template <class _Duration>
128		129
129	# endif // _LIBCPP_STD_VER >= 20	130	# endif // _LIBCPP_STD_VER >= 20
130		131
		132	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
131	_LIBCPP_END_NAMESPACE_STD	133	_LIBCPP_END_NAMESPACE_STD
132		134
133	#endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB	135	#endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB

lib/libcxx/include/__chrono/file_clock.h+4

...	@@ -46,6 +46,8 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -46,6 +46,8 @@ _LIBCPP_END_NAMESPACE_STD
46		46
47	#ifndef _LIBCPP_CXX03_LANG	47	#ifndef _LIBCPP_CXX03_LANG
48	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	48	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		49	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
		50
49	struct _FilesystemClock {	51	struct _FilesystemClock {
50	# if _LIBCPP_HAS_INT128	52	# if _LIBCPP_HAS_INT128
51	typedef __int128_t rep;	53	typedef __int128_t rep;
...	@@ -76,6 +78,8 @@ struct _FilesystemClock {	...	@@ -76,6 +78,8 @@ struct _FilesystemClock {
76	}	78	}
77	# endif // _LIBCPP_STD_VER >= 20	79	# endif // _LIBCPP_STD_VER >= 20
78	};	80	};
		81
		82	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
79	_LIBCPP_END_NAMESPACE_FILESYSTEM	83	_LIBCPP_END_NAMESPACE_FILESYSTEM
80	#endif // !_LIBCPP_CXX03_LANG	84	#endif // !_LIBCPP_CXX03_LANG
81		85

lib/libcxx/include/__chrono/gps_clock.h+4-4

 @@ -28,10 +28,10 @@
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace chrono {
 class gps_clock;
 @@ -78,11 +78,11 @@ public:
 } // namespace chrono
+_LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM &&
          // _LIBCPP_HAS_LOCALIZATION
-_LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB

lib/libcxx/include/__chrono/hh_mm_ss.h+10-10

lib/libcxx/include/__chrono/literals.h+2-2

...	@@ -24,11 +24,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -24,11 +24,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD
24		24
25	inline namespace literals {	25	inline namespace literals {
26	inline namespace chrono_literals {	26	inline namespace chrono_literals {
27	_LIBCPP_HIDE_FROM_ABI constexpr chrono::day operator""d(unsigned long long __d) noexcept {	27	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr chrono::day operator""d(unsigned long long __d) noexcept {
28	return chrono::day(static_cast<unsigned>(__d));	28	return chrono::day(static_cast<unsigned>(__d));
29	}	29	}
30		30
31	_LIBCPP_HIDE_FROM_ABI constexpr chrono::year operator""y(unsigned long long __y) noexcept {	31	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr chrono::year operator""y(unsigned long long __y) noexcept {
32	return chrono::year(static_cast<int>(__y));	32	return chrono::year(static_cast<int>(__y));
33	}	33	}
34	} // namespace chrono_literals	34	} // namespace chrono_literals

lib/libcxx/include/__chrono/month.h+6-6

lib/libcxx/include/__chrono/month_weekday.h+24-16

 @@ -35,9 +35,11 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr month_weekday(const chrono::month& __mval,
                                                 const chrono::weekday_indexed& __wdival) noexcept
       : __m_{__mval}, __wdi_{__wdival} {}
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_indexed weekday_indexed() const noexcept { return __wdi_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_indexed weekday_indexed() const noexcept {
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_.ok() && __wdi_.ok(); }
+    return __wdi_;
+  }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_.ok() && __wdi_.ok(); }
 };
 _LIBCPP_HIDE_FROM_ABI inline constexpr bool
 @@ -45,21 +47,23 @@ operator==(const month_weekday& __lhs, const month_weekday& __rhs) noexcept {
   return __lhs.month() == __rhs.month() && __lhs.weekday_indexed() == __rhs.weekday_indexed();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday
 operator/(const month& __lhs, const weekday_indexed& __rhs) noexcept {
   return month_weekday{__lhs, __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday operator/(int __lhs, const weekday_indexed& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday
+operator/(int __lhs, const weekday_indexed& __rhs) noexcept {
   return month_weekday{month(__lhs), __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday
 operator/(const weekday_indexed& __lhs, const month& __rhs) noexcept {
   return month_weekday{__rhs, __lhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday operator/(const weekday_indexed& __lhs, int __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday
+operator/(const weekday_indexed& __lhs, int __rhs) noexcept {
   return month_weekday{month(__rhs), __lhs};
 }
 @@ -71,9 +75,11 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr month_weekday_last(const chrono::month& __mval,
                                                      const chrono::weekday_last& __wdlval) noexcept
       : __m_{__mval}, __wdl_{__wdlval} {}
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_last weekday_last() const noexcept { return __wdl_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_last weekday_last() const noexcept {
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_.ok() && __wdl_.ok(); }
+    return __wdl_;
+  }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_.ok() && __wdl_.ok(); }
 };
 _LIBCPP_HIDE_FROM_ABI inline constexpr bool
 @@ -81,21 +87,23 @@ operator==(const month_weekday_last& __lhs, const month_weekday_last& __rhs) noe
   return __lhs.month() == __rhs.month() && __lhs.weekday_last() == __rhs.weekday_last();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last
 operator/(const month& __lhs, const weekday_last& __rhs) noexcept {
   return month_weekday_last{__lhs, __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last operator/(int __lhs, const weekday_last& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last
+operator/(int __lhs, const weekday_last& __rhs) noexcept {
   return month_weekday_last{month(__lhs), __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last
 operator/(const weekday_last& __lhs, const month& __rhs) noexcept {
   return month_weekday_last{__rhs, __lhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last operator/(const weekday_last& __lhs, int __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last
+operator/(const weekday_last& __lhs, int __rhs) noexcept {
   return month_weekday_last{month(__rhs), __lhs};
 }
 } // namespace chrono
 @@ -104,7 +112,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr month_weekday_last operator/(const weekda
 template <>
 struct hash<chrono::month_weekday> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month_weekday& __mw) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month_weekday& __mw) noexcept {
     return std::__hash_combine(
         hash<chrono::month>{}(__mw.month()), hash<chrono::weekday_indexed>{}(__mw.weekday_indexed()));
   }
 @@ -112,7 +120,7 @@ struct hash<chrono::month_weekday> {
 template <>
 struct hash<chrono::month_weekday_last> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month_weekday_last& __mwl) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month_weekday_last& __mwl) noexcept {
     return std::__hash_combine(
         hash<chrono::month>{}(__mwl.month()), hash<chrono::weekday_last>{}(__mwl.weekday_last()));
   }

lib/libcxx/include/__chrono/monthday.h+18-16

 @@ -37,9 +37,9 @@ public:
   month_day() = default;
   _LIBCPP_HIDE_FROM_ABI constexpr month_day(const chrono::month& __mval, const chrono::day& __dval) noexcept
       : __m_{__mval}, __d_{__dval} {}
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::day day() const noexcept { return __d_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::day day() const noexcept { return __d_; }
-  _LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept;
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept;
 };
 _LIBCPP_HIDE_FROM_ABI inline constexpr bool month_day::ok() const noexcept {
 @@ -70,23 +70,25 @@ operator<=>(const month_day& __lhs, const month_day& __rhs) noexcept {
   return __lhs.day() <=> __rhs.day();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_day operator/(const month& __lhs, const day& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_day
+operator/(const month& __lhs, const day& __rhs) noexcept {
   return month_day{__lhs, __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_day operator/(const day& __lhs, const month& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_day
+operator/(const day& __lhs, const month& __rhs) noexcept {
   return __rhs / __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_day operator/(const month& __lhs, int __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_day operator/(const month& __lhs, int __rhs) noexcept {
   return __lhs / day(__rhs);
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_day operator/(int __lhs, const day& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_day operator/(int __lhs, const day& __rhs) noexcept {
   return month(__lhs) / __rhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_day operator/(const day& __lhs, int __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_day operator/(const day& __lhs, int __rhs) noexcept {
   return month(__rhs) / __lhs;
 }
 @@ -96,8 +98,8 @@ private:
 public:
   _LIBCPP_HIDE_FROM_ABI explicit constexpr month_day_last(const chrono::month& __val) noexcept : __m_{__val} {}
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_.ok(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_.ok(); }
 };
 _LIBCPP_HIDE_FROM_ABI inline constexpr bool
 @@ -110,19 +112,19 @@ operator<=>(const month_day_last& __lhs, const month_day_last& __rhs) noexcept {
   return __lhs.month() <=> __rhs.month();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(const month& __lhs, last_spec) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(const month& __lhs, last_spec) noexcept {
   return month_day_last{__lhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(last_spec, const month& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(last_spec, const month& __rhs) noexcept {
   return month_day_last{__rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(int __lhs, last_spec) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(int __lhs, last_spec) noexcept {
   return month_day_last{month(__lhs)};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(last_spec, int __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(last_spec, int __rhs) noexcept {
   return month_day_last{month(__rhs)};
 }
 @@ -132,14 +134,14 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr month_day_last operator/(last_spec, int _
 template <>
 struct hash<chrono::month_day> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month_day& __md) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month_day& __md) noexcept {
     return std::__hash_combine(hash<chrono::month>{}(__md.month()), hash<chrono::day>{}(__md.day()));
   }
 };
 template <>
 struct hash<chrono::month_day_last> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month_day_last& __mdl) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month_day_last& __mdl) noexcept {
     return hash<chrono::month>{}(__mdl.month());
   }
 };

lib/libcxx/include/__chrono/steady_clock.h+6-2

 @@ -18,11 +18,13 @@
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_HAS_MONOTONIC_CLOCK
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 namespace chrono {
-#if _LIBCPP_HAS_MONOTONIC_CLOCK
 class _LIBCPP_EXPORTED_FROM_ABI steady_clock {
 public:
   typedef nanoseconds duration;
 @@ -33,10 +35,12 @@ public:
   [[__nodiscard__]] static time_point now() _NOEXCEPT;
 };
-#endif
 } // namespace chrono
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
+#endif
 #endif // _LIBCPP___CHRONO_STEADY_CLOCK_H

lib/libcxx/include/__chrono/system_clock.h+2

...	@@ -20,6 +20,7 @@	...	@@ -20,6 +20,7 @@
20	#endif	20	#endif
21		21
22	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
		23	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
23		24
24	namespace chrono {	25	namespace chrono {
25		26
...	@@ -47,6 +48,7 @@ using sys_days = sys_time<days>;	...	@@ -47,6 +48,7 @@ using sys_days = sys_time<days>;
47		48
48	} // namespace chrono	49	} // namespace chrono
49		50
		51	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
50	_LIBCPP_END_NAMESPACE_STD	52	_LIBCPP_END_NAMESPACE_STD
51		53
52	#endif // _LIBCPP___CHRONO_SYSTEM_CLOCK_H	54	#endif // _LIBCPP___CHRONO_SYSTEM_CLOCK_H

lib/libcxx/include/__chrono/tai_clock.h+4-4

 @@ -28,10 +28,10 @@
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace chrono {
 class tai_clock;
 @@ -96,11 +96,11 @@ public:
 } // namespace chrono
+_LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM &&
          // _LIBCPP_HAS_LOCALIZATION
-_LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB

lib/libcxx/include/__chrono/time_zone.h+6-4

 @@ -35,10 +35,11 @@
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
+_LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 namespace chrono {
 enum class choose { earliest, latest };
 @@ -173,11 +174,12 @@ operator<=>(const time_zone& __x, const time_zone& __y) noexcept {
 } // namespace chrono
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
+_LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM &&
          // _LIBCPP_HAS_LOCALIZATION
-_LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB

lib/libcxx/include/__chrono/time_zone_link.h+4-4

 @@ -29,10 +29,10 @@
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace chrono {
 class time_zone_link {
 @@ -67,11 +67,11 @@ operator<=>(const time_zone_link& __x, const time_zone_link& __y) noexcept {
 } // namespace chrono
+_LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM &&
          // _LIBCPP_HAS_LOCALIZATION
-_LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB

lib/libcxx/include/__chrono/tzdb.h+6-4

 @@ -34,10 +34,11 @@
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
+_LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 namespace chrono {
 struct tzdb {
 @@ -84,11 +85,12 @@ private:
 } // namespace chrono
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
+_LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM &&
          // _LIBCPP_HAS_LOCALIZATION
-_LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB

lib/libcxx/include/__chrono/tzdb_list.h+6-4

 @@ -27,10 +27,11 @@
 #    pragma GCC system_header
 #  endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
+_LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 namespace chrono {
 // TODO TZDB
 @@ -98,11 +99,12 @@ _LIBCPP_AVAILABILITY_TZDB _LIBCPP_EXPORTED_FROM_ABI const tzdb& reload_tzdb();
 } // namespace chrono
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
+_LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM &&
          // _LIBCPP_HAS_LOCALIZATION
-_LIBCPP_END_NAMESPACE_STD
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 #endif // _LIBCPP___CHRONO_TZDB_LIST_H

lib/libcxx/include/__chrono/utc_clock.h+4-4

 @@ -27,10 +27,10 @@
 #    pragma GCC system_header
 #  endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace chrono {
 class utc_clock;
 @@ -153,11 +153,11 @@ utc_clock::to_sys(const utc_time<_Duration>& __time) {
 } // namespace chrono
+_LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM &&
          // _LIBCPP_HAS_LOCALIZATION
-_LIBCPP_END_NAMESPACE_STD
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 #endif // _LIBCPP___CHRONO_UTC_CLOCK_H

lib/libcxx/include/__chrono/weekday.h+27-17

 @@ -65,11 +65,13 @@ public:
   }
   _LIBCPP_HIDE_FROM_ABI constexpr weekday& operator+=(const days& __dd) noexcept;
   _LIBCPP_HIDE_FROM_ABI constexpr weekday& operator-=(const days& __dd) noexcept;
-  _LIBCPP_HIDE_FROM_ABI inline constexpr unsigned c_encoding() const noexcept { return __wd_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr unsigned c_encoding() const noexcept { return __wd_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr unsigned iso_encoding() const noexcept { return __wd_ == 0u ? 7 : __wd_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr unsigned iso_encoding() const noexcept {
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __wd_ <= 6; }
+    return __wd_ == 0u ? 7 : __wd_;
-  _LIBCPP_HIDE_FROM_ABI constexpr weekday_indexed operator[](unsigned __index) const noexcept;
+  }
-  _LIBCPP_HIDE_FROM_ABI constexpr weekday_last operator[](last_spec) const noexcept;
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __wd_ <= 6; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr weekday_indexed operator[](unsigned __index) const noexcept;
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr weekday_last operator[](last_spec) const noexcept;
 };
 // https://howardhinnant.github.io/date_algorithms.html#weekday_from_days
 @@ -81,21 +83,25 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr bool operator==(const weekday& __lhs, con
   return __lhs.c_encoding() == __rhs.c_encoding();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr weekday operator+(const weekday& __lhs, const days& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr weekday
+operator+(const weekday& __lhs, const days& __rhs) noexcept {
   auto const __mu = static_cast<long long>(__lhs.c_encoding()) + __rhs.count();
   auto const __yr = (__mu >= 0 ? __mu : __mu - 6) / 7;
   return weekday{static_cast<unsigned>(__mu - __yr * 7)};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr weekday operator+(const days& __lhs, const weekday& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr weekday
+operator+(const days& __lhs, const weekday& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr weekday operator-(const weekday& __lhs, const days& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr weekday
+operator-(const weekday& __lhs, const days& __rhs) noexcept {
   return __lhs + -__rhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr days operator-(const weekday& __lhs, const weekday& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr days
+operator-(const weekday& __lhs, const weekday& __rhs) noexcept {
   const int __wdu = __lhs.c_encoding() - __rhs.c_encoding();
   const int __wk  = (__wdu >= 0 ? __wdu : __wdu - 6) / 7;
   return days{__wdu - __wk * 7};
 @@ -120,9 +126,11 @@ public:
   weekday_indexed() = default;
   _LIBCPP_HIDE_FROM_ABI inline constexpr weekday_indexed(const chrono::weekday& __wdval, unsigned __idxval) noexcept
       : __wd_{__wdval}, __idx_(__idxval) {}
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wd_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wd_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr unsigned index() const noexcept { return __idx_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr unsigned index() const noexcept { return __idx_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __wd_.ok() && __idx_ >= 1 && __idx_ <= 5; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept {
+    return __wd_.ok() && __idx_ >= 1 && __idx_ <= 5;
+  }
 };
 _LIBCPP_HIDE_FROM_ABI inline constexpr bool
 @@ -136,8 +144,8 @@ private:
 public:
   _LIBCPP_HIDE_FROM_ABI explicit constexpr weekday_last(const chrono::weekday& __val) noexcept : __wd_{__val} {}
-  _LIBCPP_HIDE_FROM_ABI constexpr chrono::weekday weekday() const noexcept { return __wd_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr chrono::weekday weekday() const noexcept { return __wd_; }
-  _LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept { return __wd_.ok(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept { return __wd_.ok(); }
 };
 _LIBCPP_HIDE_FROM_ABI inline constexpr bool operator==(const weekday_last& __lhs, const weekday_last& __rhs) noexcept {
 @@ -166,19 +174,21 @@ inline constexpr weekday Saturday{6};
 template <>
 struct hash<chrono::weekday> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::weekday& __w) noexcept { return __w.c_encoding(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::weekday& __w) noexcept {
+    return __w.c_encoding();
+  }
 };
 template <>
 struct hash<chrono::weekday_indexed> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::weekday_indexed& __wi) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::weekday_indexed& __wi) noexcept {
     return std::__hash_combine(hash<chrono::weekday>{}(__wi.weekday()), __wi.index());
   }
 };
 template <>
 struct hash<chrono::weekday_last> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::weekday_last& __wl) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::weekday_last& __wl) noexcept {
     return hash<chrono::weekday>{}(__wl.weekday());
   }
 };

lib/libcxx/include/__chrono/year.h+13-11

 @@ -58,16 +58,16 @@ public:
   }
   _LIBCPP_HIDE_FROM_ABI constexpr year& operator+=(const years& __dy) noexcept;
   _LIBCPP_HIDE_FROM_ABI constexpr year& operator-=(const years& __dy) noexcept;
-  _LIBCPP_HIDE_FROM_ABI inline constexpr year operator+() const noexcept { return *this; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year operator+() const noexcept { return *this; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr year operator-() const noexcept { return year{-__y_}; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year operator-() const noexcept { return year{-__y_}; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool is_leap() const noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool is_leap() const noexcept {
     return __y_ % 4 == 0 && (__y_ % 100 != 0 || __y_ % 400 == 0);
   }
   _LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator int() const noexcept { return __y_; }
-  _LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept;
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept;
-  _LIBCPP_HIDE_FROM_ABI static inline constexpr year min() noexcept { return year{-32767}; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static inline constexpr year min() noexcept { return year{-32767}; }
-  _LIBCPP_HIDE_FROM_ABI static inline constexpr year max() noexcept { return year{32767}; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static inline constexpr year max() noexcept { return year{32767}; }
 };
 _LIBCPP_HIDE_FROM_ABI inline constexpr bool operator==(const year& __lhs, const year& __rhs) noexcept {
 @@ -78,19 +78,19 @@ _LIBCPP_HIDE_FROM_ABI constexpr strong_ordering operator<=>(const year& __lhs, c
   return static_cast<int>(__lhs) <=> static_cast<int>(__rhs);
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year operator+(const year& __lhs, const years& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year operator+(const year& __lhs, const years& __rhs) noexcept {
   return year(static_cast<int>(__lhs) + __rhs.count());
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year operator+(const years& __lhs, const year& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year operator+(const years& __lhs, const year& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year operator-(const year& __lhs, const years& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year operator-(const year& __lhs, const years& __rhs) noexcept {
   return __lhs + -__rhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr years operator-(const year& __lhs, const year& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr years operator-(const year& __lhs, const year& __rhs) noexcept {
   return years{static_cast<int>(__lhs) - static_cast<int>(__rhs)};
 }
 @@ -115,7 +115,9 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool year::ok() const noexcept {
 template <>
 struct hash<chrono::year> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year& __y) noexcept { return static_cast<int>(__y); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year& __y) noexcept {
+    return static_cast<int>(__y);
+  }
 };
 #  endif // _LIBCPP_STD_VER >= 26

lib/libcxx/include/__chrono/year_month.h+20-13

 @@ -36,20 +36,20 @@ public:
   year_month() = default;
   _LIBCPP_HIDE_FROM_ABI constexpr year_month(const chrono::year& __yval, const chrono::month& __mval) noexcept
       : __y_{__yval}, __m_{__mval} {}
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
   _LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const months& __dm) noexcept;
   _LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const months& __dm) noexcept;
   _LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator+=(const years& __dy) noexcept;
   _LIBCPP_HIDE_FROM_ABI inline constexpr year_month& operator-=(const years& __dy) noexcept;
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y_.ok() && __m_.ok(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y_.ok() && __m_.ok(); }
 };
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator/(const year& __y, const month& __m) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator/(const year& __y, const month& __m) noexcept {
   return year_month{__y, __m};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator/(const year& __y, int __m) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator/(const year& __y, int __m) noexcept {
   return year_month{__y, month(__m)};
 }
 @@ -64,35 +64,42 @@ operator<=>(const year_month& __lhs, const year_month& __rhs) noexcept {
   return __lhs.month() <=> __rhs.month();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator+(const year_month& __lhs, const months& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+operator+(const year_month& __lhs, const months& __rhs) noexcept {
   int __dmi      = static_cast<int>(static_cast<unsigned>(__lhs.month())) - 1 + __rhs.count();
   const int __dy = (__dmi >= 0 ? __dmi : __dmi - 11) / 12;
   __dmi          = __dmi - __dy * 12 + 1;
   return (__lhs.year() + years(__dy)) / month(static_cast<unsigned>(__dmi));
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator+(const months& __lhs, const year_month& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+operator+(const months& __lhs, const year_month& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator+(const year_month& __lhs, const years& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+operator+(const year_month& __lhs, const years& __rhs) noexcept {
   return (__lhs.year() + __rhs) / __lhs.month();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator+(const years& __lhs, const year_month& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+operator+(const years& __lhs, const year_month& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr months operator-(const year_month& __lhs, const year_month& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr months
+operator-(const year_month& __lhs, const year_month& __rhs) noexcept {
   return (__lhs.year() - __rhs.year()) +
          months(static_cast<unsigned>(__lhs.month()) - static_cast<unsigned>(__rhs.month()));
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator-(const year_month& __lhs, const months& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+operator-(const year_month& __lhs, const months& __rhs) noexcept {
   return __lhs + -__rhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month operator-(const year_month& __lhs, const years& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month
+operator-(const year_month& __lhs, const years& __rhs) noexcept {
   return __lhs + -__rhs;
 }
 @@ -122,7 +129,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr year_month& year_month::operator-=(const
 template <>
 struct hash<chrono::year_month> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month& __ym) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month& __ym) noexcept {
     return std::__hash_combine(hash<chrono::year>{}(__ym.year()), hash<chrono::month>{}(__ym.month()));
   }
 };

lib/libcxx/include/__chrono/year_month_day.h+45-34

 @@ -59,15 +59,15 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator+=(const years& __dy) noexcept;
   _LIBCPP_HIDE_FROM_ABI constexpr year_month_day& operator-=(const years& __dy) noexcept;
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::day day() const noexcept { return __d_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::day day() const noexcept { return __d_; }
   _LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{__to_days()}; }
   _LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept {
     return local_days{__to_days()};
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept;
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool ok() const noexcept;
   _LIBCPP_HIDE_FROM_ABI static constexpr year_month_day __from_days(days __d) noexcept;
   _LIBCPP_HIDE_FROM_ABI constexpr days __to_days() const noexcept;
 @@ -119,56 +119,62 @@ operator<=>(const year_month_day& __lhs, const year_month_day& __rhs) noexcept {
   return __lhs.day() <=> __rhs.day();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day operator/(const year_month& __lhs, const day& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+operator/(const year_month& __lhs, const day& __rhs) noexcept {
   return year_month_day{__lhs.year(), __lhs.month(), __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day operator/(const year_month& __lhs, int __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+operator/(const year_month& __lhs, int __rhs) noexcept {
   return __lhs / day(__rhs);
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day operator/(const year& __lhs, const month_day& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+operator/(const year& __lhs, const month_day& __rhs) noexcept {
   return __lhs / __rhs.month() / __rhs.day();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day operator/(int __lhs, const month_day& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+operator/(int __lhs, const month_day& __rhs) noexcept {
   return year(__lhs) / __rhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day operator/(const month_day& __lhs, const year& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+operator/(const month_day& __lhs, const year& __rhs) noexcept {
   return __rhs / __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day operator/(const month_day& __lhs, int __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+operator/(const month_day& __lhs, int __rhs) noexcept {
   return year(__rhs) / __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
 operator+(const year_month_day& __lhs, const months& __rhs) noexcept {
   return (__lhs.year() / __lhs.month() + __rhs) / __lhs.day();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
 operator+(const months& __lhs, const year_month_day& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
 operator-(const year_month_day& __lhs, const months& __rhs) noexcept {
   return __lhs + -__rhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
 operator+(const year_month_day& __lhs, const years& __rhs) noexcept {
   return (__lhs.year() + __rhs) / __lhs.month() / __lhs.day();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
 operator+(const years& __lhs, const year_month_day& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day
 operator-(const year_month_day& __lhs, const years& __rhs) noexcept {
   return __lhs + -__rhs;
 }
 @@ -204,17 +210,19 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator+=(const years& __y) noexcept;
   _LIBCPP_HIDE_FROM_ABI constexpr year_month_day_last& operator-=(const years& __y) noexcept;
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __mdl_.month(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __mdl_.month(); }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month_day_last month_day_last() const noexcept { return __mdl_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month_day_last month_day_last() const noexcept {
-  _LIBCPP_HIDE_FROM_ABI constexpr chrono::day day() const noexcept;
+    return __mdl_;
+  }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr chrono::day day() const noexcept;
   _LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept {
     return sys_days{year() / month() / day()};
   }
   _LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept {
     return local_days{year() / month() / day()};
   }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y_.ok() && __mdl_.ok(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y_.ok() && __mdl_.ok(); }
 };
 _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::day year_month_day_last::day() const noexcept {
 @@ -248,54 +256,57 @@ operator<=>(const year_month_day_last& __lhs, const year_month_day_last& __rhs)
   return __lhs.month_day_last() <=> __rhs.month_day_last();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last operator/(const year_month& __lhs, last_spec) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+operator/(const year_month& __lhs, last_spec) noexcept {
   return year_month_day_last{__lhs.year(), month_day_last{__lhs.month()}};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
 operator/(const year& __lhs, const month_day_last& __rhs) noexcept {
   return year_month_day_last{__lhs, __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last operator/(int __lhs, const month_day_last& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+operator/(int __lhs, const month_day_last& __rhs) noexcept {
   return year_month_day_last{year{__lhs}, __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
 operator/(const month_day_last& __lhs, const year& __rhs) noexcept {
   return __rhs / __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last operator/(const month_day_last& __lhs, int __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+operator/(const month_day_last& __lhs, int __rhs) noexcept {
   return year{__rhs} / __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
 operator+(const year_month_day_last& __lhs, const months& __rhs) noexcept {
   return (__lhs.year() / __lhs.month() + __rhs) / last;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
 operator+(const months& __lhs, const year_month_day_last& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
 operator-(const year_month_day_last& __lhs, const months& __rhs) noexcept {
   return __lhs + (-__rhs);
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
 operator+(const year_month_day_last& __lhs, const years& __rhs) noexcept {
   return year_month_day_last{__lhs.year() + __rhs, __lhs.month_day_last()};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
 operator+(const years& __lhs, const year_month_day_last& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_day_last
 operator-(const year_month_day_last& __lhs, const years& __rhs) noexcept {
   return __lhs + (-__rhs);
 }
 @@ -336,7 +347,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr bool year_month_day::ok() const noexcept
 template <>
 struct hash<chrono::year_month_day> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month_day& __ymd) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month_day& __ymd) noexcept {
     return std::__hash_combine(
         hash<chrono::year>{}(__ymd.year()),
         std::__hash_combine(hash<chrono::month>{}(__ymd.month()), hash<chrono::day>{}(__ymd.day())));
 @@ -345,7 +356,7 @@ struct hash<chrono::year_month_day> {
 template <>
 struct hash<chrono::year_month_day_last> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month_day_last& __ymdl) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month_day_last& __ymdl) noexcept {
     return std::__hash_combine(
         hash<chrono::year>{}(__ymdl.year()), hash<chrono::month_day_last>{}(__ymdl.month_day_last()));
   }

lib/libcxx/include/__chrono/year_month_weekday.h+47-35

 @@ -54,17 +54,21 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator+=(const years&) noexcept;
   _LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday& operator-=(const years&) noexcept;
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wdi_.weekday(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept {
-  _LIBCPP_HIDE_FROM_ABI inline constexpr unsigned index() const noexcept { return __wdi_.index(); }
+    return __wdi_.weekday();
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_indexed weekday_indexed() const noexcept { return __wdi_; }
+  }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr unsigned index() const noexcept { return __wdi_.index(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_indexed weekday_indexed() const noexcept {
+    return __wdi_;
+  }
   _LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{__to_days()}; }
   _LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept {
     return local_days{__to_days()};
   }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept {
     if (!__y_.ok() || !__m_.ok() || !__wdi_.ok())
       return false;
     if (__wdi_.index() <= 4)
 @@ -96,55 +100,57 @@ operator==(const year_month_weekday& __lhs, const year_month_weekday& __rhs) noe
          __lhs.weekday_indexed() == __rhs.weekday_indexed();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
 operator/(const year_month& __lhs, const weekday_indexed& __rhs) noexcept {
   return year_month_weekday{__lhs.year(), __lhs.month(), __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
 operator/(const year& __lhs, const month_weekday& __rhs) noexcept {
   return year_month_weekday{__lhs, __rhs.month(), __rhs.weekday_indexed()};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday operator/(int __lhs, const month_weekday& __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+operator/(int __lhs, const month_weekday& __rhs) noexcept {
   return year(__lhs) / __rhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
 operator/(const month_weekday& __lhs, const year& __rhs) noexcept {
   return __rhs / __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday operator/(const month_weekday& __lhs, int __rhs) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+operator/(const month_weekday& __lhs, int __rhs) noexcept {
   return year(__rhs) / __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
 operator+(const year_month_weekday& __lhs, const months& __rhs) noexcept {
   return (__lhs.year() / __lhs.month() + __rhs) / __lhs.weekday_indexed();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
 operator+(const months& __lhs, const year_month_weekday& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
 operator-(const year_month_weekday& __lhs, const months& __rhs) noexcept {
   return __lhs + (-__rhs);
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
 operator+(const year_month_weekday& __lhs, const years& __rhs) noexcept {
   return year_month_weekday{__lhs.year() + __rhs, __lhs.month(), __lhs.weekday_indexed()};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
 operator+(const years& __lhs, const year_month_weekday& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday
 operator-(const year_month_weekday& __lhs, const years& __rhs) noexcept {
   return __lhs + (-__rhs);
 }
 @@ -181,15 +187,21 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator+=(const years& __dy) noexcept;
   _LIBCPP_HIDE_FROM_ABI constexpr year_month_weekday_last& operator-=(const years& __dy) noexcept;
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::year year() const noexcept { return __y_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::month month() const noexcept { return __m_; }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept { return __wdl_.weekday(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday weekday() const noexcept {
-  _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_last weekday_last() const noexcept { return __wdl_; }
+    return __wdl_.weekday();
+  }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr chrono::weekday_last weekday_last() const noexcept {
+    return __wdl_;
+  }
   _LIBCPP_HIDE_FROM_ABI inline constexpr operator sys_days() const noexcept { return sys_days{__to_days()}; }
   _LIBCPP_HIDE_FROM_ABI inline explicit constexpr operator local_days() const noexcept {
     return local_days{__to_days()};
   }
-  _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __y_.ok() && __m_.ok() && __wdl_.ok(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept {
+    return __y_.ok() && __m_.ok() && __wdl_.ok();
+  }
   _LIBCPP_HIDE_FROM_ABI constexpr days __to_days() const noexcept;
 };
 @@ -204,57 +216,57 @@ operator==(const year_month_weekday_last& __lhs, const year_month_weekday_last&
   return __lhs.year() == __rhs.year() && __lhs.month() == __rhs.month() && __lhs.weekday_last() == __rhs.weekday_last();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator/(const year_month& __lhs, const weekday_last& __rhs) noexcept {
   return year_month_weekday_last{__lhs.year(), __lhs.month(), __rhs};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator/(const year& __lhs, const month_weekday_last& __rhs) noexcept {
   return year_month_weekday_last{__lhs, __rhs.month(), __rhs.weekday_last()};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator/(int __lhs, const month_weekday_last& __rhs) noexcept {
   return year(__lhs) / __rhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator/(const month_weekday_last& __lhs, const year& __rhs) noexcept {
   return __rhs / __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator/(const month_weekday_last& __lhs, int __rhs) noexcept {
   return year(__rhs) / __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator+(const year_month_weekday_last& __lhs, const months& __rhs) noexcept {
   return (__lhs.year() / __lhs.month() + __rhs) / __lhs.weekday_last();
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator+(const months& __lhs, const year_month_weekday_last& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator-(const year_month_weekday_last& __lhs, const months& __rhs) noexcept {
   return __lhs + (-__rhs);
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator+(const year_month_weekday_last& __lhs, const years& __rhs) noexcept {
   return year_month_weekday_last{__lhs.year() + __rhs, __lhs.month(), __lhs.weekday_last()};
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator+(const years& __lhs, const year_month_weekday_last& __rhs) noexcept {
   return __rhs + __lhs;
 }
-_LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr year_month_weekday_last
 operator-(const year_month_weekday_last& __lhs, const years& __rhs) noexcept {
   return __lhs + (-__rhs);
 }
 @@ -286,7 +298,7 @@ year_month_weekday_last::operator-=(const years& __dy) noexcept {
 template <>
 struct hash<chrono::year_month_weekday> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month_weekday& __ymw) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month_weekday& __ymw) noexcept {
     return std::__hash_combine(
         hash<chrono::year>{}(__ymw.year()),
         std::__hash_combine(
 @@ -296,7 +308,7 @@ struct hash<chrono::year_month_weekday> {
 template <>
 struct hash<chrono::year_month_weekday_last> {
-  _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month_weekday_last& __ymwl) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::year_month_weekday_last& __ymwl) noexcept {
     return std::__hash_combine(
         hash<chrono::year>{}(__ymwl.year()),
         std::__hash_combine(

lib/libcxx/include/__chrono/zoned_time.h+4-4

 @@ -40,10 +40,10 @@
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace chrono {
 template <class>
 @@ -232,11 +232,11 @@ struct hash<chrono::zoned_time<_Duration, _TimeZonePtr>> {
 #    endif // _LIBCPP_STD_VER >= 26
+_LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_TIME_ZONE_DATABASE && _LIBCPP_HAS_FILESYSTEM &&
          // _LIBCPP_HAS_LOCALIZATION
-_LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB

lib/libcxx/include/__compare/common_comparison_category.h+4-4

 @@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace __comp_detail {
 enum _ClassifyCompCategory : unsigned { _None, _PartialOrd, _WeakOrd, _StrongOrd, _CCC_Size };
 @@ -79,8 +79,8 @@ struct common_comparison_category {
 template <class... _Ts>
 using common_comparison_category_t = typename common_comparison_category<_Ts...>::type;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___COMPARE_COMMON_COMPARISON_CATEGORY_H

lib/libcxx/include/__compare/compare_three_way.h+4-4

 @@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 struct compare_three_way {
   template <class _T1, class _T2>
     requires three_way_comparable_with<_T1, _T2>
 @@ -33,8 +33,8 @@ struct compare_three_way {
   using is_transparent = void;
 };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___COMPARE_COMPARE_THREE_WAY_H

lib/libcxx/include/__compare/compare_three_way_result.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class, class, class>
 struct _LIBCPP_HIDE_FROM_ABI __compare_three_way_result {};
 @@ -39,8 +39,8 @@ struct _LIBCPP_NO_SPECIALIZATIONS compare_three_way_result : __compare_three_way
 template <class _Tp, class _Up = _Tp>
 using compare_three_way_result_t = typename compare_three_way_result<_Tp, _Up>::type;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H

lib/libcxx/include/__compare/ordering.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // exposition only
 enum class _OrdResult : signed char { __less = -1, __equiv = 0, __greater = 1 };
 @@ -275,8 +275,8 @@ template <class _Tp>
 concept __comparison_category =
     is_same_v<_Tp, partial_ordering> || is_same_v<_Tp, weak_ordering> || is_same_v<_Tp, strong_ordering>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___COMPARE_ORDERING_H

lib/libcxx/include/__compare/synth_three_way.h+4-4

 @@ -19,10 +19,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [expos.only.func]
 _LIBCPP_HIDE_FROM_ABI inline constexpr auto __synth_three_way = []<class _Tp, class _Up>(const _Tp& __t, const _Up& __u)
 @@ -46,8 +46,8 @@ template <class _Tp, class _Up = _Tp>
 using __synth_three_way_result _LIBCPP_NODEBUG =
     decltype(std::__synth_three_way(std::declval<_Tp&>(), std::declval<_Up&>()));
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___COMPARE_SYNTH_THREE_WAY_H

lib/libcxx/include/__compare/three_way_comparable.h+4-4

 @@ -24,10 +24,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, class _Cat>
 concept __compares_as = same_as<common_comparison_category_t<_Tp, _Cat>, _Cat>;
 @@ -48,8 +48,8 @@ concept three_way_comparable_with =
       { __u <=> __t } -> __compares_as<_Cat>;
     };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___COMPARE_THREE_WAY_COMPARABLE_H

lib/libcxx/include/__concepts/arithmetic.h+4-4

 @@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concepts.arithmetic], arithmetic concepts
 template <class _Tp>
 @@ -36,8 +36,8 @@ concept unsigned_integral = integral<_Tp> && !signed_integral<_Tp>;
 template <class _Tp>
 concept floating_point = is_floating_point_v<_Tp>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_ARITHMETIC_H

lib/libcxx/include/__concepts/assignable.h+4-4

 @@ -20,10 +20,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.assignable]
 template <class _Lhs, class _Rhs>
 @@ -34,8 +34,8 @@ concept assignable_from =
       { __lhs = std::forward<_Rhs>(__rhs) } -> same_as<_Lhs>;
     };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_ASSIGNABLE_H

lib/libcxx/include/__concepts/boolean_testable.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concepts.booleantestable]
 template <class _Tp>
 @@ -31,8 +31,8 @@ concept __boolean_testable = __boolean_testable_impl<_Tp> && requires(_Tp&& __t)
   { !std::forward<_Tp>(__t) } -> __boolean_testable_impl;
 };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H

lib/libcxx/include/__concepts/class_or_enum.h+4-4

 @@ -18,17 +18,17 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // Whether a type is a class type or enumeration type according to the Core wording.
 template <class _Tp>
 concept __class_or_enum = is_class_v<_Tp> || is_union_v<_Tp> || is_enum_v<_Tp>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H

lib/libcxx/include/__concepts/common_reference_with.h+4-4

 @@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.commonref]
 template <class _Tp, class _Up>
 @@ -29,8 +29,8 @@ concept common_reference_with =
     same_as<common_reference_t<_Tp, _Up>, common_reference_t<_Up, _Tp>> &&
     convertible_to<_Tp, common_reference_t<_Tp, _Up>> && convertible_to<_Up, common_reference_t<_Tp, _Up>>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_COMMON_REFERENCE_WITH_H

lib/libcxx/include/__concepts/comparison_common_type.h+4-4

 @@ -19,10 +19,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, class _Up, class _CommonRef = common_reference_t<const _Tp&, const _Up&>>
 concept __comparison_common_type_with_impl =
     same_as<common_reference_t<const _Tp&, const _Up&>, common_reference_t<const _Up&, const _Tp&>> && requires {
 @@ -33,8 +33,8 @@ concept __comparison_common_type_with_impl =
 template <class _Tp, class _Up>
 concept __comparison_common_type_with = __comparison_common_type_with_impl<remove_cvref_t<_Tp>, remove_cvref_t<_Up>>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_COMPARISON_COMMON_TYPE_H

lib/libcxx/include/__concepts/constructible.h+4-4

 @@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.constructible]
 template <class _Tp, class... _Args>
 concept constructible_from = destructible<_Tp> && is_constructible_v<_Tp, _Args...>;
 @@ -48,8 +48,8 @@ concept copy_constructible =
     constructible_from<_Tp, const _Tp> && convertible_to<const _Tp, _Tp>;
 // clang-format on
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H

lib/libcxx/include/__concepts/convertible_to.h+4-4

 @@ -17,17 +17,17 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.convertible]
 template <class _From, class _To>
 concept convertible_to = is_convertible_v<_From, _To> && requires { static_cast<_To>(std::declval<_From>()); };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H

lib/libcxx/include/__concepts/copyable.h+4-4

 @@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concepts.object]
 // clang-format off
 @@ -34,8 +34,8 @@ concept copyable =
     assignable_from<_Tp&, const _Tp>;
 // clang-format on
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_COPYABLE_H

lib/libcxx/include/__concepts/derived_from.h+4-4

 @@ -17,17 +17,17 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.derived]
 template <class _Dp, class _Bp>
 concept derived_from = is_base_of_v<_Bp, _Dp> && is_convertible_v<const volatile _Dp*, const volatile _Bp*>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_DERIVED_FROM_H

lib/libcxx/include/__concepts/destructible.h+4-4

 @@ -16,17 +16,17 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.destructible]
 template <class _Tp>
 concept destructible = is_nothrow_destructible_v<_Tp>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_DESTRUCTIBLE_H

lib/libcxx/include/__concepts/different_from.h+4-4

 @@ -17,15 +17,15 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, class _Up>
 concept __different_from = !same_as<remove_cvref_t<_Tp>, remove_cvref_t<_Up>>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_DIFFERENT_FROM_H

lib/libcxx/include/__concepts/equality_comparable.h+4-4

 @@ -20,10 +20,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.equalitycomparable]
 template <class _Tp, class _Up>
 @@ -50,8 +50,8 @@ concept equality_comparable_with =
     __weakly_equality_comparable_with<_Tp, _Up>;
 // clang-format on
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_EQUALITY_COMPARABLE_H

lib/libcxx/include/__concepts/invocable.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.invocable]
 template <class _Fn, class... _Args>
 @@ -33,8 +33,8 @@ concept invocable = requires(_Fn&& __fn, _Args&&... __args) {
 template <class _Fn, class... _Args>
 concept regular_invocable = invocable<_Fn, _Args...>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_INVOCABLE_H

lib/libcxx/include/__concepts/movable.h+4-4

 @@ -19,17 +19,17 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concepts.object]
 template <class _Tp>
 concept movable = is_object_v<_Tp> && move_constructible<_Tp> && assignable_from<_Tp&, _Tp> && swappable<_Tp>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_MOVABLE_H

lib/libcxx/include/__concepts/predicate.h+4-4

 @@ -18,17 +18,17 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.predicate]
 template <class _Fn, class... _Args>
 concept predicate = regular_invocable<_Fn, _Args...> && __boolean_testable<invoke_result_t<_Fn, _Args...>>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_PREDICATE_H

lib/libcxx/include/__concepts/primary_template.h created+33

...	@@ -0,0 +1,33 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
10	#define _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
11
12	#include <__config>
13	#include <__type_traits/is_same.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	#if _LIBCPP_STD_VER >= 20
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	template <class _Tp>
24	concept __primary_template = requires {
25	typename _Tp::__primary_template;
26	requires _IsSame<typename _Tp::__primary_template, _Tp>::value;
27	};
28
29	_LIBCPP_END_NAMESPACE_STD
30
31	#endif // _LIBCPP_STD_VER >= 20
32
33	#endif // _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H

lib/libcxx/include/__concepts/referenceable.h created+30

...	@@ -0,0 +1,30 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H
10	#define _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H
11
12	#include <__config>
13	#include <__type_traits/void_t.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	#if _LIBCPP_STD_VER >= 20
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	template <class _Tp>
24	concept __referenceable = requires { typename __void_t<_Tp&>; };
25
26	_LIBCPP_END_NAMESPACE_STD
27
28	#endif
29
30	#endif // _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H

lib/libcxx/include/__concepts/regular.h+4-4

 @@ -17,17 +17,17 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.object]
 template <class _Tp>
 concept regular = semiregular<_Tp> && equality_comparable<_Tp>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_REGULAR_H

lib/libcxx/include/__concepts/relation.h+4-4

 @@ -16,10 +16,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.relation]
 template <class _Rp, class _Tp, class _Up>
 @@ -36,8 +36,8 @@ concept equivalence_relation = relation<_Rp, _Tp, _Up>;
 template <class _Rp, class _Tp, class _Up>
 concept strict_weak_order = relation<_Rp, _Tp, _Up>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_RELATION_H

lib/libcxx/include/__concepts/same_as.h+4-4

 @@ -16,10 +16,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.same]
 template <class _Tp, class _Up>
 @@ -28,8 +28,8 @@ concept __same_as_impl = _IsSame<_Tp, _Up>::value;
 template <class _Tp, class _Up>
 concept same_as = __same_as_impl<_Tp, _Up> && __same_as_impl<_Up, _Tp>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_SAME_AS_H

lib/libcxx/include/__concepts/semiregular.h+4-4

 @@ -17,17 +17,17 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.object]
 template <class _Tp>
 concept semiregular = copyable<_Tp> && default_initializable<_Tp>;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_SEMIREGULAR_H

lib/libcxx/include/__concepts/swappable.h+4-4

 @@ -30,10 +30,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.swappable]
 namespace ranges {
 @@ -113,10 +113,10 @@ concept swappable_with = common_reference_with<_Tp, _Up> && requires(_Tp&& __t,
   ranges::swap(std::forward<_Up>(__u), std::forward<_Tp>(__t));
 };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___CONCEPTS_SWAPPABLE_H

lib/libcxx/include/__concepts/totally_ordered.h+4-4

 @@ -19,10 +19,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [concept.totallyordered]
 template <class _Tp, class _Up>
 @@ -52,8 +52,8 @@ concept totally_ordered_with =
     __partially_ordered_with<_Tp, _Up>;
 // clang-format on
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___CONCEPTS_TOTALLY_ORDERED_H

lib/libcxx/include/__condition_variable/condition_variable.h+6-4

 @@ -31,10 +31,11 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_HAS_THREADS
+_LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 // enum class cv_status
 _LIBCPP_DECLARE_STRONG_ENUM(cv_status){no_timeout, timeout};
 _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(cv_status)
 @@ -223,10 +224,11 @@ inline void condition_variable::__do_timed_wait(unique_lock<mutex>& __lk,
   wait_for(__lk, __tp - _Clock::now());
 }
-#endif // _LIBCPP_HAS_THREADS
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_HAS_THREADS
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___CONDITION_VARIABLE_CONDITION_VARIABLE_H

lib/libcxx/include/__config+32-697

...	@@ -25,61 +25,30 @@	...	@@ -25,61 +25,30 @@
25		25
26	#ifdef __cplusplus	26	#ifdef __cplusplus
27		27
		28	# include <__configuration/abi.h>
		29	# include <__configuration/attributes.h>
		30	# include <__configuration/availability.h>
		31	# include <__configuration/compiler.h>
		32	# include <__configuration/diagnostic_suppression.h>
		33	# include <__configuration/experimental.h>
		34	# include <__configuration/hardening.h>
		35	# include <__configuration/language.h>
		36	# include <__configuration/namespace.h>
		37	# include <__configuration/platform.h>
		38	# include <__configuration/pstl.h>
		39	# include <__configuration/utility.h>
		40
28	// The attributes supported by clang are documented at https://clang.llvm.org/docs/AttributeReference.html	41	// The attributes supported by clang are documented at https://clang.llvm.org/docs/AttributeReference.html
29		42
30	// _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM.	43	// _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM.
31	// Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 17.0.1 == 17.00.01), _LIBCPP_VERSION is	44	// Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 17.0.1 == 17.00.01), _LIBCPP_VERSION is
32	// defined to XXYYZZ.	45	// defined to XXYYZZ.
33	# define _LIBCPP_VERSION 220108	46	# define _LIBCPP_VERSION 230100
34
35	# define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y
36	# define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y)
37	# define _LIBCPP_CONCAT3(X, Y, Z) _LIBCPP_CONCAT(X, _LIBCPP_CONCAT(Y, Z))
38
39	# if __STDC_HOSTED__ == 0
40	# define _LIBCPP_FREESTANDING
41	# endif
42
43	# define _LIBCPP_TOSTRING2(x) #x
44	# define _LIBCPP_TOSTRING(x) _LIBCPP_TOSTRING2(x)
45
46	# ifndef __has_constexpr_builtin
47	# define __has_constexpr_builtin(x) 0
48	# endif
49
50	// This checks wheter a Clang module is built
51	# ifndef __building_module
52	# define __building_module(...) 0
53	# endif
54
55	// '__is_identifier' returns '0' if '__x' is a reserved identifier provided by
56	// the compiler and '1' otherwise.
57	# ifndef __is_identifier
58	# define __is_identifier(__x) 1
59	# endif
60
61	# ifndef __has_declspec_attribute
62	# define __has_declspec_attribute(__x) 0
63	# endif
64
65	# define __has_keyword(__x) !(__is_identifier(__x))
66
67	# ifndef __has_warning
68	# define __has_warning(...) 0
69	# endif
70
71	# if !defined(_LIBCPP_COMPILER_CLANG_BASED) && __cplusplus < 201103L
72	# error "libc++ only supports C++03 with Clang-based compilers. Please enable C++11"
73	# endif
74		47
75	# if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)	48	# if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_NO_VCRUNTIME)
76	# define _LIBCPP_ABI_VCRUNTIME	49	# define _LIBCPP_ABI_VCRUNTIME
77	# endif	50	# endif
78		51
79	# if defined(__MVS__)
80	# include <features.h> // for __NATIVE_ASCII_F
81	# endif
82
83	# if defined(_WIN32)	52	# if defined(_WIN32)
84	# define _LIBCPP_WIN32API	53	# define _LIBCPP_WIN32API
85	# define _LIBCPP_SHORT_WCHAR 1	54	# define _LIBCPP_SHORT_WCHAR 1
...	@@ -90,15 +59,9 @@	...	@@ -90,15 +59,9 @@
90	# if defined(_MSC_VER) && !defined(__MINGW32__)	59	# if defined(_MSC_VER) && !defined(__MINGW32__)
91	# define _LIBCPP_MSVCRT // Using Microsoft's C Runtime library	60	# define _LIBCPP_MSVCRT // Using Microsoft's C Runtime library
92	# endif	61	# endif
93	# if (defined(_M_AMD64) \|\| defined(__x86_64__)) \|\| (defined(_M_ARM) \|\| defined(__arm__))
94	# define _LIBCPP_HAS_BITSCAN64 1
95	# else
96	# define _LIBCPP_HAS_BITSCAN64 0
97	# endif
98	# define _LIBCPP_HAS_OPEN_WITH_WCHAR 1	62	# define _LIBCPP_HAS_OPEN_WITH_WCHAR 1
99	# else	63	# else
100	# define _LIBCPP_HAS_OPEN_WITH_WCHAR 0	64	# define _LIBCPP_HAS_OPEN_WITH_WCHAR 0
101	# define _LIBCPP_HAS_BITSCAN64 0
102	# endif // defined(_WIN32)	65	# endif // defined(_WIN32)
103		66
104	# if defined(_AIX) && !defined(__64BIT__)	67	# if defined(_AIX) && !defined(__64BIT__)
...	@@ -184,259 +147,6 @@ typedef __char32_t char32_t;	...	@@ -184,259 +147,6 @@ typedef __char32_t char32_t;
184	# define _LIBCPP_HAS_BLOCKS_RUNTIME 0	147	# define _LIBCPP_HAS_BLOCKS_RUNTIME 0
185	# endif	148	# endif
186		149
187	# define _LIBCPP_ALWAYS_INLINE __attribute__((__always_inline__))
188
189	# if defined(_LIBCPP_OBJECT_FORMAT_COFF)
190
191	# ifdef _DLL
192	# define _LIBCPP_CRT_FUNC __declspec(dllimport)
193	# else
194	# define _LIBCPP_CRT_FUNC
195	# endif
196
197	# if defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) \|\| (defined(__MINGW32__) && !defined(_LIBCPP_BUILDING_LIBRARY))
198	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
199	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
200	# define _LIBCPP_OVERRIDABLE_FUNC_VIS
201	# define _LIBCPP_EXPORTED_FROM_ABI
202	# elif defined(_LIBCPP_BUILDING_LIBRARY)
203	# if defined(__MINGW32__)
204	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __declspec(dllexport)
205	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
206	# else
207	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
208	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS __declspec(dllexport)
209	# endif
210	# define _LIBCPP_OVERRIDABLE_FUNC_VIS __declspec(dllexport)
211	# define _LIBCPP_EXPORTED_FROM_ABI __declspec(dllexport)
212	# else
213	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __declspec(dllimport)
214	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
215	# define _LIBCPP_OVERRIDABLE_FUNC_VIS
216	# define _LIBCPP_EXPORTED_FROM_ABI __declspec(dllimport)
217	# endif
218
219	# define _LIBCPP_HIDDEN
220	# define _LIBCPP_TEMPLATE_DATA_VIS
221	# define _LIBCPP_NAMESPACE_VISIBILITY
222
223	# else
224
225	# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
226	# define _LIBCPP_VISIBILITY(vis) __attribute__((__visibility__(vis)))
227	# else
228	# define _LIBCPP_VISIBILITY(vis)
229	# endif
230
231	# define _LIBCPP_HIDDEN _LIBCPP_VISIBILITY("hidden")
232	# define _LIBCPP_TEMPLATE_DATA_VIS _LIBCPP_VISIBILITY("default")
233	# define _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_VISIBILITY("default")
234	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS _LIBCPP_VISIBILITY("default")
235	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
236
237	// TODO: Make this a proper customization point or remove the option to override it.
238	# ifndef _LIBCPP_OVERRIDABLE_FUNC_VIS
239	# define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_VISIBILITY("default")
240	# endif
241
242	# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__)
243	# define _LIBCPP_NAMESPACE_VISIBILITY __attribute__((__type_visibility__("default")))
244	# elif !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
245	# define _LIBCPP_NAMESPACE_VISIBILITY __attribute__((__visibility__("default")))
246	# else
247	# define _LIBCPP_NAMESPACE_VISIBILITY
248	# endif
249
250	# endif // defined(_LIBCPP_OBJECT_FORMAT_COFF)
251
252	# if __has_attribute(exclude_from_explicit_instantiation)
253	# define _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION __attribute__((__exclude_from_explicit_instantiation__))
254	# else
255	// Try to approximate the effect of exclude_from_explicit_instantiation
256	// (which is that entities are not assumed to be provided by explicit
257	// template instantiations in the dylib) by always inlining those entities.
258	# define _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION _LIBCPP_ALWAYS_INLINE
259	# endif
260
261	# ifdef _LIBCPP_COMPILER_CLANG_BASED
262	# define _LIBCPP_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
263	# define _LIBCPP_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
264	# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED(str) _Pragma(_LIBCPP_TOSTRING(clang diagnostic ignored str))
265	# define _LIBCPP_GCC_DIAGNOSTIC_IGNORED(str)
266	# elif defined(_LIBCPP_COMPILER_GCC)
267	# define _LIBCPP_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
268	# define _LIBCPP_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
269	# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED(str)
270	# define _LIBCPP_GCC_DIAGNOSTIC_IGNORED(str) _Pragma(_LIBCPP_TOSTRING(GCC diagnostic ignored str))
271	# else
272	# define _LIBCPP_DIAGNOSTIC_PUSH
273	# define _LIBCPP_DIAGNOSTIC_POP
274	# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED(str)
275	# define _LIBCPP_GCC_DIAGNOSTIC_IGNORED(str)
276	# endif
277
278	// Macros to enter and leave a state where deprecation warnings are suppressed.
279	# define _LIBCPP_SUPPRESS_DEPRECATED_PUSH \
280	_LIBCPP_DIAGNOSTIC_PUSH _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated") \
281	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations")
282	# define _LIBCPP_SUPPRESS_DEPRECATED_POP _LIBCPP_DIAGNOSTIC_POP
283
284	# if _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_FAST
285	# define _LIBCPP_HARDENING_SIG f
286	# elif _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_EXTENSIVE
287	# define _LIBCPP_HARDENING_SIG s
288	# elif _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
289	# define _LIBCPP_HARDENING_SIG d
290	# else
291	# define _LIBCPP_HARDENING_SIG n // "none"
292	# endif
293
294	# if _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_OBSERVE
295	# define _LIBCPP_ASSERTION_SEMANTIC_SIG o
296	# elif _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_QUICK_ENFORCE
297	# define _LIBCPP_ASSERTION_SEMANTIC_SIG q
298	# elif _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_ENFORCE
299	# define _LIBCPP_ASSERTION_SEMANTIC_SIG e
300	# else
301	# define _LIBCPP_ASSERTION_SEMANTIC_SIG i // `ignore`
302	# endif
303
304	# if !_LIBCPP_HAS_EXCEPTIONS
305	# define _LIBCPP_EXCEPTIONS_SIG n
306	# else
307	# define _LIBCPP_EXCEPTIONS_SIG e
308	# endif
309
310	# define _LIBCPP_ODR_SIGNATURE \
311	_LIBCPP_CONCAT( \
312	_LIBCPP_CONCAT(_LIBCPP_CONCAT(_LIBCPP_HARDENING_SIG, _LIBCPP_ASSERTION_SEMANTIC_SIG), _LIBCPP_EXCEPTIONS_SIG), \
313	_LIBCPP_VERSION)
314
315	// This macro marks a symbol as being hidden from libc++'s ABI. This is achieved
316	// on two levels:
317	// 1. The symbol is given hidden visibility, which ensures that users won't start exporting
318	// symbols from their dynamic library by means of using the libc++ headers. This ensures
319	// that those symbols stay private to the dynamic library in which it is defined.
320	//
321	// 2. The symbol is given an ABI tag that encodes the ODR-relevant properties of the library.
322	// This ensures that no ODR violation can arise from mixing two TUs compiled with different
323	// versions or configurations of libc++ (such as exceptions vs no-exceptions). Indeed, if the
324	// program contains two definitions of a function, the ODR requires them to be token-by-token
325	// equivalent, and the linker is allowed to pick either definition and discard the other one.
326	//
327	// For example, if a program contains a copy of `vector::at()` compiled with exceptions enabled
328	// and a copy of `vector::at()` compiled with exceptions disabled (by means of having two TUs
329	// compiled with different settings), the two definitions are both visible by the linker and they
330	// have the same name, but they have a meaningfully different implementation (one throws an exception
331	// and the other aborts the program). This violates the ODR and makes the program ill-formed, and in
332	// practice what will happen is that the linker will pick one of the definitions at random and will
333	// discard the other one. This can quite clearly lead to incorrect program behavior.
334	//
335	// A similar reasoning holds for many other properties that are ODR-affecting. Essentially any
336	// property that causes the code of a function to differ from the code in another configuration
337	// can be considered ODR-affecting. In practice, we don't encode all such properties in the ABI
338	// tag, but we encode the ones that we think are most important: library version, exceptions, and
339	// hardening mode.
340	//
341	// Note that historically, solving this problem has been achieved in various ways, including
342	// force-inlining all functions or giving internal linkage to all functions. Both these previous
343	// solutions suffer from drawbacks that lead notably to code bloat.
344	//
345	// Note that we use _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION to ensure that we don't depend
346	// on _LIBCPP_HIDE_FROM_ABI methods of classes explicitly instantiated in the dynamic library.
347	//
348	// Also note that the _LIBCPP_HIDE_FROM_ABI_VIRTUAL macro should be used on virtual functions
349	// instead of _LIBCPP_HIDE_FROM_ABI. That macro does not use an ABI tag. Indeed, the mangled
350	// name of a virtual function is part of its ABI, since some architectures like arm64e can sign
351	// the virtual function pointer in the vtable based on the mangled name of the function. Since
352	// we use an ABI tag that changes with each released version, the mangled name of the virtual
353	// function would change, which is incorrect. Note that it doesn't make much sense to change
354	// the implementation of a virtual function in an ABI-incompatible way in the first place,
355	// since that would be an ABI break anyway. Hence, the lack of ABI tag should not be noticeable.
356	//
357	// The macro can be applied to record and enum types. When the tagged type is nested in
358	// a record this "parent" record needs to have the macro too. Another use case for applying
359	// this macro to records and unions is to apply an ABI tag to inline constexpr variables.
360	// This can be useful for inline variables that are implementation details which are expected
361	// to change in the future.
362	//
363	// TODO: We provide a escape hatch with _LIBCPP_NO_ABI_TAG for folks who want to avoid increasing
364	// the length of symbols with an ABI tag. In practice, we should remove the escape hatch and
365	// use compression mangling instead, see https://github.com/itanium-cxx-abi/cxx-abi/issues/70.
366	# ifndef _LIBCPP_NO_ABI_TAG
367	# define _LIBCPP_HIDE_FROM_ABI \
368	_LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION \
369	__attribute__((__abi_tag__(_LIBCPP_TOSTRING(_LIBCPP_ODR_SIGNATURE))))
370	# else
371	# define _LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION
372	# endif
373	# define _LIBCPP_HIDE_FROM_ABI_VIRTUAL _LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION
374
375	// Clang modules take a significant compile time hit when pushing and popping diagnostics.
376	// Since all the headers are marked as system headers unless _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER is defined, we can
377	// simply disable this pushing and popping when _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER isn't defined.
378	# ifdef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
379	# define _LIBCPP_PUSH_EXTENSION_DIAGNOSTICS \
380	_LIBCPP_DIAGNOSTIC_PUSH \
381	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++11-extensions") \
382	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++14-extensions") \
383	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++17-extensions") \
384	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++20-extensions") \
385	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++23-extensions") \
386	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wc++14-extensions") \
387	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wc++17-extensions") \
388	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wc++20-extensions") \
389	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wc++23-extensions")
390	# define _LIBCPP_POP_EXTENSION_DIAGNOSTICS _LIBCPP_DIAGNOSTIC_POP
391	# else
392	# define _LIBCPP_PUSH_EXTENSION_DIAGNOSTICS
393	# define _LIBCPP_POP_EXTENSION_DIAGNOSTICS
394	# endif
395
396	// clang-format off
397
398	// The unversioned namespace is used when we want to be ABI compatible with other standard libraries in some way. There
399	// are two main categories where that's the case:
400	// - Historically, we have made exception types ABI compatible with libstdc++ to allow throwing them between libstdc++
401	// and libc++. This is not used anymore for new exception types, since there is no use-case for it anymore.
402	// - Types and functions which are used by the compiler are in the unversioned namespace, since the compiler has to know
403	// their mangling without the appropriate declaration in some cases.
404	// If it's not clear whether using the unversioned namespace is the correct thing to do, it's not. The versioned
405	// namespace (_LIBCPP_BEGIN_NAMESPACE_STD) should almost always be used.
406	# define _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD \
407	_LIBCPP_PUSH_EXTENSION_DIAGNOSTICS namespace _LIBCPP_NAMESPACE_VISIBILITY std {
408
409	# define _LIBCPP_END_UNVERSIONED_NAMESPACE_STD } _LIBCPP_POP_EXTENSION_DIAGNOSTICS
410
411	# define _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD inline namespace _LIBCPP_ABI_NAMESPACE {
412	# define _LIBCPP_END_NAMESPACE_STD } _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
413
414	// TODO: This should really be in the versioned namespace
415	#define _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD namespace experimental {
416	#define _LIBCPP_END_NAMESPACE_EXPERIMENTAL } _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
417
418	#define _LIBCPP_BEGIN_NAMESPACE_LFTS _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL inline namespace fundamentals_v1 {
419	#define _LIBCPP_END_NAMESPACE_LFTS } _LIBCPP_END_NAMESPACE_EXPERIMENTAL
420
421	#define _LIBCPP_BEGIN_NAMESPACE_LFTS_V2 _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL inline namespace fundamentals_v2 {
422	#define _LIBCPP_END_NAMESPACE_LFTS_V2 } _LIBCPP_END_NAMESPACE_EXPERIMENTAL
423
424	#ifdef _LIBCPP_ABI_NO_FILESYSTEM_INLINE_NAMESPACE
425	# define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM _LIBCPP_BEGIN_NAMESPACE_STD namespace filesystem {
426	# define _LIBCPP_END_NAMESPACE_FILESYSTEM } _LIBCPP_END_NAMESPACE_STD
427	#else
428	# define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM _LIBCPP_BEGIN_NAMESPACE_STD \
429	inline namespace __fs { namespace filesystem {
430
431	# define _LIBCPP_END_NAMESPACE_FILESYSTEM }} _LIBCPP_END_NAMESPACE_STD
432	#endif
433
434	// clang-format on
435
436	# if __has_attribute(__enable_if__)
437	# define _LIBCPP_PREFERRED_OVERLOAD __attribute__((__enable_if__(true, "")))
438	# endif
439
440	# if !defined(__SIZEOF_INT128__) \|\| defined(_MSC_VER)	150	# if !defined(__SIZEOF_INT128__) \|\| defined(_MSC_VER)
441	# define _LIBCPP_HAS_INT128 0	151	# define _LIBCPP_HAS_INT128 0
442	# else	152	# else
...	@@ -488,34 +198,14 @@ typedef __char32_t char32_t;	...	@@ -488,34 +198,14 @@ typedef __char32_t char32_t;
488	# endif	198	# endif
489	# endif	199	# endif
490		200
491	# if defined(__APPLE__) \|\| defined(__FreeBSD__)	201	# if !_LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION \|\| (!defined(__cpp_aligned_new) \|\| __cpp_aligned_new < 201606)
492	# define _LIBCPP_WCTYPE_IS_MASK	202	# define _LIBCPP_HAS_ALIGNED_ALLOCATION 0
493	# endif
494
495	# if _LIBCPP_STD_VER <= 17 \|\| !defined(__cpp_char8_t)
496	# define _LIBCPP_HAS_CHAR8_T 0
497	# else	203	# else
498	# define _LIBCPP_HAS_CHAR8_T 1	204	# define _LIBCPP_HAS_ALIGNED_ALLOCATION 1
499	# endif	205	# endif
500		206
501	// Deprecation macros.	207	# if defined(__APPLE__) \|\| defined(__FreeBSD__)
502	//	208	# define _LIBCPP_WCTYPE_IS_MASK
503	// Deprecations warnings are always enabled, except when users explicitly opt-out
504	// by defining _LIBCPP_DISABLE_DEPRECATION_WARNINGS.
505	# if !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
506	# if __has_attribute(__deprecated__)
507	# define _LIBCPP_DEPRECATED __attribute__((__deprecated__))
508	# define _LIBCPP_DEPRECATED_(m) __attribute__((__deprecated__(m)))
509	# elif _LIBCPP_STD_VER >= 14
510	# define _LIBCPP_DEPRECATED [[deprecated]]
511	# define _LIBCPP_DEPRECATED_(m) [[deprecated(m)]]
512	# else
513	# define _LIBCPP_DEPRECATED
514	# define _LIBCPP_DEPRECATED_(m)
515	# endif
516	# else
517	# define _LIBCPP_DEPRECATED
518	# define _LIBCPP_DEPRECATED_(m)
519	# endif	209	# endif
520		210
521	// FIXME: using `#warning` causes diagnostics from system headers which include deprecated headers. This can only be	211	// FIXME: using `#warning` causes diagnostics from system headers which include deprecated headers. This can only be
...	@@ -527,102 +217,13 @@ typedef __char32_t char32_t;	...	@@ -527,102 +217,13 @@ typedef __char32_t char32_t;
527	# define _LIBCPP_DIAGNOSE_DEPRECATED_HEADERS 0	217	# define _LIBCPP_DIAGNOSE_DEPRECATED_HEADERS 0
528	# endif	218	# endif
529		219
530	# if !defined(_LIBCPP_CXX03_LANG)
531	# define _LIBCPP_DEPRECATED_IN_CXX11 _LIBCPP_DEPRECATED
532	# else
533	# define _LIBCPP_DEPRECATED_IN_CXX11
534	# endif
535
536	# if _LIBCPP_STD_VER >= 14
537	# define _LIBCPP_DEPRECATED_IN_CXX14 _LIBCPP_DEPRECATED
538	# else
539	# define _LIBCPP_DEPRECATED_IN_CXX14
540	# endif
541
542	# if _LIBCPP_STD_VER >= 17
543	# define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED
544	# else
545	# define _LIBCPP_DEPRECATED_IN_CXX17
546	# endif
547
548	# if _LIBCPP_STD_VER >= 20
549	# define _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_DEPRECATED
550	# else
551	# define _LIBCPP_DEPRECATED_IN_CXX20
552	# endif
553
554	# if _LIBCPP_STD_VER >= 23
555	# define _LIBCPP_DEPRECATED_IN_CXX23 _LIBCPP_DEPRECATED
556	# else
557	# define _LIBCPP_DEPRECATED_IN_CXX23
558	# endif
559
560	# if _LIBCPP_STD_VER >= 26
561	# define _LIBCPP_DEPRECATED_IN_CXX26 _LIBCPP_DEPRECATED
562	# define _LIBCPP_DEPRECATED_IN_CXX26_(m) _LIBCPP_DEPRECATED_(m)
563	# else
564	# define _LIBCPP_DEPRECATED_IN_CXX26
565	# define _LIBCPP_DEPRECATED_IN_CXX26_(m)
566	# endif
567
568	# if _LIBCPP_HAS_CHAR8_T
569	# define _LIBCPP_DEPRECATED_WITH_CHAR8_T _LIBCPP_DEPRECATED
570	# else
571	# define _LIBCPP_DEPRECATED_WITH_CHAR8_T
572	# endif
573
574	# if _LIBCPP_STD_VER <= 11
575	# define _LIBCPP_EXPLICIT_SINCE_CXX14
576	# else
577	# define _LIBCPP_EXPLICIT_SINCE_CXX14 explicit
578	# endif
579
580	# if _LIBCPP_STD_VER >= 23
581	# define _LIBCPP_EXPLICIT_SINCE_CXX23 explicit
582	# else
583	# define _LIBCPP_EXPLICIT_SINCE_CXX23
584	# endif
585
586	# if _LIBCPP_STD_VER >= 14
587	# define _LIBCPP_CONSTEXPR_SINCE_CXX14 constexpr
588	# else
589	# define _LIBCPP_CONSTEXPR_SINCE_CXX14
590	# endif
591
592	# if _LIBCPP_STD_VER >= 17
593	# define _LIBCPP_CONSTEXPR_SINCE_CXX17 constexpr
594	# else
595	# define _LIBCPP_CONSTEXPR_SINCE_CXX17
596	# endif
597
598	# if _LIBCPP_STD_VER >= 20
599	# define _LIBCPP_CONSTEXPR_SINCE_CXX20 constexpr
600	# else
601	# define _LIBCPP_CONSTEXPR_SINCE_CXX20
602	# endif
603
604	# if _LIBCPP_STD_VER >= 23
605	# define _LIBCPP_CONSTEXPR_SINCE_CXX23 constexpr
606	# else
607	# define _LIBCPP_CONSTEXPR_SINCE_CXX23
608	# endif
609
610	# if _LIBCPP_STD_VER >= 26
611	# define _LIBCPP_CONSTEXPR_SINCE_CXX26 constexpr
612	# else
613	# define _LIBCPP_CONSTEXPR_SINCE_CXX26
614	# endif
615
616	# ifndef _LIBCPP_WEAK
617	# define _LIBCPP_WEAK __attribute__((__weak__))
618	# endif
619
620	// Thread API	220	// Thread API
621	// clang-format off	221	// clang-format off
622	# if _LIBCPP_HAS_THREADS && \	222	# if _LIBCPP_HAS_THREADS && \
623	!_LIBCPP_HAS_THREAD_API_PTHREAD && \	223	!_LIBCPP_HAS_THREAD_API_PTHREAD && \
624	!_LIBCPP_HAS_THREAD_API_WIN32 && \	224	!_LIBCPP_HAS_THREAD_API_WIN32 && \
625	!_LIBCPP_HAS_THREAD_API_EXTERNAL	225	!_LIBCPP_HAS_THREAD_API_EXTERNAL && \
		226	!_LIBCPP_HAS_THREAD_API_C11
626		227
627	# if defined(__FreeBSD__) \|\| \	228	# if defined(__FreeBSD__) \|\| \
628	defined(__wasi__) \|\| \	229	defined(__wasi__) \|\| \
...	@@ -634,7 +235,11 @@ typedef __char32_t char32_t;	...	@@ -634,7 +235,11 @@ typedef __char32_t char32_t;
634	defined(__APPLE__) \|\| \	235	defined(__APPLE__) \|\| \
635	defined(__MVS__) \|\| \	236	defined(__MVS__) \|\| \
636	defined(_AIX) \|\| \	237	defined(_AIX) \|\| \
637	defined(__EMSCRIPTEN__)	238	defined(__EMSCRIPTEN__) \|\| \
		239	defined(__HAIKU__) \|\| \
		240	defined(__serenity__)
		241	// zig patch: haiku support
		242	// zig patch: serenity support
638	// clang-format on	243	// clang-format on
639	# undef _LIBCPP_HAS_THREAD_API_PTHREAD	244	# undef _LIBCPP_HAS_THREAD_API_PTHREAD
640	# define _LIBCPP_HAS_THREAD_API_PTHREAD 1	245	# define _LIBCPP_HAS_THREAD_API_PTHREAD 1
...	@@ -666,6 +271,10 @@ typedef __char32_t char32_t;	...	@@ -666,6 +271,10 @@ typedef __char32_t char32_t;
666	# error _LIBCPP_HAS_THREAD_API_EXTERNAL may only be true when _LIBCPP_HAS_THREADS is true.	271	# error _LIBCPP_HAS_THREAD_API_EXTERNAL may only be true when _LIBCPP_HAS_THREADS is true.
667	# endif	272	# endif
668		273
		274	# if !_LIBCPP_HAS_THREADS && _LIBCPP_HAS_THREAD_API_C11
		275	# error _LIBCPP_HAS_THREAD_API_C11 may only be true when _LIBCPP_HAS_THREADS is true.
		276	# endif
		277
669	# if !_LIBCPP_HAS_MONOTONIC_CLOCK && _LIBCPP_HAS_THREADS	278	# if !_LIBCPP_HAS_MONOTONIC_CLOCK && _LIBCPP_HAS_THREADS
670	# error _LIBCPP_HAS_MONOTONIC_CLOCK may only be false when _LIBCPP_HAS_THREADS is false.	279	# error _LIBCPP_HAS_MONOTONIC_CLOCK may only be false when _LIBCPP_HAS_THREADS is false.
671	# endif	280	# endif
...	@@ -708,61 +317,12 @@ typedef __char32_t char32_t;	...	@@ -708,61 +317,12 @@ typedef __char32_t char32_t;
708	# define _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION 0	317	# define _LIBCPP_HAS_TRIVIAL_CONDVAR_DESTRUCTION 0
709	# endif	318	# endif
710		319
		320	// zig patch: serenity support
711	# if defined(__BIONIC__) \|\| defined(__NuttX__) \|\| defined(__Fuchsia__) \|\| defined(__wasi__) \|\| \	321	# if defined(__BIONIC__) \|\| defined(__NuttX__) \|\| defined(__Fuchsia__) \|\| defined(__wasi__) \|\| \
712	_LIBCPP_HAS_MUSL_LIBC \|\| defined(__OpenBSD__) \|\| defined(__LLVM_LIBC__)	322	_LIBCPP_HAS_MUSL_LIBC \|\| defined(__OpenBSD__) \|\| _LIBCPP_LIBC_LLVM_LIBC \|\| defined(__serenity__)
713	# define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE	323	# define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
714	# endif	324	# endif
715		325
716	# if __has_feature(cxx_atomic) \|\| __has_extension(c_atomic) \|\| __has_keyword(_Atomic)
717	# define _LIBCPP_HAS_C_ATOMIC_IMP 1
718	# define _LIBCPP_HAS_GCC_ATOMIC_IMP 0
719	# define _LIBCPP_HAS_EXTERNAL_ATOMIC_IMP 0
720	# elif defined(_LIBCPP_COMPILER_GCC)
721	# define _LIBCPP_HAS_C_ATOMIC_IMP 0
722	# define _LIBCPP_HAS_GCC_ATOMIC_IMP 1
723	# define _LIBCPP_HAS_EXTERNAL_ATOMIC_IMP 0
724	# endif
725
726	# if !_LIBCPP_HAS_C_ATOMIC_IMP && !_LIBCPP_HAS_GCC_ATOMIC_IMP && !_LIBCPP_HAS_EXTERNAL_ATOMIC_IMP
727	# define _LIBCPP_HAS_ATOMIC_HEADER 0
728	# else
729	# define _LIBCPP_HAS_ATOMIC_HEADER 1
730	# ifndef _LIBCPP_ATOMIC_FLAG_TYPE
731	# define _LIBCPP_ATOMIC_FLAG_TYPE bool
732	# endif
733	# endif
734
735	# if __has_cpp_attribute(_Clang::__no_thread_safety_analysis__)
736	# define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS [[_Clang::__no_thread_safety_analysis__]]
737	# else
738	# define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS
739	# endif
740
741	# if _LIBCPP_STD_VER >= 20
742	# define _LIBCPP_CONSTINIT constinit
743	# elif __has_attribute(__require_constant_initialization__)
744	# define _LIBCPP_CONSTINIT __attribute__((__require_constant_initialization__))
745	# else
746	# define _LIBCPP_CONSTINIT
747	# endif
748
749	# if defined(__CUDACC__) \|\| defined(__CUDA_ARCH__) \|\| defined(__CUDA_LIBDEVICE__)
750	// The CUDA SDK contains an unfortunate definition for the __noinline__ macro,
751	// which breaks the regular __attribute__((__noinline__)) syntax. Therefore,
752	// when compiling for CUDA we use the non-underscored version of the noinline
753	// attribute.
754	//
755	// This is a temporary workaround and we still expect the CUDA SDK team to solve
756	// this issue properly in the SDK headers.
757	//
758	// See https://github.com/llvm/llvm-project/pull/73838 for more details.
759	# define _LIBCPP_NOINLINE __attribute__((noinline))
760	# elif __has_attribute(__noinline__)
761	# define _LIBCPP_NOINLINE __attribute__((__noinline__))
762	# else
763	# define _LIBCPP_NOINLINE
764	# endif
765
766	// We often repeat things just for handling wide characters in the library.	326	// We often repeat things just for handling wide characters in the library.
767	// When wide characters are disabled, it can be useful to have a quick way of	327	// When wide characters are disabled, it can be useful to have a quick way of
768	// disabling it without having to resort to #if-#endif, which has a larger	328	// disabling it without having to resort to #if-#endif, which has a larger
...	@@ -788,27 +348,6 @@ typedef __char32_t char32_t;	...	@@ -788,27 +348,6 @@ typedef __char32_t char32_t;
788	# endif // defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY)	348	# endif // defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_BUILDING_LIBRARY)
789	# endif // _LIBCPP_NO_AUTO_LINK	349	# endif // _LIBCPP_NO_AUTO_LINK
790		350
791	// Configures the fopen close-on-exec mode character, if any. This string will
792	// be appended to any mode string used by fstream for fopen/fdopen.
793	//
794	// Not all platforms support this, but it helps avoid fd-leaks on platforms that
795	// do.
796	# if defined(__BIONIC__)
797	# define _LIBCPP_FOPEN_CLOEXEC_MODE "e"
798	# else
799	# define _LIBCPP_FOPEN_CLOEXEC_MODE
800	# endif
801
802	# if __has_cpp_attribute(msvc::no_unique_address)
803	// MSVC implements [[no_unique_address]] as a silent no-op currently.
804	// (If/when MSVC breaks its C++ ABI, it will be changed to work as intended.)
805	// However, MSVC implements [[msvc::no_unique_address]] which does what
806	// [[no_unique_address]] is supposed to do, in general.
807	# define _LIBCPP_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
808	# else
809	# define _LIBCPP_NO_UNIQUE_ADDRESS [[__no_unique_address__]]
810	# endif
811
812	// c8rtomb() and mbrtoc8() were added in C++20 and C23. Support for these	351	// c8rtomb() and mbrtoc8() were added in C++20 and C23. Support for these
813	// functions is gradually being added to existing C libraries. The conditions	352	// functions is gradually being added to existing C libraries. The conditions
814	// below check for known C library versions and conditions under which these	353	// below check for known C library versions and conditions under which these
...	@@ -844,210 +383,6 @@ typedef __char32_t char32_t;	...	@@ -844,210 +383,6 @@ typedef __char32_t char32_t;
844	# define _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(_ClassName) static_assert(true, "")	383	# define _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(_ClassName) static_assert(true, "")
845	# endif	384	# endif
846		385
847	# if defined(__OBJC__) && defined(_LIBCPP_APPLE_CLANG_VER)
848	# define _LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS
849	# endif
850
851	# define _PSTL_PRAGMA(x) _Pragma(#x)
852
853	// Enable SIMD for compilers that support OpenMP 4.0
854	# if (defined(_OPENMP) && _OPENMP >= 201307)
855
856	# define _PSTL_UDR_PRESENT
857	# define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(omp simd)
858	# define _PSTL_PRAGMA_DECLARE_SIMD _PSTL_PRAGMA(omp declare simd)
859	# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(omp simd reduction(PRM))
860	# define _PSTL_PRAGMA_SIMD_SCAN(PRM) _PSTL_PRAGMA(omp simd reduction(inscan, PRM))
861	# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan inclusive(PRM))
862	# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan exclusive(PRM))
863
864	// Declaration of reduction functor, where
865	// NAME - the name of the functor
866	// OP - type of the callable object with the reduction operation
867	// omp_in - refers to the local partial result
868	// omp_out - refers to the final value of the combiner operator
869	// omp_priv - refers to the private copy of the initial value
870	// omp_orig - refers to the original variable to be reduced
871	# define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP) \
872	_PSTL_PRAGMA(omp declare reduction(NAME:OP : omp_out(omp_in)) initializer(omp_priv = omp_orig))
873
874	# elif defined(_LIBCPP_COMPILER_CLANG_BASED)
875
876	# define _PSTL_PRAGMA_SIMD _Pragma("clang loop vectorize(enable) interleave(enable)")
877	# define _PSTL_PRAGMA_DECLARE_SIMD
878	# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _Pragma("clang loop vectorize(enable) interleave(enable)")
879	# define _PSTL_PRAGMA_SIMD_SCAN(PRM) _Pragma("clang loop vectorize(enable) interleave(enable)")
880	# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM)
881	# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM)
882	# define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP)
883
884	# else // (defined(_OPENMP) && _OPENMP >= 201307)
885
886	# define _PSTL_PRAGMA_SIMD
887	# define _PSTL_PRAGMA_DECLARE_SIMD
888	# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM)
889	# define _PSTL_PRAGMA_SIMD_SCAN(PRM)
890	# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM)
891	# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM)
892	# define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP)
893
894	# endif // (defined(_OPENMP) && _OPENMP >= 201307)
895
896	# define _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
897
898	// Optional attributes - these are useful for a better QoI, but not required to be available
899
900	# define _LIBCPP_NOALIAS __attribute__((__malloc__))
901	# define _LIBCPP_NODEBUG [[__gnu__::__nodebug__]]
902	# define _LIBCPP_NO_SANITIZE(...) __attribute__((__no_sanitize__(__VA_ARGS__)))
903	# define _LIBCPP_INIT_PRIORITY_MAX __attribute__((__init_priority__(100)))
904	# define _LIBCPP_ATTRIBUTE_FORMAT(archetype, format_string_index, first_format_arg_index) \
905	__attribute__((__format__(archetype, format_string_index, first_format_arg_index)))
906	# define _LIBCPP_PACKED __attribute__((__packed__))
907
908	# if __has_attribute(__no_sanitize__) && !defined(_LIBCPP_COMPILER_GCC)
909	# define _LIBCPP_NO_CFI __attribute__((__no_sanitize__("cfi")))
910	# else
911	# define _LIBCPP_NO_CFI
912	# endif
913
914	# if __has_attribute(__using_if_exists__)
915	# define _LIBCPP_USING_IF_EXISTS __attribute__((__using_if_exists__))
916	# else
917	# define _LIBCPP_USING_IF_EXISTS
918	# endif
919
920	# if __has_cpp_attribute(_Clang::__no_destroy__)
921	# define _LIBCPP_NO_DESTROY [[_Clang::__no_destroy__]]
922	# else
923	# define _LIBCPP_NO_DESTROY
924	# endif
925
926	# if __has_attribute(__diagnose_if__)
927	# define _LIBCPP_DIAGNOSE_WARNING(...) __attribute__((__diagnose_if__(__VA_ARGS__, "warning")))
928	# else
929	# define _LIBCPP_DIAGNOSE_WARNING(...)
930	# endif
931
932	# if __has_attribute(__diagnose_if__) && !defined(_LIBCPP_APPLE_CLANG_VER) && \
933	(!defined(_LIBCPP_CLANG_VER) \|\| _LIBCPP_CLANG_VER >= 2001)
934	# define _LIBCPP_DIAGNOSE_IF(...) __attribute__((__diagnose_if__(__VA_ARGS__)))
935	# else
936	# define _LIBCPP_DIAGNOSE_IF(...)
937	# endif
938
939	# define _LIBCPP_DIAGNOSE_NULLPTR_IF(condition, condition_description) \
940	_LIBCPP_DIAGNOSE_IF( \
941	condition, \
942	"null passed to callee that requires a non-null argument" condition_description, \
943	"warning", \
944	"nonnull")
945
946	# if __has_cpp_attribute(_Clang::__lifetimebound__)
947	# define _LIBCPP_LIFETIMEBOUND [[_Clang::__lifetimebound__]]
948	# else
949	# define _LIBCPP_LIFETIMEBOUND
950	# endif
951
952	// This is to work around https://llvm.org/PR156809
953	# ifndef _LIBCPP_CXX03_LANG
954	# define _LIBCPP_CTOR_LIFETIMEBOUND _LIBCPP_LIFETIMEBOUND
955	# else
956	# define _LIBCPP_CTOR_LIFETIMEBOUND
957	# endif
958
959	# if __has_cpp_attribute(_Clang::__noescape__)
960	# define _LIBCPP_NOESCAPE [[_Clang::__noescape__]]
961	# else
962	# define _LIBCPP_NOESCAPE
963	# endif
964
965	# if __has_cpp_attribute(_Clang::__no_specializations__)
966	# define _LIBCPP_NO_SPECIALIZATIONS \
967	[[_Clang::__no_specializations__("Users are not allowed to specialize this standard library entity")]]
968	# else
969	# define _LIBCPP_NO_SPECIALIZATIONS
970	# endif
971
972	# if __has_cpp_attribute(_Clang::__preferred_name__)
973	# define _LIBCPP_PREFERRED_NAME(x) [[_Clang::__preferred_name__(x)]]
974	# else
975	# define _LIBCPP_PREFERRED_NAME(x)
976	# endif
977
978	# if __has_cpp_attribute(_Clang::__scoped_lockable__)
979	# define _LIBCPP_SCOPED_LOCKABLE [[_Clang::__scoped_lockable__]]
980	# else
981	# define _LIBCPP_SCOPED_LOCKABLE
982	# endif
983
984	# if __has_cpp_attribute(_Clang::__capability__)
985	# define _LIBCPP_CAPABILITY(...) [[_Clang::__capability__(__VA_ARGS__)]]
986	# else
987	# define _LIBCPP_CAPABILITY(...)
988	# endif
989
990	# if __has_attribute(__acquire_capability__)
991	# define _LIBCPP_ACQUIRE_CAPABILITY(...) __attribute__((__acquire_capability__(__VA_ARGS__)))
992	# else
993	# define _LIBCPP_ACQUIRE_CAPABILITY(...)
994	# endif
995
996	# if __has_cpp_attribute(_Clang::__try_acquire_capability__)
997	# define _LIBCPP_TRY_ACQUIRE_CAPABILITY(...) [[_Clang::__try_acquire_capability__(__VA_ARGS__)]]
998	# else
999	# define _LIBCPP_TRY_ACQUIRE_CAPABILITY(...)
1000	# endif
1001
1002	# if __has_cpp_attribute(_Clang::__acquire_shared_capability__)
1003	# define _LIBCPP_ACQUIRE_SHARED_CAPABILITY [[_Clang::__acquire_shared_capability__]]
1004	# else
1005	# define _LIBCPP_ACQUIRE_SHARED_CAPABILITY
1006	# endif
1007
1008	# if __has_cpp_attribute(_Clang::__try_acquire_shared_capability__)
1009	# define _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(...) [[_Clang::__try_acquire_shared_capability__(__VA_ARGS__)]]
1010	# else
1011	# define _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(...)
1012	# endif
1013
1014	# if __has_cpp_attribute(_Clang::__release_capability__)
1015	# define _LIBCPP_RELEASE_CAPABILITY [[_Clang::__release_capability__]]
1016	# else
1017	# define _LIBCPP_RELEASE_CAPABILITY
1018	# endif
1019
1020	# if __has_cpp_attribute(_Clang::__release_shared_capability__)
1021	# define _LIBCPP_RELEASE_SHARED_CAPABILITY [[_Clang::__release_shared_capability__]]
1022	# else
1023	# define _LIBCPP_RELEASE_SHARED_CAPABILITY
1024	# endif
1025
1026	# if __has_attribute(__requires_capability__)
1027	# define _LIBCPP_REQUIRES_CAPABILITY(...) __attribute__((__requires_capability__(__VA_ARGS__)))
1028	# else
1029	# define _LIBCPP_REQUIRES_CAPABILITY(...)
1030	# endif
1031
1032	# if defined(_LIBCPP_ABI_MICROSOFT) && __has_declspec_attribute(empty_bases)
1033	# define _LIBCPP_DECLSPEC_EMPTY_BASES __declspec(empty_bases)
1034	# else
1035	# define _LIBCPP_DECLSPEC_EMPTY_BASES
1036	# endif
1037
1038	// Allow for build-time disabling of unsigned integer sanitization
1039	# if __has_attribute(no_sanitize) && !defined(_LIBCPP_COMPILER_GCC)
1040	# define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK __attribute__((__no_sanitize__("unsigned-integer-overflow")))
1041	# else
1042	# define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
1043	# endif
1044
1045	# if __has_feature(nullability)
1046	# define _LIBCPP_DIAGNOSE_NULLPTR _Nonnull
1047	# else
1048	# define _LIBCPP_DIAGNOSE_NULLPTR
1049	# endif
1050
1051	#endif // __cplusplus	386	#endif // __cplusplus
1052		387
1053	#endif // _LIBCPP___CONFIG	388	#endif // _LIBCPP___CONFIG

lib/libcxx/include/__configuration/abi.h+4-16

 @@ -52,12 +52,6 @@
 #if _LIBCPP_ABI_VERSION >= 2
 // TODO: Move the description of the remaining ABI flags to ABIGuarantees.rst or remove them.
-// Override the default return value of exception::what() for bad_function_call::what()
-// with a string that is specific to bad_function_call (see http://wg21.link/LWG2233).
-// This is an ABI break on platforms that sign and authenticate vtable function pointers
-// because it changes the mangling of the virtual function located in the vtable, which
-// changes how it gets signed.
-#  define _LIBCPP_ABI_BAD_FUNCTION_CALL_GOOD_WHAT_MESSAGE
 // According to the Standard, `bitset::operator[] const` returns bool
 #  define _LIBCPP_ABI_BITSET_VECTOR_BOOL_CONST_SUBSCRIPT_RETURN_BOOL
 @@ -77,11 +71,14 @@
 #  define _LIBCPP_ABI_NO_REVERSE_ITERATOR_SECOND_MEMBER
 #  define _LIBCPP_ABI_OPTIMIZED_FUNCTION
 #  define _LIBCPP_ABI_REGEX_CONSTANTS_NONZERO
+#  define _LIBCPP_ABI_VECTOR_LAYOUT_SIZE_BASED
 #  define _LIBCPP_ABI_STRING_OPTIMIZED_EXTERNAL_INSTANTIATION
 #  define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_ARRAY
 #  define _LIBCPP_ABI_USE_WRAP_ITER_IN_STD_STRING_VIEW
 #  define _LIBCPP_ABI_VARIANT_INDEX_TYPE_OPTIMIZATION
 #  define _LIBCPP_ABI_TRIVIALLY_COPYABLE_BIT_ITERATOR
+#  define _LIBCPP_ABI_USE_SMALL_DEQUE_BLOCK_SIZE
+#  define _LIBCPP_ABI_VECTORIZED_MERSENNE_TWISTER_ENGINE
 #elif _LIBCPP_ABI_VERSION == 1
 // Feature macros for disabling pre ABI v1 features. All of these options
 @@ -91,15 +88,6 @@
 #  endif
 #endif
-// TODO(LLVM 22): Remove this check
-#if defined(_LIBCPP_ABI_NO_ITERATOR_BASES) && !defined(_LIBCPP_ABI_NO_REVERSE_ITERATOR_SECOND_MEMBER)
-#  ifndef _LIBCPP_ONLY_NO_ITERATOR_BASES
-#    error "You probably want to define _LIBCPP_ABI_NO_REVERSE_ITERATOR_SECOND_MEMBER. This has been split out from"   \
- " _LIBCPP_ABI_NO_ITERATOR_BASES to allow only removing the second iterator member, since they aren't really related." \
- "If you actually want this ABI configuration, please define _LIBCPP_ONLY_NO_ITERATOR_BASES instead."
-#  endif
-#endif
 // We had some bugs where we use [[no_unique_address]] together with construct_at,
 // which causes UB as the call on construct_at could write to overlapping subobjects
 //
 @@ -108,7 +96,7 @@
 //
 // To fix the bug we had to change the ABI of some classes to remove [[no_unique_address]] under certain conditions.
 // The macro below is used for all classes whose ABI have changed as part of fixing these bugs.
-#define _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS __attribute__((__abi_tag__("llvm18_nua")))
+#define _LIBCPP_LLVM18_NO_UNIQUE_ADDRESS_ABI_TAG __attribute__((__abi_tag__("llvm18_nua")))
 // [[msvc::no_unique_address]] seems to mostly affect empty classes, so the padding scheme for Itanium doesn't work.
 #if defined(_LIBCPP_ABI_MICROSOFT) && !defined(_LIBCPP_ABI_NO_COMPRESSED_PAIR_PADDING)

lib/libcxx/include/__configuration/attributes.h created+476

...	@@ -0,0 +1,476 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___CONFIGURATION_ATTRIBUTES_H
10	#define _LIBCPP___CONFIGURATION_ATTRIBUTES_H
11
12	/* zig patch: instead of including __config_site, zig adds -D flags when compiling */
13	#include <__configuration/hardening.h>
14	#include <__configuration/language.h>
15	#include <__configuration/utility.h>
16
17	#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
18	# pragma GCC system_header
19	#endif
20
21	#ifndef __has_declspec_attribute
22	# define __has_declspec_attribute(__x) 0
23	#endif
24
25	// Attributes relevant for layout ABI
26	// ----------------------------------
27
28	#if __has_cpp_attribute(msvc::no_unique_address)
29	// MSVC implements [[no_unique_address]] as a silent no-op currently.
30	// (If/when MSVC breaks its C++ ABI, it will be changed to work as intended.)
31	// However, MSVC implements [[msvc::no_unique_address]] which does what
32	// [[no_unique_address]] is supposed to do, in general.
33	# define _LIBCPP_NO_UNIQUE_ADDRESS [[msvc::no_unique_address]]
34	#else
35	# define _LIBCPP_NO_UNIQUE_ADDRESS [[__no_unique_address__]]
36	#endif
37
38	#define _LIBCPP_PACKED __attribute__((__packed__))
39
40	// Attributes affecting overload resolution
41	// ----------------------------------------
42
43	#if __has_attribute(__enable_if__)
44	# define _LIBCPP_PREFERRED_OVERLOAD __attribute__((__enable_if__(true, "")))
45	#endif
46
47	// Visibility attributes
48	// ---------------------
49
50	#if defined(_LIBCPP_OBJECT_FORMAT_COFF)
51
52	# ifdef _DLL
53	# define _LIBCPP_CRT_FUNC __declspec(dllimport)
54	# else
55	# define _LIBCPP_CRT_FUNC
56	# endif
57
58	# if defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) \|\| (defined(__MINGW32__) && !defined(_LIBCPP_BUILDING_LIBRARY))
59	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
60	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
61	# define _LIBCPP_OVERRIDABLE_FUNC_VIS
62	# define _LIBCPP_EXPORTED_FROM_ABI
63	# elif defined(_LIBCPP_BUILDING_LIBRARY)
64	# if defined(__MINGW32__)
65	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __declspec(dllexport)
66	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
67	# else
68	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS
69	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS __declspec(dllexport)
70	# endif
71	# define _LIBCPP_OVERRIDABLE_FUNC_VIS __declspec(dllexport)
72	# define _LIBCPP_EXPORTED_FROM_ABI __declspec(dllexport)
73	# else
74	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS __declspec(dllimport)
75	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
76	# define _LIBCPP_OVERRIDABLE_FUNC_VIS
77	# define _LIBCPP_EXPORTED_FROM_ABI __declspec(dllimport)
78	# endif
79
80	# define _LIBCPP_HIDDEN
81	# define _LIBCPP_TEMPLATE_DATA_VIS
82	# define _LIBCPP_NAMESPACE_VISIBILITY
83
84	#else
85
86	# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
87	# define _LIBCPP_VISIBILITY(vis) __attribute__((__visibility__(vis)))
88	# else
89	# define _LIBCPP_VISIBILITY(vis)
90	# endif
91
92	# define _LIBCPP_HIDDEN _LIBCPP_VISIBILITY("hidden")
93	# define _LIBCPP_TEMPLATE_DATA_VIS _LIBCPP_VISIBILITY("default")
94	# define _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_VISIBILITY("default")
95	# define _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS _LIBCPP_VISIBILITY("default")
96	# define _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
97
98	// TODO: Make this a proper customization point or remove the option to override it.
99	# ifndef _LIBCPP_OVERRIDABLE_FUNC_VIS
100	# define _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_VISIBILITY("default")
101	# endif
102
103	# if !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS) && __has_attribute(__type_visibility__)
104	# define _LIBCPP_NAMESPACE_VISIBILITY __attribute__((__type_visibility__("default")))
105	# elif !defined(_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS)
106	# define _LIBCPP_NAMESPACE_VISIBILITY __attribute__((__visibility__("default")))
107	# else
108	# define _LIBCPP_NAMESPACE_VISIBILITY
109	# endif
110
111	#endif // defined(_LIBCPP_OBJECT_FORMAT_COFF)
112
113	// hide_from_abi
114	// -------------
115
116	#define _LIBCPP_ALWAYS_INLINE __attribute__((__always_inline__))
117
118	#if __has_attribute(exclude_from_explicit_instantiation)
119	# define _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION __attribute__((__exclude_from_explicit_instantiation__))
120	#else
121	// Try to approximate the effect of exclude_from_explicit_instantiation
122	// (which is that entities are not assumed to be provided by explicit
123	// template instantiations in the dylib) by always inlining those entities.
124	# define _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION _LIBCPP_ALWAYS_INLINE
125	#endif
126
127	#if _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_FAST
128	# define _LIBCPP_HARDENING_SIG f
129	#elif _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_EXTENSIVE
130	# define _LIBCPP_HARDENING_SIG s
131	#elif _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_DEBUG
132	# define _LIBCPP_HARDENING_SIG d
133	#else
134	# define _LIBCPP_HARDENING_SIG n // "none"
135	#endif
136
137	#if _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_OBSERVE
138	# define _LIBCPP_ASSERTION_SEMANTIC_SIG o
139	#elif _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_QUICK_ENFORCE
140	# define _LIBCPP_ASSERTION_SEMANTIC_SIG q
141	#elif _LIBCPP_ASSERTION_SEMANTIC == _LIBCPP_ASSERTION_SEMANTIC_ENFORCE
142	# define _LIBCPP_ASSERTION_SEMANTIC_SIG e
143	#else
144	# define _LIBCPP_ASSERTION_SEMANTIC_SIG i // `ignore`
145	#endif
146
147	#if !_LIBCPP_HAS_EXCEPTIONS
148	# define _LIBCPP_EXCEPTIONS_SIG n
149	#else
150	# define _LIBCPP_EXCEPTIONS_SIG e
151	#endif
152
153	#define _LIBCPP_ODR_SIGNATURE \
154	_LIBCPP_CONCAT( \
155	_LIBCPP_CONCAT(_LIBCPP_CONCAT(_LIBCPP_HARDENING_SIG, _LIBCPP_ASSERTION_SEMANTIC_SIG), _LIBCPP_EXCEPTIONS_SIG), \
156	_LIBCPP_VERSION)
157
158	// This macro marks a symbol as being hidden from libc++'s ABI. This is achieved
159	// on two levels:
160	// 1. The symbol is given hidden visibility, which ensures that users won't start exporting
161	// symbols from their dynamic library by means of using the libc++ headers. This ensures
162	// that those symbols stay private to the dynamic library in which it is defined.
163	//
164	// 2. The symbol is given an ABI tag that encodes the ODR-relevant properties of the library.
165	// This ensures that no ODR violation can arise from mixing two TUs compiled with different
166	// versions or configurations of libc++ (such as exceptions vs no-exceptions). Indeed, if the
167	// program contains two definitions of a function, the ODR requires them to be token-by-token
168	// equivalent, and the linker is allowed to pick either definition and discard the other one.
169	//
170	// For example, if a program contains a copy of `vector::at()` compiled with exceptions enabled
171	// and a copy of `vector::at()` compiled with exceptions disabled (by means of having two TUs
172	// compiled with different settings), the two definitions are both visible by the linker and they
173	// have the same name, but they have a meaningfully different implementation (one throws an exception
174	// and the other aborts the program). This violates the ODR and makes the program ill-formed, and in
175	// practice what will happen is that the linker will pick one of the definitions at random and will
176	// discard the other one. This can quite clearly lead to incorrect program behavior.
177	//
178	// A similar reasoning holds for many other properties that are ODR-affecting. Essentially any
179	// property that causes the code of a function to differ from the code in another configuration
180	// can be considered ODR-affecting. In practice, we don't encode all such properties in the ABI
181	// tag, but we encode the ones that we think are most important: library version, exceptions, and
182	// hardening mode.
183	//
184	// Note that historically, solving this problem has been achieved in various ways, including
185	// force-inlining all functions or giving internal linkage to all functions. Both these previous
186	// solutions suffer from drawbacks that lead notably to code bloat.
187	//
188	// Note that we use _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION to ensure that we don't depend
189	// on _LIBCPP_HIDE_FROM_ABI methods of classes explicitly instantiated in the dynamic library.
190	//
191	// Also note that the _LIBCPP_HIDE_FROM_ABI_VIRTUAL macro should be used on virtual functions
192	// instead of _LIBCPP_HIDE_FROM_ABI. That macro does not use an ABI tag. Indeed, the mangled
193	// name of a virtual function is part of its ABI, since some architectures like arm64e can sign
194	// the virtual function pointer in the vtable based on the mangled name of the function. Since
195	// we use an ABI tag that changes with each released version, the mangled name of the virtual
196	// function would change, which is incorrect. Note that it doesn't make much sense to change
197	// the implementation of a virtual function in an ABI-incompatible way in the first place,
198	// since that would be an ABI break anyway. Hence, the lack of ABI tag should not be noticeable.
199	//
200	// The macro can be applied to record and enum types. When the tagged type is nested in
201	// a record this "parent" record needs to have the macro too. Another use case for applying
202	// this macro to records and unions is to apply an ABI tag to inline constexpr variables.
203	// This can be useful for inline variables that are implementation details which are expected
204	// to change in the future.
205	//
206	// TODO: We provide a escape hatch with _LIBCPP_NO_ABI_TAG for folks who want to avoid increasing
207	// the length of symbols with an ABI tag. In practice, we should remove the escape hatch and
208	// use compression mangling instead, see https://github.com/itanium-cxx-abi/cxx-abi/issues/70.
209	#ifndef _LIBCPP_NO_ABI_TAG
210	# define _LIBCPP_HIDE_FROM_ABI \
211	_LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION \
212	__attribute__((__abi_tag__(_LIBCPP_TOSTRING(_LIBCPP_ODR_SIGNATURE))))
213	#else
214	# define _LIBCPP_HIDE_FROM_ABI _LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION
215	#endif
216	#define _LIBCPP_HIDE_FROM_ABI_VIRTUAL _LIBCPP_HIDDEN _LIBCPP_EXCLUDE_FROM_EXPLICIT_INSTANTIATION
217
218	// This macro makes sure that private classes which aren't necessarily part of the ABI change their name every release.
219	// The intention is _not_ to put it on every private class, but only on classes where type name stability implies ABI
220	// stability. This is essentially the case for classes that are only accessed through the vtable after instantiation,
221	// for example the control blocks of `shared_ptr`. These classes can change in ABI breaking ways as long as their name
222	// (and hence their vtable symbol) changes too. Note that the vtable and RTTI are not marked with
223	// [[gnu::visibility("hidden")]], since the vtable and RTTI should still be deduplicated across dylibs with the same
224	// instatiations.
225	#define _LIBCPP_HIDE_STRUCT_FROM_ABI [[__gnu__::__abi_tag__(_LIBCPP_TOSTRING(_LIBCPP_ODR_SIGNATURE))]]
226
227	// Optional attributes
228	// -------------------
229
230	// these are useful for a better QoI, but not required to be available
231
232	#define _LIBCPP_NOALIAS __attribute__((__malloc__))
233	#define _LIBCPP_NODEBUG [[__gnu__::__nodebug__]]
234	#define _LIBCPP_NO_SANITIZE(...) __attribute__((__no_sanitize__(__VA_ARGS__)))
235	#define _LIBCPP_INIT_PRIORITY_MAX __attribute__((__init_priority__(100)))
236	#define _LIBCPP_ATTRIBUTE_FORMAT(archetype, format_string_index, first_format_arg_index) \
237	__attribute__((__format__(archetype, format_string_index, first_format_arg_index)))
238
239	#if __has_attribute(__no_sanitize__) && !defined(_LIBCPP_COMPILER_GCC)
240	# define _LIBCPP_NO_CFI __attribute__((__no_sanitize__("cfi")))
241	#else
242	# define _LIBCPP_NO_CFI
243	#endif
244
245	#if __has_attribute(__using_if_exists__)
246	# define _LIBCPP_USING_IF_EXISTS __attribute__((__using_if_exists__))
247	#else
248	# define _LIBCPP_USING_IF_EXISTS
249	#endif
250
251	#if __has_cpp_attribute(_Clang::__no_destroy__)
252	# define _LIBCPP_NO_DESTROY [[_Clang::__no_destroy__]]
253	#else
254	# define _LIBCPP_NO_DESTROY
255	#endif
256
257	#if __has_attribute(__diagnose_if__)
258	# define _LIBCPP_DIAGNOSE_WARNING(...) __attribute__((__diagnose_if__(__VA_ARGS__, "warning")))
259	#else
260	# define _LIBCPP_DIAGNOSE_WARNING(...)
261	#endif
262
263	#if __has_attribute(__diagnose_if__) && !defined(_LIBCPP_APPLE_CLANG_VER) && \
264	(!defined(_LIBCPP_CLANG_VER) \|\| _LIBCPP_CLANG_VER >= 2001)
265	# define _LIBCPP_DIAGNOSE_IF(...) __attribute__((__diagnose_if__(__VA_ARGS__)))
266	#else
267	# define _LIBCPP_DIAGNOSE_IF(...)
268	#endif
269
270	#define _LIBCPP_DIAGNOSE_NULLPTR_IF(condition, condition_description) \
271	_LIBCPP_DIAGNOSE_IF( \
272	condition, \
273	"null passed to callee that requires a non-null argument" condition_description, \
274	"warning", \
275	"nonnull")
276
277	#if __has_cpp_attribute(_Clang::__lifetimebound__)
278	# define _LIBCPP_LIFETIMEBOUND [[_Clang::__lifetimebound__]]
279	#else
280	# define _LIBCPP_LIFETIMEBOUND
281	#endif
282
283	// This is to work around https://llvm.org/PR156809
284	#ifndef _LIBCPP_CXX03_LANG
285	# define _LIBCPP_CTOR_LIFETIMEBOUND _LIBCPP_LIFETIMEBOUND
286	#else
287	# define _LIBCPP_CTOR_LIFETIMEBOUND
288	#endif
289
290	#if __has_cpp_attribute(_Clang::__noescape__)
291	# define _LIBCPP_NOESCAPE [[_Clang::__noescape__]]
292	#else
293	# define _LIBCPP_NOESCAPE
294	#endif
295
296	#if __has_cpp_attribute(_Clang::__no_specializations__)
297	# define _LIBCPP_NO_SPECIALIZATIONS \
298	[[_Clang::__no_specializations__("Users are not allowed to specialize this standard library entity")]]
299	#else
300	# define _LIBCPP_NO_SPECIALIZATIONS
301	#endif
302
303	#if __has_cpp_attribute(_Clang::__preferred_name__)
304	# define _LIBCPP_PREFERRED_NAME(x) [[_Clang::__preferred_name__(x)]]
305	#else
306	# define _LIBCPP_PREFERRED_NAME(x)
307	#endif
308
309	#if __has_cpp_attribute(_Clang::__scoped_lockable__)
310	# define _LIBCPP_SCOPED_LOCKABLE [[_Clang::__scoped_lockable__]]
311	#else
312	# define _LIBCPP_SCOPED_LOCKABLE
313	#endif
314
315	#if __has_cpp_attribute(_Clang::__capability__)
316	# define _LIBCPP_CAPABILITY(...) [[_Clang::__capability__(__VA_ARGS__)]]
317	#else
318	# define _LIBCPP_CAPABILITY(...)
319	#endif
320
321	#if __has_attribute(__acquire_capability__)
322	# define _LIBCPP_ACQUIRE_CAPABILITY(...) __attribute__((__acquire_capability__(__VA_ARGS__)))
323	#else
324	# define _LIBCPP_ACQUIRE_CAPABILITY(...)
325	#endif
326
327	#if __has_cpp_attribute(_Clang::__try_acquire_capability__)
328	# define _LIBCPP_TRY_ACQUIRE_CAPABILITY(...) [[_Clang::__try_acquire_capability__(__VA_ARGS__)]]
329	#else
330	# define _LIBCPP_TRY_ACQUIRE_CAPABILITY(...)
331	#endif
332
333	#if __has_cpp_attribute(_Clang::__acquire_shared_capability__)
334	# define _LIBCPP_ACQUIRE_SHARED_CAPABILITY [[_Clang::__acquire_shared_capability__]]
335	#else
336	# define _LIBCPP_ACQUIRE_SHARED_CAPABILITY
337	#endif
338
339	#if __has_cpp_attribute(_Clang::__try_acquire_shared_capability__)
340	# define _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(...) [[_Clang::__try_acquire_shared_capability__(__VA_ARGS__)]]
341	#else
342	# define _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(...)
343	#endif
344
345	#if __has_attribute(__release_capability__)
346	# define _LIBCPP_RELEASE_CAPABILITY(...) __attribute__((__release_capability__(__VA_ARGS__)))
347	#else
348	# define _LIBCPP_RELEASE_CAPABILITY(...)
349	#endif
350
351	#if __has_cpp_attribute(_Clang::__release_shared_capability__)
352	# define _LIBCPP_RELEASE_SHARED_CAPABILITY [[_Clang::__release_shared_capability__]]
353	#else
354	# define _LIBCPP_RELEASE_SHARED_CAPABILITY
355	#endif
356
357	#if __has_attribute(__requires_capability__)
358	# define _LIBCPP_REQUIRES_CAPABILITY(...) __attribute__((__requires_capability__(__VA_ARGS__)))
359	#else
360	# define _LIBCPP_REQUIRES_CAPABILITY(...)
361	#endif
362
363	#if __has_cpp_attribute(_Clang::__no_thread_safety_analysis__)
364	# define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS [[_Clang::__no_thread_safety_analysis__]]
365	#else
366	# define _LIBCPP_NO_THREAD_SAFETY_ANALYSIS
367	#endif
368
369	#if defined(_LIBCPP_ABI_MICROSOFT) && __has_declspec_attribute(empty_bases)
370	# define _LIBCPP_DECLSPEC_EMPTY_BASES __declspec(empty_bases)
371	#else
372	# define _LIBCPP_DECLSPEC_EMPTY_BASES
373	#endif
374
375	// Allow for build-time disabling of unsigned integer sanitization
376	#if __has_attribute(no_sanitize) && !defined(_LIBCPP_COMPILER_GCC)
377	# define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK __attribute__((__no_sanitize__("unsigned-integer-overflow")))
378	#else
379	# define _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK
380	#endif
381
382	#if __has_feature(nullability)
383	# define _LIBCPP_DIAGNOSE_NULLPTR _Nonnull
384	#else
385	# define _LIBCPP_DIAGNOSE_NULLPTR
386	#endif
387
388	#if defined(__CUDACC__) \|\| defined(__CUDA_ARCH__) \|\| defined(__CUDA_LIBDEVICE__)
389	// The CUDA SDK contains an unfortunate definition for the __noinline__ macro,
390	// which breaks the regular __attribute__((__noinline__)) syntax. Therefore,
391	// when compiling for CUDA we use the non-underscored version of the noinline
392	// attribute.
393	//
394	// This is a temporary workaround and we still expect the CUDA SDK team to solve
395	// this issue properly in the SDK headers.
396	//
397	// See https://github.com/llvm/llvm-project/pull/73838 for more details.
398	# define _LIBCPP_NOINLINE __attribute__((noinline))
399	#elif __has_attribute(__noinline__)
400	# define _LIBCPP_NOINLINE __attribute__((__noinline__))
401	#else
402	# define _LIBCPP_NOINLINE
403	#endif
404
405	// Deprecation macros
406	// ------------------
407
408	// Deprecations warnings are always enabled, except when users explicitly opt-out
409	// by defining _LIBCPP_DISABLE_DEPRECATION_WARNINGS.
410	#if !defined(_LIBCPP_DISABLE_DEPRECATION_WARNINGS)
411	# if __has_attribute(__deprecated__)
412	# define _LIBCPP_DEPRECATED __attribute__((__deprecated__))
413	# define _LIBCPP_DEPRECATED_(m) __attribute__((__deprecated__(m)))
414	# elif _LIBCPP_STD_VER >= 14
415	# define _LIBCPP_DEPRECATED [[deprecated]]
416	# define _LIBCPP_DEPRECATED_(m) [[deprecated(m)]]
417	# else
418	# define _LIBCPP_DEPRECATED
419	# define _LIBCPP_DEPRECATED_(m)
420	# endif
421	#else
422	# define _LIBCPP_DEPRECATED
423	# define _LIBCPP_DEPRECATED_(m)
424	#endif
425
426	#if !defined(_LIBCPP_CXX03_LANG)
427	# define _LIBCPP_DEPRECATED_IN_CXX11 _LIBCPP_DEPRECATED
428	#else
429	# define _LIBCPP_DEPRECATED_IN_CXX11
430	#endif
431
432	#if _LIBCPP_STD_VER >= 14
433	# define _LIBCPP_DEPRECATED_IN_CXX14 _LIBCPP_DEPRECATED
434	#else
435	# define _LIBCPP_DEPRECATED_IN_CXX14
436	#endif
437
438	#if _LIBCPP_STD_VER >= 17
439	# define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED
440	#else
441	# define _LIBCPP_DEPRECATED_IN_CXX17
442	#endif
443
444	#if _LIBCPP_STD_VER >= 20
445	# define _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_DEPRECATED
446	#else
447	# define _LIBCPP_DEPRECATED_IN_CXX20
448	#endif
449
450	#if _LIBCPP_STD_VER >= 23
451	# define _LIBCPP_DEPRECATED_IN_CXX23 _LIBCPP_DEPRECATED
452	#else
453	# define _LIBCPP_DEPRECATED_IN_CXX23
454	#endif
455
456	#if _LIBCPP_STD_VER >= 26
457	# define _LIBCPP_DEPRECATED_IN_CXX26 _LIBCPP_DEPRECATED
458	# define _LIBCPP_DEPRECATED_IN_CXX26_(m) _LIBCPP_DEPRECATED_(m)
459	#else
460	# define _LIBCPP_DEPRECATED_IN_CXX26
461	# define _LIBCPP_DEPRECATED_IN_CXX26_(m)
462	#endif
463
464	#if _LIBCPP_HAS_CHAR8_T
465	# define _LIBCPP_DEPRECATED_WITH_CHAR8_T _LIBCPP_DEPRECATED
466	#else
467	# define _LIBCPP_DEPRECATED_WITH_CHAR8_T
468	#endif
469
470	#if __has_cpp_attribute(_Clang::__no_field_protection__)
471	# define _LIBCPP_DISABLE_POINTER_FIELD_PROTECTION [[_Clang::__no_field_protection__]]
472	#else
473	# define _LIBCPP_DISABLE_POINTER_FIELD_PROTECTION
474	#endif
475
476	#endif // _LIBCPP___CONFIGURATION_ATTRIBUTES_H

lib/libcxx/include/__configuration/availability.h+93-68

 @@ -38,6 +38,11 @@
 // When availability annotations are disabled, we take for granted that features introduced
 // in all versions of the library are available.
 #if !_LIBCPP_HAS_VENDOR_AVAILABILITY_ANNOTATIONS
+#  define _LIBCPP_INTRODUCED_IN_LLVM_23 1
+#  define _LIBCPP_INTRODUCED_IN_LLVM_23_ATTRIBUTE /* nothing */
+#  define _LIBCPP_INTRODUCED_IN_LLVM_23 1
+#  define _LIBCPP_INTRODUCED_IN_LLVM_23_ATTRIBUTE /* nothing */
 #  define _LIBCPP_INTRODUCED_IN_LLVM_22 1
 #  define _LIBCPP_INTRODUCED_IN_LLVM_22_ATTRIBUTE /* nothing */
 @@ -70,15 +75,34 @@
 // clang-format off
+// LLVM 23
+// TODO: Fill this in
+#  define _LIBCPP_INTRODUCED_IN_LLVM_23 0
+#  define _LIBCPP_INTRODUCED_IN_LLVM_23_ATTRIBUTE __attribute__((unavailable))
 // LLVM 22
 // TODO: Fill this in
 #  define _LIBCPP_INTRODUCED_IN_LLVM_22 0
 #  define _LIBCPP_INTRODUCED_IN_LLVM_22_ATTRIBUTE __attribute__((unavailable))
 // LLVM 21
-// TODO: Fill this in
+#  if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 260400) ||       \
-#  define _LIBCPP_INTRODUCED_IN_LLVM_21 0
+      (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 260400) ||     \
-#  define _LIBCPP_INTRODUCED_IN_LLVM_21_ATTRIBUTE __attribute__((unavailable))
+      (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 260400) ||             \
+      (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 260400) ||       \
+      (defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 100400) ||     \
+      (defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 250400)
+#    define _LIBCPP_INTRODUCED_IN_LLVM_21 0
+#  else
+#    define _LIBCPP_INTRODUCED_IN_LLVM_21 1
+#  endif
+#  define _LIBCPP_INTRODUCED_IN_LLVM_21_ATTRIBUTE                                                                 \
+    __attribute__((availability(macos, strict, introduced = 26.4)))                                               \
+    __attribute__((availability(ios, strict, introduced = 26.4)))                                                 \
+    __attribute__((availability(tvos, strict, introduced = 26.4)))                                                \
+    __attribute__((availability(watchos, strict, introduced = 26.4)))                                             \
+    __attribute__((availability(bridgeos, strict, introduced = 10.4)))                                            \
+    __attribute__((availability(driverkit, strict, introduced = 25.4)))
 // LLVM 20
 //
 @@ -87,7 +111,8 @@
       (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 260000) ||     \
       (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 260000) ||             \
       (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 260000) ||       \
-      (defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 100000)
+      (defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 100000) ||     \
+      (defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 250000)
 #    define _LIBCPP_INTRODUCED_IN_LLVM_20 0
 #  else
 #    define _LIBCPP_INTRODUCED_IN_LLVM_20 1
 @@ -97,14 +122,16 @@
     __attribute__((availability(ios, strict, introduced = 26.0)))                                                 \
     __attribute__((availability(tvos, strict, introduced = 26.0)))                                                \
     __attribute__((availability(watchos, strict, introduced = 26.0)))                                             \
-    __attribute__((availability(bridgeos, strict, introduced = 10.0)))
+    __attribute__((availability(bridgeos, strict, introduced = 10.0)))                                            \
+    __attribute__((availability(driverkit, strict, introduced = 25.0)))
 // LLVM 19
 #  if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 150400) ||       \
       (defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ < 180400) ||     \
       (defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ < 180400) ||             \
       (defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ < 110400) ||       \
-      (defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 90400)
+      (defined(__ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_BRIDGE_OS_VERSION_MIN_REQUIRED__ < 90400) ||       \
+      (defined(__ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_DRIVERKIT_VERSION_MIN_REQUIRED__ < 240400)
 #    define _LIBCPP_INTRODUCED_IN_LLVM_19 0
 #  else
 #    define _LIBCPP_INTRODUCED_IN_LLVM_19 1
 @@ -114,7 +141,8 @@
     __attribute__((availability(ios, strict, introduced = 18.4)))                                                 \
     __attribute__((availability(tvos, strict, introduced = 18.4)))                                                \
     __attribute__((availability(watchos, strict, introduced = 11.4)))                                             \
-    __attribute__((availability(bridgeos, strict, introduced = 9.4)))
+    __attribute__((availability(bridgeos, strict, introduced = 9.4)))                                             \
+    __attribute__((availability(driverkit, strict, introduced = 24.4)))
 // LLVM 18
 #  if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 150000) ||       \
 @@ -220,51 +248,28 @@
 #define _LIBCPP_AVAILABILITY_HAS_NEW_SYNC _LIBCPP_INTRODUCED_IN_LLVM_22
 #define _LIBCPP_AVAILABILITY_NEW_SYNC _LIBCPP_INTRODUCED_IN_LLVM_22_ATTRIBUTE
-// Enable additional explicit instantiations of iostreams components. This
+// This controls whether `std::__hash_memory` is available in the dylib, which
-// reduces the number of weak definitions generated in programs that use
+// is used for some `std::hash` specializations.
-// iostreams by providing a single strong definition in the shared library.
+#define _LIBCPP_AVAILABILITY_HAS_HASH_MEMORY _LIBCPP_INTRODUCED_IN_LLVM_21
-//
+// No attribute, since we've had hash in the headers before
-// TODO: Enable additional explicit instantiations on GCC once it supports exclude_from_explicit_instantiation,
-//       or once libc++ doesn't use the attribute anymore.
-// TODO: Enable them on Windows once https://llvm.org/PR41018 has been fixed.
-#if !defined(_LIBCPP_COMPILER_GCC) && !defined(_WIN32)
-#  define _LIBCPP_AVAILABILITY_HAS_ADDITIONAL_IOSTREAM_EXPLICIT_INSTANTIATIONS_1 _LIBCPP_INTRODUCED_IN_LLVM_12
-#else
-#  define _LIBCPP_AVAILABILITY_HAS_ADDITIONAL_IOSTREAM_EXPLICIT_INSTANTIATIONS_1 0
-#endif
-// This controls the availability of floating-point std::to_chars functions.
-// These overloads were added later than the integer overloads.
-#define _LIBCPP_AVAILABILITY_HAS_TO_CHARS_FLOATING_POINT _LIBCPP_INTRODUCED_IN_LLVM_14
-#define _LIBCPP_AVAILABILITY_TO_CHARS_FLOATING_POINT _LIBCPP_INTRODUCED_IN_LLVM_14_ATTRIBUTE
-// This controls whether the library claims to provide a default verbose
-// termination function, and consequently whether the headers will try
-// to use it when the mechanism isn't overriden at compile-time.
-#define _LIBCPP_AVAILABILITY_HAS_VERBOSE_ABORT _LIBCPP_INTRODUCED_IN_LLVM_15
-#define _LIBCPP_AVAILABILITY_VERBOSE_ABORT _LIBCPP_INTRODUCED_IN_LLVM_15_ATTRIBUTE
-// This controls the availability of the C++17 std::pmr library,
+// This controls whether we provide a message for `bad_function_call::what()` that specific to `std::bad_function_call`.
-// which is implemented in large part in the built library.
+// See https://wg21.link/LWG2233. This requires `std::bad_function_call::what()` to be available in the dylib.
-//
+#define _LIBCPP_AVAILABILITY_HAS_BAD_FUNCTION_CALL_GOOD_WHAT_MESSAGE _LIBCPP_INTRODUCED_IN_LLVM_21
-// TODO: Enable std::pmr markup once https://llvm.org/PR40340 has been fixed
+// No attribute, since we've had bad_function_call::what() in the headers before
-//       Until then, it is possible for folks to try to use `std::pmr` when back-deploying to targets that don't support
-//       it and it'll be a load-time error, but we don't have a good alternative because the library won't compile if we
-//       use availability annotations until that bug has been fixed.
-#define _LIBCPP_AVAILABILITY_HAS_PMR _LIBCPP_INTRODUCED_IN_LLVM_16
-#define _LIBCPP_AVAILABILITY_PMR
-// These macros controls the availability of __cxa_init_primary_exception
+// This determines whether we assume that the internal std::__bad_variant_access_with_msg class
-// in the built library, which std::make_exception_ptr might use
+// (which carries a message describing the cause of the failure in bad_variant_access::what())
-// (see libcxx/include/__exception/exception_ptr.h).
+// provides a key function in the dylib. This allows centralizing its vtable and typeinfo instead
-#define _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION _LIBCPP_INTRODUCED_IN_LLVM_18
+// of having all TUs provide a weak definition that then gets deduplicated. When it is not available
-#define _LIBCPP_AVAILABILITY_INIT_PRIMARY_EXCEPTION _LIBCPP_INTRODUCED_IN_LLVM_18_ATTRIBUTE
+// in the dylib, what() is defined inline instead, so the descriptive message is provided regardless.
+#define _LIBCPP_AVAILABILITY_HAS_BAD_VARIANT_ACCESS_WITH_MSG_KEY_FUNCTION _LIBCPP_INTRODUCED_IN_LLVM_23
+// No attribute, since we've had bad_variant_access in the headers before
-// This controls the availability of C++23 <print>, which
+// This controls the availability of floating-point std::from_chars functions.
-// has a dependency on the built library (it needs access to
+// These overloads were added later than the integer overloads.
-// the underlying buffer types of std::cout, std::cerr, and std::clog.
+#define _LIBCPP_AVAILABILITY_HAS_FROM_CHARS_FLOATING_POINT _LIBCPP_INTRODUCED_IN_LLVM_20
-#define _LIBCPP_AVAILABILITY_HAS_PRINT _LIBCPP_INTRODUCED_IN_LLVM_18
+#define _LIBCPP_AVAILABILITY_FROM_CHARS_FLOATING_POINT _LIBCPP_INTRODUCED_IN_LLVM_20_ATTRIBUTE
-#define _LIBCPP_AVAILABILITY_PRINT _LIBCPP_INTRODUCED_IN_LLVM_18_ATTRIBUTE
 // This controls the availability of the C++20 time zone database.
 // The parser code is built in the library.
 @@ -280,30 +285,50 @@
 #define _LIBCPP_AVAILABILITY_HAS_BAD_EXPECTED_ACCESS_KEY_FUNCTION _LIBCPP_INTRODUCED_IN_LLVM_19
 #define _LIBCPP_AVAILABILITY_BAD_EXPECTED_ACCESS_KEY_FUNCTION _LIBCPP_INTRODUCED_IN_LLVM_19_ATTRIBUTE
-// This controls the availability of floating-point std::from_chars functions.
+// These macros controls the availability of __cxa_init_primary_exception
-// These overloads were added later than the integer overloads.
+// in the built library, which std::make_exception_ptr might use
-#define _LIBCPP_AVAILABILITY_HAS_FROM_CHARS_FLOATING_POINT _LIBCPP_INTRODUCED_IN_LLVM_20
+// (see libcxx/include/__exception/exception_ptr.h).
-#define _LIBCPP_AVAILABILITY_FROM_CHARS_FLOATING_POINT _LIBCPP_INTRODUCED_IN_LLVM_20_ATTRIBUTE
+#define _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION _LIBCPP_INTRODUCED_IN_LLVM_18
+#define _LIBCPP_AVAILABILITY_INIT_PRIMARY_EXCEPTION _LIBCPP_INTRODUCED_IN_LLVM_18_ATTRIBUTE
-// This controls whether `std::__hash_memory` is available in the dylib, which
+// This controls the availability of the C++17 std::pmr library,
-// is used for some `std::hash` specializations.
+// which is implemented in large part in the built library.
-#define _LIBCPP_AVAILABILITY_HAS_HASH_MEMORY _LIBCPP_INTRODUCED_IN_LLVM_21
+//
-// No attribute, since we've had hash in the headers before
+// TODO: Enable std::pmr markup once https://llvm.org/PR40340 has been fixed
+//       Until then, it is possible for folks to try to use `std::pmr` when back-deploying to targets that don't support
+//       it and it'll be a load-time error, but we don't have a good alternative because the library won't compile if we
+//       use availability annotations until that bug has been fixed.
+#define _LIBCPP_AVAILABILITY_HAS_PMR _LIBCPP_INTRODUCED_IN_LLVM_16
+#define _LIBCPP_AVAILABILITY_PMR
-// This controls whether we provide a message for `bad_function_call::what()` that specific to `std::bad_function_call`.
+// This controls whether the library claims to provide a default verbose
-// See https://wg21.link/LWG2233. This requires `std::bad_function_call::what()` to be available in the dylib.
+// termination function, and consequently whether the headers will try
-#define _LIBCPP_AVAILABILITY_HAS_BAD_FUNCTION_CALL_GOOD_WHAT_MESSAGE _LIBCPP_INTRODUCED_IN_LLVM_21
+// to use it when the mechanism isn't overriden at compile-time.
-// No attribute, since we've had bad_function_call::what() in the headers before
+#define _LIBCPP_AVAILABILITY_HAS_VERBOSE_ABORT _LIBCPP_INTRODUCED_IN_LLVM_15
+#define _LIBCPP_AVAILABILITY_VERBOSE_ABORT _LIBCPP_INTRODUCED_IN_LLVM_15_ATTRIBUTE
+// This controls the availability of floating-point std::to_chars functions.
+// These overloads were added later than the integer overloads.
+#define _LIBCPP_AVAILABILITY_HAS_TO_CHARS_FLOATING_POINT _LIBCPP_INTRODUCED_IN_LLVM_14
+#define _LIBCPP_AVAILABILITY_TO_CHARS_FLOATING_POINT _LIBCPP_INTRODUCED_IN_LLVM_14_ATTRIBUTE
-// Define availability attributes that depend on both
+// Enable additional explicit instantiations of iostreams components. This
-// _LIBCPP_HAS_EXCEPTIONS and _LIBCPP_HAS_RTTI.
+// reduces the number of weak definitions generated in programs that use
-#if !_LIBCPP_HAS_EXCEPTIONS || !_LIBCPP_HAS_RTTI
+// iostreams by providing a single strong definition in the shared library.
-#  undef _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION
+//
-#  undef _LIBCPP_AVAILABILITY_INIT_PRIMARY_EXCEPTION
+// TODO: Enable additional explicit instantiations on GCC once it supports exclude_from_explicit_instantiation,
-#  define _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION 0
+//       or once libc++ doesn't use the attribute anymore.
-#  define _LIBCPP_AVAILABILITY_INIT_PRIMARY_EXCEPTION
+// TODO: Enable them on Windows once https://llvm.org/PR41018 has been fixed.
+#if !defined(_LIBCPP_COMPILER_GCC) && !defined(_WIN32)
+#  define _LIBCPP_AVAILABILITY_HAS_ADDITIONAL_IOSTREAM_EXPLICIT_INSTANTIATIONS_1 _LIBCPP_INTRODUCED_IN_LLVM_12
+#else
+#  define _LIBCPP_AVAILABILITY_HAS_ADDITIONAL_IOSTREAM_EXPLICIT_INSTANTIATIONS_1 0
 #endif
+// Controls whether the implementation for text_encoding::environment() is available
+#define _LIBCPP_AVAILABILITY_HAS_TEXT_ENCODING_ENVIRONMENT _LIBCPP_INTRODUCED_IN_LLVM_23
+#define _LIBCPP_AVAILABILITY_TEXT_ENCODING_ENVIRONMENT _LIBCPP_INTRODUCED_IN_LLVM_23_ATTRIBUTE
 // Only define a bunch of symbols in the dylib if we need to be compatible with LLVM 7 headers or older
 #  if defined(_LIBCPP_BUILDING_LIBRARY) && _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 8
 #    define _LIBCPP_HIDE_FROM_ABI_SINCE_LLVM8

lib/libcxx/include/__configuration/compiler.h+29-4

...	@@ -33,12 +33,12 @@	...	@@ -33,12 +33,12 @@
33	// Warn if a compiler version is used that is not supported anymore	33	// Warn if a compiler version is used that is not supported anymore
34	// LLVM RELEASE Update the minimum compiler versions	34	// LLVM RELEASE Update the minimum compiler versions
35	# if defined(_LIBCPP_CLANG_VER)	35	# if defined(_LIBCPP_CLANG_VER)
36	# if _LIBCPP_CLANG_VER < 2001	36	# if _LIBCPP_CLANG_VER < 2101
37	# warning "Libc++ only supports Clang 20 and later"	37	# warning "Libc++ only supports Clang 21 and later"
38	# endif	38	# endif
39	# elif defined(_LIBCPP_APPLE_CLANG_VER)	39	# elif defined(_LIBCPP_APPLE_CLANG_VER)
40	# if _LIBCPP_APPLE_CLANG_VER < 1700	40	# if _LIBCPP_APPLE_CLANG_VER < 2100
41	# warning "Libc++ only supports AppleClang 26 and later"	41	# warning "Libc++ only supports AppleClang 26.4 and later"
42	# endif	42	# endif
43	# elif defined(_LIBCPP_GCC_VER)	43	# elif defined(_LIBCPP_GCC_VER)
44	# if _LIBCPP_GCC_VER < 1500	44	# if _LIBCPP_GCC_VER < 1500
...	@@ -46,6 +46,31 @@	...	@@ -46,6 +46,31 @@
46	# endif	46	# endif
47	# endif	47	# endif
48		48
		49	# ifndef __has_constexpr_builtin
		50	# define __has_constexpr_builtin(x) 0
		51	# endif
		52
		53	// This checks wheter a Clang module is built
		54	# ifndef __building_module
		55	# define __building_module(...) 0
		56	# endif
		57
		58	// '__is_identifier' returns '0' if '__x' is a reserved identifier provided by
		59	// the compiler and '1' otherwise.
		60	# ifndef __is_identifier
		61	# define __is_identifier(__x) 1
		62	# endif
		63
		64	# define __has_keyword(__x) !(__is_identifier(__x))
		65
		66	# ifndef __has_warning
		67	# define __has_warning(...) 0
		68	# endif
		69
		70	# if !defined(_LIBCPP_COMPILER_CLANG_BASED) && __cplusplus < 201103L
		71	# error "libc++ only supports C++03 with Clang-based compilers. Please enable C++11"
		72	# endif
		73
49	#endif	74	#endif
50		75
51	#endif // _LIBCPP___CONFIGURATION_COMPILER_H	76	#endif // _LIBCPP___CONFIGURATION_COMPILER_H

lib/libcxx/include/__configuration/diagnostic_suppression.h created+44

...	@@ -0,0 +1,44 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CONFIGURATION_DIAGNOSTIC_SUPPRESSION_H
11	#define _LIBCPP___CONFIGURATION_DIAGNOSTIC_SUPPRESSION_H
12
13	/* zig patch: instead of including __config_site, zig adds -D flags when compiling */
14	#include <__configuration/compiler.h>
15	#include <__configuration/utility.h>
16
17	#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
18	# pragma GCC system_header
19	#endif
20
21	#ifdef _LIBCPP_COMPILER_CLANG_BASED
22	# define _LIBCPP_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
23	# define _LIBCPP_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
24	# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED(str) _Pragma(_LIBCPP_TOSTRING(clang diagnostic ignored str))
25	# define _LIBCPP_GCC_DIAGNOSTIC_IGNORED(str)
26	#elif defined(_LIBCPP_COMPILER_GCC)
27	# define _LIBCPP_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
28	# define _LIBCPP_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
29	# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED(str)
30	# define _LIBCPP_GCC_DIAGNOSTIC_IGNORED(str) _Pragma(_LIBCPP_TOSTRING(GCC diagnostic ignored str))
31	#else
32	# define _LIBCPP_DIAGNOSTIC_PUSH
33	# define _LIBCPP_DIAGNOSTIC_POP
34	# define _LIBCPP_CLANG_DIAGNOSTIC_IGNORED(str)
35	# define _LIBCPP_GCC_DIAGNOSTIC_IGNORED(str)
36	#endif
37
38	// Macros to enter and leave a state where deprecation warnings are suppressed.
39	#define _LIBCPP_SUPPRESS_DEPRECATED_PUSH \
40	_LIBCPP_DIAGNOSTIC_PUSH _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated") \
41	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wdeprecated-declarations")
42	#define _LIBCPP_SUPPRESS_DEPRECATED_POP _LIBCPP_DIAGNOSTIC_POP
43
44	#endif // _LIBCPP___CONFIGURATION_DIAGNOSTIC_SUPPRESSION_H

lib/libcxx/include/__configuration/hardening.h-17

...	@@ -17,23 +17,6 @@	...	@@ -17,23 +17,6 @@
17	# pragma GCC system_header	17	# pragma GCC system_header
18	#endif	18	#endif
19		19
20	// TODO(LLVM 23): Remove this. We're making these an error to catch folks who might not have migrated.
21	// Since hardening went through several changes (many of which impacted user-facing macros),
22	// we're keeping these checks around for a bit longer than usual. Failure to properly configure
23	// hardening results in checks being dropped silently, which is a pretty big deal.
24	#if defined(_LIBCPP_ENABLE_ASSERTIONS)
25	# error "_LIBCPP_ENABLE_ASSERTIONS has been removed, please use _LIBCPP_HARDENING_MODE=<mode> instead (see docs)"
26	#endif
27	#if defined(_LIBCPP_ENABLE_HARDENED_MODE)
28	# error "_LIBCPP_ENABLE_HARDENED_MODE has been removed, please use _LIBCPP_HARDENING_MODE=<mode> instead (see docs)"
29	#endif
30	#if defined(_LIBCPP_ENABLE_SAFE_MODE)
31	# error "_LIBCPP_ENABLE_SAFE_MODE has been removed, please use _LIBCPP_HARDENING_MODE=<mode> instead (see docs)"
32	#endif
33	#if defined(_LIBCPP_ENABLE_DEBUG_MODE)
34	# error "_LIBCPP_ENABLE_DEBUG_MODE has been removed, please use _LIBCPP_HARDENING_MODE=<mode> instead (see docs)"
35	#endif
36
37	// The library provides the macro `_LIBCPP_HARDENING_MODE` which can be set to one of the following values:	20	// The library provides the macro `_LIBCPP_HARDENING_MODE` which can be set to one of the following values:
38	//	21	//
39	// - `_LIBCPP_HARDENING_MODE_NONE`;	22	// - `_LIBCPP_HARDENING_MODE_NONE`;

lib/libcxx/include/__configuration/language.h+42

...	@@ -50,4 +50,46 @@	...	@@ -50,4 +50,46 @@
50	# define _LIBCPP_HAS_EXCEPTIONS 0	50	# define _LIBCPP_HAS_EXCEPTIONS 0
51	#endif	51	#endif
52		52
		53	#if _LIBCPP_STD_VER <= 17 \|\| !defined(__cpp_char8_t)
		54	# define _LIBCPP_HAS_CHAR8_T 0
		55	#else
		56	# define _LIBCPP_HAS_CHAR8_T 1
		57	#endif
		58
		59	#if _LIBCPP_STD_VER <= 11
		60	# define _LIBCPP_EXPLICIT_SINCE_CXX14
		61	#else
		62	# define _LIBCPP_EXPLICIT_SINCE_CXX14 explicit
		63	#endif
		64
		65	#if _LIBCPP_STD_VER >= 14
		66	# define _LIBCPP_CONSTEXPR_SINCE_CXX14 constexpr
		67	#else
		68	# define _LIBCPP_CONSTEXPR_SINCE_CXX14
		69	#endif
		70
		71	#if _LIBCPP_STD_VER >= 17
		72	# define _LIBCPP_CONSTEXPR_SINCE_CXX17 constexpr
		73	#else
		74	# define _LIBCPP_CONSTEXPR_SINCE_CXX17
		75	#endif
		76
		77	#if _LIBCPP_STD_VER >= 20
		78	# define _LIBCPP_CONSTEXPR_SINCE_CXX20 constexpr
		79	#else
		80	# define _LIBCPP_CONSTEXPR_SINCE_CXX20
		81	#endif
		82
		83	#if _LIBCPP_STD_VER >= 23
		84	# define _LIBCPP_CONSTEXPR_SINCE_CXX23 constexpr
		85	#else
		86	# define _LIBCPP_CONSTEXPR_SINCE_CXX23
		87	#endif
		88
		89	#if _LIBCPP_STD_VER >= 26
		90	# define _LIBCPP_CONSTEXPR_SINCE_CXX26 constexpr
		91	#else
		92	# define _LIBCPP_CONSTEXPR_SINCE_CXX26
		93	#endif
		94
53	#endif // _LIBCPP___CONFIGURATION_LANGUAGE_H	95	#endif // _LIBCPP___CONFIGURATION_LANGUAGE_H

lib/libcxx/include/__configuration/namespace.h created+99

...	@@ -0,0 +1,99 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CONFIGURATION_NAMESPACE_H
11	#define _LIBCPP___CONFIGURATION_NAMESPACE_H
12
13	/* zig patch: instead of including __config_site, zig adds -D flags when compiling */
14	#include <__configuration/attributes.h>
15	#include <__configuration/diagnostic_suppression.h>
16	#include <__configuration/utility.h>
17
18	#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
19	# pragma GCC system_header
20	#endif
21
22	// Clang modules take a significant compile time hit when pushing and popping diagnostics.
23	// Since all the headers are marked as system headers unless _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER is defined, we can
24	// simply disable this pushing and popping when _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER isn't defined.
25	#ifdef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
26	# define _LIBCPP_PUSH_EXTENSION_DIAGNOSTICS \
27	_LIBCPP_DIAGNOSTIC_PUSH \
28	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++11-extensions") \
29	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++14-extensions") \
30	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++17-extensions") \
31	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++20-extensions") \
32	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wc++23-extensions") \
33	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wc++14-extensions") \
34	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wc++17-extensions") \
35	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wc++20-extensions") \
36	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wc++23-extensions")
37	# define _LIBCPP_POP_EXTENSION_DIAGNOSTICS _LIBCPP_DIAGNOSTIC_POP
38	# define _LIBCPP_PUSH_ABI_PRAGMA_DIAGNOSTICS \
39	_LIBCPP_DIAGNOSTIC_PUSH _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wpragma-clang-attribute") \
40	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wignored-attributes")
41	# define _LIBCPP_POP_ABI_PRAGMA_DIAGNOSTICS _LIBCPP_DIAGNOSTIC_POP
42	#else
43	# define _LIBCPP_PUSH_EXTENSION_DIAGNOSTICS
44	# define _LIBCPP_POP_EXTENSION_DIAGNOSTICS
45	# define _LIBCPP_PUSH_ABI_PRAGMA_DIAGNOSTICS
46	# define _LIBCPP_POP_ABI_PRAGMA_DIAGNOSTICS
47	#endif
48
49	#define _LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS \
50	_LIBCPP_PUSH_ABI_PRAGMA_DIAGNOSTICS \
51	_Pragma(_LIBCPP_TOSTRING(clang attribute _LibcxxExplicitABIAnnotations.push( \
52	__attribute__((__exclude_from_explicit_instantiation__, \
53	__visibility__("hidden"), \
54	__abi_tag__(_LIBCPP_TOSTRING(_LIBCPP_ODR_SIGNATURE)))), \
55	apply_to = function))) _LIBCPP_POP_ABI_PRAGMA_DIAGNOSTICS
56
57	#define _LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS _Pragma("clang attribute _LibcxxExplicitABIAnnotations.pop")
58
59	// clang-format off
60
61	// The unversioned namespace is used when we want to be ABI compatible with other standard libraries in some way. There
62	// are two main categories where that's the case:
63	// - Historically, we have made exception types ABI compatible with libstdc++ to allow throwing them between libstdc++
64	// and libc++. This is not used anymore for new exception types, since there is no use-case for it anymore.
65	// - Types and functions which are used by the compiler are in the unversioned namespace, since the compiler has to know
66	// their mangling without the appropriate declaration in some cases.
67	// If it's not clear whether using the unversioned namespace is the correct thing to do, it's not. The versioned
68	// namespace (_LIBCPP_BEGIN_NAMESPACE_STD) should almost always be used.
69	# define _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD \
70	_LIBCPP_PUSH_EXTENSION_DIAGNOSTICS _LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS namespace _LIBCPP_NAMESPACE_VISIBILITY std {
71
72	# define _LIBCPP_END_UNVERSIONED_NAMESPACE_STD } _LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS _LIBCPP_POP_EXTENSION_DIAGNOSTICS
73
74	# define _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD inline namespace _LIBCPP_ABI_NAMESPACE {
75	# define _LIBCPP_END_NAMESPACE_STD } _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
76
77	// TODO: This should really be in the versioned namespace
78	#define _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD namespace experimental {
79	#define _LIBCPP_END_NAMESPACE_EXPERIMENTAL } _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
80
81	#define _LIBCPP_BEGIN_NAMESPACE_LFTS _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL inline namespace fundamentals_v1 {
82	#define _LIBCPP_END_NAMESPACE_LFTS } _LIBCPP_END_NAMESPACE_EXPERIMENTAL
83
84	#define _LIBCPP_BEGIN_NAMESPACE_LFTS_V2 _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL inline namespace fundamentals_v2 {
85	#define _LIBCPP_END_NAMESPACE_LFTS_V2 } _LIBCPP_END_NAMESPACE_EXPERIMENTAL
86
87	#ifdef _LIBCPP_ABI_NO_FILESYSTEM_INLINE_NAMESPACE
88	# define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM _LIBCPP_BEGIN_NAMESPACE_STD namespace filesystem {
89	# define _LIBCPP_END_NAMESPACE_FILESYSTEM } _LIBCPP_END_NAMESPACE_STD
90	#else
91	# define _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM _LIBCPP_BEGIN_NAMESPACE_STD \
92	inline namespace __fs { namespace filesystem {
93
94	# define _LIBCPP_END_NAMESPACE_FILESYSTEM }} _LIBCPP_END_NAMESPACE_STD
95	#endif
96
97	// clang-format on
98
99	#endif // _LIBCPP___CONFIGURATION_NAMESPACE_H

lib/libcxx/include/__configuration/platform.h+4

 @@ -30,6 +30,10 @@
 // ... add new file formats here ...
 #endif
+#if defined(__MVS__)
+#  include <features.h> // for __NATIVE_ASCII_F
+#endif
 // Need to detect which libc we're using if we're on Linux.
 #if (defined(__linux__) || defined(__AMDGPU__) || defined(__NVPTX__)) && __has_include(<features.h>)
 #  include <features.h>

lib/libcxx/include/__configuration/pstl.h created+66

...	@@ -0,0 +1,66 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CONFIGURATION_PSTL_H
11	#define _LIBCPP___CONFIGURATION_PSTL_H
12
13	/* zig patch: instead of including __config_site, zig adds -D flags when compiling */
14
15	#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
16	# pragma GCC system_header
17	#endif
18
19	#define _PSTL_PRAGMA(x) _Pragma(#x)
20
21	// Enable SIMD for compilers that support OpenMP 4.0
22	#if (defined(_OPENMP) && _OPENMP >= 201307)
23
24	# define _PSTL_UDR_PRESENT
25	# define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(omp simd)
26	# define _PSTL_PRAGMA_DECLARE_SIMD _PSTL_PRAGMA(omp declare simd)
27	# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(omp simd reduction(PRM))
28	# define _PSTL_PRAGMA_SIMD_SCAN(PRM) _PSTL_PRAGMA(omp simd reduction(inscan, PRM))
29	# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan inclusive(PRM))
30	# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan exclusive(PRM))
31
32	// Declaration of reduction functor, where
33	// NAME - the name of the functor
34	// OP - type of the callable object with the reduction operation
35	// omp_in - refers to the local partial result
36	// omp_out - refers to the final value of the combiner operator
37	// omp_priv - refers to the private copy of the initial value
38	// omp_orig - refers to the original variable to be reduced
39	# define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP) \
40	_PSTL_PRAGMA(omp declare reduction(NAME:OP : omp_out(omp_in)) initializer(omp_priv = omp_orig))
41
42	#elif defined(_LIBCPP_COMPILER_CLANG_BASED)
43
44	# define _PSTL_PRAGMA_SIMD _Pragma("clang loop vectorize(enable) interleave(enable)")
45	# define _PSTL_PRAGMA_DECLARE_SIMD
46	# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _Pragma("clang loop vectorize(enable) interleave(enable)")
47	# define _PSTL_PRAGMA_SIMD_SCAN(PRM) _Pragma("clang loop vectorize(enable) interleave(enable)")
48	# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM)
49	# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM)
50	# define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP)
51
52	#else // (defined(_OPENMP) && _OPENMP >= 201307)
53
54	# define _PSTL_PRAGMA_SIMD
55	# define _PSTL_PRAGMA_DECLARE_SIMD
56	# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM)
57	# define _PSTL_PRAGMA_SIMD_SCAN(PRM)
58	# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM)
59	# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM)
60	# define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP)
61
62	#endif // (defined(_OPENMP) && _OPENMP >= 201307)
63
64	#define _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
65
66	#endif // _LIBCPP___CONFIGURATION_PSTL_H

lib/libcxx/include/__configuration/utility.h created+26

...	@@ -0,0 +1,26 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CONFIGURATION_UTILITY_H
11	#define _LIBCPP___CONFIGURATION_UTILITY_H
12
13	/* zig patch: instead of including __config_site, zig adds -D flags when compiling */
14
15	#ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
16	# pragma GCC system_header
17	#endif
18
19	#define _LIBCPP_TOSTRING2(x) #x
20	#define _LIBCPP_TOSTRING(x) _LIBCPP_TOSTRING2(x)
21
22	#define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y
23	#define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y)
24	#define _LIBCPP_CONCAT3(X, Y, Z) _LIBCPP_CONCAT(X, _LIBCPP_CONCAT(Y, Z))
25
26	#endif // _LIBCPP___CONFIGURATION_UTILITY_H

lib/libcxx/include/__cstddef/byte.h+6-6

lib/libcxx/include/__cstddef/max_align_t.h+4-2

 @@ -16,12 +16,14 @@
 #  pragma GCC system_header
 #endif
+#if !defined(_LIBCPP_CXX03_LANG)
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if !defined(_LIBCPP_CXX03_LANG)
 using ::max_align_t _LIBCPP_USING_IF_EXISTS;
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif
 #endif // _LIBCPP___CSTDDEF_MAX_ALIGN_T_H

lib/libcxx/include/__debug_utils/sanitizers.h+30-5

 @@ -17,7 +17,32 @@
 #  pragma GCC system_header
 #endif
-#if __has_feature(address_sanitizer)
+// Within libc++, _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS determines whether the containers should
+// provide ASAN container overflow checks. That setting attempts to honour ASAN's documented option
+// __SANITIZER_DISABLE_CONTAINER_OVERFLOW__ which can be defined by users to disable container overflow
+// checks.
+//
+// However, since parts of some containers (e.g. std::string) are compiled separately into the built
+// library, there are caveats:
+// - __SANITIZER_DISABLE_CONTAINER_OVERFLOW__ can't always be honoured, i.e. if the built library
+//   was compiled with ASAN container checks, it's impossible to turn them off afterwards. We diagnose
+//   this with an error to avoid the proliferation of invalid configurations that appear to work.
+//
+// - The container overflow checks themselves are not always available even when the user is compiling
+//   with -fsanitize=address. If a container is compiled separately like std::string, it can't provide
+//   container checks unless the separately compiled code was built with container checks enabled. These
+//   containers need to also conditionalize whether they provide overflow checks on `_LIBCPP_INSTRUMENTED_WITH_ASAN`.
+#if __has_feature(address_sanitizer) && !defined(__SANITIZER_DISABLE_CONTAINER_OVERFLOW__)
+#  define _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS 1
+#else
+#  define _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS 0
+#endif
+#if _LIBCPP_INSTRUMENTED_WITH_ASAN && !_LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
+#  error "We can't disable ASAN container checks when libc++ has been built with ASAN container checks enabled"
+#endif
+#if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
 extern "C" {
 _LIBCPP_EXPORTED_FROM_ABI void
 @@ -28,12 +53,12 @@ _LIBCPP_EXPORTED_FROM_ABI int
 __sanitizer_verify_double_ended_contiguous_container(const void*, const void*, const void*, const void*);
 }
-#endif // __has_feature(address_sanitizer)
+#endif // _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
 _LIBCPP_BEGIN_NAMESPACE_STD
 // ASan choices
-#if __has_feature(address_sanitizer)
+#if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
 #  define _LIBCPP_HAS_ASAN_CONTAINER_ANNOTATIONS_FOR_ALL_ALLOCATORS 1
 #endif
 @@ -57,7 +82,7 @@ _LIBCPP_HIDE_FROM_ABI void __annotate_double_ended_contiguous_container(
     const void* __last_old_contained,
     const void* __first_new_contained,
     const void* __last_new_contained) {
-#if !__has_feature(address_sanitizer)
+#if !_LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
   (void)__first_storage;
   (void)__last_storage;
   (void)__first_old_contained;
 @@ -86,7 +111,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void __annotate_contiguous_c
     const void* __last_storage,
     const void* __old_last_contained,
     const void* __new_last_contained) {
-#if !__has_feature(address_sanitizer)
+#if !_LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
   (void)__first_storage;
   (void)__last_storage;
   (void)__old_last_contained;

lib/libcxx/include/__exception/exception.h+2

...	@@ -22,6 +22,7 @@	...	@@ -22,6 +22,7 @@
22	#endif	22	#endif
23		23
24	_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD	24	_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
		25	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
25		26
26	#if defined(_LIBCPP_ABI_VCRUNTIME) && (!defined(_HAS_EXCEPTIONS) \|\| _HAS_EXCEPTIONS != 0)	27	#if defined(_LIBCPP_ABI_VCRUNTIME) && (!defined(_HAS_EXCEPTIONS) \|\| _HAS_EXCEPTIONS != 0)
27	// The std::exception class was already included above, but we're explicit about this condition here for clarity.	28	// The std::exception class was already included above, but we're explicit about this condition here for clarity.
...	@@ -91,6 +92,7 @@ public:	...	@@ -91,6 +92,7 @@ public:
91	};	92	};
92	#endif // !_LIBCPP_ABI_VCRUNTIME	93	#endif // !_LIBCPP_ABI_VCRUNTIME
93		94
		95	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
94	_LIBCPP_END_UNVERSIONED_NAMESPACE_STD	96	_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
95		97
96	#endif // _LIBCPP___EXCEPTION_EXCEPTION_H	98	#endif // _LIBCPP___EXCEPTION_EXCEPTION_H

lib/libcxx/include/__exception/exception_ptr.h+15-37

...	@@ -31,7 +31,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -31,7 +31,7 @@ _LIBCPP_PUSH_MACROS
31		31
32	#ifndef _LIBCPP_ABI_MICROSOFT	32	#ifndef _LIBCPP_ABI_MICROSOFT
33		33
34	# if _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION	34	# if _LIBCPP_HAS_EXCEPTIONS && _LIBCPP_HAS_RTTI && _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION
35		35
36	namespace __cxxabiv1 {	36	namespace __cxxabiv1 {
37		37
...	@@ -55,13 +55,12 @@ _LIBCPP_OVERRIDABLE_FUNC_VIS __cxa_exception* __cxa_init_primary_exception(	...	@@ -55,13 +55,12 @@ _LIBCPP_OVERRIDABLE_FUNC_VIS __cxa_exception* __cxa_init_primary_exception(
55		55
56	} // namespace __cxxabiv1	56	} // namespace __cxxabiv1
57		57
58	# endif	58	# endif // _LIBCPP_HAS_EXCEPTIONS && _LIBCPP_HAS_RTTI && _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION
59		59
60	#endif	60	#endif // !defined(_LIBCPP_ABI_MICROSOFT)
61		61
62	_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD	62	_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
63		63	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
64	#ifndef _LIBCPP_ABI_MICROSOFT
65		64
66	inline _LIBCPP_HIDE_FROM_ABI void swap(exception_ptr& __x, exception_ptr& __y) _NOEXCEPT;	65	inline _LIBCPP_HIDE_FROM_ABI void swap(exception_ptr& __x, exception_ptr& __y) _NOEXCEPT;
67		66
...	@@ -73,6 +72,8 @@ class _LIBCPP_EXPORTED_FROM_ABI exception_ptr {	...	@@ -73,6 +72,8 @@ class _LIBCPP_EXPORTED_FROM_ABI exception_ptr {
73	template <class _Ep>	72	template <class _Ep>
74	friend _LIBCPP_HIDE_FROM_ABI exception_ptr __make_exception_ptr_explicit(_Ep&) _NOEXCEPT;	73	friend _LIBCPP_HIDE_FROM_ABI exception_ptr __make_exception_ptr_explicit(_Ep&) _NOEXCEPT;
75		74
		75	friend _LIBCPP_EXPORTED_FROM_ABI exception_ptr __copy_exception_ptr(void, const void);
		76
76	public:	77	public:
77	// exception_ptr is basically a COW string so it is trivially relocatable.	78	// exception_ptr is basically a COW string so it is trivially relocatable.
78	using __trivially_relocatable _LIBCPP_NODEBUG = exception_ptr;	79	using __trivially_relocatable _LIBCPP_NODEBUG = exception_ptr;
...	@@ -112,8 +113,10 @@ inline _LIBCPP_HIDE_FROM_ABI void swap(exception_ptr& __x, exception_ptr& __y) _	...	@@ -112,8 +113,10 @@ inline _LIBCPP_HIDE_FROM_ABI void swap(exception_ptr& __x, exception_ptr& __y) _
112	std::swap(__x.__ptr_, __y.__ptr_);	113	std::swap(__x.__ptr_, __y.__ptr_);
113	}	114	}
114		115
		116	#ifndef _LIBCPP_ABI_MICROSOFT
		117
115	# if _LIBCPP_HAS_EXCEPTIONS	118	# if _LIBCPP_HAS_EXCEPTIONS
116	# if _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION	119	# if _LIBCPP_HAS_RTTI && _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION
117	template <class _Ep>	120	template <class _Ep>
118	_LIBCPP_HIDE_FROM_ABI exception_ptr __make_exception_ptr_explicit(_Ep& __e) _NOEXCEPT {	121	_LIBCPP_HIDE_FROM_ABI exception_ptr __make_exception_ptr_explicit(_Ep& __e) _NOEXCEPT {
119	using _Ep2 = __decay_t<_Ep>;	122	using _Ep2 = __decay_t<_Ep>;
...	@@ -136,7 +139,7 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr __make_exception_ptr_explicit(_Ep& __e) _NOE	...	@@ -136,7 +139,7 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr __make_exception_ptr_explicit(_Ep& __e) _NOE
136	return current_exception();	139	return current_exception();
137	}	140	}
138	}	141	}
139	# endif	142	# endif // _LIBCPP_HAS_RTTI && _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION
140		143
141	template <class _Ep>	144	template <class _Ep>
142	_LIBCPP_HIDE_FROM_ABI exception_ptr __make_exception_ptr_via_throw(_Ep& __e) _NOEXCEPT {	145	_LIBCPP_HIDE_FROM_ABI exception_ptr __make_exception_ptr_via_throw(_Ep& __e) _NOEXCEPT {
...	@@ -164,7 +167,7 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep __e) _NOEXCEPT {	...	@@ -164,7 +167,7 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep __e) _NOEXCEPT {
164	return std::__make_exception_ptr_via_throw(__e);	167	return std::__make_exception_ptr_via_throw(__e);
165	}	168	}
166		169
167	# if _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION && !defined(_LIBCPP_CXX03_LANG)	170	# if _LIBCPP_HAS_RTTI && _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION && !defined(_LIBCPP_CXX03_LANG)
168	return std::__make_exception_ptr_explicit(__e);	171	return std::__make_exception_ptr_explicit(__e);
169	# else	172	# else
170	return std::__make_exception_ptr_via_throw(__e);	173	return std::__make_exception_ptr_via_throw(__e);
...	@@ -177,36 +180,9 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep) _NOEXCEPT {	...	@@ -177,36 +180,9 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep) _NOEXCEPT {
177	}	180	}
178	# endif // _LIBCPP_HAS_EXCEPTIONS	181	# endif // _LIBCPP_HAS_EXCEPTIONS
179		182
180	#else // _LIBCPP_ABI_MICROSOFT	183	#else // defined(_LIBCPP_ABI_MICROSOFT)
181
182	class _LIBCPP_EXPORTED_FROM_ABI exception_ptr {
183	_LIBCPP_DIAGNOSTIC_PUSH
184	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wunused-private-field")
185	void* __ptr1_;
186	void* __ptr2_;
187	_LIBCPP_DIAGNOSTIC_POP
188
189	public:
190	exception_ptr() _NOEXCEPT;
191	exception_ptr(nullptr_t) _NOEXCEPT;
192	exception_ptr(const exception_ptr& __other) _NOEXCEPT;
193	exception_ptr& operator=(const exception_ptr& __other) _NOEXCEPT;
194	exception_ptr& operator=(nullptr_t) _NOEXCEPT;
195	~exception_ptr() _NOEXCEPT;
196	explicit operator bool() const _NOEXCEPT;
197	};
198
199	_LIBCPP_EXPORTED_FROM_ABI bool operator==(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT;
200
201	inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT {
202	return !(__x == __y);
203	}
204
205	_LIBCPP_EXPORTED_FROM_ABI void swap(exception_ptr&, exception_ptr&) _NOEXCEPT;
206		184
207	_LIBCPP_EXPORTED_FROM_ABI exception_ptr __copy_exception_ptr(void* __except, const void* __ptr);	185	_LIBCPP_EXPORTED_FROM_ABI exception_ptr __copy_exception_ptr(void* __except, const void* __ptr);
208	_LIBCPP_EXPORTED_FROM_ABI exception_ptr current_exception() _NOEXCEPT;
209	[[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void rethrow_exception(exception_ptr);
210		186
211	// This is a built-in template function which automagically extracts the required	187	// This is a built-in template function which automagically extracts the required
212	// information.	188	// information.
...	@@ -218,7 +194,9 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep __e) _NOEXCEPT {	...	@@ -218,7 +194,9 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep __e) _NOEXCEPT {
218	return __copy_exception_ptr(std::addressof(__e), __GetExceptionInfo(__e));	194	return __copy_exception_ptr(std::addressof(__e), __GetExceptionInfo(__e));
219	}	195	}
220		196
221	#endif // _LIBCPP_ABI_MICROSOFT	197	#endif // defined(_LIBCPP_ABI_MICROSOFT)
		198
		199	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
222	_LIBCPP_END_UNVERSIONED_NAMESPACE_STD	200	_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
223		201
224	_LIBCPP_POP_MACROS	202	_LIBCPP_POP_MACROS

lib/libcxx/include/__exception/nested_exception.h+6-6

 @@ -14,7 +14,6 @@
 #include <__memory/addressof.h>
 #include <__type_traits/decay.h>
 #include <__type_traits/enable_if.h>
-#include <__type_traits/integral_constant.h>
 #include <__type_traits/is_base_of.h>
 #include <__type_traits/is_class.h>
 #include <__type_traits/is_constructible.h>
 @@ -28,6 +27,7 @@
 #endif
 _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 class _LIBCPP_EXPORTED_FROM_ABI nested_exception {
   exception_ptr __ptr_;
 @@ -81,20 +81,20 @@ template <class _Tp>
 }
 template <class _From, class _To>
-struct __can_dynamic_cast
+inline const bool __can_dynamic_cast_v =
-    : _BoolConstant< is_polymorphic<_From>::value &&
+    is_polymorphic<_From>::value && (!is_base_of<_To, _From>::value || is_convertible<const _From*, const _To*>::value);
-                     (!is_base_of<_To, _From>::value || is_convertible<const _From*, const _To*>::value)> {};
-template <class _Ep, __enable_if_t< __can_dynamic_cast<_Ep, nested_exception>::value, int> = 0>
+template <class _Ep, __enable_if_t<__can_dynamic_cast_v<_Ep, nested_exception>, int> = 0>
 inline _LIBCPP_HIDE_FROM_ABI void rethrow_if_nested(const _Ep& __e) {
   const nested_exception* __nep = dynamic_cast<const nested_exception*>(std::addressof(__e));
   if (__nep)
     __nep->rethrow_nested();
 }
-template <class _Ep, __enable_if_t<!__can_dynamic_cast<_Ep, nested_exception>::value, int> = 0>
+template <class _Ep, __enable_if_t<!__can_dynamic_cast_v<_Ep, nested_exception>, int> = 0>
 inline _LIBCPP_HIDE_FROM_ABI void rethrow_if_nested(const _Ep&) {}
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #endif // _LIBCPP___EXCEPTION_NESTED_EXCEPTION_H

lib/libcxx/include/__exception/operations.h+4

...	@@ -16,6 +16,8 @@	...	@@ -16,6 +16,8 @@
16	#endif	16	#endif
17		17
18	_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD	18	_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
		19	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
		20
19	#if _LIBCPP_STD_VER <= 14 \|\| defined(_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS) \|\| \	21	#if _LIBCPP_STD_VER <= 14 \|\| defined(_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS) \|\| \
20	defined(_LIBCPP_BUILDING_LIBRARY)	22	defined(_LIBCPP_BUILDING_LIBRARY)
21	using unexpected_handler = void (*)();	23	using unexpected_handler = void (*)();
...	@@ -37,6 +39,8 @@ class _LIBCPP_EXPORTED_FROM_ABI exception_ptr;	...	@@ -37,6 +39,8 @@ class _LIBCPP_EXPORTED_FROM_ABI exception_ptr;
37		39
38	[[__nodiscard__]] _LIBCPP_EXPORTED_FROM_ABI exception_ptr current_exception() _NOEXCEPT;	40	[[__nodiscard__]] _LIBCPP_EXPORTED_FROM_ABI exception_ptr current_exception() _NOEXCEPT;
39	[[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void rethrow_exception(exception_ptr);	41	[[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void rethrow_exception(exception_ptr);
		42
		43	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
40	_LIBCPP_END_UNVERSIONED_NAMESPACE_STD	44	_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
41		45
42	#endif // _LIBCPP___EXCEPTION_OPERATIONS_H	46	#endif // _LIBCPP___EXCEPTION_OPERATIONS_H

lib/libcxx/include/__exception/terminate.h+4

 @@ -16,7 +16,11 @@
 #endif
 _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 [[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void terminate() _NOEXCEPT;
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #endif // _LIBCPP___EXCEPTION_TERMINATE_H

lib/libcxx/include/__expected/bad_expected_access.h+2

...	@@ -23,6 +23,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -23,6 +23,7 @@ _LIBCPP_PUSH_MACROS
23	#if _LIBCPP_STD_VER >= 23	23	#if _LIBCPP_STD_VER >= 23
24		24
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
		26	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
26		27
27	template <class _Err>	28	template <class _Err>
28	class bad_expected_access;	29	class bad_expected_access;
...	@@ -66,6 +67,7 @@ private:	...	@@ -66,6 +67,7 @@ private:
66	_Err __unex_;	67	_Err __unex_;
67	};	68	};
68		69
		70	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
69	_LIBCPP_END_NAMESPACE_STD	71	_LIBCPP_END_NAMESPACE_STD
70		72
71	#endif // _LIBCPP_STD_VER >= 23	73	#endif // _LIBCPP_STD_VER >= 23

lib/libcxx/include/__expected/expected.h+19-13

 @@ -10,6 +10,7 @@
 #define _LIBCPP___EXPECTED_EXPECTED_H
 #include <__assert>
+#include <__concepts/same_as.h>
 #include <__config>
 #include <__expected/bad_expected_access.h>
 #include <__expected/unexpect.h>
 @@ -36,7 +37,6 @@
 #include <__type_traits/is_trivially_destructible.h>
 #include <__type_traits/is_trivially_relocatable.h>
 #include <__type_traits/is_void.h>
-#include <__type_traits/lazy.h>
 #include <__type_traits/negation.h>
 #include <__type_traits/remove_cv.h>
 #include <__type_traits/remove_cvref.h>
 @@ -446,6 +446,10 @@ private:
   _LIBCPP_NO_UNIQUE_ADDRESS __conditional_no_unique_address<__allow_reusing_expected_tail_padding, __repr> __repr_;
 };
+// Helper to handle comparisons that produce a value whose type is not bool,
+// but allows only implicit (and not explicit) conversions to bool.
+constexpr bool __into_bool(bool __b) noexcept { return __b; }
 template <class _Tp, class _Err>
 class expected : private __expected_base<_Tp, _Err> {
   static_assert(!is_reference_v<_Tp> && !is_function_v<_Tp> && !is_same_v<remove_cv_t<_Tp>, in_place_t> &&
 @@ -684,12 +688,11 @@ public:
 private:
   template <class _OtherErrQual>
   static constexpr bool __can_assign_from_unexpected =
-      _And< is_constructible<_Err, _OtherErrQual>,
+      _And<is_constructible<_Err, _OtherErrQual>,
-            is_assignable<_Err&, _OtherErrQual>,
+           is_assignable<_Err&, _OtherErrQual>,
-            _Lazy<_Or,
+           _Or<is_nothrow_constructible<_Err, _OtherErrQual>,
-                  is_nothrow_constructible<_Err, _OtherErrQual>,
+               is_nothrow_move_constructible<_Tp>,
-                  is_nothrow_move_constructible<_Tp>,
+               is_nothrow_move_constructible<_Err>>>::value;
-                  is_nothrow_move_constructible<_Err>> >::value;
 public:
   template <class _OtherErr>
 @@ -1161,15 +1164,18 @@ public:
     }
   }
-  template <class _T2>
+  // The unusual signature avoids constraint recursion via ADL through
-  _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const expected& __x, const _T2& __v)
+  // std::expected, see https://llvm.org/PR160431. Note that this only
+  // triggers with compilers that implement https://wg21.link/CWG2369.
+  template <class _T2, same_as<_Tp> _Tp2>
+  _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const expected<_Tp2, _Err>& __x, const _T2& __v)
 #  if _LIBCPP_STD_VER >= 26
     requires(!__is_std_expected<_T2>::value) && requires {
       { *__x == __v } -> __core_convertible_to<bool>;
     }
 #  endif
   {
-    return __x.__has_val() && static_cast<bool>(__x.__val() == __v);
+    return __x.__has_val() && std::__into_bool(__x.__val() == __v);
   }
   template <class _E2>
 @@ -1180,7 +1186,7 @@ public:
     }
 #  endif
   {
-    return !__x.__has_val() && static_cast<bool>(__x.__unex() == __e.error());
+    return !__x.__has_val() && std::__into_bool(__x.__unex() == __e.error());
   }
 };
 @@ -1882,7 +1888,7 @@ public:
     if (__x.__has_val() != __y.__has_val()) {
       return false;
     } else {
-      return __x.__has_val() || static_cast<bool>(__x.__unex() == __y.__unex());
+      return __x.__has_val() || std::__into_bool(__x.__unex() == __y.__unex());
     }
   }
 @@ -1894,7 +1900,7 @@ public:
     }
 #  endif
   {
-    return !__x.__has_val() && static_cast<bool>(__x.__unex() == __y.error());
+    return !__x.__has_val() && std::__into_bool(__x.__unex() == __y.error());
   }
 };

lib/libcxx/include/__filesystem/directory_entry.h+2

...	@@ -39,6 +39,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -39,6 +39,7 @@ _LIBCPP_PUSH_MACROS
39	#if _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_FILESYSTEM	39	#if _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_FILESYSTEM
40		40
41	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	41	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		42	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
42		43
43	class directory_entry {	44	class directory_entry {
44	typedef filesystem::path _Path;	45	typedef filesystem::path _Path;
...	@@ -465,6 +466,7 @@ private:	...	@@ -465,6 +466,7 @@ private:
465	directory_entry __elem_;	466	directory_entry __elem_;
466	};	467	};
467		468
		469	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
468	_LIBCPP_END_NAMESPACE_FILESYSTEM	470	_LIBCPP_END_NAMESPACE_FILESYSTEM
469		471
470	#endif // _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_FILESYSTEM	472	#endif // _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_FILESYSTEM

lib/libcxx/include/__filesystem/directory_iterator.h+2

...	@@ -33,6 +33,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -33,6 +33,7 @@ _LIBCPP_PUSH_MACROS
33	#if _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_FILESYSTEM	33	#if _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_FILESYSTEM
34		34
35	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	35	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		36	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
36		37
37	class _LIBCPP_HIDDEN __dir_stream;	38	class _LIBCPP_HIDDEN __dir_stream;
38	class directory_iterator {	39	class directory_iterator {
...	@@ -129,6 +130,7 @@ operator!=(const directory_iterator& __lhs, const directory_iterator& __rhs) noe	...	@@ -129,6 +130,7 @@ operator!=(const directory_iterator& __lhs, const directory_iterator& __rhs) noe
129	return directory_iterator();	130	return directory_iterator();
130	}	131	}
131		132
		133	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
132	_LIBCPP_END_NAMESPACE_FILESYSTEM	134	_LIBCPP_END_NAMESPACE_FILESYSTEM
133		135
134	# if _LIBCPP_STD_VER >= 20	136	# if _LIBCPP_STD_VER >= 20

lib/libcxx/include/__filesystem/filesystem_error.h+2

...	@@ -26,6 +26,7 @@	...	@@ -26,6 +26,7 @@
26	#if _LIBCPP_STD_VER >= 17	26	#if _LIBCPP_STD_VER >= 17
27		27
28	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	28	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		29	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
29		30
30	class _LIBCPP_EXPORTED_FROM_ABI filesystem_error : public system_error {	31	class _LIBCPP_EXPORTED_FROM_ABI filesystem_error : public system_error {
31	public:	32	public:
...	@@ -80,6 +81,7 @@ template <class... _Args>	...	@@ -80,6 +81,7 @@ template <class... _Args>
80	}	81	}
81	# endif	82	# endif
82		83
		84	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
83	_LIBCPP_END_NAMESPACE_FILESYSTEM	85	_LIBCPP_END_NAMESPACE_FILESYSTEM
84		86
85	#endif // _LIBCPP_STD_VER >= 17	87	#endif // _LIBCPP_STD_VER >= 17

lib/libcxx/include/__filesystem/operations.h+2

...	@@ -31,6 +31,7 @@	...	@@ -31,6 +31,7 @@
31		31
32	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	32	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
33		33
		34	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
34	_LIBCPP_EXPORTED_FROM_ABI path __absolute(const path&, error_code* __ec = nullptr);	35	_LIBCPP_EXPORTED_FROM_ABI path __absolute(const path&, error_code* __ec = nullptr);
35	_LIBCPP_EXPORTED_FROM_ABI path __canonical(const path&, error_code* __ec = nullptr);	36	_LIBCPP_EXPORTED_FROM_ABI path __canonical(const path&, error_code* __ec = nullptr);
36	_LIBCPP_EXPORTED_FROM_ABI bool	37	_LIBCPP_EXPORTED_FROM_ABI bool
...	@@ -67,6 +68,7 @@ _LIBCPP_EXPORTED_FROM_ABI path __temp_directory_path(error_code* __ec = nullptr)	...	@@ -67,6 +68,7 @@ _LIBCPP_EXPORTED_FROM_ABI path __temp_directory_path(error_code* __ec = nullptr)
67	_LIBCPP_EXPORTED_FROM_ABI bool __fs_is_empty(const path& __p, error_code* __ec = nullptr);	68	_LIBCPP_EXPORTED_FROM_ABI bool __fs_is_empty(const path& __p, error_code* __ec = nullptr);
68	_LIBCPP_EXPORTED_FROM_ABI void __permissions(const path&, perms, perm_options, error_code* = nullptr);	69	_LIBCPP_EXPORTED_FROM_ABI void __permissions(const path&, perms, perm_options, error_code* = nullptr);
69	_LIBCPP_EXPORTED_FROM_ABI space_info __space(const path&, error_code* __ec = nullptr);	70	_LIBCPP_EXPORTED_FROM_ABI space_info __space(const path&, error_code* __ec = nullptr);
		71	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
70		72
71	[[nodiscard]] inline _LIBCPP_HIDE_FROM_ABI path absolute(const path& __p) { return __absolute(__p); }	73	[[nodiscard]] inline _LIBCPP_HIDE_FROM_ABI path absolute(const path& __p) { return __absolute(__p); }
72	[[nodiscard]] inline _LIBCPP_HIDE_FROM_ABI path absolute(const path& __p, error_code& __ec) {	74	[[nodiscard]] inline _LIBCPP_HIDE_FROM_ABI path absolute(const path& __p, error_code& __ec) {

lib/libcxx/include/__filesystem/path.h+37-52

 @@ -23,6 +23,7 @@
 #include <__type_traits/is_pointer.h>
 #include <__type_traits/remove_const.h>
 #include <__type_traits/remove_pointer.h>
+#include <__type_traits/void_t.h>
 #include <__utility/move.h>
 #include <string>
 #include <string_view>
 @@ -41,6 +42,7 @@ _LIBCPP_PUSH_MACROS
 #if _LIBCPP_STD_VER >= 17
 _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 template <class _Tp>
 struct __can_convert_char {
 @@ -93,15 +95,12 @@ typedef string __u8_string;
 struct _NullSentinel {};
-template <class _Tp>
-using _Void _LIBCPP_NODEBUG = void;
 template <class _Tp, class = void>
 struct __is_pathable_string : public false_type {};
 template <class _ECharT, class _Traits, class _Alloc>
 struct __is_pathable_string< basic_string<_ECharT, _Traits, _Alloc>,
-                             _Void<typename __can_convert_char<_ECharT>::__char_type> >
+                             void_t<typename __can_convert_char<_ECharT>::__char_type> >
     : public __can_convert_char<_ECharT> {
   using _Str _LIBCPP_NODEBUG = basic_string<_ECharT, _Traits, _Alloc>;
 @@ -114,7 +113,7 @@ struct __is_pathable_string< basic_string<_ECharT, _Traits, _Alloc>,
 template <class _ECharT, class _Traits>
 struct __is_pathable_string< basic_string_view<_ECharT, _Traits>,
-                             _Void<typename __can_convert_char<_ECharT>::__char_type> >
+                             void_t<typename __can_convert_char<_ECharT>::__char_type> >
     : public __can_convert_char<_ECharT> {
   using _Str _LIBCPP_NODEBUG = basic_string_view<_ECharT, _Traits>;
 @@ -154,7 +153,7 @@ template <class _Iter>
 struct __is_pathable_iter<
     _Iter,
     true,
-    _Void<typename __can_convert_char< typename iterator_traits<_Iter>::value_type>::__char_type> >
+    void_t<typename __can_convert_char< typename iterator_traits<_Iter>::value_type>::__char_type> >
     : __can_convert_char<typename iterator_traits<_Iter>::value_type> {
   using _ECharT _LIBCPP_NODEBUG = typename iterator_traits<_Iter>::value_type;
 @@ -261,15 +260,14 @@ struct _PathCVT {
 template <>
 struct _PathCVT<__path_value> {
-  template <class _Iter, __enable_if_t<__has_exactly_input_iterator_category<_Iter>::value, int> = 0>
+  template <class _Iter>
-  _LIBCPP_HIDE_FROM_ABI static void __append_range(__path_string& __dest, _Iter __b, _Iter __e) {
-    for (; __b != __e; ++__b)
-      __dest.push_back(*__b);
-  }
-  template <class _Iter, __enable_if_t<__has_forward_iterator_category<_Iter>::value, int> = 0>
   _LIBCPP_HIDE_FROM_ABI static void __append_range(__path_string& __dest, _Iter __b, _Iter __e) {
-    __dest.append(__b, __e);
+    if constexpr (__has_forward_iterator_category<_Iter>::value) {
+      __dest.append(__b, __e);
+    } else {
+      for (; __b != __e; ++__b)
+        __dest.push_back(*__b);
+    }
   }
   template <class _Iter>
 @@ -296,13 +294,7 @@ struct _PathCVT<char> {
     __char_to_wide(__str, const_cast<__path_value*>(__dest.data()) + __pos, __size);
   }
-  template <class _Iter, __enable_if_t<__has_exactly_input_iterator_category<_Iter>::value, int> = 0>
+  template <class _Iter>
-  _LIBCPP_HIDE_FROM_ABI static void __append_range(__path_string& __dest, _Iter __b, _Iter __e) {
-    basic_string<char> __tmp(__b, __e);
-    __append_string(__dest, __tmp);
-  }
-  template <class _Iter, __enable_if_t<__has_forward_iterator_category<_Iter>::value, int> = 0>
   _LIBCPP_HIDE_FROM_ABI static void __append_range(__path_string& __dest, _Iter __b, _Iter __e) {
     basic_string<char> __tmp(__b, __e);
     __append_string(__dest, __tmp);
 @@ -449,7 +441,7 @@ public:
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI path& assign(string_type&& __s) noexcept {
+  _LIBCPP_HIDE_FROM_ABI path& assign(string_type&& __s) noexcept _LIBCPP_LIFETIMEBOUND {
     __pn_ = std::move(__s);
     return *this;
   }
 @@ -460,14 +452,14 @@ public:
   }
   template <class _Source>
-  _LIBCPP_HIDE_FROM_ABI _EnableIfPathable<_Source> assign(const _Source& __src) {
+  _LIBCPP_HIDE_FROM_ABI _EnableIfPathable<_Source> assign(const _Source& __src) _LIBCPP_LIFETIMEBOUND {
     __pn_.clear();
     _SourceCVT<_Source>::__append_source(__pn_, __src);
     return *this;
   }
   template <class _InputIt>
-  _LIBCPP_HIDE_FROM_ABI path& assign(_InputIt __first, _InputIt __last) {
+  _LIBCPP_HIDE_FROM_ABI path& assign(_InputIt __first, _InputIt __last) _LIBCPP_LIFETIMEBOUND {
     typedef typename iterator_traits<_InputIt>::value_type _ItVal;
     __pn_.clear();
     _PathCVT<_ItVal>::__append_range(__pn_, __first, __last);
 @@ -501,12 +493,12 @@ public:
   }
   template <class _Source>
-  _LIBCPP_HIDE_FROM_ABI _EnableIfPathable<_Source> append(const _Source& __src) {
+  _LIBCPP_HIDE_FROM_ABI _EnableIfPathable<_Source> append(const _Source& __src) _LIBCPP_LIFETIMEBOUND {
     return operator/=(path(__src));
   }
   template <class _InputIt>
-  _LIBCPP_HIDE_FROM_ABI path& append(_InputIt __first, _InputIt __last) {
+  _LIBCPP_HIDE_FROM_ABI path& append(_InputIt __first, _InputIt __last) _LIBCPP_LIFETIMEBOUND {
     return operator/=(path(__first, __last));
   }
 #  else
 @@ -530,7 +522,7 @@ public:
   }
   template <class _Source>
-  _LIBCPP_HIDE_FROM_ABI _EnableIfPathable<_Source> append(const _Source& __src) {
+  _LIBCPP_HIDE_FROM_ABI _EnableIfPathable<_Source> append(const _Source& __src) _LIBCPP_LIFETIMEBOUND {
     using _Traits             = __is_pathable<_Source>;
     using _CVT                = _PathCVT<_SourceChar<_Source> >;
     bool __source_is_absolute = filesystem::__is_separator(_Traits::__first_or_null(__src));
 @@ -543,7 +535,7 @@ public:
   }
   template <class _InputIt>
-  _LIBCPP_HIDE_FROM_ABI path& append(_InputIt __first, _InputIt __last) {
+  _LIBCPP_HIDE_FROM_ABI path& append(_InputIt __first, _InputIt __last) _LIBCPP_LIFETIMEBOUND {
     typedef typename iterator_traits<_InputIt>::value_type _ItVal;
     static_assert(__can_convert_char<_ItVal>::value, "Must convertible");
     using _CVT = _PathCVT<_ItVal>;
 @@ -594,13 +586,13 @@ public:
   }
   template <class _Source>
-  _LIBCPP_HIDE_FROM_ABI _EnableIfPathable<_Source> concat(const _Source& __x) {
+  _LIBCPP_HIDE_FROM_ABI _EnableIfPathable<_Source> concat(const _Source& __x) _LIBCPP_LIFETIMEBOUND {
     _SourceCVT<_Source>::__append_source(__pn_, __x);
     return *this;
   }
   template <class _InputIt>
-  _LIBCPP_HIDE_FROM_ABI path& concat(_InputIt __first, _InputIt __last) {
+  _LIBCPP_HIDE_FROM_ABI path& concat(_InputIt __first, _InputIt __last) _LIBCPP_LIFETIMEBOUND {
     typedef typename iterator_traits<_InputIt>::value_type _ItVal;
     _PathCVT<_ItVal>::__append_range(__pn_, __first, __last);
     return *this;
 @@ -609,26 +601,26 @@ public:
   // modifiers
   _LIBCPP_HIDE_FROM_ABI void clear() noexcept { __pn_.clear(); }
-  _LIBCPP_HIDE_FROM_ABI path& make_preferred() {
+  _LIBCPP_HIDE_FROM_ABI path& make_preferred() _LIBCPP_LIFETIMEBOUND {
 #  if defined(_LIBCPP_WIN32API)
     std::replace(__pn_.begin(), __pn_.end(), L'/', L'\\');
 #  endif
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI path& remove_filename() {
+  _LIBCPP_HIDE_FROM_ABI path& remove_filename() _LIBCPP_LIFETIMEBOUND {
     auto __fname = __filename();
     if (!__fname.empty())
       __pn_.erase(__fname.data() - __pn_.data());
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI path& replace_filename(const path& __replacement) {
+  _LIBCPP_HIDE_FROM_ABI path& replace_filename(const path& __replacement) _LIBCPP_LIFETIMEBOUND {
     remove_filename();
     return (*this /= __replacement);
   }
-  path& replace_extension(const path& __replacement = path());
+  path& replace_extension(const path& __replacement = path()) _LIBCPP_LIFETIMEBOUND;
   friend _LIBCPP_HIDE_FROM_ABI bool operator==(const path& __lhs, const path& __rhs) noexcept {
     return __lhs.__compare(__rhs.__pn_) == 0;
 @@ -667,9 +659,11 @@ public:
   _LIBCPP_HIDE_FROM_ABI void __reserve(size_t __s) { __pn_.reserve(__s); }
   // native format observers
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI const string_type& native() const noexcept { return __pn_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI const string_type& native() const noexcept _LIBCPP_LIFETIMEBOUND { return __pn_; }
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI const value_type* c_str() const noexcept { return __pn_.c_str(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI const value_type* c_str() const noexcept _LIBCPP_LIFETIMEBOUND {
+    return __pn_.c_str();
+  }
   _LIBCPP_HIDE_FROM_ABI operator string_type() const { return __pn_; }
 @@ -874,23 +868,13 @@ public:
   [[nodiscard]] iterator end() const;
 #  if _LIBCPP_HAS_LOCALIZATION
-  template <
+  template <class _CharT, class _Traits>
-      class _CharT,
-      class _Traits,
-      __enable_if_t<is_same<_CharT, value_type>::value && is_same<_Traits, char_traits<value_type> >::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI friend basic_ostream<_CharT, _Traits>&
-  operator<<(basic_ostream<_CharT, _Traits>& __os, const path& __p) {
-    __os << std::__quoted(__p.native());
-    return __os;
-  }
-  template <
-      class _CharT,
-      class _Traits,
-      __enable_if_t<!is_same<_CharT, value_type>::value || !is_same<_Traits, char_traits<value_type> >::value, int> = 0>
   _LIBCPP_HIDE_FROM_ABI friend basic_ostream<_CharT, _Traits>&
   operator<<(basic_ostream<_CharT, _Traits>& __os, const path& __p) {
-    __os << std::__quoted(__p.string<_CharT, _Traits>());
+    if constexpr (is_same<_CharT, value_type>::value && is_same<_Traits, char_traits<value_type> >::value)
+      __os << std::quoted(__p.native());
+    else
+      __os << std::quoted(__p.string<_CharT, _Traits>());
     return __os;
   }
 @@ -898,7 +882,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI friend basic_istream<_CharT, _Traits>&
   operator>>(basic_istream<_CharT, _Traits>& __is, path& __p) {
     basic_string<_CharT, _Traits> __tmp;
-    __is >> std::__quoted(__tmp);
+    __is >> std::quoted(__tmp);
     __p = __tmp;
     return __is;
   }
 @@ -916,6 +900,7 @@ inline _LIBCPP_HIDE_FROM_ABI void swap(path& __lhs, path& __rhs) noexcept { __lh
 [[nodiscard]] _LIBCPP_EXPORTED_FROM_ABI size_t hash_value(const path& __p) noexcept;
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_FILESYSTEM
 _LIBCPP_BEGIN_NAMESPACE_STD

lib/libcxx/include/__filesystem/path_iterator.h+2

...	@@ -22,6 +22,7 @@	...	@@ -22,6 +22,7 @@
22	#if _LIBCPP_STD_VER >= 17	22	#if _LIBCPP_STD_VER >= 17
23		23
24	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	24	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		25	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
25		26
26	class _LIBCPP_EXPORTED_FROM_ABI path::iterator {	27	class _LIBCPP_EXPORTED_FROM_ABI path::iterator {
27	public:	28	public:
...	@@ -103,6 +104,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const path::iterator& __lhs, const	...	@@ -103,6 +104,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const path::iterator& __lhs, const
103	return !(__lhs == __rhs);	104	return !(__lhs == __rhs);
104	}	105	}
105		106
		107	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
106	_LIBCPP_END_NAMESPACE_FILESYSTEM	108	_LIBCPP_END_NAMESPACE_FILESYSTEM
107		109
108	#endif // _LIBCPP_STD_VER >= 17	110	#endif // _LIBCPP_STD_VER >= 17

lib/libcxx/include/__filesystem/recursive_directory_iterator.h+2

...	@@ -32,6 +32,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -32,6 +32,7 @@ _LIBCPP_PUSH_MACROS
32	#if _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_FILESYSTEM	32	#if _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_FILESYSTEM
33		33
34	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	34	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		35	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
35		36
36	class recursive_directory_iterator {	37	class recursive_directory_iterator {
37	public:	38	public:
...	@@ -139,6 +140,7 @@ begin(recursive_directory_iterator __iter) noexcept {	...	@@ -139,6 +140,7 @@ begin(recursive_directory_iterator __iter) noexcept {
139	return recursive_directory_iterator();	140	return recursive_directory_iterator();
140	}	141	}
141		142
		143	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
142	_LIBCPP_END_NAMESPACE_FILESYSTEM	144	_LIBCPP_END_NAMESPACE_FILESYSTEM
143		145
144	# if _LIBCPP_STD_VER >= 20	146	# if _LIBCPP_STD_VER >= 20

lib/libcxx/include/__flat_map/flat_multimap.h-9

...	@@ -934,15 +934,6 @@ private:	...	@@ -934,15 +934,6 @@ private:
934		934
935	containers __containers_;	935	containers __containers_;
936	_LIBCPP_NO_UNIQUE_ADDRESS key_compare __compare_;	936	_LIBCPP_NO_UNIQUE_ADDRESS key_compare __compare_;
937
938	struct __key_equiv {
939	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __key_equiv(key_compare __c) : __comp_(__c) {}
940	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
941	operator()(const_reference __x, const_reference __y) const {
942	return !__comp_(std::get<0>(__x), std::get<0>(__y)) && !__comp_(std::get<0>(__y), std::get<0>(__x));
943	}
944	key_compare __comp_;
945	};
946	};	937	};
947		938
948	template <class _KeyContainer, class _MappedContainer, class _Compare = less<typename _KeyContainer::value_type>>	939	template <class _KeyContainer, class _MappedContainer, class _Compare = less<typename _KeyContainer::value_type>>

lib/libcxx/include/__flat_set/flat_multiset.h-9

...	@@ -745,15 +745,6 @@ private:	...	@@ -745,15 +745,6 @@ private:
745		745
746	_KeyContainer __keys_;	746	_KeyContainer __keys_;
747	_LIBCPP_NO_UNIQUE_ADDRESS key_compare __compare_;	747	_LIBCPP_NO_UNIQUE_ADDRESS key_compare __compare_;
748
749	struct __key_equiv {
750	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __key_equiv(key_compare __c) : __comp_(__c) {}
751	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
752	operator()(const_reference __x, const_reference __y) const {
753	return !__comp_(std::get<0>(__x), std::get<0>(__y)) && !__comp_(std::get<0>(__y), std::get<0>(__x));
754	}
755	key_compare __comp_;
756	};
757	};	748	};
758		749
759	template <class _KeyContainer, class _Compare = less<typename _KeyContainer::value_type>>	750	template <class _KeyContainer, class _Compare = less<typename _KeyContainer::value_type>>

lib/libcxx/include/__format/container_adaptor.h+4-4

 @@ -24,10 +24,10 @@
 #include <__type_traits/is_const.h>
 #include <__type_traits/maybe_const.h>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [container.adaptors.format] only specifies the library should provide the
 // formatter specializations, not which header should provide them.
 // Since <format> includes a lot of headers, add these headers here instead of
 @@ -66,8 +66,8 @@ template <class _CharT, class _Tp, formattable<_CharT> _Container>
 struct formatter<stack<_Tp, _Container>, _CharT>
     : public __formatter_container_adaptor<stack<_Tp, _Container>, _CharT> {};
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H

lib/libcxx/include/__format/enable_insertable.h+4-4

 @@ -16,10 +16,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace __format {
 /// Opt-in to enable \ref __insertable for a \a _Container.
 @@ -28,8 +28,8 @@ inline constexpr bool __enable_insertable = false;
 } // namespace __format
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___FORMAT_ENABLE_INSERTABLE_H

lib/libcxx/include/__format/escaped_output_table.h+7-6

 @@ -61,19 +61,20 @@
 #ifndef _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H
 #define _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H
-#include <__algorithm/ranges_upper_bound.h>
+#include <__algorithm/upper_bound.h>
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
+#include <__iterator/access.h>
 #include <cstdint>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace __escaped_output_table {
 // clang-format off
 @@ -868,7 +869,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr uint32_t __entries[735] = {
   if (__code_point >= 0x000323b0)
     return true;
-  ptrdiff_t __i = std::ranges::upper_bound(__entries, (__code_point << 14) | 0x3fffu) - __entries;
+  ptrdiff_t __i = std::upper_bound(std::begin(__entries), std::end(__entries), (__code_point << 14) | 0x3fffu) - __entries;
   if (__i == 0)
     return false;
 @@ -880,8 +881,8 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr uint32_t __entries[735] = {
 // clang-format on
 } // namespace __escaped_output_table
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H

lib/libcxx/include/__format/fmt_pair_like.h+4-4

 @@ -20,10 +20,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [tuple.like] defines a tuple-like exposition only concept. This concept is not related to that. Therefore it uses a
 // different name for the concept.
 //
 @@ -35,8 +35,8 @@ template <class _Tp>
 concept __fmt_pair_like =
     __is_specialization_v<_Tp, pair> || (__is_specialization_v<_Tp, tuple> && tuple_size_v<_Tp> == 2);
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___FORMAT_FMT_PAIR_LIKE_H

lib/libcxx/include/__format/format_context.h+4-7

 @@ -40,10 +40,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
-template <class _OutIt, class _CharT>
-  requires output_iterator<_OutIt, const _CharT&>
-class basic_format_context;
 #  if _LIBCPP_HAS_LOCALIZATION
 /**
  * Helper to create a basic_format_context.
 @@ -71,15 +67,16 @@ using wformat_context = basic_format_context< back_insert_iterator<__format::__o
 #  endif
 template <class _OutIt, class _CharT>
-  requires output_iterator<_OutIt, const _CharT&>
+class _LIBCPP_PREFERRED_NAME(format_context) _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERRED_NAME(wformat_context))
-class _LIBCPP_PREFERRED_NAME(format_context)
+    basic_format_context {
-    _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERRED_NAME(wformat_context)) basic_format_context {
 public:
   using iterator  = _OutIt;
   using char_type = _CharT;
   template <class _Tp>
   using formatter_type = formatter<_Tp, _CharT>;
+  static_assert(output_iterator<_OutIt, const _CharT&>, "[format.context]/p3 requires OutIt to be an output_iterator");
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI basic_format_arg<basic_format_context> arg(size_t __id) const noexcept {
     return __args_.get(__id);
   }

lib/libcxx/include/__format/format_error.h+2

...	@@ -19,6 +19,7 @@	...	@@ -19,6 +19,7 @@
19	#endif	19	#endif
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
		22	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
22		23
23	#if _LIBCPP_STD_VER >= 20	24	#if _LIBCPP_STD_VER >= 20
24		25
...	@@ -45,6 +46,7 @@ _LIBCPP_DIAGNOSTIC_POP	...	@@ -45,6 +46,7 @@ _LIBCPP_DIAGNOSTIC_POP
45		46
46	#endif // _LIBCPP_STD_VER >= 20	47	#endif // _LIBCPP_STD_VER >= 20
47		48
		49	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
48	_LIBCPP_END_NAMESPACE_STD	50	_LIBCPP_END_NAMESPACE_STD
49		51
50	#endif // _LIBCPP___FORMAT_FORMAT_ERROR_H	52	#endif // _LIBCPP___FORMAT_FORMAT_ERROR_H

lib/libcxx/include/__format/format_functions.h+15-11

 @@ -11,7 +11,7 @@
 #define _LIBCPP___FORMAT_FORMAT_FUNCTIONS
 #include <__algorithm/clamp.h>
-#include <__algorithm/ranges_find_first_of.h>
+#include <__algorithm/find_first_of.h>
 #include <__chrono/statically_widen.h>
 #include <__concepts/convertible_to.h>
 #include <__concepts/same_as.h>
 @@ -26,7 +26,7 @@
 #include <__format/format_string.h>
 #include <__format/format_to_n_result.h>
 #include <__format/formatter.h>
-#include <__format/formatter_bool.h>
+#include <__format/formatter_bool_impl.h>
 #include <__format/formatter_char.h>
 #include <__format/formatter_floating_point.h>
 #include <__format/formatter_integer.h>
 @@ -342,7 +342,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr typename _Ctx::iterator __vformat_to(_ParseCtx&&
 #  if _LIBCPP_STD_VER >= 26
 template <class _CharT>
-struct __runtime_format_string {
+struct __dynamic_format_string {
 private:
   basic_string_view<_CharT> __str_;
 @@ -350,15 +350,15 @@ private:
   friend struct basic_format_string;
 public:
-  _LIBCPP_HIDE_FROM_ABI __runtime_format_string(basic_string_view<_CharT> __s) noexcept : __str_(__s) {}
+  _LIBCPP_HIDE_FROM_ABI __dynamic_format_string(basic_string_view<_CharT> __s) noexcept : __str_(__s) {}
-  __runtime_format_string(const __runtime_format_string&)            = delete;
+  __dynamic_format_string(const __dynamic_format_string&)            = delete;
-  __runtime_format_string& operator=(const __runtime_format_string&) = delete;
+  __dynamic_format_string& operator=(const __dynamic_format_string&) = delete;
 };
-_LIBCPP_HIDE_FROM_ABI inline __runtime_format_string<char> runtime_format(string_view __fmt) noexcept { return __fmt; }
+_LIBCPP_HIDE_FROM_ABI inline __dynamic_format_string<char> dynamic_format(string_view __fmt) noexcept { return __fmt; }
 #    if _LIBCPP_HAS_WIDE_CHARACTERS
-_LIBCPP_HIDE_FROM_ABI inline __runtime_format_string<wchar_t> runtime_format(wstring_view __fmt) noexcept {
+_LIBCPP_HIDE_FROM_ABI inline __dynamic_format_string<wchar_t> dynamic_format(wstring_view __fmt) noexcept {
   return __fmt;
 }
 #    endif
 @@ -375,7 +375,7 @@ struct basic_format_string {
   _LIBCPP_HIDE_FROM_ABI constexpr basic_string_view<_CharT> get() const noexcept { return __str_; }
 #  if _LIBCPP_STD_VER >= 26
-  _LIBCPP_HIDE_FROM_ABI basic_format_string(__runtime_format_string<_CharT> __s) noexcept : __str_(__s.__str_) {}
+  _LIBCPP_HIDE_FROM_ABI basic_format_string(__dynamic_format_string<_CharT> __s) noexcept : __str_(__s.__str_) {}
 #  endif
 private:
 @@ -459,8 +459,12 @@ template <class _CharT>
     basic_string_view<_CharT> __fmt,
     basic_format_args<basic_format_context<back_insert_iterator<__format::__output_buffer<_CharT>>, _CharT>> __args) {
   // Fold strings not containing '{' or '}' to just return the string
-  if (bool __is_identity = [&] [[__gnu__::__pure__]] // Make sure the compiler knows this call can be eliminated
+  if (bool __is_identity =
-      { return std::ranges::find_first_of(__fmt, array{'{', '}'}) == __fmt.end(); }();
+          [&] [[__gnu__::__pure__]] // Make sure the compiler knows this call can be eliminated
+      {
+        char __vals[] = {'{', '}'};
+        return std::find_first_of(__fmt.begin(), __fmt.end(), std::begin(__vals), std::end(__vals)) == __fmt.end();
+      }();
       __builtin_constant_p(__is_identity) && __is_identity)
     return basic_string<_CharT>{__fmt};

lib/libcxx/include/__format/formatter_bool.h+5-30

...	@@ -10,19 +10,10 @@	...	@@ -10,19 +10,10 @@
10	#ifndef _LIBCPP___FORMAT_FORMATTER_BOOL_H	10	#ifndef _LIBCPP___FORMAT_FORMATTER_BOOL_H
11	#define _LIBCPP___FORMAT_FORMATTER_BOOL_H	11	#define _LIBCPP___FORMAT_FORMATTER_BOOL_H
12		12
13	#include <__algorithm/copy.h>
14	#include <__assert>
15	#include <__config>	13	#include <__config>
16	#include <__format/concepts.h>	14	#include <__format/concepts.h>
17	#include <__format/format_parse_context.h>
18	#include <__format/formatter.h>	15	#include <__format/formatter.h>
19	#include <__format/formatter_integral.h>
20	#include <__format/parser_std_format_spec.h>	16	#include <__format/parser_std_format_spec.h>
21	#include <__utility/unreachable.h>
22
23	#if _LIBCPP_HAS_LOCALIZATION
24	# include <__locale>
25	#endif
26		17
27	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
28	# pragma GCC system_header	19	# pragma GCC system_header
...	@@ -32,9 +23,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -32,9 +23,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD
32		23
33	#if _LIBCPP_STD_VER >= 20	24	#if _LIBCPP_STD_VER >= 20
34		25
		26	template <__fmt_char_type _CharT, class _FormatContext>
		27	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator
		28	__formatter_bool_format(bool __value, __format_spec::__parser<_CharT>, _FormatContext&);
		29
35	template <__fmt_char_type _CharT>	30	template <__fmt_char_type _CharT>
36	struct formatter<bool, _CharT> {	31	struct formatter<bool, _CharT> {
37	public:
38	template <class _ParseContext>	32	template <class _ParseContext>
39	_LIBCPP_HIDE_FROM_ABI constexpr typename _ParseContext::iterator parse(_ParseContext& __ctx) {	33	_LIBCPP_HIDE_FROM_ABI constexpr typename _ParseContext::iterator parse(_ParseContext& __ctx) {
40	typename _ParseContext::iterator __result = __parser_.__parse(__ctx, __format_spec::__fields_integral);	34	typename _ParseContext::iterator __result = __parser_.__parse(__ctx, __format_spec::__fields_integral);
...	@@ -44,26 +38,7 @@ public:	...	@@ -44,26 +38,7 @@ public:
44		38
45	template <class _FormatContext>	39	template <class _FormatContext>
46	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator format(bool __value, _FormatContext& __ctx) const {	40	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator format(bool __value, _FormatContext& __ctx) const {
47	switch (__parser_.__type_) {	41	return std::__formatter_bool_format(__value, __parser_, __ctx);
48	case __format_spec::__type::__default:
49	case __format_spec::__type::__string:
50	return __formatter::__format_bool(__value, __ctx, __parser_.__get_parsed_std_specifications(__ctx));
51
52	case __format_spec::__type::__binary_lower_case:
53	case __format_spec::__type::__binary_upper_case:
54	case __format_spec::__type::__octal:
55	case __format_spec::__type::__decimal:
56	case __format_spec::__type::__hexadecimal_lower_case:
57	case __format_spec::__type::__hexadecimal_upper_case:
58	// Promotes bool to an integral type. This reduces the number of
59	// instantiations of __format_integer reducing code size.
60	return __formatter::__format_integer(
61	static_cast<unsigned>(__value), __ctx, __parser_.__get_parsed_std_specifications(__ctx));
62
63	default:
64	_LIBCPP_ASSERT_INTERNAL(false, "The parse function should have validated the type");
65	__libcpp_unreachable();
66	}
67	}	42	}
68		43
69	__format_spec::__parser<_CharT> __parser_;	44	__format_spec::__parser<_CharT> __parser_;

lib/libcxx/include/__format/formatter_bool_impl.h created+60

...	@@ -0,0 +1,60 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___FORMAT_FORMATTER_BOOL_IMPL_H
11	#define _LIBCPP___FORMAT_FORMATTER_BOOL_IMPL_H
12
13	#include <__assert>
14	#include <__config>
15	#include <__format/concepts.h>
16	#include <__format/formatter_bool.h>
17	#include <__format/formatter_integral.h>
18	#include <__format/parser_std_format_spec.h>
19	#include <__utility/unreachable.h>
20
21	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
22	# pragma GCC system_header
23	#endif
24
25	#if _LIBCPP_STD_VER >= 20
26
27	_LIBCPP_BEGIN_NAMESPACE_STD
28
29	// This function is separated from formatter<bool> to avoid pulling in a bunch of code from <format> that we aren't
30	// required to provide in other headers where we need formatter<bool> itself to be complete.
31	template <__fmt_char_type _CharT, class _FormatContext>
32	_LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator
33	__formatter_bool_format(bool __value, __format_spec::__parser<_CharT> __parser, _FormatContext& __ctx) {
34	switch (__parser.__type_) {
35	case __format_spec::__type::__default:
36	case __format_spec::__type::__string:
37	return __formatter::__format_bool(__value, __ctx, __parser.__get_parsed_std_specifications(__ctx));
38
39	case __format_spec::__type::__binary_lower_case:
40	case __format_spec::__type::__binary_upper_case:
41	case __format_spec::__type::__octal:
42	case __format_spec::__type::__decimal:
43	case __format_spec::__type::__hexadecimal_lower_case:
44	case __format_spec::__type::__hexadecimal_upper_case:
45	// Promotes bool to an integral type. This reduces the number of
46	// instantiations of __format_integer reducing code size.
47	return __formatter::__format_integer(
48	static_cast<unsigned>(__value), __ctx, __parser.__get_parsed_std_specifications(__ctx));
49
50	default:
51	_LIBCPP_ASSERT_INTERNAL(false, "The parse function should have validated the type");
52	__libcpp_unreachable();
53	}
54	}
55
56	_LIBCPP_END_NAMESPACE_STD
57
58	#endif // _LIBCPP_STD_VER >= 20
59
60	#endif // _LIBCPP___FORMAT_FORMATTER_BOOL_IMPL_H

lib/libcxx/include/__format/formatter_floating_point.h+4-4

 @@ -32,12 +32,12 @@
 #include <__format/formatter_output.h>
 #include <__format/parser_std_format_spec.h>
 #include <__iterator/concepts.h>
+#include <__math/traits.h>
 #include <__memory/allocator.h>
 #include <__system_error/errc.h>
 #include <__type_traits/conditional.h>
 #include <__utility/move.h>
 #include <__utility/unreachable.h>
-#include <cmath>
 #if _LIBCPP_HAS_LOCALIZATION
 #  include <__locale>
 @@ -637,10 +637,10 @@ _LIBCPP_HIDE_FROM_ABI auto __write_using_trailing_zeros(
 template <floating_point _Tp, class _CharT, class _FormatContext>
 _LIBCPP_HIDE_FROM_ABI typename _FormatContext::iterator
 __format_floating_point(_Tp __value, _FormatContext& __ctx, __format_spec::__parsed_specifications<_CharT> __specs) {
-  bool __negative = std::signbit(__value);
+  bool __negative = __math::signbit(__value);
-  if (!std::isfinite(__value)) [[unlikely]]
+  if (!__math::isfinite(__value)) [[unlikely]]
-    return __formatter::__format_floating_point_non_finite(__ctx.out(), __specs, __negative, std::isnan(__value));
+    return __formatter::__format_floating_point_non_finite(__ctx.out(), __specs, __negative, __math::isnan(__value));
   // Depending on the std-format-spec string the sign and the value
   // might not be outputted together:

lib/libcxx/include/__format/formatter_tuple.h+4-4

 @@ -31,10 +31,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <__fmt_char_type _CharT, class _Tuple, formattable<_CharT>... _Args>
 struct __formatter_tuple {
   _LIBCPP_HIDE_FROM_ABI constexpr void set_separator(basic_string_view<_CharT> __separator) noexcept {
 @@ -141,8 +141,8 @@ struct formatter<pair<_Args...>, _CharT> : public __formatter_tuple<_CharT, pair
 template <__fmt_char_type _CharT, formattable<_CharT>... _Args>
 struct formatter<tuple<_Args...>, _CharT> : public __formatter_tuple<_CharT, tuple<_Args...>, _Args...> {};
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___FORMAT_FORMATTER_TUPLE_H

lib/libcxx/include/__format/range_default_formatter.h+5-4

 @@ -22,6 +22,7 @@
 #include <__format/formatter.h>
 #include <__format/range_format.h>
 #include <__format/range_formatter.h>
+#include <__fwd/format.h>
 #include <__iterator/back_insert_iterator.h>
 #include <__ranges/concepts.h>
 #include <__ranges/data.h>
 @@ -32,10 +33,10 @@
 #include <__utility/pair.h>
 #include <string_view>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Rp, class _CharT>
 concept __const_formattable_range =
     ranges::input_range<const _Rp> && formattable<ranges::range_reference_t<const _Rp>, _CharT>;
 @@ -168,8 +169,8 @@ template <ranges::input_range _Rp, class _CharT>
   requires(format_kind<_Rp> != range_format::disabled && formattable<ranges::range_reference_t<_Rp>, _CharT>)
 struct formatter<_Rp, _CharT> : __range_default_formatter<format_kind<_Rp>, _Rp, _CharT> {};
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H

lib/libcxx/include/__format/range_format.h+4-18

 @@ -17,27 +17,13 @@
 #include <__concepts/same_as.h>
 #include <__config>
 #include <__format/fmt_pair_like.h>
+#include <__fwd/format.h>
 #include <__ranges/concepts.h>
 #include <__type_traits/remove_cvref.h>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
-_LIBCPP_DIAGNOSTIC_PUSH
+_LIBCPP_BEGIN_NAMESPACE_STD
-_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wshadow")
-_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wshadow")
-// This shadows map, set, and string.
-enum class range_format { disabled, map, set, sequence, string, debug_string };
-_LIBCPP_DIAGNOSTIC_POP
-template <class _Rp>
-constexpr range_format format_kind = [] {
-  // [format.range.fmtkind]/1
-  // A program that instantiates the primary template of format_kind is ill-formed.
-  static_assert(sizeof(_Rp) != sizeof(_Rp), "create a template specialization of format_kind for your type");
-  return range_format::disabled;
-}();
 template <ranges::input_range _Rp>
   requires same_as<_Rp, remove_cvref_t<_Rp>>
 @@ -64,8 +50,8 @@ inline constexpr range_format format_kind<_Rp> = [] {
     return range_format::sequence;
 }();
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif

lib/libcxx/include/__format/range_formatter.h+6-4

 @@ -34,10 +34,10 @@
 #include <__type_traits/remove_cvref.h>
 #include <string_view>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, class _CharT = char>
   requires same_as<remove_cvref_t<_Tp>, _Tp> && formattable<_Tp, _CharT>
 struct range_formatter {
 @@ -215,6 +215,8 @@ private:
     switch (*__begin) {
     case _CharT('m'):
       if constexpr (__fmt_pair_like<_Tp>) {
+        __underlying_.set_separator(_LIBCPP_STATICALLY_WIDEN(_CharT, ": "));
+        __underlying_.set_brackets({}, {});
         set_brackets(_LIBCPP_STATICALLY_WIDEN(_CharT, "{"), _LIBCPP_STATICALLY_WIDEN(_CharT, "}"));
         set_separator(_LIBCPP_STATICALLY_WIDEN(_CharT, ", "));
         ++__begin;
 @@ -258,8 +260,8 @@ private:
   basic_string_view<_CharT> __closing_bracket_ = _LIBCPP_STATICALLY_WIDEN(_CharT, "]");
 };
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___FORMAT_RANGE_FORMATTER_H

lib/libcxx/include/__format/unicode.h+1-1

...	@@ -101,7 +101,7 @@ inline constexpr __consume_result __consume_result_error{__replacement_character	...	@@ -101,7 +101,7 @@ inline constexpr __consume_result __consume_result_error{__replacement_character
101	return __unicode::__is_code_point(__value) && !__unicode::__is_surrogate(__value);	101	return __unicode::__is_code_point(__value) && !__unicode::__is_surrogate(__value);
102	}	102	}
103		103
104	template <contiguous_iterator _Iterator>	104	template <class _Iterator>
105	requires same_as<iter_value_t<_Iterator>, char>	105	requires same_as<iter_value_t<_Iterator>, char>
106	_LIBCPP_HIDE_FROM_ABI constexpr bool __is_continuation(_Iterator __char, int __count) {	106	_LIBCPP_HIDE_FROM_ABI constexpr bool __is_continuation(_Iterator __char, int __count) {
107	do {	107	do {

lib/libcxx/include/__functional/binary_negate.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_NEGATORS)
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Predicate>
 class _LIBCPP_DEPRECATED_IN_CXX17 binary_negate
     : public __binary_function<typename _Predicate::first_argument_type,
 @@ -44,8 +44,8 @@ not2(const _Predicate& __pred) {
   return binary_negate<_Predicate>(__pred);
 }
-#endif // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_NEGATORS)
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_NEGATORS)
 #endif // _LIBCPP___FUNCTIONAL_BINARY_NEGATE_H

lib/libcxx/include/__functional/bind_front.h+49

...	@@ -17,6 +17,8 @@	...	@@ -17,6 +17,8 @@
17	#include <__type_traits/decay.h>	17	#include <__type_traits/decay.h>
18	#include <__type_traits/enable_if.h>	18	#include <__type_traits/enable_if.h>
19	#include <__type_traits/is_constructible.h>	19	#include <__type_traits/is_constructible.h>
		20	#include <__type_traits/is_member_pointer.h>
		21	#include <__type_traits/is_pointer.h>
20	#include <__utility/forward.h>	22	#include <__utility/forward.h>
21		23
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	24	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -49,6 +51,53 @@ template <class _Fn, class... _Args>	...	@@ -49,6 +51,53 @@ template <class _Fn, class... _Args>
49		51
50	#endif // _LIBCPP_STD_VER >= 20	52	#endif // _LIBCPP_STD_VER >= 20
51		53
		54	#if _LIBCPP_STD_VER >= 26
		55
		56	template <auto _Fn, class _Indices, class... _BoundArgs>
		57	struct __nttp_bind_front_t;
		58
		59	template <auto _Fn, size_t... _Indices, class... _BoundArgs>
		60	struct __nttp_bind_front_t<_Fn, index_sequence<_Indices...>, _BoundArgs...> {
		61	tuple<_BoundArgs...> __bound_args_;
		62
		63	template <class _Self, class... _Args>
		64	_LIBCPP_HIDE_FROM_ABI constexpr auto operator()(this _Self&& __self, _Args&&... __args) noexcept(noexcept(std::invoke(
		65	_Fn, std::get<_Indices>(std::forward<_Self>(__self).__bound_args_)..., std::forward<_Args>(__args)...)))
		66	-> decltype(std::invoke(
		67	_Fn, std::get<_Indices>(std::forward<_Self>(__self).__bound_args_)..., std::forward<_Args>(__args)...)) {
		68	return std::invoke(
		69	_Fn, std::get<_Indices>(std::forward<_Self>(__self).__bound_args_)..., std::forward<_Args>(__args)...);
		70	}
		71	};
		72
		73	template <auto _Fn>
		74	struct __nttp_bind_without_bound_args_t {
		75	template <class... _Args>
		76	_LIBCPP_HIDE_FROM_ABI static constexpr auto
		77	operator()(_Args&&... __args) noexcept(noexcept(std::invoke(_Fn, std::forward<_Args>(__args)...)))
		78	-> decltype(std::invoke(_Fn, std::forward<_Args>(__args)...)) {
		79	return std::invoke(_Fn, std::forward<_Args>(__args)...);
		80	}
		81	};
		82
		83	template <auto _Fn, class... _Args>
		84	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto bind_front(_Args&&... __args) {
		85	static_assert((is_constructible_v<decay_t<_Args>, _Args> && ...),
		86	"bind_front requires all decay_t<Args> to be constructible from respective Args");
		87	static_assert((is_move_constructible_v<decay_t<_Args>> && ...),
		88	"bind_front requires all decay_t<Args> to be move constructible");
		89	if constexpr (using _Ty = decltype(_Fn); is_pointer_v<_Ty> \|\| is_member_pointer_v<_Ty>)
		90	static_assert(_Fn != nullptr, "bind_front: f cannot be equal to nullptr");
		91
		92	if constexpr (sizeof...(_Args) == 0)
		93	return __nttp_bind_without_bound_args_t<_Fn>{};
		94	else
		95	return __nttp_bind_front_t<_Fn, index_sequence_for<_Args...>, decay_t<_Args>...>{
		96	.__bound_args_{std::forward<_Args>(__args)...}};
		97	}
		98
		99	#endif // _LIBCPP_STD_VER >= 26
		100
52	_LIBCPP_END_NAMESPACE_STD	101	_LIBCPP_END_NAMESPACE_STD
53		102
54	#endif // _LIBCPP___FUNCTIONAL_BIND_FRONT_H	103	#endif // _LIBCPP___FUNCTIONAL_BIND_FRONT_H

lib/libcxx/include/__functional/binder1st.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Operation>
 class _LIBCPP_DEPRECATED_IN_CXX11 binder1st
     : public __unary_function<typename _Operation::second_argument_type, typename _Operation::result_type> {
 @@ -47,8 +47,8 @@ bind1st(const _Operation& __op, const _Tp& __x) {
   return binder1st<_Operation>(__op, __x);
 }
-#endif // _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
 #endif // _LIBCPP___FUNCTIONAL_BINDER1ST_H

lib/libcxx/include/__functional/binder2nd.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Operation>
 class _LIBCPP_DEPRECATED_IN_CXX11 binder2nd
     : public __unary_function<typename _Operation::first_argument_type, typename _Operation::result_type> {
 @@ -47,8 +47,8 @@ bind2nd(const _Operation& __op, const _Tp& __x) {
   return binder2nd<_Operation>(__op, __x);
 }
-#endif // _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
 #endif // _LIBCPP___FUNCTIONAL_BINDER2ND_H

lib/libcxx/include/__functional/compose.h+4-4

 @@ -20,10 +20,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 struct __compose_op {
   template <class _Fn1, class _Fn2, class... _Args>
   _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Fn1&& __f1, _Fn2&& __f2, _Args&&... __args) const noexcept(noexcept(
 @@ -46,8 +46,8 @@ _LIBCPP_HIDE_FROM_ABI constexpr auto __compose(_Fn1&& __f1, _Fn2&& __f2) noexcep
   return __compose_t<decay_t<_Fn1>, decay_t<_Fn2>>(std::forward<_Fn1>(__f1), std::forward<_Fn2>(__f2));
 }
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___FUNCTIONAL_COMPOSE_H

lib/libcxx/include/__functional/function.h+12-3

...	@@ -17,6 +17,7 @@	...	@@ -17,6 +17,7 @@
17	#include <__functional/binary_function.h>	17	#include <__functional/binary_function.h>
18	#include <__functional/unary_function.h>	18	#include <__functional/unary_function.h>
19	#include <__memory/addressof.h>	19	#include <__memory/addressof.h>
		20	#include <__new/placement_new_delete.h>
20	#include <__type_traits/aligned_storage.h>	21	#include <__type_traits/aligned_storage.h>
21	#include <__type_traits/decay.h>	22	#include <__type_traits/decay.h>
22	#include <__type_traits/invoke.h>	23	#include <__type_traits/invoke.h>
...	@@ -44,6 +45,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -44,6 +45,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
44	// bad_function_call	45	// bad_function_call
45		46
46	_LIBCPP_DIAGNOSTIC_PUSH	47	_LIBCPP_DIAGNOSTIC_PUSH
		48	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
47	# if !_LIBCPP_AVAILABILITY_HAS_BAD_FUNCTION_CALL_KEY_FUNCTION	49	# if !_LIBCPP_AVAILABILITY_HAS_BAD_FUNCTION_CALL_KEY_FUNCTION
48	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wweak-vtables")	50	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wweak-vtables")
49	# endif	51	# endif
...	@@ -65,6 +67,7 @@ public:	...	@@ -65,6 +67,7 @@ public:
65	const char* what() const _NOEXCEPT override;	67	const char* what() const _NOEXCEPT override;
66	# endif	68	# endif
67	};	69	};
		70	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
68	_LIBCPP_DIAGNOSTIC_POP	71	_LIBCPP_DIAGNOSTIC_POP
69		72
70	[[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_bad_function_call() {	73	[[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_bad_function_call() {
...	@@ -128,6 +131,7 @@ namespace __function {	...	@@ -128,6 +131,7 @@ namespace __function {
128	template <class _Fp>	131	template <class _Fp>
129	class __base;	132	class __base;
130		133
		134	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
131	template <class _Rp, class... _ArgTypes>	135	template <class _Rp, class... _ArgTypes>
132	class __base<_Rp(_ArgTypes...)> {	136	class __base<_Rp(_ArgTypes...)> {
133	public:	137	public:
...	@@ -146,6 +150,7 @@ public:	...	@@ -146,6 +150,7 @@ public:
146	virtual const std::type_info& target_type() const _NOEXCEPT = 0;	150	virtual const std::type_info& target_type() const _NOEXCEPT = 0;
147	# endif // _LIBCPP_HAS_RTTI	151	# endif // _LIBCPP_HAS_RTTI
148	};	152	};
		153	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
149		154
150	// __func implements __base for a given functor type.	155	// __func implements __base for a given functor type.
151		156
...	@@ -527,9 +532,13 @@ public:	...	@@ -527,9 +532,13 @@ public:
527		532
528	# if _LIBCPP_HAS_BLOCKS_RUNTIME	533	# if _LIBCPP_HAS_BLOCKS_RUNTIME
529		534
		535	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
		536
530	extern "C" void* _Block_copy(const void*);	537	extern "C" void* _Block_copy(const void*);
531	extern "C" void _Block_release(const void*);	538	extern "C" void _Block_release(const void*);
532		539
		540	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
		541
533	template <class _Rp1, class... _ArgTypes1, class _Rp, class... _ArgTypes>	542	template <class _Rp1, class... _ArgTypes1, class _Rp, class... _ArgTypes>
534	class __func<_Rp1 (^)(_ArgTypes1...), _Rp(_ArgTypes...)> : public __base<_Rp(_ArgTypes...)> {	543	class __func<_Rp1 (^)(_ArgTypes1...), _Rp(_ArgTypes...)> : public __base<_Rp(_ArgTypes...)> {
535	typedef _Rp1 (^__block_type)(_ArgTypes1...);	544	typedef _Rp1 (^__block_type)(_ArgTypes1...);
...	@@ -540,7 +549,7 @@ public:	...	@@ -540,7 +549,7 @@ public:
540	# if __has_feature(objc_arc)	549	# if __has_feature(objc_arc)
541	: __f_(__f)	550	: __f_(__f)
542	# else	551	# else
543	: __f_(reinterpret_cast<__block_type>(__f ? _Block_copy(__f) : nullptr))	552	: __f_(reinterpret_cast<__block_type>(__f ? __function::_Block_copy(__f) : nullptr))
544	# endif	553	# endif
545	{	554	{
546	}	555	}
...	@@ -563,7 +572,7 @@ public:	...	@@ -563,7 +572,7 @@ public:
563	_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void destroy() _NOEXCEPT {	572	_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual void destroy() _NOEXCEPT {
564	# if !__has_feature(objc_arc)	573	# if !__has_feature(objc_arc)
565	if (__f_)	574	if (__f_)
566	_Block_release(__f_);	575	__function::_Block_release(__f_);
567	# endif	576	# endif
568	__f_ = 0;	577	__f_ = 0;
569	}	578	}
...	@@ -684,7 +693,7 @@ public:	...	@@ -684,7 +693,7 @@ public:
684	template <class _Rp, class... _Ap>	693	template <class _Rp, class... _Ap>
685	function(_Rp (*)(_Ap...)) -> function<_Rp(_Ap...)>;	694	function(_Rp (*)(_Ap...)) -> function<_Rp(_Ap...)>;
686		695
687	template <class _Fp, class _Stripped = typename __strip_signature<decltype(&_Fp::operator())>::type>	696	template <class _Fp, class _Stripped = __strip_signature_t<decltype(&_Fp::operator())>>
688	function(_Fp) -> function<_Stripped>;	697	function(_Fp) -> function<_Stripped>;
689	# endif // _LIBCPP_STD_VER >= 17	698	# endif // _LIBCPP_STD_VER >= 17
690		699

lib/libcxx/include/__functional/hash.h+16-12

 @@ -23,7 +23,6 @@
 #include <__type_traits/is_integral.h>
 #include <__type_traits/is_unqualified.h>
 #include <__type_traits/underlying_type.h>
-#include <__utility/pair.h>
 #include <__utility/swap.h>
 #include <cstdint>
 #include <cstring>
 @@ -41,6 +40,11 @@ inline _LIBCPP_HIDE_FROM_ABI _Size __loadword(const void* __p) {
   return __r;
 }
+struct _PairT {
+  size_t first;
+  size_t second;
+};
 // We use murmur2 when size_t is 32 bits, and cityhash64 when size_t
 // is 64 bits.  This is because cityhash64 uses 64bit x 64bit
 // multiplication, which can be very slow on 32-bit systems.
 @@ -104,9 +108,9 @@ struct __murmur2_or_cityhash<_Size, 64> {
     _Size __y = std::__loadword<_Size>(__s + __len - 16) + std::__loadword<_Size>(__s + __len - 56);
     _Size __z =
         __hash_len_16(std::__loadword<_Size>(__s + __len - 48) + __len, std::__loadword<_Size>(__s + __len - 24));
-    pair<_Size, _Size> __v = __weak_hash_len_32_with_seeds(__s + __len - 64, __len, __z);
+    _PairT __v = __weak_hash_len_32_with_seeds(__s + __len - 64, __len, __z);
-    pair<_Size, _Size> __w = __weak_hash_len_32_with_seeds(__s + __len - 32, __y + __k1, __x);
+    _PairT __w = __weak_hash_len_32_with_seeds(__s + __len - 32, __y + __k1, __x);
-    __x                    = __x * __k1 + std::__loadword<_Size>(__s);
+    __x        = __x * __k1 + std::__loadword<_Size>(__s);
     // Decrease len to the nearest multiple of 64, and operate on 64-byte chunks.
     __len = (__len - 1) & ~static_cast<_Size>(63);
 @@ -192,7 +196,7 @@ private:
   // Return a 16-byte hash for 48 bytes.  Quick and dirty.
   // Callers do best to use "random-looking" values for a and b.
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK static pair<_Size, _Size>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK static _PairT
   __weak_hash_len_32_with_seeds(_Size __w, _Size __x, _Size __y, _Size __z, _Size __a, _Size __b) {
     __a += __w;
     __b             = __rotate(__b + __a + __z, 21);
 @@ -200,11 +204,14 @@ private:
     __a += __x;
     __a += __y;
     __b += __rotate(__a, 44);
-    return pair<_Size, _Size>(__a + __z, __b + __c);
+    _PairT __ret;
+    __ret.first  = __a + __z;
+    __ret.second = __b + __c;
+    return __ret;
   }
   // Return a 16-byte hash for s[0] ... s[31], a, and b.  Quick and dirty.
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK static pair<_Size, _Size>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_DISABLE_UBSAN_UNSIGNED_INTEGER_CHECK static _PairT
   __weak_hash_len_32_with_seeds(const char* __s, _Size __a, _Size __b) {
     return __weak_hash_len_32_with_seeds(
         std::__loadword<_Size>(__s),
 @@ -242,7 +249,9 @@ private:
 };
 #if _LIBCPP_AVAILABILITY_HAS_HASH_MEMORY
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 [[__gnu__::__pure__]] _LIBCPP_EXPORTED_FROM_ABI size_t __hash_memory(_LIBCPP_NOESCAPE const void*, size_t) _NOEXCEPT;
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 #else
 _LIBCPP_HIDE_FROM_ABI inline size_t __hash_memory(const void* __ptr, size_t __size) _NOEXCEPT {
   return __murmur2_or_cityhash<size_t>()(__ptr, __size);
 @@ -325,11 +334,6 @@ struct __scalar_hash<_Tp, 4> : public __unary_function<_Tp, size_t> {
   }
 };
-struct _PairT {
-  size_t first;
-  size_t second;
-};
 _LIBCPP_HIDE_FROM_ABI inline size_t __hash_combine(size_t __lhs, size_t __rhs) _NOEXCEPT {
   typedef __scalar_hash<_PairT> _HashT;
   const _PairT __p = {__lhs, __rhs};

lib/libcxx/include/__functional/invoke.h+6-6

 @@ -19,19 +19,17 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Fn, class... _Args>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 invoke_result_t<_Fn, _Args...>
 invoke(_Fn&& __f, _Args&&... __args) noexcept(is_nothrow_invocable_v<_Fn, _Args...>) {
   return std::__invoke(std::forward<_Fn>(__f), std::forward<_Args>(__args)...);
 }
-#endif // _LIBCPP_STD_VER >= 17
+#  if _LIBCPP_STD_VER >= 23
-#if _LIBCPP_STD_VER >= 23
 template <class _Result, class _Fn, class... _Args>
   requires is_invocable_r_v<_Result, _Fn, _Args...>
 _LIBCPP_HIDE_FROM_ABI constexpr _Result
 @@ -48,8 +46,10 @@ invoke_r(_Fn&& __f, _Args&&... __args) noexcept(is_nothrow_invocable_r_v<_Result
     return std::invoke(std::forward<_Fn>(__f), std::forward<_Args>(__args)...);
   }
 }
-#endif
+#  endif
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___FUNCTIONAL_INVOKE_H

lib/libcxx/include/__functional/is_transparent.h+3-3

...	@@ -21,11 +21,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -21,11 +21,11 @@ _LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	#if _LIBCPP_STD_VER >= 14	22	#if _LIBCPP_STD_VER >= 14
23		23
24	template <class _Tp, class _Key = void, class = void>	24	template <class _Comparator, class = void>
25	inline const bool __is_transparent_v = false;	25	inline const bool __is_transparent_v = false;
26		26
27	template <class _Tp, class _Key>	27	template <class _Comparator>
28	inline const bool __is_transparent_v<_Tp, _Key, __void_t<typename _Tp::is_transparent> > = true;	28	inline const bool __is_transparent_v<_Comparator, __void_t<typename _Comparator::is_transparent> > = true;
29		29
30	#endif	30	#endif
31		31

lib/libcxx/include/__functional/mem_fun_ref.h+4-4

 @@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Sp, class _Tp>
 class _LIBCPP_DEPRECATED_IN_CXX11 mem_fun_t : public __unary_function<_Tp*, _Sp> {
   _Sp (_Tp::*__p_)();
 @@ -138,8 +138,8 @@ mem_fun_ref(_Sp (_Tp::*__f)(_Ap) const) {
   return const_mem_fun1_ref_t<_Sp, _Tp, _Ap>(__f);
 }
-#endif // _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
 #endif // _LIBCPP___FUNCTIONAL_MEM_FUN_REF_H

lib/libcxx/include/__functional/operations.h+4-4

...	@@ -379,8 +379,8 @@ struct less<void> {	...	@@ -379,8 +379,8 @@ struct less<void> {
379	typedef void is_transparent;	379	typedef void is_transparent;
380	};	380	};
381		381
382	template <class _Tp>	382	template <class _ArgumentType>
383	struct __make_transparent<_Tp, less<_Tp> > {	383	struct __make_transparent<_ArgumentType, less<_ArgumentType> > {
384	using type _LIBCPP_NODEBUG = less<>;	384	using type _LIBCPP_NODEBUG = less<>;
385	};	385	};
386		386
...	@@ -477,8 +477,8 @@ struct greater<void> {	...	@@ -477,8 +477,8 @@ struct greater<void> {
477	template <class _Tp, class _Up>	477	template <class _Tp, class _Up>
478	inline const bool __desugars_to_v<__greater_tag, greater<>, _Tp, _Up> = true;	478	inline const bool __desugars_to_v<__greater_tag, greater<>, _Tp, _Up> = true;
479		479
480	template <class _Tp>	480	template <class _ArgumentType>
481	struct __make_transparent<_Tp, greater<_Tp>> {	481	struct __make_transparent<_ArgumentType, greater<_ArgumentType>> {
482	using type _LIBCPP_NODEBUG = greater<>;	482	using type _LIBCPP_NODEBUG = greater<>;
483	};	483	};
484		484

lib/libcxx/include/__functional/perfect_forward.h+4-4

 @@ -28,10 +28,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Op, class _Indices, class... _BoundArgs>
 struct __perfect_forward_impl;
 @@ -96,10 +96,10 @@ public:
 template <class _Op, class... _Args>
 using __perfect_forward _LIBCPP_NODEBUG = __perfect_forward_impl<_Op, index_sequence_for<_Args...>, _Args...>;
-#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___FUNCTIONAL_PERFECT_FORWARD_H

lib/libcxx/include/__functional/pointer_to_binary_function.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Arg1, class _Arg2, class _Result>
 class _LIBCPP_DEPRECATED_IN_CXX11 pointer_to_binary_function : public __binary_function<_Arg1, _Arg2, _Result> {
   _Result (*__f_)(_Arg1, _Arg2);
 @@ -36,8 +36,8 @@ ptr_fun(_Result (*__f)(_Arg1, _Arg2)) {
   return pointer_to_binary_function<_Arg1, _Arg2, _Result>(__f);
 }
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif
 #endif // _LIBCPP___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H

lib/libcxx/include/__functional/pointer_to_unary_function.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Arg, class _Result>
 class _LIBCPP_DEPRECATED_IN_CXX11 pointer_to_unary_function : public __unary_function<_Arg, _Result> {
   _Result (*__f_)(_Arg);
 @@ -36,8 +36,8 @@ ptr_fun(_Result (*__f)(_Arg)) {
   return pointer_to_unary_function<_Arg, _Result>(__f);
 }
-#endif // _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_BINDERS)
 #endif // _LIBCPP___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H

lib/libcxx/include/__functional/ranges_operations.h+4-4

 @@ -21,10 +21,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 struct equal_to {
 @@ -115,8 +115,8 @@ inline const bool __is_generic_transparent_comparator_v<ranges::less> = true;
 template <>
 inline const bool __is_generic_transparent_comparator_v<ranges::greater> = true;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___FUNCTIONAL_RANGES_OPERATIONS_H

lib/libcxx/include/__functional/unary_negate.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_NEGATORS)
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Predicate>
 class _LIBCPP_DEPRECATED_IN_CXX17 unary_negate : public __unary_function<typename _Predicate::argument_type, bool> {
   _Predicate __pred_;
 @@ -40,8 +40,8 @@ not1(const _Predicate& __pred) {
   return unary_negate<_Predicate>(__pred);
 }
-#endif // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_NEGATORS)
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_NEGATORS)
 #endif // _LIBCPP___FUNCTIONAL_UNARY_NEGATE_H

lib/libcxx/include/__fwd/format.h+22-5

 @@ -11,28 +11,45 @@
 #define _LIBCPP___FWD_FORMAT_H
 #include <__config>
-#include <__iterator/concepts.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Context>
 class basic_format_arg;
 template <class _OutIt, class _CharT>
-  requires output_iterator<_OutIt, const _CharT&>
 class basic_format_context;
 template <class _Tp, class _CharT = char>
 struct formatter;
-#endif // _LIBCPP_STD_VER >= 20
+#  if _LIBCPP_STD_VER >= 23
+_LIBCPP_DIAGNOSTIC_PUSH
+_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wshadow")
+_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wshadow")
+// This shadows map, set, and string.
+enum class range_format { disabled, map, set, sequence, string, debug_string };
+_LIBCPP_DIAGNOSTIC_POP
+template <class _Rp>
+constexpr range_format format_kind = [] {
+  // [format.range.fmtkind]/1
+  // A program that instantiates the primary template of format_kind is ill-formed.
+  static_assert(sizeof(_Rp) != sizeof(_Rp), "create a template specialization of format_kind for your type");
+  return range_format::disabled;
+}();
+#  endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___FWD_FORMAT_H

lib/libcxx/include/__fwd/map.h deleted-31

...	@@ -1,31 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_MAP_H
10	#define _LIBCPP___FWD_MAP_H
11
12	#include <__config>
13	#include <__fwd/functional.h>
14	#include <__fwd/memory.h>
15	#include <__fwd/pair.h>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	template <class _Key, class _Tp, class _Compare = less<_Key>, class _Allocator = allocator<pair<const _Key, _Tp> > >
24	class map;
25
26	template <class _Key, class _Tp, class _Compare = less<_Key>, class _Allocator = allocator<pair<const _Key, _Tp> > >
27	class multimap;
28
29	_LIBCPP_END_NAMESPACE_STD
30
31	#endif // _LIBCPP___FWD_MAP_H

lib/libcxx/include/__fwd/set.h deleted-30

...	@@ -1,30 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___FWD_SET_H
10	#define _LIBCPP___FWD_SET_H
11
12	#include <__config>
13	#include <__fwd/functional.h>
14	#include <__fwd/memory.h>
15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header
18	#endif
19
20	_LIBCPP_BEGIN_NAMESPACE_STD
21
22	template <class _Key, class _Compare = less<_Key>, class _Allocator = allocator<_Key> >
23	class set;
24
25	template <class _Key, class _Compare = less<_Key>, class _Allocator = allocator<_Key> >
26	class multiset;
27
28	_LIBCPP_END_NAMESPACE_STD
29
30	#endif // _LIBCPP___FWD_SET_H

lib/libcxx/include/__fwd/span.h+4-4

 @@ -21,18 +21,18 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 inline constexpr size_t dynamic_extent = numeric_limits<size_t>::max();
 template <typename _Tp, size_t _Extent = dynamic_extent>
 class span;
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___FWD_SPAN_H

lib/libcxx/include/__fwd/variant.h+4-4

 @@ -16,10 +16,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class... _Types>
 class variant;
 @@ -61,8 +61,8 @@ _LIBCPP_HIDE_FROM_ABI constexpr const _Tp& get(const variant<_Types...>&);
 template <class _Tp, class... _Types>
 _LIBCPP_HIDE_FROM_ABI constexpr const _Tp&& get(const variant<_Types...>&&);
-#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___FWD_VARIANT_H

lib/libcxx/include/__hash_table+18-4

 @@ -41,6 +41,8 @@
 #include <__type_traits/is_swappable.h>
 #include <__type_traits/remove_const.h>
 #include <__type_traits/remove_cvref.h>
+#include <__utility/exception_guard.h>
+#include <__utility/exchange.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
 #include <__utility/pair.h>
 @@ -73,7 +75,9 @@ struct __is_hash_value_type : false_type {};
 template <class _One>
 struct __is_hash_value_type<_One> : __is_hash_value_type_imp<__remove_cvref_t<_One> > {};
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_EXPORTED_FROM_ABI size_t __next_prime(size_t __n);
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 template <class _NodePtr>
 struct __hash_node_base {
 @@ -524,9 +528,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI __bucket_list_deallocator(__bucket_list_deallocator&& __x)
       _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-      : __size_(std::move(__x.__size_)), __alloc_(std::move(__x.__alloc_)) {
+      : __size_(std::__exchange(__x.__size_, 0)), __alloc_(std::move(__x.__alloc_)) {}
-    __x.size() = 0;
-  }
   _LIBCPP_HIDE_FROM_ABI size_type& size() _NOEXCEPT { return __size_; }
   _LIBCPP_HIDE_FROM_ABI size_type size() const _NOEXCEPT { return __size_; }
 @@ -696,6 +698,17 @@ private:
   _LIBCPP_HIDE_FROM_ABI void __copy_construct(__next_pointer __other_iter) {
     __next_pointer __own_iter = __first_node_.__ptr();
+    // If copying a node throws, the nodes that have already been constructed and linked into the
+    // list have to be deallocated. When this is called from the copy constructor the enclosing
+    // __hash_table is not fully constructed yet, so its destructor would not run to release them.
+    // This is also reached from operator= when assigning into an empty table; there the table
+    // stays alive, so we must leave it in a valid empty state: besides releasing the nodes we
+    // clear the bucket pointers, which were made to point into the now-deallocated node list.
+    auto __guard = std::__make_exception_guard([&] {
+      __deallocate_node_list(__first_node_.__next_);
+      __first_node_.__next_ = nullptr;
+      std::fill_n(__bucket_list_.get(), bucket_count(), nullptr);
+    });
     {
       __node_holder __new_node = __construct_node_hash(__other_iter->__hash(), __other_iter->__upcast()->__get_value());
       __own_iter->__next_      = static_cast<__next_pointer>(__new_node.release());
 @@ -706,6 +719,7 @@ private:
     __other_iter                    = __other_iter->__next_;
     __own_iter                      = __own_iter->__next_;
     __copy_construct(__other_iter, __own_iter, __current_chash);
+    __guard.__complete();
   }
 public:
 @@ -774,7 +788,7 @@ public:
   template <class... _Args>
   _LIBCPP_HIDE_FROM_ABI pair<iterator, bool> __emplace_unique(_Args&&... __args) {
-    return std::__try_key_extraction<key_type>(
+    return std::__try_key_extraction<key_type, value_type>(
         [this](const key_type& __key, _Args&&... __args2) {
           size_t __hash   = hash_function()(__key);
           size_type __bc  = bucket_count();

lib/libcxx/include/__iterator/access.h+15-13

 @@ -20,47 +20,49 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, size_t _Np>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp* begin(_Tp (&__array)[_Np]) _NOEXCEPT {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp* begin(_Tp (&__array)[_Np]) _NOEXCEPT {
   return __array;
 }
 template <class _Tp, size_t _Np>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp* end(_Tp (&__array)[_Np]) _NOEXCEPT {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp* end(_Tp (&__array)[_Np]) _NOEXCEPT {
   return __array + _Np;
 }
 #if !defined(_LIBCPP_CXX03_LANG)
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto begin(_Cp& __c) -> decltype(__c.begin()) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto begin(_Cp& __c) -> decltype(__c.begin()) {
   return __c.begin();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto begin(const _Cp& __c) -> decltype(__c.begin()) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto begin(const _Cp& __c)
+    -> decltype(__c.begin()) {
   return __c.begin();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto end(_Cp& __c) -> decltype(__c.end()) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto end(_Cp& __c) -> decltype(__c.end()) {
   return __c.end();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto end(const _Cp& __c) -> decltype(__c.end()) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto end(const _Cp& __c) -> decltype(__c.end()) {
   return __c.end();
 }
 #  if _LIBCPP_STD_VER >= 14
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI constexpr auto
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto cbegin(const _Cp& __c) noexcept(noexcept(std::begin(__c)))
-cbegin(const _Cp& __c) noexcept(noexcept(std::begin(__c))) -> decltype(std::begin(__c)) {
+    -> decltype(std::begin(__c)) {
   return std::begin(__c);
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI constexpr auto cend(const _Cp& __c) noexcept(noexcept(std::end(__c))) -> decltype(std::end(__c)) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr auto cend(const _Cp& __c) noexcept(noexcept(std::end(__c)))
+    -> decltype(std::end(__c)) {
   return std::end(__c);
 }
 @@ -69,22 +71,22 @@ _LIBCPP_HIDE_FROM_ABI constexpr auto cend(const _Cp& __c) noexcept(noexcept(std:
 #else // defined(_LIBCPP_CXX03_LANG)
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI typename _Cp::iterator begin(_Cp& __c) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI typename _Cp::iterator begin(_Cp& __c) {
   return __c.begin();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI typename _Cp::const_iterator begin(const _Cp& __c) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI typename _Cp::const_iterator begin(const _Cp& __c) {
   return __c.begin();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI typename _Cp::iterator end(_Cp& __c) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI typename _Cp::iterator end(_Cp& __c) {
   return __c.end();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI typename _Cp::const_iterator end(const _Cp& __c) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI typename _Cp::const_iterator end(const _Cp& __c) {
   return __c.end();
 }

lib/libcxx/include/__iterator/back_insert_iterator.h+3-1

 @@ -58,7 +58,9 @@ public:
     return *this;
   }
 #endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 back_insert_iterator& operator*() { return *this; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 back_insert_iterator& operator*() {
+    return *this;
+  }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 back_insert_iterator& operator++() { return *this; }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 back_insert_iterator operator++(int) { return *this; }

lib/libcxx/include/__iterator/bounded_iter.h+7-9

 @@ -53,9 +53,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 //    optimizations deleting non-redundant bounds checks.
 template <class _Iterator>
 struct __bounded_iter {
-  static_assert(__libcpp_is_contiguous_iterator<_Iterator>::value,
-                "Only contiguous iterators can be adapted by __bounded_iter.");
   using value_type        = typename iterator_traits<_Iterator>::value_type;
   using difference_type   = typename iterator_traits<_Iterator>::difference_type;
   using pointer           = typename iterator_traits<_Iterator>::pointer;
 @@ -117,7 +114,7 @@ public:
   // that the iterator is always within `[begin, end]`, we only need to check it's not pointing to
   // `end`. This is easier for the optimizer because it aligns with the `iter != container.end()`
   // checks that typical callers already use (see https://llvm.org/PR78829).
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator*() const _NOEXCEPT {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator*() const _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
         __current_ != __end_, "__bounded_iter::operator*: Attempt to dereference an iterator at the end");
     return *__current_;
 @@ -129,7 +126,8 @@ public:
     return std::__to_address(__current_);
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator[](difference_type __n) const _NOEXCEPT {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference
+  operator[](difference_type __n) const _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
         __n >= __begin_ - __current_, "__bounded_iter::operator[]: Attempt to index an iterator past the start");
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
 @@ -172,13 +170,13 @@ public:
     __current_ += __n;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __bounded_iter
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __bounded_iter
   operator+(__bounded_iter const& __self, difference_type __n) _NOEXCEPT {
     __bounded_iter __tmp(__self);
     __tmp += __n;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __bounded_iter
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __bounded_iter
   operator+(difference_type __n, __bounded_iter const& __self) _NOEXCEPT {
     __bounded_iter __tmp(__self);
     __tmp += __n;
 @@ -193,13 +191,13 @@ public:
     __current_ -= __n;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __bounded_iter
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __bounded_iter
   operator-(__bounded_iter const& __self, difference_type __n) _NOEXCEPT {
     __bounded_iter __tmp(__self);
     __tmp -= __n;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend difference_type
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend difference_type
   operator-(__bounded_iter const& __x, __bounded_iter const& __y) _NOEXCEPT {
     return __x.__current_ - __y.__current_;
   }

lib/libcxx/include/__iterator/capacity_aware_iterator.h created+186

...	@@ -0,0 +1,186 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___CAPACITY_AWARE_ITERATOR_H
11	#define _LIBCPP___CAPACITY_AWARE_ITERATOR_H
12
13	#include <__assert>
14	#include <__compare/ordering.h>
15	#include <__compare/three_way_comparable.h>
16	#include <__config>
17	#include <__cstddef/size_t.h>
18	#include <__iterator/concepts.h>
19	#include <__iterator/incrementable_traits.h>
20	#include <__iterator/iterator_traits.h>
21	#include <__memory/pointer_traits.h>
22	#include <__type_traits/is_constructible.h>
23	#include <__type_traits/is_convertible.h>
24	#include <__utility/move.h>
25
26	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
27	# pragma GCC system_header
28	#endif
29
30	_LIBCPP_PUSH_MACROS
31	#include <__undef_macros>
32
33	#if _LIBCPP_STD_VER >= 26
34
35	_LIBCPP_BEGIN_NAMESPACE_STD
36
37	// __capacity_aware_iterator is an iterator that wraps a contiguous iterator and encodes the maximum number of
38	// elements that can appear in a range of such iterators. That maximum number of elements must be known at compile-time.
39	// As of writing, the only standard library containers which fulfill these requirements are inplace_vector and optional.
40	//
41	// It also embeds a tag type to prevent mixing iterators from e.g. different containers. This also allows for some
42	// algorithms to detect this iterator and perform optimizations based on the added semantic information.
43
44	template <class _Iter, class _Tag, size_t _RangeMaxElements>
45	class __capacity_aware_iterator {
46	private:
47	_Iter __iter_;
48
49	template <class, class, size_t>
50	friend class __capacity_aware_iterator;
51
52	public:
53	static_assert(contiguous_iterator<_Iter>, "__capacity_aware_iterator can only be used with contiguous iterators");
54
55	using iterator_category = iterator_traits<_Iter>::iterator_category;
56	using iterator_concept = contiguous_iterator_tag;
57	using difference_type = iter_difference_t<_Iter>;
58	using pointer = iterator_traits<_Iter>::pointer;
59	using reference = iter_reference_t<_Iter>;
60	using value_type = iter_value_t<_Iter>;
61
62	_LIBCPP_HIDE_FROM_ABI constexpr __capacity_aware_iterator()
63	requires is_default_constructible_v<_Iter>
64	= default;
65
66	template <typename _Iter2>
67	requires is_convertible_v<_Iter2, _Iter>
68	_LIBCPP_HIDE_FROM_ABI constexpr __capacity_aware_iterator(
69	const __capacity_aware_iterator<_Iter2, _Tag, _RangeMaxElements>& __y) noexcept
70	: __iter_(__y.__iter_) {}
71
72	template <class _It, class _Tag2, size_t _RangeMaxElems2>
73	_LIBCPP_HIDE_FROM_ABI friend constexpr auto __make_capacity_aware_iterator(_It __iter) noexcept;
74
75	private:
76	_LIBCPP_HIDE_FROM_ABI constexpr explicit __capacity_aware_iterator(_Iter __iter) : __iter_(std::move(__iter)) {}
77
78	public:
79	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator() const noexcept { return __iter_; }
80	_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator->() const noexcept { return std::__to_address(__iter_); }
81
82	_LIBCPP_HIDE_FROM_ABI constexpr __capacity_aware_iterator& operator++() noexcept {
83	++__iter_;
84	return *this;
85	}
86
87	_LIBCPP_HIDE_FROM_ABI constexpr __capacity_aware_iterator operator++(int) noexcept {
88	__capacity_aware_iterator __tmp(*this);
89	++*this;
90	return __tmp;
91	}
92
93	_LIBCPP_HIDE_FROM_ABI constexpr __capacity_aware_iterator& operator--() noexcept {
94	--__iter_;
95	return *this;
96	}
97
98	_LIBCPP_HIDE_FROM_ABI constexpr __capacity_aware_iterator operator--(int) noexcept {
99	__capacity_aware_iterator __tmp(*this);
100	--*this;
101	return __tmp;
102	}
103
104	_LIBCPP_HIDE_FROM_ABI constexpr __capacity_aware_iterator& operator+=(difference_type __n) noexcept {
105	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
106	static_cast<size_t>(__n >= 0 ? __n : -__n) <= _RangeMaxElements,
107	"__capacity_aware_iterator::operator+=: Attempting to move iterator past its container's possible range");
108
109	__iter_ += __n;
110	return *this;
111	}
112
113	_LIBCPP_HIDE_FROM_ABI constexpr __capacity_aware_iterator& operator-=(difference_type __n) noexcept {
114	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
115	static_cast<size_t>(__n >= 0 ? __n : -__n) <= _RangeMaxElements,
116	"__capacity_aware_iterator::operator-=: Attempting to move iterator past its container's possible range");
117
118	__iter_ -= __n;
119	return *this;
120	}
121
122	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const noexcept {
123	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
124	static_cast<size_t>(__n >= 0 ? __n : -__n) < _RangeMaxElements,
125	"__capacity_aware_iterator::operator[]: Attempting to index iterator past its container's possible range");
126	return (this + __n);
127	}
128
129	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
130	operator==(const __capacity_aware_iterator& __x, const __capacity_aware_iterator& __y) noexcept {
131	return __x.__iter_ == __y.__iter_;
132	}
133
134	_LIBCPP_HIDE_FROM_ABI friend constexpr auto
135	operator<=>(const __capacity_aware_iterator& __x, const __capacity_aware_iterator& __y) noexcept {
136	if constexpr (three_way_comparable_with<_Iter, _Iter, strong_ordering>) {
137	return __x.__iter_ <=> __y.__iter_;
138	} else {
139	if (__x.__iter_ < __y.__iter_) {
140	return strong_ordering::less;
141	} else if (__x.__iter_ == __y.__iter_) {
142	return strong_ordering::equal;
143	}
144	return strong_ordering::greater;
145	}
146	}
147
148	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __capacity_aware_iterator
149	operator+(const __capacity_aware_iterator& __i, difference_type __n) noexcept {
150	auto __tmp = __i;
151	__tmp += __n;
152	return __tmp;
153	}
154
155	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __capacity_aware_iterator
156	operator+(difference_type __n, const __capacity_aware_iterator& __i) noexcept {
157	auto __tmp = __i;
158	__tmp += __n;
159	return __tmp;
160	}
161
162	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __capacity_aware_iterator
163	operator-(const __capacity_aware_iterator& __i, difference_type __n) noexcept {
164	auto __tmp = __i;
165	__tmp -= __n;
166	return __tmp;
167	}
168
169	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
170	operator-(const __capacity_aware_iterator& __x, const __capacity_aware_iterator& __y) noexcept {
171	return difference_type(__x.__iter_ - __y.__iter_);
172	}
173	};
174
175	template <class _It, class _Tag2, size_t _RangeMaxElems2>
176	_LIBCPP_HIDE_FROM_ABI constexpr auto __make_capacity_aware_iterator(_It __iter) noexcept {
177	return __capacity_aware_iterator<_It, _Tag2, _RangeMaxElems2>(__iter);
178	}
179
180	_LIBCPP_END_NAMESPACE_STD
181
182	#endif // _LIBCPP_STD_VER >= 26
183
184	_LIBCPP_POP_MACROS
185
186	#endif // _LIBCPP___CAPACITY_AWARE_ITERATOR_H

lib/libcxx/include/__iterator/common_iterator.h+3-3

...	@@ -17,6 +17,7 @@	...	@@ -17,6 +17,7 @@
17	#include <__concepts/copyable.h>	17	#include <__concepts/copyable.h>
18	#include <__concepts/derived_from.h>	18	#include <__concepts/derived_from.h>
19	#include <__concepts/equality_comparable.h>	19	#include <__concepts/equality_comparable.h>
		20	#include <__concepts/referenceable.h>
20	#include <__concepts/same_as.h>	21	#include <__concepts/same_as.h>
21	#include <__config>	22	#include <__config>
22	#include <__iterator/concepts.h>	23	#include <__iterator/concepts.h>
...	@@ -28,7 +29,6 @@	...	@@ -28,7 +29,6 @@
28	#include <__memory/addressof.h>	29	#include <__memory/addressof.h>
29	#include <__type_traits/conditional.h>	30	#include <__type_traits/conditional.h>
30	#include <__type_traits/is_pointer.h>	31	#include <__type_traits/is_pointer.h>
31	#include <__type_traits/is_referenceable.h>
32	#include <__utility/declval.h>	32	#include <__utility/declval.h>
33	#include <variant>	33	#include <variant>
34		34
...	@@ -111,7 +111,7 @@ public:	...	@@ -111,7 +111,7 @@ public:
111	return *this;	111	return *this;
112	}	112	}
113		113
114	_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() {	114	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() {
115	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(	115	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
116	std::holds_alternative<_Iter>(__hold_), "Attempted to dereference a non-dereferenceable common_iterator");	116	std::holds_alternative<_Iter>(__hold_), "Attempted to dereference a non-dereferenceable common_iterator");
117	return *std::__unchecked_get<_Iter>(__hold_);	117	return *std::__unchecked_get<_Iter>(__hold_);
...	@@ -237,7 +237,7 @@ public:	...	@@ -237,7 +237,7 @@ public:
237	return std::__unchecked_get<_Sent>(__x.__hold_) - std::__unchecked_get<_I2>(__y.__hold_);	237	return std::__unchecked_get<_Sent>(__x.__hold_) - std::__unchecked_get<_I2>(__y.__hold_);
238	}	238	}
239		239
240	_LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto)	240	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto)
241	iter_move(const common_iterator& __i) noexcept(noexcept(ranges::iter_move(std::declval<const _Iter&>())))	241	iter_move(const common_iterator& __i) noexcept(noexcept(ranges::iter_move(std::declval<const _Iter&>())))
242	requires input_iterator<_Iter>	242	requires input_iterator<_Iter>
243	{	243	{

lib/libcxx/include/__iterator/concepts.h+8-9

 @@ -20,6 +20,8 @@
 #include <__concepts/invocable.h>
 #include <__concepts/movable.h>
 #include <__concepts/predicate.h>
+#include <__concepts/primary_template.h>
+#include <__concepts/referenceable.h>
 #include <__concepts/regular.h>
 #include <__concepts/relation.h>
 #include <__concepts/same_as.h>
 @@ -38,10 +40,7 @@
 #include <__type_traits/integral_constant.h>
 #include <__type_traits/invoke.h>
 #include <__type_traits/is_pointer.h>
-#include <__type_traits/is_primary_template.h>
 #include <__type_traits/is_reference.h>
-#include <__type_traits/is_referenceable.h>
-#include <__type_traits/is_valid_expansion.h>
 #include <__type_traits/remove_cv.h>
 #include <__type_traits/remove_cvref.h>
 #include <__utility/forward.h>
 @@ -80,7 +79,7 @@ template <class _Tp>
 concept __specialization_of_projected = requires {
   typename __projected_iterator_t<_Tp>;
   typename __projected_projection_t<_Tp>;
-} && __is_primary_template<_Tp>::value;
+} && __primary_template<_Tp>;
 template <class _Tp>
 struct __indirect_value_t_impl {
 @@ -153,8 +152,7 @@ concept sized_sentinel_for =
 template <class _Iter>
 struct __iter_traits_cache {
-  using type _LIBCPP_NODEBUG =
+  using type _LIBCPP_NODEBUG = _If<__primary_template<iterator_traits<_Iter> >, _Iter, iterator_traits<_Iter> >;
-      _If<__is_primary_template<iterator_traits<_Iter> >::value, _Iter, iterator_traits<_Iter> >;
 };
 template <class _Iter>
 using _ITER_TRAITS _LIBCPP_NODEBUG = typename __iter_traits_cache<_Iter>::type;
 @@ -169,12 +167,13 @@ struct __iter_concept_category_test {
 };
 struct __iter_concept_random_fallback {
   template <class _Iter>
-  using _Apply _LIBCPP_NODEBUG =
+  using _Apply _LIBCPP_NODEBUG = __enable_if_t<__primary_template<iterator_traits<_Iter> >, random_access_iterator_tag>;
-      __enable_if_t<__is_primary_template<iterator_traits<_Iter> >::value, random_access_iterator_tag>;
 };
 template <class _Iter, class _Tester>
-struct __test_iter_concept : _IsValidExpansion<_Tester::template _Apply, _Iter>, _Tester {};
+    struct __test_iter_concept : bool_constant < requires {
+  typename _Tester::template _Apply<_Iter>;
+} >, _Tester{};
 template <class _Iter>
 struct __iter_concept_cache {

lib/libcxx/include/__iterator/counted_iterator.h+13-13

lib/libcxx/include/__iterator/data.h+10-8

 @@ -17,32 +17,34 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Cont>
-constexpr _LIBCPP_HIDE_FROM_ABI auto data(_Cont& __c) noexcept(noexcept(__c.data())) -> decltype(__c.data()) {
+[[nodiscard]] constexpr _LIBCPP_HIDE_FROM_ABI auto data(_Cont& __c) noexcept(noexcept(__c.data()))
+    -> decltype(__c.data()) {
   return __c.data();
 }
 template <class _Cont>
-constexpr _LIBCPP_HIDE_FROM_ABI auto data(const _Cont& __c) noexcept(noexcept(__c.data())) -> decltype(__c.data()) {
+[[nodiscard]] constexpr _LIBCPP_HIDE_FROM_ABI auto data(const _Cont& __c) noexcept(noexcept(__c.data()))
+    -> decltype(__c.data()) {
   return __c.data();
 }
 template <class _Tp, size_t _Sz>
-_LIBCPP_HIDE_FROM_ABI constexpr _Tp* data(_Tp (&__array)[_Sz]) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp* data(_Tp (&__array)[_Sz]) noexcept {
   return __array;
 }
 template <class _Ep>
-_LIBCPP_HIDE_FROM_ABI constexpr const _Ep* data(initializer_list<_Ep> __il) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _Ep* data(initializer_list<_Ep> __il) noexcept {
   return __il.begin();
 }
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___ITERATOR_DATA_H

lib/libcxx/include/__iterator/default_sentinel.h+4-4

 @@ -16,15 +16,15 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 struct default_sentinel_t {};
 inline constexpr default_sentinel_t default_sentinel{};
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___ITERATOR_DEFAULT_SENTINEL_H

lib/libcxx/include/__iterator/distance.h+5-4

 @@ -67,7 +67,8 @@ __distance(_InputIter __first, _Sent __last) {
 }
 template <class _InputIter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 typename iterator_traits<_InputIter>::difference_type
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17
+typename iterator_traits<_InputIter>::difference_type
 distance(_InputIter __first, _InputIter __last) {
   return std::__distance(__first, __last);
 }
 @@ -80,12 +81,12 @@ namespace ranges {
 struct __distance {
   template <class _Ip, sentinel_for<_Ip> _Sp>
     requires(!sized_sentinel_for<_Sp, _Ip>)
-  _LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Ip> operator()(_Ip __first, _Sp __last) const {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Ip> operator()(_Ip __first, _Sp __last) const {
     return std::__distance(std::move(__first), std::move(__last));
   }
   template <class _Ip, sized_sentinel_for<decay_t<_Ip>> _Sp>
-  _LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Ip> operator()(_Ip&& __first, _Sp __last) const {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Ip> operator()(_Ip&& __first, _Sp __last) const {
     if constexpr (sized_sentinel_for<_Sp, __remove_cvref_t<_Ip>>) {
       return __last - __first;
     } else {
 @@ -94,7 +95,7 @@ struct __distance {
   }
   template <range _Rp>
-  _LIBCPP_HIDE_FROM_ABI constexpr range_difference_t<_Rp> operator()(_Rp&& __r) const {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr range_difference_t<_Rp> operator()(_Rp&& __r) const {
     if constexpr (sized_range<_Rp>) {
       return static_cast<range_difference_t<_Rp>>(ranges::size(__r));
     } else {

lib/libcxx/include/__iterator/empty.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Cont>
 [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto
 empty(const _Cont& __c) noexcept(noexcept(__c.empty())) -> decltype(__c.empty()) {
 @@ -37,8 +37,8 @@ template <class _Ep>
   return __il.size() == 0;
 }
-#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___ITERATOR_EMPTY_H

lib/libcxx/include/__iterator/erase_if_container.h+2-1

...	@@ -22,7 +22,8 @@ _LIBCPP_PUSH_MACROS	...	@@ -22,7 +22,8 @@ _LIBCPP_PUSH_MACROS
22	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
23		23
24	template <class _Container, class _Predicate>	24	template <class _Container, class _Predicate>
25	_LIBCPP_HIDE_FROM_ABI typename _Container::size_type __libcpp_erase_if_container(_Container& __c, _Predicate& __pred) {	25	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 typename _Container::size_type
		26	__libcpp_erase_if_container(_Container& __c, _Predicate& __pred) {
26	typename _Container::size_type __old_size = __c.size();	27	typename _Container::size_type __old_size = __c.size();
27		28
28	const typename _Container::iterator __last = __c.end();	29	const typename _Container::iterator __last = __c.end();

lib/libcxx/include/__iterator/front_insert_iterator.h+4-2

 @@ -58,14 +58,16 @@ public:
     return *this;
   }
 #endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator& operator*() { return *this; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator& operator*() {
+    return *this;
+  }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator& operator++() { return *this; }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator operator++(int) { return *this; }
 };
 _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(front_insert_iterator);
 template <class _Container>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator<_Container>
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 front_insert_iterator<_Container>
 front_inserter(_Container& __x) {
   return front_insert_iterator<_Container>(__x);
 }

lib/libcxx/include/__iterator/incrementable_traits.h+6-6

 @@ -11,11 +11,11 @@
 #define _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H
 #include <__concepts/arithmetic.h>
+#include <__concepts/primary_template.h>
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
 #include <__type_traits/conditional.h>
 #include <__type_traits/is_object.h>
-#include <__type_traits/is_primary_template.h>
 #include <__type_traits/make_signed.h>
 #include <__type_traits/remove_cvref.h>
 #include <__utility/declval.h>
 @@ -24,10 +24,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [incrementable.traits]
 template <class>
 struct incrementable_traits {};
 @@ -68,12 +68,12 @@ struct iterator_traits;
 // generated from the primary template, and `iterator_traits<RI>::difference_type` otherwise.
 template <class _Ip>
 using iter_difference_t =
-    typename conditional_t<__is_primary_template<iterator_traits<remove_cvref_t<_Ip> > >::value,
+    typename conditional_t<__primary_template<iterator_traits<remove_cvref_t<_Ip> > >,
                            incrementable_traits<remove_cvref_t<_Ip> >,
                            iterator_traits<remove_cvref_t<_Ip> > >::difference_type;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H

lib/libcxx/include/__iterator/insert_iterator.h+2-2

...	@@ -71,13 +71,13 @@ public:	...	@@ -71,13 +71,13 @@ public:
71	return *this;	71	return *this;
72	}	72	}
73	#endif // _LIBCPP_CXX03_LANG	73	#endif // _LIBCPP_CXX03_LANG
74	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator() { return this; }	74	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator() { return this; }
75	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator++() { return *this; }	75	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator++() { return *this; }
76	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator++(int) { return *this; }	76	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator& operator++(int) { return *this; }
77	};	77	};
78		78
79	template <class _Container>	79	template <class _Container>
80	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator<_Container>	80	[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 insert_iterator<_Container>
81	inserter(_Container& __x, __insert_iterator_iter_t<_Container> __i) {	81	inserter(_Container& __x, __insert_iterator_iter_t<_Container> __i) {
82	return insert_iterator<_Container>(__x, __i);	82	return insert_iterator<_Container>(__x, __i);
83	}	83	}

lib/libcxx/include/__iterator/istream_iterator.h+1-1

...	@@ -60,7 +60,7 @@ public:	...	@@ -60,7 +60,7 @@ public:
60	// LWG3600 Changed the wording of the copy constructor. In libc++ this constructor	60	// LWG3600 Changed the wording of the copy constructor. In libc++ this constructor
61	// can still be trivial after this change.	61	// can still be trivial after this change.
62		62
63	_LIBCPP_HIDE_FROM_ABI const _Tp& operator*() const { return __value_; }	63	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const _Tp& operator*() const { return __value_; }
64	_LIBCPP_HIDE_FROM_ABI const _Tp* operator->() const { return std::addressof((operator*())); }	64	_LIBCPP_HIDE_FROM_ABI const _Tp* operator->() const { return std::addressof((operator*())); }
65	_LIBCPP_HIDE_FROM_ABI istream_iterator& operator++() {	65	_LIBCPP_HIDE_FROM_ABI istream_iterator& operator++() {
66	if (!(*__in_stream_ >> __value_))	66	if (!(*__in_stream_ >> __value_))

lib/libcxx/include/__iterator/istreambuf_iterator.h+4-2

 @@ -73,14 +73,16 @@ public:
   _LIBCPP_HIDE_FROM_ABI istreambuf_iterator(streambuf_type* __s) _NOEXCEPT : __sbuf_(__s) {}
   _LIBCPP_HIDE_FROM_ABI istreambuf_iterator(const __proxy& __p) _NOEXCEPT : __sbuf_(__p.__sbuf_) {}
-  _LIBCPP_HIDE_FROM_ABI char_type operator*() const { return static_cast<char_type>(__sbuf_->sgetc()); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type operator*() const {
+    return static_cast<char_type>(__sbuf_->sgetc());
+  }
   _LIBCPP_HIDE_FROM_ABI istreambuf_iterator& operator++() {
     __sbuf_->sbumpc();
     return *this;
   }
   _LIBCPP_HIDE_FROM_ABI __proxy operator++(int) { return __proxy(__sbuf_->sbumpc(), __sbuf_); }
-  _LIBCPP_HIDE_FROM_ABI bool equal(const istreambuf_iterator& __b) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool equal(const istreambuf_iterator& __b) const {
     return __test_for_eof() == __b.__test_for_eof();
   }

lib/libcxx/include/__iterator/iter_move.h+5-5

 @@ -11,10 +11,10 @@
 #define _LIBCPP___ITERATOR_ITER_MOVE_H
 #include <__concepts/class_or_enum.h>
+#include <__concepts/referenceable.h>
 #include <__config>
 #include <__iterator/iterator_traits.h>
 #include <__type_traits/is_reference.h>
-#include <__type_traits/is_referenceable.h>
 #include <__type_traits/remove_cvref.h>
 #include <__utility/declval.h>
 #include <__utility/forward.h>
 @@ -27,10 +27,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [iterator.cust.move]
 namespace ranges {
 @@ -95,10 +95,10 @@ template <__dereferenceable _Tp>
   }
 using iter_rvalue_reference_t = decltype(ranges::iter_move(std::declval<_Tp&>()));
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___ITERATOR_ITER_MOVE_H

lib/libcxx/include/__iterator/iter_swap.h+4-4

 @@ -29,10 +29,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [iter.cust.swap]
 namespace ranges {
 @@ -99,10 +99,10 @@ concept indirectly_swappable =
       ranges::iter_swap(__i2, __i1);
     };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___ITERATOR_ITER_SWAP_H

lib/libcxx/include/__iterator/iterator_traits.h+3-3

...	@@ -15,6 +15,8 @@	...	@@ -15,6 +15,8 @@
15	#include <__concepts/convertible_to.h>	15	#include <__concepts/convertible_to.h>
16	#include <__concepts/copyable.h>	16	#include <__concepts/copyable.h>
17	#include <__concepts/equality_comparable.h>	17	#include <__concepts/equality_comparable.h>
		18	#include <__concepts/primary_template.h>
		19	#include <__concepts/referenceable.h>
18	#include <__concepts/same_as.h>	20	#include <__concepts/same_as.h>
19	#include <__concepts/totally_ordered.h>	21	#include <__concepts/totally_ordered.h>
20	#include <__config>	22	#include <__config>
...	@@ -30,9 +32,7 @@	...	@@ -30,9 +32,7 @@
30	#include <__type_traits/integral_constant.h>	32	#include <__type_traits/integral_constant.h>
31	#include <__type_traits/is_convertible.h>	33	#include <__type_traits/is_convertible.h>
32	#include <__type_traits/is_object.h>	34	#include <__type_traits/is_object.h>
33	#include <__type_traits/is_primary_template.h>
34	#include <__type_traits/is_reference.h>	35	#include <__type_traits/is_reference.h>
35	#include <__type_traits/is_referenceable.h>
36	#include <__type_traits/nat.h>	36	#include <__type_traits/nat.h>
37	#include <__type_traits/remove_const.h>	37	#include <__type_traits/remove_const.h>
38	#include <__type_traits/remove_cv.h>	38	#include <__type_traits/remove_cv.h>
...	@@ -468,7 +468,7 @@ using __iterator_reference _LIBCPP_NODEBUG = typename iterator_traits<_Iter>::re	...	@@ -468,7 +468,7 @@ using __iterator_reference _LIBCPP_NODEBUG = typename iterator_traits<_Iter>::re
468	// This has to be in this file and not readable_traits.h to break the include cycle between the two.	468	// This has to be in this file and not readable_traits.h to break the include cycle between the two.
469	template <class _Ip>	469	template <class _Ip>
470	using iter_value_t =	470	using iter_value_t =
471	typename conditional_t<__is_primary_template<iterator_traits<remove_cvref_t<_Ip> > >::value,	471	typename conditional_t<__primary_template<iterator_traits<remove_cvref_t<_Ip> > >,
472	indirectly_readable_traits<remove_cvref_t<_Ip> >,	472	indirectly_readable_traits<remove_cvref_t<_Ip> >,
473	iterator_traits<remove_cvref_t<_Ip> > >::value_type;	473	iterator_traits<remove_cvref_t<_Ip> > >::value_type;
474		474

lib/libcxx/include/__iterator/move_iterator.h+25-20

 @@ -13,6 +13,7 @@
 #include <__compare/compare_three_way_result.h>
 #include <__compare/three_way_comparable.h>
 #include <__concepts/assignable.h>
+#include <__concepts/constructible.h>
 #include <__concepts/convertible_to.h>
 #include <__concepts/derived_from.h>
 #include <__concepts/same_as.h>
 @@ -27,7 +28,6 @@
 #include <__type_traits/conditional.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_assignable.h>
-#include <__type_traits/is_constructible.h>
 #include <__type_traits/is_convertible.h>
 #include <__type_traits/is_reference.h>
 #include <__type_traits/is_same.h>
 @@ -122,7 +122,7 @@ public:
 #if _LIBCPP_STD_VER >= 20
   _LIBCPP_HIDE_FROM_ABI constexpr move_iterator()
-    requires is_constructible_v<_Iter>
+    requires default_initializable<_Iter>
       : __current_() {}
   template <class _Up>
 @@ -136,11 +136,11 @@ public:
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr const _Iter& base() const& noexcept { return __current_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _Iter& base() const& noexcept { return __current_; }
-  _LIBCPP_HIDE_FROM_ABI constexpr _Iter base() && { return std::move(__current_); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Iter base() && { return std::move(__current_); }
-  _LIBCPP_HIDE_FROM_ABI constexpr reference operator*() const { return ranges::iter_move(__current_); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr reference operator*() const { return ranges::iter_move(__current_); }
-  _LIBCPP_HIDE_FROM_ABI constexpr reference operator[](difference_type __n) const {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr reference operator[](difference_type __n) const {
     return ranges::iter_move(__current_ + __n);
   }
 @@ -169,12 +169,13 @@ public:
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 _Iter base() const { return __current_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 _Iter base() const { return __current_; }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reference operator*() const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reference operator*() const {
     return static_cast<reference>(*__current_);
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reference operator[](difference_type __n) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reference
+  operator[](difference_type __n) const {
     return static_cast<reference>(__current_[__n]);
   }
 @@ -194,14 +195,16 @@ public:
     --__current_;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator operator+(difference_type __n) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator
+  operator+(difference_type __n) const {
     return move_iterator(__current_ + __n);
   }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator& operator+=(difference_type __n) {
     __current_ += __n;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator operator-(difference_type __n) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator
+  operator-(difference_type __n) const {
     return move_iterator(__current_ - __n);
   }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator& operator-=(difference_type __n) {
 @@ -218,18 +221,18 @@ public:
   }
   template <sized_sentinel_for<_Iter> _Sent>
-  friend _LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Iter>
+  [[nodiscard]] friend _LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Iter>
   operator-(const move_sentinel<_Sent>& __x, const move_iterator& __y) {
     return __x.base() - __y.base();
   }
   template <sized_sentinel_for<_Iter> _Sent>
-  friend _LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Iter>
+  [[nodiscard]] friend _LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Iter>
   operator-(const move_iterator& __x, const move_sentinel<_Sent>& __y) {
     return __x.base() - __y.base();
   }
-  friend _LIBCPP_HIDE_FROM_ABI constexpr iter_rvalue_reference_t<_Iter>
+  [[nodiscard]] friend _LIBCPP_HIDE_FROM_ABI constexpr iter_rvalue_reference_t<_Iter>
   iter_move(const move_iterator& __i) noexcept(noexcept(ranges::iter_move(__i.__current_))) {
     return ranges::iter_move(__i.__current_);
   }
 @@ -299,13 +302,14 @@ operator<=>(const move_iterator<_Iter1>& __x,
 #ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI
-operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y) -> decltype(__x.base() - __y.base()) {
+_LIBCPP_CONSTEXPR_SINCE_CXX17 auto operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
+    -> decltype(__x.base() - __y.base()) {
   return __x.base() - __y.base();
 }
 #else
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI typename move_iterator<_Iter1>::difference_type
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI typename move_iterator<_Iter1>::difference_type
 operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y) {
   return __x.base() - __y.base();
 }
 @@ -313,7 +317,7 @@ operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y) {
 #if _LIBCPP_STD_VER >= 20
 template <class _Iter>
-inline _LIBCPP_HIDE_FROM_ABI constexpr move_iterator<_Iter>
+[[nodiscard]] inline _LIBCPP_HIDE_FROM_ABI constexpr move_iterator<_Iter>
 operator+(iter_difference_t<_Iter> __n, const move_iterator<_Iter>& __x)
   requires requires {
     { __x.base() + __n } -> same_as<_Iter>;
 @@ -323,7 +327,7 @@ operator+(iter_difference_t<_Iter> __n, const move_iterator<_Iter>& __x)
 }
 #else
 template <class _Iter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator<_Iter>
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator<_Iter>
 operator+(typename move_iterator<_Iter>::difference_type __n, const move_iterator<_Iter>& __x) {
   return move_iterator<_Iter>(__x.base() + __n);
 }
 @@ -336,7 +340,8 @@ inline constexpr bool disable_sized_sentinel_for<move_iterator<_Iter1>, move_ite
 #endif // _LIBCPP_STD_VER >= 20
 template <class _Iter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator<_Iter> make_move_iterator(_Iter __i) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI
+_LIBCPP_CONSTEXPR_SINCE_CXX17 move_iterator<_Iter> make_move_iterator(_Iter __i) {
   return move_iterator<_Iter>(std::move(__i));
 }

lib/libcxx/include/__iterator/move_sentinel.h+5-5

 @@ -22,10 +22,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <semiregular _Sent>
 class move_sentinel {
 public:
 @@ -44,7 +44,7 @@ public:
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr _Sent base() const { return __last_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Sent base() const { return __last_; }
 private:
   _Sent __last_ = _Sent();
 @@ -52,10 +52,10 @@ private:
 _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(move_sentinel);
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___ITERATOR_MOVE_SENTINEL_H

lib/libcxx/include/__iterator/ostream_iterator.h+1-1

...	@@ -59,7 +59,7 @@ public:	...	@@ -59,7 +59,7 @@ public:
59	return *this;	59	return *this;
60	}	60	}
61		61
62	_LIBCPP_HIDE_FROM_ABI ostream_iterator& operator() { return this; }	62	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI ostream_iterator& operator() { return this; }
63	_LIBCPP_HIDE_FROM_ABI ostream_iterator& operator++() { return *this; }	63	_LIBCPP_HIDE_FROM_ABI ostream_iterator& operator++() { return *this; }
64	_LIBCPP_HIDE_FROM_ABI ostream_iterator& operator++(int) { return *this; }	64	_LIBCPP_HIDE_FROM_ABI ostream_iterator& operator++(int) { return *this; }
65	};	65	};

lib/libcxx/include/__iterator/ostreambuf_iterator.h+25-2

 @@ -10,6 +10,8 @@
 #ifndef _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H
 #define _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H
+#include <__algorithm/in_out_result.h>
+#include <__algorithm/specialized_algorithms.h>
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
 #include <__fwd/ios.h>
 @@ -17,6 +19,7 @@
 #include <__fwd/streambuf.h>
 #include <__iterator/iterator.h>
 #include <__iterator/iterator_traits.h>
+#include <__type_traits/is_same.h>
 #include <iosfwd> // for forward declaration of ostreambuf_iterator
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -54,16 +57,36 @@ public:
       __sbuf_ = nullptr;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI ostreambuf_iterator& operator*() { return *this; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI ostreambuf_iterator& operator*() { return *this; }
   _LIBCPP_HIDE_FROM_ABI ostreambuf_iterator& operator++() { return *this; }
   _LIBCPP_HIDE_FROM_ABI ostreambuf_iterator& operator++(int) { return *this; }
-  _LIBCPP_HIDE_FROM_ABI bool failed() const _NOEXCEPT { return __sbuf_ == nullptr; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool failed() const _NOEXCEPT { return __sbuf_ == nullptr; }
 #if _LIBCPP_HAS_LOCALIZATION
   template <class _Ch, class _Tr>
   friend _LIBCPP_HIDE_FROM_ABI ostreambuf_iterator<_Ch, _Tr> __pad_and_output(
       ostreambuf_iterator<_Ch, _Tr> __s, const _Ch* __ob, const _Ch* __op, const _Ch* __oe, ios_base& __iob, _Ch __fl);
 #endif // _LIBCPP_HAS_LOCALIZATION
+  template <class, class...>
+  friend struct __specialized_algorithm;
+};
+template <class _InCharT, class _CharT, class _Traits>
+struct __specialized_algorithm<_Algorithm::__copy,
+                               __iterator_pair<_InCharT*, _InCharT*>,
+                               __single_iterator<ostreambuf_iterator<_CharT, _Traits> > > {
+  static const bool __has_algorithm = is_same<const _CharT, const _InCharT>::value;
+  _LIBCPP_HIDE_FROM_ABI static __in_out_result<_InCharT*, ostreambuf_iterator<_CharT, _Traits> >
+  operator()(_InCharT* __first, _InCharT* __last, ostreambuf_iterator<_CharT, _Traits> __result) {
+    auto __size = __last - __first;
+    if (__result.__sbuf_ && __size > 0) {
+      if (__result.__sbuf_->sputn(__first, __last - __first) != __size)
+        __result.__sbuf_ = nullptr;
+    }
+    return {__last, __result};
+  }
 };
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__iterator/ranges_iterator_traits.h+4-4

 @@ -19,10 +19,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <ranges::input_range _Range>
 using __range_key_type _LIBCPP_NODEBUG = __remove_const_t<typename ranges::range_value_t<_Range>::first_type>;
 @@ -33,8 +33,8 @@ template <ranges::input_range _Range>
 using __range_to_alloc_type _LIBCPP_NODEBUG =
     pair<const typename ranges::range_value_t<_Range>::first_type, typename ranges::range_value_t<_Range>::second_type>;
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif
 #endif // _LIBCPP___ITERATOR_RANGES_ITERATOR_TRAITS_H

lib/libcxx/include/__iterator/readable_traits.h+5-5

 @@ -10,12 +10,12 @@
 #ifndef _LIBCPP___ITERATOR_READABLE_TRAITS_H
 #define _LIBCPP___ITERATOR_READABLE_TRAITS_H
+#include <__concepts/primary_template.h>
 #include <__concepts/same_as.h>
 #include <__config>
 #include <__type_traits/conditional.h>
 #include <__type_traits/is_array.h>
 #include <__type_traits/is_object.h>
-#include <__type_traits/is_primary_template.h>
 #include <__type_traits/remove_cv.h>
 #include <__type_traits/remove_cvref.h>
 #include <__type_traits/remove_extent.h>
 @@ -24,10 +24,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [readable.traits]
 template <class>
 struct __cond_value_type {};
 @@ -74,8 +74,8 @@ template <__has_member_value_type _Tp>
            same_as<remove_cv_t<typename _Tp::element_type>, remove_cv_t<typename _Tp::value_type>>
 struct indirectly_readable_traits<_Tp> : __cond_value_type<typename _Tp::value_type> {};
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___ITERATOR_READABLE_TRAITS_H

lib/libcxx/include/__iterator/reverse_access.h+21-14

 @@ -18,62 +18,69 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 14
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, size_t _Np>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np]) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI
+_LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np]) {
   return reverse_iterator<_Tp*>(__array + _Np);
 }
 template <class _Tp, size_t _Np>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np]) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np]) {
   return reverse_iterator<_Tp*>(__array);
 }
 template <class _Ep>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<const _Ep*> rbegin(initializer_list<_Ep> __il) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<const _Ep*>
+rbegin(initializer_list<_Ep> __il) {
   return reverse_iterator<const _Ep*>(__il.end());
 }
 template <class _Ep>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<const _Ep*> rend(initializer_list<_Ep> __il) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<const _Ep*>
+rend(initializer_list<_Ep> __il) {
   return reverse_iterator<const _Ep*>(__il.begin());
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto rbegin(_Cp& __c) -> decltype(__c.rbegin()) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto rbegin(_Cp& __c) -> decltype(__c.rbegin()) {
   return __c.rbegin();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto rbegin(const _Cp& __c) -> decltype(__c.rbegin()) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto rbegin(const _Cp& __c)
+    -> decltype(__c.rbegin()) {
   return __c.rbegin();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto rend(_Cp& __c) -> decltype(__c.rend()) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto rend(_Cp& __c) -> decltype(__c.rend()) {
   return __c.rend();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto rend(const _Cp& __c) -> decltype(__c.rend()) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto rend(const _Cp& __c)
+    -> decltype(__c.rend()) {
   return __c.rend();
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto crbegin(const _Cp& __c) -> decltype(std::rbegin(__c)) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto crbegin(const _Cp& __c)
+    -> decltype(std::rbegin(__c)) {
   return std::rbegin(__c);
 }
 template <class _Cp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto crend(const _Cp& __c) -> decltype(std::rend(__c)) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto crend(const _Cp& __c)
+    -> decltype(std::rend(__c)) {
   return std::rend(__c);
 }
-#endif // _LIBCPP_STD_VER >= 14
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 14
 #endif // _LIBCPP___ITERATOR_REVERSE_ACCESS_H

lib/libcxx/include/__iterator/reverse_iterator.h+16-30

 @@ -15,21 +15,13 @@
 #include <__compare/three_way_comparable.h>
 #include <__concepts/convertible_to.h>
 #include <__config>
-#include <__iterator/advance.h>
 #include <__iterator/concepts.h>
 #include <__iterator/incrementable_traits.h>
 #include <__iterator/iter_move.h>
 #include <__iterator/iter_swap.h>
 #include <__iterator/iterator.h>
 #include <__iterator/iterator_traits.h>
-#include <__iterator/next.h>
-#include <__iterator/prev.h>
-#include <__iterator/readable_traits.h>
-#include <__iterator/segmented_iterator.h>
 #include <__memory/addressof.h>
-#include <__ranges/access.h>
-#include <__ranges/concepts.h>
-#include <__ranges/subrange.h>
 #include <__type_traits/conditional.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/is_assignable.h>
 @@ -38,7 +30,6 @@
 #include <__type_traits/is_pointer.h>
 #include <__type_traits/is_same.h>
 #include <__utility/declval.h>
-#include <__utility/move.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -121,8 +112,8 @@ public:
     return *this;
   }
 #endif
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 _Iter base() const { return current; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 _Iter base() const { return current; }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reference operator*() const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reference operator*() const {
     _Iter __tmp = current;
     return *--__tmp;
   }
 @@ -161,25 +152,29 @@ public:
     ++current;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator operator+(difference_type __n) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator
+  operator+(difference_type __n) const {
     return reverse_iterator(current - __n);
   }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator& operator+=(difference_type __n) {
     current -= __n;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator operator-(difference_type __n) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator
+  operator-(difference_type __n) const {
     return reverse_iterator(current + __n);
   }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator& operator-=(difference_type __n) {
     current += __n;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reference operator[](difference_type __n) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reference
+  operator[](difference_type __n) const {
     return *(*this + __n);
   }
 #if _LIBCPP_STD_VER >= 20
+  [[nodiscard]]
   _LIBCPP_HIDE_FROM_ABI friend constexpr iter_rvalue_reference_t<_Iter> iter_move(const reverse_iterator& __i) noexcept(
       is_nothrow_copy_constructible_v<_Iter> && noexcept(ranges::iter_move(--std::declval<_Iter&>()))) {
     auto __tmp = __i.base();
 @@ -280,21 +275,21 @@ operator<=>(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>&
 #ifndef _LIBCPP_CXX03_LANG
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI
-operator-(const reverse_iterator<_Iter1>& __x,
+_LIBCPP_CONSTEXPR_SINCE_CXX17 auto operator-(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-          const reverse_iterator<_Iter2>& __y) -> decltype(__y.base() - __x.base()) {
+    -> decltype(__y.base() - __x.base()) {
   return __y.base() - __x.base();
 }
 #else
 template <class _Iter1, class _Iter2>
-inline _LIBCPP_HIDE_FROM_ABI typename reverse_iterator<_Iter1>::difference_type
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI typename reverse_iterator<_Iter1>::difference_type
 operator-(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y) {
   return __y.base() - __x.base();
 }
 #endif
 template <class _Iter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<_Iter>
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<_Iter>
 operator+(typename reverse_iterator<_Iter>::difference_type __n, const reverse_iterator<_Iter>& __x) {
   return reverse_iterator<_Iter>(__x.base() - __n);
 }
 @@ -307,21 +302,12 @@ inline constexpr bool disable_sized_sentinel_for<reverse_iterator<_Iter1>, rever
 #if _LIBCPP_STD_VER >= 14
 template <class _Iter>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<_Iter> make_reverse_iterator(_Iter __i) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI
+_LIBCPP_CONSTEXPR_SINCE_CXX17 reverse_iterator<_Iter> make_reverse_iterator(_Iter __i) {
   return reverse_iterator<_Iter>(__i);
 }
 #endif
-#if _LIBCPP_STD_VER >= 20
-template <ranges::bidirectional_range _Range>
-_LIBCPP_HIDE_FROM_ABI constexpr ranges::subrange<reverse_iterator<ranges::iterator_t<_Range>>,
-                                                 reverse_iterator<ranges::iterator_t<_Range>>>
-__reverse_range(_Range&& __range) {
-  auto __first = ranges::begin(__range);
-  return {std::make_reverse_iterator(ranges::next(__first, ranges::end(__range))), std::make_reverse_iterator(__first)};
-}
-#endif
 template <class _Iter, bool __b>
 struct __unwrap_iter_impl<reverse_iterator<reverse_iterator<_Iter> >, __b> {
   using _UnwrappedIter _LIBCPP_NODEBUG  = decltype(__unwrap_iter_impl<_Iter>::__unwrap(std::declval<_Iter>()));

lib/libcxx/include/__iterator/segmented_iterator.h-2

...	@@ -42,8 +42,6 @@	...	@@ -42,8 +42,6 @@
42		42
43	#include <__config>	43	#include <__config>
44	#include <__cstddef/size_t.h>	44	#include <__cstddef/size_t.h>
45	#include <__iterator/iterator_traits.h>
46	#include <__type_traits/integral_constant.h>
47		45
48	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	46	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
49	# pragma GCC system_header	47	# pragma GCC system_header

lib/libcxx/include/__iterator/size.h+10-9

 @@ -20,25 +20,26 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Cont>
+[[nodiscard]]
 _LIBCPP_HIDE_FROM_ABI constexpr auto size(const _Cont& __c) noexcept(noexcept(__c.size())) -> decltype(__c.size()) {
   return __c.size();
 }
 template <class _Tp, size_t _Sz>
-_LIBCPP_HIDE_FROM_ABI constexpr size_t size(const _Tp (&)[_Sz]) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr size_t size(const _Tp (&)[_Sz]) noexcept {
   return _Sz;
 }
 #  if _LIBCPP_STD_VER >= 20
 template <class _Cont>
-_LIBCPP_HIDE_FROM_ABI constexpr auto
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto ssize(const _Cont& __c) noexcept(
-ssize(const _Cont& __c) noexcept(noexcept(static_cast<common_type_t<ptrdiff_t, make_signed_t<decltype(__c.size())>>>(
+    noexcept(static_cast<common_type_t<ptrdiff_t, make_signed_t<decltype(__c.size())>>>(__c.size())))
-    __c.size()))) -> common_type_t<ptrdiff_t, make_signed_t<decltype(__c.size())>> {
+    -> common_type_t<ptrdiff_t, make_signed_t<decltype(__c.size())>> {
   return static_cast<common_type_t<ptrdiff_t, make_signed_t<decltype(__c.size())>>>(__c.size());
 }
 @@ -47,14 +48,14 @@ ssize(const _Cont& __c) noexcept(noexcept(static_cast<common_type_t<ptrdiff_t, m
 _LIBCPP_DIAGNOSTIC_PUSH
 _LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wsign-conversion")
 template <class _Tp, ptrdiff_t _Sz>
-_LIBCPP_HIDE_FROM_ABI constexpr ptrdiff_t ssize(const _Tp (&)[_Sz]) noexcept {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr ptrdiff_t ssize(const _Tp (&)[_Sz]) noexcept {
   return _Sz;
 }
 _LIBCPP_DIAGNOSTIC_POP
 #  endif
-#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___ITERATOR_SIZE_H

lib/libcxx/include/__iterator/static_bounded_iter.h+7-6

 @@ -128,7 +128,7 @@ private:
 public:
   // Dereference and indexing operations.
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator*() const _NOEXCEPT {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator*() const _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
         __current() != __end(), "__static_bounded_iter::operator*: Attempt to dereference an iterator at the end");
     return *__current();
 @@ -140,7 +140,8 @@ public:
     return std::__to_address(__current());
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator[](difference_type __n) const _NOEXCEPT {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference
+  operator[](difference_type __n) const _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
         __n >= __begin() - __current(),
         "__static_bounded_iter::operator[]: Attempt to index an iterator past the start");
 @@ -186,13 +187,13 @@ public:
     __current() += __n;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __static_bounded_iter
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __static_bounded_iter
   operator+(__static_bounded_iter const& __self, difference_type __n) _NOEXCEPT {
     __static_bounded_iter __tmp(__self);
     __tmp += __n;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __static_bounded_iter
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __static_bounded_iter
   operator+(difference_type __n, __static_bounded_iter const& __self) _NOEXCEPT {
     __static_bounded_iter __tmp(__self);
     __tmp += __n;
 @@ -208,13 +209,13 @@ public:
     __current() -= __n;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __static_bounded_iter
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend __static_bounded_iter
   operator-(__static_bounded_iter const& __self, difference_type __n) _NOEXCEPT {
     __static_bounded_iter __tmp(__self);
     __tmp -= __n;
     return __tmp;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend difference_type
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 friend difference_type
   operator-(__static_bounded_iter const& __x, __static_bounded_iter const& __y) _NOEXCEPT {
     return __x.__current() - __y.__current();
   }

lib/libcxx/include/__iterator/wrap_iter.h+116-127

...	@@ -15,7 +15,6 @@	...	@@ -15,7 +15,6 @@
15	#include <__config>	15	#include <__config>
16	#include <__cstddef/size_t.h>	16	#include <__cstddef/size_t.h>
17	#include <__iterator/iterator_traits.h>	17	#include <__iterator/iterator_traits.h>
18	#include <__memory/addressof.h>
19	#include <__memory/pointer_traits.h>	18	#include <__memory/pointer_traits.h>
20	#include <__type_traits/conjunction.h>	19	#include <__type_traits/conjunction.h>
21	#include <__type_traits/disjunction.h>	20	#include <__type_traits/disjunction.h>
...	@@ -34,18 +33,17 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -34,18 +33,17 @@ _LIBCPP_BEGIN_NAMESPACE_STD
34	template <class _Iter>	33	template <class _Iter>
35	class __wrap_iter {	34	class __wrap_iter {
36	public:	35	public:
37	typedef _Iter iterator_type;	36	typedef typename iterator_traits<_Iter>::value_type value_type;
38	typedef typename iterator_traits<iterator_type>::value_type value_type;	37	typedef typename iterator_traits<_Iter>::difference_type difference_type;
39	typedef typename iterator_traits<iterator_type>::difference_type difference_type;	38	typedef typename iterator_traits<_Iter>::pointer pointer;
40	typedef typename iterator_traits<iterator_type>::pointer pointer;	39	typedef typename iterator_traits<_Iter>::reference reference;
41	typedef typename iterator_traits<iterator_type>::reference reference;	40	typedef typename iterator_traits<_Iter>::iterator_category iterator_category;
42	typedef typename iterator_traits<iterator_type>::iterator_category iterator_category;
43	#if _LIBCPP_STD_VER >= 20	41	#if _LIBCPP_STD_VER >= 20
44	typedef contiguous_iterator_tag iterator_concept;	42	typedef contiguous_iterator_tag iterator_concept;
45	#endif	43	#endif
46		44
47	private:	45	private:
48	iterator_type __i_;	46	_Iter __i_;
49		47
50	public:	48	public:
51	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter() _NOEXCEPT : __i_() {}	49	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter() _NOEXCEPT : __i_() {}
...	@@ -57,7 +55,9 @@ public:	...	@@ -57,7 +55,9 @@ public:
57	int> = 0>	55	int> = 0>
58	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter(const __wrap_iter<_OtherIter>& __u) _NOEXCEPT	56	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter(const __wrap_iter<_OtherIter>& __u) _NOEXCEPT
59	: __i_(__u.__i_) {}	57	: __i_(__u.__i_) {}
60	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator() const _NOEXCEPT { return __i_; }	58	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator*() const _NOEXCEPT {
		59	return *__i_;
		60	}
61	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pointer operator->() const _NOEXCEPT {	61	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pointer operator->() const _NOEXCEPT {
62	return std::__to_address(__i_);	62	return std::__to_address(__i_);
63	}	63	}
...	@@ -80,7 +80,8 @@ public:	...	@@ -80,7 +80,8 @@ public:
80	--(*this);	80	--(*this);
81	return __tmp;	81	return __tmp;
82	}	82	}
83	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter operator+(difference_type __n) const _NOEXCEPT {	83	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter
		84	operator+(difference_type __n) const _NOEXCEPT {
84	__wrap_iter __w(*this);	85	__wrap_iter __w(*this);
85	__w += __n;	86	__w += __n;
86	return __w;	87	return __w;
...	@@ -89,21 +90,21 @@ public:	...	@@ -89,21 +90,21 @@ public:
89	__i_ += __n;	90	__i_ += __n;
90	return *this;	91	return *this;
91	}	92	}
92	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter operator-(difference_type __n) const _NOEXCEPT {	93	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter
		94	operator-(difference_type __n) const _NOEXCEPT {
93	return *this + (-__n);	95	return *this + (-__n);
94	}	96	}
95	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter& operator-=(difference_type __n) _NOEXCEPT {	97	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter& operator-=(difference_type __n) _NOEXCEPT {
96	*this += -__n;	98	*this += -__n;
97	return *this;	99	return *this;
98	}	100	}
99	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference operator[](difference_type __n) const _NOEXCEPT {	101	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 reference
		102	operator[](difference_type __n) const _NOEXCEPT {
100	return __i_[__n];	103	return __i_[__n];
101	}	104	}
102		105
103	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 iterator_type base() const _NOEXCEPT { return __i_; }
104
105	private:	106	private:
106	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit __wrap_iter(iterator_type __x) _NOEXCEPT : __i_(__x) {}	107	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit __wrap_iter(_Iter __x) _NOEXCEPT : __i_(__x) {}
107		108
108	template <class _Up>	109	template <class _Up>
109	friend class __wrap_iter;	110	friend class __wrap_iter;
...	@@ -117,137 +118,125 @@ private:	...	@@ -117,137 +118,125 @@ private:
117	friend class span;	118	friend class span;
118	template <class _Tp, size_t _Size>	119	template <class _Tp, size_t _Size>
119	friend struct array;	120	friend struct array;
120	template <class _Tp, class>
121	friend struct __optional_iterator;
122	};
123
124	template <class _Iter1>
125	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool
126	operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT {
127	return __x.base() == __y.base();
128	}
129
130	template <class _Iter1, class _Iter2>
131	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool
132	operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {
133	return __x.base() == __y.base();
134	}
135
136	template <class _Iter1>
137	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool
138	operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT {
139	return __x.base() < __y.base();
140	}
141
142	template <class _Iter1, class _Iter2>
143	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool
144	operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {
145	return __x.base() < __y.base();
146	}
147		121
148	#if _LIBCPP_STD_VER <= 17	122	#if _LIBCPP_STD_VER <= 17
149	template <class _Iter1>	123	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
150	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool	124	operator==(const __wrap_iter& __x, const __wrap_iter& __y) _NOEXCEPT {
151	operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT {	125	return __x.__i_ == __y.__i_;
152	return !(__x == __y);	126	}
153	}	127
154		128	template <class _Iter2>
155	template <class _Iter1, class _Iter2>	129	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
156	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool	130	operator==(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {
157	operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {	131	return __x.__i_ == __y.__i_;
158	return !(__x == __y);	132	}
159	}	133
160	template <class _Iter1>	134	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
161	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool	135	operator<(const __wrap_iter& __x, const __wrap_iter& __y) _NOEXCEPT {
162	operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT {	136	return __x.__i_ < __y.__i_;
163	return __y < __x;	137	}
164	}	138
165		139	template <class _Iter2>
166	template <class _Iter1, class _Iter2>	140	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
167	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool	141	operator<(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {
168	operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {	142	return __x.__i_ < __y.__i_;
169	return __y < __x;	143	}
170	}	144
171		145	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
172	template <class _Iter1>	146	operator!=(const __wrap_iter& __x, const __wrap_iter& __y) _NOEXCEPT {
173	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool	147	return !(__x == __y);
174	operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT {	148	}
175	return !(__x < __y);	149
176	}	150	template <class _Iter2>
177		151	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
178	template <class _Iter1, class _Iter2>	152	operator!=(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {
179	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool	153	return !(__x == __y);
180	operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {	154	}
181	return !(__x < __y);	155
182	}	156	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
183		157	operator>(const __wrap_iter& __x, const __wrap_iter& __y) _NOEXCEPT {
184	template <class _Iter1>	158	return __y < __x;
185	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool	159	}
186	operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT {	160
187	return !(__y < __x);	161	template <class _Iter2>
188	}	162	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
189		163	operator>(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {
190	template <class _Iter1, class _Iter2>	164	return __y < __x;
191	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR bool	165	}
192	operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {	166
193	return !(__y < __x);	167	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
194	}	168	operator>=(const __wrap_iter& __x, const __wrap_iter& __y) _NOEXCEPT {
		169	return !(__x < __y);
		170	}
		171
		172	template <class _Iter2>
		173	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
		174	operator>=(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {
		175	return !(__x < __y);
		176	}
		177
		178	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
		179	operator<=(const __wrap_iter& __x, const __wrap_iter& __y) _NOEXCEPT {
		180	return !(__y < __x);
		181	}
		182
		183	template <class _Iter2>
		184	_LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR bool
		185	operator<=(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT {
		186	return !(__y < __x);
		187	}
195		188
196	#else	189	#else
197	template <class _Iter1, class _Iter2>	190	_LIBCPP_HIDE_FROM_ABI friend bool operator==(const __wrap_iter&, const __wrap_iter&) = default;
198	_LIBCPP_HIDE_FROM_ABI constexpr strong_ordering	191
199	operator<=>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) noexcept {	192	template <class _Iter2>
200	if constexpr (three_way_comparable_with<_Iter1, _Iter2, strong_ordering>) {	193	_LIBCPP_HIDE_FROM_ABI friend constexpr bool
201	return __x.base() <=> __y.base();	194	operator==(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) noexcept {
202	} else {	195	return __x.__i_ == __y.__i_;
203	if (__x.base() < __y.base())	196	}
204	return strong_ordering::less;
205		197
206	if (__x.base() == __y.base())	198	template <class _Iter2>
207	return strong_ordering::equal;	199	_LIBCPP_HIDE_FROM_ABI friend constexpr strong_ordering
		200	operator<=>(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) noexcept {
		201	if constexpr (three_way_comparable_with<_Iter, _Iter2, strong_ordering>) {
		202	return __x.__i_ <=> __y.__i_;
		203	} else {
		204	if (__x.__i_ < __y.__i_)
		205	return strong_ordering::less;
208		206
209	return strong_ordering::greater;	207	if (__x.__i_ == __y.__i_)
		208	return strong_ordering::equal;
		209
		210	return strong_ordering::greater;
		211	}
210	}	212	}
211	}
212	#endif // _LIBCPP_STD_VER >= 20	213	#endif // _LIBCPP_STD_VER >= 20
213		214
214	template <class _Iter1, class _Iter2>
215	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
216	#ifndef _LIBCPP_CXX03_LANG	215	#ifndef _LIBCPP_CXX03_LANG
217	auto	216	template <class _Iter2>
218	operator-(const __wrap_iter<_Iter1>& __x,	217	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR_SINCE_CXX14 auto
219	const __wrap_iter<_Iter2>& __y) _NOEXCEPT->decltype(__x.base() - __y.base())	218	operator-(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT->decltype(__x.__i_ - __y.__i_)
220	#else	219	#else
221	typename __wrap_iter<_Iter1>::difference_type	220	template <class _Iter2>
222	operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT	221	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR_SINCE_CXX14
		222	typename __wrap_iter::difference_type operator-(const __wrap_iter& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
223	#endif // C++03	223	#endif // C++03
224	{	224	{
225	return __x.base() - __y.base();	225	return __x.__i_ - __y.__i_;
226	}	226	}
227		227
228	template <class _Iter1>	228	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI friend _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter
229	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 __wrap_iter<_Iter1>	229	operator+(typename __wrap_iter::difference_type __n, __wrap_iter __x) _NOEXCEPT {
230	operator+(typename __wrap_iter<_Iter1>::difference_type __n, __wrap_iter<_Iter1> __x) _NOEXCEPT {	230	__x += __n;
231	__x += __n;	231	return __x;
232	return __x;	232	}
233	}	233	};
234		234
235	#if _LIBCPP_STD_VER <= 17	235	#if _LIBCPP_STD_VER <= 17
236	template <class _It>	236	template <class _It>
237	struct __libcpp_is_contiguous_iterator<__wrap_iter<_It> > : true_type {};	237	struct __libcpp_is_contiguous_iterator<__wrap_iter<_It> > : true_type {};
238	#endif	238	#endif
239		239
240	template <class _It>
241	struct pointer_traits<__wrap_iter<_It> > {
242	typedef __wrap_iter<_It> pointer;
243	typedef typename pointer_traits<_It>::element_type element_type;
244	typedef typename pointer_traits<_It>::difference_type difference_type;
245
246	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR static element_type* to_address(pointer __w) _NOEXCEPT {
247	return std::__to_address(__w.base());
248	}
249	};
250
251	_LIBCPP_END_NAMESPACE_STD	240	_LIBCPP_END_NAMESPACE_STD
252		241
253	#endif // _LIBCPP___ITERATOR_WRAP_ITER_H	242	#endif // _LIBCPP___ITERATOR_WRAP_ITER_H

lib/libcxx/include/__locale+118-72

 @@ -11,6 +11,7 @@
 #define _LIBCPP___LOCALE
 #include <__config>
+#include <__configuration/availability.h>
 #if _LIBCPP_HAS_LOCALIZATION
 @@ -26,6 +27,7 @@
 #  include <cstdint>
 #  include <cstdlib>
 #  include <string>
+#  include <text_encoding>
 // Some platforms require more includes than others. Keep the includes on all plaforms for now.
 #  include <cstddef>
 @@ -42,6 +44,7 @@
 #  endif
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 class _LIBCPP_EXPORTED_FROM_ABI locale;
 @@ -88,7 +91,7 @@ public:
   const locale& operator=(const locale&) _NOEXCEPT;
   template <class _Facet>
-  _LIBCPP_HIDE_FROM_ABI locale combine(const locale& __other) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI locale combine(const locale& __other) const {
     if (!std::has_facet<_Facet>(__other))
       __throw_runtime_error("locale::combine: locale missing facet");
 @@ -96,21 +99,29 @@ public:
   }
   // locale operations:
-  string name() const;
+  [[__nodiscard__]] string name() const;
   bool operator==(const locale&) const;
 #  if _LIBCPP_STD_VER <= 17
   _LIBCPP_HIDE_FROM_ABI bool operator!=(const locale& __y) const { return !(*this == __y); }
 #  endif
   template <class _CharT, class _Traits, class _Allocator>
+  [[__nodiscard__]]
   _LIBCPP_HIDE_FROM_ABI bool operator()(const basic_string<_CharT, _Traits, _Allocator>& __x,
                                         const basic_string<_CharT, _Traits, _Allocator>& __y) const {
     return std::use_facet<std::collate<_CharT> >(*this).compare(
                __x.data(), __x.data() + __x.size(), __y.data(), __y.data() + __y.size()) < 0;
   }
+#  if _LIBCPP_STD_VER >= 26
+  [[nodiscard]] _LIBCPP_AVAILABILITY_TEXT_ENCODING_ENVIRONMENT
+      _LIBCPP_HIDE_FROM_ABI std::text_encoding encoding() const {
+    std::string __name = name();
+    return std::__get_locale_encoding(__name.c_str());
+  }
+#  endif
   // global locale objects:
   static locale global(const locale&);
-  static const locale& classic();
+  [[__nodiscard__]] static const locale& classic();
 private:
   class __imp;
 @@ -118,6 +129,9 @@ private:
   template <class>
   friend struct __no_destroy;
+  friend ios_base;
   _LIBCPP_HIDE_FROM_ABI explicit locale(__private_constructor_tag, __imp* __loc) : __locale_(__loc) {}
   void __install_ctor(const locale&, facet*, long);
 @@ -168,12 +182,12 @@ inline _LIBCPP_HIDE_FROM_ABI locale::locale(const locale& __other, _Facet* __f)
 }
 template <class _Facet>
-inline _LIBCPP_HIDE_FROM_ABI bool has_facet(const locale& __l) _NOEXCEPT {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool has_facet(const locale& __l) _NOEXCEPT {
   return __l.has_facet(_Facet::id);
 }
 template <class _Facet>
-inline _LIBCPP_HIDE_FROM_ABI const _Facet& use_facet(const locale& __l) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI const _Facet& use_facet(const locale& __l) {
   return static_cast<const _Facet&>(*__l.use_facet(_Facet::id));
 }
 @@ -187,19 +201,21 @@ public:
   _LIBCPP_HIDE_FROM_ABI explicit collate(size_t __refs = 0) : locale::facet(__refs) {}
-  _LIBCPP_HIDE_FROM_ABI int
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int
   compare(const char_type* __lo1, const char_type* __hi1, const char_type* __lo2, const char_type* __hi2) const {
     return do_compare(__lo1, __hi1, __lo2, __hi2);
   }
   // FIXME(EricWF): The _LIBCPP_ALWAYS_INLINE is needed on Windows to work
   // around a dllimport bug that expects an external instantiation.
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE string_type
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE string_type
   transform(const char_type* __lo, const char_type* __hi) const {
     return do_transform(__lo, __hi);
   }
-  _LIBCPP_HIDE_FROM_ABI long hash(const char_type* __lo, const char_type* __hi) const { return do_hash(__lo, __hi); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI long hash(const char_type* __lo, const char_type* __hi) const {
+    return do_hash(__lo, __hi);
+  }
   static locale::id id;
 @@ -318,6 +334,8 @@ public:
 #    endif // defined(__BIONIC__)
 #  elif defined(__GLIBC__)
   typedef unsigned short mask;
+  _LIBCPP_DIAGNOSTIC_PUSH
+  _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wmodules-ambiguous-internal-linkage")
   static const mask space  = _ISspace;
   static const mask print  = _ISprint;
   static const mask cntrl  = _IScntrl;
 @@ -328,6 +346,7 @@ public:
   static const mask punct  = _ISpunct;
   static const mask xdigit = _ISxdigit;
   static const mask blank  = _ISblank;
+  _LIBCPP_DIAGNOSTIC_POP
 #    if defined(__mips__) || (BYTE_ORDER == BIG_ENDIAN)
   static const mask __regex_word = static_cast<mask>(_ISbit(15));
 #    else
 @@ -435,6 +454,20 @@ public:
   static const mask blank  = __ISBLANK;
 #    endif
   static const mask __regex_word = 0x8000;
+// zig patch: haiku support
+#  elif defined(__HAIKU__)
+  typedef unsigned short mask;
+  static const mask space        = _ISspace;
+  static const mask print        = _ISprint;
+  static const mask cntrl        = _IScntrl;
+  static const mask upper        = _ISupper;
+  static const mask lower        = _ISlower;
+  static const mask alpha        = _ISalpha;
+  static const mask digit        = _ISdigit;
+  static const mask punct        = _ISpunct;
+  static const mask xdigit       = _ISxdigit;
+  static const mask blank        = _ISblank;
+  static const mask __regex_word = 0x80;
 #  else
 #    error unknown rune table for this platform -- do you mean to define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE?
 #  endif
 @@ -459,39 +492,43 @@ public:
   _LIBCPP_HIDE_FROM_ABI explicit ctype(size_t __refs = 0) : locale::facet(__refs) {}
-  _LIBCPP_HIDE_FROM_ABI bool is(mask __m, char_type __c) const { return do_is(__m, __c); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool is(mask __m, char_type __c) const { return do_is(__m, __c); }
   _LIBCPP_HIDE_FROM_ABI const char_type* is(const char_type* __low, const char_type* __high, mask* __vec) const {
     return do_is(__low, __high, __vec);
   }
-  _LIBCPP_HIDE_FROM_ABI const char_type* scan_is(mask __m, const char_type* __low, const char_type* __high) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const char_type*
+  scan_is(mask __m, const char_type* __low, const char_type* __high) const {
     return do_scan_is(__m, __low, __high);
   }
-  _LIBCPP_HIDE_FROM_ABI const char_type* scan_not(mask __m, const char_type* __low, const char_type* __high) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const char_type*
+  scan_not(mask __m, const char_type* __low, const char_type* __high) const {
     return do_scan_not(__m, __low, __high);
   }
-  _LIBCPP_HIDE_FROM_ABI char_type toupper(char_type __c) const { return do_toupper(__c); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type toupper(char_type __c) const { return do_toupper(__c); }
   _LIBCPP_HIDE_FROM_ABI const char_type* toupper(char_type* __low, const char_type* __high) const {
     return do_toupper(__low, __high);
   }
-  _LIBCPP_HIDE_FROM_ABI char_type tolower(char_type __c) const { return do_tolower(__c); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type tolower(char_type __c) const { return do_tolower(__c); }
   _LIBCPP_HIDE_FROM_ABI const char_type* tolower(char_type* __low, const char_type* __high) const {
     return do_tolower(__low, __high);
   }
-  _LIBCPP_HIDE_FROM_ABI char_type widen(char __c) const { return do_widen(__c); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type widen(char __c) const { return do_widen(__c); }
   _LIBCPP_HIDE_FROM_ABI const char* widen(const char* __low, const char* __high, char_type* __to) const {
     return do_widen(__low, __high, __to);
   }
-  _LIBCPP_HIDE_FROM_ABI char narrow(char_type __c, char __dfault) const { return do_narrow(__c, __dfault); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char narrow(char_type __c, char __dfault) const {
+    return do_narrow(__c, __dfault);
+  }
   _LIBCPP_HIDE_FROM_ABI const char_type*
   narrow(const char_type* __low, const char_type* __high, char __dfault, char* __to) const {
 @@ -530,7 +567,7 @@ public:
   explicit ctype(const mask* __tab = nullptr, bool __del = false, size_t __refs = 0);
-  _LIBCPP_HIDE_FROM_ABI bool is(mask __m, char_type __c) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool is(mask __m, char_type __c) const {
     return std::__libcpp_isascii(__c) ? (__tab_[static_cast<int>(__c)] & __m) != 0 : false;
   }
 @@ -540,39 +577,43 @@ public:
     return __low;
   }
-  _LIBCPP_HIDE_FROM_ABI const char_type* scan_is(mask __m, const char_type* __low, const char_type* __high) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const char_type*
+  scan_is(mask __m, const char_type* __low, const char_type* __high) const {
     for (; __low != __high; ++__low)
       if (std::__libcpp_isascii(*__low) && (__tab_[static_cast<int>(*__low)] & __m))
         break;
     return __low;
   }
-  _LIBCPP_HIDE_FROM_ABI const char_type* scan_not(mask __m, const char_type* __low, const char_type* __high) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const char_type*
+  scan_not(mask __m, const char_type* __low, const char_type* __high) const {
     for (; __low != __high; ++__low)
       if (!std::__libcpp_isascii(*__low) || !(__tab_[static_cast<int>(*__low)] & __m))
         break;
     return __low;
   }
-  _LIBCPP_HIDE_FROM_ABI char_type toupper(char_type __c) const { return do_toupper(__c); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type toupper(char_type __c) const { return do_toupper(__c); }
   _LIBCPP_HIDE_FROM_ABI const char_type* toupper(char_type* __low, const char_type* __high) const {
     return do_toupper(__low, __high);
   }
-  _LIBCPP_HIDE_FROM_ABI char_type tolower(char_type __c) const { return do_tolower(__c); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type tolower(char_type __c) const { return do_tolower(__c); }
   _LIBCPP_HIDE_FROM_ABI const char_type* tolower(char_type* __low, const char_type* __high) const {
     return do_tolower(__low, __high);
   }
-  _LIBCPP_HIDE_FROM_ABI char_type widen(char __c) const { return do_widen(__c); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type widen(char __c) const { return do_widen(__c); }
   _LIBCPP_HIDE_FROM_ABI const char* widen(const char* __low, const char* __high, char_type* __to) const {
     return do_widen(__low, __high, __to);
   }
-  _LIBCPP_HIDE_FROM_ABI char narrow(char_type __c, char __dfault) const { return do_narrow(__c, __dfault); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char narrow(char_type __c, char __dfault) const {
+    return do_narrow(__c, __dfault);
+  }
   _LIBCPP_HIDE_FROM_ABI const char*
   narrow(const char_type* __low, const char_type* __high, char __dfault, char* __to) const {
 @@ -586,8 +627,8 @@ public:
 #  else
   static const size_t table_size = 256;
 #  endif
-  _LIBCPP_HIDE_FROM_ABI const mask* table() const _NOEXCEPT { return __tab_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const mask* table() const _NOEXCEPT { return __tab_; }
-  static const mask* classic_table() _NOEXCEPT;
+  [[__nodiscard__]] static const mask* classic_table() _NOEXCEPT;
 protected:
   ~ctype() override;
 @@ -650,72 +691,72 @@ protected:
 #  endif // _LIBCPP_HAS_WIDE_CHARACTERS
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool isspace(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool isspace(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::space, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool isprint(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool isprint(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool iscntrl(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool iscntrl(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::cntrl, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool isupper(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool isupper(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::upper, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool islower(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool islower(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::lower, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool isalpha(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool isalpha(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::alpha, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool isdigit(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool isdigit(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::digit, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool ispunct(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool ispunct(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::punct, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool isxdigit(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool isxdigit(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::xdigit, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool isalnum(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool isalnum(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::alnum, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI bool isgraph(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI bool isgraph(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::graph, __c);
 }
 template <class _CharT>
-_LIBCPP_HIDE_FROM_ABI bool isblank(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool isblank(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).is(ctype_base::blank, __c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI _CharT toupper(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _CharT toupper(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).toupper(__c);
 }
 template <class _CharT>
-inline _LIBCPP_HIDE_FROM_ABI _CharT tolower(_CharT __c, const locale& __loc) {
+[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _CharT tolower(_CharT __c, const locale& __loc) {
   return std::use_facet<ctype<_CharT> >(__loc).tolower(__c);
 }
 @@ -770,16 +811,16 @@ public:
     return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
   }
-  _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
-  _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
   _LIBCPP_HIDE_FROM_ABI int
   length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const {
     return do_length(__st, __frm, __end, __mx);
   }
-  _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
   static locale::id id;
 @@ -852,16 +893,16 @@ public:
     return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
   }
-  _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
-  _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
   _LIBCPP_HIDE_FROM_ABI int
   length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const {
     return do_length(__st, __frm, __end, __mx);
   }
-  _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
   static locale::id id;
 @@ -933,16 +974,16 @@ public:
     return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
   }
-  _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
-  _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
   _LIBCPP_HIDE_FROM_ABI int
   length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const {
     return do_length(__st, __frm, __end, __mx);
   }
-  _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
   static locale::id id;
 @@ -976,10 +1017,11 @@ protected:
 #  if _LIBCPP_HAS_CHAR8_T
-// template <> class codecvt<char16_t, char8_t, mbstate_t> // C++20
+// template <> class codecvt<char16_t, char8_t, mbstate_t> // C++20, deprecated in C++20
 template <>
-class _LIBCPP_EXPORTED_FROM_ABI codecvt<char16_t, char8_t, mbstate_t> : public locale::facet, public codecvt_base {
+class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_EXPORTED_FROM_ABI codecvt<char16_t, char8_t, mbstate_t>
+    : public locale::facet, public codecvt_base {
 public:
   typedef char16_t intern_type;
   typedef char8_t extern_type;
 @@ -1014,16 +1056,16 @@ public:
     return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
   }
-  _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
-  _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
   _LIBCPP_HIDE_FROM_ABI int
   length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const {
     return do_length(__st, __frm, __end, __mx);
   }
-  _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
   static locale::id id;
 @@ -1096,16 +1138,16 @@ public:
     return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
   }
-  _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
-  _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
   _LIBCPP_HIDE_FROM_ABI int
   length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const {
     return do_length(__st, __frm, __end, __mx);
   }
-  _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
   static locale::id id;
 @@ -1139,10 +1181,11 @@ protected:
 #  if _LIBCPP_HAS_CHAR8_T
-// template <> class codecvt<char32_t, char8_t, mbstate_t> // C++20
+// template <> class codecvt<char32_t, char8_t, mbstate_t> // C++20, deprecated in C++20
 template <>
-class _LIBCPP_EXPORTED_FROM_ABI codecvt<char32_t, char8_t, mbstate_t> : public locale::facet, public codecvt_base {
+class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_EXPORTED_FROM_ABI codecvt<char32_t, char8_t, mbstate_t>
+    : public locale::facet, public codecvt_base {
 public:
   typedef char32_t intern_type;
   typedef char8_t extern_type;
 @@ -1177,16 +1220,16 @@ public:
     return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
   }
-  _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI int encoding() const _NOEXCEPT { return do_encoding(); }
-  _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool always_noconv() const _NOEXCEPT { return do_always_noconv(); }
   _LIBCPP_HIDE_FROM_ABI int
   length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const {
     return do_length(__st, __frm, __end, __mx);
   }
-  _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI int max_length() const _NOEXCEPT { return do_max_length(); }
   static locale::id id;
 @@ -1248,8 +1291,10 @@ _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char16_t, char, mbstate_t>; // d
 extern template class _LIBCPP_DEPRECATED_IN_CXX20
 _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char32_t, char, mbstate_t>; // deprecated in C++20
 #  if _LIBCPP_HAS_CHAR8_T
-extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char16_t, char8_t, mbstate_t>; // C++20
+extern template class _LIBCPP_DEPRECATED_IN_CXX20
-extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char32_t, char8_t, mbstate_t>; // C++20
+_LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char16_t, char8_t, mbstate_t>; // C++20, deprecated in C++20
+extern template class _LIBCPP_DEPRECATED_IN_CXX20
+_LIBCPP_EXTERN_TEMPLATE_TYPE_VIS codecvt_byname<char32_t, char8_t, mbstate_t>; // C++20, deprecated in C++20
 #  endif
 template <size_t _Np>
 @@ -1409,11 +1454,11 @@ public:
   explicit numpunct(size_t __refs = 0);
-  _LIBCPP_HIDE_FROM_ABI char_type decimal_point() const { return do_decimal_point(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type decimal_point() const { return do_decimal_point(); }
-  _LIBCPP_HIDE_FROM_ABI char_type thousands_sep() const { return do_thousands_sep(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type thousands_sep() const { return do_thousands_sep(); }
-  _LIBCPP_HIDE_FROM_ABI string grouping() const { return do_grouping(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string grouping() const { return do_grouping(); }
-  _LIBCPP_HIDE_FROM_ABI string_type truename() const { return do_truename(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string_type truename() const { return do_truename(); }
-  _LIBCPP_HIDE_FROM_ABI string_type falsename() const { return do_falsename(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string_type falsename() const { return do_falsename(); }
   static locale::id id;
 @@ -1439,11 +1484,11 @@ public:
   explicit numpunct(size_t __refs = 0);
-  _LIBCPP_HIDE_FROM_ABI char_type decimal_point() const { return do_decimal_point(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type decimal_point() const { return do_decimal_point(); }
-  _LIBCPP_HIDE_FROM_ABI char_type thousands_sep() const { return do_thousands_sep(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type thousands_sep() const { return do_thousands_sep(); }
-  _LIBCPP_HIDE_FROM_ABI string grouping() const { return do_grouping(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string grouping() const { return do_grouping(); }
-  _LIBCPP_HIDE_FROM_ABI string_type truename() const { return do_truename(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string_type truename() const { return do_truename(); }
-  _LIBCPP_HIDE_FROM_ABI string_type falsename() const { return do_falsename(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string_type falsename() const { return do_falsename(); }
   static locale::id id;
 @@ -1494,6 +1539,7 @@ protected:
 };
 #  endif // _LIBCPP_HAS_WIDE_CHARACTERS
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 #endif // _LIBCPP_HAS_LOCALIZATION

lib/libcxx/include/__locale_dir/check_grouping.h+2

 @@ -20,10 +20,12 @@
 #  endif
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_EXPORTED_FROM_ABI void
 __check_grouping(const string& __grouping, unsigned* __g, unsigned* __g_end, ios_base::iostate& __err);
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 #endif // _LIBCPP_HAS_LOCALIZATION

lib/libcxx/include/__locale_dir/get_c_locale.h+2

 @@ -29,7 +29,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #  else
 #    define _LIBCPP_GET_C_LOCALE __cloc()
 // Get the C locale object
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_EXPORTED_FROM_ABI __locale::__locale_t __cloc();
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 #    define __cloc_defined
 #  endif

lib/libcxx/include/__locale_dir/locale_base_api.h+22-8

...	@@ -102,6 +102,8 @@	...	@@ -102,6 +102,8 @@
102	//	102	//
103	// int __snprintf(char, size_t, __locale_t, const char, ...); // required by the headers	103	// int __snprintf(char, size_t, __locale_t, const char, ...); // required by the headers
104	// int __asprintf(char*, __locale_t, const char, ...); // required by the headers	104	// int __asprintf(char*, __locale_t, const char, ...); // required by the headers
		105	//
		106	// const char* __get_locale_encoding(__locale_t);
105	// }	107	// }
106		108
107	#if _LIBCPP_HAS_LOCALIZATION	109	#if _LIBCPP_HAS_LOCALIZATION
...	@@ -112,33 +114,40 @@	...	@@ -112,33 +114,40 @@
112	# include <__locale_dir/support/freebsd.h>	114	# include <__locale_dir/support/freebsd.h>
113	# elif defined(__NetBSD__)	115	# elif defined(__NetBSD__)
114	# include <__locale_dir/support/netbsd.h>	116	# include <__locale_dir/support/netbsd.h>
		117	# elif defined(__OpenBSD__)
		118	# include <__locale_dir/support/openbsd.h>
115	# elif defined(_LIBCPP_MSVCRT_LIKE)	119	# elif defined(_LIBCPP_MSVCRT_LIKE)
116	# include <__locale_dir/support/windows.h>	120	# include <__locale_dir/support/windows.h>
117	# elif defined(__Fuchsia__)	121	# elif defined(__Fuchsia__)
118	# include <__locale_dir/support/fuchsia.h>	122	# include <__locale_dir/support/fuchsia.h>
		123	# elif _LIBCPP_LIBC_LLVM_LIBC
		124	# include <__locale_dir/support/llvm_libc.h>
119	# elif defined(__linux__)	125	# elif defined(__linux__)
120	# include <__locale_dir/support/linux.h>	126	# include <__locale_dir/support/linux.h>
121	# elif _LIBCPP_LIBC_NEWLIB	127	# elif _LIBCPP_LIBC_NEWLIB
122	# include <__locale_dir/support/newlib.h>	128	# include <__locale_dir/support/newlib.h>
123	# elif defined(_AIX)	129	# elif defined(_AIX)
124	# include <__locale_dir/support/aix.h>	130	# include <__locale_dir/support/aix.h>
		131	// zig patch: haiku support
		132	# elif defined(__HAIKU__)
		133	# include <__locale_dir/support/haiku.h>
		134	// zig patch: serenity support
		135	# elif defined(__serenity__)
		136	# include <__locale_dir/support/serenity.h>
125	# else	137	# else
126		138
127	// TODO: This is a temporary definition to bridge between the old way we defined the locale base API	139	// TODO: This is a temporary definition to bridge between the old way we defined the locale base API
128	// (by providing global non-reserved names) and the new API. As we move individual platforms	140	// (by providing global non-reserved names) and the new API. As we move individual platforms
129	// towards the new way of defining the locale base API, this should disappear since each platform	141	// towards the new way of defining the locale base API, this should disappear since each platform
130	// will define those directly.	142	// will define those directly.
131	# if defined(__MVS__)	143	# include <__locale_dir/locale_base_api/ibm.h>
132	# include <__locale_dir/locale_base_api/ibm.h>
133	# elif defined(__OpenBSD__)
134	# include <__locale_dir/locale_base_api/openbsd.h>
135	# endif
136		144
137	# include <__locale_dir/locale_base_api/bsd_locale_fallbacks.h>	145	# include <__locale_dir/locale_base_api/bsd_locale_fallbacks.h>
138		146
139	# include <__cstddef/size_t.h>	147	# include <__cstddef/size_t.h>
140	# include <__utility/forward.h>	148	# include <__utility/forward.h>
141	# include <ctype.h>	149	# include <ctype.h>
		150	# include <langinfo.h>
142	# include <string.h>	151	# include <string.h>
143	# include <time.h>	152	# include <time.h>
144	# if _LIBCPP_HAS_WIDE_CHARACTERS	153	# if _LIBCPP_HAS_WIDE_CHARACTERS
...	@@ -228,8 +237,8 @@ inline _LIBCPP_HIDE_FROM_ABI wint_t __towupper(wint_t __ch, __locale_t __loc) {	...	@@ -228,8 +237,8 @@ inline _LIBCPP_HIDE_FROM_ABI wint_t __towupper(wint_t __ch, __locale_t __loc) {
228	inline _LIBCPP_HIDE_FROM_ABI wint_t __towlower(wint_t __ch, __locale_t __loc) { return towlower_l(__ch, __loc); }	237	inline _LIBCPP_HIDE_FROM_ABI wint_t __towlower(wint_t __ch, __locale_t __loc) { return towlower_l(__ch, __loc); }
229	# endif	238	# endif
230		239
231	inline _LIBCPP_HIDE_FROM_ABI size_t	240	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
232	__strftime(char* __s, size_t __max, const char* __format, const tm* __tm, __locale_t __loc) {	241	__strftime(char* __s, size_t __max, const char* __format, const tm* __tm, __locale_t __loc) {
233	return strftime_l(__s, __max, __format, __tm, __loc);	242	return strftime_l(__s, __max, __format, __tm, __loc);
234	}	243	}
235		244
...	@@ -268,7 +277,12 @@ __mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps,	...	@@ -268,7 +277,12 @@ __mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps,
268	return __libcpp_mbsrtowcs_l(__dest, __src, __len, __ps, __loc);	277	return __libcpp_mbsrtowcs_l(__dest, __src, __len, __ps, __loc);
269	}	278	}
270	# endif // _LIBCPP_HAS_WIDE_CHARACTERS	279	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
271	# endif // _LIBCPP_BUILDING_LIBRARY	280
		281	inline _LIBCPP_HIDE_FROM_ABI const char* __get_locale_encoding(__locale_t __loc) {
		282	return ::nl_langinfo_l(CODESET, __loc);
		283	}
		284
		285	# endif // _LIBCPP_BUILDING_LIBRARY
272		286
273	_LIBCPP_DIAGNOSTIC_PUSH	287	_LIBCPP_DIAGNOSTIC_PUSH
274	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wgcc-compat")	288	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wgcc-compat")

lib/libcxx/include/__locale_dir/locale_base_api/android.h deleted-45

...	@@ -1,45 +0,0 @@
1	// -- C++ --
2	//===-----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_ANDROID_H
11	#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_ANDROID_H
12
13	#include <stdlib.h>
14
15	// FIXME: Is this actually required?
16	extern "C" {
17	#include <xlocale.h>
18	}
19
20	#include <android/api-level.h>
21
22	// If we do not have this header, we are in a platform build rather than an NDK
23	// build, which will always be at least as new as the ToT NDK, in which case we
24	// don't need any of the inlines below since libc provides them.
25	#if __has_include(<android/ndk-version.h>)
26	# include <android/ndk-version.h>
27	// In NDK versions later than 16, locale-aware functions are provided by
28	// legacy_stdlib_inlines.h
29	# if __NDK_MAJOR__ <= 16
30	# if __ANDROID_API__ < 26
31
32	inline _LIBCPP_HIDE_FROM_ABI float strtof_l(const char* __nptr, char** __endptr, locale_t) {
33	return ::strtof(__nptr, __endptr);
34	}
35
36	inline _LIBCPP_HIDE_FROM_ABI double strtod_l(const char* __nptr, char** __endptr, locale_t) {
37	return ::strtod(__nptr, __endptr);
38	}
39
40	# endif // __ANDROID_API__ < 26
41
42	# endif // __NDK_MAJOR__ <= 16
43	#endif // __has_include(<android/ndk-version.h>)
44
45	#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_ANDROID_H

lib/libcxx/include/__locale_dir/locale_base_api/ibm.h created+97

...	@@ -0,0 +1,97 @@
1	// -- C++ --
2	//===-----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H
11	#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H
12
13	#if defined(__MVS__)
14	# include <__support/ibm/locale_mgmt_zos.h>
15	#endif // defined(__MVS__)
16
17	#include <locale.h>
18	#include <stdarg.h>
19	#include <stdio.h>
20
21	#include "cstdlib"
22
23	#if defined(__MVS__)
24	# include <wctype.h>
25	// POSIX routines
26	# include <__support/xlocale/__posix_l_fallback.h>
27	#endif // defined(__MVS__)
28
29	namespace {
30
31	struct __setAndRestore {
32	explicit __setAndRestore(locale_t locale) {
33	if (locale == (locale_t)0) {
34	__cloc = newlocale(LC_ALL_MASK, "C", /* base */ (locale_t)0);
35	__stored = uselocale(__cloc);
36	} else {
37	__stored = uselocale(locale);
38	}
39	}
40
41	~__setAndRestore() {
42	uselocale(__stored);
43	if (__cloc)
44	freelocale(__cloc);
45	}
46
47	private:
48	locale_t __stored = (locale_t)0;
49	locale_t __cloc = (locale_t)0;
50	};
51
52	} // namespace
53
54	// The following are not POSIX routines. These are quick-and-dirty hacks
55	// to make things pretend to work
56	inline _LIBCPP_HIDE_FROM_ABI double strtod_l(const char* __nptr, char** __endptr, locale_t locale) {
57	__setAndRestore __newloc(locale);
58	return ::strtod(__nptr, __endptr);
59	}
60
61	inline _LIBCPP_HIDE_FROM_ABI float strtof_l(const char* __nptr, char** __endptr, locale_t locale) {
62	__setAndRestore __newloc(locale);
63	return ::strtof(__nptr, __endptr);
64	}
65
66	inline _LIBCPP_HIDE_FROM_ABI long double strtold_l(const char* __nptr, char** __endptr, locale_t locale) {
67	__setAndRestore __newloc(locale);
68	return ::strtold(__nptr, __endptr);
69	}
70
71	inline _LIBCPP_HIDE_FROM_ABI
72	_LIBCPP_ATTRIBUTE_FORMAT(__printf__, 2, 0) int vasprintf(char** strp, const char* fmt, va_list ap) {
73	const size_t buff_size = 256;
74	if ((strp = (char)malloc(buff_size)) == nullptr) {
75	return -1;
76	}
77
78	va_list ap_copy;
79	// va_copy may not be provided by the C library in C++03 mode.
80	#if defined(_LIBCPP_CXX03_LANG) && __has_builtin(__builtin_va_copy)
81	__builtin_va_copy(ap_copy, ap);
82	#else
83	va_copy(ap_copy, ap);
84	#endif
85	int str_size = vsnprintf(*strp, buff_size, fmt, ap_copy);
86	va_end(ap_copy);
87
88	if ((size_t)str_size >= buff_size) {
89	if ((strp = (char)realloc(*strp, str_size + 1)) == nullptr) {
90	return -1;
91	}
92	str_size = vsnprintf(*strp, str_size + 1, fmt, ap);
93	}
94	return str_size;
95	}
96
97	#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H

lib/libcxx/include/__locale_dir/locale_base_api/musl.h deleted-31

...	@@ -1,31 +0,0 @@
1	// -- C++ --
2	//===-----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9	// This adds support for the extended locale functions that are currently
10	// missing from the Musl C library.
11	//
12	// This only works when the specified locale is "C" or "POSIX", but that's
13	// about as good as we can do without implementing full xlocale support
14	// in Musl.
15	//===----------------------------------------------------------------------===//
16
17	#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_MUSL_H
18	#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_MUSL_H
19
20	#include <cstdlib>
21	#include <cwchar>
22
23	inline _LIBCPP_HIDE_FROM_ABI long long strtoll_l(const char* __nptr, char** __endptr, int __base, locale_t) {
24	return ::strtoll(__nptr, __endptr, __base);
25	}
26
27	inline _LIBCPP_HIDE_FROM_ABI unsigned long long strtoull_l(const char* __nptr, char** __endptr, int __base, locale_t) {
28	return ::strtoull(__nptr, __endptr, __base);
29	}
30
31	#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_MUSL_H

lib/libcxx/include/__locale_dir/locale_base_api/openbsd.h deleted-19

...	@@ -1,19 +0,0 @@
1	// -- C++ --
2	//===-----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
11	#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
12
13	#include <__support/xlocale/__strtonum_fallback.h>
14	#include <clocale>
15	#include <cstdlib>
16	#include <ctype.h>
17	#include <cwctype>
18
19	#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H

lib/libcxx/include/__locale_dir/messages.h+7-3

...	@@ -22,7 +22,8 @@	...	@@ -22,7 +22,8 @@
22		22
23	# if defined(__unix__) \|\| (defined(__APPLE__) && defined(__MACH__))	23	# if defined(__unix__) \|\| (defined(__APPLE__) && defined(__MACH__))
24	// Most unix variants have catopen. These are the specific ones that don't.	24	// Most unix variants have catopen. These are the specific ones that don't.
25	# if !defined(__BIONIC__) && !_LIBCPP_LIBC_NEWLIB && !defined(__EMSCRIPTEN__)	25	// zig patch: serenity support
		26	# if !defined(__BIONIC__) && !_LIBCPP_LIBC_NEWLIB && !defined(__EMSCRIPTEN__) && !defined(__serenity__)
26	# define _LIBCPP_HAS_CATOPEN 1	27	# define _LIBCPP_HAS_CATOPEN 1
27	# include <nl_types.h>	28	# include <nl_types.h>
28	# else	29	# else
...	@@ -33,6 +34,7 @@	...	@@ -33,6 +34,7 @@
33	# endif	34	# endif
34		35
35	_LIBCPP_BEGIN_NAMESPACE_STD	36	_LIBCPP_BEGIN_NAMESPACE_STD
		37	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
36		38
37	class _LIBCPP_EXPORTED_FROM_ABI messages_base {	39	class _LIBCPP_EXPORTED_FROM_ABI messages_base {
38	public:	40	public:
...	@@ -49,11 +51,12 @@ public:	...	@@ -49,11 +51,12 @@ public:
49		51
50	_LIBCPP_HIDE_FROM_ABI explicit messages(size_t __refs = 0) : locale::facet(__refs) {}	52	_LIBCPP_HIDE_FROM_ABI explicit messages(size_t __refs = 0) : locale::facet(__refs) {}
51		53
52	_LIBCPP_HIDE_FROM_ABI catalog open(const basic_string<char>& __nm, const locale& __loc) const {	54	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI catalog open(const basic_string<char>& __nm, const locale& __loc) const {
53	return do_open(__nm, __loc);	55	return do_open(__nm, __loc);
54	}	56	}
55		57
56	_LIBCPP_HIDE_FROM_ABI string_type get(catalog __c, int __set, int __msgid, const string_type& __dflt) const {	58	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string_type
		59	get(catalog __c, int __set, int __msgid, const string_type& __dflt) const {
57	return do_get(__c, __set, __msgid, __dflt);	60	return do_get(__c, __set, __msgid, __dflt);
58	}	61	}
59		62
...	@@ -136,6 +139,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages_byname<char>;	...	@@ -136,6 +139,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages_byname<char>;
136	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages_byname<wchar_t>;	139	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS messages_byname<wchar_t>;
137	# endif	140	# endif
138		141
		142	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
139	_LIBCPP_END_NAMESPACE_STD	143	_LIBCPP_END_NAMESPACE_STD
140		144
141	#endif // _LIBCPP_HAS_LOCALIZATION	145	#endif // _LIBCPP_HAS_LOCALIZATION

lib/libcxx/include/__locale_dir/money.h+11-9

 @@ -32,6 +32,7 @@ _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 // money_base
 @@ -55,15 +56,15 @@ public:
   _LIBCPP_HIDE_FROM_ABI explicit moneypunct(size_t __refs = 0) : locale::facet(__refs) {}
-  _LIBCPP_HIDE_FROM_ABI char_type decimal_point() const { return do_decimal_point(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type decimal_point() const { return do_decimal_point(); }
-  _LIBCPP_HIDE_FROM_ABI char_type thousands_sep() const { return do_thousands_sep(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI char_type thousands_sep() const { return do_thousands_sep(); }
-  _LIBCPP_HIDE_FROM_ABI string grouping() const { return do_grouping(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string grouping() const { return do_grouping(); }
-  _LIBCPP_HIDE_FROM_ABI string_type curr_symbol() const { return do_curr_symbol(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string_type curr_symbol() const { return do_curr_symbol(); }
-  _LIBCPP_HIDE_FROM_ABI string_type positive_sign() const { return do_positive_sign(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string_type positive_sign() const { return do_positive_sign(); }
-  _LIBCPP_HIDE_FROM_ABI string_type negative_sign() const { return do_negative_sign(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI string_type negative_sign() const { return do_negative_sign(); }
-  _LIBCPP_HIDE_FROM_ABI int frac_digits() const { return do_frac_digits(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI int frac_digits() const { return do_frac_digits(); }
-  _LIBCPP_HIDE_FROM_ABI pattern pos_format() const { return do_pos_format(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pattern pos_format() const { return do_pos_format(); }
-  _LIBCPP_HIDE_FROM_ABI pattern neg_format() const { return do_neg_format(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pattern neg_format() const { return do_neg_format(); }
   static locale::id id;
   static const bool intl = _International;
 @@ -864,6 +865,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS money_put<char>;
 extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS money_put<wchar_t>;
 #  endif
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS

lib/libcxx/include/__locale_dir/num.h+3-2

...	@@ -42,6 +42,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -42,6 +42,7 @@ _LIBCPP_PUSH_MACROS
42	# include <__undef_macros>	42	# include <__undef_macros>
43		43
44	_LIBCPP_BEGIN_NAMESPACE_STD	44	_LIBCPP_BEGIN_NAMESPACE_STD
		45	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
45		46
46	struct _LIBCPP_EXPORTED_FROM_ABI __num_get_base {	47	struct _LIBCPP_EXPORTED_FROM_ABI __num_get_base {
47	static const int __num_get_buf_sz = 40;	48	static const int __num_get_buf_sz = 40;
...	@@ -95,9 +96,8 @@ struct __num_get : protected __num_get_base {	...	@@ -95,9 +96,8 @@ struct __num_get : protected __num_get_base {
95	_LIBCPP_DIAGNOSTIC_PUSH	96	_LIBCPP_DIAGNOSTIC_PUSH
96	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wpsabi")	97	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wpsabi")
97	using __vec = __simd_vector<char, 32>;	98	using __vec = __simd_vector<char, 32>;
98	__vec __chars = std::__broadcast<__vec>(__val);
99	__vec __cmp = std::__partial_load<__vec, __int_chr_cnt>(__atoms);	99	__vec __cmp = std::__partial_load<__vec, __int_chr_cnt>(__atoms);
100	auto __res = __chars == __cmp;	100	auto __res = __vec(__val) == __cmp;
101	if (std::__none_of(__res))	101	if (std::__none_of(__res))
102	return __int_chr_cnt;	102	return __int_chr_cnt;
103	return std::min(__int_chr_cnt, std::__find_first_set(__res));	103	return std::min(__int_chr_cnt, std::__find_first_set(__res));
...	@@ -1008,6 +1008,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS num_put<char>;	...	@@ -1008,6 +1008,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS num_put<char>;
1008	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS num_put<wchar_t>;	1008	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS num_put<wchar_t>;
1009	# endif	1009	# endif
1010		1010
		1011	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
1011	_LIBCPP_END_NAMESPACE_STD	1012	_LIBCPP_END_NAMESPACE_STD
1012		1013
1013	_LIBCPP_POP_MACROS	1014	_LIBCPP_POP_MACROS

lib/libcxx/include/__locale_dir/pad_and_output.h+2-14

 @@ -55,13 +55,7 @@ _LIBCPP_HIDE_FROM_ABI ostreambuf_iterator<_CharT, _Traits> __pad_and_output(
     __ns -= __sz;
   else
     __ns = 0;
-  streamsize __np = __op - __ob;
+  __s = std::copy(__ob, __op, __s);
-  if (__np > 0) {
-    if (__s.__sbuf_->sputn(__ob, __np) != __np) {
-      __s.__sbuf_ = nullptr;
-      return __s;
-    }
-  }
   if (__ns > 0) {
     basic_string<_CharT, _Traits> __sp(__ns, __fl);
     if (__s.__sbuf_->sputn(__sp.data(), __ns) != __ns) {
 @@ -69,13 +63,7 @@ _LIBCPP_HIDE_FROM_ABI ostreambuf_iterator<_CharT, _Traits> __pad_and_output(
       return __s;
     }
   }
-  __np = __oe - __op;
+  __s = std::copy(__op, __oe, __s);
-  if (__np > 0) {
-    if (__s.__sbuf_->sputn(__op, __np) != __np) {
-      __s.__sbuf_ = nullptr;
-      return __s;
-    }
-  }
   __iob.width(0);
   return __s;
 }

lib/libcxx/include/__locale_dir/support/bsd_like.h+8-3

...	@@ -15,6 +15,7 @@	...	@@ -15,6 +15,7 @@
15	#include <__utility/forward.h>	15	#include <__utility/forward.h>
16	#include <clocale> // std::lconv	16	#include <clocale> // std::lconv
17	#include <ctype.h>	17	#include <ctype.h>
		18	#include <langinfo.h>
18	#include <stdio.h>	19	#include <stdio.h>
19	#include <stdlib.h>	20	#include <stdlib.h>
20	#include <string.h>	21	#include <string.h>
...	@@ -133,8 +134,8 @@ inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __	...	@@ -133,8 +134,8 @@ inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __
133	}	134	}
134	# endif // _LIBCPP_HAS_WIDE_CHARACTERS	135	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
135		136
136	inline _LIBCPP_HIDE_FROM_ABI size_t	137	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
137	__strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t __loc) {	138	__strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t __loc) {
138	return ::strftime_l(__s, __max, __format, __tm, __loc);	139	return ::strftime_l(__s, __max, __format, __tm, __loc);
139	}	140	}
140		141
...	@@ -180,7 +181,11 @@ __mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps,	...	@@ -180,7 +181,11 @@ __mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps,
180	return ::mbsrtowcs_l(__dest, __src, __len, __ps, __loc);	181	return ::mbsrtowcs_l(__dest, __src, __len, __ps, __loc);
181	}	182	}
182	# endif // _LIBCPP_HAS_WIDE_CHARACTERS	183	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
183	#endif // _LIBCPP_BUILDING_LIBRARY	184
		185	inline _LIBCPP_HIDE_FROM_ABI const char* __get_locale_encoding(__locale_t __loc) {
		186	return ::nl_langinfo_l(CODESET, __loc);
		187	}
		188	#endif // _LIBCPP_BUILDING_LIBRARY
184		189
185	_LIBCPP_DIAGNOSTIC_PUSH	190	_LIBCPP_DIAGNOSTIC_PUSH
186	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wgcc-compat")	191	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wgcc-compat")

lib/libcxx/include/__locale_dir/support/fuchsia.h+5

...	@@ -15,6 +15,7 @@	...	@@ -15,6 +15,7 @@
15	#include <cstdio>	15	#include <cstdio>
16	#include <cstdlib>	16	#include <cstdlib>
17	#include <cwchar>	17	#include <cwchar>
		18	#include <langinfo.h>
18		19
19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
20	# pragma GCC system_header	21	# pragma GCC system_header
...	@@ -69,6 +70,10 @@ inline _LIBCPP_HIDE_FROM_ABI __lconv_t* __localeconv(__locale_t& __loc) {	...	@@ -69,6 +70,10 @@ inline _LIBCPP_HIDE_FROM_ABI __lconv_t* __localeconv(__locale_t& __loc) {
69	return std::localeconv();	70	return std::localeconv();
70	}	71	}
71		72
		73	inline _LIBCPP_HIDE_FROM_ABI const char* __get_locale_encoding(__locale_t __loc) {
		74	return ::nl_langinfo_l(CODESET, __loc);
		75	}
		76
72	//	77	//
73	// Other functions	78	// Other functions
74	//	79	//

lib/libcxx/include/__locale_dir/support/haiku.h created+243

...	@@ -0,0 +1,243 @@
1	// zig patch: haiku support
2	//===-----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_HAIKU_H
11	#define _LIBCPP___LOCALE_DIR_SUPPORT_HAIKU_H
12
13	#include <__config>
14	#include <cctype>
15	#include <clocale>
16	#include <cstdio>
17	#include <cstdlib>
18	#include <cstring>
19	#if _LIBCPP_HAS_WIDE_CHARACTERS
20	# include <cwchar>
21	# include <cwctype>
22	#endif
23
24	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
25	# pragma GCC system_header
26	#endif
27
28	_LIBCPP_BEGIN_NAMESPACE_STD
29	namespace __locale {
30
31	struct __locale_guard {
32	_LIBCPP_HIDE_FROM_ABI __locale_guard(locale_t& __loc) : __old_loc_(::uselocale(__loc)) {}
33
34	_LIBCPP_HIDE_FROM_ABI ~__locale_guard() {
35	if (__old_loc_)
36	::uselocale(__old_loc_);
37	}
38
39	locale_t __old_loc_;
40
41	__locale_guard(__locale_guard const&) = delete;
42	__locale_guard& operator=(__locale_guard const&) = delete;
43	};
44
45	//
46	// Locale management
47	//
48	#define _LIBCPP_COLLATE_MASK LC_COLLATE_MASK
49	#define _LIBCPP_CTYPE_MASK LC_CTYPE_MASK
50	#define _LIBCPP_MONETARY_MASK LC_MONETARY_MASK
51	#define _LIBCPP_NUMERIC_MASK LC_NUMERIC_MASK
52	#define _LIBCPP_TIME_MASK LC_TIME_MASK
53	#define _LIBCPP_MESSAGES_MASK LC_MESSAGES_MASK
54	#define _LIBCPP_ALL_MASK LC_ALL_MASK
55	#define _LIBCPP_LC_ALL LC_ALL
56
57	using __locale_t _LIBCPP_NODEBUG = ::locale_t;
58
59	#if defined(_LIBCPP_BUILDING_LIBRARY)
60	using __lconv_t _LIBCPP_NODEBUG = std::lconv;
61
62	inline _LIBCPP_HIDE_FROM_ABI __locale_t __newlocale(int __category_mask, const char* __locale, __locale_t __base) {
63	return ::newlocale(__category_mask, __locale, __base);
64	}
65
66	inline _LIBCPP_HIDE_FROM_ABI void __freelocale(__locale_t __loc) { ::freelocale(__loc); }
67
68	inline _LIBCPP_HIDE_FROM_ABI char* __setlocale(int __category, char const* __locale) {
69	return ::setlocale(__category, __locale);
70	}
71
72	inline _LIBCPP_HIDE_FROM_ABI __lconv_t* __localeconv(__locale_t& __loc) {
73	__locale_guard __current(__loc);
74	return std::localeconv();
75	}
76	#endif // _LIBCPP_BUILDING_LIBRARY
77
78	//
79	// Strtonum functions
80	//
81	inline _LIBCPP_HIDE_FROM_ABI float __strtof(const char* __nptr, char** __endptr, __locale_t __loc) {
82	__locale_guard __current(__loc);
83	return std::strtof(__nptr, __endptr);
84	}
85
86	inline _LIBCPP_HIDE_FROM_ABI double __strtod(const char* __nptr, char** __endptr, __locale_t __loc) {
87	__locale_guard __current(__loc);
88	return std::strtod(__nptr, __endptr);
89	}
90
91	inline _LIBCPP_HIDE_FROM_ABI long double __strtold(const char* __nptr, char** __endptr, __locale_t __loc) {
92	__locale_guard __current(__loc);
93	return std::strtold(__nptr, __endptr);
94	}
95
96	//
97	// Character manipulation functions
98	//
99	#if defined(_LIBCPP_BUILDING_LIBRARY)
100	inline _LIBCPP_HIDE_FROM_ABI int __toupper(int __c, __locale_t __loc) { return ::toupper_l(__c, __loc); }
101
102	inline _LIBCPP_HIDE_FROM_ABI int __tolower(int __c, __locale_t __loc) { return ::tolower_l(__c, __loc); }
103
104	inline _LIBCPP_HIDE_FROM_ABI int __strcoll(const char* __s1, const char* __s2, __locale_t __loc) {
105	return ::strcoll_l(__s1, __s2, __loc);
106	}
107
108	inline _LIBCPP_HIDE_FROM_ABI size_t __strxfrm(char* __dest, const char* __src, size_t __n, __locale_t __loc) {
109	return ::strxfrm_l(__dest, __src, __n, __loc);
110	}
111
112	# if _LIBCPP_HAS_WIDE_CHARACTERS
113	inline _LIBCPP_HIDE_FROM_ABI int __iswctype(wint_t __c, wctype_t __type, __locale_t __loc) {
114	return ::iswctype_l(__c, __type, __loc);
115	}
116
117	inline _LIBCPP_HIDE_FROM_ABI int __iswspace(wint_t __c, __locale_t __loc) { return ::iswspace_l(__c, __loc); }
118
119	inline _LIBCPP_HIDE_FROM_ABI int __iswprint(wint_t __c, __locale_t __loc) { return ::iswprint_l(__c, __loc); }
120
121	inline _LIBCPP_HIDE_FROM_ABI int __iswcntrl(wint_t __c, __locale_t __loc) { return ::iswcntrl_l(__c, __loc); }
122
123	inline _LIBCPP_HIDE_FROM_ABI int __iswupper(wint_t __c, __locale_t __loc) { return ::iswupper_l(__c, __loc); }
124
125	inline _LIBCPP_HIDE_FROM_ABI int __iswlower(wint_t __c, __locale_t __loc) { return ::iswlower_l(__c, __loc); }
126
127	inline _LIBCPP_HIDE_FROM_ABI int __iswalpha(wint_t __c, __locale_t __loc) { return ::iswalpha_l(__c, __loc); }
128
129	inline _LIBCPP_HIDE_FROM_ABI int __iswblank(wint_t __c, __locale_t __loc) { return ::iswblank_l(__c, __loc); }
130
131	inline _LIBCPP_HIDE_FROM_ABI int __iswdigit(wint_t __c, __locale_t __loc) { return ::iswdigit_l(__c, __loc); }
132
133	inline _LIBCPP_HIDE_FROM_ABI int __iswpunct(wint_t __c, __locale_t __loc) { return ::iswpunct_l(__c, __loc); }
134
135	inline _LIBCPP_HIDE_FROM_ABI int __iswxdigit(wint_t __c, __locale_t __loc) { return ::iswxdigit_l(__c, __loc); }
136
137	inline _LIBCPP_HIDE_FROM_ABI wint_t __towupper(wint_t __c, __locale_t __loc) { return ::towupper_l(__c, __loc); }
138
139	inline _LIBCPP_HIDE_FROM_ABI wint_t __towlower(wint_t __c, __locale_t __loc) { return ::towlower_l(__c, __loc); }
140
141	inline _LIBCPP_HIDE_FROM_ABI int __wcscoll(const wchar_t* __ws1, const wchar_t* __ws2, __locale_t __loc) {
142	return ::wcscoll_l(__ws1, __ws2, __loc);
143	}
144
145	inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __src, size_t __n, __locale_t __loc) {
146	return ::wcsxfrm_l(__dest, __src, __n, __loc);
147	}
148	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
149
150	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
151	__strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t __loc) {
152	return ::strftime_l(__s, __max, __format, __tm, __loc);
153	}
154
155	//
156	// Other functions
157	//
158	inline _LIBCPP_HIDE_FROM_ABI decltype(MB_CUR_MAX) __mb_len_max(__locale_t __loc) {
159	__locale_guard __current(__loc);
160	return MB_CUR_MAX;
161	}
162
163	# if _LIBCPP_HAS_WIDE_CHARACTERS
164	inline _LIBCPP_HIDE_FROM_ABI wint_t __btowc(int __c, __locale_t __loc) {
165	__locale_guard __current(__loc);
166	return std::btowc(__c);
167	}
168
169	inline _LIBCPP_HIDE_FROM_ABI int __wctob(wint_t __c, __locale_t __loc) {
170	__locale_guard __current(__loc);
171	return std::wctob(__c);
172	}
173
174	inline _LIBCPP_HIDE_FROM_ABI size_t
175	__wcsnrtombs(char* __dest, const wchar_t** __src, size_t __nwc, size_t __len, mbstate_t* __ps, __locale_t __loc) {
176	__locale_guard __current(__loc);
177	return ::wcsnrtombs(__dest, __src, __nwc, __len, __ps); // non-standard
178	}
179
180	inline _LIBCPP_HIDE_FROM_ABI size_t __wcrtomb(char* __s, wchar_t __wc, mbstate_t* __ps, __locale_t __loc) {
181	__locale_guard __current(__loc);
182	return std::wcrtomb(__s, __wc, __ps);
183	}
184
185	inline _LIBCPP_HIDE_FROM_ABI size_t
186	__mbsnrtowcs(wchar_t* __dest, const char** __src, size_t __nms, size_t __len, mbstate_t* __ps, __locale_t __loc) {
187	__locale_guard __current(__loc);
188	return ::mbsnrtowcs(__dest, __src, __nms, __len, __ps); // non-standard
189	}
190
191	inline _LIBCPP_HIDE_FROM_ABI size_t
192	__mbrtowc(wchar_t* __pwc, const char* __s, size_t __n, mbstate_t* __ps, __locale_t __loc) {
193	__locale_guard __current(__loc);
194	return std::mbrtowc(__pwc, __s, __n, __ps);
195	}
196
197	inline _LIBCPP_HIDE_FROM_ABI int __mbtowc(wchar_t* __pwc, const char* __pmb, size_t __max, __locale_t __loc) {
198	__locale_guard __current(__loc);
199	return std::mbtowc(__pwc, __pmb, __max);
200	}
201
202	inline _LIBCPP_HIDE_FROM_ABI size_t __mbrlen(const char* __s, size_t __n, mbstate_t* __ps, __locale_t __loc) {
203	__locale_guard __current(__loc);
204	return std::mbrlen(__s, __n, __ps);
205	}
206
207	inline _LIBCPP_HIDE_FROM_ABI size_t
208	__mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps, __locale_t __loc) {
209	__locale_guard __current(__loc);
210	return std::mbsrtowcs(__dest, __src, __len, __ps);
211	}
212	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
213	#endif // _LIBCPP_BUILDING_LIBRARY
214
215	#ifndef _LIBCPP_COMPILER_GCC // GCC complains that this can't be always_inline due to C-style varargs
216	_LIBCPP_HIDE_FROM_ABI
217	#endif
218	inline _LIBCPP_ATTRIBUTE_FORMAT(__printf__, 4, 5) int __snprintf(
219	char* __s, size_t __n, __locale_t __loc, const char* __format, ...) {
220	va_list __va;
221	va_start(__va, __format);
222	__locale_guard __current(__loc);
223	int __res = std::vsnprintf(__s, __n, __format, __va);
224	va_end(__va);
225	return __res;
226	}
227
228	#ifndef _LIBCPP_COMPILER_GCC // GCC complains that this can't be always_inline due to C-style varargs
229	_LIBCPP_HIDE_FROM_ABI
230	#endif
231	inline _LIBCPP_ATTRIBUTE_FORMAT(__printf__, 3, 4) int __asprintf(
232	char** __s, __locale_t __loc, const char* __format, ...) {
233	va_list __va;
234	va_start(__va, __format);
235	__locale_guard __current(__loc);
236	int __res = ::vasprintf(__s, __format, __va); // non-standard
237	va_end(__va);
238	return __res;
239	}
240	} // namespace __locale
241	_LIBCPP_END_NAMESPACE_STD
242
243	#endif // _LIBCPP___LOCALE_DIR_SUPPORT_HAIKU_H

lib/libcxx/include/__locale_dir/support/linux.h+12-3

...	@@ -17,6 +17,7 @@	...	@@ -17,6 +17,7 @@
17	#include <cstdio>	17	#include <cstdio>
18	#include <cstdlib>	18	#include <cstdlib>
19	#include <ctype.h>	19	#include <ctype.h>
		20	#include <langinfo.h>
20	#include <stdarg.h>	21	#include <stdarg.h>
21	#include <string.h>	22	#include <string.h>
22	#include <time.h>	23	#include <time.h>
...	@@ -148,8 +149,8 @@ inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __	...	@@ -148,8 +149,8 @@ inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __
148	}	149	}
149	# endif // _LIBCPP_HAS_WIDE_CHARACTERS	150	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
150		151
151	inline _LIBCPP_HIDE_FROM_ABI size_t	152	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
152	__strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t __loc) {	153	__strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t __loc) {
153	return strftime_l(__s, __max, __format, __tm, __loc);	154	return strftime_l(__s, __max, __format, __tm, __loc);
154	}	155	}
155		156
...	@@ -211,7 +212,15 @@ __mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps,	...	@@ -211,7 +212,15 @@ __mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps,
211	return std::mbsrtowcs(__dest, __src, __len, __ps);	212	return std::mbsrtowcs(__dest, __src, __len, __ps);
212	}	213	}
213	# endif // _LIBCPP_HAS_WIDE_CHARACTERS	214	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
214	#endif // _LIBCPP_BUILDING_LIBRARY	215
		216	inline _LIBCPP_HIDE_FROM_ABI const char* __get_locale_encoding([[maybe_unused]] __locale_t __loc) {
		217	# if defined(__ANDROID__)
		218	return "UTF-8";
		219	# else
		220	return ::nl_langinfo_l(CODESET, __loc);
		221	# endif
		222	}
		223	#endif // _LIBCPP_BUILDING_LIBRARY
215		224
216	#ifndef _LIBCPP_COMPILER_GCC // GCC complains that this can't be always_inline due to C-style varargs	225	#ifndef _LIBCPP_COMPILER_GCC // GCC complains that this can't be always_inline due to C-style varargs
217	_LIBCPP_HIDE_FROM_ABI	226	_LIBCPP_HIDE_FROM_ABI

lib/libcxx/include/__locale_dir/support/newlib.h+7-2

...	@@ -16,6 +16,7 @@	...	@@ -16,6 +16,7 @@
16	#include <cstdio>	16	#include <cstdio>
17	#include <cstdlib>	17	#include <cstdlib>
18	#include <ctype.h>	18	#include <ctype.h>
		19	#include <langinfo.h>
19	#include <stdarg.h>	20	#include <stdarg.h>
20	#include <string.h>	21	#include <string.h>
21	#include <time.h>	22	#include <time.h>
...	@@ -76,6 +77,10 @@ inline _LIBCPP_HIDE_FROM_ABI __lconv_t* __localeconv(__locale_t& __loc) {	...	@@ -76,6 +77,10 @@ inline _LIBCPP_HIDE_FROM_ABI __lconv_t* __localeconv(__locale_t& __loc) {
76	__locale_guard __current(__loc);	77	__locale_guard __current(__loc);
77	return std::localeconv();	78	return std::localeconv();
78	}	79	}
		80
		81	inline _LIBCPP_HIDE_FROM_ABI const char* __get_locale_encoding(__locale_t __loc) {
		82	return ::nl_langinfo_l(CODESET, __loc);
		83	}
79	#endif // _LIBCPP_BUILDING_LIBRARY	84	#endif // _LIBCPP_BUILDING_LIBRARY
80		85
81	//	86	//
...	@@ -147,8 +152,8 @@ inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __	...	@@ -147,8 +152,8 @@ inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __
147	}	152	}
148	# endif // _LIBCPP_HAS_WIDE_CHARACTERS	153	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
149		154
150	inline _LIBCPP_HIDE_FROM_ABI	155	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
151	size_t __strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t __loc) {	156	__strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t __loc) {
152	return strftime_l(__s, __max, __format, __tm, __loc);	157	return strftime_l(__s, __max, __format, __tm, __loc);
153	}	158	}
154		159

lib/libcxx/include/__locale_dir/support/no_locale/characters.h+6-4

 @@ -16,6 +16,7 @@
 #include <cstring>
 #include <ctime>
 #if _LIBCPP_HAS_WIDE_CHARACTERS
+#  include <cwchar>
 #  include <cwctype>
 #endif
 @@ -23,13 +24,14 @@
 #  pragma GCC system_header
 #endif
+#if defined(_LIBCPP_BUILDING_LIBRARY)
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __locale {
 //
 // Character manipulation functions
 //
-#if defined(_LIBCPP_BUILDING_LIBRARY)
 inline _LIBCPP_HIDE_FROM_ABI int __toupper(int __c, __locale_t) { return std::toupper(__c); }
 inline _LIBCPP_HIDE_FROM_ABI int __tolower(int __c, __locale_t) { return std::tolower(__c); }
 @@ -80,13 +82,13 @@ inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __
 }
 #  endif // _LIBCPP_HAS_WIDE_CHARACTERS
-inline _LIBCPP_HIDE_FROM_ABI size_t
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
-__strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t) {
+    __strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t) {
   return std::strftime(__s, __max, __format, __tm);
 }
-#endif // _LIBCPP_BUILDING_LIBRARY
 } // namespace __locale
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_BUILDING_LIBRARY
 #endif // _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_CHARACTERS_H

lib/libcxx/include/__locale_dir/support/no_locale/conversions.h created+73

...	@@ -0,0 +1,73 @@
1	//===-----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_CONVERSIONS_H
10	#define _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_CONVERSIONS_H
11
12	#include <__config>
13	#include <__cstddef/size_t.h>
14	#include <__std_mbstate_t.h>
15	#include <cstdlib>
16	#if _LIBCPP_HAS_WIDE_CHARACTERS
17	# include <cwchar>
18	#endif
19
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header
22	#endif
23
24	#if defined(_LIBCPP_BUILDING_LIBRARY)
25
26	_LIBCPP_BEGIN_NAMESPACE_STD
27	namespace __locale {
28
29	inline _LIBCPP_HIDE_FROM_ABI decltype(MB_CUR_MAX) __mb_len_max(__locale_t) { return MB_CUR_MAX; }
30
31	# if _LIBCPP_HAS_WIDE_CHARACTERS
32	inline _LIBCPP_HIDE_FROM_ABI wint_t __btowc(int __c, __locale_t) { return std::btowc(__c); }
33
34	inline _LIBCPP_HIDE_FROM_ABI int __wctob(wint_t __c, __locale_t) { return std::wctob(__c); }
35
36	inline _LIBCPP_HIDE_FROM_ABI size_t
37	__wcsnrtombs(char* __dest, const wchar_t** __src, size_t __nwc, size_t __len, mbstate_t* __ps, __locale_t) {
38	return ::wcsnrtombs(__dest, __src, __nwc, __len, __ps); // Non-standard
39	}
40
41	inline _LIBCPP_HIDE_FROM_ABI size_t __wcrtomb(char* __s, wchar_t __wc, mbstate_t* __ps, __locale_t) {
42	return std::wcrtomb(__s, __wc, __ps);
43	}
44
45	inline _LIBCPP_HIDE_FROM_ABI size_t
46	__mbsnrtowcs(wchar_t* __dest, const char** __src, size_t __nms, size_t __len, mbstate_t* __ps, __locale_t) {
47	return ::mbsnrtowcs(__dest, __src, __nms, __len, __ps); // Non-standard
48	}
49
50	inline _LIBCPP_HIDE_FROM_ABI size_t
51	__mbrtowc(wchar_t* __pwc, const char* __s, size_t __n, mbstate_t* __ps, __locale_t) {
52	return std::mbrtowc(__pwc, __s, __n, __ps);
53	}
54
55	inline _LIBCPP_HIDE_FROM_ABI int __mbtowc(wchar_t* __pwc, const char* __pmb, size_t __max, __locale_t) {
56	return std::mbtowc(__pwc, __pmb, __max);
57	}
58
59	inline _LIBCPP_HIDE_FROM_ABI size_t __mbrlen(const char* __s, size_t __n, mbstate_t* __ps, __locale_t) {
60	return std::mbrlen(__s, __n, __ps);
61	}
62
63	inline _LIBCPP_HIDE_FROM_ABI size_t
64	__mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps, __locale_t) {
65	return std::mbsrtowcs(__dest, __src, __len, __ps);
66	}
67	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
68
69	} // namespace __locale
70	_LIBCPP_END_NAMESPACE_STD
71
72	#endif // _LIBCPP_BUILDING_LIBRARY
73	#endif // _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_CONVERSIONS_H

lib/libcxx/include/__locale_dir/support/no_locale/formatting.h created+50

...	@@ -0,0 +1,50 @@
1	//===-----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_FORMATTING_H
10	#define _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_FORMATTING_H
11
12	#include <__config>
13	#include <__utility/forward.h>
14	#include <cstdio>
15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header
18	#endif
19
20	_LIBCPP_BEGIN_NAMESPACE_STD
21	namespace __locale {
22
23	_LIBCPP_DIAGNOSTIC_PUSH
24	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wgcc-compat")
25	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wformat-nonliteral") // GCC doesn't support [[gnu::format]] on variadic templates
26	#ifdef _LIBCPP_COMPILER_CLANG_BASED
27	# define _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(...) _LIBCPP_ATTRIBUTE_FORMAT(__VA_ARGS__)
28	#else
29	# define _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(...) /* nothing */
30	#endif
31
32	template <class... _Args>
33	_LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 4, 5) int __snprintf(
34	char* __s, size_t __n, __locale_t, const char* __format, _Args&&... __args) {
35	return std::snprintf(__s, __n, __format, std::forward<_Args>(__args)...);
36	}
37
38	template <class... _Args>
39	_LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 3, 4) int __asprintf(
40	char** __s, __locale_t, const char* __format, _Args&&... __args) {
41	return ::asprintf(__s, __format, std::forward<_Args>(__args)...); // non-standard
42	}
43
44	_LIBCPP_DIAGNOSTIC_POP
45	#undef _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT
46
47	} // namespace __locale
48	_LIBCPP_END_NAMESPACE_STD
49
50	#endif // _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_FORMATTING_H

lib/libcxx/include/__locale_dir/support/openbsd.h created+236

...	@@ -0,0 +1,236 @@
1	// -- C++ --
2	//===-----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
11	#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
12
13	#include <__config>
14	#include <__cstddef/size_t.h>
15	#include <__std_mbstate_t.h>
16	#include <__utility/forward.h>
17	#include <clocale> // std::lconv
18	#include <ctype.h>
19	#include <stdio.h>
20	#include <stdlib.h>
21	#include <string.h>
22	#include <time.h>
23	#if _LIBCPP_HAS_WIDE_CHARACTERS
24	# include <wchar.h>
25	# include <wctype.h>
26	#endif
27	#if defined(_LIBCPP_BUILDING_LIBRARY)
28	# include <langinfo.h>
29	#endif
30
31	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
32	# pragma GCC system_header
33	#endif
34
35	_LIBCPP_BEGIN_NAMESPACE_STD
36	namespace __locale {
37
38	struct __locale_guard {
39	__locale_guard(locale_t& __loc) : __old_loc_(::uselocale(__loc)) {}
40
41	~__locale_guard() {
42	if (__old_loc_)
43	::uselocale(__old_loc_);
44	}
45
46	locale_t __old_loc_;
47
48	__locale_guard(__locale_guard const&) = delete;
49	__locale_guard& operator=(__locale_guard const&) = delete;
50	};
51
52	//
53	// Locale management
54	//
55	#define _LIBCPP_COLLATE_MASK LC_COLLATE_MASK
56	#define _LIBCPP_CTYPE_MASK LC_CTYPE_MASK
57	#define _LIBCPP_MONETARY_MASK LC_MONETARY_MASK
58	#define _LIBCPP_NUMERIC_MASK LC_NUMERIC_MASK
59	#define _LIBCPP_TIME_MASK LC_TIME_MASK
60	#define _LIBCPP_MESSAGES_MASK LC_MESSAGES_MASK
61	#define _LIBCPP_ALL_MASK LC_ALL_MASK
62	#define _LIBCPP_LC_ALL LC_ALL
63
64	using __locale_t _LIBCPP_NODEBUG = ::locale_t;
65	#if defined(_LIBCPP_BUILDING_LIBRARY)
66	using __lconv_t _LIBCPP_NODEBUG = std::lconv;
67
68	inline __locale_t __newlocale(int __category_mask, const char* __locale, __locale_t __base) {
69	return ::newlocale(__category_mask, __locale, __base);
70	}
71
72	inline void __freelocale(__locale_t __loc) { ::freelocale(__loc); }
73
74	inline char* __setlocale(int __category, char const* __locale) { return ::setlocale(__category, __locale); }
75
76	inline __lconv_t* __localeconv(__locale_t& __loc) {
77	__locale_guard __current(__loc);
78	return ::localeconv();
79	}
80
81	inline _LIBCPP_HIDE_FROM_ABI const char* __get_locale_encoding(__locale_t __loc) {
82	return ::nl_langinfo_l(CODESET, __loc);
83	}
84	#endif // _LIBCPP_BUILDING_LIBRARY
85
86	//
87	// Strtonum functions
88	//
89	inline float __strtof(const char* __nptr, char** __endptr, __locale_t) { return ::strtof(__nptr, __endptr); }
90
91	inline double __strtod(const char* __nptr, char** __endptr, __locale_t) { return ::strtod(__nptr, __endptr); }
92
93	inline long double __strtold(const char* __nptr, char** __endptr, __locale_t) { return ::strtold(__nptr, __endptr); }
94
95	//
96	// Character manipulation functions
97	//
98	#if defined(_LIBCPP_BUILDING_LIBRARY)
99	inline int __toupper(int __c, __locale_t __loc) { return ::toupper_l(__c, __loc); }
100
101	inline int __tolower(int __c, __locale_t __loc) { return ::tolower_l(__c, __loc); }
102
103	inline int __strcoll(const char* __s1, const char* __s2, __locale_t __loc) { return ::strcoll_l(__s1, __s2, __loc); }
104
105	inline size_t __strxfrm(char* __dest, const char* __src, size_t __n, __locale_t __loc) {
106	return ::strxfrm_l(__dest, __src, __n, __loc);
107	}
108
109	# if _LIBCPP_HAS_WIDE_CHARACTERS
110	inline int __iswctype(wint_t __c, wctype_t __type, __locale_t __loc) { return ::iswctype_l(__c, __type, __loc); }
111
112	inline int __iswspace(wint_t __c, __locale_t __loc) { return ::iswspace_l(__c, __loc); }
113
114	inline int __iswprint(wint_t __c, __locale_t __loc) { return ::iswprint_l(__c, __loc); }
115
116	inline int __iswcntrl(wint_t __c, __locale_t __loc) { return ::iswcntrl_l(__c, __loc); }
117
118	inline int __iswupper(wint_t __c, __locale_t __loc) { return ::iswupper_l(__c, __loc); }
119
120	inline int __iswlower(wint_t __c, __locale_t __loc) { return ::iswlower_l(__c, __loc); }
121
122	inline int __iswalpha(wint_t __c, __locale_t __loc) { return ::iswalpha_l(__c, __loc); }
123
124	inline int __iswblank(wint_t __c, __locale_t __loc) { return ::iswblank_l(__c, __loc); }
125
126	inline int __iswdigit(wint_t __c, __locale_t __loc) { return ::iswdigit_l(__c, __loc); }
127
128	inline int __iswpunct(wint_t __c, __locale_t __loc) { return ::iswpunct_l(__c, __loc); }
129
130	inline int __iswxdigit(wint_t __c, __locale_t __loc) { return ::iswxdigit_l(__c, __loc); }
131
132	inline wint_t __towupper(wint_t __c, __locale_t __loc) { return ::towupper_l(__c, __loc); }
133
134	inline wint_t __towlower(wint_t __c, __locale_t __loc) { return ::towlower_l(__c, __loc); }
135
136	inline int __wcscoll(const wchar_t* __ws1, const wchar_t* __ws2, __locale_t __loc) {
137	return ::wcscoll_l(__ws1, __ws2, __loc);
138	}
139
140	inline size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __src, size_t __n, __locale_t __loc) {
141	return ::wcsxfrm_l(__dest, __src, __n, __loc);
142	}
143	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
144
145	inline _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
146	__strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t __loc) {
147	return ::strftime_l(__s, __max, __format, __tm, __loc);
148	}
149
150	//
151	// Other functions
152	//
153	inline decltype(MB_CUR_MAX) __mb_len_max(__locale_t __loc) {
154	__locale_guard __current(__loc);
155	return MB_CUR_MAX;
156	}
157
158	# if _LIBCPP_HAS_WIDE_CHARACTERS
159	inline wint_t __btowc(int __c, __locale_t __loc) {
160	__locale_guard __current(__loc);
161	return btowc(__c);
162	}
163
164	inline int __wctob(wint_t __c, __locale_t __loc) {
165	__locale_guard __current(__loc);
166	return wctob(__c);
167	}
168
169	inline size_t
170	__wcsnrtombs(char* __dest, const wchar_t** __src, size_t __nwc, size_t __len, mbstate_t* __ps, __locale_t __loc) {
171	__locale_guard __current(__loc);
172	return wcsnrtombs(__dest, __src, __nwc, __len, __ps); // wcsnrtombs is a POSIX extension
173	}
174
175	inline size_t __wcrtomb(char* __s, wchar_t __wc, mbstate_t* __ps, __locale_t __loc) {
176	__locale_guard __current(__loc);
177	return wcrtomb(__s, __wc, __ps);
178	}
179
180	inline size_t
181	__mbsnrtowcs(wchar_t* __dest, const char** __src, size_t __nms, size_t __len, mbstate_t* __ps, __locale_t __loc) {
182	__locale_guard __current(__loc);
183	return mbsnrtowcs(__dest, __src, __nms, __len, __ps); // mbsnrtowcs is a POSIX extension
184	}
185
186	inline size_t __mbrtowc(wchar_t* __pwc, const char* __s, size_t __n, mbstate_t* __ps, __locale_t __loc) {
187	__locale_guard __current(__loc);
188	return mbrtowc(__pwc, __s, __n, __ps);
189	}
190
191	inline int __mbtowc(wchar_t* __pwc, const char* __pmb, size_t __max, __locale_t __loc) {
192	__locale_guard __current(__loc);
193	return mbtowc(__pwc, __pmb, __max);
194	}
195
196	inline size_t __mbrlen(const char* __s, size_t __n, mbstate_t* __ps, __locale_t __loc) {
197	__locale_guard __current(__loc);
198	return mbrlen(__s, __n, __ps);
199	}
200
201	inline size_t __mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps, __locale_t __loc) {
202	__locale_guard __current(__loc);
203	return mbsrtowcs(__dest, __src, __len, __ps);
204	}
205	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
206	#endif // _LIBCPP_BUILDING_LIBRARY
207
208	_LIBCPP_DIAGNOSTIC_PUSH
209	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wgcc-compat")
210	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wformat-nonliteral") // GCC doesn't support [[gnu::format]] on variadic templates
211	#ifdef _LIBCPP_COMPILER_CLANG_BASED
212	# define _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(...) _LIBCPP_ATTRIBUTE_FORMAT(__VA_ARGS__)
213	#else
214	# define _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(...) /* nothing */
215	#endif
216
217	template <class... _Args>
218	_LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 4, 5)
219	int __snprintf(char* __s, size_t __n, __locale_t __loc, const char* __format, _Args&&... __args) {
220	__locale_guard __current(__loc);
221	return ::snprintf(__s, __n, __format, std::forward<_Args>(__args)...);
222	}
223
224	template <class... _Args>
225	_LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 3, 4)
226	int __asprintf(char** __s, __locale_t __loc, const char* __format, _Args&&... __args) {
227	__locale_guard __current(__loc);
228	return ::asprintf(__s, __format, std::forward<_Args>(__args)...); // non-standard
229	}
230	_LIBCPP_DIAGNOSTIC_POP
231	#undef _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT
232
233	} // namespace __locale
234	_LIBCPP_END_NAMESPACE_STD
235
236	#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H

lib/libcxx/include/__locale_dir/support/serenity.h created+274

...	@@ -0,0 +1,274 @@
1	// zig patch: serenity support
2	// -- C++ --
3	//===-----------------------------------------------------------------------===//
4	//
5	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
6	// See https://llvm.org/LICENSE.txt for license information.
7	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
8	//
9	//===----------------------------------------------------------------------===//
10
11	#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_SERENITY_H
12	#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_SERENITY_H
13
14	#include <__config>
15	#include <__cstddef/size_t.h>
16	#include <__std_mbstate_t.h>
17	#include <__utility/forward.h>
18	#include <clocale> // std::lconv
19	#include <ctype.h>
20	#include <langinfo.h>
21	#include <stdio.h>
22	#include <stdlib.h>
23	#include <string.h>
24	#include <time.h>
25	#if _LIBCPP_HAS_WIDE_CHARACTERS
26	# include <wchar.h>
27	# include <wctype.h>
28	#endif
29
30	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
31	# pragma GCC system_header
32	#endif
33
34	_LIBCPP_BEGIN_NAMESPACE_STD
35	namespace __locale {
36
37	struct __locale_guard {
38	__locale_guard(locale_t& __loc) : __old_loc_(::uselocale(__loc)) {}
39
40	~__locale_guard() {
41	if (__old_loc_)
42	::uselocale(__old_loc_);
43	}
44
45	locale_t __old_loc_;
46
47	__locale_guard(__locale_guard const&) = delete;
48	__locale_guard& operator=(__locale_guard const&) = delete;
49	};
50
51	//
52	// Locale management
53	//
54	#define _LIBCPP_COLLATE_MASK LC_COLLATE_MASK
55	#define _LIBCPP_CTYPE_MASK LC_CTYPE_MASK
56	#define _LIBCPP_MONETARY_MASK LC_MONETARY_MASK
57	#define _LIBCPP_NUMERIC_MASK LC_NUMERIC_MASK
58	#define _LIBCPP_TIME_MASK LC_TIME_MASK
59	#define _LIBCPP_MESSAGES_MASK LC_MESSAGES_MASK
60	#define _LIBCPP_ALL_MASK LC_ALL_MASK
61	#define _LIBCPP_LC_ALL LC_ALL
62
63	using __locale_t _LIBCPP_NODEBUG = ::locale_t;
64	#if defined(_LIBCPP_BUILDING_LIBRARY)
65	using __lconv_t _LIBCPP_NODEBUG = std::lconv;
66
67	inline __locale_t __newlocale(int __category_mask, const char* __locale, __locale_t __base) {
68	return ::newlocale(__category_mask, __locale, __base);
69	}
70
71	inline void __freelocale(__locale_t __loc) { ::freelocale(__loc); }
72
73	inline char* __setlocale(int __category, char const* __locale) { return ::setlocale(__category, __locale); }
74
75	inline __lconv_t* __localeconv(__locale_t& __loc) {
76	__locale_guard __current(__loc);
77	return ::localeconv();
78	}
79	#endif // _LIBCPP_BUILDING_LIBRARY
80
81	//
82	// Strtonum functions
83	//
84	inline float __strtof(const char* __nptr, char** __endptr, __locale_t) { return ::strtof(__nptr, __endptr); }
85
86	inline double __strtod(const char* __nptr, char** __endptr, __locale_t) { return ::strtod(__nptr, __endptr); }
87
88	inline long double __strtold(const char* __nptr, char** __endptr, __locale_t) { return ::strtold(__nptr, __endptr); }
89
90	//
91	// Character manipulation functions
92	//
93	#if defined(_LIBCPP_BUILDING_LIBRARY)
94	inline int __toupper(int __c, __locale_t __loc) {
95	__locale_guard __current(__loc);
96	return ::toupper(__c);
97	}
98
99	inline int __tolower(int __c, __locale_t __loc) {
100	__locale_guard __current(__loc);
101	return ::tolower(__c);
102	}
103
104	inline int __strcoll(const char* __s1, const char* __s2, __locale_t __loc) {
105	__locale_guard __current(__loc);
106	return ::strcoll(__s1, __s2);
107	}
108
109	inline size_t __strxfrm(char* __dest, const char* __src, size_t __n, __locale_t __loc) {
110	__locale_guard __current(__loc);
111	return ::strxfrm(__dest, __src, __n);
112	}
113
114	# if _LIBCPP_HAS_WIDE_CHARACTERS
115	inline int __iswctype(wint_t __c, wctype_t __type, __locale_t __loc) {
116	__locale_guard __current(__loc);
117	return ::iswctype(__c, __type); }
118
119	inline int __iswspace(wint_t __c, __locale_t __loc) {
120	__locale_guard __current(__loc);
121	return ::iswspace(__c); }
122
123	inline int __iswprint(wint_t __c, __locale_t __loc) {
124	__locale_guard __current(__loc);
125	return ::iswprint(__c); }
126
127	inline int __iswcntrl(wint_t __c, __locale_t __loc) {
128	__locale_guard __current(__loc);
129	return ::iswcntrl(__c); }
130
131	inline int __iswupper(wint_t __c, __locale_t __loc) {
132	__locale_guard __current(__loc);
133	return ::iswupper(__c); }
134
135	inline int __iswlower(wint_t __c, __locale_t __loc) {
136	__locale_guard __current(__loc);
137	return ::iswlower(__c); }
138
139	inline int __iswalpha(wint_t __c, __locale_t __loc) {
140	__locale_guard __current(__loc);
141	return ::iswalpha(__c); }
142
143	inline int __iswblank(wint_t __c, __locale_t __loc) {
144	__locale_guard __current(__loc);
145	return ::iswblank(__c); }
146
147	inline int __iswdigit(wint_t __c, __locale_t __loc) {
148	__locale_guard __current(__loc);
149	return ::iswdigit(__c); }
150
151	inline int __iswpunct(wint_t __c, __locale_t __loc) {
152	__locale_guard __current(__loc);
153	return ::iswpunct(__c); }
154
155	inline int __iswxdigit(wint_t __c, __locale_t __loc) {
156	__locale_guard __current(__loc);
157	return ::iswxdigit(__c); }
158
159	inline wint_t __towupper(wint_t __c, __locale_t __loc) {
160	__locale_guard __current(__loc);
161	return ::towupper(__c); }
162
163	inline wint_t __towlower(wint_t __c, __locale_t __loc) {
164	__locale_guard __current(__loc);
165	return ::towlower(__c); }
166
167	inline int __wcscoll(const wchar_t* __ws1, const wchar_t* __ws2, __locale_t __loc) {
168	__locale_guard __current(__loc);
169	return ::wcscoll(__ws1, __ws2);
170	}
171
172	inline size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __src, size_t __n, __locale_t __loc) {
173	__locale_guard __current(__loc);
174	return ::wcsxfrm(__dest, __src, __n);
175	}
176	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
177
178	inline _LIBCPP_HIDE_FROM_ABI const char* __get_locale_encoding(__locale_t __loc) {
179	return ::nl_langinfo_l(CODESET, __loc);
180	}
181
182	inline _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
183	__strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm, __locale_t __loc) {
184	__locale_guard __current(__loc);
185	return ::strftime(__s, __max, __format, __tm);
186	}
187
188	//
189	// Other functions
190	//
191	inline decltype(MB_CUR_MAX) __mb_len_max(__locale_t __loc) {
192	__locale_guard __current(__loc);
193	return MB_CUR_MAX;
194	}
195
196	# if _LIBCPP_HAS_WIDE_CHARACTERS
197	inline wint_t __btowc(int __c, __locale_t __loc) {
198	__locale_guard __current(__loc);
199	return btowc(__c);
200	}
201
202	inline int __wctob(wint_t __c, __locale_t __loc) {
203	__locale_guard __current(__loc);
204	return wctob(__c);
205	}
206
207	inline size_t
208	__wcsnrtombs(char* __dest, const wchar_t** __src, size_t __nwc, size_t __len, mbstate_t* __ps, __locale_t __loc) {
209	__locale_guard __current(__loc);
210	return wcsnrtombs(__dest, __src, __nwc, __len, __ps); // wcsnrtombs is a POSIX extension
211	}
212
213	inline size_t __wcrtomb(char* __s, wchar_t __wc, mbstate_t* __ps, __locale_t __loc) {
214	__locale_guard __current(__loc);
215	return wcrtomb(__s, __wc, __ps);
216	}
217
218	inline size_t
219	__mbsnrtowcs(wchar_t* __dest, const char** __src, size_t __nms, size_t __len, mbstate_t* __ps, __locale_t __loc) {
220	__locale_guard __current(__loc);
221	return mbsnrtowcs(__dest, __src, __nms, __len, __ps); // mbsnrtowcs is a POSIX extension
222	}
223
224	inline size_t __mbrtowc(wchar_t* __pwc, const char* __s, size_t __n, mbstate_t* __ps, __locale_t __loc) {
225	__locale_guard __current(__loc);
226	return mbrtowc(__pwc, __s, __n, __ps);
227	}
228
229	inline int __mbtowc(wchar_t* __pwc, const char* __pmb, size_t __max, __locale_t __loc) {
230	__locale_guard __current(__loc);
231	return mbtowc(__pwc, __pmb, __max);
232	}
233
234	inline size_t __mbrlen(const char* __s, size_t __n, mbstate_t* __ps, __locale_t __loc) {
235	__locale_guard __current(__loc);
236	return mbrlen(__s, __n, __ps);
237	}
238
239	inline size_t __mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps, __locale_t __loc) {
240	__locale_guard __current(__loc);
241	return mbsrtowcs(__dest, __src, __len, __ps);
242	}
243	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
244	#endif // _LIBCPP_BUILDING_LIBRARY
245
246	_LIBCPP_DIAGNOSTIC_PUSH
247	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wgcc-compat")
248	_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wformat-nonliteral") // GCC doesn't support [[gnu::format]] on variadic templates
249	#ifdef _LIBCPP_COMPILER_CLANG_BASED
250	# define _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(...) _LIBCPP_ATTRIBUTE_FORMAT(__VA_ARGS__)
251	#else
252	# define _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(...) /* nothing */
253	#endif
254
255	template <class... _Args>
256	_LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 4, 5)
257	int __snprintf(char* __s, size_t __n, __locale_t __loc, const char* __format, _Args&&... __args) {
258	__locale_guard __current(__loc);
259	return ::snprintf(__s, __n, __format, std::forward<_Args>(__args)...);
260	}
261
262	template <class... _Args>
263	_LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 3, 4)
264	int __asprintf(char** __s, __locale_t __loc, const char* __format, _Args&&... __args) {
265	__locale_guard __current(__loc);
266	return ::asprintf(__s, __format, std::forward<_Args>(__args)...); // non-standard
267	}
268	_LIBCPP_DIAGNOSTIC_POP
269	#undef _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT
270
271	} // namespace __locale
272	_LIBCPP_END_NAMESPACE_STD
273
274	#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_SERENITY_H

lib/libcxx/include/__locale_dir/support/windows.h+7-3

...	@@ -27,6 +27,7 @@	...	@@ -27,6 +27,7 @@
27	#endif	27	#endif
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
		30	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
30	namespace __locale {	31	namespace __locale {
31		32
32	using __lconv_t _LIBCPP_NODEBUG = std::lconv;	33	using __lconv_t _LIBCPP_NODEBUG = std::lconv;
...	@@ -163,6 +164,7 @@ inline _LIBCPP_HIDE_FROM_ABI char* __setlocale(int __category, const char* __loc	...	@@ -163,6 +164,7 @@ inline _LIBCPP_HIDE_FROM_ABI char* __setlocale(int __category, const char* __loc
163	return __new_locale;	164	return __new_locale;
164	}	165	}
165	_LIBCPP_EXPORTED_FROM_ABI __lconv_t* __localeconv(__locale_t& __loc);	166	_LIBCPP_EXPORTED_FROM_ABI __lconv_t* __localeconv(__locale_t& __loc);
		167	_LIBCPP_EXPORTED_FROM_ABI const char* __get_locale_encoding(__locale_t __loc);
166	#endif // _LIBCPP_BUILDING_LIBRARY	168	#endif // _LIBCPP_BUILDING_LIBRARY
167		169
168	//	170	//
...	@@ -230,10 +232,11 @@ inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __	...	@@ -230,10 +232,11 @@ inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __
230	# endif // _LIBCPP_HAS_WIDE_CHARACTERS	232	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
231		233
232	# if defined(__MINGW32__) && __MSVCRT_VERSION__ < 0x0800	234	# if defined(__MINGW32__) && __MSVCRT_VERSION__ < 0x0800
233	_LIBCPP_EXPORTED_FROM_ABI size_t __strftime(char, size_t, const char, const struct tm*, __locale_t);	235	_LIBCPP_EXPORTED_FROM_ABI _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
		236	__strftime(char, size_t, const char, const struct tm*, __locale_t);
234	# else	237	# else
235	inline _LIBCPP_HIDE_FROM_ABI size_t	238	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_ATTRIBUTE_FORMAT(__strftime__, 3, 0) size_t
236	__strftime(char* __ret, size_t __n, const char* __format, const struct tm* __tm, __locale_t __loc) {	239	__strftime(char* __ret, size_t __n, const char* __format, const struct tm* __tm, __locale_t __loc) {
237	return ::_strftime_l(__ret, __n, __format, __tm, __loc);	240	return ::_strftime_l(__ret, __n, __format, __tm, __loc);
238	}	241	}
239	# endif	242	# endif
...	@@ -303,6 +306,7 @@ struct __locale_guard {	...	@@ -303,6 +306,7 @@ struct __locale_guard {
303	#endif // _LIBCPP_BUILDING_LIBRARY	306	#endif // _LIBCPP_BUILDING_LIBRARY
304		307
305	} // namespace __locale	308	} // namespace __locale
		309	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
306	_LIBCPP_END_NAMESPACE_STD	310	_LIBCPP_END_NAMESPACE_STD
307		311
308	#endif // _LIBCPP___LOCALE_DIR_SUPPORT_WINDOWS_H	312	#endif // _LIBCPP___LOCALE_DIR_SUPPORT_WINDOWS_H

lib/libcxx/include/__locale_dir/time.h+2

...	@@ -22,6 +22,7 @@	...	@@ -22,6 +22,7 @@
22	# endif	22	# endif
23		23
24	_LIBCPP_BEGIN_NAMESPACE_STD	24	_LIBCPP_BEGIN_NAMESPACE_STD
		25	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
25		26
26	template <class _CharT, class _InputIterator>	27	template <class _CharT, class _InputIterator>
27	_LIBCPP_HIDE_FROM_ABI int __get_up_to_n_digits(	28	_LIBCPP_HIDE_FROM_ABI int __get_up_to_n_digits(
...	@@ -755,6 +756,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS time_put_byname<char>;	...	@@ -755,6 +756,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS time_put_byname<char>;
755	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS time_put_byname<wchar_t>;	756	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS time_put_byname<wchar_t>;
756	# endif	757	# endif
757		758
		759	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
758	_LIBCPP_END_NAMESPACE_STD	760	_LIBCPP_END_NAMESPACE_STD
759		761
760	#endif // _LIBCPP_HAS_LOCALIZATION	762	#endif // _LIBCPP_HAS_LOCALIZATION

lib/libcxx/include/__locale_dir/wbuffer_convert.h+4-2

...	@@ -27,6 +27,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -27,6 +27,7 @@ _LIBCPP_PUSH_MACROS
27	# include <__undef_macros>	27	# include <__undef_macros>
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
		30	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
30		31
31	template <class _Codecvt, class _Elem = wchar_t, class _Tr = char_traits<_Elem> >	32	template <class _Codecvt, class _Elem = wchar_t, class _Tr = char_traits<_Elem> >
32	class _LIBCPP_DEPRECATED_IN_CXX17 wbuffer_convert : public basic_streambuf<_Elem, _Tr> {	33	class _LIBCPP_DEPRECATED_IN_CXX17 wbuffer_convert : public basic_streambuf<_Elem, _Tr> {
...	@@ -67,7 +68,7 @@ public:	...	@@ -67,7 +68,7 @@ public:
67		68
68	_LIBCPP_HIDE_FROM_ABI ~wbuffer_convert();	69	_LIBCPP_HIDE_FROM_ABI ~wbuffer_convert();
69		70
70	_LIBCPP_HIDE_FROM_ABI streambuf* rdbuf() const { return __bufptr_; }	71	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI streambuf* rdbuf() const { return __bufptr_; }
71	_LIBCPP_HIDE_FROM_ABI streambuf* rdbuf(streambuf* __bytebuf) {	72	_LIBCPP_HIDE_FROM_ABI streambuf* rdbuf(streambuf* __bytebuf) {
72	streambuf* __r = __bufptr_;	73	streambuf* __r = __bufptr_;
73	__bufptr_ = __bytebuf;	74	__bufptr_ = __bytebuf;
...	@@ -77,7 +78,7 @@ public:	...	@@ -77,7 +78,7 @@ public:
77	wbuffer_convert(const wbuffer_convert&) = delete;	78	wbuffer_convert(const wbuffer_convert&) = delete;
78	wbuffer_convert& operator=(const wbuffer_convert&) = delete;	79	wbuffer_convert& operator=(const wbuffer_convert&) = delete;
79		80
80	_LIBCPP_HIDE_FROM_ABI state_type state() const { return __st_; }	81	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI state_type state() const { return __st_; }
81		82
82	protected:	83	protected:
83	_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual int_type underflow();	84	_LIBCPP_HIDE_FROM_ABI_VIRTUAL virtual int_type underflow();
...	@@ -419,6 +420,7 @@ wbuffer_convert<_Codecvt, _Elem, _Tr>* wbuffer_convert<_Codecvt, _Elem, _Tr>::__	...	@@ -419,6 +420,7 @@ wbuffer_convert<_Codecvt, _Elem, _Tr>* wbuffer_convert<_Codecvt, _Elem, _Tr>::__
419		420
420	_LIBCPP_SUPPRESS_DEPRECATED_POP	421	_LIBCPP_SUPPRESS_DEPRECATED_POP
421		422
		423	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
422	_LIBCPP_END_NAMESPACE_STD	424	_LIBCPP_END_NAMESPACE_STD
423		425
424	_LIBCPP_POP_MACROS	426	_LIBCPP_POP_MACROS

lib/libcxx/include/__locale_dir/wstring_convert.h+14-10

 @@ -64,28 +64,30 @@ public:
   wstring_convert(const wstring_convert& __wc)            = delete;
   wstring_convert& operator=(const wstring_convert& __wc) = delete;
-  _LIBCPP_HIDE_FROM_ABI wide_string from_bytes(char __byte) { return from_bytes(&__byte, &__byte + 1); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI wide_string from_bytes(char __byte) {
-  _LIBCPP_HIDE_FROM_ABI wide_string from_bytes(const char* __ptr) {
+    return from_bytes(&__byte, &__byte + 1);
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI wide_string from_bytes(const char* __ptr) {
     return from_bytes(__ptr, __ptr + char_traits<char>::length(__ptr));
   }
-  _LIBCPP_HIDE_FROM_ABI wide_string from_bytes(const byte_string& __str) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI wide_string from_bytes(const byte_string& __str) {
     return from_bytes(__str.data(), __str.data() + __str.size());
   }
-  _LIBCPP_HIDE_FROM_ABI wide_string from_bytes(const char* __first, const char* __last);
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI wide_string from_bytes(const char* __first, const char* __last);
-  _LIBCPP_HIDE_FROM_ABI byte_string to_bytes(_Elem __wchar) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI byte_string to_bytes(_Elem __wchar) {
     return to_bytes(std::addressof(__wchar), std::addressof(__wchar) + 1);
   }
-  _LIBCPP_HIDE_FROM_ABI byte_string to_bytes(const _Elem* __wptr) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI byte_string to_bytes(const _Elem* __wptr) {
     return to_bytes(__wptr, __wptr + char_traits<_Elem>::length(__wptr));
   }
-  _LIBCPP_HIDE_FROM_ABI byte_string to_bytes(const wide_string& __wstr) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI byte_string to_bytes(const wide_string& __wstr) {
     return to_bytes(__wstr.data(), __wstr.data() + __wstr.size());
   }
-  _LIBCPP_HIDE_FROM_ABI byte_string to_bytes(const _Elem* __first, const _Elem* __last);
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI byte_string to_bytes(const _Elem* __first, const _Elem* __last);
-  _LIBCPP_HIDE_FROM_ABI size_t converted() const _NOEXCEPT { return __cvtcount_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_t converted() const _NOEXCEPT { return __cvtcount_; }
-  _LIBCPP_HIDE_FROM_ABI state_type state() const { return __cvtstate_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI state_type state() const { return __cvtstate_; }
 };
 _LIBCPP_SUPPRESS_DEPRECATED_PUSH
 @@ -174,9 +176,11 @@ wstring_convert<_Codecvt, _Elem, _WideAlloc, _ByteAlloc>::from_bytes(const char*
   return __wide_err_string_;
 }
+_LIBCPP_SUPPRESS_DEPRECATED_PUSH
 template <class _Codecvt, class _Elem, class _WideAlloc, class _ByteAlloc>
 typename wstring_convert<_Codecvt, _Elem, _WideAlloc, _ByteAlloc>::byte_string
 wstring_convert<_Codecvt, _Elem, _WideAlloc, _ByteAlloc>::to_bytes(const _Elem* __frm, const _Elem* __frm_end) {
+  _LIBCPP_SUPPRESS_DEPRECATED_POP
   __cvtcount_ = 0;
   if (__cvtptr_ != nullptr) {
     byte_string __bs(2 * (__frm_end - __frm), char());

lib/libcxx/include/__log_hardening_failure+2

 @@ -24,7 +24,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 // This function should never be called directly from the code -- it should only be called through the
 // `_LIBCPP_LOG_HARDENING_FAILURE` macro.
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 [[__gnu__::__cold__]] _LIBCPP_EXPORTED_FROM_ABI void __log_hardening_failure(const char* __message) noexcept;
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 // _LIBCPP_LOG_HARDENING_FAILURE(message)
 //

lib/libcxx/include/__math/abs.h+13

...	@@ -63,6 +63,19 @@ template <class = int>	...	@@ -63,6 +63,19 @@ template <class = int>
63	return __builtin_llabs(__x);	63	return __builtin_llabs(__x);
64	}	64	}
65		65
		66	#if _LIBCPP_HAS_INT128
		67	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI inline __int128_t abs(__int128_t __x) _NOEXCEPT { return __x < 0 ? -__x : __x; }
		68	#endif
		69
		70	#if defined(__BITINT_MAXWIDTH__)
		71	// _BitInt does not integer-promote, so without a same-type overload a narrow
		72	// signed _BitInt would be an ambiguous call against abs(int/long/long long).
		73	template <int _Np>
		74	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _BitInt(_Np) abs(_BitInt(_Np) __x) _NOEXCEPT {
		75	return __x < 0 ? -__x : __x;
		76	}
		77	#endif
		78
66	} // namespace __math	79	} // namespace __math
67		80
68	_LIBCPP_END_NAMESPACE_STD	81	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__math/gamma.h+28

...	@@ -55,6 +55,34 @@ inline _LIBCPP_HIDE_FROM_ABI double tgamma(_A1 __x) _NOEXCEPT {	...	@@ -55,6 +55,34 @@ inline _LIBCPP_HIDE_FROM_ABI double tgamma(_A1 __x) _NOEXCEPT {
55	return __builtin_tgamma((double)__x);	55	return __builtin_tgamma((double)__x);
56	}	56	}
57		57
		58	// __lgamma_r
		59	//
		60	// POSIX systems provide a function named lgamma_r which is a reentrant version of lgamma. Use that
		61	// whenever possible. However, we avoid re-declaring the actual function since different platforms
		62	// declare it differently in the first place: instead use `asm` to get the compiler to call the right
		63	// function.
		64
		65	#if defined(_LIBCPP_MSVCRT_LIKE) // reentrant version is not available on Windows
		66
		67	inline _LIBCPP_HIDE_FROM_ABI double __lgamma_r(double __d) _NOEXCEPT { return __builtin_lgamma(__d); }
		68
		69	#else
		70
		71	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
		72	# if defined(_LIBCPP_OBJECT_FORMAT_MACHO)
		73	double __lgamma_r_shim(double, int*) _NOEXCEPT __asm__("_lgamma_r");
		74	# else
		75	double __lgamma_r_shim(double, int*) _NOEXCEPT __asm__("lgamma_r");
		76	# endif
		77	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
		78
		79	inline _LIBCPP_HIDE_FROM_ABI double __lgamma_r(double __d) _NOEXCEPT {
		80	int __sign;
		81	return __math::__lgamma_r_shim(__d, &__sign);
		82	}
		83
		84	#endif
		85
58	} // namespace __math	86	} // namespace __math
59		87
60	_LIBCPP_END_NAMESPACE_STD	88	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__math/special_functions.h+5-5

 @@ -21,10 +21,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Real>
 _LIBCPP_HIDE_FROM_ABI _Real __hermite(unsigned __n, _Real __x) {
   // The Hermite polynomial H_n(x).
 @@ -49,7 +49,7 @@ _LIBCPP_HIDE_FROM_ABI _Real __hermite(unsigned __n, _Real __x) {
   }
   if (!__math::isfinite(__H_n)) {
-    // Overflow occured. Two possible cases:
+    // Overflow occurred. Two possible cases:
     //    n is odd:  return infinity of the same sign as x.
     //    n is even: return +Inf
     _Real __inf = std::numeric_limits<_Real>::infinity();
 @@ -77,8 +77,8 @@ _LIBCPP_HIDE_FROM_ABI double hermite(unsigned __n, _Integer __x) {
   return std::hermite(__n, static_cast<double>(__x));
 }
-#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___MATH_SPECIAL_FUNCTIONS_H

lib/libcxx/include/__mbstate_t.h+4

 @@ -39,10 +39,14 @@
 #  define __NEED_mbstate_t
 #  include <bits/alltypes.h>
 #  undef __NEED_mbstate_t
+#elif _LIBCPP_LIBC_LLVM_LIBC
+#  include <llvm-libc-types/mbstate_t.h>
 #elif __has_include(<bits/types/mbstate_t.h>)
 #  include <bits/types/mbstate_t.h> // works on most Unixes
 #elif __has_include(<sys/_types/_mbstate_t.h>)
 #  include <sys/_types/_mbstate_t.h> // works on Darwin
+#elif __has_include(<bits/mbstate_t.h>)
+#  include <bits/mbstate_t.h> // works for Android
 #elif __has_include_next(<wchar.h>)
 #  include_next <wchar.h> // use the C standard provider of mbstate_t if present
 #elif __has_include_next(<uchar.h>)

lib/libcxx/include/__mdspan/aligned_accessor.h+4-4

 @@ -33,10 +33,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 26
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _ElementType, size_t _ByteAlignment>
 struct aligned_accessor {
   static_assert(_ByteAlignment != 0 && (_ByteAlignment & (_ByteAlignment - 1)) == 0,
 @@ -78,10 +78,10 @@ struct aligned_accessor {
   }
 };
-#endif // _LIBCPP_STD_VER >= 26
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 26
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___MDSPAN_ALIGNED_ACCESSOR_H

lib/libcxx/include/__mdspan/extents.h+76-81

 @@ -21,12 +21,16 @@
 #include <__config>
 #include <__concepts/arithmetic.h>
+#include <__concepts/same_as.h>
 #include <__type_traits/common_type.h>
 #include <__type_traits/integer_traits.h>
 #include <__type_traits/is_convertible.h>
 #include <__type_traits/is_nothrow_constructible.h>
 #include <__type_traits/is_signed.h>
 #include <__type_traits/make_unsigned.h>
+#include <__type_traits/remove_cvref.h>
+#include <__utility/as_const.h>
+#include <__utility/forward.h>
 #include <__utility/integer_sequence.h>
 #include <__utility/unreachable.h>
 #include <array>
 @@ -46,25 +50,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
 namespace __mdspan_detail {
-// ------------------------------------------------------------------
-// ------------ __static_array --------------------------------------
-// ------------------------------------------------------------------
-// array like class which provides an array of static values with get
-template <class _Tp, _Tp... _Values>
-struct __static_array {
-  static constexpr array<_Tp, sizeof...(_Values)> __array = {_Values...};
-public:
-  _LIBCPP_HIDE_FROM_ABI static constexpr size_t __size() { return sizeof...(_Values); }
-  _LIBCPP_HIDE_FROM_ABI static constexpr _Tp __get(size_t __index) noexcept { return __array[__index]; }
-  template <size_t _Index>
-  _LIBCPP_HIDE_FROM_ABI static constexpr _Tp __get() {
-    return __get(_Index);
-  }
-};
 // ------------------------------------------------------------------
 // ------------ __possibly_empty_array  -----------------------------
 // ------------------------------------------------------------------
 @@ -117,35 +102,28 @@ struct __static_partial_sums {
 // array like class which has a mix of static and runtime values but
 // only stores the runtime values.
 // The type of the static and the runtime values can be different.
-// The position of a dynamic value is indicated through a tag value.
+// The position of a dynamic value is indicated by dynamic_extent.
-template <class _TDynamic, class _TStatic, _TStatic _DynTag, _TStatic... _Values>
+template <class _TDynamic, class _TStatic, _TStatic... _Values>
 struct __maybe_static_array {
-  static_assert(is_convertible<_TStatic, _TDynamic>::value,
+  static_assert(is_convertible_v<_TStatic, _TDynamic>,
                 "__maybe_static_array: _TStatic must be convertible to _TDynamic");
-  static_assert(is_convertible<_TDynamic, _TStatic>::value,
+  static_assert(is_convertible_v<_TDynamic, _TStatic>,
                 "__maybe_static_array: _TDynamic must be convertible to _TStatic");
 private:
   // Static values member
   static constexpr size_t __size_         = sizeof...(_Values);
-  static constexpr size_t __size_dynamic_ = ((_Values == _DynTag) + ... + 0);
+  static constexpr size_t __size_dynamic_ = ((_Values == dynamic_extent) + ... + 0);
-  using _StaticValues _LIBCPP_NODEBUG     = __static_array<_TStatic, _Values...>;
   using _DynamicValues _LIBCPP_NODEBUG    = __possibly_empty_array<_TDynamic, __size_dynamic_>;
-  // Dynamic values member
+  static constexpr array<_TStatic, sizeof...(_Values)> __static_values_ = {_Values...};
   _LIBCPP_NO_UNIQUE_ADDRESS _DynamicValues __dyn_vals_;
   // static mapping of indices to the position in the dynamic values array
-  using _DynamicIdxMap _LIBCPP_NODEBUG = __static_partial_sums<static_cast<size_t>(_Values == _DynTag)...>;
+  using _DynamicIdxMap _LIBCPP_NODEBUG = __static_partial_sums<static_cast<size_t>(_Values == dynamic_extent)...>;
-  template <size_t... _Indices>
-  _LIBCPP_HIDE_FROM_ABI static constexpr _DynamicValues __zeros(index_sequence<_Indices...>) noexcept {
-    return _DynamicValues{((void)_Indices, 0)...};
-  }
 public:
-  _LIBCPP_HIDE_FROM_ABI constexpr __maybe_static_array() noexcept
+  _LIBCPP_HIDE_FROM_ABI constexpr __maybe_static_array() noexcept : __dyn_vals_{} {}
-      : __dyn_vals_{__zeros(make_index_sequence<__size_dynamic_>())} {}
   // constructors from dynamic values only -- this covers the case for rank() == 0
   template <class... _DynVals>
 @@ -169,8 +147,8 @@ public:
     static_assert(sizeof...(_DynVals) == __size_, "Invalid number of values.");
     _TDynamic __values[__size_] = {static_cast<_TDynamic>(__vals)...};
     for (size_t __i = 0; __i < __size_; __i++) {
-      _TStatic __static_val = _StaticValues::__get(__i);
+      _TStatic __static_val = __static_values_[__i];
-      if (__static_val == _DynTag) {
+      if (__static_val == dynamic_extent) {
         __dyn_vals_[_DynamicIdxMap::__get(__i)] = __values[__i];
       } else
         // Not catching this could lead to out of bounds errors later
 @@ -188,8 +166,8 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr __maybe_static_array(const span<_Tp, _Size>& __vals) {
     static_assert(_Size == __size_ || __size_ == dynamic_extent);
     for (size_t __i = 0; __i < __size_; __i++) {
-      _TStatic __static_val = _StaticValues::__get(__i);
+      _TStatic __static_val = __static_values_[__i];
-      if (__static_val == _DynTag) {
+      if (__static_val == dynamic_extent) {
         __dyn_vals_[_DynamicIdxMap::__get(__i)] = static_cast<_TDynamic>(__vals[__i]);
       } else
         // Not catching this could lead to out of bounds errors later
 @@ -205,13 +183,15 @@ public:
   // access functions
   _LIBCPP_HIDE_FROM_ABI static constexpr _TStatic __static_value(size_t __i) noexcept {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__i < __size_, "extents access: index must be less than rank");
-    return _StaticValues::__get(__i);
+    return __static_values_[__i];
   }
   _LIBCPP_HIDE_FROM_ABI constexpr _TDynamic __value(size_t __i) const {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__i < __size_, "extents access: index must be less than rank");
-    _TStatic __static_val = _StaticValues::__get(__i);
+    _TStatic __static_val = __static_values_[__i];
-    return __static_val == _DynTag ? __dyn_vals_[_DynamicIdxMap::__get(__i)] : static_cast<_TDynamic>(__static_val);
+    return __static_val == dynamic_extent
+             ? __dyn_vals_[_DynamicIdxMap::__get(__i)]
+             : static_cast<_TDynamic>(__static_val);
   }
   _LIBCPP_HIDE_FROM_ABI constexpr _TDynamic operator[](size_t __i) const {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__i < __size_, "extents access: index must be less than rank");
 @@ -252,19 +232,6 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool __is_representable_as(_From __value) {
   return true;
 }
-template <integral _To, class... _From>
-_LIBCPP_HIDE_FROM_ABI constexpr bool __are_representable_as(_From... __values) {
-  return (__mdspan_detail::__is_representable_as<_To>(__values) && ... && true);
-}
-template <integral _To, class _From, size_t _Size>
-_LIBCPP_HIDE_FROM_ABI constexpr bool __are_representable_as(span<_From, _Size> __values) {
-  for (size_t __i = 0; __i < _Size; __i++)
-    if (!__mdspan_detail::__is_representable_as<_To>(__values[__i]))
-      return false;
-  return true;
-}
 } // namespace __mdspan_detail
 // ------------------------------------------------------------------
 @@ -293,10 +260,45 @@ private:
   static constexpr rank_type __rank_dynamic_ = ((_Extents == dynamic_extent) + ... + 0);
   // internal storage type using __maybe_static_array
-  using _Values _LIBCPP_NODEBUG =
+  using _Values _LIBCPP_NODEBUG = __mdspan_detail::__maybe_static_array<_IndexType, size_t, _Extents...>;
-      __mdspan_detail::__maybe_static_array<_IndexType, size_t, dynamic_extent, _Extents...>;
   [[no_unique_address]] _Values __vals_;
+  template <class _OtherIndexType>
+  _LIBCPP_HIDE_FROM_ABI static constexpr index_type __checked_index_cast(_OtherIndexType&& __value) noexcept {
+    using _OtherType = remove_cvref_t<_OtherIndexType>;
+    if constexpr (integral<_OtherType> && !same_as<_OtherType, bool>) {
+      _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
+          __mdspan_detail::__is_representable_as<index_type>(__value),
+          "extents ctor: arguments must be representable as index_type and nonnegative");
+      return static_cast<index_type>(__value);
+    } else {
+      auto __converted_val = static_cast<index_type>(std::forward<_OtherIndexType>(__value));
+      if constexpr (is_signed_v<index_type>) {
+        _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
+            __converted_val >= 0, "extents ctor: arguments must be representable as index_type and nonnegative");
+      }
+      return __converted_val;
+    }
+  }
+  template <class... _OtherIndexTypes>
+  _LIBCPP_HIDE_FROM_ABI static constexpr _Values
+  __representability_checked_cast(_OtherIndexTypes&&... __values) noexcept {
+    return _Values{__checked_index_cast(std::forward<_OtherIndexTypes>(__values))...};
+  }
+  template <class _OtherIndexType, size_t _Size, size_t... _Idxs>
+  _LIBCPP_HIDE_FROM_ABI static constexpr _Values
+  __representability_checked_cast(const array<_OtherIndexType, _Size>& __exts, index_sequence<_Idxs...>) noexcept {
+    return __representability_checked_cast(__exts[_Idxs]...);
+  }
+  template <class _OtherIndexType, size_t _Size, size_t... _Idxs>
+  _LIBCPP_HIDE_FROM_ABI static constexpr _Values
+  __representability_checked_cast(const span<_OtherIndexType, _Size>& __exts, index_sequence<_Idxs...>) noexcept {
+    return __representability_checked_cast(std::as_const(__exts[_Idxs])...);
+  }
 public:
   // [mdspan.extents.obs], observers of multidimensional index space
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr rank_type rank() noexcept { return __rank_; }
 @@ -319,12 +321,9 @@ public:
              (is_nothrow_constructible_v<index_type, _OtherIndexTypes> && ...) &&
              (sizeof...(_OtherIndexTypes) == __rank_ || sizeof...(_OtherIndexTypes) == __rank_dynamic_))
   _LIBCPP_HIDE_FROM_ABI constexpr explicit extents(_OtherIndexTypes... __dynvals) noexcept
-      : __vals_(static_cast<index_type>(__dynvals)...) {
+      // Not catching this could lead to out of bounds errors later
-    // Not catching this could lead to out of bounds errors later
+      // e.g. mdspan m(ptr, dextents<char, 1>(200u)); leads to an extent of -56 on m
-    // e.g. mdspan m(ptr, dextents<char, 1>(200u)); leads to an extent of -56 on m
+      : __vals_(__representability_checked_cast(std::move(__dynvals)...)) {}
-    _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__mdspan_detail::__are_representable_as<index_type>(__dynvals...),
-                                        "extents ctor: arguments must be representable as index_type and nonnegative");
-  }
   template <class _OtherIndexType, size_t _Size>
     requires(is_convertible_v<const _OtherIndexType&, index_type> &&
 @@ -332,12 +331,9 @@ public:
              (_Size == __rank_ || _Size == __rank_dynamic_))
   explicit(_Size != __rank_dynamic_)
       _LIBCPP_HIDE_FROM_ABI constexpr extents(const array<_OtherIndexType, _Size>& __exts) noexcept
-      : __vals_(span(__exts)) {
+      // Not catching this could lead to out of bounds errors later
-    // Not catching this could lead to out of bounds errors later
+      // e.g. mdspan m(ptr, dextents<char, 1>(200u)); leads to an extent of -56 on m
-    // e.g. mdspan m(ptr, dextents<char, 1>(array<unsigned,1>(200))); leads to an extent of -56 on m
+      : __vals_(__representability_checked_cast(__exts, make_index_sequence<_Size>())) {}
-    _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__mdspan_detail::__are_representable_as<index_type>(span(__exts)),
-                                        "extents ctor: arguments must be representable as index_type and nonnegative");
-  }
   template <class _OtherIndexType, size_t _Size>
     requires(is_convertible_v<const _OtherIndexType&, index_type> &&
 @@ -345,13 +341,9 @@ public:
              (_Size == __rank_ || _Size == __rank_dynamic_))
   explicit(_Size != __rank_dynamic_)
       _LIBCPP_HIDE_FROM_ABI constexpr extents(const span<_OtherIndexType, _Size>& __exts) noexcept
-      : __vals_(__exts) {
+      // Not catching this could lead to out of bounds errors later
-    // Not catching this could lead to out of bounds errors later
+      // e.g. mdspan m(ptr, dextents<char, 1>(200u)); leads to an extent of -56 on m
-    // e.g. array a{200u}; mdspan<int, dextents<char,1>> m(ptr, extents(span<unsigned,1>(a))); leads to an extent of -56
+      : __vals_(__representability_checked_cast(__exts, make_index_sequence<_Size>())) {}
-    // on m
-    _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__mdspan_detail::__are_representable_as<index_type>(__exts),
-                                        "extents ctor: arguments must be representable as index_type and nonnegative");
-  }
 private:
   // Function to construct extents storage from other extents.
 @@ -433,6 +425,15 @@ public:
     }
     return true;
   }
+  template <class _OtherIndexType>
+  _LIBCPP_HIDE_FROM_ABI static constexpr auto __index_cast(_OtherIndexType&& __i) noexcept {
+    using _OtherIndex = remove_cvref_t<_OtherIndexType>;
+    if constexpr (integral<_OtherIndex> && !same_as<_OtherIndex, bool>)
+      return __i;
+    else
+      return static_cast<index_type>(std::forward<_OtherIndexType>(__i));
+  }
 };
 // Recursive helper classes to implement dextents alias for extents
 @@ -465,15 +466,9 @@ using dims = dextents<_IndexType, _Rank>;
 #  endif
 // Deduction guide for extents
-#  if _LIBCPP_STD_VER >= 26
 template <class... _IndexTypes>
   requires(is_convertible_v<_IndexTypes, size_t> && ...)
 explicit extents(_IndexTypes...) -> extents<size_t, __maybe_static_ext<_IndexTypes>...>;
-#  else
-template <class... _IndexTypes>
-  requires(is_convertible_v<_IndexTypes, size_t> && ...)
-explicit extents(_IndexTypes...) -> extents<size_t, size_t(((void)sizeof(_IndexTypes), dynamic_extent))...>;
-#  endif
 namespace __mdspan_detail {

lib/libcxx/include/__mdspan/layout_left.h+3-3

...	@@ -47,9 +47,9 @@ public:	...	@@ -47,9 +47,9 @@ public:
47	"layout_left::mapping template argument must be a specialization of extents.");	47	"layout_left::mapping template argument must be a specialization of extents.");
48		48
49	using extents_type = _Extents;	49	using extents_type = _Extents;
50	using index_type = typename extents_type::index_type;	50	using index_type = extents_type::index_type;
51	using size_type = typename extents_type::size_type;	51	using size_type = extents_type::size_type;
52	using rank_type = typename extents_type::rank_type;	52	using rank_type = extents_type::rank_type;
53	using layout_type = layout_left;	53	using layout_type = layout_left;
54		54
55	private:	55	private:

lib/libcxx/include/__mdspan/layout_right.h+3-3

...	@@ -47,9 +47,9 @@ public:	...	@@ -47,9 +47,9 @@ public:
47	"layout_right::mapping template argument must be a specialization of extents.");	47	"layout_right::mapping template argument must be a specialization of extents.");
48		48
49	using extents_type = _Extents;	49	using extents_type = _Extents;
50	using index_type = typename extents_type::index_type;	50	using index_type = extents_type::index_type;
51	using size_type = typename extents_type::size_type;	51	using size_type = extents_type::size_type;
52	using rank_type = typename extents_type::rank_type;	52	using rank_type = extents_type::rank_type;
53	using layout_type = layout_right;	53	using layout_type = layout_right;
54		54
55	private:	55	private:

lib/libcxx/include/__mdspan/layout_stride.h+18-30

 @@ -72,9 +72,9 @@ public:
                 "layout_stride::mapping template argument must be a specialization of extents.");
   using extents_type = _Extents;
-  using index_type   = typename extents_type::index_type;
+  using index_type   = extents_type::index_type;
-  using size_type    = typename extents_type::size_type;
+  using size_type    = extents_type::size_type;
-  using rank_type    = typename extents_type::rank_type;
+  using rank_type    = extents_type::rank_type;
   using layout_type  = layout_stride;
 private:
 @@ -296,38 +296,26 @@ public:
   }
   _LIBCPP_HIDE_FROM_ABI static constexpr bool is_always_unique() noexcept { return true; }
-  _LIBCPP_HIDE_FROM_ABI static constexpr bool is_always_exhaustive() noexcept { return false; }
+  _LIBCPP_HIDE_FROM_ABI static constexpr bool is_always_exhaustive() noexcept {
+    if constexpr (__rank_ == 0)
+      return true;
+    for (size_t __r = 0; __r < __rank_; ++__r)
+      if (extents_type::static_extent(__r) == 0)
+        return true;
+    return false;
+  }
   _LIBCPP_HIDE_FROM_ABI static constexpr bool is_always_strided() noexcept { return true; }
   _LIBCPP_HIDE_FROM_ABI static constexpr bool is_unique() noexcept { return true; }
-  // The answer of this function is fairly complex in the case where one or more
-  // extents are zero.
-  // Technically it is meaningless to query is_exhaustive() in that case, but unfortunately
-  // the way the standard defines this function, we can't give a simple true or false then.
   _LIBCPP_HIDE_FROM_ABI constexpr bool is_exhaustive() const noexcept {
-    if constexpr (__rank_ == 0)
+    if constexpr (is_always_exhaustive())
       return true;
-    else {
+    index_type __span_size = required_span_size();
-      index_type __span_size = required_span_size();
+    if (__span_size == static_cast<index_type>(0))
-      if (__span_size == static_cast<index_type>(0)) {
+      return true;
-        if constexpr (__rank_ == 1)
+    return __span_size == [&]<size_t... _Pos>(index_sequence<_Pos...>) {
-          return __strides_[0] == 1;
+      return (__extents_.extent(_Pos) * ... * static_cast<index_type>(1));
-        else {
+    }(make_index_sequence<__rank_>());
-          rank_type __r_largest = 0;
-          for (rank_type __r = 1; __r < __rank_; __r++)
-            if (__strides_[__r] > __strides_[__r_largest])
-              __r_largest = __r;
-          for (rank_type __r = 0; __r < __rank_; __r++)
-            if (__extents_.extent(__r) == 0 && __r != __r_largest)
-              return false;
-          return true;
-        }
-      } else {
-        return required_span_size() == [&]<size_t... _Pos>(index_sequence<_Pos...>) {
-          return (__extents_.extent(_Pos) * ... * static_cast<index_type>(1));
-        }(make_index_sequence<__rank_>());
-      }
-    }
   }
   _LIBCPP_HIDE_FROM_ABI static constexpr bool is_strided() noexcept { return true; }

lib/libcxx/include/__mdspan/mdspan.h+55-21

 @@ -30,6 +30,7 @@
 #include <__type_traits/is_constructible.h>
 #include <__type_traits/is_convertible.h>
 #include <__type_traits/is_nothrow_constructible.h>
+#include <__type_traits/is_object.h>
 #include <__type_traits/is_pointer.h>
 #include <__type_traits/is_same.h>
 #include <__type_traits/rank.h>
 @@ -37,9 +38,11 @@
 #include <__type_traits/remove_cv.h>
 #include <__type_traits/remove_pointer.h>
 #include <__type_traits/remove_reference.h>
+#include <__utility/as_const.h>
 #include <__utility/integer_sequence.h>
 #include <array>
 #include <span>
+#include <stdexcept>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -66,6 +69,9 @@ class mdspan {
 private:
   static_assert(__mdspan_detail::__is_extents_v<_Extents>,
                 "mdspan: Extents template parameter must be a specialization of extents.");
+  static_assert(
+      is_object_v<_ElementType> && requires { sizeof(_ElementType); },
+      "mdspan: ElementType template parameter must be a complete object type");
   static_assert(!is_array_v<_ElementType>, "mdspan: ElementType template parameter may not be an array type");
   static_assert(!is_abstract_v<_ElementType>, "mdspan: ElementType template parameter may not be an abstract class");
   static_assert(is_same_v<_ElementType, typename _AccessorPolicy::element_type>,
 @@ -78,14 +84,14 @@ public:
   using extents_type     = _Extents;
   using layout_type      = _LayoutPolicy;
   using accessor_type    = _AccessorPolicy;
-  using mapping_type     = typename layout_type::template mapping<extents_type>;
+  using mapping_type     = layout_type::template mapping<extents_type>;
   using element_type     = _ElementType;
   using value_type       = remove_cv_t<element_type>;
-  using index_type       = typename extents_type::index_type;
+  using index_type       = extents_type::index_type;
-  using size_type        = typename extents_type::size_type;
+  using size_type        = extents_type::size_type;
-  using rank_type        = typename extents_type::rank_type;
+  using rank_type        = extents_type::rank_type;
-  using data_handle_type = typename accessor_type::data_handle_type;
+  using data_handle_type = accessor_type::data_handle_type;
-  using reference        = typename accessor_type::reference;
+  using reference        = accessor_type::reference;
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr rank_type rank() noexcept { return extents_type::rank(); }
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr rank_type rank_dynamic() noexcept {
 @@ -187,11 +193,11 @@ public:
              (is_nothrow_constructible_v<index_type, _OtherIndexTypes> && ...) &&
              (sizeof...(_OtherIndexTypes) == rank()))
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr reference operator[](_OtherIndexTypes... __indices) const {
-    // Note the standard layouts would also check this, but user provided ones may not, so we
+    return [&]<class... _IndexTypes>(_IndexTypes... __idxs) -> reference {
-    // check the precondition here
+      _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__mdspan_detail::__is_multidimensional_index_in(extents(), __idxs...),
-    _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__mdspan_detail::__is_multidimensional_index_in(extents(), __indices...),
+                                          "mdspan: operator[] out of bounds access");
-                                        "mdspan: operator[] out of bounds access");
+      return __acc_.access(__ptr_, __map_(static_cast<index_type>(std::move(__idxs))...));
-    return __acc_.access(__ptr_, __map_(static_cast<index_type>(std::move(__indices))...));
+    }(extents_type::__index_cast(std::move(__indices))...);
   }
   template <class _OtherIndexType>
 @@ -200,7 +206,7 @@ public:
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr reference
   operator[](const array< _OtherIndexType, rank()>& __indices) const {
     return __acc_.access(__ptr_, [&]<size_t... _Idxs>(index_sequence<_Idxs...>) {
-      return __map_(__indices[_Idxs]...);
+      return __map_(extents_type::__index_cast(__indices[_Idxs])...);
     }(make_index_sequence<rank()>()));
   }
 @@ -209,10 +215,41 @@ public:
              is_nothrow_constructible_v<index_type, const _OtherIndexType&>)
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr reference operator[](span<_OtherIndexType, rank()> __indices) const {
     return __acc_.access(__ptr_, [&]<size_t... _Idxs>(index_sequence<_Idxs...>) {
-      return __map_(__indices[_Idxs]...);
+      return __map_(extents_type::__index_cast(__indices[_Idxs])...);
     }(make_index_sequence<rank()>()));
   }
+#  if _LIBCPP_STD_VER >= 26
+  template <class... _OtherIndexTypes>
+    requires((is_convertible_v<_OtherIndexTypes, index_type> && ...) &&
+             (is_nothrow_constructible_v<index_type, _OtherIndexTypes> && ...) &&
+             (sizeof...(_OtherIndexTypes) == rank()))
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr reference at(_OtherIndexTypes... __indices) const {
+    if (!__mdspan_detail::__is_multidimensional_index_in(__map_.extents(), __indices...)) {
+      __throw_out_of_range();
+    }
+    return (*this)[extents_type::__index_cast(std::move(__indices))...];
+  }
+  template <class _OtherIndexType>
+    requires(is_convertible_v<const _OtherIndexType&, index_type> &&
+             is_nothrow_constructible_v<index_type, const _OtherIndexType&>)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr reference at(const array<_OtherIndexType, rank()>& __indices) const {
+    return [&]<size_t... _Idxs>(index_sequence<_Idxs...>) -> reference {
+      return at(extents_type::__index_cast(__indices[_Idxs])...);
+    }(make_index_sequence<rank()>());
+  }
+  template <class _OtherIndexType>
+    requires(is_convertible_v<const _OtherIndexType&, index_type> &&
+             is_nothrow_constructible_v<index_type, const _OtherIndexType&>)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr reference at(span<_OtherIndexType, rank()> __indices) const {
+    return [&]<size_t... _Idxs>(index_sequence<_Idxs...>) -> reference {
+      return at(extents_type::__index_cast(std::as_const(__indices[_Idxs]))...);
+    }(make_index_sequence<rank()>());
+  }
+#  endif
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr size_type size() const noexcept {
     // Could leave this as only checked in debug mode: semantically size() is never
     // guaranteed to be related to any accessible range
 @@ -269,19 +306,16 @@ private:
   template <class, class, class, class>
   friend class mdspan;
-};
 #  if _LIBCPP_STD_VER >= 26
+  _LIBCPP_HIDE_FROM_ABI void __throw_out_of_range() const { std::__throw_out_of_range("mdspan"); }
+#  endif
+};
 template <class _ElementType, class... _OtherIndexTypes>
   requires((is_convertible_v<_OtherIndexTypes, size_t> && ...) && (sizeof...(_OtherIndexTypes) > 0))
 explicit mdspan(_ElementType*, _OtherIndexTypes...)
     -> mdspan<_ElementType, extents<size_t, __maybe_static_ext<_OtherIndexTypes>...>>;
-#  else
-template <class _ElementType, class... _OtherIndexTypes>
-  requires((is_convertible_v<_OtherIndexTypes, size_t> && ...) && (sizeof...(_OtherIndexTypes) > 0))
-explicit mdspan(_ElementType*, _OtherIndexTypes...)
-    -> mdspan<_ElementType, dextents<size_t, sizeof...(_OtherIndexTypes)>>;
-#  endif
 template <class _Pointer>
   requires(is_pointer_v<remove_reference_t<_Pointer>>)
 @@ -309,7 +343,7 @@ mdspan(_ElementType*, const _MappingType&)
     -> mdspan<_ElementType, typename _MappingType::extents_type, typename _MappingType::layout_type>;
 template <class _MappingType, class _AccessorType>
-mdspan(const typename _AccessorType::data_handle_type, const _MappingType&, const _AccessorType&)
+mdspan(typename _AccessorType::data_handle_type, const _MappingType&, const _AccessorType&)
     -> mdspan<typename _AccessorType::element_type,
               typename _MappingType::extents_type,
               typename _MappingType::layout_type,

lib/libcxx/include/__memory/aligned_alloc.h deleted-63

...	@@ -1,63 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_ALIGNED_ALLOC_H
10	#define _LIBCPP___MEMORY_ALIGNED_ALLOC_H
11
12	#include <__config>
13	#include <cstdlib>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	#if _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
22
23	// Low-level helpers to call the aligned allocation and deallocation functions
24	// on the target platform. This is used to implement libc++'s own memory
25	// allocation routines -- if you need to allocate memory inside the library,
26	// chances are that you want to use `__libcpp_allocate` instead.
27	//
28	// Returns the allocated memory, or `nullptr` on failure.
29	inline _LIBCPP_HIDE_FROM_ABI void* __libcpp_aligned_alloc(std::size_t __alignment, std::size_t __size) {
30	# if defined(_LIBCPP_MSVCRT_LIKE)
31	return ::_aligned_malloc(__size, __alignment);
32	# elif _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_C11_ALIGNED_ALLOC
33	// aligned_alloc() requires that __size is a multiple of __alignment,
34	// but for C++ [new.delete.general], only states "if the value of an
35	// alignment argument passed to any of these functions is not a valid
36	// alignment value, the behavior is undefined".
37	// To handle calls such as ::operator new(1, std::align_val_t(128)), we
38	// round __size up to the next multiple of __alignment.
39	size_t __rounded_size = (__size + __alignment - 1) & ~(__alignment - 1);
40	// Rounding up could have wrapped around to zero, so we have to add another
41	// max() ternary to the actual call site to avoid succeeded in that case.
42	return ::aligned_alloc(__alignment, __size > __rounded_size ? __size : __rounded_size);
43	# else
44	void* __result = nullptr;
45	(void)::posix_memalign(&__result, __alignment, __size);
46	// If posix_memalign fails, __result is unmodified so we still return `nullptr`.
47	return __result;
48	# endif
49	}
50
51	inline _LIBCPP_HIDE_FROM_ABI void __libcpp_aligned_free(void* __ptr) {
52	# if defined(_LIBCPP_MSVCRT_LIKE)
53	::_aligned_free(__ptr);
54	# else
55	::free(__ptr);
56	# endif
57	}
58
59	#endif // _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
60
61	_LIBCPP_END_NAMESPACE_STD
62
63	#endif // _LIBCPP___MEMORY_ALIGNED_ALLOC_H

lib/libcxx/include/__memory/allocator_traits.h+61-1

...	@@ -11,6 +11,7 @@	...	@@ -11,6 +11,7 @@
11	#define _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H	11	#define _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H
12		12
13	#include <__config>	13	#include <__config>
		14	#include <__cstddef/ptrdiff_t.h>
14	#include <__cstddef/size_t.h>	15	#include <__cstddef/size_t.h>
15	#include <__fwd/memory.h>	16	#include <__fwd/memory.h>
16	#include <__memory/construct_at.h>	17	#include <__memory/construct_at.h>
...	@@ -223,8 +224,13 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(allocation_result);	...	@@ -223,8 +224,13 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(allocation_result);
223		224
224	#endif // _LIBCPP_STD_VER	225	#endif // _LIBCPP_STD_VER
225		226
		227	template <class>
		228	struct allocator_traits;
		229
		230	// We have a base class that can be specialized for different allocators, since the metaprogramming to get the aliases
		231	// is quite expensive and the definition of these aliases is usually quite trivial in the end.
226	template <class _Alloc>	232	template <class _Alloc>
227	struct allocator_traits {	233	struct __allocator_traits_base {
228	using allocator_type = _Alloc;	234	using allocator_type = _Alloc;
229	using value_type = typename allocator_type::value_type;	235	using value_type = typename allocator_type::value_type;
230	using pointer = __pointer<value_type, allocator_type>;	236	using pointer = __pointer<value_type, allocator_type>;
...	@@ -253,6 +259,60 @@ struct allocator_traits {	...	@@ -253,6 +259,60 @@ struct allocator_traits {
253	using other = allocator_traits<typename rebind_alloc<_Tp>::other>;	259	using other = allocator_traits<typename rebind_alloc<_Tp>::other>;
254	};	260	};
255	#endif // _LIBCPP_CXX03_LANG	261	#endif // _LIBCPP_CXX03_LANG
		262	};
		263
		264	template <class _Tp>
		265	struct __allocator_traits_base<allocator<_Tp> > {
		266	using allocator_type = allocator<_Tp>;
		267	using value_type = _Tp;
		268	using pointer = _Tp*;
		269	using const_pointer = const _Tp*;
		270	using void_pointer = void*;
		271	using const_void_pointer = const void*;
		272	using difference_type = ptrdiff_t;
		273	using size_type = size_t;
		274	using propagate_on_container_copy_assignment = false_type;
		275	using propagate_on_container_move_assignment = true_type;
		276	using propagate_on_container_swap = false_type;
		277	using is_always_equal = true_type;
		278
		279	#ifndef _LIBCPP_CXX03_LANG
		280	template <class _Up>
		281	using rebind_alloc = allocator<_Up>;
		282	template <class _Up>
		283	using rebind_traits = allocator_traits<allocator<_Up> >;
		284	#else
		285	template <class _Up>
		286	struct rebind_alloc {
		287	using other = allocator<_Up>;
		288	};
		289	template <class _Up>
		290	struct rebind_traits {
		291	using other = allocator_traits<allocator<_Up> >;
		292	};
		293	#endif
		294	};
		295
		296	template <class _Alloc>
		297	struct allocator_traits : __allocator_traits_base<_Alloc> {
		298	using __base _LIBCPP_NODEBUG = __allocator_traits_base<_Alloc>;
		299
		300	using allocator_type = typename __base::allocator_type;
		301	using value_type = typename __base::value_type;
		302	using pointer = typename __base::pointer;
		303	using const_pointer = typename __base::const_pointer;
		304	using void_pointer = typename __base::void_pointer;
		305	using const_void_pointer = typename __base::const_void_pointer;
		306	using difference_type = typename __base::difference_type;
		307	using size_type = typename __base::size_type;
		308	using propagate_on_container_copy_assignment = typename __base::propagate_on_container_copy_assignment;
		309	using propagate_on_container_move_assignment = typename __base::propagate_on_container_move_assignment;
		310	using is_always_equal = typename __base::is_always_equal;
		311
		312	template <class _Tp>
		313	using rebind_alloc = typename __base::template rebind_alloc<_Tp>;
		314	template <class _Tp>
		315	using rebind_traits = typename __base::template rebind_traits<_Tp>;
256		316
257	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 static pointer	317	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 static pointer
258	allocate(allocator_type& __a, size_type __n) {	318	allocate(allocator_type& __a, size_type __n) {

lib/libcxx/include/__memory/compressed_pair.h+4-29

 @@ -20,8 +20,6 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 // ================================================================================================================== //
 // The utilites here are for staying ABI compatible with the legacy `__compressed_pair`. They should not be used      //
 // for new data structures. Use `_LIBCPP_NO_UNIQUE_ADDRESS` for new data structures instead (but make sure you        //
 @@ -59,6 +57,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 #ifndef _LIBCPP_ABI_NO_COMPRESSED_PAIR_PADDING
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 inline const size_t __compressed_pair_alignment = _LIBCPP_ALIGNOF(_Tp);
 @@ -94,16 +94,6 @@ class __compressed_pair_padding<_ToPad, true> {};
       _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T1> _LIBCPP_CONCAT3(__padding1_, __LINE__, _);        \
       _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;                                                                       \
       _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2> _LIBCPP_CONCAT3(__padding2_, __LINE__, _)
-#    define _LIBCPP_COMPRESSED_TRIPLE(T1, Initializer1, T2, Initializer2, T3, Initializer3)                            \
-      _LIBCPP_NO_UNIQUE_ADDRESS                                                                                        \
-      __attribute__((__aligned__(::std::__compressed_pair_alignment<T2>),                                              \
-                     __aligned__(::std::__compressed_pair_alignment<T3>))) T1 Initializer1;                            \
-      _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T1> _LIBCPP_CONCAT3(__padding1_, __LINE__, _);        \
-      _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;                                                                       \
-      _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2> _LIBCPP_CONCAT3(__padding2_, __LINE__, _);        \
-      _LIBCPP_NO_UNIQUE_ADDRESS T3 Initializer3;                                                                       \
-      _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T3> _LIBCPP_CONCAT3(__padding3_, __LINE__, _)
 #  else
 #    define _LIBCPP_COMPRESSED_PAIR(T1, Initializer1, T2, Initializer2)                                                \
       struct {                                                                                                         \
 @@ -112,31 +102,16 @@ class __compressed_pair_padding<_ToPad, true> {};
         _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;                                                                     \
         _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2> _LIBCPP_CONCAT3(__padding2_, __LINE__, _);      \
       }
-#    define _LIBCPP_COMPRESSED_TRIPLE(T1, Initializer1, T2, Initializer2, T3, Initializer3)                            \
-      struct {                                                                                                         \
-        _LIBCPP_NO_UNIQUE_ADDRESS T1 Initializer1;                                                                     \
-        _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T1> _LIBCPP_CONCAT3(__padding1_, __LINE__, _);      \
-        _LIBCPP_NO_UNIQUE_ADDRESS T2 Initializer2;                                                                     \
-        _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T2> _LIBCPP_CONCAT3(__padding2_, __LINE__, _);      \
-        _LIBCPP_NO_UNIQUE_ADDRESS T3 Initializer3;                                                                     \
-        _LIBCPP_NO_UNIQUE_ADDRESS ::std::__compressed_pair_padding<T3> _LIBCPP_CONCAT3(__padding3_, __LINE__, _);      \
-      }
 #  endif
+_LIBCPP_END_NAMESPACE_STD
 #else
 #  define _LIBCPP_COMPRESSED_ELEMENT(T1, Initializer1) _LIBCPP_NO_UNIQUE_ADDRESS T1 Initializer1
 #  define _LIBCPP_COMPRESSED_PAIR(T1, Name1, T2, Name2)                                                                \
     _LIBCPP_NO_UNIQUE_ADDRESS T1 Name1;                                                                                \
     _LIBCPP_NO_UNIQUE_ADDRESS T2 Name2
-#  define _LIBCPP_COMPRESSED_TRIPLE(T1, Name1, T2, Name2, T3, Name3)                                                   \
-    _LIBCPP_NO_UNIQUE_ADDRESS T1 Name1;                                                                                \
-    _LIBCPP_NO_UNIQUE_ADDRESS T2 Name2;                                                                                \
-    _LIBCPP_NO_UNIQUE_ADDRESS T3 Name3
 #endif // _LIBCPP_ABI_NO_COMPRESSED_PAIR_PADDING
-_LIBCPP_END_NAMESPACE_STD
 #endif // _LIBCPP___MEMORY_COMPRESSED_PAIR_H

lib/libcxx/include/__memory/inout_ptr.h+5-6

 @@ -11,10 +11,9 @@
 #define _LIBCPP___INOUT_PTR_H
 #include <__config>
+#include <__fwd/memory.h>
 #include <__memory/addressof.h>
 #include <__memory/pointer_traits.h>
-#include <__memory/shared_ptr.h>
-#include <__memory/unique_ptr.h>
 #include <__type_traits/is_pointer.h>
 #include <__type_traits/is_same.h>
 #include <__type_traits/is_specialization.h>
 @@ -30,10 +29,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Smart, class _Pointer, class... _Args>
 class inout_ptr_t {
   static_assert(!__is_specialization_v<_Smart, shared_ptr>, "std::shared_ptr<> is not supported with std::inout_ptr.");
 @@ -101,10 +100,10 @@ template <class _Pointer = void, class _Smart, class... _Args>
   return std::inout_ptr_t<_Smart, _Ptr, _Args&&...>(__s, std::forward<_Args>(__args)...);
 }
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___INOUT_PTR_H

lib/libcxx/include/__memory/is_sufficiently_aligned.h+6-1

 @@ -20,11 +20,16 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
+template <size_t _Alignment, class _Tp>
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool __is_sufficiently_aligned(_Tp* __ptr) {
+  return reinterpret_cast<uintptr_t>(__ptr) % _Alignment == 0;
+}
 #if _LIBCPP_STD_VER >= 26
 template <size_t _Alignment, class _Tp>
 [[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool is_sufficiently_aligned(_Tp* __ptr) {
-  return reinterpret_cast<uintptr_t>(__ptr) % _Alignment == 0;
+  return std::__is_sufficiently_aligned<_Alignment>(__ptr);
 }
 #endif // _LIBCPP_STD_VER >= 26

lib/libcxx/include/__memory/out_ptr.h+5-6

 @@ -11,10 +11,9 @@
 #define _LIBCPP___OUT_PTR_H
 #include <__config>
+#include <__fwd/memory.h>
 #include <__memory/addressof.h>
 #include <__memory/pointer_traits.h>
-#include <__memory/shared_ptr.h>
-#include <__memory/unique_ptr.h>
 #include <__type_traits/is_pointer.h>
 #include <__type_traits/is_specialization.h>
 #include <__type_traits/is_void.h>
 @@ -29,10 +28,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Smart, class _Pointer, class... _Args>
 class out_ptr_t {
   static_assert(!__is_specialization_v<_Smart, shared_ptr> || sizeof...(_Args) > 0,
 @@ -93,10 +92,10 @@ template <class _Pointer = void, class _Smart, class... _Args>
   return std::out_ptr_t<_Smart, _Ptr, _Args&&...>(__s, std::forward<_Args>(__args)...);
 }
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___OUT_PTR_H

lib/libcxx/include/__memory/pointer_traits.h+20-35

 @@ -14,12 +14,10 @@
 #include <__cstddef/ptrdiff_t.h>
 #include <__memory/addressof.h>
 #include <__type_traits/conditional.h>
-#include <__type_traits/conjunction.h>
 #include <__type_traits/decay.h>
 #include <__type_traits/detected_or.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/integral_constant.h>
-#include <__type_traits/is_class.h>
 #include <__type_traits/is_function.h>
 #include <__type_traits/is_void.h>
 #include <__type_traits/nat.h>
 @@ -139,9 +137,6 @@ using __rebind_pointer_t _LIBCPP_NODEBUG = typename pointer_traits<_From>::templ
 // to_address
-template <class _Pointer, class = void>
-struct __to_address_helper;
 template <class _Tp>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp* __to_address(_Tp* __p) _NOEXCEPT {
   static_assert(!is_function<_Tp>::value, "_Tp is a function type");
 @@ -149,48 +144,38 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp* __to_address(_Tp* __p) _NOEXCEPT {
 }
 template <class _Pointer, class = void>
-struct _HasToAddress : false_type {};
+inline const bool __has_to_address_v = false;
 template <class _Pointer>
-struct _HasToAddress<_Pointer, decltype((void)pointer_traits<_Pointer>::to_address(std::declval<const _Pointer&>())) >
+inline const bool
-    : true_type {};
+    __has_to_address_v<_Pointer,
+                       decltype((void)pointer_traits<_Pointer>::to_address(std::declval<const _Pointer&>()))> = true;
 template <class _Pointer, class = void>
-struct _HasArrow : false_type {};
+inline const bool __has_arrow_v = false;
-template <class _Pointer>
-struct _HasArrow<_Pointer, decltype((void)std::declval<const _Pointer&>().operator->()) > : true_type {};
 template <class _Pointer>
-struct _IsFancyPointer {
+inline const bool __has_arrow_v<_Pointer, decltype((void)std::declval<const _Pointer&>().operator->()) > = true;
-  static const bool value = _HasArrow<_Pointer>::value || _HasToAddress<_Pointer>::value;
-};
-// enable_if is needed here to avoid instantiating checks for fancy pointers on raw pointers
+template <class _Pointer, __enable_if_t<__has_to_address_v<_Pointer>, int> = 0>
-template <class _Pointer, __enable_if_t< _And<is_class<_Pointer>, _IsFancyPointer<_Pointer> >::value, int> = 0>
+_LIBCPP_CONSTEXPR __decay_t<decltype(pointer_traits<_Pointer>::to_address(std::declval<const _Pointer&>()))>
-_LIBCPP_HIDE_FROM_ABI
-_LIBCPP_CONSTEXPR __decay_t<decltype(__to_address_helper<_Pointer>::__call(std::declval<const _Pointer&>()))>
 __to_address(const _Pointer& __p) _NOEXCEPT {
-  return __to_address_helper<_Pointer>::__call(__p);
+  return pointer_traits<_Pointer>::to_address(__p);
 }
-template <class _Pointer, class>
+template <class _Pointer>
-struct __to_address_helper {
+struct __to_address_arrow_result;
-  _LIBCPP_HIDE_FROM_ABI
-  _LIBCPP_CONSTEXPR static decltype(std::__to_address(std::declval<const _Pointer&>().operator->()))
-  __call(const _Pointer& __p) _NOEXCEPT {
-    return std::__to_address(__p.operator->());
-  }
-};
+template <class _Pointer, __enable_if_t<!__has_to_address_v<_Pointer> && __has_arrow_v<_Pointer>, int> = 0>
+_LIBCPP_CONSTEXPR typename __to_address_arrow_result<_Pointer>::type __to_address(const _Pointer& __p) _NOEXCEPT {
+  return std::__to_address(__p.operator->());
+}
+// The return type needs to see all `__to_address` overloads, so this is delayed until after all the overloads have been
+// defined. This could also be moved to a trailing return type, but that's not available in C++03.
 template <class _Pointer>
-struct __to_address_helper<_Pointer,
+struct __to_address_arrow_result {
-                           decltype((void)pointer_traits<_Pointer>::to_address(std::declval<const _Pointer&>()))> {
+  using type _LIBCPP_NODEBUG = __decay_t<decltype(std::__to_address(std::declval<const _Pointer&>().operator->()))>;
-  _LIBCPP_HIDE_FROM_ABI
-  _LIBCPP_CONSTEXPR static decltype(pointer_traits<_Pointer>::to_address(std::declval<const _Pointer&>()))
-  __call(const _Pointer& __p) _NOEXCEPT {
-    return pointer_traits<_Pointer>::to_address(__p);
-  }
 };
 #if _LIBCPP_STD_VER >= 20

lib/libcxx/include/__memory/ranges_uninitialized_algorithms.h+29-26

 @@ -44,14 +44,16 @@ namespace ranges {
 struct __uninitialized_default_construct {
   template <__nothrow_forward_iterator _ForwardIterator, __nothrow_sentinel_for<_ForwardIterator> _Sentinel>
     requires default_initializable<iter_value_t<_ForwardIterator>>
-  _LIBCPP_HIDE_FROM_ABI _ForwardIterator operator()(_ForwardIterator __first, _Sentinel __last) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
+  operator()(_ForwardIterator __first, _Sentinel __last) const {
     using _ValueType = remove_reference_t<iter_reference_t<_ForwardIterator>>;
     return std::__uninitialized_default_construct<_ValueType>(std::move(__first), std::move(__last));
   }
   template <__nothrow_forward_range _ForwardRange>
     requires default_initializable<range_value_t<_ForwardRange>>
-  _LIBCPP_HIDE_FROM_ABI borrowed_iterator_t<_ForwardRange> operator()(_ForwardRange&& __range) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 borrowed_iterator_t<_ForwardRange>
+  operator()(_ForwardRange&& __range) const {
     return (*this)(ranges::begin(__range), ranges::end(__range));
   }
 };
 @@ -65,7 +67,7 @@ inline constexpr auto uninitialized_default_construct = __uninitialized_default_
 struct __uninitialized_default_construct_n {
   template <__nothrow_forward_iterator _ForwardIterator>
     requires default_initializable<iter_value_t<_ForwardIterator>>
-  _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
   operator()(_ForwardIterator __first, iter_difference_t<_ForwardIterator> __n) const {
     using _ValueType = remove_reference_t<iter_reference_t<_ForwardIterator>>;
     return std::__uninitialized_default_construct_n<_ValueType>(std::move(__first), __n);
 @@ -81,14 +83,16 @@ inline constexpr auto uninitialized_default_construct_n = __uninitialized_defaul
 struct __uninitialized_value_construct {
   template <__nothrow_forward_iterator _ForwardIterator, __nothrow_sentinel_for<_ForwardIterator> _Sentinel>
     requires default_initializable<iter_value_t<_ForwardIterator>>
-  _LIBCPP_HIDE_FROM_ABI _ForwardIterator operator()(_ForwardIterator __first, _Sentinel __last) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
+  operator()(_ForwardIterator __first, _Sentinel __last) const {
     using _ValueType = remove_reference_t<iter_reference_t<_ForwardIterator>>;
     return std::__uninitialized_value_construct<_ValueType>(std::move(__first), std::move(__last));
   }
   template <__nothrow_forward_range _ForwardRange>
     requires default_initializable<range_value_t<_ForwardRange>>
-  _LIBCPP_HIDE_FROM_ABI borrowed_iterator_t<_ForwardRange> operator()(_ForwardRange&& __range) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 borrowed_iterator_t<_ForwardRange>
+  operator()(_ForwardRange&& __range) const {
     return (*this)(ranges::begin(__range), ranges::end(__range));
   }
 };
 @@ -102,7 +106,7 @@ inline constexpr auto uninitialized_value_construct = __uninitialized_value_cons
 struct __uninitialized_value_construct_n {
   template <__nothrow_forward_iterator _ForwardIterator>
     requires default_initializable<iter_value_t<_ForwardIterator>>
-  _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
   operator()(_ForwardIterator __first, iter_difference_t<_ForwardIterator> __n) const {
     using _ValueType = remove_reference_t<iter_reference_t<_ForwardIterator>>;
     return std::__uninitialized_value_construct_n<_ValueType>(std::move(__first), __n);
 @@ -118,14 +122,16 @@ inline constexpr auto uninitialized_value_construct_n = __uninitialized_value_co
 struct __uninitialized_fill {
   template <__nothrow_forward_iterator _ForwardIterator, __nothrow_sentinel_for<_ForwardIterator> _Sentinel, class _Tp>
     requires constructible_from<iter_value_t<_ForwardIterator>, const _Tp&>
-  _LIBCPP_HIDE_FROM_ABI _ForwardIterator operator()(_ForwardIterator __first, _Sentinel __last, const _Tp& __x) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
+  operator()(_ForwardIterator __first, _Sentinel __last, const _Tp& __x) const {
     using _ValueType = remove_reference_t<iter_reference_t<_ForwardIterator>>;
     return std::__uninitialized_fill<_ValueType>(std::move(__first), std::move(__last), __x);
   }
   template <__nothrow_forward_range _ForwardRange, class _Tp>
     requires constructible_from<range_value_t<_ForwardRange>, const _Tp&>
-  _LIBCPP_HIDE_FROM_ABI borrowed_iterator_t<_ForwardRange> operator()(_ForwardRange&& __range, const _Tp& __x) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 borrowed_iterator_t<_ForwardRange>
+  operator()(_ForwardRange&& __range, const _Tp& __x) const {
     return (*this)(ranges::begin(__range), ranges::end(__range), __x);
   }
 };
 @@ -139,7 +145,7 @@ inline constexpr auto uninitialized_fill = __uninitialized_fill{};
 struct __uninitialized_fill_n {
   template <__nothrow_forward_iterator _ForwardIterator, class _Tp>
     requires constructible_from<iter_value_t<_ForwardIterator>, const _Tp&>
-  _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
   operator()(_ForwardIterator __first, iter_difference_t<_ForwardIterator> __n, const _Tp& __x) const {
     using _ValueType = remove_reference_t<iter_reference_t<_ForwardIterator>>;
     return std::__uninitialized_fill_n<_ValueType>(std::move(__first), __n, __x);
 @@ -161,20 +167,20 @@ struct __uninitialized_copy {
             __nothrow_forward_iterator _OutputIterator,
             __nothrow_sentinel_for<_OutputIterator> _Sentinel2>
     requires constructible_from<iter_value_t<_OutputIterator>, iter_reference_t<_InputIterator>>
-  _LIBCPP_HIDE_FROM_ABI uninitialized_copy_result<_InputIterator, _OutputIterator>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 uninitialized_copy_result<_InputIterator, _OutputIterator>
   operator()(_InputIterator __ifirst, _Sentinel1 __ilast, _OutputIterator __ofirst, _Sentinel2 __olast) const {
     using _ValueType = remove_reference_t<iter_reference_t<_OutputIterator>>;
     auto __stop_copying = [&__olast](auto&& __out_iter) -> bool { return __out_iter == __olast; };
-    auto __result       = std::__uninitialized_copy<_ValueType>(
+    return std::__uninitialized_copy<_ValueType>(
         std::move(__ifirst), std::move(__ilast), std::move(__ofirst), __stop_copying);
-    return {std::move(__result.first), std::move(__result.second)};
   }
   template <input_range _InputRange, __nothrow_forward_range _OutputRange>
     requires constructible_from<range_value_t<_OutputRange>, range_reference_t<_InputRange>>
-  _LIBCPP_HIDE_FROM_ABI uninitialized_copy_result<borrowed_iterator_t<_InputRange>, borrowed_iterator_t<_OutputRange>>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
-  operator()(_InputRange&& __in_range, _OutputRange&& __out_range) const {
+      uninitialized_copy_result<borrowed_iterator_t<_InputRange>, borrowed_iterator_t<_OutputRange>>
+      operator()(_InputRange&& __in_range, _OutputRange&& __out_range) const {
     return (*this)(
         ranges::begin(__in_range), ranges::end(__in_range), ranges::begin(__out_range), ranges::end(__out_range));
   }
 @@ -194,16 +200,14 @@ struct __uninitialized_copy_n {
             __nothrow_forward_iterator _OutputIterator,
             __nothrow_sentinel_for<_OutputIterator> _Sentinel>
     requires constructible_from<iter_value_t<_OutputIterator>, iter_reference_t<_InputIterator>>
-  _LIBCPP_HIDE_FROM_ABI uninitialized_copy_n_result<_InputIterator, _OutputIterator>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 uninitialized_copy_n_result<_InputIterator, _OutputIterator>
   operator()(_InputIterator __ifirst,
              iter_difference_t<_InputIterator> __n,
              _OutputIterator __ofirst,
              _Sentinel __olast) const {
     using _ValueType    = remove_reference_t<iter_reference_t<_OutputIterator>>;
     auto __stop_copying = [&__olast](auto&& __out_iter) -> bool { return __out_iter == __olast; };
-    auto __result =
+    return std::__uninitialized_copy_n<_ValueType>(std::move(__ifirst), __n, std::move(__ofirst), __stop_copying);
-        std::__uninitialized_copy_n<_ValueType>(std::move(__ifirst), __n, std::move(__ofirst), __stop_copying);
-    return {std::move(__result.first), std::move(__result.second)};
   }
 };
 @@ -222,20 +226,20 @@ struct __uninitialized_move {
             __nothrow_forward_iterator _OutputIterator,
             __nothrow_sentinel_for<_OutputIterator> _Sentinel2>
     requires constructible_from<iter_value_t<_OutputIterator>, iter_rvalue_reference_t<_InputIterator>>
-  _LIBCPP_HIDE_FROM_ABI uninitialized_move_result<_InputIterator, _OutputIterator>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 uninitialized_move_result<_InputIterator, _OutputIterator>
   operator()(_InputIterator __ifirst, _Sentinel1 __ilast, _OutputIterator __ofirst, _Sentinel2 __olast) const {
     using _ValueType   = remove_reference_t<iter_reference_t<_OutputIterator>>;
     auto __iter_move   = [](auto&& __iter) -> decltype(auto) { return ranges::iter_move(__iter); };
     auto __stop_moving = [&__olast](auto&& __out_iter) -> bool { return __out_iter == __olast; };
-    auto __result      = std::__uninitialized_move<_ValueType>(
+    return std::__uninitialized_move<_ValueType>(
         std::move(__ifirst), std::move(__ilast), std::move(__ofirst), __stop_moving, __iter_move);
-    return {std::move(__result.first), std::move(__result.second)};
   }
   template <input_range _InputRange, __nothrow_forward_range _OutputRange>
     requires constructible_from<range_value_t<_OutputRange>, range_rvalue_reference_t<_InputRange>>
-  _LIBCPP_HIDE_FROM_ABI uninitialized_move_result<borrowed_iterator_t<_InputRange>, borrowed_iterator_t<_OutputRange>>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
-  operator()(_InputRange&& __in_range, _OutputRange&& __out_range) const {
+      uninitialized_move_result<borrowed_iterator_t<_InputRange>, borrowed_iterator_t<_OutputRange>>
+      operator()(_InputRange&& __in_range, _OutputRange&& __out_range) const {
     return (*this)(
         ranges::begin(__in_range), ranges::end(__in_range), ranges::begin(__out_range), ranges::end(__out_range));
   }
 @@ -255,7 +259,7 @@ struct __uninitialized_move_n {
             __nothrow_forward_iterator _OutputIterator,
             __nothrow_sentinel_for<_OutputIterator> _Sentinel>
     requires constructible_from<iter_value_t<_OutputIterator>, iter_rvalue_reference_t<_InputIterator>>
-  _LIBCPP_HIDE_FROM_ABI uninitialized_move_n_result<_InputIterator, _OutputIterator>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 uninitialized_move_n_result<_InputIterator, _OutputIterator>
   operator()(_InputIterator __ifirst,
              iter_difference_t<_InputIterator> __n,
              _OutputIterator __ofirst,
 @@ -263,9 +267,8 @@ struct __uninitialized_move_n {
     using _ValueType   = remove_reference_t<iter_reference_t<_OutputIterator>>;
     auto __iter_move   = [](auto&& __iter) -> decltype(auto) { return ranges::iter_move(__iter); };
     auto __stop_moving = [&__olast](auto&& __out_iter) -> bool { return __out_iter == __olast; };
-    auto __result      = std::__uninitialized_move_n<_ValueType>(
+    return std::__uninitialized_move_n<_ValueType>(
         std::move(__ifirst), __n, std::move(__ofirst), __stop_moving, __iter_move);
-    return {std::move(__result.first), std::move(__result.second)};
   }
 };

lib/libcxx/include/__memory/raw_storage_iterator.h+4-4

 @@ -21,13 +21,13 @@
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_RAW_STORAGE_ITERATOR)
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_RAW_STORAGE_ITERATOR)
 template <class _OutputIterator, class _Tp>
 class _LIBCPP_DEPRECATED_IN_CXX17 raw_storage_iterator
     : public __iterator_base<raw_storage_iterator<_OutputIterator, _Tp>, output_iterator_tag, void, void, void, void> {
 @@ -71,10 +71,10 @@ public:
 #  endif
 };
-#endif // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_RAW_STORAGE_ITERATOR)
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
+#endif // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_RAW_STORAGE_ITERATOR)
 #endif // _LIBCPP___MEMORY_RAW_STORAGE_ITERATOR_H

lib/libcxx/include/__memory/shared_count.h+2

...	@@ -18,6 +18,7 @@	...	@@ -18,6 +18,7 @@
18	#endif	18	#endif
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
		21	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
21		22
22	// NOTE: Relaxed and acq/rel atomics (for increment and decrement respectively)	23	// NOTE: Relaxed and acq/rel atomics (for increment and decrement respectively)
23	// should be sufficient for thread safety.	24	// should be sufficient for thread safety.
...	@@ -111,6 +112,7 @@ private:	...	@@ -111,6 +112,7 @@ private:
111	virtual void __on_zero_shared_weak() _NOEXCEPT = 0;	112	virtual void __on_zero_shared_weak() _NOEXCEPT = 0;
112	};	113	};
113		114
		115	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
114	_LIBCPP_END_NAMESPACE_STD	116	_LIBCPP_END_NAMESPACE_STD
115		117
116	#endif // _LIBCPP___MEMORY_SHARED_COUNT_H	118	#endif // _LIBCPP___MEMORY_SHARED_COUNT_H

lib/libcxx/include/__memory/shared_ptr.h+209-277

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#ifndef _LIBCPP___MEMORY_SHARED_PTR_H	10	#ifndef _LIBCPP___MEMORY_SHARED_PTR_H
11	#define _LIBCPP___MEMORY_SHARED_PTR_H	11	#define _LIBCPP___MEMORY_SHARED_PTR_H
12		12
		13	#include <__atomic/memory_order.h>
13	#include <__compare/compare_three_way.h>	14	#include <__compare/compare_three_way.h>
14	#include <__compare/ordering.h>	15	#include <__compare/ordering.h>
15	#include <__config>	16	#include <__config>
...	@@ -27,19 +28,17 @@	...	@@ -27,19 +28,17 @@
27	#include <__memory/allocator_destructor.h>	28	#include <__memory/allocator_destructor.h>
28	#include <__memory/allocator_traits.h>	29	#include <__memory/allocator_traits.h>
29	#include <__memory/auto_ptr.h>	30	#include <__memory/auto_ptr.h>
30	#include <__memory/compressed_pair.h>
31	#include <__memory/construct_at.h>	31	#include <__memory/construct_at.h>
32	#include <__memory/destroy.h>	32	#include <__memory/destroy.h>
33	#include <__memory/pointer_traits.h>	33	#include <__memory/pointer_traits.h>
34	#include <__memory/shared_count.h>	34	#include <__memory/shared_count.h>
35	#include <__memory/uninitialized_algorithms.h>	35	#include <__memory/uninitialized_algorithms.h>
		36	#include <__memory/uninitialized_multidimensional_algorithms.h>
36	#include <__memory/unique_ptr.h>	37	#include <__memory/unique_ptr.h>
37	#include <__type_traits/add_reference.h>	38	#include <__type_traits/add_reference.h>
38	#include <__type_traits/conditional.h>	39	#include <__type_traits/conditional.h>
39	#include <__type_traits/conjunction.h>	40	#include <__type_traits/conjunction.h>
40	#include <__type_traits/disjunction.h>
41	#include <__type_traits/enable_if.h>	41	#include <__type_traits/enable_if.h>
42	#include <__type_traits/integral_constant.h>
43	#include <__type_traits/is_array.h>	42	#include <__type_traits/is_array.h>
44	#include <__type_traits/is_constructible.h>	43	#include <__type_traits/is_constructible.h>
45	#include <__type_traits/is_convertible.h>	44	#include <__type_traits/is_convertible.h>
...	@@ -47,10 +46,11 @@	...	@@ -47,10 +46,11 @@
47	#include <__type_traits/is_reference.h>	46	#include <__type_traits/is_reference.h>
48	#include <__type_traits/is_same.h>	47	#include <__type_traits/is_same.h>
49	#include <__type_traits/nat.h>	48	#include <__type_traits/nat.h>
50	#include <__type_traits/negation.h>
51	#include <__type_traits/remove_cv.h>	49	#include <__type_traits/remove_cv.h>
52	#include <__type_traits/remove_extent.h>	50	#include <__type_traits/remove_extent.h>
		51	#include <__type_traits/remove_pointer.h>
53	#include <__type_traits/remove_reference.h>	52	#include <__type_traits/remove_reference.h>
		53	#include <__type_traits/void_t.h>
54	#include <__utility/declval.h>	54	#include <__utility/declval.h>
55	#include <__utility/exception_guard.h>	55	#include <__utility/exception_guard.h>
56	#include <__utility/forward.h>	56	#include <__utility/forward.h>
...	@@ -58,9 +58,6 @@	...	@@ -58,9 +58,6 @@
58	#include <__utility/swap.h>	58	#include <__utility/swap.h>
59	#include <__verbose_abort>	59	#include <__verbose_abort>
60	#include <typeinfo>	60	#include <typeinfo>
61	#if _LIBCPP_HAS_ATOMIC_HEADER
62	# include <__atomic/memory_order.h>
63	#endif
64		61
65	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	62	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
66	# pragma GCC system_header	63	# pragma GCC system_header
...	@@ -70,6 +67,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -70,6 +67,7 @@ _LIBCPP_PUSH_MACROS
70	#include <__undef_macros>	67	#include <__undef_macros>
71		68
72	_LIBCPP_BEGIN_NAMESPACE_STD	69	_LIBCPP_BEGIN_NAMESPACE_STD
		70	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
73		71
74	class _LIBCPP_EXPORTED_FROM_ABI bad_weak_ptr : public std::exception {	72	class _LIBCPP_EXPORTED_FROM_ABI bad_weak_ptr : public std::exception {
75	public:	73	public:
...	@@ -92,47 +90,36 @@ template <class _Tp>	...	@@ -92,47 +90,36 @@ template <class _Tp>
92	class weak_ptr;	90	class weak_ptr;
93		91
94	template <class _Tp, class _Dp, class _Alloc>	92	template <class _Tp, class _Dp, class _Alloc>
95	class __shared_ptr_pointer : public __shared_weak_count {	93	class _LIBCPP_HIDE_STRUCT_FROM_ABI __shared_ptr_pointer final : public __shared_weak_count {
96	_LIBCPP_COMPRESSED_TRIPLE(_Tp, __ptr_, _Dp, __deleter_, _Alloc, __alloc_);	94	_LIBCPP_NO_UNIQUE_ADDRESS _Alloc __alloc_;
		95	_LIBCPP_NO_UNIQUE_ADDRESS _Dp __deleter_;
		96	_LIBCPP_NO_UNIQUE_ADDRESS _Tp __ptr_;
97		97
98	public:	98	public:
99	_LIBCPP_HIDE_FROM_ABI __shared_ptr_pointer(_Tp __p, _Dp __d, _Alloc __a)	99	_LIBCPP_HIDE_FROM_ABI __shared_ptr_pointer(_Tp __p, _Dp __d, _Alloc __a)
100	: __ptr_(__p), __deleter_(std::move(__d)), __alloc_(std::move(__a)) {}	100	: __alloc_(std::move(__a)), __deleter_(std::move(__d)), __ptr_(__p) {}
101		101
102	#if _LIBCPP_HAS_RTTI	102	#if _LIBCPP_HAS_RTTI
103	_LIBCPP_HIDE_FROM_ABI_VIRTUAL const void* __get_deleter(const type_info&) const _NOEXCEPT override;	103	_LIBCPP_HIDE_FROM_ABI_VIRTUAL const void* __get_deleter(const type_info& __t) const _NOEXCEPT override {
		104	return __t == typeid(_Dp) ? std::addressof(__deleter_) : nullptr;
		105	}
104	#endif	106	#endif
105		107
106	private:	108	private:
107	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared() _NOEXCEPT override;	109	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared() _NOEXCEPT override {
108	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared_weak() _NOEXCEPT override;	110	__deleter_(__ptr_);
109	};	111	__ptr_.~_Tp();
110		112	__deleter_.~_Dp();
111	#if _LIBCPP_HAS_RTTI	113	}
112
113	template <class _Tp, class _Dp, class _Alloc>
114	const void* __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__get_deleter(const type_info& __t) const _NOEXCEPT {
115	return __t == typeid(_Dp) ? std::addressof(__deleter_) : nullptr;
116	}
117
118	#endif // _LIBCPP_HAS_RTTI
119		114
120	template <class _Tp, class _Dp, class _Alloc>	115	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared_weak() _NOEXCEPT override {
121	void __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared() _NOEXCEPT {	116	using __alloc_t = __allocator_traits_rebind_t<_Alloc, __shared_ptr_pointer>;
122	__deleter_(__ptr_);
123	__deleter_.~_Dp();
124	}
125		117
126	template <class _Tp, class _Dp, class _Alloc>	118	__alloc_t __a(__alloc_);
127	void __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT {	119	__alloc_.~_Alloc();
128	typedef typename __allocator_traits_rebind<_Alloc, __shared_ptr_pointer>::type _Al;	120	__a.deallocate(pointer_traits<typename allocator_traits<__alloc_t>::pointer>::pointer_to(*this), 1);
129	typedef allocator_traits<_Al> _ATraits;	121	}
130	typedef pointer_traits<typename _ATraits::pointer> _PTraits;	122	};
131
132	_Al __a(__alloc_);
133	__alloc_.~_Alloc();
134	__a.deallocate(_PTraits::pointer_to(*this), 1);
135	}
136		123
137	// This tag is used to instantiate an allocator type. The various shared_ptr control blocks	124	// This tag is used to instantiate an allocator type. The various shared_ptr control blocks
138	// detect that the allocator has been instantiated for this type and perform alternative	125	// detect that the allocator has been instantiated for this type and perform alternative
...	@@ -140,79 +127,54 @@ void __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT {	...	@@ -140,79 +127,54 @@ void __shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT {
140	struct __for_overwrite_tag {};	127	struct __for_overwrite_tag {};
141		128
142	template <class _Tp, class _Alloc>	129	template <class _Tp, class _Alloc>
143	struct __shared_ptr_emplace : __shared_weak_count {	130	struct _LIBCPP_HIDE_STRUCT_FROM_ABI __shared_ptr_emplace : __shared_weak_count {
144	using __value_type _LIBCPP_NODEBUG = __remove_cv_t<_Tp>;	131	using __alloc_traits _LIBCPP_NODEBUG = allocator_traits<_Alloc>;
		132	using __value_type _LIBCPP_NODEBUG = __remove_cv_t<_Tp>;
145		133
146	template <class... _Args,	134	template <class... _Args>
147	class _Allocator = _Alloc,	135	_LIBCPP_HIDE_FROM_ABI explicit __shared_ptr_emplace(_Alloc __a, _Args&&... __args) : __alloc_(std::move(__a)) {
148	__enable_if_t<is_same<typename _Allocator::value_type, __for_overwrite_tag>::value, int> = 0>	136	allocator_traits<_Alloc>::construct(__alloc_, __get_elem(), std::forward<_Args>(__args)...);
149	_LIBCPP_HIDE_FROM_ABI explicit __shared_ptr_emplace(_Alloc __a, _Args&&...) : __storage_(std::move(__a)) {
150	static_assert(
151	sizeof...(_Args) == 0, "No argument should be provided to the control block when using _for_overwrite");
152	::new (static_cast<void*>(__get_elem())) __value_type;
153	}	137	}
154		138
155	template <class... _Args,	139	_LIBCPP_HIDE_FROM_ABI __value_type* __get_elem() _NOEXCEPT { return reinterpret_cast<__value_type*>(__buffer_); }
156	class _Allocator = _Alloc,
157	__enable_if_t<!is_same<typename _Allocator::value_type, __for_overwrite_tag>::value, int> = 0>
158	_LIBCPP_HIDE_FROM_ABI explicit __shared_ptr_emplace(_Alloc __a, _Args&&... __args) : __storage_(std::move(__a)) {
159	using _TpAlloc = typename __allocator_traits_rebind<_Alloc, __value_type>::type;
160	_TpAlloc __tmp(*__get_alloc());
161	allocator_traits<_TpAlloc>::construct(__tmp, __get_elem(), std::forward<_Args>(__args)...);
162	}
163
164	_LIBCPP_HIDE_FROM_ABI _Alloc* __get_alloc() _NOEXCEPT { return __storage_.__get_alloc(); }
165
166	_LIBCPP_HIDE_FROM_ABI __value_type* __get_elem() _NOEXCEPT { return __storage_.__get_elem(); }
167		140
168	private:	141	private:
169	template <class _Allocator = _Alloc,	142	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared() _NOEXCEPT override {
170	__enable_if_t<is_same<typename _Allocator::value_type, __for_overwrite_tag>::value, int> = 0>	143	allocator_traits<_Alloc>::destroy(__alloc_, __get_elem());
171	_LIBCPP_HIDE_FROM_ABI void __on_zero_shared_impl() _NOEXCEPT {
172	__get_elem()->~__value_type();
173	}
174
175	template <class _Allocator = _Alloc,
176	__enable_if_t<!is_same<typename _Allocator::value_type, __for_overwrite_tag>::value, int> = 0>
177	_LIBCPP_HIDE_FROM_ABI void __on_zero_shared_impl() _NOEXCEPT {
178	using _TpAlloc = typename __allocator_traits_rebind<_Allocator, __remove_cv_t<_Tp> >::type;
179	_TpAlloc __tmp(*__get_alloc());
180	allocator_traits<_TpAlloc>::destroy(__tmp, __get_elem());
181	}	144	}
182		145
183	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared() _NOEXCEPT override { __on_zero_shared_impl(); }
184
185	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared_weak() _NOEXCEPT override {	146	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared_weak() _NOEXCEPT override {
186	using _ControlBlockAlloc = typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type;	147	using __alloc_t = __allocator_traits_rebind_t<_Alloc, __shared_ptr_emplace>;
187	using _ControlBlockPointer = typename allocator_traits<_ControlBlockAlloc>::pointer;	148	__alloc_t __tmp(__alloc_);
188	_ControlBlockAlloc __tmp(*__get_alloc());	149	__alloc_.~_Alloc();
189	__storage_.~_Storage();	150	allocator_traits<__alloc_t>::deallocate(
190	allocator_traits<_ControlBlockAlloc>::deallocate(__tmp, pointer_traits<_ControlBlockPointer>::pointer_to(*this), 1);	151	__tmp, pointer_traits<typename allocator_traits<__alloc_t>::pointer>::pointer_to(*this), 1);
191	}	152	}
192		153
193	// TODO: It should be possible to refactor this to remove `_Storage` entirely.	154	_LIBCPP_NO_UNIQUE_ADDRESS _Alloc __alloc_;
194	// This class implements the control block for non-array shared pointers created	155	_ALIGNAS_TYPE(__value_type) char __buffer_[sizeof(__value_type)];
195	// through `std::allocate_shared` and `std::make_shared`.	156	};
196	struct _Storage {
197	struct _Data {
198	_LIBCPP_COMPRESSED_PAIR(_Alloc, __alloc_, __value_type, __elem_);
199	};
200		157
201	_ALIGNAS_TYPE(_Data) char __buffer_[sizeof(_Data)];	158	template <class _Tp, class _Alloc>
		159	struct _LIBCPP_HIDE_STRUCT_FROM_ABI __shared_ptr_emplace_for_overwrite : __shared_weak_count {
		160	using __value_type _LIBCPP_NODEBUG = __remove_cv_t<_Tp>;
202		161
203	_LIBCPP_HIDE_FROM_ABI explicit _Storage(_Alloc&& __a) { ::new ((void*)__get_alloc()) _Alloc(std::move(__a)); }	162	_LIBCPP_HIDE_FROM_ABI explicit __shared_ptr_emplace_for_overwrite(_Alloc __a) : __alloc_(std::move(__a)) {}
204	_LIBCPP_HIDE_FROM_ABI ~_Storage() { __get_alloc()->~_Alloc(); }
205		163
206	_LIBCPP_HIDE_FROM_ABI _Alloc* __get_alloc() _NOEXCEPT {	164	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared() _NOEXCEPT override { __value_.~__value_type(); }
207	return std::addressof(reinterpret_cast<_Data*>(__buffer_)->__alloc_);	165	_LIBCPP_HIDE_FROM_ABI_VIRTUAL void __on_zero_shared_weak() _NOEXCEPT override {
208	}	166	using __alloc_t = __allocator_traits_rebind_t<_Alloc, __shared_ptr_emplace_for_overwrite>;
		167	using __alloc_traits = allocator_traits<__alloc_t>;
		168	__alloc_t __tmp(__alloc_);
		169	__alloc_.~_Alloc();
		170	__alloc_traits::deallocate(__tmp, pointer_traits<typename __alloc_traits::pointer>::pointer_to(*this), 1);
		171	}
209		172
210	_LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_CFI __value_type* __get_elem() _NOEXCEPT {	173	_LIBCPP_HIDE_FROM_ABI __value_type* __get_elem() _NOEXCEPT { return std::addressof(__value_); }
211	return std::addressof(reinterpret_cast<_Data*>(__buffer_)->__elem_);
212	}
213	};
214		174
215	_Storage __storage_;	175	private:
		176	_LIBCPP_NO_UNIQUE_ADDRESS _Alloc __alloc_;
		177	_LIBCPP_NO_UNIQUE_ADDRESS __value_type __value_;
216	};	178	};
217		179
218	struct __shared_ptr_dummy_rebind_allocator_type;	180	struct __shared_ptr_dummy_rebind_allocator_type;
...	@@ -233,16 +195,16 @@ class enable_shared_from_this;	...	@@ -233,16 +195,16 @@ class enable_shared_from_this;
233	// when either Y* is convertible to T* or Y is U[N] and T is cv U[].	195	// when either Y* is convertible to T* or Y is U[N] and T is cv U[].
234	#if _LIBCPP_STD_VER >= 17	196	#if _LIBCPP_STD_VER >= 17
235	template <class _Yp, class _Tp>	197	template <class _Yp, class _Tp>
236	struct __bounded_convertible_to_unbounded : false_type {};	198	inline const bool __bounded_convertible_to_unbounded_v = false;
237		199
238	template <class _Up, std::size_t _Np, class _Tp>	200	template <class _Up, std::size_t _Np, class _Tp>
239	struct __bounded_convertible_to_unbounded<_Up[_Np], _Tp> : is_same<__remove_cv_t<_Tp>, _Up[]> {};	201	inline const bool __bounded_convertible_to_unbounded_v<_Up[_Np], _Tp> = is_same_v<remove_cv_t<_Tp>, _Up[]>;
240		202
241	template <class _Yp, class _Tp>	203	template <class _Yp, class _Tp>
242	struct __compatible_with : _Or< is_convertible<_Yp, _Tp>, __bounded_convertible_to_unbounded<_Yp, _Tp> > {};	204	inline const bool __compatible_with_v = is_convertible_v<_Yp, _Tp> \|\| __bounded_convertible_to_unbounded_v<_Yp, _Tp>;
243	#else	205	#else
244	template <class _Yp, class _Tp>	206	template <class _Yp, class _Tp>
245	struct __compatible_with : is_convertible<_Yp, _Tp> {};	207	inline const bool __compatible_with_v = is_convertible<_Yp, _Tp>::value;
246	#endif // _LIBCPP_STD_VER >= 17	208	#endif // _LIBCPP_STD_VER >= 17
247		209
248	// Constructors that take raw pointers have a different set of "compatible" constraints	210	// Constructors that take raw pointers have a different set of "compatible" constraints
...	@@ -252,49 +214,46 @@ struct __compatible_with : is_convertible<_Yp, _Tp> {};	...	@@ -252,49 +214,46 @@ struct __compatible_with : is_convertible<_Yp, _Tp> {};
252	// - If T is not an array type, then Y* is convertible to T*.	214	// - If T is not an array type, then Y* is convertible to T*.
253	#if _LIBCPP_STD_VER >= 17	215	#if _LIBCPP_STD_VER >= 17
254	template <class _Yp, class _Tp, class = void>	216	template <class _Yp, class _Tp, class = void>
255	struct __raw_pointer_compatible_with : _And< _Not<is_array<_Tp>>, is_convertible<_Yp, _Tp> > {};	217	inline const bool __raw_pointer_compatible_with_v = !is_array_v<_Tp> && is_convertible_v<_Yp, _Tp>;
256		218
257	template <class _Yp, class _Up, std::size_t _Np>	219	template <class _Yp, class _Up, std::size_t _Np>
258	struct __raw_pointer_compatible_with<_Yp, _Up[_Np], __enable_if_t< is_convertible<_Yp ()[_Np], _Up ()[_Np]>::value> >	220	inline const bool
259	: true_type {};	221	__raw_pointer_compatible_with_v<_Yp, _Up[_Np], enable_if_t<is_convertible_v<_Yp ()[_Np], _Up ()[_Np]>>> = true;
260		222
261	template <class _Yp, class _Up>	223	template <class _Yp, class _Up>
262	struct __raw_pointer_compatible_with<_Yp, _Up[], __enable_if_t< is_convertible<_Yp ()[], _Up ()[]>::value> >	224	inline const bool __raw_pointer_compatible_with_v<_Yp, _Up[], enable_if_t<is_convertible_v<_Yp ()[], _Up ()[]>>> =
263	: true_type {};	225	true;
264		226
265	#else	227	#else
266	template <class _Yp, class _Tp>	228	template <class _Yp, class _Tp>
267	struct __raw_pointer_compatible_with : is_convertible<_Yp, _Tp> {};	229	inline const bool __raw_pointer_compatible_with_v = is_convertible<_Yp, _Tp>::value;
268	#endif // _LIBCPP_STD_VER >= 17	230	#endif // _LIBCPP_STD_VER >= 17
269		231
270	template <class _Ptr, class = void>	232	template <class _Ptr, class = void>
271	struct __is_deletable : false_type {};	233	inline const bool __is_deletable_v = false;
272	template <class _Ptr>	234	template <class _Ptr>
273	struct __is_deletable<_Ptr, decltype(delete std::declval<_Ptr>())> : true_type {};	235	inline const bool __is_deletable_v<_Ptr, decltype(delete std::declval<_Ptr>())> = true;
274		236
275	template <class _Ptr, class = void>	237	template <class _Ptr, class = void>
276	struct __is_array_deletable : false_type {};	238	inline const bool __is_array_deletable_v = false;
277	template <class _Ptr>	239	template <class _Ptr>
278	struct __is_array_deletable<_Ptr, decltype(delete[] std::declval<_Ptr>())> : true_type {};	240	inline const bool __is_array_deletable_v<_Ptr, decltype(delete[] std::declval<_Ptr>())> = true;
279
280	template <class _Dp, class _Pt, class = decltype(std::declval<_Dp>()(std::declval<_Pt>()))>
281	true_type __well_formed_deleter_test(int);
282		241
283	template <class, class>	242	template <class _Dp, class _Pt, class = void>
284	false_type __well_formed_deleter_test(...);	243	inline const bool __well_formed_deleter_v = false;
285		244
286	template <class _Dp, class _Pt>	245	template <class _Dp, class _Pt>
287	struct __well_formed_deleter : decltype(std::__well_formed_deleter_test<_Dp, _Pt>(0)) {};	246	inline const bool __well_formed_deleter_v<_Dp, _Pt, __void_t<decltype(std::declval<_Dp>()(std::declval<_Pt>()))> > =
		247	true;
288		248
289	template <class _Dp, class _Yp, class _Tp>	249	template <class _Dp, class _Yp, class _Tp>
290	struct __shared_ptr_deleter_ctor_reqs {	250	inline const bool __shared_ptr_deleter_ctor_reqs_v =
291	static const bool value = __raw_pointer_compatible_with<_Yp, _Tp>::value && is_move_constructible<_Dp>::value &&	251	__raw_pointer_compatible_with_v<_Yp, _Tp> && is_move_constructible<_Dp>::value &&
292	__well_formed_deleter<_Dp, _Yp*>::value;	252	__well_formed_deleter_v<_Dp, _Yp*>;
293	};
294		253
295	template <class _Dp>	254	template <class _Dp>
296	using __shared_ptr_nullptr_deleter_ctor_reqs _LIBCPP_NODEBUG =	255	inline const bool __shared_ptr_nullptr_deleter_ctor_reqs_v =
297	_And<is_move_constructible<_Dp>, __well_formed_deleter<_Dp, nullptr_t> >;	256	is_move_constructible<_Dp>::value && __well_formed_deleter_v<_Dp, nullptr_t>;
298		257
299	#if defined(_LIBCPP_ABI_ENABLE_SHARED_PTR_TRIVIAL_ABI)	258	#if defined(_LIBCPP_ABI_ENABLE_SHARED_PTR_TRIVIAL_ABI)
300	# define _LIBCPP_SHARED_PTR_TRIVIAL_ABI __attribute__((__trivial_abi__))	259	# define _LIBCPP_SHARED_PTR_TRIVIAL_ABI __attribute__((__trivial_abi__))
...	@@ -328,16 +287,15 @@ public:	...	@@ -328,16 +287,15 @@ public:
328	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR shared_ptr(nullptr_t) _NOEXCEPT : __ptr_(nullptr), __cntrl_(nullptr) {}	287	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR shared_ptr(nullptr_t) _NOEXCEPT : __ptr_(nullptr), __cntrl_(nullptr) {}
329		288
330	template <class _Yp,	289	template <class _Yp,
331	__enable_if_t< _And< __raw_pointer_compatible_with<_Yp, _Tp>	290	__enable_if_t<__raw_pointer_compatible_with_v<_Yp, _Tp>
332	// In C++03 we get errors when trying to do SFINAE with the	291	// In C++03 we get errors when trying to do SFINAE with the
333	// delete operator, so we always pretend that it's deletable.	292	// delete operator, so we always pretend that it's deletable.
334	// The same happens on GCC.	293	// The same happens on GCC.
335	#if !defined(_LIBCPP_CXX03_LANG) && !defined(_LIBCPP_COMPILER_GCC)	294	#if !defined(_LIBCPP_CXX03_LANG)
336	,	295	&& (is_array<_Tp>::value ? __is_array_deletable_v<_Yp> : __is_deletable_v<_Yp>)
337	_If<is_array<_Tp>::value, __is_array_deletable<_Yp>, __is_deletable<_Yp> >
338	#endif	296	#endif
339	>::value,	297	,
340	int> = 0>	298	int> = 0>
341	_LIBCPP_HIDE_FROM_ABI explicit shared_ptr(_Yp* __p) : __ptr_(__p) {	299	_LIBCPP_HIDE_FROM_ABI explicit shared_ptr(_Yp* __p) : __ptr_(__p) {
342	unique_ptr<_Yp> __hold(__p);	300	unique_ptr<_Yp> __hold(__p);
343	typedef typename __shared_ptr_default_allocator<_Yp>::type _AllocT;	301	typedef typename __shared_ptr_default_allocator<_Yp>::type _AllocT;
...	@@ -347,7 +305,7 @@ public:	...	@@ -347,7 +305,7 @@ public:
347	__enable_weak_this(__p, __p);	305	__enable_weak_this(__p, __p);
348	}	306	}
349		307
350	template <class _Yp, class _Dp, __enable_if_t<__shared_ptr_deleter_ctor_reqs<_Dp, _Yp, _Tp>::value, int> = 0>	308	template <class _Yp, class _Dp, __enable_if_t<__shared_ptr_deleter_ctor_reqs_v<_Dp, _Yp, _Tp>, int> = 0>
351	_LIBCPP_HIDE_FROM_ABI shared_ptr(_Yp* __p, _Dp __d) : __ptr_(__p) {	309	_LIBCPP_HIDE_FROM_ABI shared_ptr(_Yp* __p, _Dp __d) : __ptr_(__p) {
352	auto __guard = std::__make_exception_guard([&] { __d(__p); });	310	auto __guard = std::__make_exception_guard([&] { __d(__p); });
353	typedef typename __shared_ptr_default_allocator<_Yp>::type _AllocT;	311	typedef typename __shared_ptr_default_allocator<_Yp>::type _AllocT;
...	@@ -361,10 +319,7 @@ public:	...	@@ -361,10 +319,7 @@ public:
361	__guard.__complete();	319	__guard.__complete();
362	}	320	}
363		321
364	template <class _Yp,	322	template <class _Yp, class _Dp, class _Alloc, __enable_if_t<__shared_ptr_deleter_ctor_reqs_v<_Dp, _Yp, _Tp>, int> = 0>
365	class _Dp,
366	class _Alloc,
367	__enable_if_t<__shared_ptr_deleter_ctor_reqs<_Dp, _Yp, _Tp>::value, int> = 0>
368	_LIBCPP_HIDE_FROM_ABI shared_ptr(_Yp* __p, _Dp __d, _Alloc __a) : __ptr_(__p) {	323	_LIBCPP_HIDE_FROM_ABI shared_ptr(_Yp* __p, _Dp __d, _Alloc __a) : __ptr_(__p) {
369	auto __guard = std::__make_exception_guard([&] { __d(__p); });	324	auto __guard = std::__make_exception_guard([&] { __d(__p); });
370	typedef __shared_ptr_pointer<_Yp*, _Dp, _Alloc> _CntrlBlk;	325	typedef __shared_ptr_pointer<_Yp*, _Dp, _Alloc> _CntrlBlk;
...	@@ -387,7 +342,7 @@ public:	...	@@ -387,7 +342,7 @@ public:
387	_LIBCPP_HIDE_FROM_ABI shared_ptr(	342	_LIBCPP_HIDE_FROM_ABI shared_ptr(
388	nullptr_t __p,	343	nullptr_t __p,
389	_Dp __d,	344	_Dp __d,
390	__enable_if_t<__shared_ptr_nullptr_deleter_ctor_reqs<_Dp>::value, __nullptr_sfinae_tag> = __nullptr_sfinae_tag())	345	__enable_if_t<__shared_ptr_nullptr_deleter_ctor_reqs_v<_Dp>, __nullptr_sfinae_tag> = __nullptr_sfinae_tag())
391	: __ptr_(nullptr) {	346	: __ptr_(nullptr) {
392	auto __guard = std::__make_exception_guard([&] { __d(__p); });	347	auto __guard = std::__make_exception_guard([&] { __d(__p); });
393	typedef typename __shared_ptr_default_allocator<_Tp>::type _AllocT;	348	typedef typename __shared_ptr_default_allocator<_Tp>::type _AllocT;
...	@@ -405,7 +360,7 @@ public:	...	@@ -405,7 +360,7 @@ public:
405	nullptr_t __p,	360	nullptr_t __p,
406	_Dp __d,	361	_Dp __d,
407	_Alloc __a,	362	_Alloc __a,
408	__enable_if_t<__shared_ptr_nullptr_deleter_ctor_reqs<_Dp>::value, __nullptr_sfinae_tag> = __nullptr_sfinae_tag())	363	__enable_if_t<__shared_ptr_nullptr_deleter_ctor_reqs_v<_Dp>, __nullptr_sfinae_tag> = __nullptr_sfinae_tag())
409	: __ptr_(nullptr) {	364	: __ptr_(nullptr) {
410	auto __guard = std::__make_exception_guard([&] { __d(__p); });	365	auto __guard = std::__make_exception_guard([&] { __d(__p); });
411	typedef __shared_ptr_pointer<nullptr_t, _Dp, _Alloc> _CntrlBlk;	366	typedef __shared_ptr_pointer<nullptr_t, _Dp, _Alloc> _CntrlBlk;
...	@@ -447,7 +402,7 @@ public:	...	@@ -447,7 +402,7 @@ public:
447	__cntrl_->__add_shared();	402	__cntrl_->__add_shared();
448	}	403	}
449		404
450	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	405	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
451	_LIBCPP_HIDE_FROM_ABI shared_ptr(const shared_ptr<_Yp>& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {	406	_LIBCPP_HIDE_FROM_ABI shared_ptr(const shared_ptr<_Yp>& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {
452	if (__cntrl_)	407	if (__cntrl_)
453	__cntrl_->__add_shared();	408	__cntrl_->__add_shared();
...	@@ -458,13 +413,13 @@ public:	...	@@ -458,13 +413,13 @@ public:
458	__r.__cntrl_ = nullptr;	413	__r.__cntrl_ = nullptr;
459	}	414	}
460		415
461	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	416	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
462	_LIBCPP_HIDE_FROM_ABI shared_ptr(shared_ptr<_Yp>&& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {	417	_LIBCPP_HIDE_FROM_ABI shared_ptr(shared_ptr<_Yp>&& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {
463	__r.__ptr_ = nullptr;	418	__r.__ptr_ = nullptr;
464	__r.__cntrl_ = nullptr;	419	__r.__cntrl_ = nullptr;
465	}	420	}
466		421
467	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	422	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
468	_LIBCPP_HIDE_FROM_ABI explicit shared_ptr(const weak_ptr<_Yp>& __r)	423	_LIBCPP_HIDE_FROM_ABI explicit shared_ptr(const weak_ptr<_Yp>& __r)
469	: __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_ ? __r.__cntrl_->lock() : __r.__cntrl_) {	424	: __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_ ? __r.__cntrl_->lock() : __r.__cntrl_) {
470	if (__cntrl_ == nullptr)	425	if (__cntrl_ == nullptr)
...	@@ -483,7 +438,7 @@ public:	...	@@ -483,7 +438,7 @@ public:
483		438
484	template <class _Yp,	439	template <class _Yp,
485	class _Dp,	440	class _Dp,
486	__enable_if_t<__compatible_with<_Yp, _Tp>::value &&	441	__enable_if_t<__compatible_with_v<_Yp, _Tp> &&
487	is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,	442	is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
488	int> = 0>	443	int> = 0>
489	_LIBCPP_HIDE_FROM_ABI shared_ptr(unique_ptr<_Yp, _Dp>&& __r) : __ptr_(__r.get()) {	444	_LIBCPP_HIDE_FROM_ABI shared_ptr(unique_ptr<_Yp, _Dp>&& __r) : __ptr_(__r.get()) {
...	@@ -506,7 +461,7 @@ public:	...	@@ -506,7 +461,7 @@ public:
506	return *this;	461	return *this;
507	}	462	}
508		463
509	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	464	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
510	_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>& operator=(const shared_ptr<_Yp>& __r) _NOEXCEPT {	465	_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>& operator=(const shared_ptr<_Yp>& __r) _NOEXCEPT {
511	shared_ptr(__r).swap(*this);	466	shared_ptr(__r).swap(*this);
512	return *this;	467	return *this;
...	@@ -517,7 +472,7 @@ public:	...	@@ -517,7 +472,7 @@ public:
517	return *this;	472	return *this;
518	}	473	}
519		474
520	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	475	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
521	_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>& operator=(shared_ptr<_Yp>&& __r) {	476	_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>& operator=(shared_ptr<_Yp>&& __r) {
522	shared_ptr(std::move(__r)).swap(*this);	477	shared_ptr(std::move(__r)).swap(*this);
523	return *this;	478	return *this;
...	@@ -535,8 +490,8 @@ public:	...	@@ -535,8 +490,8 @@ public:
535		490
536	template <class _Yp,	491	template <class _Yp,
537	class _Dp,	492	class _Dp,
538	__enable_if_t<_And< __compatible_with<_Yp, _Tp>,	493	__enable_if_t<__compatible_with_v<_Yp, _Tp> &&
539	is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*> >::value,	494	is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
540	int> = 0>	495	int> = 0>
541	_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>& operator=(unique_ptr<_Yp, _Dp>&& __r) {	496	_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp>& operator=(unique_ptr<_Yp, _Dp>&& __r) {
542	shared_ptr(std::move(__r)).swap(*this);	497	shared_ptr(std::move(__r)).swap(*this);
...	@@ -550,20 +505,17 @@ public:	...	@@ -550,20 +505,17 @@ public:
550		505
551	_LIBCPP_HIDE_FROM_ABI void reset() _NOEXCEPT { shared_ptr().swap(*this); }	506	_LIBCPP_HIDE_FROM_ABI void reset() _NOEXCEPT { shared_ptr().swap(*this); }
552		507
553	template <class _Yp, __enable_if_t<__raw_pointer_compatible_with<_Yp, _Tp>::value, int> = 0>	508	template <class _Yp, __enable_if_t<__raw_pointer_compatible_with_v<_Yp, _Tp>, int> = 0>
554	_LIBCPP_HIDE_FROM_ABI void reset(_Yp* __p) {	509	_LIBCPP_HIDE_FROM_ABI void reset(_Yp* __p) {
555	shared_ptr(__p).swap(*this);	510	shared_ptr(__p).swap(*this);
556	}	511	}
557		512
558	template <class _Yp, class _Dp, __enable_if_t<__shared_ptr_deleter_ctor_reqs<_Dp, _Yp, _Tp>::value, int> = 0>	513	template <class _Yp, class _Dp, __enable_if_t<__shared_ptr_deleter_ctor_reqs_v<_Dp, _Yp, _Tp>, int> = 0>
559	_LIBCPP_HIDE_FROM_ABI void reset(_Yp* __p, _Dp __d) {	514	_LIBCPP_HIDE_FROM_ABI void reset(_Yp* __p, _Dp __d) {
560	shared_ptr(__p, __d).swap(*this);	515	shared_ptr(__p, __d).swap(*this);
561	}	516	}
562		517
563	template <class _Yp,	518	template <class _Yp, class _Dp, class _Alloc, __enable_if_t<__shared_ptr_deleter_ctor_reqs_v<_Dp, _Yp, _Tp>, int> = 0>
564	class _Dp,
565	class _Alloc,
566	__enable_if_t<__shared_ptr_deleter_ctor_reqs<_Dp, _Yp, _Tp>::value, int> = 0>
567	_LIBCPP_HIDE_FROM_ABI void reset(_Yp* __p, _Dp __d, _Alloc __a) {	519	_LIBCPP_HIDE_FROM_ABI void reset(_Yp* __p, _Dp __d, _Alloc __a) {
568	shared_ptr(__p, __d, __a).swap(*this);	520	shared_ptr(__p, __d, __a).swap(*this);
569	}	521	}
...	@@ -647,7 +599,26 @@ private:	...	@@ -647,7 +599,26 @@ private:
647	}	599	}
648	}	600	}
649		601
650	_LIBCPP_HIDE_FROM_ABI void __enable_weak_this(...) _NOEXCEPT {}	602	template <class _Vp>
		603	static __type_identity<_Vp> __get_shared_from_this_impl(const enable_shared_from_this<_Vp>*);
		604
		605	template <class _Vp, class = void>
		606	struct __get_shared_from_this {
		607	using type _LIBCPP_NODEBUG = __nat;
		608	};
		609
		610	template <class _Vp>
		611	struct __get_shared_from_this<_Vp, __void_t<decltype(__get_shared_from_this_impl(static_cast<_Vp*>(nullptr)))> > {
		612	using type _LIBCPP_NODEBUG = const enable_shared_from_this<typename decltype(__get_shared_from_this_impl(
		613	static_cast<_Vp>(nullptr)))::type>;
		614	};
		615
		616	template <
		617	class _Yp,
		618	class _OrigPtr,
		619	__enable_if_t<!is_convertible<_OrigPtr, typename __get_shared_from_this<__remove_pointer_t<_Yp> >::type>::value,
		620	int> = 0>
		621	_LIBCPP_HIDE_FROM_ABI void __enable_weak_this(_Yp, _OrigPtr) {}
651		622
652	template <class, class _Yp>	623	template <class, class _Yp>
653	struct __shared_ptr_default_delete : default_delete<_Yp> {};	624	struct __shared_ptr_default_delete : default_delete<_Yp> {};
...	@@ -674,15 +645,22 @@ shared_ptr(unique_ptr<_Tp, _Dp>) -> shared_ptr<_Tp>;	...	@@ -674,15 +645,22 @@ shared_ptr(unique_ptr<_Tp, _Dp>) -> shared_ptr<_Tp>;
674	//	645	//
675	// std::allocate_shared and std::make_shared	646	// std::allocate_shared and std::make_shared
676	//	647	//
677	template <class _Tp, class _Alloc, class... _Args, __enable_if_t<!is_array<_Tp>::value, int> = 0>	648
678	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp> allocate_shared(const _Alloc& __a, _Args&&... __args) {	649	template <class _ControlBlock, class _Tp, class _Alloc, class... _Args>
679	using _ControlBlock = __shared_ptr_emplace<_Tp, _Alloc>;	650	_LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp> __allocate_shared_impl(const _Alloc& __alloc, _Args&&... __args) {
680	using _ControlBlockAllocator = typename __allocator_traits_rebind<_Alloc, _ControlBlock>::type;	651	using _ControlBlockAllocator = typename __allocator_traits_rebind<_Alloc, _ControlBlock>::type;
681	__allocation_guard<_ControlBlockAllocator> __guard(__a, 1);	652	__allocation_guard<_ControlBlockAllocator> __guard(__alloc, 1);
682	::new ((void)std::addressof(__guard.__get())) _ControlBlock(__a, std::forward<_Args>(__args)...);	653	::new ((void)std::addressof(__guard.__get())) _ControlBlock(__alloc, std::forward<_Args>(__args)...);
683	auto __control_block = __guard.__release_ptr();	654	auto __control_block = __guard.__release_ptr();
684	return shared_ptr<_Tp>::__create_with_control_block(	655	return shared_ptr<_Tp>::__create_with_control_block(
685	(__control_block).__get_elem(), std::addressof(__control_block));	656	__control_block->__get_elem(), std::__to_address(__control_block));
		657	}
		658
		659	template <class _Tp, class _Alloc, class... _Args, __enable_if_t<!is_array<_Tp>::value, int> = 0>
		660	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp> allocate_shared(const _Alloc& __a, _Args&&... __args) {
		661	using _CanonicalAlloc = __allocator_traits_rebind_t<_Alloc, __remove_cv_t<_Tp> >;
		662	using _ControlBlock = __shared_ptr_emplace<_Tp, _CanonicalAlloc>;
		663	return std::__allocate_shared_impl<_ControlBlock, _Tp>(_CanonicalAlloc(__a), std::forward<_Args>(__args)...);
686	}	664	}
687		665
688	template <class _Tp, class... _Args, __enable_if_t<!is_array<_Tp>::value, int> = 0>	666	template <class _Tp, class... _Args, __enable_if_t<!is_array<_Tp>::value, int> = 0>
...	@@ -694,9 +672,9 @@ template <class _Tp, class... _Args, __enable_if_t<!is_array<_Tp>::value, int> =	...	@@ -694,9 +672,9 @@ template <class _Tp, class... _Args, __enable_if_t<!is_array<_Tp>::value, int> =
694		672
695	template <class _Tp, class _Alloc, __enable_if_t<!is_array<_Tp>::value, int> = 0>	673	template <class _Tp, class _Alloc, __enable_if_t<!is_array<_Tp>::value, int> = 0>
696	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp> allocate_shared_for_overwrite(const _Alloc& __a) {	674	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp> allocate_shared_for_overwrite(const _Alloc& __a) {
697	using _ForOverwriteAllocator = __allocator_traits_rebind_t<_Alloc, __for_overwrite_tag>;	675	using _CanonicalAlloc = __allocator_traits_rebind_t<_Alloc, remove_cv_t<_Tp>>;
698	_ForOverwriteAllocator __alloc(__a);	676	using _ControlBlock = __shared_ptr_emplace_for_overwrite<_Tp, _CanonicalAlloc>;
699	return std::allocate_shared<_Tp>(__alloc);	677	return std::__allocate_shared_impl<_ControlBlock, _Tp>(_CanonicalAlloc(__a));
700	}	678	}
701		679
702	template <class _Tp, __enable_if_t<!is_array<_Tp>::value, int> = 0>	680	template <class _Tp, __enable_if_t<!is_array<_Tp>::value, int> = 0>
...	@@ -752,7 +730,7 @@ struct __unbounded_array_control_block<_Tp[], _Alloc> : __shared_weak_count {	...	@@ -752,7 +730,7 @@ struct __unbounded_array_control_block<_Tp[], _Alloc> : __shared_weak_count {
752	// [1]: https://en.wikipedia.org/wiki/Data_structure_alignment#Computing_padding	730	// [1]: https://en.wikipedia.org/wiki/Data_structure_alignment#Computing_padding
753	size_t __bytes = __elements == 0 ? sizeof(__unbounded_array_control_block)	731	size_t __bytes = __elements == 0 ? sizeof(__unbounded_array_control_block)
754	: (__elements - 1) * sizeof(_Tp) + sizeof(__unbounded_array_control_block);	732	: (__elements - 1) * sizeof(_Tp) + sizeof(__unbounded_array_control_block);
755	constexpr size_t __align = alignof(_Tp);	733	constexpr size_t __align = alignof(__unbounded_array_control_block);
756	return (__bytes + __align - 1) & ~(__align - 1);	734	return (__bytes + __align - 1) & ~(__align - 1);
757	}	735	}
758		736
...	@@ -1171,44 +1149,93 @@ private:	...	@@ -1171,44 +1149,93 @@ private:
1171	__shared_weak_count* __cntrl_;	1149	__shared_weak_count* __cntrl_;
1172		1150
1173	public:	1151	public:
1174	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR weak_ptr() _NOEXCEPT;	1152	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR weak_ptr() _NOEXCEPT : __ptr_(nullptr), __cntrl_(nullptr) {}
		1153
		1154	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
		1155	_LIBCPP_HIDE_FROM_ABI weak_ptr(shared_ptr<_Yp> const& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {
		1156	if (__cntrl_)
		1157	__cntrl_->__add_weak();
		1158	}
		1159
		1160	_LIBCPP_HIDE_FROM_ABI weak_ptr(weak_ptr const& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {
		1161	if (__cntrl_)
		1162	__cntrl_->__add_weak();
		1163	}
		1164
		1165	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
		1166	_LIBCPP_HIDE_FROM_ABI weak_ptr(weak_ptr<_Yp> const& __r) _NOEXCEPT : __ptr_(nullptr), __cntrl_(nullptr) {
		1167	shared_ptr<_Yp> __s = __r.lock();
		1168	*this = weak_ptr<_Tp>(__s);
		1169	}
1175		1170
1176	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	1171	_LIBCPP_HIDE_FROM_ABI weak_ptr(weak_ptr&& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {
1177	_LIBCPP_HIDE_FROM_ABI weak_ptr(shared_ptr<_Yp> const& __r) _NOEXCEPT;	1172	__r.__ptr_ = nullptr;
		1173	__r.__cntrl_ = nullptr;
		1174	}
1178		1175
1179	_LIBCPP_HIDE_FROM_ABI weak_ptr(weak_ptr const& __r) _NOEXCEPT;	1176	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
		1177	_LIBCPP_HIDE_FROM_ABI weak_ptr(weak_ptr<_Yp>&& __r) _NOEXCEPT : __ptr_(nullptr), __cntrl_(nullptr) {
		1178	shared_ptr<_Yp> __s = __r.lock();
		1179	*this = weak_ptr<_Tp>(__s);
		1180	__r.reset();
		1181	}
1180		1182
1181	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	1183	_LIBCPP_HIDE_FROM_ABI ~weak_ptr() {
1182	_LIBCPP_HIDE_FROM_ABI weak_ptr(weak_ptr<_Yp> const& __r) _NOEXCEPT;	1184	if (__cntrl_)
		1185	__cntrl_->__release_weak();
		1186	}
1183		1187
1184	_LIBCPP_HIDE_FROM_ABI weak_ptr(weak_ptr&& __r) _NOEXCEPT;	1188	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(weak_ptr const& __r) _NOEXCEPT {
		1189	weak_ptr(__r).swap(*this);
		1190	return *this;
		1191	}
1185		1192
1186	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	1193	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
1187	_LIBCPP_HIDE_FROM_ABI weak_ptr(weak_ptr<_Yp>&& __r) _NOEXCEPT;	1194	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(weak_ptr<_Yp> const& __r) _NOEXCEPT {
		1195	weak_ptr(__r).swap(*this);
		1196	return *this;
		1197	}
1188		1198
1189	_LIBCPP_HIDE_FROM_ABI ~weak_ptr();	1199	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(weak_ptr&& __r) _NOEXCEPT {
		1200	weak_ptr(std::move(__r)).swap(*this);
		1201	return *this;
		1202	}
1190		1203
1191	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(weak_ptr const& __r) _NOEXCEPT;	1204	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
1192	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	1205	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(weak_ptr<_Yp>&& __r) _NOEXCEPT {
1193	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(weak_ptr<_Yp> const& __r) _NOEXCEPT;	1206	weak_ptr(std::move(__r)).swap(*this);
		1207	return *this;
		1208	}
1194		1209
1195	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(weak_ptr&& __r) _NOEXCEPT;	1210	template <class _Yp, __enable_if_t<__compatible_with_v<_Yp, _Tp>, int> = 0>
1196	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	1211	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(shared_ptr<_Yp> const& __r) _NOEXCEPT {
1197	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(weak_ptr<_Yp>&& __r) _NOEXCEPT;	1212	weak_ptr(__r).swap(*this);
		1213	return *this;
		1214	}
1198		1215
1199	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> = 0>	1216	_LIBCPP_HIDE_FROM_ABI void swap(weak_ptr& __r) _NOEXCEPT {
1200	_LIBCPP_HIDE_FROM_ABI weak_ptr& operator=(shared_ptr<_Yp> const& __r) _NOEXCEPT;	1217	std::swap(__ptr_, __r.__ptr_);
		1218	std::swap(__cntrl_, __r.__cntrl_);
		1219	}
1201		1220
1202	_LIBCPP_HIDE_FROM_ABI void swap(weak_ptr& __r) _NOEXCEPT;	1221	_LIBCPP_HIDE_FROM_ABI void reset() _NOEXCEPT { weak_ptr().swap(*this); }
1203	_LIBCPP_HIDE_FROM_ABI void reset() _NOEXCEPT;
1204		1222
1205	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI long use_count() const _NOEXCEPT {	1223	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI long use_count() const _NOEXCEPT {
1206	return __cntrl_ ? __cntrl_->use_count() : 0;	1224	return __cntrl_ ? __cntrl_->use_count() : 0;
1207	}	1225	}
		1226
1208	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool expired() const _NOEXCEPT {	1227	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool expired() const _NOEXCEPT {
1209	return __cntrl_ == nullptr \|\| __cntrl_->use_count() == 0;	1228	return __cntrl_ == nullptr \|\| __cntrl_->use_count() == 0;
1210	}	1229	}
1211	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp> lock() const _NOEXCEPT;	1230
		1231	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI shared_ptr<_Tp> lock() const _NOEXCEPT {
		1232	shared_ptr<_Tp> __r;
		1233	__r.__cntrl_ = __cntrl_ ? __cntrl_->lock() : __cntrl_;
		1234	if (__r.__cntrl_)
		1235	__r.__ptr_ = __ptr_;
		1236	return __r;
		1237	}
		1238
1212	template <class _Up>	1239	template <class _Up>
1213	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool owner_before(const shared_ptr<_Up>& __r) const _NOEXCEPT {	1240	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool owner_before(const shared_ptr<_Up>& __r) const _NOEXCEPT {
1214	return __cntrl_ < __r.__cntrl_;	1241	return __cntrl_ < __r.__cntrl_;
...	@@ -1229,107 +1256,11 @@ template <class _Tp>	...	@@ -1229,107 +1256,11 @@ template <class _Tp>
1229	weak_ptr(shared_ptr<_Tp>) -> weak_ptr<_Tp>;	1256	weak_ptr(shared_ptr<_Tp>) -> weak_ptr<_Tp>;
1230	#endif	1257	#endif
1231		1258
1232	template <class _Tp>
1233	inline _LIBCPP_CONSTEXPR weak_ptr<_Tp>::weak_ptr() _NOEXCEPT : __ptr_(nullptr), __cntrl_(nullptr) {}
1234
1235	template <class _Tp>
1236	inline weak_ptr<_Tp>::weak_ptr(weak_ptr const& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {
1237	if (__cntrl_)
1238	__cntrl_->__add_weak();
1239	}
1240
1241	template <class _Tp>
1242	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> >
1243	inline weak_ptr<_Tp>::weak_ptr(shared_ptr<_Yp> const& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {
1244	if (__cntrl_)
1245	__cntrl_->__add_weak();
1246	}
1247
1248	template <class _Tp>
1249	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> >
1250	inline weak_ptr<_Tp>::weak_ptr(weak_ptr<_Yp> const& __r) _NOEXCEPT : __ptr_(nullptr), __cntrl_(nullptr) {
1251	shared_ptr<_Yp> __s = __r.lock();
1252	*this = weak_ptr<_Tp>(__s);
1253	}
1254
1255	template <class _Tp>
1256	inline weak_ptr<_Tp>::weak_ptr(weak_ptr&& __r) _NOEXCEPT : __ptr_(__r.__ptr_), __cntrl_(__r.__cntrl_) {
1257	__r.__ptr_ = nullptr;
1258	__r.__cntrl_ = nullptr;
1259	}
1260
1261	template <class _Tp>
1262	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> >
1263	inline weak_ptr<_Tp>::weak_ptr(weak_ptr<_Yp>&& __r) _NOEXCEPT : __ptr_(nullptr), __cntrl_(nullptr) {
1264	shared_ptr<_Yp> __s = __r.lock();
1265	*this = weak_ptr<_Tp>(__s);
1266	__r.reset();
1267	}
1268
1269	template <class _Tp>
1270	weak_ptr<_Tp>::~weak_ptr() {
1271	if (__cntrl_)
1272	__cntrl_->__release_weak();
1273	}
1274
1275	template <class _Tp>
1276	inline weak_ptr<_Tp>& weak_ptr<_Tp>::operator=(weak_ptr const& __r) _NOEXCEPT {
1277	weak_ptr(__r).swap(*this);
1278	return *this;
1279	}
1280
1281	template <class _Tp>
1282	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> >
1283	inline weak_ptr<_Tp>& weak_ptr<_Tp>::operator=(weak_ptr<_Yp> const& __r) _NOEXCEPT {
1284	weak_ptr(__r).swap(*this);
1285	return *this;
1286	}
1287
1288	template <class _Tp>
1289	inline weak_ptr<_Tp>& weak_ptr<_Tp>::operator=(weak_ptr&& __r) _NOEXCEPT {
1290	weak_ptr(std::move(__r)).swap(*this);
1291	return *this;
1292	}
1293
1294	template <class _Tp>
1295	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> >
1296	inline weak_ptr<_Tp>& weak_ptr<_Tp>::operator=(weak_ptr<_Yp>&& __r) _NOEXCEPT {
1297	weak_ptr(std::move(__r)).swap(*this);
1298	return *this;
1299	}
1300
1301	template <class _Tp>
1302	template <class _Yp, __enable_if_t<__compatible_with<_Yp, _Tp>::value, int> >
1303	inline weak_ptr<_Tp>& weak_ptr<_Tp>::operator=(shared_ptr<_Yp> const& __r) _NOEXCEPT {
1304	weak_ptr(__r).swap(*this);
1305	return *this;
1306	}
1307
1308	template <class _Tp>
1309	inline void weak_ptr<_Tp>::swap(weak_ptr& __r) _NOEXCEPT {
1310	std::swap(__ptr_, __r.__ptr_);
1311	std::swap(__cntrl_, __r.__cntrl_);
1312	}
1313
1314	template <class _Tp>	1259	template <class _Tp>
1315	inline _LIBCPP_HIDE_FROM_ABI void swap(weak_ptr<_Tp>& __x, weak_ptr<_Tp>& __y) _NOEXCEPT {	1260	inline _LIBCPP_HIDE_FROM_ABI void swap(weak_ptr<_Tp>& __x, weak_ptr<_Tp>& __y) _NOEXCEPT {
1316	__x.swap(__y);	1261	__x.swap(__y);
1317	}	1262	}
1318		1263
1319	template <class _Tp>
1320	inline void weak_ptr<_Tp>::reset() _NOEXCEPT {
1321	weak_ptr().swap(*this);
1322	}
1323
1324	template <class _Tp>
1325	shared_ptr<_Tp> weak_ptr<_Tp>::lock() const _NOEXCEPT {
1326	shared_ptr<_Tp> __r;
1327	__r.__cntrl_ = __cntrl_ ? __cntrl_->lock() : __cntrl_;
1328	if (__r.__cntrl_)
1329	__r.__ptr_ = __ptr_;
1330	return __r;
1331	}
1332
1333	#if _LIBCPP_STD_VER >= 17	1264	#if _LIBCPP_STD_VER >= 17
1334	template <class _Tp = void>	1265	template <class _Tp = void>
1335	struct owner_less;	1266	struct owner_less;
...	@@ -1536,6 +1467,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool atomic_compare_exchange_weak_explicit(	...	@@ -1536,6 +1467,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool atomic_compare_exchange_weak_explicit(
1536		1467
1537	#endif // _LIBCPP_HAS_THREADS	1468	#endif // _LIBCPP_HAS_THREADS
1538		1469
		1470	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
1539	_LIBCPP_END_NAMESPACE_STD	1471	_LIBCPP_END_NAMESPACE_STD
1540		1472
1541	_LIBCPP_POP_MACROS	1473	_LIBCPP_POP_MACROS

lib/libcxx/include/__memory/temporary_buffer.h+3

 @@ -26,6 +26,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_CFI _LIBCPP_DEPRECATED_IN_CXX17 pair<_Tp*, ptrdiff_t>
 get_temporary_buffer(ptrdiff_t __n) _NOEXCEPT {
+  if (__n <= 0)
+    return pair<_Tp*, ptrdiff_t>();
   __unique_temporary_buffer<_Tp> __unique_buf = std::__allocate_unique_temporary_buffer<_Tp>(__n);
   pair<_Tp*, ptrdiff_t> __result(__unique_buf.get(), __unique_buf.get_deleter().__count_);
   __unique_buf.release();

lib/libcxx/include/__memory/uninitialized_algorithms.h+53-192

 @@ -11,11 +11,10 @@
 #define _LIBCPP___MEMORY_UNINITIALIZED_ALGORITHMS_H
 #include <__algorithm/copy.h>
-#include <__algorithm/move.h>
+#include <__algorithm/in_out_result.h>
 #include <__algorithm/unwrap_iter.h>
 #include <__algorithm/unwrap_range.h>
 #include <__config>
-#include <__cstddef/size_t.h>
 #include <__fwd/memory.h>
 #include <__iterator/iterator_traits.h>
 #include <__iterator/reverse_iterator.h>
 @@ -25,15 +24,13 @@
 #include <__memory/destroy.h>
 #include <__memory/pointer_traits.h>
 #include <__type_traits/enable_if.h>
-#include <__type_traits/extent.h>
-#include <__type_traits/is_array.h>
 #include <__type_traits/is_constant_evaluated.h>
+#include <__type_traits/is_reference.h>
 #include <__type_traits/is_same.h>
 #include <__type_traits/is_trivially_assignable.h>
 #include <__type_traits/is_trivially_constructible.h>
 #include <__type_traits/is_trivially_relocatable.h>
 #include <__type_traits/remove_const.h>
-#include <__type_traits/remove_extent.h>
 #include <__utility/exception_guard.h>
 #include <__utility/move.h>
 #include <__utility/pair.h>
 @@ -57,7 +54,8 @@ struct __always_false {
 // uninitialized_copy
 template <class _ValueType, class _InputIterator, class _Sentinel1, class _ForwardIterator, class _EndPredicate>
-inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator> __uninitialized_copy(
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __in_out_result<_InputIterator, _ForwardIterator>
+__uninitialized_copy(
     _InputIterator __ifirst, _Sentinel1 __ilast, _ForwardIterator __ofirst, _EndPredicate __stop_copying) {
   _ForwardIterator __idx = __ofirst;
   auto __guard           = std::__make_exception_guard([&] { std::__destroy(__ofirst, __idx); });
 @@ -65,22 +63,22 @@ inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator> __uninitiali
     ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType(*__ifirst);
   __guard.__complete();
-  return pair<_InputIterator, _ForwardIterator>(std::move(__ifirst), std::move(__idx));
+  return {std::move(__ifirst), std::move(__idx)};
 }
 template <class _InputIterator, class _ForwardIterator>
-_LIBCPP_HIDE_FROM_ABI _ForwardIterator
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
 uninitialized_copy(_InputIterator __ifirst, _InputIterator __ilast, _ForwardIterator __ofirst) {
   typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
   auto __result = std::__uninitialized_copy<_ValueType>(
       std::move(__ifirst), std::move(__ilast), std::move(__ofirst), __always_false());
-  return std::move(__result.second);
+  return std::move(__result.__out_);
 }
 // uninitialized_copy_n
 template <class _ValueType, class _InputIterator, class _Size, class _ForwardIterator, class _EndPredicate>
-inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator>
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __in_out_result<_InputIterator, _ForwardIterator>
 __uninitialized_copy_n(_InputIterator __ifirst, _Size __n, _ForwardIterator __ofirst, _EndPredicate __stop_copying) {
   _ForwardIterator __idx = __ofirst;
   auto __guard           = std::__make_exception_guard([&] { std::__destroy(__ofirst, __idx); });
 @@ -88,22 +86,22 @@ __uninitialized_copy_n(_InputIterator __ifirst, _Size __n, _ForwardIterator __of
     ::new (static_cast<void*>(std::addressof(*__idx))) _ValueType(*__ifirst);
   __guard.__complete();
-  return pair<_InputIterator, _ForwardIterator>(std::move(__ifirst), std::move(__idx));
+  return {std::move(__ifirst), std::move(__idx)};
 }
 template <class _InputIterator, class _Size, class _ForwardIterator>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
 uninitialized_copy_n(_InputIterator __ifirst, _Size __n, _ForwardIterator __ofirst) {
   typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
   auto __result =
       std::__uninitialized_copy_n<_ValueType>(std::move(__ifirst), __n, std::move(__ofirst), __always_false());
-  return std::move(__result.second);
+  return std::move(__result.__out_);
 }
 // uninitialized_fill
 template <class _ValueType, class _ForwardIterator, class _Sentinel, class _Tp>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
 __uninitialized_fill(_ForwardIterator __first, _Sentinel __last, const _Tp& __x) {
   _ForwardIterator __idx = __first;
   auto __guard           = std::__make_exception_guard([&] { std::__destroy(__first, __idx); });
 @@ -115,7 +113,7 @@ __uninitialized_fill(_ForwardIterator __first, _Sentinel __last, const _Tp& __x)
 }
 template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_HIDE_FROM_ABI void
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
 uninitialized_fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __x) {
   typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
   (void)std::__uninitialized_fill<_ValueType>(__first, __last, __x);
 @@ -124,7 +122,7 @@ uninitialized_fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp&
 // uninitialized_fill_n
 template <class _ValueType, class _ForwardIterator, class _Size, class _Tp>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
 __uninitialized_fill_n(_ForwardIterator __first, _Size __n, const _Tp& __x) {
   _ForwardIterator __idx = __first;
   auto __guard           = std::__make_exception_guard([&] { std::__destroy(__first, __idx); });
 @@ -136,7 +134,7 @@ __uninitialized_fill_n(_ForwardIterator __first, _Size __n, const _Tp& __x) {
 }
 template <class _ForwardIterator, class _Size, class _Tp>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
 uninitialized_fill_n(_ForwardIterator __first, _Size __n, const _Tp& __x) {
   typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
   return std::__uninitialized_fill_n<_ValueType>(__first, __n, __x);
 @@ -144,10 +142,18 @@ uninitialized_fill_n(_ForwardIterator __first, _Size __n, const _Tp& __x) {
 #if _LIBCPP_STD_VER >= 17
+template <class _Iter>
+_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) __deref_move(_Iter& __it) {
+  if constexpr (is_lvalue_reference_v<decltype(*__it)>)
+    return std::move(*__it);
+  else
+    return *__it;
+}
 // uninitialized_default_construct
 template <class _ValueType, class _ForwardIterator, class _Sentinel>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
 __uninitialized_default_construct(_ForwardIterator __first, _Sentinel __last) {
   auto __idx   = __first;
   auto __guard = std::__make_exception_guard([&] { std::__destroy(__first, __idx); });
 @@ -159,7 +165,8 @@ __uninitialized_default_construct(_ForwardIterator __first, _Sentinel __last) {
 }
 template <class _ForwardIterator>
-inline _LIBCPP_HIDE_FROM_ABI void uninitialized_default_construct(_ForwardIterator __first, _ForwardIterator __last) {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+uninitialized_default_construct(_ForwardIterator __first, _ForwardIterator __last) {
   using _ValueType = typename iterator_traits<_ForwardIterator>::value_type;
   (void)std::__uninitialized_default_construct<_ValueType>(std::move(__first), std::move(__last));
 }
 @@ -167,7 +174,8 @@ inline _LIBCPP_HIDE_FROM_ABI void uninitialized_default_construct(_ForwardIterat
 // uninitialized_default_construct_n
 template <class _ValueType, class _ForwardIterator, class _Size>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator __uninitialized_default_construct_n(_ForwardIterator __first, _Size __n) {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
+__uninitialized_default_construct_n(_ForwardIterator __first, _Size __n) {
   auto __idx = __first;
   auto __guard = std::__make_exception_guard([&] { std::__destroy(__first, __idx); });
   for (; __n > 0; ++__idx, (void)--__n)
 @@ -178,7 +186,8 @@ inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator __uninitialized_default_construct_
 }
 template <class _ForwardIterator, class _Size>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator uninitialized_default_construct_n(_ForwardIterator __first, _Size __n) {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
+uninitialized_default_construct_n(_ForwardIterator __first, _Size __n) {
   using _ValueType = typename iterator_traits<_ForwardIterator>::value_type;
   return std::__uninitialized_default_construct_n<_ValueType>(std::move(__first), __n);
 }
 @@ -186,7 +195,7 @@ inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator uninitialized_default_construct_n(
 // uninitialized_value_construct
 template <class _ValueType, class _ForwardIterator, class _Sentinel>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
 __uninitialized_value_construct(_ForwardIterator __first, _Sentinel __last) {
   auto __idx   = __first;
   auto __guard = std::__make_exception_guard([&] { std::__destroy(__first, __idx); });
 @@ -198,7 +207,8 @@ __uninitialized_value_construct(_ForwardIterator __first, _Sentinel __last) {
 }
 template <class _ForwardIterator>
-inline _LIBCPP_HIDE_FROM_ABI void uninitialized_value_construct(_ForwardIterator __first, _ForwardIterator __last) {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+uninitialized_value_construct(_ForwardIterator __first, _ForwardIterator __last) {
   using _ValueType = typename iterator_traits<_ForwardIterator>::value_type;
   (void)std::__uninitialized_value_construct<_ValueType>(std::move(__first), std::move(__last));
 }
 @@ -206,7 +216,8 @@ inline _LIBCPP_HIDE_FROM_ABI void uninitialized_value_construct(_ForwardIterator
 // uninitialized_value_construct_n
 template <class _ValueType, class _ForwardIterator, class _Size>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator __uninitialized_value_construct_n(_ForwardIterator __first, _Size __n) {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
+__uninitialized_value_construct_n(_ForwardIterator __first, _Size __n) {
   auto __idx = __first;
   auto __guard = std::__make_exception_guard([&] { std::__destroy(__first, __idx); });
   for (; __n > 0; ++__idx, (void)--__n)
 @@ -217,7 +228,8 @@ inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator __uninitialized_value_construct_n(
 }
 template <class _ForwardIterator, class _Size>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator uninitialized_value_construct_n(_ForwardIterator __first, _Size __n) {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
+uninitialized_value_construct_n(_ForwardIterator __first, _Size __n) {
   using _ValueType = typename iterator_traits<_ForwardIterator>::value_type;
   return std::__uninitialized_value_construct_n<_ValueType>(std::move(__first), __n);
 }
 @@ -230,12 +242,12 @@ template <class _ValueType,
           class _ForwardIterator,
           class _EndPredicate,
           class _IterMove>
-inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator> __uninitialized_move(
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __in_out_result<_InputIterator, _ForwardIterator>
-    _InputIterator __ifirst,
+__uninitialized_move(_InputIterator __ifirst,
-    _Sentinel1 __ilast,
+                     _Sentinel1 __ilast,
-    _ForwardIterator __ofirst,
+                     _ForwardIterator __ofirst,
-    _EndPredicate __stop_moving,
+                     _EndPredicate __stop_moving,
-    _IterMove __iter_move) {
+                     _IterMove __iter_move) {
   auto __idx   = __ofirst;
   auto __guard = std::__make_exception_guard([&] { std::__destroy(__ofirst, __idx); });
   for (; __ifirst != __ilast && !__stop_moving(__idx); ++__idx, (void)++__ifirst) {
 @@ -247,14 +259,14 @@ inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator> __uninitiali
 }
 template <class _InputIterator, class _ForwardIterator>
-inline _LIBCPP_HIDE_FROM_ABI _ForwardIterator
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _ForwardIterator
 uninitialized_move(_InputIterator __ifirst, _InputIterator __ilast, _ForwardIterator __ofirst) {
   using _ValueType = typename iterator_traits<_ForwardIterator>::value_type;
-  auto __iter_move = [](auto&& __iter) -> decltype(auto) { return std::move(*__iter); };
+  auto __iter_move = [](auto&& __iter) -> decltype(auto) { return std::__deref_move(__iter); };
   auto __result = std::__uninitialized_move<_ValueType>(
       std::move(__ifirst), std::move(__ilast), std::move(__ofirst), __always_false(), __iter_move);
-  return std::move(__result.second);
+  return std::move(__result.__out_);
 }
 // uninitialized_move_n
 @@ -265,7 +277,8 @@ template <class _ValueType,
           class _ForwardIterator,
           class _EndPredicate,
           class _IterMove>
-inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator> __uninitialized_move_n(
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __in_out_result<_InputIterator, _ForwardIterator>
+__uninitialized_move_n(
     _InputIterator __ifirst, _Size __n, _ForwardIterator __ofirst, _EndPredicate __stop_moving, _IterMove __iter_move) {
   auto __idx   = __ofirst;
   auto __guard = std::__make_exception_guard([&] { std::__destroy(__ofirst, __idx); });
 @@ -277,166 +290,14 @@ inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator> __uninitiali
 }
 template <class _InputIterator, class _Size, class _ForwardIterator>
-inline _LIBCPP_HIDE_FROM_ABI pair<_InputIterator, _ForwardIterator>
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<_InputIterator, _ForwardIterator>
 uninitialized_move_n(_InputIterator __ifirst, _Size __n, _ForwardIterator __ofirst) {
   using _ValueType = typename iterator_traits<_ForwardIterator>::value_type;
-  auto __iter_move = [](auto&& __iter) -> decltype(auto) { return std::move(*__iter); };
+  auto __iter_move = [](auto&& __iter) -> decltype(auto) { return std::__deref_move(__iter); };
-  return std::__uninitialized_move_n<_ValueType>(
+  auto __result = std::__uninitialized_move_n<_ValueType>(
       std::move(__ifirst), __n, std::move(__ofirst), __always_false(), __iter_move);
-}
+  return {std::move(__result.__in_), std::move(__result.__out_)};
-// TODO: Rewrite this to iterate left to right and use reverse_iterators when calling
-// Destroys every element in the range [first, last) FROM RIGHT TO LEFT using allocator
-// destruction. If elements are themselves C-style arrays, they are recursively destroyed
-// in the same manner.
-//
-// This function assumes that destructors do not throw, and that the allocator is bound to
-// the correct type.
-template <class _Alloc,
-          class _BidirIter,
-          __enable_if_t<__has_bidirectional_iterator_category<_BidirIter>::value, int> = 0>
-_LIBCPP_HIDE_FROM_ABI constexpr void
-__allocator_destroy_multidimensional(_Alloc& __alloc, _BidirIter __first, _BidirIter __last) noexcept {
-  using _ValueType = typename iterator_traits<_BidirIter>::value_type;
-  static_assert(is_same_v<typename allocator_traits<_Alloc>::value_type, _ValueType>,
-                "The allocator should already be rebound to the correct type");
-  if (__first == __last)
-    return;
-  if constexpr (is_array_v<_ValueType>) {
-    static_assert(!__is_unbounded_array_v<_ValueType>,
-                  "arrays of unbounded arrays don't exist, but if they did we would mess up here");
-    using _Element = remove_extent_t<_ValueType>;
-    __allocator_traits_rebind_t<_Alloc, _Element> __elem_alloc(__alloc);
-    do {
-      --__last;
-      decltype(auto) __array = *__last;
-      std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + extent_v<_ValueType>);
-    } while (__last != __first);
-  } else {
-    do {
-      --__last;
-      allocator_traits<_Alloc>::destroy(__alloc, std::addressof(*__last));
-    } while (__last != __first);
-  }
-}
-// Constructs the object at the given location using the allocator's construct method.
-//
-// If the object being constructed is an array, each element of the array is allocator-constructed,
-// recursively. If an exception is thrown during the construction of an array, the initialized
-// elements are destroyed in reverse order of initialization using allocator destruction.
-//
-// This function assumes that the allocator is bound to the correct type.
-template <class _Alloc, class _Tp>
-_LIBCPP_HIDE_FROM_ABI constexpr void __allocator_construct_at_multidimensional(_Alloc& __alloc, _Tp* __loc) {
-  static_assert(is_same_v<typename allocator_traits<_Alloc>::value_type, _Tp>,
-                "The allocator should already be rebound to the correct type");
-  if constexpr (is_array_v<_Tp>) {
-    using _Element = remove_extent_t<_Tp>;
-    __allocator_traits_rebind_t<_Alloc, _Element> __elem_alloc(__alloc);
-    size_t __i   = 0;
-    _Tp& __array = *__loc;
-    // If an exception is thrown, destroy what we have constructed so far in reverse order.
-    auto __guard = std::__make_exception_guard([&]() {
-      std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + __i);
-    });
-    for (; __i != extent_v<_Tp>; ++__i) {
-      std::__allocator_construct_at_multidimensional(__elem_alloc, std::addressof(__array[__i]));
-    }
-    __guard.__complete();
-  } else {
-    allocator_traits<_Alloc>::construct(__alloc, __loc);
-  }
-}
-// Constructs the object at the given location using the allocator's construct method, passing along
-// the provided argument.
-//
-// If the object being constructed is an array, the argument is also assumed to be an array. Each
-// each element of the array being constructed is allocator-constructed from the corresponding
-// element of the argument array. If an exception is thrown during the construction of an array,
-// the initialized elements are destroyed in reverse order of initialization using allocator
-// destruction.
-//
-// This function assumes that the allocator is bound to the correct type.
-template <class _Alloc, class _Tp, class _Arg>
-_LIBCPP_HIDE_FROM_ABI constexpr void
-__allocator_construct_at_multidimensional(_Alloc& __alloc, _Tp* __loc, _Arg const& __arg) {
-  static_assert(is_same_v<typename allocator_traits<_Alloc>::value_type, _Tp>,
-                "The allocator should already be rebound to the correct type");
-  if constexpr (is_array_v<_Tp>) {
-    static_assert(is_array_v<_Arg>,
-                  "Provided non-array initialization argument to __allocator_construct_at_multidimensional when "
-                  "trying to construct an array.");
-    using _Element = remove_extent_t<_Tp>;
-    __allocator_traits_rebind_t<_Alloc, _Element> __elem_alloc(__alloc);
-    size_t __i   = 0;
-    _Tp& __array = *__loc;
-    // If an exception is thrown, destroy what we have constructed so far in reverse order.
-    auto __guard = std::__make_exception_guard([&]() {
-      std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + __i);
-    });
-    for (; __i != extent_v<_Tp>; ++__i) {
-      std::__allocator_construct_at_multidimensional(__elem_alloc, std::addressof(__array[__i]), __arg[__i]);
-    }
-    __guard.__complete();
-  } else {
-    allocator_traits<_Alloc>::construct(__alloc, __loc, __arg);
-  }
-}
-// Given a range starting at it and containing n elements, initializes each element in the
-// range from left to right using the construct method of the allocator (rebound to the
-// correct type).
-//
-// If an exception is thrown, the initialized elements are destroyed in reverse order of
-// initialization using allocator_traits destruction. If the elements in the range are C-style
-// arrays, they are initialized element-wise using allocator construction, and recursively so.
-template <class _Alloc,
-          class _BidirIter,
-          class _Tp,
-          class _Size = typename iterator_traits<_BidirIter>::difference_type>
-_LIBCPP_HIDE_FROM_ABI constexpr void
-__uninitialized_allocator_fill_n_multidimensional(_Alloc& __alloc, _BidirIter __it, _Size __n, _Tp const& __value) {
-  using _ValueType = typename iterator_traits<_BidirIter>::value_type;
-  __allocator_traits_rebind_t<_Alloc, _ValueType> __value_alloc(__alloc);
-  _BidirIter __begin = __it;
-  // If an exception is thrown, destroy what we have constructed so far in reverse order.
-  auto __guard =
-      std::__make_exception_guard([&]() { std::__allocator_destroy_multidimensional(__value_alloc, __begin, __it); });
-  for (; __n != 0; --__n, ++__it) {
-    std::__allocator_construct_at_multidimensional(__value_alloc, std::addressof(*__it), __value);
-  }
-  __guard.__complete();
-}
-// Same as __uninitialized_allocator_fill_n_multidimensional, but doesn't pass any initialization argument
-// to the allocator's construct method, which results in value initialization.
-template <class _Alloc, class _BidirIter, class _Size = typename iterator_traits<_BidirIter>::difference_type>
-_LIBCPP_HIDE_FROM_ABI constexpr void
-__uninitialized_allocator_value_construct_n_multidimensional(_Alloc& __alloc, _BidirIter __it, _Size __n) {
-  using _ValueType = typename iterator_traits<_BidirIter>::value_type;
-  __allocator_traits_rebind_t<_Alloc, _ValueType> __value_alloc(__alloc);
-  _BidirIter __begin = __it;
-  // If an exception is thrown, destroy what we have constructed so far in reverse order.
-  auto __guard =
-      std::__make_exception_guard([&]() { std::__allocator_destroy_multidimensional(__value_alloc, __begin, __it); });
-  for (; __n != 0; --__n, ++__it) {
-    std::__allocator_construct_at_multidimensional(__value_alloc, std::addressof(*__it));
-  }
-  __guard.__complete();
 }
 #endif // _LIBCPP_STD_VER >= 17
 @@ -486,7 +347,7 @@ inline const bool __allocator_has_trivial_copy_construct_v<allocator<_Type>, _Ty
 template <class _Alloc,
           class _In,
           class _Out,
-          __enable_if_t<is_trivially_copy_constructible<_In>::value && is_trivially_copy_assignable<_In>::value &&
+          __enable_if_t<is_trivially_copy_constructible<_In>::value && is_trivially_assignable<_Out&, _In&>::value &&
                             is_same<__remove_const_t<_In>, __remove_const_t<_Out> >::value &&
                             __allocator_has_trivial_copy_construct_v<_Alloc, _In>,
                         int> = 0>

lib/libcxx/include/__memory/uninitialized_multidimensional_algorithms.h created+194

...	@@ -0,0 +1,194 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_UNINITIALIZED_MULTIDIMENSIONAL_ALGORITHMS_H
10	#define _LIBCPP___MEMORY_UNINITIALIZED_MULTIDIMENSIONAL_ALGORITHMS_H
11
12	#include <__config>
13	#include <__cstddef/size_t.h>
14	#include <__iterator/iterator_traits.h>
15	#include <__memory/addressof.h>
16	#include <__memory/allocator_traits.h>
17	#include <__type_traits/enable_if.h>
18	#include <__type_traits/extent.h>
19	#include <__type_traits/is_array.h>
20	#include <__type_traits/is_same.h>
21	#include <__type_traits/remove_extent.h>
22	#include <__utility/exception_guard.h>
23
24	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
25	# pragma GCC system_header
26	#endif
27
28	_LIBCPP_PUSH_MACROS
29	#include <__undef_macros>
30
31	#if _LIBCPP_STD_VER >= 17
32
33	_LIBCPP_BEGIN_NAMESPACE_STD
34
35	// TODO: Rewrite this to iterate left to right and use reverse_iterators when calling
36	// Destroys every element in the range [first, last) FROM RIGHT TO LEFT using allocator
37	// destruction. If elements are themselves C-style arrays, they are recursively destroyed
38	// in the same manner.
39	//
40	// This function assumes that destructors do not throw, and that the allocator is bound to
41	// the correct type.
42	template <class _Alloc,
43	class _BidirIter,
44	__enable_if_t<__has_bidirectional_iterator_category<_BidirIter>::value, int> = 0>
45	_LIBCPP_HIDE_FROM_ABI constexpr void
46	__allocator_destroy_multidimensional(_Alloc& __alloc, _BidirIter __first, _BidirIter __last) noexcept {
47	using _ValueType = typename iterator_traits<_BidirIter>::value_type;
48	static_assert(is_same_v<typename allocator_traits<_Alloc>::value_type, _ValueType>,
49	"The allocator should already be rebound to the correct type");
50
51	if (__first == __last)
52	return;
53
54	if constexpr (is_array_v<_ValueType>) {
55	static_assert(!__is_unbounded_array_v<_ValueType>,
56	"arrays of unbounded arrays don't exist, but if they did we would mess up here");
57
58	using _Element = remove_extent_t<_ValueType>;
59	__allocator_traits_rebind_t<_Alloc, _Element> __elem_alloc(__alloc);
60	do {
61	--__last;
62	decltype(auto) __array = *__last;
63	std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + extent_v<_ValueType>);
64	} while (__last != __first);
65	} else {
66	do {
67	--__last;
68	allocator_traits<_Alloc>::destroy(__alloc, std::addressof(*__last));
69	} while (__last != __first);
70	}
71	}
72
73	// Constructs the object at the given location using the allocator's construct method.
74	//
75	// If the object being constructed is an array, each element of the array is allocator-constructed,
76	// recursively. If an exception is thrown during the construction of an array, the initialized
77	// elements are destroyed in reverse order of initialization using allocator destruction.
78	//
79	// This function assumes that the allocator is bound to the correct type.
80	template <class _Alloc, class _Tp>
81	_LIBCPP_HIDE_FROM_ABI constexpr void __allocator_construct_at_multidimensional(_Alloc& __alloc, _Tp* __loc) {
82	static_assert(is_same_v<typename allocator_traits<_Alloc>::value_type, _Tp>,
83	"The allocator should already be rebound to the correct type");
84
85	if constexpr (is_array_v<_Tp>) {
86	using _Element = remove_extent_t<_Tp>;
87	__allocator_traits_rebind_t<_Alloc, _Element> __elem_alloc(__alloc);
88	size_t __i = 0;
89	_Tp& __array = *__loc;
90
91	// If an exception is thrown, destroy what we have constructed so far in reverse order.
92	auto __guard = std::__make_exception_guard([&]() {
93	std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + __i);
94	});
95
96	for (; __i != extent_v<_Tp>; ++__i) {
97	std::__allocator_construct_at_multidimensional(__elem_alloc, std::addressof(__array[__i]));
98	}
99	__guard.__complete();
100	} else {
101	allocator_traits<_Alloc>::construct(__alloc, __loc);
102	}
103	}
104
105	// Constructs the object at the given location using the allocator's construct method, passing along
106	// the provided argument.
107	//
108	// If the object being constructed is an array, the argument is also assumed to be an array. Each
109	// each element of the array being constructed is allocator-constructed from the corresponding
110	// element of the argument array. If an exception is thrown during the construction of an array,
111	// the initialized elements are destroyed in reverse order of initialization using allocator
112	// destruction.
113	//
114	// This function assumes that the allocator is bound to the correct type.
115	template <class _Alloc, class _Tp, class _Arg>
116	_LIBCPP_HIDE_FROM_ABI constexpr void
117	__allocator_construct_at_multidimensional(_Alloc& __alloc, _Tp* __loc, _Arg const& __arg) {
118	static_assert(is_same_v<typename allocator_traits<_Alloc>::value_type, _Tp>,
119	"The allocator should already be rebound to the correct type");
120
121	if constexpr (is_array_v<_Tp>) {
122	static_assert(is_array_v<_Arg>,
123	"Provided non-array initialization argument to __allocator_construct_at_multidimensional when "
124	"trying to construct an array.");
125
126	using _Element = remove_extent_t<_Tp>;
127	__allocator_traits_rebind_t<_Alloc, _Element> __elem_alloc(__alloc);
128	size_t __i = 0;
129	_Tp& __array = *__loc;
130
131	// If an exception is thrown, destroy what we have constructed so far in reverse order.
132	auto __guard = std::__make_exception_guard([&]() {
133	std::__allocator_destroy_multidimensional(__elem_alloc, __array, __array + __i);
134	});
135	for (; __i != extent_v<_Tp>; ++__i) {
136	std::__allocator_construct_at_multidimensional(__elem_alloc, std::addressof(__array[__i]), __arg[__i]);
137	}
138	__guard.__complete();
139	} else {
140	allocator_traits<_Alloc>::construct(__alloc, __loc, __arg);
141	}
142	}
143
144	// Given a range starting at it and containing n elements, initializes each element in the
145	// range from left to right using the construct method of the allocator (rebound to the
146	// correct type).
147	//
148	// If an exception is thrown, the initialized elements are destroyed in reverse order of
149	// initialization using allocator_traits destruction. If the elements in the range are C-style
150	// arrays, they are initialized element-wise using allocator construction, and recursively so.
151	template <class _Alloc,
152	class _BidirIter,
153	class _Tp,
154	class _Size = typename iterator_traits<_BidirIter>::difference_type>
155	_LIBCPP_HIDE_FROM_ABI constexpr void
156	__uninitialized_allocator_fill_n_multidimensional(_Alloc& __alloc, _BidirIter __it, _Size __n, _Tp const& __value) {
157	using _ValueType = typename iterator_traits<_BidirIter>::value_type;
158	__allocator_traits_rebind_t<_Alloc, _ValueType> __value_alloc(__alloc);
159	_BidirIter __begin = __it;
160
161	// If an exception is thrown, destroy what we have constructed so far in reverse order.
162	auto __guard =
163	std::__make_exception_guard([&]() { std::__allocator_destroy_multidimensional(__value_alloc, __begin, __it); });
164	for (; __n != 0; --__n, ++__it) {
165	std::__allocator_construct_at_multidimensional(__value_alloc, std::addressof(*__it), __value);
166	}
167	__guard.__complete();
168	}
169
170	// Same as __uninitialized_allocator_fill_n_multidimensional, but doesn't pass any initialization argument
171	// to the allocator's construct method, which results in value initialization.
172	template <class _Alloc, class _BidirIter, class _Size = typename iterator_traits<_BidirIter>::difference_type>
173	_LIBCPP_HIDE_FROM_ABI constexpr void
174	__uninitialized_allocator_value_construct_n_multidimensional(_Alloc& __alloc, _BidirIter __it, _Size __n) {
175	using _ValueType = typename iterator_traits<_BidirIter>::value_type;
176	__allocator_traits_rebind_t<_Alloc, _ValueType> __value_alloc(__alloc);
177	_BidirIter __begin = __it;
178
179	// If an exception is thrown, destroy what we have constructed so far in reverse order.
180	auto __guard =
181	std::__make_exception_guard([&]() { std::__allocator_destroy_multidimensional(__value_alloc, __begin, __it); });
182	for (; __n != 0; --__n, ++__it) {
183	std::__allocator_construct_at_multidimensional(__value_alloc, std::addressof(*__it));
184	}
185	__guard.__complete();
186	}
187
188	_LIBCPP_END_NAMESPACE_STD
189
190	#endif // _LIBCPP_STD_VER >= 17
191
192	_LIBCPP_POP_MACROS
193
194	#endif // _LIBCPP___MEMORY_UNINITIALIZED_MULTIDIMENSIONAL_ALGORITHMS_H

lib/libcxx/include/__memory/unique_ptr.h+62-110

...	@@ -27,7 +27,6 @@	...	@@ -27,7 +27,6 @@
27	#include <__type_traits/add_reference.h>	27	#include <__type_traits/add_reference.h>
28	#include <__type_traits/common_type.h>	28	#include <__type_traits/common_type.h>
29	#include <__type_traits/conditional.h>	29	#include <__type_traits/conditional.h>
30	#include <__type_traits/dependent_type.h>
31	#include <__type_traits/enable_if.h>	30	#include <__type_traits/enable_if.h>
32	#include <__type_traits/integral_constant.h>	31	#include <__type_traits/integral_constant.h>
33	#include <__type_traits/is_array.h>	32	#include <__type_traits/is_array.h>
...	@@ -43,7 +42,8 @@	...	@@ -43,7 +42,8 @@
43	#include <__type_traits/is_trivially_relocatable.h>	42	#include <__type_traits/is_trivially_relocatable.h>
44	#include <__type_traits/is_void.h>	43	#include <__type_traits/is_void.h>
45	#include <__type_traits/remove_extent.h>	44	#include <__type_traits/remove_extent.h>
46	#include <__type_traits/type_identity.h>	45	#include <__type_traits/remove_reference.h>
		46	#include <__type_traits/void_t.h>
47	#include <__utility/declval.h>	47	#include <__utility/declval.h>
48	#include <__utility/forward.h>	48	#include <__utility/forward.h>
49	#include <__utility/move.h>	49	#include <__utility/move.h>
...	@@ -95,27 +95,17 @@ inline const bool __is_default_deleter_v = false;	...	@@ -95,27 +95,17 @@ inline const bool __is_default_deleter_v = false;
95	template <class _Tp>	95	template <class _Tp>
96	inline const bool __is_default_deleter_v<default_delete<_Tp> > = true;	96	inline const bool __is_default_deleter_v<default_delete<_Tp> > = true;
97		97
98	template <class _Deleter>	98	template <class, class = void>
99	struct __unique_ptr_deleter_sfinae {	99	inline const bool __can_dereference = false;
100	static_assert(!is_reference<_Deleter>::value, "incorrect specialization");
101	typedef const _Deleter& __lval_ref_type;
102	typedef _Deleter&& __good_rval_ref_type;
103	typedef true_type __enable_rval_overload;
104	};
105		100
106	template <class _Deleter>	101	template <class _Tp>
107	struct __unique_ptr_deleter_sfinae<_Deleter const&> {	102	inline const bool __can_dereference<_Tp, decltype((void)*std::declval<_Tp>())> = true;
108	typedef const _Deleter& __lval_ref_type;
109	typedef const _Deleter&& __bad_rval_ref_type;
110	typedef false_type __enable_rval_overload;
111	};
112		103
113	template <class _Deleter>	104	template <class _Tp, class = void>
114	struct __unique_ptr_deleter_sfinae<_Deleter&> {	105	inline const bool __can_add_pointer = false;
115	typedef _Deleter& __lval_ref_type;	106
116	typedef _Deleter&& __bad_rval_ref_type;	107	template <class _Tp>
117	typedef false_type __enable_rval_overload;	108	inline const bool __can_add_pointer<_Tp, __void_t<_Tp*> > = true;
118	};
119		109
120	#if defined(_LIBCPP_ABI_ENABLE_UNIQUE_PTR_TRIVIAL_ABI)	110	#if defined(_LIBCPP_ABI_ENABLE_UNIQUE_PTR_TRIVIAL_ABI)
121	# define _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI __attribute__((__trivial_abi__))	111	# define _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI __attribute__((__trivial_abi__))
...	@@ -125,13 +115,14 @@ struct __unique_ptr_deleter_sfinae<_Deleter&> {	...	@@ -125,13 +115,14 @@ struct __unique_ptr_deleter_sfinae<_Deleter&> {
125		115
126	template <class _Tp, class _Dp = default_delete<_Tp> >	116	template <class _Tp, class _Dp = default_delete<_Tp> >
127	class _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI unique_ptr {	117	class _LIBCPP_UNIQUE_PTR_TRIVIAL_ABI unique_ptr {
		118	static_assert(__can_add_pointer<_Tp>, "unique_ptr<T, D> requires T* to be a valid type");
		119	static_assert(!is_rvalue_reference<_Dp>::value, "the specified deleter type cannot be an rvalue reference");
		120
128	public:	121	public:
129	typedef _Tp element_type;	122	typedef _Tp element_type;
130	typedef _Dp deleter_type;	123	typedef _Dp deleter_type;
131	using pointer _LIBCPP_NODEBUG = __pointer<_Tp, deleter_type>;	124	using pointer _LIBCPP_NODEBUG = __pointer<_Tp, deleter_type>;
132		125
133	static_assert(!is_rvalue_reference<deleter_type>::value, "the specified deleter type cannot be an rvalue reference");
134
135	// A unique_ptr contains the following members which may be trivially relocatable:	126	// A unique_ptr contains the following members which may be trivially relocatable:
136	// - pointer : this may be trivially relocatable, so it's checked	127	// - pointer : this may be trivially relocatable, so it's checked
137	// - deleter_type: this may be trivially relocatable, so it's checked	128	// - deleter_type: this may be trivially relocatable, so it's checked
...	@@ -146,24 +137,6 @@ public:	...	@@ -146,24 +137,6 @@ public:
146	private:	137	private:
147	_LIBCPP_COMPRESSED_PAIR(pointer, __ptr_, deleter_type, __deleter_);	138	_LIBCPP_COMPRESSED_PAIR(pointer, __ptr_, deleter_type, __deleter_);
148		139
149	using _DeleterSFINAE _LIBCPP_NODEBUG = __unique_ptr_deleter_sfinae<_Dp>;
150
151	template <bool _Dummy>
152	using _LValRefType _LIBCPP_NODEBUG = typename __dependent_type<_DeleterSFINAE, _Dummy>::__lval_ref_type;
153
154	template <bool _Dummy>
155	using _GoodRValRefType _LIBCPP_NODEBUG = typename __dependent_type<_DeleterSFINAE, _Dummy>::__good_rval_ref_type;
156
157	template <bool _Dummy>
158	using _BadRValRefType _LIBCPP_NODEBUG = typename __dependent_type<_DeleterSFINAE, _Dummy>::__bad_rval_ref_type;
159
160	template <bool _Dummy, class _Deleter = typename __dependent_type< __type_identity<deleter_type>, _Dummy>::type>
161	using _EnableIfDeleterDefaultConstructible _LIBCPP_NODEBUG =
162	__enable_if_t<is_default_constructible<_Deleter>::value && !is_pointer<_Deleter>::value>;
163
164	template <class _ArgType>
165	using _EnableIfDeleterConstructible _LIBCPP_NODEBUG = __enable_if_t<is_constructible<deleter_type, _ArgType>::value>;
166
167	template <class _UPtr, class _Up>	140	template <class _UPtr, class _Up>
168	using _EnableIfMoveConvertible _LIBCPP_NODEBUG =	141	using _EnableIfMoveConvertible _LIBCPP_NODEBUG =
169	__enable_if_t< is_convertible<typename _UPtr::pointer, pointer>::value && !is_array<_Up>::value >;	142	__enable_if_t< is_convertible<typename _UPtr::pointer, pointer>::value && !is_array<_Up>::value >;
...	@@ -177,31 +150,33 @@ private:	...	@@ -177,31 +150,33 @@ private:
177	using _EnableIfDeleterAssignable _LIBCPP_NODEBUG = __enable_if_t< is_assignable<_Dp&, _UDel&&>::value >;	150	using _EnableIfDeleterAssignable _LIBCPP_NODEBUG = __enable_if_t< is_assignable<_Dp&, _UDel&&>::value >;
178		151
179	public:	152	public:
180	template <bool _Dummy = true, class = _EnableIfDeleterDefaultConstructible<_Dummy> >	153	template <class _Deleter = deleter_type,
		154	__enable_if_t<is_default_constructible<_Deleter>::value && !is_pointer<_Deleter>::value, int> = 0>
181	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT : __ptr_(), __deleter_() {}	155	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT : __ptr_(), __deleter_() {}
182		156
183	template <bool _Dummy = true, class = _EnableIfDeleterDefaultConstructible<_Dummy> >	157	template <class _Deleter = deleter_type,
		158	__enable_if_t<is_default_constructible<_Deleter>::value && !is_pointer<_Deleter>::value, int> = 0>
184	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(), __deleter_() {}	159	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(), __deleter_() {}
185		160
186	template <bool _Dummy = true, class = _EnableIfDeleterDefaultConstructible<_Dummy> >	161	template <class _Deleter = deleter_type,
		162	__enable_if_t<is_default_constructible<_Deleter>::value && !is_pointer<_Deleter>::value, int> = 0>
187	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(pointer __p) _NOEXCEPT	163	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(pointer __p) _NOEXCEPT
188	: __ptr_(__p),	164	: __ptr_(__p),
189	__deleter_() {}	165	__deleter_() {}
190		166
191	template <bool _Dummy = true, class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> > >	167	template <class _Deleter = deleter_type, __enable_if_t<is_copy_constructible<_Deleter>::value, int> = 0>
192	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(pointer __p, _LValRefType<_Dummy> __d) _NOEXCEPT	168	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(pointer __p, const deleter_type& __d) _NOEXCEPT
193	: __ptr_(__p),	169	: __ptr_(__p),
194	__deleter_(__d) {}	170	__deleter_(__d) {}
195		171
196	template <bool _Dummy = true, class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> > >	172	template <class _Deleter = deleter_type,
197	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(pointer __p, _GoodRValRefType<_Dummy> __d) _NOEXCEPT	173	__enable_if_t<!is_reference<_Deleter>::value && is_move_constructible<_Deleter>::value, int> = 0>
		174	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(pointer __p, deleter_type&& __d) _NOEXCEPT
198	: __ptr_(__p),	175	: __ptr_(__p),
199	__deleter_(std::move(__d)) {	176	__deleter_(std::move(__d)) {}
200	static_assert(!is_reference<deleter_type>::value, "rvalue deleter bound to reference");
201	}
202		177
203	template <bool _Dummy = true, class = _EnableIfDeleterConstructible<_BadRValRefType<_Dummy> > >	178	template <class _Deleter = deleter_type, __enable_if_t<is_reference<_Deleter>::value, int> = 0>
204	_LIBCPP_HIDE_FROM_ABI unique_ptr(pointer __p, _BadRValRefType<_Dummy> __d) = delete;	179	_LIBCPP_HIDE_FROM_ABI unique_ptr(pointer, __libcpp_remove_reference_t<deleter_type>&&) = delete;
205		180
206	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr&& __u) _NOEXCEPT	181	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr&& __u) _NOEXCEPT
207	: __ptr_(__u.release()),	182	: __ptr_(__u.release()),
...	@@ -222,7 +197,7 @@ public:	...	@@ -222,7 +197,7 @@ public:
222	#endif	197	#endif
223		198
224	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT {	199	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT {
225	reset(__u.release());	200	reset(__u.release()); // NOLINT(misc-uniqueptr-reset-release)
226	__deleter_ = std::forward<deleter_type>(__u.get_deleter());	201	__deleter_ = std::forward<deleter_type>(__u.get_deleter());
227	return *this;	202	return *this;
228	}	203	}
...	@@ -258,6 +233,7 @@ public:	...	@@ -258,6 +233,7 @@ public:
258	return *this;	233	return *this;
259	}	234	}
260		235
		236	template <class _Ptr = pointer, __enable_if_t<__can_dereference<_Ptr>, int> = 0>
261	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 __add_lvalue_reference_t<_Tp> operator*() const	237	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 __add_lvalue_reference_t<_Tp> operator*() const
262	_NOEXCEPT_(_NOEXCEPT_(*std::declval<pointer>())) {	238	_NOEXCEPT_(_NOEXCEPT_(*std::declval<pointer>())) {
263	return *__ptr_;	239	return *__ptr_;
...	@@ -434,27 +410,6 @@ private:	...	@@ -434,27 +410,6 @@ private:
434	(is_same<pointer, element_type*>::value &&	410	(is_same<pointer, element_type*>::value &&
435	is_convertible<_FromElem ()[], element_type ()[]>::value) > {};	411	is_convertible<_FromElem ()[], element_type ()[]>::value) > {};
436		412
437	typedef __unique_ptr_deleter_sfinae<_Dp> _DeleterSFINAE;
438
439	template <bool _Dummy>
440	using _LValRefType _LIBCPP_NODEBUG = typename __dependent_type<_DeleterSFINAE, _Dummy>::__lval_ref_type;
441
442	template <bool _Dummy>
443	using _GoodRValRefType _LIBCPP_NODEBUG = typename __dependent_type<_DeleterSFINAE, _Dummy>::__good_rval_ref_type;
444
445	template <bool _Dummy>
446	using _BadRValRefType _LIBCPP_NODEBUG = typename __dependent_type<_DeleterSFINAE, _Dummy>::__bad_rval_ref_type;
447
448	template <bool _Dummy, class _Deleter = typename __dependent_type< __type_identity<deleter_type>, _Dummy>::type>
449	using _EnableIfDeleterDefaultConstructible _LIBCPP_NODEBUG =
450	__enable_if_t<is_default_constructible<_Deleter>::value && !is_pointer<_Deleter>::value>;
451
452	template <class _ArgType>
453	using _EnableIfDeleterConstructible _LIBCPP_NODEBUG = __enable_if_t<is_constructible<deleter_type, _ArgType>::value>;
454
455	template <class _Pp>
456	using _EnableIfPointerConvertible _LIBCPP_NODEBUG = __enable_if_t< _CheckArrayPointerConversion<_Pp>::value >;
457
458	template <class _UPtr, class _Up, class _ElemT = typename _UPtr::element_type>	413	template <class _UPtr, class _Up, class _ElemT = typename _UPtr::element_type>
459	using _EnableIfMoveConvertible _LIBCPP_NODEBUG =	414	using _EnableIfMoveConvertible _LIBCPP_NODEBUG =
460	__enable_if_t< is_array<_Up>::value && is_same<pointer, element_type*>::value &&	415	__enable_if_t< is_array<_Up>::value && is_same<pointer, element_type*>::value &&
...	@@ -470,17 +425,19 @@ private:	...	@@ -470,17 +425,19 @@ private:
470	using _EnableIfDeleterAssignable _LIBCPP_NODEBUG = __enable_if_t< is_assignable<_Dp&, _UDel&&>::value >;	425	using _EnableIfDeleterAssignable _LIBCPP_NODEBUG = __enable_if_t< is_assignable<_Dp&, _UDel&&>::value >;
471		426
472	public:	427	public:
473	template <bool _Dummy = true, class = _EnableIfDeleterDefaultConstructible<_Dummy> >	428	template <class _Deleter = deleter_type,
		429	__enable_if_t<is_default_constructible<_Deleter>::value && !is_pointer<_Deleter>::value, int> = 0>
474	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT : __ptr_(), __deleter_() {}	430	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT : __ptr_(), __deleter_() {}
475		431
476	template <bool _Dummy = true, class = _EnableIfDeleterDefaultConstructible<_Dummy> >	432	template <class _Deleter = deleter_type,
		433	__enable_if_t<is_default_constructible<_Deleter>::value && !is_pointer<_Deleter>::value, int> = 0>
477	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(), __deleter_() {}	434	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT : __ptr_(), __deleter_() {}
478		435
479	template <class _Pp,	436	template <class _Ptr,
480	bool _Dummy = true,	437	class _Deleter = deleter_type,
481	class = _EnableIfDeleterDefaultConstructible<_Dummy>,	438	__enable_if_t<is_default_constructible<_Deleter>::value && !is_pointer<_Deleter>::value, int> = 0,
482	class = _EnableIfPointerConvertible<_Pp> >	439	__enable_if_t<_CheckArrayPointerConversion<_Ptr>::value, int> = 0>
483	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(_Pp __ptr) _NOEXCEPT	440	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 explicit unique_ptr(_Ptr __ptr) _NOEXCEPT
484	: __ptr_(__ptr),	441	: __ptr_(__ptr),
485	__deleter_() {}	442	__deleter_() {}
486		443
...	@@ -490,43 +447,38 @@ public:	...	@@ -490,43 +447,38 @@ public:
490	: __ptr_(__ptr),	447	: __ptr_(__ptr),
491	__checker_(__size) {}	448	__checker_(__size) {}
492		449
493	template <class _Pp,	450	template <class _Ptr,
494	bool _Dummy = true,	451	class _Deleter = deleter_type,
495	class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> >,	452	__enable_if_t<is_copy_constructible<_Deleter>::value, int> = 0,
496	class = _EnableIfPointerConvertible<_Pp> >	453	__enable_if_t<_CheckArrayPointerConversion<_Ptr>::value, int> = 0>
497	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(_Pp __ptr, _LValRefType<_Dummy> __deleter) _NOEXCEPT	454	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(_Ptr __ptr, const deleter_type& __deleter) _NOEXCEPT
498	: __ptr_(__ptr),	455	: __ptr_(__ptr),
499	__deleter_(__deleter) {}	456	__deleter_(__deleter) {}
500		457
501	template <bool _Dummy = true, class = _EnableIfDeleterConstructible<_LValRefType<_Dummy> > >	458	template <class _Deleter = deleter_type, __enable_if_t<is_copy_constructible<_Deleter>::value, int> = 0>
502	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(nullptr_t, _LValRefType<_Dummy> __deleter) _NOEXCEPT	459	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(nullptr_t, const deleter_type& __deleter) _NOEXCEPT
503	: __ptr_(nullptr),	460	: __ptr_(nullptr),
504	__deleter_(__deleter) {}	461	__deleter_(__deleter) {}
505		462
506	template <class _Pp,	463	template <class _Ptr,
507	bool _Dummy = true,	464	class _Deleter = deleter_type,
508	class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> >,	465	__enable_if_t<!is_reference<_Deleter>::value && is_move_constructible<_Deleter>::value, int> = 0,
509	class = _EnableIfPointerConvertible<_Pp> >	466	__enable_if_t<_CheckArrayPointerConversion<_Ptr>::value, int> = 0>
510	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23	467	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(_Ptr __ptr, deleter_type&& __deleter) _NOEXCEPT
511	unique_ptr(_Pp __ptr, _GoodRValRefType<_Dummy> __deleter) _NOEXCEPT
512	: __ptr_(__ptr),	468	: __ptr_(__ptr),
513	__deleter_(std::move(__deleter)) {	469	__deleter_(std::move(__deleter)) {}
514	static_assert(!is_reference<deleter_type>::value, "rvalue deleter bound to reference");
515	}
516		470
517	template <bool _Dummy = true, class = _EnableIfDeleterConstructible<_GoodRValRefType<_Dummy> > >	471	template <class _Deleter = deleter_type,
518	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23	472	__enable_if_t<!is_reference<_Deleter>::value && is_move_constructible<_Deleter>::value, int> = 0>
519	unique_ptr(nullptr_t, _GoodRValRefType<_Dummy> __deleter) _NOEXCEPT	473	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(nullptr_t, deleter_type&& __deleter) _NOEXCEPT
520	: __ptr_(nullptr),	474	: __ptr_(nullptr),
521	__deleter_(std::move(__deleter)) {	475	__deleter_(std::move(__deleter)) {}
522	static_assert(!is_reference<deleter_type>::value, "rvalue deleter bound to reference");
523	}
524		476
525	template <class _Pp,	477	template <class _Ptr,
526	bool _Dummy = true,	478	class _Deleter = deleter_type,
527	class = _EnableIfDeleterConstructible<_BadRValRefType<_Dummy> >,	479	__enable_if_t<is_reference<_Deleter>::value, int> = 0,
528	class = _EnableIfPointerConvertible<_Pp> >	480	__enable_if_t<_CheckArrayPointerConversion<_Ptr>::value, int> = 0>
529	_LIBCPP_HIDE_FROM_ABI unique_ptr(_Pp __ptr, _BadRValRefType<_Dummy> __deleter) = delete;	481	_LIBCPP_HIDE_FROM_ABI unique_ptr(_Ptr, __libcpp_remove_reference_t<deleter_type>&&) = delete;
530		482
531	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr&& __u) _NOEXCEPT	483	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr(unique_ptr&& __u) _NOEXCEPT
532	: __ptr_(__u.release()),	484	: __ptr_(__u.release()),
...	@@ -534,7 +486,7 @@ public:	...	@@ -534,7 +486,7 @@ public:
534	__checker_(std::move(__u.__checker_)) {}	486	__checker_(std::move(__u.__checker_)) {}
535		487
536	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT {	488	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT {
537	reset(__u.release());	489	reset(__u.release()); // NOLINT(misc-uniqueptr-reset-release)
538	__deleter_ = std::forward<deleter_type>(__u.get_deleter());	490	__deleter_ = std::forward<deleter_type>(__u.get_deleter());
539	__checker_ = std::move(__u.__checker_);	491	__checker_ = std::move(__u.__checker_);
540	return *this;	492	return *this;

lib/libcxx/include/__memory/uses_allocator_construction.h+6-6

 @@ -27,10 +27,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 inline constexpr bool __is_cv_std_pair = __is_pair_v<remove_cv_t<_Tp>>;
 @@ -202,9 +202,7 @@ __uninitialized_construct_using_allocator(_Type* __ptr, const _Alloc& __alloc, _
       __uses_allocator_construction_args<_Type>::__apply(__alloc, std::forward<_Args>(__args)...));
 }
-#endif // _LIBCPP_STD_VER >= 17
+#  if _LIBCPP_STD_VER >= 20
-#if _LIBCPP_STD_VER >= 20
 template <class _Type, class _Alloc, class... _Args>
 _LIBCPP_HIDE_FROM_ABI constexpr auto uses_allocator_construction_args(const _Alloc& __alloc, _Args&&... __args) noexcept
 @@ -225,10 +223,12 @@ uninitialized_construct_using_allocator(_Type* __ptr, const _Alloc& __alloc, _Ar
   return /*--*/ std::__uninitialized_construct_using_allocator(__ptr, __alloc, std::forward<_Args>(__args)...);
 }
-#endif // _LIBCPP_STD_VER >= 20
+#  endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H

lib/libcxx/include/__memory/valid_range.h created+74

...	@@ -0,0 +1,74 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___MEMORY_VALID_RANGE_H
10	#define _LIBCPP___MEMORY_VALID_RANGE_H
11
12	#include <__algorithm/comp.h>
13	#include <__assert>
14	#include <__config>
15	#include <__iterator/iterator_traits.h>
16	#include <__memory/assume_aligned.h>
17	#include <__memory/pointer_traits.h>
18	#include <__type_traits/is_constant_evaluated.h>
19	#include <__type_traits/is_same.h>
20	#include <__type_traits/remove_cvref.h>
21
22	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
23	# pragma GCC system_header
24	#endif
25
26	_LIBCPP_BEGIN_NAMESPACE_STD
27
28	// A valid range as defined by the C++ Standard has the following constraints:
29	// - [__first, __last) is dereferenceable
30	// - __last is reachable from __first
31	// - if __first and __last are contiguous iterators, the pointers they "decay to" are correctly aligned according to the
32	// language rules for pointers
33
34	// This function attempts to detect invalid ranges as defined above. Specifically, it checks bullet (2). This also means
35	// that it doesn't return whether a range is actually valid, but only whether a range is definitely not valid.
36	// The checks may be extended in the future.
37	template <class _Tp>
38	_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_SANITIZE("address") bool
39	__is_valid_range(const _Tp* __first, const _Tp* __last) {
40	if (__libcpp_is_constant_evaluated()) {
41	// If this is not a constant during constant evaluation, that is because __first and __last are not
42	// part of the same allocation. If they are part of the same allocation, we must still make sure they
43	// are ordered properly.
44	return __builtin_constant_p(__first <= __last) && __first <= __last;
45	}
46
47	return !__less<>()(__last, __first);
48	}
49
50	// This function allows the compiler to assume that [__first, __last) is a valid range as defined above.
51	//
52	// In practice, we only add explicit assumptions for bullets (1) and (3). These assumptions allow (currently only
53	// clang-based compilers) to auto-vectorize algorithms that contain early returns.
54	template <class _Iter, class _Sent>
55	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void
56	__assume_valid_range([[__maybe_unused__]] _Iter&& __first, [[__maybe_unused__]] _Sent&& __last) {
57	#if defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 2300 && !defined(_LIBCPP_CXX03_LANG)
58	if constexpr (__libcpp_is_contiguous_iterator<__remove_cvref_t<_Iter>>::value &&
59	is_same<__remove_cvref_t<_Iter>, __remove_cvref_t<_Sent>>::value) {
60	_LIBCPP_ASSERT_INTERNAL(std::__is_valid_range(std::__to_address(__first), std::__to_address(__last)),
61	"Valid range assumption does not hold");
62	if (!__libcpp_is_constant_evaluated()) {
63	using __value_type = typename iterator_traits<__remove_cvref_t<_Iter>>::value_type;
64	__builtin_assume_dereferenceable(std::__to_address(__first), (__last - __first) * sizeof(__value_type));
65	(void)std::__assume_aligned<_LIBCPP_ALIGNOF(__value_type)>(std::__to_address(__first));
66	(void)std::__assume_aligned<_LIBCPP_ALIGNOF(__value_type)>(std::__to_address(__last));
67	}
68	}
69	#endif
70	}
71
72	_LIBCPP_END_NAMESPACE_STD
73
74	#endif // _LIBCPP___MEMORY_VALID_RANGE_H

lib/libcxx/include/__memory_resource/memory_resource.h+2

...	@@ -21,6 +21,7 @@	...	@@ -21,6 +21,7 @@
21	#if _LIBCPP_STD_VER >= 17	21	#if _LIBCPP_STD_VER >= 17
22		22
23	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
		24	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
24		25
25	namespace pmr {	26	namespace pmr {
26		27
...	@@ -84,6 +85,7 @@ null_memory_resource() noexcept;	...	@@ -84,6 +85,7 @@ null_memory_resource() noexcept;
84		85
85	} // namespace pmr	86	} // namespace pmr
86		87
		88	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
87	_LIBCPP_END_NAMESPACE_STD	89	_LIBCPP_END_NAMESPACE_STD
88		90
89	#endif // _LIBCPP_STD_VER >= 17	91	#endif // _LIBCPP_STD_VER >= 17

lib/libcxx/include/__memory_resource/monotonic_buffer_resource.h+2

...	@@ -21,6 +21,7 @@	...	@@ -21,6 +21,7 @@
21	#if _LIBCPP_STD_VER >= 17	21	#if _LIBCPP_STD_VER >= 17
22		22
23	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
		24	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
24		25
25	namespace pmr {	26	namespace pmr {
26		27
...	@@ -112,6 +113,7 @@ private:	...	@@ -112,6 +113,7 @@ private:
112		113
113	} // namespace pmr	114	} // namespace pmr
114		115
		116	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
115	_LIBCPP_END_NAMESPACE_STD	117	_LIBCPP_END_NAMESPACE_STD
116		118
117	#endif // _LIBCPP_STD_VER >= 17	119	#endif // _LIBCPP_STD_VER >= 17

lib/libcxx/include/__memory_resource/synchronized_pool_resource.h+2

...	@@ -24,6 +24,7 @@	...	@@ -24,6 +24,7 @@
24	#if _LIBCPP_STD_VER >= 17	24	#if _LIBCPP_STD_VER >= 17
25		25
26	_LIBCPP_BEGIN_NAMESPACE_STD	26	_LIBCPP_BEGIN_NAMESPACE_STD
		27	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
27		28
28	namespace pmr {	29	namespace pmr {
29		30
...	@@ -88,6 +89,7 @@ private:	...	@@ -88,6 +89,7 @@ private:
88		89
89	} // namespace pmr	90	} // namespace pmr
90		91
		92	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
91	_LIBCPP_END_NAMESPACE_STD	93	_LIBCPP_END_NAMESPACE_STD
92		94
93	#endif // _LIBCPP_STD_VER >= 17	95	#endif // _LIBCPP_STD_VER >= 17

lib/libcxx/include/__memory_resource/unsynchronized_pool_resource.h+2

...	@@ -22,6 +22,7 @@	...	@@ -22,6 +22,7 @@
22	#if _LIBCPP_STD_VER >= 17	22	#if _LIBCPP_STD_VER >= 17
23		23
24	_LIBCPP_BEGIN_NAMESPACE_STD	24	_LIBCPP_BEGIN_NAMESPACE_STD
		25	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
25		26
26	namespace pmr {	27	namespace pmr {
27		28
...	@@ -99,6 +100,7 @@ private:	...	@@ -99,6 +100,7 @@ private:
99		100
100	} // namespace pmr	101	} // namespace pmr
101		102
		103	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
102	_LIBCPP_END_NAMESPACE_STD	104	_LIBCPP_END_NAMESPACE_STD
103		105
104	#endif // _LIBCPP_STD_VER >= 17	106	#endif // _LIBCPP_STD_VER >= 17

lib/libcxx/include/__mutex/lock_guard.h+1-1

...	@@ -34,7 +34,7 @@ public:	...	@@ -34,7 +34,7 @@ public:
34		34
35	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI lock_guard(mutex_type& __m, adopt_lock_t) _LIBCPP_REQUIRES_CAPABILITY(__m)	35	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI lock_guard(mutex_type& __m, adopt_lock_t) _LIBCPP_REQUIRES_CAPABILITY(__m)
36	: __m_(__m) {}	36	: __m_(__m) {}
37	_LIBCPP_RELEASE_CAPABILITY _LIBCPP_HIDE_FROM_ABI ~lock_guard() { __m_.unlock(); }	37	_LIBCPP_RELEASE_CAPABILITY() _LIBCPP_HIDE_FROM_ABI ~lock_guard() { __m_.unlock(); }
38		38
39	lock_guard(lock_guard const&) = delete;	39	lock_guard(lock_guard const&) = delete;
40	lock_guard& operator=(lock_guard const&) = delete;	40	lock_guard& operator=(lock_guard const&) = delete;

lib/libcxx/include/__mutex/mutex.h+3-1

...	@@ -20,6 +20,7 @@	...	@@ -20,6 +20,7 @@
20	#if _LIBCPP_HAS_THREADS	20	#if _LIBCPP_HAS_THREADS
21		21
22	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
		23	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
23		24
24	class _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_CAPABILITY("mutex") mutex {	25	class _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_CAPABILITY("mutex") mutex {
25	__libcpp_mutex_t __m_ = _LIBCPP_MUTEX_INITIALIZER;	26	__libcpp_mutex_t __m_ = _LIBCPP_MUTEX_INITIALIZER;
...	@@ -38,7 +39,7 @@ public:	...	@@ -38,7 +39,7 @@ public:
38		39
39	_LIBCPP_ACQUIRE_CAPABILITY() void lock();	40	_LIBCPP_ACQUIRE_CAPABILITY() void lock();
40	[[__nodiscard__]] _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) bool try_lock() _NOEXCEPT;	41	[[__nodiscard__]] _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) bool try_lock() _NOEXCEPT;
41	_LIBCPP_RELEASE_CAPABILITY void unlock() _NOEXCEPT;	42	_LIBCPP_RELEASE_CAPABILITY() void unlock() _NOEXCEPT;
42		43
43	typedef __libcpp_mutex_t* native_handle_type;	44	typedef __libcpp_mutex_t* native_handle_type;
44	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI native_handle_type native_handle() { return &__m_; }	45	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI native_handle_type native_handle() { return &__m_; }
...	@@ -46,6 +47,7 @@ public:	...	@@ -46,6 +47,7 @@ public:
46		47
47	static_assert(is_nothrow_default_constructible<mutex>::value, "the default constructor for std::mutex must be nothrow");	48	static_assert(is_nothrow_default_constructible<mutex>::value, "the default constructor for std::mutex must be nothrow");
48		49
		50	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
49	_LIBCPP_END_NAMESPACE_STD	51	_LIBCPP_END_NAMESPACE_STD
50		52
51	#endif // _LIBCPP_HAS_THREADS	53	#endif // _LIBCPP_HAS_THREADS

lib/libcxx/include/__mutex/once_flag.h+2

 @@ -113,7 +113,9 @@ void _LIBCPP_HIDE_FROM_ABI __call_once_proxy(void* __vp) {
   (*__p)();
 }
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_EXPORTED_FROM_ABI void __call_once(volatile once_flag::_State_type&, void*, void (*)(void*));
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 template <class _ValueType>
 inline _LIBCPP_HIDE_FROM_ABI _ValueType __libcpp_acquire_load(_ValueType const* __value) {

lib/libcxx/include/__mutex/unique_lock.h+5-5

...	@@ -84,13 +84,13 @@ public:	...	@@ -84,13 +84,13 @@ public:
84	}	84	}
85		85
86	_LIBCPP_HIDE_FROM_ABI void lock();	86	_LIBCPP_HIDE_FROM_ABI void lock();
87	_LIBCPP_HIDE_FROM_ABI bool try_lock();	87	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool try_lock();
88		88
89	template <class _Rep, class _Period>	89	template <class _Rep, class _Period>
90	_LIBCPP_HIDE_FROM_ABI bool try_lock_for(const chrono::duration<_Rep, _Period>& __d);	90	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool try_lock_for(const chrono::duration<_Rep, _Period>& __d);
91		91
92	template <class _Clock, class _Duration>	92	template <class _Clock, class _Duration>
93	_LIBCPP_HIDE_FROM_ABI bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);	93	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);
94		94
95	_LIBCPP_HIDE_FROM_ABI void unlock();	95	_LIBCPP_HIDE_FROM_ABI void unlock();
96		96
...	@@ -106,9 +106,9 @@ public:	...	@@ -106,9 +106,9 @@ public:
106	return __m;	106	return __m;
107	}	107	}
108		108
109	_LIBCPP_HIDE_FROM_ABI bool owns_lock() const _NOEXCEPT { return __owns_; }	109	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool owns_lock() const _NOEXCEPT { return __owns_; }
110	_LIBCPP_HIDE_FROM_ABI explicit operator bool() const _NOEXCEPT { return __owns_; }	110	_LIBCPP_HIDE_FROM_ABI explicit operator bool() const _NOEXCEPT { return __owns_; }
111	_LIBCPP_HIDE_FROM_ABI mutex_type* mutex() const _NOEXCEPT { return __m_; }	111	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI mutex_type* mutex() const _NOEXCEPT { return __m_; }
112	};	112	};
113	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(unique_lock);	113	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(unique_lock);
114		114

lib/libcxx/include/__new/exceptions.h+3

...	@@ -24,6 +24,8 @@	...	@@ -24,6 +24,8 @@
24	#endif	24	#endif
25		25
26	_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD	26	_LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
		27	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
		28
27	#if !defined(_LIBCPP_ABI_VCRUNTIME)	29	#if !defined(_LIBCPP_ABI_VCRUNTIME)
28		30
29	class _LIBCPP_EXPORTED_FROM_ABI bad_alloc : public exception {	31	class _LIBCPP_EXPORTED_FROM_ABI bad_alloc : public exception {
...	@@ -74,6 +76,7 @@ public:	...	@@ -74,6 +76,7 @@ public:
74	_LIBCPP_VERBOSE_ABORT("bad_array_new_length was thrown in -fno-exceptions mode");	76	_LIBCPP_VERBOSE_ABORT("bad_array_new_length was thrown in -fno-exceptions mode");
75	#endif	77	#endif
76	}	78	}
		79	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
77	_LIBCPP_END_UNVERSIONED_NAMESPACE_STD	80	_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
78		81
79	#endif // _LIBCPP___NEW_EXCEPTIONS_H	82	#endif // _LIBCPP___NEW_EXCEPTIONS_H

lib/libcxx/include/__new/new_handler.h+4

 @@ -19,9 +19,13 @@
 #  include <new.h>
 #else
 _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 typedef void (*new_handler)();
 _LIBCPP_EXPORTED_FROM_ABI new_handler set_new_handler(new_handler) _NOEXCEPT;
 _LIBCPP_EXPORTED_FROM_ABI new_handler get_new_handler() _NOEXCEPT;
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #endif // _LIBCPP_ABI_VCRUNTIME

lib/libcxx/include/__new/placement_new_delete.h+2-2

...	@@ -27,8 +27,8 @@ operator new(std::size_t, void* __p) _NOEXCEPT {	...	@@ -27,8 +27,8 @@ operator new(std::size_t, void* __p) _NOEXCEPT {
27	operator new[](std::size_t, void* __p) _NOEXCEPT {	27	operator new[](std::size_t, void* __p) _NOEXCEPT {
28	return __p;	28	return __p;
29	}	29	}
30	inline _LIBCPP_HIDE_FROM_ABI void operator delete(void, void) _NOEXCEPT {}	30	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void operator delete(void, void) _NOEXCEPT {}
31	inline _LIBCPP_HIDE_FROM_ABI void operator delete[](void, void) _NOEXCEPT {}	31	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void operator delete[](void, void) _NOEXCEPT {}
32	#endif	32	#endif
33		33
34	#endif // _LIBCPP___NEW_PLACEMENT_NEW_DELETE_H	34	#endif // _LIBCPP___NEW_PLACEMENT_NEW_DELETE_H

lib/libcxx/include/__node_handle+37-36

 @@ -31,29 +31,29 @@ private:
 public:
   // [container.node.cons], constructors, copy, and assignment
   constexpr node-handle() noexcept : ptr_(), alloc_() {}
-  node-handle(node-handle&&) noexcept;
+  constexpr node-handle(node-handle&&) noexcept;         // constexpr since C++26
-  node-handle& operator=(node-handle&&);
+  constexpr node-handle& operator=(node-handle&&);       // constexpr since C++26
   // [container.node.dtor], destructor
-  ~node-handle();
+  constexpr ~node-handle(); // constexpr since C++26
   // [container.node.observers], observers
-  value_type& value() const;            // not present for map containers
+  value_type& value() const;             // not present for map containers
-  key_type& key() const;                // not present for set containers
+  key_type& key() const;                 // not present for set containers
-  mapped_type& mapped() const;          // not present for set containers
+  constexpr mapped_type& mapped() const; // not present for set containers, constexpr since C++26
-  allocator_type get_allocator() const;
+  constexpr allocator_type get_allocator() const;      // constexpr since C++26
-  explicit operator bool() const noexcept;
+  constexpr explicit operator bool() const noexcept;   // constexpr since C++26
-  [[nodiscard]] bool empty() const noexcept; // nodiscard since C++20
+  [[nodiscard]] constexpr bool empty() const noexcept; // nodiscard since C++20, constexpr since C++26
   // [container.node.modifiers], modifiers
-  void swap(node-handle&)
+  constexpr void swap(node-handle&)
     noexcept(ator_traits::propagate_on_container_swap::value ||
-             ator_traits::is_always_equal::value);
+             ator_traits::is_always_equal::value); // constexpr since C++26
-  friend void swap(node-handle& x, node-handle& y) noexcept(noexcept(x.swap(y))) {
+  constexpr friend void swap(node-handle& x, node-handle& y) noexcept(noexcept(x.swap(y))) {
     x.swap(y);
-  }
+  } // constexpr since C++26
 };
 */
 @@ -63,6 +63,7 @@ public:
 #include <__memory/allocator_traits.h>
 #include <__memory/pointer_traits.h>
 #include <__type_traits/is_specialization.h>
+#include <__utility/exchange.h>
 #include <optional>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -72,10 +73,10 @@ public:
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 // Specialized in __tree & __hash_table for their _NodeType.
 template <class _NodeType, class _Alloc>
 struct __generic_container_node_destructor;
 @@ -99,12 +100,12 @@ private:
   __node_pointer_type __ptr_ = nullptr;
   optional<allocator_type> __alloc_;
-  _LIBCPP_HIDE_FROM_ABI void __release_ptr() {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __release_ptr() {
     __ptr_   = nullptr;
     __alloc_ = std::nullopt;
   }
-  _LIBCPP_HIDE_FROM_ABI void __destroy_node_pointer() {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __destroy_node_pointer() {
     if (__ptr_ != nullptr) {
       typedef typename __allocator_traits_rebind< allocator_type, _NodeType>::type __node_alloc_type;
       __node_alloc_type __alloc(*__alloc_);
 @@ -113,19 +114,17 @@ private:
     }
   }
-  _LIBCPP_HIDE_FROM_ABI __basic_node_handle(__node_pointer_type __ptr, allocator_type const& __alloc)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  __basic_node_handle(__node_pointer_type __ptr, allocator_type const& __alloc)
       : __ptr_(__ptr), __alloc_(__alloc) {}
 public:
-  _LIBCPP_HIDE_FROM_ABI __basic_node_handle() = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __basic_node_handle() = default;
-  _LIBCPP_HIDE_FROM_ABI __basic_node_handle(__basic_node_handle&& __other) noexcept
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __basic_node_handle(__basic_node_handle&& __other) noexcept
-      : __ptr_(__other.__ptr_), __alloc_(std::move(__other.__alloc_)) {
+      : __ptr_(std::exchange(__other.__ptr_, nullptr)), __alloc_(std::exchange(__other.__alloc_, std::nullopt)) {}
-    __other.__ptr_   = nullptr;
-    __other.__alloc_ = std::nullopt;
-  }
-  _LIBCPP_HIDE_FROM_ABI __basic_node_handle& operator=(__basic_node_handle&& __other) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __basic_node_handle& operator=(__basic_node_handle&& __other) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
         __alloc_ == std::nullopt || __alloc_traits::propagate_on_container_move_assignment::value ||
             __alloc_ == __other.__alloc_,
 @@ -133,24 +132,23 @@ public:
         "node_type::operator=(node_type&&)");
     __destroy_node_pointer();
-    __ptr_ = __other.__ptr_;
+    __ptr_ = std::exchange(__other.__ptr_, nullptr);
     if (__alloc_traits::propagate_on_container_move_assignment::value || __alloc_ == std::nullopt)
       __alloc_ = std::move(__other.__alloc_);
-    __other.__ptr_   = nullptr;
     __other.__alloc_ = std::nullopt;
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const { return *__alloc_; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 allocator_type get_allocator() const { return *__alloc_; }
-  _LIBCPP_HIDE_FROM_ABI explicit operator bool() const { return __ptr_ != nullptr; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit operator bool() const { return __ptr_ != nullptr; }
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool empty() const { return __ptr_ == nullptr; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool empty() const { return __ptr_ == nullptr; }
-  _LIBCPP_HIDE_FROM_ABI void swap(__basic_node_handle& __other) noexcept(
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void swap(__basic_node_handle& __other) noexcept(
       __alloc_traits::propagate_on_container_swap::value || __alloc_traits::is_always_equal::value) {
     using std::swap;
     swap(__ptr_, __other.__ptr_);
 @@ -159,19 +157,21 @@ public:
       swap(__alloc_, __other.__alloc_);
   }
-  _LIBCPP_HIDE_FROM_ABI friend void
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 friend void
   swap(__basic_node_handle& __a, __basic_node_handle& __b) noexcept(noexcept(__a.swap(__b))) {
     __a.swap(__b);
   }
-  _LIBCPP_HIDE_FROM_ABI ~__basic_node_handle() { __destroy_node_pointer(); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 ~__basic_node_handle() { __destroy_node_pointer(); }
 };
 template <class _NodeType, class _Derived>
 struct __set_node_handle_specifics {
   typedef typename _NodeType::__node_value_type value_type;
-  _LIBCPP_HIDE_FROM_ABI value_type& value() const { return static_cast<_Derived const*>(this)->__ptr_->__get_value(); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 value_type& value() const {
+    return static_cast<_Derived const*>(this)->__ptr_->__get_value();
+  }
 };
 template <class _NodeType, class _Derived>
 @@ -179,6 +179,7 @@ struct __map_node_handle_specifics {
   using key_type    = __remove_const_t<typename _NodeType::__node_value_type::first_type>;
   using mapped_type = typename _NodeType::__node_value_type::second_type;
+  // This method is not constexpr as per the standard.
   _LIBCPP_HIDE_FROM_ABI key_type& key() const {
     return const_cast<key_type&>(static_cast<_Derived const*>(this)->__ptr_->__get_value().first);
   }
 @@ -201,10 +202,10 @@ struct __insert_return_type {
   _NodeType node;
 };
-#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___NODE_HANDLE

lib/libcxx/include/__numeric/accumulate.h+2-2

...	@@ -23,7 +23,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -23,7 +23,7 @@ _LIBCPP_PUSH_MACROS
23	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
24		24
25	template <class _InputIterator, class _Tp>	25	template <class _InputIterator, class _Tp>
26	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp	26	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp
27	accumulate(_InputIterator __first, _InputIterator __last, _Tp __init) {	27	accumulate(_InputIterator __first, _InputIterator __last, _Tp __init) {
28	for (; __first != __last; ++__first)	28	for (; __first != __last; ++__first)
29	#if _LIBCPP_STD_VER >= 20	29	#if _LIBCPP_STD_VER >= 20
...	@@ -35,7 +35,7 @@ accumulate(_InputIterator __first, _InputIterator __last, _Tp __init) {	...	@@ -35,7 +35,7 @@ accumulate(_InputIterator __first, _InputIterator __last, _Tp __init) {
35	}	35	}
36		36
37	template <class _InputIterator, class _Tp, class _BinaryOperation>	37	template <class _InputIterator, class _Tp, class _BinaryOperation>
38	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp	38	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp
39	accumulate(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOperation __binary_op) {	39	accumulate(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOperation __binary_op) {
40	for (; __first != __last; ++__first)	40	for (; __first != __last; ++__first)
41	#if _LIBCPP_STD_VER >= 20	41	#if _LIBCPP_STD_VER >= 20

lib/libcxx/include/__numeric/gcd_lcm.h+2-2

...	@@ -47,7 +47,7 @@ constexpr _LIBCPP_HIDE_FROM_ABI _Result __abs_in_type(_Source __t) noexcept {	...	@@ -47,7 +47,7 @@ constexpr _LIBCPP_HIDE_FROM_ABI _Result __abs_in_type(_Source __t) noexcept {
47	}	47	}
48		48
49	template <class _Tp, class _Up>	49	template <class _Tp, class _Up>
50	constexpr _LIBCPP_HIDE_FROM_ABI common_type_t<_Tp, _Up> gcd(_Tp __m, _Up __n) {	50	[[nodiscard]] constexpr _LIBCPP_HIDE_FROM_ABI common_type_t<_Tp, _Up> gcd(_Tp __m, _Up __n) {
51	static_assert(is_integral<_Tp>::value && is_integral<_Up>::value, "Arguments to gcd must be integer types");	51	static_assert(is_integral<_Tp>::value && is_integral<_Up>::value, "Arguments to gcd must be integer types");
52	static_assert(!is_same<__remove_cv_t<_Tp>, bool>::value, "First argument to gcd cannot be bool");	52	static_assert(!is_same<__remove_cv_t<_Tp>, bool>::value, "First argument to gcd cannot be bool");
53	static_assert(!is_same<__remove_cv_t<_Up>, bool>::value, "Second argument to gcd cannot be bool");	53	static_assert(!is_same<__remove_cv_t<_Up>, bool>::value, "Second argument to gcd cannot be bool");
...	@@ -95,7 +95,7 @@ constexpr _LIBCPP_HIDE_FROM_ABI common_type_t<_Tp, _Up> gcd(_Tp __m, _Up __n) {	...	@@ -95,7 +95,7 @@ constexpr _LIBCPP_HIDE_FROM_ABI common_type_t<_Tp, _Up> gcd(_Tp __m, _Up __n) {
95	}	95	}
96		96
97	template <class _Tp, class _Up>	97	template <class _Tp, class _Up>
98	constexpr _LIBCPP_HIDE_FROM_ABI common_type_t<_Tp, _Up> lcm(_Tp __m, _Up __n) {	98	[[nodiscard]] constexpr _LIBCPP_HIDE_FROM_ABI common_type_t<_Tp, _Up> lcm(_Tp __m, _Up __n) {
99	static_assert(is_integral<_Tp>::value && is_integral<_Up>::value, "Arguments to lcm must be integer types");	99	static_assert(is_integral<_Tp>::value && is_integral<_Up>::value, "Arguments to lcm must be integer types");
100	static_assert(!is_same<__remove_cv_t<_Tp>, bool>::value, "First argument to lcm cannot be bool");	100	static_assert(!is_same<__remove_cv_t<_Tp>, bool>::value, "First argument to lcm cannot be bool");
101	static_assert(!is_same<__remove_cv_t<_Up>, bool>::value, "Second argument to lcm cannot be bool");	101	static_assert(!is_same<__remove_cv_t<_Up>, bool>::value, "Second argument to lcm cannot be bool");

lib/libcxx/include/__numeric/inner_product.h+2-2

...	@@ -23,7 +23,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -23,7 +23,7 @@ _LIBCPP_PUSH_MACROS
23	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
24		24
25	template <class _InputIterator1, class _InputIterator2, class _Tp>	25	template <class _InputIterator1, class _InputIterator2, class _Tp>
26	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp	26	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp
27	inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init) {	27	inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init) {
28	for (; __first1 != __last1; ++__first1, (void)++__first2)	28	for (; __first1 != __last1; ++__first1, (void)++__first2)
29	#if _LIBCPP_STD_VER >= 20	29	#if _LIBCPP_STD_VER >= 20
...	@@ -35,7 +35,7 @@ inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2	...	@@ -35,7 +35,7 @@ inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2
35	}	35	}
36		36
37	template <class _InputIterator1, class _InputIterator2, class _Tp, class _BinaryOperation1, class _BinaryOperation2>	37	template <class _InputIterator1, class _InputIterator2, class _Tp, class _BinaryOperation1, class _BinaryOperation2>
38	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp inner_product(	38	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp inner_product(
39	_InputIterator1 __first1,	39	_InputIterator1 __first1,
40	_InputIterator1 __last1,	40	_InputIterator1 __last1,
41	_InputIterator2 __first2,	41	_InputIterator2 __first2,

lib/libcxx/include/__numeric/pstl.h+6-6

lib/libcxx/include/__numeric/ranges_iota.h+4-3

 @@ -26,9 +26,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
+#if _LIBCPP_STD_VER >= 23
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 23
 namespace ranges {
 template <typename _Out, typename _Tp>
 using iota_result = ranges::out_value_result<_Out, _Tp>;
 @@ -56,10 +57,10 @@ public:
 inline constexpr auto iota = __iota_fn{};
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___NUMERIC_RANGES_IOTA_H

lib/libcxx/include/__numeric/reduce.h+8-6

 @@ -22,32 +22,34 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
+#if _LIBCPP_STD_VER >= 17
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 17
 template <class _InputIterator, class _Tp, class _BinaryOp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI
-reduce(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOp __b) {
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp reduce(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOp __b) {
   for (; __first != __last; ++__first)
     __init = __b(std::move(__init), *__first);
   return __init;
 }
 template <class _InputIterator, class _Tp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp
 reduce(_InputIterator __first, _InputIterator __last, _Tp __init) {
   return std::reduce(__first, __last, __init, std::plus<>());
 }
 template <class _InputIterator>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 typename iterator_traits<_InputIterator>::value_type
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 typename iterator_traits<_InputIterator>::value_type
 reduce(_InputIterator __first, _InputIterator __last) {
   return std::reduce(__first, __last, typename iterator_traits<_InputIterator>::value_type{});
 }
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___NUMERIC_REDUCE_H

lib/libcxx/include/__numeric/saturation_arithmetic.h+15-15

lib/libcxx/include/__numeric/transform_reduce.h+8-6

 @@ -21,19 +21,20 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
+#if _LIBCPP_STD_VER >= 17
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 17
 template <class _InputIterator, class _Tp, class _BinaryOp, class _UnaryOp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
-transform_reduce(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOp __b, _UnaryOp __u) {
+_Tp transform_reduce(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOp __b, _UnaryOp __u) {
   for (; __first != __last; ++__first)
     __init = __b(std::move(__init), __u(*__first));
   return __init;
 }
 template <class _InputIterator1, class _InputIterator2, class _Tp, class _BinaryOp1, class _BinaryOp2>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp transform_reduce(
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp transform_reduce(
     _InputIterator1 __first1,
     _InputIterator1 __last1,
     _InputIterator2 __first2,
 @@ -46,14 +47,15 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp transform_reduce(
 }
 template <class _InputIterator1, class _InputIterator2, class _Tp>
-_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp
 transform_reduce(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init) {
   return std::transform_reduce(__first1, __last1, __first2, std::move(__init), std::plus<>(), std::multiplies<>());
 }
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___NUMERIC_TRANSFORM_REDUCE_H

lib/libcxx/include/__ostream/basic_ostream.h+2

...	@@ -41,6 +41,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -41,6 +41,7 @@ _LIBCPP_PUSH_MACROS
41	# include <__undef_macros>	41	# include <__undef_macros>
42		42
43	_LIBCPP_BEGIN_NAMESPACE_STD	43	_LIBCPP_BEGIN_NAMESPACE_STD
		44	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
44		45
45	template <class _CharT, class _Traits>	46	template <class _CharT, class _Traits>
46	class basic_ostream : virtual public basic_ios<_CharT, _Traits> {	47	class basic_ostream : virtual public basic_ios<_CharT, _Traits> {
...	@@ -672,6 +673,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ostream<char>;	...	@@ -672,6 +673,7 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ostream<char>;
672	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ostream<wchar_t>;	673	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ostream<wchar_t>;
673	# endif	674	# endif
674		675
		676	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
675	_LIBCPP_END_NAMESPACE_STD	677	_LIBCPP_END_NAMESPACE_STD
676		678
677	_LIBCPP_POP_MACROS	679	_LIBCPP_POP_MACROS

lib/libcxx/include/__ostream/print.h+8-9

 @@ -82,12 +82,14 @@ _LIBCPP_HIDE_FROM_ABI inline void vprint_nonunicode(ostream& __os, string_view _
 //   native Unicode API;
 // Whether the returned FILE* is "a terminal capable of displaying Unicode"
 // is determined in the same way as the print(FILE*, ...) overloads.
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_EXPORTED_FROM_ABI FILE* __get_ostream_file(ostream& __os);
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 #    if _LIBCPP_HAS_UNICODE
 template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
 _LIBCPP_HIDE_FROM_ABI void __vprint_unicode(ostream& __os, string_view __fmt, format_args __args, bool __write_nl) {
-#      if _LIBCPP_AVAILABILITY_HAS_PRINT == 0
+#      ifndef _LIBCPP_WIN32API
   return std::__vprint_nonunicode(__os, __fmt, __args, __write_nl);
 #      else
   FILE* __file = std::__get_ostream_file(__os);
 @@ -110,13 +112,10 @@ _LIBCPP_HIDE_FROM_ABI void __vprint_unicode(ostream& __os, string_view __fmt, fo
 #        endif // _LIBCPP_HAS_EXCEPTIONS
     ostream::sentry __s(__os);
     if (__s) {
-#        ifndef _LIBCPP_WIN32API
+      auto __result = std::vformat(__fmt, __args);
-      __print::__vprint_unicode_posix(__file, __fmt, __args, __write_nl, true);
+      if (__write_nl)
-#        elif _LIBCPP_HAS_WIDE_CHARACTERS
+        __result.push_back('\n');
-    __print::__vprint_unicode_windows(__file, __fmt, __args, __write_nl, true);
+      __print::__output_unicode_windows(__file, __result);
-#        else
-#          error "Windows builds with wchar_t disabled are not supported."
-#        endif
     }
 #        if _LIBCPP_HAS_EXCEPTIONS
 @@ -124,7 +123,7 @@ _LIBCPP_HIDE_FROM_ABI void __vprint_unicode(ostream& __os, string_view __fmt, fo
     __os.__set_badbit_and_consider_rethrow();
   }
 #        endif // _LIBCPP_HAS_EXCEPTIONS
-#      endif   // _LIBCPP_AVAILABILITY_HAS_PRINT
+#      endif   // _LIBCPP_WIN32API
 }
 template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).

lib/libcxx/include/__pstl/backend_fwd.h+20

...	@@ -109,6 +109,13 @@ struct __is_partitioned;	...	@@ -109,6 +109,13 @@ struct __is_partitioned;
109	// optional<bool>	109	// optional<bool>
110	// operator()(_Policy&&, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred) const noexcept;	110	// operator()(_Policy&&, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred) const noexcept;
111		111
		112	template <class _Backend, class _ExecutionPolicy>
		113	struct __find_first_of;
		114	// template <class _Policy, class _ForwardIterator1, class _ForwardIterator2, class _Predicate>
		115	// optional<_ForwardIterator1>
		116	// operator()(_Policy&&, _ForwardIterator1 __first1, _ForwardIterator1 __last1,
		117	// _ForwardIterator2 __first2, _ForwardIterator2 __last2, _Predicate __pred) const noexcept;
		118
112	template <class _Backend, class _ExecutionPolicy>	119	template <class _Backend, class _ExecutionPolicy>
113	struct __for_each;	120	struct __for_each;
114	// template <class _Policy, class _ForwardIterator, class _Function>	121	// template <class _Policy, class _ForwardIterator, class _Function>
...	@@ -159,6 +166,13 @@ struct __generate_n;	...	@@ -159,6 +166,13 @@ struct __generate_n;
159	// optional<__empty>	166	// optional<__empty>
160	// operator()(_Policy&&, _ForwardIterator __first, _Size __n, _Generator __gen) const noexcept;	167	// operator()(_Policy&&, _ForwardIterator __first, _Size __n, _Generator __gen) const noexcept;
161		168
		169	template <class _Backend, class _ExecutionPolicy>
		170	struct __reverse_copy;
		171	// template <class _Policy, class _BidirectionalIterator, class _ForwardIterator>
		172	// optional<_ForwardIterator>
		173	// operator()(_Policy&&, _BidirectionalIterator __first, _BidirectionalIterator __last,
		174	// _ForwardIterator __result) const noexcept;
		175
162	template <class _Backend, class _ExecutionPolicy>	176	template <class _Backend, class _ExecutionPolicy>
163	struct __merge;	177	struct __merge;
164	// template <class _Policy, class _ForwardIterator1, class _ForwardIterator2, class _ForwardOutIterator, class _Comp>	178	// template <class _Policy, class _ForwardIterator1, class _ForwardIterator2, class _ForwardOutIterator, class _Comp>
...	@@ -297,6 +311,12 @@ struct __reduce;	...	@@ -297,6 +311,12 @@ struct __reduce;
297	// operator()(_Policy&&, _ForwardIterator __first, _ForwardIterator __last,	311	// operator()(_Policy&&, _ForwardIterator __first, _ForwardIterator __last,
298	// _Tp __init, _BinaryOperation __op) const noexcept;	312	// _Tp __init, _BinaryOperation __op) const noexcept;
299		313
		314	template <class _Backend, class _ExecutionPolicy>
		315	struct __is_sorted;
		316	// template <class _Policy, class _ForwardIterator, class _Comp>
		317	// optional<bool>
		318	// operator()(_Policy&& __policy, _ForwardIterator __first, _ForwardIterator __last, _Comp&& __comp) const noexcept;
		319
300	} // namespace __pstl	320	} // namespace __pstl
301	_LIBCPP_END_NAMESPACE_STD	321	_LIBCPP_END_NAMESPACE_STD
302		322

lib/libcxx/include/__pstl/backends/default.h+78

...	@@ -12,15 +12,21 @@	...	@@ -12,15 +12,21 @@
12	#include <__algorithm/copy_n.h>	12	#include <__algorithm/copy_n.h>
13	#include <__algorithm/equal.h>	13	#include <__algorithm/equal.h>
14	#include <__algorithm/fill_n.h>	14	#include <__algorithm/fill_n.h>
		15	#include <__algorithm/find.h>
		16	#include <__algorithm/find_if.h>
15	#include <__algorithm/for_each_n.h>	17	#include <__algorithm/for_each_n.h>
		18	#include <__algorithm/is_sorted.h>
16	#include <__config>	19	#include <__config>
17	#include <__functional/identity.h>	20	#include <__functional/identity.h>
18	#include <__functional/not_fn.h>	21	#include <__functional/not_fn.h>
19	#include <__functional/operations.h>	22	#include <__functional/operations.h>
20	#include <__iterator/concepts.h>	23	#include <__iterator/concepts.h>
21	#include <__iterator/iterator_traits.h>	24	#include <__iterator/iterator_traits.h>
		25	#include <__iterator/next.h>
		26	#include <__iterator/reverse_iterator.h>
22	#include <__pstl/backend_fwd.h>	27	#include <__pstl/backend_fwd.h>
23	#include <__pstl/dispatch.h>	28	#include <__pstl/dispatch.h>
		29	#include <__type_traits/desugars_to.h>
24	#include <__utility/empty.h>	30	#include <__utility/empty.h>
25	#include <__utility/forward.h>	31	#include <__utility/forward.h>
26	#include <__utility/move.h>	32	#include <__utility/move.h>
...	@@ -55,6 +61,7 @@ namespace __pstl {	...	@@ -55,6 +61,7 @@ namespace __pstl {
55	// - all_of	61	// - all_of
56	// - none_of	62	// - none_of
57	// - is_partitioned	63	// - is_partitioned
		64	// - find_first_of
58	//	65	//
59	// for_each family	66	// for_each family
60	// ---------------	67	// ---------------
...	@@ -80,6 +87,7 @@ namespace __pstl {	...	@@ -80,6 +87,7 @@ namespace __pstl {
80	// - count	87	// - count
81	// - equal(3 legs)	88	// - equal(3 legs)
82	// - equal	89	// - equal
		90	// - is_sorted
83	// - reduce	91	// - reduce
84	//	92	//
85	// transform and transform_binary family	93	// transform and transform_binary family
...	@@ -89,6 +97,7 @@ namespace __pstl {	...	@@ -89,6 +97,7 @@ namespace __pstl {
89	// - move	97	// - move
90	// - copy	98	// - copy
91	// - copy_n	99	// - copy_n
		100	// - reverse_copy
92	// - rotate_copy	101	// - rotate_copy
93	//	102	//
94		103
...	@@ -178,6 +187,30 @@ struct __is_partitioned<__default_backend_tag, _ExecutionPolicy> {	...	@@ -178,6 +187,30 @@ struct __is_partitioned<__default_backend_tag, _ExecutionPolicy> {
178	}	187	}
179	};	188	};
180		189
		190	template <class _ExecutionPolicy>
		191	struct __find_first_of<__default_backend_tag, _ExecutionPolicy> {
		192	template <class _Policy, class _ForwardIterator1, class _ForwardIterator2, class _Predicate>
		193	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI optional<_ForwardIterator1>
		194	operator()(_Policy&& __policy,
		195	_ForwardIterator1 __first1,
		196	_ForwardIterator1 __last1,
		197	_ForwardIterator2 __first2,
		198	_ForwardIterator2 __last2,
		199	_Predicate&& __pred) const noexcept {
		200	using _FindIf = __dispatch<__find_if, __current_configuration, _ExecutionPolicy>;
		201	using _Ref1 = __iterator_reference<_ForwardIterator1>;
		202	using _Ref2 = __iterator_reference<_ForwardIterator2>;
		203	return _FindIf()(__policy, std::move(__first1), std::move(__last1), [&](_Ref1 __element) {
		204	if constexpr (__desugars_to_v<__equal_tag, _Predicate, _Ref1, _Ref2>) {
		205	// bypass an equality predicate and call directly to std::find() to allow more vectorization
		206	return std::find(__first2, __last2, __element) != __last2;
		207	} else {
		208	return std::find_if(__first2, __last2, [&](_Ref2 __value) { return __pred(__element, __value); }) != __last2;
		209	}
		210	});
		211	}
		212	};
		213
181	//////////////////////////////////////////////////////////////	214	//////////////////////////////////////////////////////////////
182	// for_each family	215	// for_each family
183	//////////////////////////////////////////////////////////////	216	//////////////////////////////////////////////////////////////
...	@@ -388,6 +421,35 @@ struct __reduce<__default_backend_tag, _ExecutionPolicy> {	...	@@ -388,6 +421,35 @@ struct __reduce<__default_backend_tag, _ExecutionPolicy> {
388	}	421	}
389	};	422	};
390		423
		424	template <class _ExecutionPolicy>
		425	struct __is_sorted<__default_backend_tag, _ExecutionPolicy> {
		426	template <class _Policy, class _ForwardIterator, class _Comp>
		427	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI optional<bool>
		428	operator()(_Policy&& __policy, _ForwardIterator __first, _ForwardIterator __last, _Comp&& __comp) const noexcept {
		429	if constexpr (__has_bidirectional_iterator_category<_ForwardIterator>::value) {
		430	if (__first == __last)
		431	return true; // Empty, sorted by definition
		432	_ForwardIterator __first2 = std::next(__first);
		433	if (__first2 == __last)
		434	return true; // Only one element, sorted by definition
		435	--__last; // Make two iterator ranges: [__first, __first + n - 1) and [__first + 1, __first + n)
		436	using _TransformReduce = __dispatch<__transform_reduce_binary, __current_configuration, _ExecutionPolicy>;
		437	using _Ref = __iterator_reference<_ForwardIterator>;
		438	return _TransformReduce()(
		439	__policy,
		440	std::move(__first),
		441	std::move(__last),
		442	std::move(__first2),
		443	true,
		444	std::logical_and{},
		445	[&](_Ref __left, _Ref __right) -> bool { return !__comp(__right, __left); });
		446	} else {
		447	// Currently anything outside bidirectional iterators has to be processed serially
		448	return std::is_sorted(std::move(__first), std::move(__last), std::forward<_Comp>(__comp));
		449	}
		450	}
		451	};
		452
391	//////////////////////////////////////////////////////////////	453	//////////////////////////////////////////////////////////////
392	// transform family	454	// transform family
393	//////////////////////////////////////////////////////////////	455	//////////////////////////////////////////////////////////////
...	@@ -497,6 +559,22 @@ struct __rotate_copy<__default_backend_tag, _ExecutionPolicy> {	...	@@ -497,6 +559,22 @@ struct __rotate_copy<__default_backend_tag, _ExecutionPolicy> {
497	}	559	}
498	};	560	};
499		561
		562	template <class _ExecutionPolicy>
		563	struct __reverse_copy<__default_backend_tag, _ExecutionPolicy> {
		564	template <class _Policy, class _BidirectionalIterator, class _ForwardIterator>
		565	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI optional<_ForwardIterator>
		566	operator()(_Policy&& __policy,
		567	_BidirectionalIterator __first,
		568	_BidirectionalIterator __last,
		569	_ForwardIterator __result) const noexcept {
		570	using _Copy = __dispatch<__copy, __current_configuration, _ExecutionPolicy>;
		571	return _Copy()(__policy,
		572	std::reverse_iterator<_BidirectionalIterator>(std::move(__last)),
		573	std::reverse_iterator<_BidirectionalIterator>(std::move(__first)),
		574	std::move(__result));
		575	}
		576	};
		577
500	} // namespace __pstl	578	} // namespace __pstl
501	_LIBCPP_END_NAMESPACE_STD	579	_LIBCPP_END_NAMESPACE_STD
502		580

lib/libcxx/include/__pstl/backends/libdispatch.h+2

...	@@ -48,6 +48,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -48,6 +48,7 @@ _LIBCPP_PUSH_MACROS
48	#if _LIBCPP_STD_VER >= 17	48	#if _LIBCPP_STD_VER >= 17
49		49
50	_LIBCPP_BEGIN_NAMESPACE_STD	50	_LIBCPP_BEGIN_NAMESPACE_STD
		51	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
51	namespace __pstl {	52	namespace __pstl {
52		53
53	namespace __libdispatch {	54	namespace __libdispatch {
...	@@ -393,6 +394,7 @@ struct __fill<__libdispatch_backend_tag, _ExecutionPolicy>	...	@@ -393,6 +394,7 @@ struct __fill<__libdispatch_backend_tag, _ExecutionPolicy>
393	: __cpu_parallel_fill<__libdispatch_backend_tag, _ExecutionPolicy> {};	394	: __cpu_parallel_fill<__libdispatch_backend_tag, _ExecutionPolicy> {};
394		395
395	} // namespace __pstl	396	} // namespace __pstl
		397	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
396	_LIBCPP_END_NAMESPACE_STD	398	_LIBCPP_END_NAMESPACE_STD
397		399
398	#endif // _LIBCPP_STD_VER >= 17	400	#endif // _LIBCPP_STD_VER >= 17

lib/libcxx/include/__random/bernoulli_distribution.h+7-7

...	@@ -36,7 +36,7 @@ public:	...	@@ -36,7 +36,7 @@ public:
36		36
37	_LIBCPP_HIDE_FROM_ABI explicit param_type(double __p = 0.5) : __p_(__p) {}	37	_LIBCPP_HIDE_FROM_ABI explicit param_type(double __p = 0.5) : __p_(__p) {}
38		38
39	_LIBCPP_HIDE_FROM_ABI double p() const { return __p_; }	39	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double p() const { return __p_; }
40		40
41	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	41	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
42	return __x.__p_ == __y.__p_;	42	return __x.__p_ == __y.__p_;
...	@@ -60,20 +60,20 @@ public:	...	@@ -60,20 +60,20 @@ public:
60		60
61	// generating functions	61	// generating functions
62	template <class _URNG>	62	template <class _URNG>
63	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	63	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
64	return (*this)(__g, __p_);	64	return (*this)(__g, __p_);
65	}	65	}
66	template <class _URNG>	66	template <class _URNG>
67	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	67	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
68		68
69	// property functions	69	// property functions
70	_LIBCPP_HIDE_FROM_ABI double p() const { return __p_.p(); }	70	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double p() const { return __p_.p(); }
71		71
72	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	72	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
73	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	73	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
74		74
75	_LIBCPP_HIDE_FROM_ABI result_type min() const { return false; }	75	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return false; }
76	_LIBCPP_HIDE_FROM_ABI result_type max() const { return true; }	76	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return true; }
77		77
78	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const bernoulli_distribution& __x, const bernoulli_distribution& __y) {	78	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const bernoulli_distribution& __x, const bernoulli_distribution& __y) {
79	return __x.__p_ == __y.__p_;	79	return __x.__p_ == __y.__p_;

lib/libcxx/include/__random/binomial_distribution.h+13-32

 @@ -10,6 +10,7 @@
 #define _LIBCPP___RANDOM_BINOMIAL_DISTRIBUTION_H
 #include <__config>
+#include <__math/gamma.h>
 #include <__random/is_valid.h>
 #include <__random/uniform_real_distribution.h>
 #include <cmath>
 @@ -44,8 +45,8 @@ public:
     _LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __t = 1, double __p = 0.5);
-    _LIBCPP_HIDE_FROM_ABI result_type t() const { return __t_; }
+    [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type t() const { return __t_; }
-    _LIBCPP_HIDE_FROM_ABI double p() const { return __p_; }
+    [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double p() const { return __p_; }
     friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
       return __x.__t_ == __y.__t_ && __x.__p_ == __y.__p_;
 @@ -73,21 +74,21 @@ public:
   // generating functions
   template <class _URNG>
-  _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
     return (*this)(__g, __p_);
   }
   template <class _URNG>
-  _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
   // property functions
-  _LIBCPP_HIDE_FROM_ABI result_type t() const { return __p_.t(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type t() const { return __p_.t(); }
-  _LIBCPP_HIDE_FROM_ABI double p() const { return __p_.p(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double p() const { return __p_.p(); }
-  _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
   _LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
-  _LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }
-  _LIBCPP_HIDE_FROM_ABI result_type max() const { return t(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return t(); }
   friend _LIBCPP_HIDE_FROM_ABI bool operator==(const binomial_distribution& __x, const binomial_distribution& __y) {
     return __x.__p_ == __y.__p_;
 @@ -97,33 +98,13 @@ public:
   }
 };
-// Some libc declares the math functions to be `noexcept`.
-#if _LIBCPP_GLIBC_PREREQ(2, 8) || defined(__LLVM_LIBC__)
-#  define _LIBCPP_LGAMMA_R_NOEXCEPT _NOEXCEPT
-#else
-#  define _LIBCPP_LGAMMA_R_NOEXCEPT
-#endif
-#if !defined(_LIBCPP_MSVCRT_LIKE)
-extern "C" double lgamma_r(double, int*) _LIBCPP_LGAMMA_R_NOEXCEPT;
-#endif
-inline _LIBCPP_HIDE_FROM_ABI double __libcpp_lgamma(double __d) {
-#if defined(_LIBCPP_MSVCRT_LIKE)
-  return lgamma(__d);
-#else
-  int __sign;
-  return lgamma_r(__d, &__sign);
-#endif
-}
 template <class _IntType>
 binomial_distribution<_IntType>::param_type::param_type(result_type __t, double __p) : __t_(__t), __p_(__p) {
   if (0 < __p_ && __p_ < 1) {
     __r0_ = static_cast<result_type>((__t_ + 1) * __p_);
-    __pr_ = std::exp(
+    __pr_ =
-        std::__libcpp_lgamma(__t_ + 1.) - std::__libcpp_lgamma(__r0_ + 1.) - std::__libcpp_lgamma(__t_ - __r0_ + 1.) +
+        std::exp(__math::__lgamma_r(__t_ + 1.) - __math::__lgamma_r(__r0_ + 1.) -
-        __r0_ * std::log(__p_) + (__t_ - __r0_) * std::log(1 - __p_));
+                 __math::__lgamma_r(__t_ - __r0_ + 1.) + __r0_ * std::log(__p_) + (__t_ - __r0_) * std::log(1 - __p_));
     __odds_ratio_ = __p_ / (1 - __p_);
   }
 }

lib/libcxx/include/__random/cauchy_distribution.h+9-9

lib/libcxx/include/__random/chi_squared_distribution.h+7-7

lib/libcxx/include/__random/discard_block_engine.h+9-10

 @@ -54,8 +54,8 @@ public:
   static constexpr result_type _Max = _Engine::max();
 #endif
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Engine::min(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Engine::min(); }
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Engine::max(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Engine::max(); }
   // constructors and seeding functions
   _LIBCPP_HIDE_FROM_ABI discard_block_engine() : __n_(0) {}
 @@ -64,10 +64,9 @@ public:
   _LIBCPP_HIDE_FROM_ABI explicit discard_block_engine(_Engine&& __e) : __e_(std::move(__e)), __n_(0) {}
 #endif // _LIBCPP_CXX03_LANG
   _LIBCPP_HIDE_FROM_ABI explicit discard_block_engine(result_type __sd) : __e_(__sd), __n_(0) {}
-  template <
+  template <class _Sseq,
-      class _Sseq,
+            __enable_if_t<__is_seed_sequence_v<_Sseq, discard_block_engine> && !is_convertible<_Sseq, _Engine>::value,
-      __enable_if_t<__is_seed_sequence<_Sseq, discard_block_engine>::value && !is_convertible<_Sseq, _Engine>::value,
+                          int> = 0>
-                    int> = 0>
   _LIBCPP_HIDE_FROM_ABI explicit discard_block_engine(_Sseq& __q) : __e_(__q), __n_(0) {}
   _LIBCPP_HIDE_FROM_ABI void seed() {
     __e_.seed();
 @@ -77,21 +76,21 @@ public:
     __e_.seed(__sd);
     __n_ = 0;
   }
-  template <class _Sseq, __enable_if_t<__is_seed_sequence<_Sseq, discard_block_engine>::value, int> = 0>
+  template <class _Sseq, __enable_if_t<__is_seed_sequence_v<_Sseq, discard_block_engine>, int> = 0>
   _LIBCPP_HIDE_FROM_ABI void seed(_Sseq& __q) {
     __e_.seed(__q);
     __n_ = 0;
   }
   // generating functions
-  _LIBCPP_HIDE_FROM_ABI result_type operator()();
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()();
   _LIBCPP_HIDE_FROM_ABI void discard(unsigned long long __z) {
     for (; __z; --__z)
-      operator()();
+      (void)operator()();
   }
   // property functions
-  _LIBCPP_HIDE_FROM_ABI const _Engine& base() const _NOEXCEPT { return __e_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const _Engine& base() const _NOEXCEPT { return __e_; }
   template <class _Eng, size_t _Pp, size_t _Rp>
   friend bool

lib/libcxx/include/__random/discrete_distribution.h+7-7

...	@@ -52,7 +52,7 @@ public:	...	@@ -52,7 +52,7 @@ public:
52	template <class _UnaryOperation>	52	template <class _UnaryOperation>
53	_LIBCPP_HIDE_FROM_ABI param_type(size_t __nw, double __xmin, double __xmax, _UnaryOperation __fw);	53	_LIBCPP_HIDE_FROM_ABI param_type(size_t __nw, double __xmin, double __xmax, _UnaryOperation __fw);
54		54
55	_LIBCPP_HIDE_FROM_ABI vector<double> probabilities() const;	55	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<double> probabilities() const;
56		56
57	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	57	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
58	return __x.__p_ == __y.__p_;	58	return __x.__p_ == __y.__p_;
...	@@ -92,20 +92,20 @@ public:	...	@@ -92,20 +92,20 @@ public:
92		92
93	// generating functions	93	// generating functions
94	template <class _URNG>	94	template <class _URNG>
95	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	95	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
96	return (*this)(__g, __p_);	96	return (*this)(__g, __p_);
97	}	97	}
98	template <class _URNG>	98	template <class _URNG>
99	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	99	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
100		100
101	// property functions	101	// property functions
102	_LIBCPP_HIDE_FROM_ABI vector<double> probabilities() const { return __p_.probabilities(); }	102	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<double> probabilities() const { return __p_.probabilities(); }
103		103
104	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	104	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
105	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	105	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
106		106
107	_LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }	107	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }
108	_LIBCPP_HIDE_FROM_ABI result_type max() const { return __p_.__p_.size(); }	108	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return __p_.__p_.size(); }
109		109
110	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const discrete_distribution& __x, const discrete_distribution& __y) {	110	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const discrete_distribution& __x, const discrete_distribution& __y) {
111	return __x.__p_ == __y.__p_;	111	return __x.__p_ == __y.__p_;

lib/libcxx/include/__random/exponential_distribution.h+7-7

lib/libcxx/include/__random/extreme_value_distribution.h+9-9

lib/libcxx/include/__random/fisher_f_distribution.h+9-9

lib/libcxx/include/__random/gamma_distribution.h+9-9

lib/libcxx/include/__random/generate_canonical.h+1-1

...	@@ -27,7 +27,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -27,7 +27,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
27	// generate_canonical	27	// generate_canonical
28		28
29	template <class _RealType, size_t __bits, class _URNG>	29	template <class _RealType, size_t __bits, class _URNG>
30	_LIBCPP_HIDE_FROM_ABI _RealType generate_canonical(_URNG& __g) {	30	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _RealType generate_canonical(_URNG& __g) {
31	const size_t __dt = numeric_limits<_RealType>::digits;	31	const size_t __dt = numeric_limits<_RealType>::digits;
32	const size_t __b = __dt < __bits ? __dt : __bits;	32	const size_t __b = __dt < __bits ? __dt : __bits;
33	#ifdef _LIBCPP_CXX03_LANG	33	#ifdef _LIBCPP_CXX03_LANG

lib/libcxx/include/__random/geometric_distribution.h+7-7

...	@@ -40,7 +40,7 @@ public:	...	@@ -40,7 +40,7 @@ public:
40		40
41	_LIBCPP_HIDE_FROM_ABI explicit param_type(double __p = 0.5) : __p_(__p) {}	41	_LIBCPP_HIDE_FROM_ABI explicit param_type(double __p = 0.5) : __p_(__p) {}
42		42
43	_LIBCPP_HIDE_FROM_ABI double p() const { return __p_; }	43	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double p() const { return __p_; }
44		44
45	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	45	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
46	return __x.__p_ == __y.__p_;	46	return __x.__p_ == __y.__p_;
...	@@ -64,22 +64,22 @@ public:	...	@@ -64,22 +64,22 @@ public:
64		64
65	// generating functions	65	// generating functions
66	template <class _URNG>	66	template <class _URNG>
67	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	67	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
68	return (*this)(__g, __p_);	68	return (*this)(__g, __p_);
69	}	69	}
70	template <class _URNG>	70	template <class _URNG>
71	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p) {	71	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p) {
72	return negative_binomial_distribution<result_type>(1, __p.p())(__g);	72	return negative_binomial_distribution<result_type>(1, __p.p())(__g);
73	}	73	}
74		74
75	// property functions	75	// property functions
76	_LIBCPP_HIDE_FROM_ABI double p() const { return __p_.p(); }	76	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double p() const { return __p_.p(); }
77		77
78	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	78	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
79	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	79	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
80		80
81	_LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }	81	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }
82	_LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::max(); }	82	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::max(); }
83		83
84	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const geometric_distribution& __x, const geometric_distribution& __y) {	84	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const geometric_distribution& __x, const geometric_distribution& __y) {
85	return __x.__p_ == __y.__p_;	85	return __x.__p_ == __y.__p_;

lib/libcxx/include/__random/independent_bits_engine.h+29-35

 @@ -82,8 +82,8 @@ public:
   static_assert(_Min < _Max, "independent_bits_engine invalid parameters");
   // engine characteristics
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
   // constructors and seeding functions
   _LIBCPP_HIDE_FROM_ABI independent_bits_engine() {}
 @@ -94,25 +94,47 @@ public:
   _LIBCPP_HIDE_FROM_ABI explicit independent_bits_engine(result_type __sd) : __e_(__sd) {}
   template <
       class _Sseq,
-      __enable_if_t<__is_seed_sequence<_Sseq, independent_bits_engine>::value && !is_convertible<_Sseq, _Engine>::value,
+      __enable_if_t<__is_seed_sequence_v<_Sseq, independent_bits_engine> && !is_convertible<_Sseq, _Engine>::value,
                     int> = 0>
   _LIBCPP_HIDE_FROM_ABI explicit independent_bits_engine(_Sseq& __q) : __e_(__q) {}
   _LIBCPP_HIDE_FROM_ABI void seed() { __e_.seed(); }
   _LIBCPP_HIDE_FROM_ABI void seed(result_type __sd) { __e_.seed(__sd); }
-  template <class _Sseq, __enable_if_t<__is_seed_sequence<_Sseq, independent_bits_engine>::value, int> = 0>
+  template <class _Sseq, __enable_if_t<__is_seed_sequence_v<_Sseq, independent_bits_engine>, int> = 0>
   _LIBCPP_HIDE_FROM_ABI void seed(_Sseq& __q) {
     __e_.seed(__q);
   }
   // generating functions
-  _LIBCPP_HIDE_FROM_ABI result_type operator()() { return __eval(integral_constant<bool, _Rp != 0>()); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()() {
+    if _LIBCPP_CONSTEXPR (_Rp != 0) {
+      result_type __sp = 0;
+      for (size_t __k = 0; __k < __n0; ++__k) {
+        _Engine_result_type __u;
+        do {
+          __u = __e_() - _Engine::min();
+        } while (__u >= __y0);
+        __sp = static_cast<result_type>(__lshift<__w0>(__sp) + (__u & __mask0));
+      }
+      for (size_t __k = __n0; __k < __n; ++__k) {
+        _Engine_result_type __u;
+        do {
+          __u = __e_() - _Engine::min();
+        } while (__u >= __y1);
+        __sp = static_cast<result_type>(__lshift<__w0 + 1>(__sp) + (__u & __mask1));
+      }
+      return __sp;
+    } else {
+      return static_cast<result_type>(__e_() & __mask0);
+    }
+  }
   _LIBCPP_HIDE_FROM_ABI void discard(unsigned long long __z) {
     for (; __z; --__z)
-      operator()();
+      (void)operator()();
   }
   // property functions
-  _LIBCPP_HIDE_FROM_ABI const _Engine& base() const _NOEXCEPT { return __e_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const _Engine& base() const _NOEXCEPT { return __e_; }
   template <class _Eng, size_t _Wp, class _UInt>
   friend bool operator==(const independent_bits_engine<_Eng, _Wp, _UInt>& __x,
 @@ -131,9 +153,6 @@ public:
   operator>>(basic_istream<_CharT, _Traits>& __is, independent_bits_engine<_Eng, _Wp, _UInt>& __x);
 private:
-  _LIBCPP_HIDE_FROM_ABI result_type __eval(false_type);
-  _LIBCPP_HIDE_FROM_ABI result_type __eval(true_type);
   template <size_t __count,
             __enable_if_t<__count< _Dt, int> = 0> _LIBCPP_HIDE_FROM_ABI static result_type __lshift(result_type __x) {
     return __x << __count;
 @@ -145,31 +164,6 @@ private:
   }
 };
-template <class _Engine, size_t __w, class _UIntType>
-inline _UIntType independent_bits_engine<_Engine, __w, _UIntType>::__eval(false_type) {
-  return static_cast<result_type>(__e_() & __mask0);
-}
-template <class _Engine, size_t __w, class _UIntType>
-_UIntType independent_bits_engine<_Engine, __w, _UIntType>::__eval(true_type) {
-  result_type __sp = 0;
-  for (size_t __k = 0; __k < __n0; ++__k) {
-    _Engine_result_type __u;
-    do {
-      __u = __e_() - _Engine::min();
-    } while (__u >= __y0);
-    __sp = static_cast<result_type>(__lshift<__w0>(__sp) + (__u & __mask0));
-  }
-  for (size_t __k = __n0; __k < __n; ++__k) {
-    _Engine_result_type __u;
-    do {
-      __u = __e_() - _Engine::min();
-    } while (__u >= __y1);
-    __sp = static_cast<result_type>(__lshift<__w0 + 1>(__sp) + (__u & __mask1));
-  }
-  return __sp;
-}
 template <class _Eng, size_t _Wp, class _UInt>
 inline _LIBCPP_HIDE_FROM_ABI bool
 operator==(const independent_bits_engine<_Eng, _Wp, _UInt>& __x, const independent_bits_engine<_Eng, _Wp, _UInt>& __y) {

lib/libcxx/include/__random/is_seed_sequence.h+2-4

 @@ -21,10 +21,8 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Sseq, class _Engine>
-struct __is_seed_sequence {
+inline const bool __is_seed_sequence_v =
-  static _LIBCPP_CONSTEXPR const bool value =
+    !is_convertible<_Sseq, typename _Engine::result_type>::value && !is_same<__remove_cv_t<_Sseq>, _Engine>::value;
-      !is_convertible<_Sseq, typename _Engine::result_type>::value && !is_same<__remove_cv_t<_Sseq>, _Engine>::value;
-};
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__random/linear_congruential_engine.h+26-41

...	@@ -254,8 +254,8 @@ public:	...	@@ -254,8 +254,8 @@ public:
254	static inline _LIBCPP_CONSTEXPR const result_type multiplier = __a;	254	static inline _LIBCPP_CONSTEXPR const result_type multiplier = __a;
255	static inline _LIBCPP_CONSTEXPR const result_type increment = __c;	255	static inline _LIBCPP_CONSTEXPR const result_type increment = __c;
256	static inline _LIBCPP_CONSTEXPR const result_type modulus = __m;	256	static inline _LIBCPP_CONSTEXPR const result_type modulus = __m;
257	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }	257	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
258	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }	258	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
259	static inline _LIBCPP_CONSTEXPR const result_type default_seed = 1u;	259	static inline _LIBCPP_CONSTEXPR const result_type default_seed = 1u;
260		260
261	// constructors and seeding functions	261	// constructors and seeding functions
...	@@ -265,28 +265,43 @@ public:	...	@@ -265,28 +265,43 @@ public:
265	#else	265	#else
266	_LIBCPP_HIDE_FROM_ABI explicit linear_congruential_engine(result_type __s = default_seed) { seed(__s); }	266	_LIBCPP_HIDE_FROM_ABI explicit linear_congruential_engine(result_type __s = default_seed) { seed(__s); }
267	#endif	267	#endif
268	template <class _Sseq, __enable_if_t<__is_seed_sequence<_Sseq, linear_congruential_engine>::value, int> = 0>	268	template <class _Sseq, __enable_if_t<__is_seed_sequence_v<_Sseq, linear_congruential_engine>, int> = 0>
269	_LIBCPP_HIDE_FROM_ABI explicit linear_congruential_engine(_Sseq& __q) {	269	_LIBCPP_HIDE_FROM_ABI explicit linear_congruential_engine(_Sseq& __q) {
270	seed(__q);	270	seed(__q);
271	}	271	}
		272
272	_LIBCPP_HIDE_FROM_ABI void seed(result_type __s = default_seed) {	273	_LIBCPP_HIDE_FROM_ABI void seed(result_type __s = default_seed) {
273	seed(integral_constant<bool, __m == 0>(), integral_constant<bool, __c == 0>(), __s);	274	if _LIBCPP_CONSTEXPR (__m == 0) {
		275	if _LIBCPP_CONSTEXPR (__c == 0)
		276	__x_ = __s == 0 ? 1 : __s;
		277	else
		278	__x_ = __s;
		279	} else {
		280	if _LIBCPP_CONSTEXPR (__c == 0)
		281	__x_ = __s % __m == 0 ? 1 : __s % __m;
		282	else
		283	__x_ = __s % __m;
		284	}
274	}	285	}
275	template <class _Sseq, __enable_if_t<__is_seed_sequence<_Sseq, linear_congruential_engine>::value, int> = 0>	286
		287	template <class _Sseq, __enable_if_t<__is_seed_sequence_v<_Sseq, linear_congruential_engine>, int> = 0>
276	_LIBCPP_HIDE_FROM_ABI void seed(_Sseq& __q) {	288	_LIBCPP_HIDE_FROM_ABI void seed(_Sseq& __q) {
277	__seed(	289	const _LIBCPP_CONSTEXPR unsigned __k =
278	__q,	290	1 + (__m == 0 ? (sizeof(result_type) * __CHAR_BIT__ - 1) / 32 : (__m > 0x100000000ull));
279	integral_constant<unsigned,	291	static_assert(__k <= 2);
280	1 + (__m == 0 ? (sizeof(result_type) * __CHAR_BIT__ - 1) / 32 : (__m > 0x100000000ull))>());	292	uint32_t __ar[__k + 3];
		293	__q.generate(__ar, __ar + __k + 3);
		294	result_type __s = static_cast<result_type>((__ar[3] + (__k == 1 ? 0 : (uint64_t)__ar[4] << 32)) % __m);
		295	__x_ = __c == 0 && __s == 0 ? result_type(1) : __s;
281	}	296	}
282		297
283	// generating functions	298	// generating functions
284	_LIBCPP_HIDE_FROM_ABI result_type operator()() {	299	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()() {
285	return __x_ = static_cast<result_type>(__lce_ta<__a, __c, __m, _Mp>::next(__x_));	300	return __x_ = static_cast<result_type>(__lce_ta<__a, __c, __m, _Mp>::next(__x_));
286	}	301	}
287	_LIBCPP_HIDE_FROM_ABI void discard(unsigned long long __z) {	302	_LIBCPP_HIDE_FROM_ABI void discard(unsigned long long __z) {
288	for (; __z; --__z)	303	for (; __z; --__z)
289	operator()();	304	(void)operator()();
290	}	305	}
291		306
292	friend _LIBCPP_HIDE_FROM_ABI bool	307	friend _LIBCPP_HIDE_FROM_ABI bool
...	@@ -299,16 +314,6 @@ public:	...	@@ -299,16 +314,6 @@ public:
299	}	314	}
300		315
301	private:	316	private:
302	_LIBCPP_HIDE_FROM_ABI void seed(true_type, true_type, result_type __s) { __x_ = __s == 0 ? 1 : __s; }
303	_LIBCPP_HIDE_FROM_ABI void seed(true_type, false_type, result_type __s) { __x_ = __s; }
304	_LIBCPP_HIDE_FROM_ABI void seed(false_type, true_type, result_type __s) { __x_ = __s % __m == 0 ? 1 : __s % __m; }
305	_LIBCPP_HIDE_FROM_ABI void seed(false_type, false_type, result_type __s) { __x_ = __s % __m; }
306
307	template <class _Sseq>
308	_LIBCPP_HIDE_FROM_ABI void __seed(_Sseq& __q, integral_constant<unsigned, 1>);
309	template <class _Sseq>
310	_LIBCPP_HIDE_FROM_ABI void __seed(_Sseq& __q, integral_constant<unsigned, 2>);
311
312	template <class _CharT, class _Traits, class _Up, _Up _Ap, _Up _Cp, _Up _Np>	317	template <class _CharT, class _Traits, class _Up, _Up _Ap, _Up _Cp, _Up _Np>
313	friend basic_ostream<_CharT, _Traits>&	318	friend basic_ostream<_CharT, _Traits>&
314	operator<<(basic_ostream<_CharT, _Traits>& __os, const linear_congruential_engine<_Up, _Ap, _Cp, _Np>&);	319	operator<<(basic_ostream<_CharT, _Traits>& __os, const linear_congruential_engine<_Up, _Ap, _Cp, _Np>&);
...	@@ -318,26 +323,6 @@ private:	...	@@ -318,26 +323,6 @@ private:
318	operator>>(basic_istream<_CharT, _Traits>& __is, linear_congruential_engine<_Up, _Ap, _Cp, _Np>& __x);	323	operator>>(basic_istream<_CharT, _Traits>& __is, linear_congruential_engine<_Up, _Ap, _Cp, _Np>& __x);
319	};	324	};
320		325
321	template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
322	template <class _Sseq>
323	void linear_congruential_engine<_UIntType, __a, __c, __m>::__seed(_Sseq& __q, integral_constant<unsigned, 1>) {
324	const unsigned __k = 1;
325	uint32_t __ar[__k + 3];
326	__q.generate(__ar, __ar + __k + 3);
327	result_type __s = static_cast<result_type>(__ar[3] % __m);
328	__x_ = __c == 0 && __s == 0 ? result_type(1) : __s;
329	}
330
331	template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
332	template <class _Sseq>
333	void linear_congruential_engine<_UIntType, __a, __c, __m>::__seed(_Sseq& __q, integral_constant<unsigned, 2>) {
334	const unsigned __k = 2;
335	uint32_t __ar[__k + 3];
336	__q.generate(__ar, __ar + __k + 3);
337	result_type __s = static_cast<result_type>((__ar[3] + ((uint64_t)__ar[4] << 32)) % __m);
338	__x_ = __c == 0 && __s == 0 ? result_type(1) : __s;
339	}
340
341	template <class _CharT, class _Traits, class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>	326	template <class _CharT, class _Traits, class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
342	inline _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&	327	inline _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>&
343	operator<<(basic_ostream<_CharT, _Traits>& __os, const linear_congruential_engine<_UIntType, __a, __c, __m>& __x) {	328	operator<<(basic_ostream<_CharT, _Traits>& __os, const linear_congruential_engine<_UIntType, __a, __c, __m>& __x) {

lib/libcxx/include/__random/lognormal_distribution.h+9-9

lib/libcxx/include/__random/mersenne_twister_engine.h+73-62

...	@@ -161,8 +161,8 @@ public:	...	@@ -161,8 +161,8 @@ public:
161	static inline _LIBCPP_CONSTEXPR const result_type tempering_c = __c;	161	static inline _LIBCPP_CONSTEXPR const result_type tempering_c = __c;
162	static inline _LIBCPP_CONSTEXPR const size_t tempering_l = __l;	162	static inline _LIBCPP_CONSTEXPR const size_t tempering_l = __l;
163	static inline _LIBCPP_CONSTEXPR const result_type initialization_multiplier = __f;	163	static inline _LIBCPP_CONSTEXPR const result_type initialization_multiplier = __f;
164	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }	164	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
165	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }	165	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
166	static inline _LIBCPP_CONSTEXPR const result_type default_seed = 5489u;	166	static inline _LIBCPP_CONSTEXPR const result_type default_seed = 5489u;
167		167
168	// constructors and seeding functions	168	// constructors and seeding functions
...	@@ -172,7 +172,7 @@ public:	...	@@ -172,7 +172,7 @@ public:
172	#else	172	#else
173	_LIBCPP_HIDE_FROM_ABI explicit mersenne_twister_engine(result_type __sd = default_seed) { seed(__sd); }	173	_LIBCPP_HIDE_FROM_ABI explicit mersenne_twister_engine(result_type __sd = default_seed) { seed(__sd); }
174	#endif	174	#endif
175	template <class _Sseq, __enable_if_t<__is_seed_sequence<_Sseq, mersenne_twister_engine>::value, int> = 0>	175	template <class _Sseq, __enable_if_t<__is_seed_sequence_v<_Sseq, mersenne_twister_engine>, int> = 0>
176	_LIBCPP_HIDE_FROM_ABI explicit mersenne_twister_engine(_Sseq& __q) {	176	_LIBCPP_HIDE_FROM_ABI explicit mersenne_twister_engine(_Sseq& __q) {
177	seed(__q);	177	seed(__q);
178	}	178	}
...	@@ -181,21 +181,68 @@ public:	...	@@ -181,21 +181,68 @@ public:
181	for (size_t __i = 1; __i < __n; ++__i)	181	for (size_t __i = 1; __i < __n; ++__i)
182	__x_[__i] = (__f * (__x_[__i - 1] ^ __rshift<__w - 2>(__x_[__i - 1])) + __i) & _Max;	182	__x_[__i] = (__f * (__x_[__i - 1] ^ __rshift<__w - 2>(__x_[__i - 1])) + __i) & _Max;
183	__i_ = 0;	183	__i_ = 0;
		184	#ifdef _LIBCPP_ABI_VECTORIZED_MERSENNE_TWISTER_ENGINE
		185	__update_all_states();
		186	#endif
184	}	187	}
185	template <class _Sseq, __enable_if_t<__is_seed_sequence<_Sseq, mersenne_twister_engine>::value, int> = 0>	188	template <class _Sseq, __enable_if_t<__is_seed_sequence_v<_Sseq, mersenne_twister_engine>, int> = 0>
186	_LIBCPP_HIDE_FROM_ABI void seed(_Sseq& __q) {	189	_LIBCPP_HIDE_FROM_ABI void seed(_Sseq& __q) {
187	__seed(__q, integral_constant<unsigned, 1 + (__w - 1) / 32>());	190	const unsigned __k = 1 + (__w - 1) / 32;
		191	static_assert(__k <= 2);
		192	uint32_t __ar[__n * __k];
		193	__q.generate(__ar, __ar + __n * __k);
		194	for (size_t __i = 0; __i < __n; ++__i) {
		195	if _LIBCPP_CONSTEXPR (__k == 1) {
		196	__x_[__i] = static_cast<result_type>(__ar[__i] & _Max);
		197	} else {
		198	__x_[__i] = static_cast<result_type>((__ar[2 * __i] + ((uint64_t)__ar[2 * __i + 1] << 32)) & _Max);
		199	}
		200	}
		201	const result_type __mask = __r == _Dt ? result_type(~0) : (result_type(1) << __r) - result_type(1);
		202	__i_ = 0;
		203	if ((__x_[0] & ~__mask) == 0) {
		204	for (size_t __i = 1; __i < __n; ++__i)
		205	if (__x_[__i] != 0)
		206	return;
		207	__x_[0] = result_type(1) << (__w - 1);
		208	}
		209	#ifdef _LIBCPP_ABI_VECTORIZED_MERSENNE_TWISTER_ENGINE
		210	__update_all_states();
		211	#endif
188	}	212	}
189		213
190	// generating functions	214	void __update_state(size_t __i, size_t __k) {
191	_LIBCPP_HIDE_FROM_ABI result_type operator()() {	215	const size_t __j = (__i + 1) % __n;
192	const size_t __j = (__i_ + 1) % __n;
193	const result_type __mask = __r == _Dt ? result_type(~0) : (result_type(1) << __r) - result_type(1);	216	const result_type __mask = __r == _Dt ? result_type(~0) : (result_type(1) << __r) - result_type(1);
194	const result_type __yp = (__x_[__i_] & ~__mask) \| (__x_[__j] & __mask);	217	const result_type __yp = (__x_[__i] & ~__mask) \| (__x_[__j] & __mask);
195	const size_t __k = (__i_ + __m) % __n;	218	__x_[__i] = __x_[__k] ^ __rshift<1>(__yp) ^ (__a * (__yp & 1));
196	__x_[__i_] = __x_[__k] ^ __rshift<1>(__yp) ^ (__a * (__yp & 1));	219	}
197	result_type __z = __x_[__i_] ^ (__rshift<__u>(__x_[__i_]) & __d);	220
198	__i_ = __j;	221	void __update_state(size_t __i) { __update_state(__i, (__i + __m) % __n); }
		222
		223	void __update_all_states() {
		224	size_t __i = 0;
		225	// This is split into two loops to help the compiler vectorize the code
		226	for (; __i != (__n - __m); ++__i)
		227	__update_state(__i);
		228	for (size_t __j = 0; __i != __n; ++__i, ++__j)
		229	__update_state(__i, __j);
		230	}
		231
		232	// generating functions
		233	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()() {
		234	#ifdef _LIBCPP_ABI_VECTORIZED_MERSENNE_TWISTER_ENGINE
		235	result_type __val = __x_[__i_];
		236	if (++__i_ == __n) [[__unlikely__]] {
		237	__update_all_states();
		238	__i_ = 0;
		239	}
		240	#else
		241	__update_state(__i_);
		242	result_type __val = __x_[__i_];
		243	__i_ = (__i_ + 1) % __n;
		244	#endif
		245	result_type __z = __val ^ (__rshift<__u>(__val) & __d);
199	__z ^= __lshift<__s>(__z) & __b;	246	__z ^= __lshift<__s>(__z) & __b;
200	__z ^= __lshift<__t>(__z) & __c;	247	__z ^= __lshift<__t>(__z) & __c;
201	return __z ^ __rshift<__l>(__z);	248	return __z ^ __rshift<__l>(__z);
...	@@ -203,7 +250,7 @@ public:	...	@@ -203,7 +250,7 @@ public:
203		250
204	_LIBCPP_HIDE_FROM_ABI void discard(unsigned long long __z) {	251	_LIBCPP_HIDE_FROM_ABI void discard(unsigned long long __z) {
205	for (; __z; --__z)	252	for (; __z; --__z)
206	operator()();	253	(void)operator()();
207	}	254	}
208		255
209	template <class _UInt,	256	template <class _UInt,
...	@@ -265,59 +312,23 @@ public:	...	@@ -265,59 +312,23 @@ public:
265	mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp, _Bp, _Tp, _Cp, _Lp, _Fp>& __x);	312	mersenne_twister_engine<_UInt, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp, _Bp, _Tp, _Cp, _Lp, _Fp>& __x);
266		313
267	private:	314	private:
268	template <class _Sseq>	315	template <size_t __count>
269	_LIBCPP_HIDE_FROM_ABI void __seed(_Sseq& __q, integral_constant<unsigned, 1>) {	316	_LIBCPP_HIDE_FROM_ABI static result_type __lshift(result_type __x) {
270	const unsigned __k = 1;	317	if _LIBCPP_CONSTEXPR (__count < __w) {
271	uint32_t __ar[__n * __k];	318	return (__x << __count) & _Max;
272	__q.generate(__ar, __ar + __n * __k);	319	} else {
273	for (size_t __i = 0; __i < __n; ++__i)	320	return result_type(0);
274	__x_[__i] = static_cast<result_type>(__ar[__i] & _Max);
275	const result_type __mask = __r == _Dt ? result_type(~0) : (result_type(1) << __r) - result_type(1);
276	__i_ = 0;
277	if ((__x_[0] & ~__mask) == 0) {
278	for (size_t __i = 1; __i < __n; ++__i)
279	if (__x_[__i] != 0)
280	return;
281	__x_[0] = result_type(1) << (__w - 1);
282	}	321	}
283	}	322	}
284		323
285	template <class _Sseq>	324	template <size_t __count>
286	_LIBCPP_HIDE_FROM_ABI void __seed(_Sseq& __q, integral_constant<unsigned, 2>) {	325	_LIBCPP_HIDE_FROM_ABI static result_type __rshift(result_type __x) {
287	const unsigned __k = 2;	326	if _LIBCPP_CONSTEXPR (__count < _Dt) {
288	uint32_t __ar[__n * __k];	327	return __x >> __count;
289	__q.generate(__ar, __ar + __n * __k);	328	} else {
290	for (size_t __i = 0; __i < __n; ++__i)	329	return result_type(0);
291	__x_[__i] = static_cast<result_type>((__ar[2 * __i] + ((uint64_t)__ar[2 * __i + 1] << 32)) & _Max);
292	const result_type __mask = __r == _Dt ? result_type(~0) : (result_type(1) << __r) - result_type(1);
293	__i_ = 0;
294	if ((__x_[0] & ~__mask) == 0) {
295	for (size_t __i = 1; __i < __n; ++__i)
296	if (__x_[__i] != 0)
297	return;
298	__x_[0] = result_type(1) << (__w - 1);
299	}	330	}
300	}	331	}
301
302	template <size_t __count,
303	__enable_if_t<__count< __w, int> = 0> _LIBCPP_HIDE_FROM_ABI static result_type __lshift(result_type __x) {
304	return (__x << __count) & _Max;
305	}
306
307	template <size_t __count, __enable_if_t<(__count >= __w), int> = 0>
308	_LIBCPP_HIDE_FROM_ABI static result_type __lshift(result_type) {
309	return result_type(0);
310	}
311
312	template <size_t __count,
313	__enable_if_t<__count< _Dt, int> = 0> _LIBCPP_HIDE_FROM_ABI static result_type __rshift(result_type __x) {
314	return __x >> __count;
315	}
316
317	template <size_t __count, __enable_if_t<(__count >= _Dt), int> = 0>
318	_LIBCPP_HIDE_FROM_ABI static result_type __rshift(result_type) {
319	return result_type(0);
320	}
321	};	332	};
322		333
323	template <class _UInt,	334	template <class _UInt,

lib/libcxx/include/__random/negative_binomial_distribution.h+9-9

lib/libcxx/include/__random/normal_distribution.h+9-9

lib/libcxx/include/__random/piecewise_constant_distribution.h+9-9

lib/libcxx/include/__random/piecewise_linear_distribution.h+9-9

lib/libcxx/include/__random/poisson_distribution.h+7-7

lib/libcxx/include/__random/random_device.h+11-13

 @@ -19,27 +19,24 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_HAS_RANDOM_DEVICE
+_LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 class _LIBCPP_EXPORTED_FROM_ABI random_device {
 #  ifdef _LIBCPP_USING_DEV_RANDOM
   int __f_;
 #  elif !defined(_LIBCPP_ABI_NO_RANDOM_DEVICE_COMPATIBILITY_LAYOUT)
-  _LIBCPP_DIAGNOSTIC_PUSH
-  _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wunused-private-field")
   // Apple platforms used to use the `_LIBCPP_USING_DEV_RANDOM` code path, and now
   // use `arc4random()` as of this comment. In order to avoid breaking the ABI, we
   // retain the same layout as before.
 #    if defined(__APPLE__)
-  int __padding_; // padding to fake the `__f_` field above
+  [[__maybe_unused__]] int __padding_; // padding to fake the `__f_` field above
 #    endif
   // ... vendors can add workarounds here if they switch to a different representation ...
-  _LIBCPP_DIAGNOSTIC_POP
 #  endif
 public:
 @@ -50,8 +47,8 @@ public:
   static _LIBCPP_CONSTEXPR const result_type _Min = 0;
   static _LIBCPP_CONSTEXPR const result_type _Max = 0xFFFFFFFFu;
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
   // constructors
 #  ifndef _LIBCPP_CXX03_LANG
 @@ -63,19 +60,20 @@ public:
   ~random_device();
   // generating functions
-  result_type operator()();
+  [[__nodiscard__]] result_type operator()();
   // property functions
-  double entropy() const _NOEXCEPT;
+  [[__nodiscard__]] double entropy() const _NOEXCEPT;
   random_device(const random_device&)  = delete;
   void operator=(const random_device&) = delete;
 };
-#endif // _LIBCPP_HAS_RANDOM_DEVICE
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_HAS_RANDOM_DEVICE
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___RANDOM_RANDOM_DEVICE_H

lib/libcxx/include/__random/seed_seq.h+2-2

...	@@ -56,7 +56,7 @@ public:	...	@@ -56,7 +56,7 @@ public:
56	_LIBCPP_HIDE_FROM_ABI void generate(_RandomAccessIterator __first, _RandomAccessIterator __last);	56	_LIBCPP_HIDE_FROM_ABI void generate(_RandomAccessIterator __first, _RandomAccessIterator __last);
57		57
58	// property functions	58	// property functions
59	_LIBCPP_HIDE_FROM_ABI size_t size() const _NOEXCEPT { return __v_.size(); }	59	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_t size() const _NOEXCEPT { return __v_.size(); }
60	template <class _OutputIterator>	60	template <class _OutputIterator>
61	_LIBCPP_HIDE_FROM_ABI void param(_OutputIterator __dest) const {	61	_LIBCPP_HIDE_FROM_ABI void param(_OutputIterator __dest) const {
62	std::copy(__v_.begin(), __v_.end(), __dest);	62	std::copy(__v_.begin(), __v_.end(), __dest);
...	@@ -65,7 +65,7 @@ public:	...	@@ -65,7 +65,7 @@ public:
65	seed_seq(const seed_seq&) = delete;	65	seed_seq(const seed_seq&) = delete;
66	void operator=(const seed_seq&) = delete;	66	void operator=(const seed_seq&) = delete;
67		67
68	_LIBCPP_HIDE_FROM_ABI static result_type _Tp(result_type __x) { return __x ^ (__x >> 27); }	68	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static result_type _Tp(result_type __x) { return __x ^ (__x >> 27); }
69		69
70	private:	70	private:
71	template <class _InputIterator>	71	template <class _InputIterator>

lib/libcxx/include/__random/shuffle_order_engine.h+23-33

 @@ -76,8 +76,8 @@ public:
   static _LIBCPP_CONSTEXPR const result_type _Max = _Engine::max();
 #endif
   static_assert(_Min < _Max, "shuffle_order_engine invalid parameters");
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-  _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
   static _LIBCPP_CONSTEXPR const unsigned long long _Rp = _Max - _Min + 1ull;
 @@ -88,10 +88,9 @@ public:
   _LIBCPP_HIDE_FROM_ABI explicit shuffle_order_engine(_Engine&& __e) : __e_(std::move(__e)) { __init(); }
 #endif // _LIBCPP_CXX03_LANG
   _LIBCPP_HIDE_FROM_ABI explicit shuffle_order_engine(result_type __sd) : __e_(__sd) { __init(); }
-  template <
+  template <class _Sseq,
-      class _Sseq,
+            __enable_if_t<__is_seed_sequence_v<_Sseq, shuffle_order_engine> && !is_convertible<_Sseq, _Engine>::value,
-      __enable_if_t<__is_seed_sequence<_Sseq, shuffle_order_engine>::value && !is_convertible<_Sseq, _Engine>::value,
+                          int> = 0>
-                    int> = 0>
   _LIBCPP_HIDE_FROM_ABI explicit shuffle_order_engine(_Sseq& __q) : __e_(__q) {
     __init();
   }
 @@ -103,21 +102,35 @@ public:
     __e_.seed(__sd);
     __init();
   }
-  template <class _Sseq, __enable_if_t<__is_seed_sequence<_Sseq, shuffle_order_engine>::value, int> = 0>
+  template <class _Sseq, __enable_if_t<__is_seed_sequence_v<_Sseq, shuffle_order_engine>, int> = 0>
   _LIBCPP_HIDE_FROM_ABI void seed(_Sseq& __q) {
     __e_.seed(__q);
     __init();
   }
   // generating functions
-  _LIBCPP_HIDE_FROM_ABI result_type operator()() { return __eval(integral_constant<bool, _Rp != 0>()); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()() {
+    if _LIBCPP_CONSTEXPR (_Rp != 0 || !(__k & 1)) {
+      using _Ratio = __uratio<__k, _Rp != 0 ? _Rp : 0x8000000000000000ull>;
+      if _LIBCPP_CONSTEXPR (_Ratio::num > 0xFFFFFFFFFFFFFFFFull / (_Max - _Min)) {
+        return __evalf<_Ratio::num, _Ratio::den>();
+      } else {
+        const size_t __j = static_cast<size_t>(_Ratio::num * (__y_ - _Min) / _Ratio::den);
+        __y_             = __v_[__j];
+        __v_[__j]        = __e_();
+        return __y_;
+      }
+    } else
+      return __evalf<__k, 0>();
+  }
   _LIBCPP_HIDE_FROM_ABI void discard(unsigned long long __z) {
     for (; __z; --__z)
-      operator()();
+      (void)operator()();
   }
   // property functions
-  _LIBCPP_HIDE_FROM_ABI const _Engine& base() const _NOEXCEPT { return __e_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const _Engine& base() const _NOEXCEPT { return __e_; }
 private:
   template <class _Eng, size_t _Kp>
 @@ -140,29 +153,6 @@ private:
     __y_ = __e_();
   }
-  _LIBCPP_HIDE_FROM_ABI result_type __eval(false_type) { return __eval2(integral_constant<bool, __k & 1>()); }
-  _LIBCPP_HIDE_FROM_ABI result_type __eval(true_type) { return __eval(__uratio<__k, _Rp>()); }
-  _LIBCPP_HIDE_FROM_ABI result_type __eval2(false_type) { return __eval(__uratio<__k / 2, 0x8000000000000000ull>()); }
-  _LIBCPP_HIDE_FROM_ABI result_type __eval2(true_type) { return __evalf<__k, 0>(); }
-  template <uint64_t _Np,
-            uint64_t _Dp,
-            __enable_if_t<(__uratio<_Np, _Dp>::num > 0xFFFFFFFFFFFFFFFFull / (_Max - _Min)), int> = 0>
-  _LIBCPP_HIDE_FROM_ABI result_type __eval(__uratio<_Np, _Dp>) {
-    return __evalf<__uratio<_Np, _Dp>::num, __uratio<_Np, _Dp>::den>();
-  }
-  template <uint64_t _Np,
-            uint64_t _Dp,
-            __enable_if_t<__uratio<_Np, _Dp>::num <= 0xFFFFFFFFFFFFFFFFull / (_Max - _Min), int> = 0>
-  _LIBCPP_HIDE_FROM_ABI result_type __eval(__uratio<_Np, _Dp>) {
-    const size_t __j = static_cast<size_t>(__uratio<_Np, _Dp>::num * (__y_ - _Min) / __uratio<_Np, _Dp>::den);
-    __y_             = __v_[__j];
-    __v_[__j]        = __e_();
-    return __y_;
-  }
   template <uint64_t __n, uint64_t __d>
   _LIBCPP_HIDE_FROM_ABI result_type __evalf() {
     const double __fp = __d == 0 ? __n / (2. * 0x8000000000000000ull) : __n / (double)__d;

lib/libcxx/include/__random/student_t_distribution.h+7-7

...	@@ -43,7 +43,7 @@ public:	...	@@ -43,7 +43,7 @@ public:
43		43
44	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __n = 1) : __n_(__n) {}	44	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __n = 1) : __n_(__n) {}
45		45
46	_LIBCPP_HIDE_FROM_ABI result_type n() const { return __n_; }	46	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type n() const { return __n_; }
47		47
48	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	48	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
49	return __x.__n_ == __y.__n_;	49	return __x.__n_ == __y.__n_;
...	@@ -68,20 +68,20 @@ public:	...	@@ -68,20 +68,20 @@ public:
68		68
69	// generating functions	69	// generating functions
70	template <class _URNG>	70	template <class _URNG>
71	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	71	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
72	return (*this)(__g, __p_);	72	return (*this)(__g, __p_);
73	}	73	}
74	template <class _URNG>	74	template <class _URNG>
75	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	75	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
76		76
77	// property functions	77	// property functions
78	_LIBCPP_HIDE_FROM_ABI result_type n() const { return __p_.n(); }	78	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type n() const { return __p_.n(); }
79		79
80	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	80	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
81	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	81	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
82		82
83	_LIBCPP_HIDE_FROM_ABI result_type min() const { return -numeric_limits<result_type>::infinity(); }	83	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return -numeric_limits<result_type>::infinity(); }
84	_LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }	84	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }
85		85
86	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const student_t_distribution& __x, const student_t_distribution& __y) {	86	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const student_t_distribution& __x, const student_t_distribution& __y) {
87	return __x.__p_ == __y.__p_;	87	return __x.__p_ == __y.__p_;

lib/libcxx/include/__random/subtract_with_carry_engine.h+31-60

...	@@ -75,8 +75,8 @@ public:	...	@@ -75,8 +75,8 @@ public:
75	static inline _LIBCPP_CONSTEXPR const size_t word_size = __w;	75	static inline _LIBCPP_CONSTEXPR const size_t word_size = __w;
76	static inline _LIBCPP_CONSTEXPR const size_t short_lag = __s;	76	static inline _LIBCPP_CONSTEXPR const size_t short_lag = __s;
77	static inline _LIBCPP_CONSTEXPR const size_t long_lag = __r;	77	static inline _LIBCPP_CONSTEXPR const size_t long_lag = __r;
78	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }	78	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
79	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }	79	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
80	static inline _LIBCPP_CONSTEXPR const result_type default_seed = 19780503u;	80	static inline _LIBCPP_CONSTEXPR const result_type default_seed = 19780503u;
81		81
82	// constructors and seeding functions	82	// constructors and seeding functions
...	@@ -86,23 +86,46 @@ public:	...	@@ -86,23 +86,46 @@ public:
86	#else	86	#else
87	_LIBCPP_HIDE_FROM_ABI explicit subtract_with_carry_engine(result_type __sd = default_seed) { seed(__sd); }	87	_LIBCPP_HIDE_FROM_ABI explicit subtract_with_carry_engine(result_type __sd = default_seed) { seed(__sd); }
88	#endif	88	#endif
89	template <class _Sseq, __enable_if_t<__is_seed_sequence<_Sseq, subtract_with_carry_engine>::value, int> = 0>	89	template <class _Sseq, __enable_if_t<__is_seed_sequence_v<_Sseq, subtract_with_carry_engine>, int> = 0>
90	_LIBCPP_HIDE_FROM_ABI explicit subtract_with_carry_engine(_Sseq& __q) {	90	_LIBCPP_HIDE_FROM_ABI explicit subtract_with_carry_engine(_Sseq& __q) {
91	seed(__q);	91	seed(__q);
92	}	92	}
		93
93	_LIBCPP_HIDE_FROM_ABI void seed(result_type __sd = default_seed) {	94	_LIBCPP_HIDE_FROM_ABI void seed(result_type __sd = default_seed) {
94	seed(__sd, integral_constant<unsigned, 1 + (__w - 1) / 32>());	95	linear_congruential_engine<result_type, 40014u, 0u, 2147483563u> __e(__sd == 0u ? default_seed : __sd);
		96	for (size_t __i = 0; __i < __r; ++__i) {
		97	if _LIBCPP_CONSTEXPR ((1 + (__w - 1) / 32) == 1) {
		98	__x_[__i] = static_cast<result_type>(__e() & _Max);
		99	} else {
		100	result_type __e0 = __e();
		101	__x_[__i] = static_cast<result_type>((__e0 + ((uint64_t)__e() << 32)) & _Max);
		102	}
		103	}
		104	__c_ = __x_[__r - 1] == 0;
		105	__i_ = 0;
95	}	106	}
96	template <class _Sseq, __enable_if_t<__is_seed_sequence<_Sseq, subtract_with_carry_engine>::value, int> = 0>	107
		108	template <class _Sseq, __enable_if_t<__is_seed_sequence_v<_Sseq, subtract_with_carry_engine>, int> = 0>
97	_LIBCPP_HIDE_FROM_ABI void seed(_Sseq& __q) {	109	_LIBCPP_HIDE_FROM_ABI void seed(_Sseq& __q) {
98	__seed(__q, integral_constant<unsigned, 1 + (__w - 1) / 32>());	110	const unsigned __k = 1 + (__w - 1) / 32;
		111	static_assert(__k <= 2);
		112	uint32_t __ar[__r * __k];
		113	__q.generate(__ar, __ar + __r * __k);
		114	for (size_t __i = 0; __i < __r; ++__i) {
		115	if _LIBCPP_CONSTEXPR (__k == 1)
		116	__x_[__i] = static_cast<result_type>(__ar[__i] & _Max);
		117	else
		118	__x_[__i] = static_cast<result_type>((__ar[2 * __i] + ((uint64_t)__ar[2 * __i + 1] << 32)) & _Max);
		119	}
		120	__c_ = __x_[__r - 1] == 0;
		121	__i_ = 0;
99	}	122	}
100		123
101	// generating functions	124	// generating functions
102	_LIBCPP_HIDE_FROM_ABI result_type operator()();	125	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()();
103	_LIBCPP_HIDE_FROM_ABI void discard(unsigned long long __z) {	126	_LIBCPP_HIDE_FROM_ABI void discard(unsigned long long __z) {
104	for (; __z; --__z)	127	for (; __z; --__z)
105	operator()();	128	(void)operator()();
106	}	129	}
107		130
108	template <class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>	131	template <class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>
...	@@ -120,60 +143,8 @@ public:	...	@@ -120,60 +143,8 @@ public:
120	template <class _CharT, class _Traits, class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>	143	template <class _CharT, class _Traits, class _UInt, size_t _Wp, size_t _Sp, size_t _Rp>
121	friend basic_istream<_CharT, _Traits>&	144	friend basic_istream<_CharT, _Traits>&
122	operator>>(basic_istream<_CharT, _Traits>& __is, subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x);	145	operator>>(basic_istream<_CharT, _Traits>& __is, subtract_with_carry_engine<_UInt, _Wp, _Sp, _Rp>& __x);
123
124	private:
125	_LIBCPP_HIDE_FROM_ABI void seed(result_type __sd, integral_constant<unsigned, 1>);
126	_LIBCPP_HIDE_FROM_ABI void seed(result_type __sd, integral_constant<unsigned, 2>);
127	template <class _Sseq>
128	_LIBCPP_HIDE_FROM_ABI void __seed(_Sseq& __q, integral_constant<unsigned, 1>);
129	template <class _Sseq>
130	_LIBCPP_HIDE_FROM_ABI void __seed(_Sseq& __q, integral_constant<unsigned, 2>);
131	};	146	};
132		147
133	template <class _UIntType, size_t __w, size_t __s, size_t __r>
134	void subtract_with_carry_engine<_UIntType, __w, __s, __r>::seed(result_type __sd, integral_constant<unsigned, 1>) {
135	linear_congruential_engine<result_type, 40014u, 0u, 2147483563u> __e(__sd == 0u ? default_seed : __sd);
136	for (size_t __i = 0; __i < __r; ++__i)
137	__x_[__i] = static_cast<result_type>(__e() & _Max);
138	__c_ = __x_[__r - 1] == 0;
139	__i_ = 0;
140	}
141
142	template <class _UIntType, size_t __w, size_t __s, size_t __r>
143	void subtract_with_carry_engine<_UIntType, __w, __s, __r>::seed(result_type __sd, integral_constant<unsigned, 2>) {
144	linear_congruential_engine<result_type, 40014u, 0u, 2147483563u> __e(__sd == 0u ? default_seed : __sd);
145	for (size_t __i = 0; __i < __r; ++__i) {
146	result_type __e0 = __e();
147	__x_[__i] = static_cast<result_type>((__e0 + ((uint64_t)__e() << 32)) & _Max);
148	}
149	__c_ = __x_[__r - 1] == 0;
150	__i_ = 0;
151	}
152
153	template <class _UIntType, size_t __w, size_t __s, size_t __r>
154	template <class _Sseq>
155	void subtract_with_carry_engine<_UIntType, __w, __s, __r>::__seed(_Sseq& __q, integral_constant<unsigned, 1>) {
156	const unsigned __k = 1;
157	uint32_t __ar[__r * __k];
158	__q.generate(__ar, __ar + __r * __k);
159	for (size_t __i = 0; __i < __r; ++__i)
160	__x_[__i] = static_cast<result_type>(__ar[__i] & _Max);
161	__c_ = __x_[__r - 1] == 0;
162	__i_ = 0;
163	}
164
165	template <class _UIntType, size_t __w, size_t __s, size_t __r>
166	template <class _Sseq>
167	void subtract_with_carry_engine<_UIntType, __w, __s, __r>::__seed(_Sseq& __q, integral_constant<unsigned, 2>) {
168	const unsigned __k = 2;
169	uint32_t __ar[__r * __k];
170	__q.generate(__ar, __ar + __r * __k);
171	for (size_t __i = 0; __i < __r; ++__i)
172	__x_[__i] = static_cast<result_type>((__ar[2 * __i] + ((uint64_t)__ar[2 * __i + 1] << 32)) & _Max);
173	__c_ = __x_[__r - 1] == 0;
174	__i_ = 0;
175	}
176
177	template <class _UIntType, size_t __w, size_t __s, size_t __r>	148	template <class _UIntType, size_t __w, size_t __s, size_t __r>
178	_UIntType subtract_with_carry_engine<_UIntType, __w, __s, __r>::operator()() {	149	_UIntType subtract_with_carry_engine<_UIntType, __w, __s, __r>::operator()() {
179	const result_type& __xs = __x_[(__i_ + (__r - __s)) % __r];	150	const result_type& __xs = __x_[(__i_ + (__r - __s)) % __r];

lib/libcxx/include/__random/uniform_int_distribution.h+9-9

lib/libcxx/include/__random/uniform_random_bit_generator.h+4-4

 @@ -23,10 +23,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [rand.req.urng]
 template <class _Gen>
 concept uniform_random_bit_generator = invocable<_Gen&> && unsigned_integral<invoke_result_t<_Gen&>> && requires {
 @@ -35,10 +35,10 @@ concept uniform_random_bit_generator = invocable<_Gen&> && unsigned_integral<inv
   requires bool_constant<(_Gen::min() < _Gen::max())>::value;
 };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H

lib/libcxx/include/__random/uniform_real_distribution.h+9-9

lib/libcxx/include/__random/weibull_distribution.h+9-9

lib/libcxx/include/__ranges/access.h+4-4

 @@ -27,10 +27,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <class _Tp>
 concept __can_borrow = is_lvalue_reference_v<_Tp> || enable_borrowed_range<remove_cvref_t<_Tp>>;
 @@ -203,8 +203,8 @@ inline constexpr auto cend = __cend::__fn{};
 } // namespace __cpo
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_ACCESS_H

lib/libcxx/include/__ranges/adjacent_transform_view.h+20-19

 @@ -19,6 +19,7 @@
 #include <__concepts/derived_from.h>
 #include <__concepts/equality_comparable.h>
 #include <__concepts/invocable.h>
+#include <__concepts/referenceable.h>
 #include <__cstddef/size_t.h>
 #include <__functional/bind_back.h>
 #include <__functional/invoke.h>
 @@ -45,7 +46,6 @@
 #include <__type_traits/decay.h>
 #include <__type_traits/is_nothrow_constructible.h>
 #include <__type_traits/is_object.h>
-#include <__type_traits/is_referenceable.h>
 #include <__type_traits/make_unsigned.h>
 #include <__type_traits/maybe_const.h>
 #include <__utility/declval.h>
 @@ -105,22 +105,22 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr explicit adjacent_transform_view(_View __base, _Fn __fun)
       : __inner_(std::move(__base)), __fun_(std::in_place, std::move(__fun)) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
     requires copy_constructible<_View>
   {
     return __inner_.base();
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__inner_).base(); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__inner_).base(); }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin() { return __iterator<false>(*this, __inner_.begin()); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() { return __iterator<false>(*this, __inner_.begin()); }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
     requires range<const _InnerView> && regular_invocable<__apply_n<const _Fn&, _Np>, range_reference_t<const _View>>
   {
     return __iterator<true>(*this, __inner_.begin());
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end() {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() {
     if constexpr (common_range<_InnerView>) {
       return __iterator<false>(*this, __inner_.end());
     } else {
 @@ -128,7 +128,7 @@ public:
     }
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
     requires range<const _InnerView> && regular_invocable<__apply_n<const _Fn&, _Np>, range_reference_t<const _View>>
   {
     if constexpr (common_range<const _InnerView>) {
 @@ -138,13 +138,13 @@ public:
     }
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto size()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size()
     requires sized_range<_InnerView>
   {
     return __inner_.size();
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
     requires sized_range<const _InnerView>
   {
     return __inner_.size();
 @@ -202,7 +202,7 @@ public:
     requires _Const && convertible_to<__inner_iterator<false>, __inner_iterator<true>>
       : __parent_(__i.__parent_), __inner_(std::move(__i.__inner_)) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const
       noexcept(__noexcept_dereference(make_index_sequence<_Np>{})) {
     return std::apply(
         [&](const auto&... __iters) -> decltype(auto) { return std::invoke(*__parent_->__fun_, *__iters...); },
 @@ -249,7 +249,7 @@ public:
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const
     requires random_access_range<_Base>
   {
     return std::apply(
 @@ -291,25 +291,26 @@ public:
     return __x.__inner_ <=> __y.__inner_;
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n)
     requires random_access_range<_Base>
   {
     return __iterator(*__i.__parent_, __i.__inner_ + __n);
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i)
     requires random_access_range<_Base>
   {
     return __iterator(*__i.__parent_, __i.__inner_ + __n);
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n)
     requires random_access_range<_Base>
   {
     return __iterator(*__i.__parent_, __i.__inner_ - __n);
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type operator-(const __iterator& __x, const __iterator& __y)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
+  operator-(const __iterator& __x, const __iterator& __y)
     requires sized_sentinel_for<__inner_iterator<_Const>, __inner_iterator<_Const>>
   {
     return __x.__inner_ - __y.__inner_;
 @@ -344,14 +345,14 @@ public:
   template <bool _OtherConst>
     requires sized_sentinel_for<__inner_sentinel<_Const>, __inner_iterator<_OtherConst>>
-  _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _InnerView>>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _InnerView>>
   operator-(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
     return __x.__inner_ - __y.__inner_;
   }
   template <bool _OtherConst>
     requires sized_sentinel_for<__inner_sentinel<_Const>, __inner_iterator<_OtherConst>>
-  _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _InnerView>>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _InnerView>>
   operator-(const __sentinel& __x, const __iterator<_OtherConst>& __y) {
     return __x.__inner_ - __y.__inner_;
   }
 @@ -364,14 +365,14 @@ template <size_t _Np>
 struct __fn : __range_adaptor_closure<__fn<_Np>> {
   template <class _Range, class _Fn>
     requires(_Np == 0 && forward_range<_Range &&>)
-  _LIBCPP_HIDE_FROM_ABI static constexpr auto
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto
   operator()(_Range&&, _Fn&& __fn) noexcept(noexcept(views::zip_transform(std::forward<_Fn>(__fn))))
       -> decltype(views::zip_transform(std::forward<_Fn>(__fn))) {
     return views::zip_transform(std::forward<_Fn>(__fn));
   }
   template <class _Range, class _Fn>
-  _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Range&& __range, _Fn&& __fn) noexcept(
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Range&& __range, _Fn&& __fn) noexcept(
       noexcept(adjacent_transform_view<views::all_t<_Range&&>, decay_t<_Fn>, _Np>(
           std::forward<_Range>(__range), std::forward<_Fn>(__fn))))
       -> decltype(adjacent_transform_view<views::all_t<_Range&&>, decay_t<_Fn>, _Np>(

lib/libcxx/include/__ranges/adjacent_view.h+19-18

 @@ -81,26 +81,26 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr explicit adjacent_view(_View __base) : __base_(std::move(__base)) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
     requires copy_constructible<_View>
   {
     return __base_;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin()
     requires(!__simple_view<_View>)
   {
     return __iterator<false>(ranges::begin(__base_), ranges::end(__base_));
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
     requires range<const _View> // LWG4482 This is under-constrained.
   {
     return __iterator<true>(ranges::begin(__base_), ranges::end(__base_));
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end()
     requires(!__simple_view<_View>)
   {
     if constexpr (common_range<_View>) {
 @@ -110,7 +110,7 @@ public:
     }
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
     requires range<const _View> // LWG4482 This is under-constrained.
   {
     if constexpr (common_range<const _View>) {
 @@ -120,7 +120,7 @@ public:
     }
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto size()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size()
     requires sized_range<_View>
   {
     using _ST = decltype(ranges::size(__base_));
 @@ -130,7 +130,7 @@ public:
     return static_cast<_ST>(__sz);
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
     requires sized_range<const _View>
   {
     using _ST = decltype(ranges::size(__base_));
 @@ -205,7 +205,7 @@ public:
     requires _Const && convertible_to<iterator_t<_View>, iterator_t<const _View>>
       : __iterator(std::move(__i), make_index_sequence<_Np>{}) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr auto operator*() const {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator*() const {
     return std::__tuple_transform([](auto& __i) -> decltype(auto) { return *__i; }, __current_);
   }
 @@ -257,7 +257,7 @@ public:
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto operator[](difference_type __n) const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator[](difference_type __n) const
     requires random_access_range<_Base>
   {
     return std::__tuple_transform([&](auto& __i) -> decltype(auto) { return __i[__n]; }, __current_);
 @@ -297,7 +297,7 @@ public:
     return __x.__current_.back() <=> __y.__current_.back();
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n)
     requires random_access_range<_Base>
   {
     auto __r = __i;
 @@ -305,13 +305,13 @@ public:
     return __r;
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i)
     requires random_access_range<_Base>
   {
     return __i + __n;
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n)
     requires random_access_range<_Base>
   {
     auto __r = __i;
 @@ -319,7 +319,8 @@ public:
     return __r;
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type operator-(const __iterator& __x, const __iterator& __y)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
+  operator-(const __iterator& __x, const __iterator& __y)
     requires sized_sentinel_for<iterator_t<_Base>, iterator_t<_Base>>
   {
     return __x.__current_.back() - __y.__current_.back();
 @@ -366,14 +367,14 @@ public:
   template <bool _OtherConst>
     requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
-  _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
   operator-(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
     return __x.__current_.back() - __y.__end_;
   }
   template <bool _OtherConst>
     requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
-  _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
   operator-(const __sentinel& __y, const __iterator<_OtherConst>& __x) {
     return __y.__end_ - __x.__current_.back();
   }
 @@ -389,12 +390,12 @@ template <size_t _Np>
 struct __fn : __range_adaptor_closure<__fn<_Np>> {
   template <class _Range>
     requires(_Np == 0 && forward_range<_Range &&>)
-  _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Range&&) noexcept {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Range&&) noexcept {
     return empty_view<tuple<>>{};
   }
   template <class _Ranges>
-  _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Ranges&& __range) noexcept(
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()(_Ranges&& __range) noexcept(
       noexcept(adjacent_view<views::all_t<_Ranges&&>, _Np>(std::forward<_Ranges>(__range))))
       -> decltype(adjacent_view<views::all_t<_Ranges&&>, _Np>(std::forward<_Ranges>(__range))) {
     return adjacent_view<views::all_t<_Ranges&&>, _Np>(std::forward<_Ranges>(__range));

lib/libcxx/include/__ranges/all.h+4-4

 @@ -29,10 +29,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges::views {
 namespace __all {
 @@ -71,8 +71,8 @@ using all_t = decltype(views::all(std::declval<_Range>()));
 } // namespace ranges::views
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_ALL_H

lib/libcxx/include/__ranges/chunk_by_view.h+1-1

...	@@ -54,7 +54,7 @@ namespace ranges {	...	@@ -54,7 +54,7 @@ namespace ranges {
54		54
55	template <forward_range _View, indirect_binary_predicate<iterator_t<_View>, iterator_t<_View>> _Pred>	55	template <forward_range _View, indirect_binary_predicate<iterator_t<_View>, iterator_t<_View>> _Pred>
56	requires view<_View> && is_object_v<_Pred>	56	requires view<_View> && is_object_v<_Pred>
57	class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS chunk_by_view : public view_interface<chunk_by_view<_View, _Pred>> {	57	class _LIBCPP_LLVM18_NO_UNIQUE_ADDRESS_ABI_TAG chunk_by_view : public view_interface<chunk_by_view<_View, _Pred>> {
58	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();	58	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();
59	_LIBCPP_NO_UNIQUE_ADDRESS __movable_box<_Pred> __pred_;	59	_LIBCPP_NO_UNIQUE_ADDRESS __movable_box<_Pred> __pred_;
60		60

lib/libcxx/include/__ranges/concat_view.h created+651

...	@@ -0,0 +1,651 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___RANGES_CONCAT_VIEW_H
11	#define _LIBCPP___RANGES_CONCAT_VIEW_H
12
13	#include <__assert>
14	#include <__concepts/common_reference_with.h>
15	#include <__concepts/constructible.h>
16	#include <__concepts/convertible_to.h>
17	#include <__concepts/copyable.h>
18	#include <__concepts/derived_from.h>
19	#include <__concepts/equality_comparable.h>
20	#include <__concepts/swappable.h>
21	#include <__config>
22	#include <__iterator/concepts.h>
23	#include <__iterator/default_sentinel.h>
24	#include <__iterator/distance.h>
25	#include <__iterator/incrementable_traits.h>
26	#include <__iterator/iter_move.h>
27	#include <__iterator/iter_swap.h>
28	#include <__iterator/iterator_traits.h>
29	#include <__iterator/next.h>
30	#include <__ranges/access.h>
31	#include <__ranges/all.h>
32	#include <__ranges/concepts.h>
33	#include <__ranges/movable_box.h>
34	#include <__ranges/range_adaptor.h>
35	#include <__ranges/size.h>
36	#include <__ranges/view_interface.h>
37	#include <__tuple/tuple_transform.h>
38	#include <__type_traits/conditional.h>
39	#include <__type_traits/decay.h>
40	#include <__type_traits/is_nothrow_constructible.h>
41	#include <__type_traits/make_unsigned.h>
42	#include <__type_traits/maybe_const.h>
43	#include <__utility/forward.h>
44	#include <__utility/in_place.h>
45	#include <__utility/move.h>
46	#include <tuple>
47	#include <variant>
48
49	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
50	# pragma GCC system_header
51	#endif
52
53	_LIBCPP_PUSH_MACROS
54	#include <__undef_macros>
55
56	_LIBCPP_BEGIN_NAMESPACE_STD
57
58	#if _LIBCPP_STD_VER >= 26
59
60	namespace ranges {
61
62	# ifdef __cpp_pack_indexing
63	template <class... _Tp>
64	using __extract_last _LIBCPP_NODEBUG = _Tp...[sizeof...(_Tp) - 1];
65	# else
66	template <class _Tp, class... _Tail>
67	struct __extract_last_impl : __extract_last_impl<_Tail...> {};
68	template <class _Tp>
69	struct __extract_last_impl<_Tp> {
70	using type _LIBCPP_NODEBUG = _Tp;
71	};
72
73	template <class... _Tp>
74	using __extract_last _LIBCPP_NODEBUG = __extract_last_impl<_Tp...>::type;
75	# endif
76
77	template <bool _Const, class... _Tp>
78	struct __all_but_first_model_sized_range;
79
80	template <bool _Const, class _Head, class... _Tail>
81	struct __all_but_first_model_sized_range<_Const, _Head, _Tail...> {
82	static constexpr bool value = (sized_range<__maybe_const<_Const, _Tail>> && ...);
83	};
84
85	template <bool _Const, class... _Views>
86	concept __all_random_access = (random_access_range<__maybe_const<_Const, _Views>> && ...);
87
88	template <bool _Const, class... _Views>
89	concept __all_bidirectional = (bidirectional_range<__maybe_const<_Const, _Views>> && ...);
90
91	template <bool _Const, class... _Views>
92	concept __all_forward = (forward_range<__maybe_const<_Const, _Views>> && ...);
93
94	template <bool _Const, class _First, class... _Tail>
95	struct __all_common_ignore_last {
96	static constexpr bool value =
97	common_range<__maybe_const<_Const, _First>> && __all_common_ignore_last<_Const, _Tail...>::value;
98	};
99
100	template <bool _Const, class _Tail>
101	struct __all_common_ignore_last<_Const, _Tail> {
102	static constexpr bool value = true;
103	};
104
105	template <bool _Const, class... _Rs>
106	concept __concat_is_random_access =
107	(__all_random_access<_Const, _Rs...>) && (__all_common_ignore_last<_Const, _Rs...>::value);
108
109	template <bool _Const, class... _Rs>
110	concept __concat_is_bidirectional =
111	(__all_bidirectional<_Const, _Rs...>) && (__all_common_ignore_last<_Const, _Rs...>::value);
112
113	template <input_range... _Views>
114	requires((view<_Views> && ...) && (sizeof...(_Views) > 0) && __concatable<_Views...>)
115	class concat_view : public view_interface<concat_view<_Views...>> {
116	tuple<_Views...> __views_;
117
118	template <bool _Const>
119	class __iterator;
120
121	public:
122	_LIBCPP_HIDE_FROM_ABI constexpr concat_view() = default;
123
124	_LIBCPP_HIDE_FROM_ABI constexpr explicit concat_view(_Views... __views) : __views_(std::move(__views)...) {}
125
126	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr __iterator<false> begin()
127	requires(!(__simple_view<_Views> && ...))
128	{
129	__iterator<false> __it(this, in_place_index<0>, ranges::begin(std::get<0>(__views_)));
130	__it.template __satisfy<0>();
131	return __it;
132	}
133
134	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr __iterator<true> begin() const
135	requires((range<const _Views> && ...) && __concatable<const _Views...>)
136	{
137	__iterator<true> __it(this, in_place_index<0>, ranges::begin(std::get<0>(__views_)));
138	__it.template __satisfy<0>();
139	return __it;
140	}
141
142	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end()
143	requires(!(__simple_view<_Views> && ...))
144	{
145	if constexpr (__all_forward<false, _Views...> && common_range<__maybe_const<false, __extract_last<_Views...>>>) {
146	constexpr auto __n = sizeof...(_Views);
147	return __iterator<false>(this, in_place_index<__n - 1>, ranges::end(std::get<__n - 1>(__views_)));
148	} else {
149	return default_sentinel;
150	}
151	}
152
153	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
154	requires((range<const _Views> && ...) && __concatable<const _Views...>)
155	{
156	if constexpr (__all_forward<true, _Views...> && common_range<__maybe_const<true, __extract_last<_Views...>>>) {
157	constexpr auto __n = sizeof...(_Views);
158	return __iterator<true>(this, in_place_index<__n - 1>, ranges::end(std::get<__n - 1>(__views_)));
159	} else {
160	return default_sentinel;
161	}
162	}
163
164	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size()
165	requires(sized_range<_Views> && ...)
166	{
167	return std::apply(
168	[](auto... __sizes) { return (make_unsigned_t<common_type_t<decltype(__sizes)...>>(__sizes) + ...); },
169	std::__tuple_transform(ranges::size, __views_));
170	}
171
172	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
173	requires(sized_range<const _Views> && ...)
174	{
175	return std::apply(
176	[](auto... __sizes) { return (make_unsigned_t<common_type_t<decltype(__sizes)...>>(__sizes) + ...); },
177	std::__tuple_transform(ranges::size, __views_));
178	}
179	};
180
181	template <class... _Views>
182	concat_view(_Views&&...) -> concat_view<views::all_t<_Views>...>;
183
184	template <bool _Const, typename... _Views>
185	struct __concat_view_iterator_category {};
186
187	template <bool _Const, typename... _Views>
188	requires __all_forward<_Const, _Views...>
189	struct __concat_view_iterator_category<_Const, _Views...> {
190	private:
191	constexpr static bool __derive_pack_random_iterator =
192	(derived_from<typename iterator_traits<iterator_t<__maybe_const<_Const, _Views>>>::iterator_category,
193	random_access_iterator_tag> &&
194	...);
195	constexpr static bool __derive_pack_bidirectional_iterator =
196	(derived_from<typename iterator_traits<iterator_t<__maybe_const<_Const, _Views>>>::iterator_category,
197	bidirectional_iterator_tag> &&
198	...);
199	constexpr static bool __derive_pack_forward_iterator =
200	(derived_from<typename iterator_traits< iterator_t<__maybe_const<_Const, _Views>>>::iterator_category,
201	forward_iterator_tag> &&
202	...);
203
204	public:
205	using iterator_category =
206	_If<!is_reference_v<__concat_reference_t<__maybe_const<_Const, _Views>...>>,
207	input_iterator_tag,
208	_If<__derive_pack_random_iterator,
209	random_access_iterator_tag,
210	_If<__derive_pack_bidirectional_iterator,
211	bidirectional_iterator_tag,
212	_If<__derive_pack_forward_iterator, forward_iterator_tag, input_iterator_tag > > > >;
213	};
214
215	template <input_range... _Views>
216	requires((view<_Views> && ...) && (sizeof...(_Views) > 0) && __concatable<_Views...>)
217	template <bool _Const>
218	class concat_view<_Views...>::__iterator : public __concat_view_iterator_category<_Const, _Views...> {
219	public:
220	using iterator_concept =
221	_If<__concat_is_random_access<_Const, _Views...>,
222	random_access_iterator_tag,
223	_If<__concat_is_bidirectional<_Const, _Views...>,
224	bidirectional_iterator_tag,
225	_If< __all_forward<_Const, _Views...>, forward_iterator_tag, input_iterator_tag > > >;
226	using value_type = __concat_value_t<__maybe_const<_Const, _Views>...>;
227	using difference_type = common_type_t<range_difference_t<__maybe_const<_Const, _Views>>...>;
228
229	private:
230	using __base_iter _LIBCPP_NODEBUG = variant<iterator_t<__maybe_const<_Const, _Views>>...>;
231	__base_iter __it_;
232	__maybe_const<_Const, concat_view>* __parent_ = nullptr;
233
234	template <size_t _Idx>
235	_LIBCPP_HIDE_FROM_ABI constexpr void __satisfy() {
236	if constexpr (_Idx < (sizeof...(_Views) - 1)) {
237	if (std::get<_Idx>(__it_) == ranges::end(std::get<_Idx>(__parent_->__views_))) {
238	__it_.template emplace<_Idx + 1>(ranges::begin(std::get<_Idx + 1>(__parent_->__views_)));
239	__satisfy<_Idx + 1>();
240	}
241	}
242	}
243
244	template <size_t _Idx>
245	_LIBCPP_HIDE_FROM_ABI constexpr void __prev() {
246	if constexpr (_Idx == 0) {
247	--std::get<0>(__it_);
248	} else {
249	if (std::get<_Idx>(__it_) == ranges::begin(std::get<_Idx>(__parent_->__views_))) {
250	__it_.template emplace<_Idx - 1>(ranges::end(std::get<_Idx - 1>(__parent_->__views_)));
251	__prev<_Idx - 1>();
252	} else {
253	--std::get<_Idx>(__it_);
254	}
255	}
256	}
257
258	template <size_t _Idx>
259	_LIBCPP_HIDE_FROM_ABI constexpr void __advance_fwd(difference_type __offset, difference_type __steps) {
260	using __underlying_diff_type = iter_difference_t<variant_alternative_t<_Idx, __base_iter>>;
261	if constexpr (_Idx == sizeof...(_Views) - 1) {
262	std::get<_Idx>(__it_) += static_cast<__underlying_diff_type>(__steps);
263	} else {
264	auto __n_size = ranges::distance(std::get<_Idx>(__parent_->__views_));
265	if (__offset + __steps < __n_size) {
266	std::get<_Idx>(__it_) += static_cast<__underlying_diff_type>(__steps);
267	} else {
268	__it_.template emplace<_Idx + 1>(ranges::begin(std::get<_Idx + 1>(__parent_->__views_)));
269	__advance_fwd<_Idx + 1>(0, __offset + __steps - __n_size);
270	}
271	}
272	}
273
274	template <size_t _Idx>
275	_LIBCPP_HIDE_FROM_ABI constexpr void __advance_bwd(difference_type __offset, difference_type __steps) {
276	using __underlying_diff_type = iter_difference_t<variant_alternative_t<_Idx, __base_iter>>;
277	if constexpr (_Idx == 0) {
278	std::get<_Idx>(__it_) -= static_cast<__underlying_diff_type>(__steps);
279	} else {
280	if (__offset >= __steps) {
281	std::get<_Idx>(__it_) -= static_cast<__underlying_diff_type>(__steps);
282	} else {
283	auto __prev_size = ranges::distance(std::get<_Idx - 1>(__parent_->__views_));
284	__it_.template emplace<_Idx - 1>(ranges::end(std::get<_Idx - 1>(__parent_->__views_)));
285	__advance_bwd<_Idx - 1>(__prev_size, __steps - __offset);
286	}
287	}
288	}
289
290	template <typename _Func>
291	_LIBCPP_HIDE_FROM_ABI constexpr auto __invoke_at_index(_Func&& __func) const {
292	// TODO(GCC 16): Just capture `this` when GCC PR113563 and PR121008 are fixed.
293	return [&__func, &__view_iter = *this]<std::size_t _Is>(this auto&& __self) {
294	if (_Is == __view_iter.__it_.index()) {
295	return __func.template operator()<_Is>();
296	}
297	if constexpr (_Is + 1 < sizeof...(_Views)) {
298	return __self.template operator()<_Is + 1>();
299	}
300	__builtin_unreachable();
301	}.template operator()<0>();
302	}
303
304	template <size_t... _Is, typename _Func>
305	_LIBCPP_HIDE_FROM_ABI constexpr void __apply_at_index(size_t __index, _Func&& __func, index_sequence<_Is...>) const {
306	((__index == _Is ? (static_cast<void>(__func(integral_constant<size_t, _Is>{})), 0) : 0), ...);
307	}
308
309	template <size_t _Idx, typename _Func>
310	_LIBCPP_HIDE_FROM_ABI constexpr void __apply_at_index(size_t __index, _Func&& __func) const {
311	__apply_at_index(__index, std::forward<_Func>(__func), make_index_sequence<_Idx>{});
312	}
313
314	template <class... _Args>
315	_LIBCPP_HIDE_FROM_ABI explicit constexpr __iterator(__maybe_const<_Const, concat_view>* __parent, _Args&&... __args)
316	requires constructible_from<__base_iter, _Args&&...>
317	: __it_(std::forward<_Args>(__args)...), __parent_(__parent) {}
318
319	friend class concat_view;
320	friend class __iterator<!_Const>;
321
322	public:
323	_LIBCPP_HIDE_FROM_ABI __iterator() = default;
324
325	_LIBCPP_HIDE_FROM_ABI constexpr __iterator(__iterator<!_Const> __i)
326	requires _Const && (convertible_to<iterator_t<_Views>, iterator_t<const _Views>> && ...)
327	: __it_([&__src = __i.__it_]<size_t... _Indices>(size_t __idx, index_sequence<_Indices...>) -> __base_iter {
328	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
329	!__src.valueless_by_exception(), "Trying to convert from a valueless iterator of concat_view.");
330	using __src_lref = decltype((__src));
331	using __construction_fptr = __base_iter (*)(__src_lref);
332	static constexpr __construction_fptr __vtable[]{[](__src_lref __src_var) -> __base_iter {
333	return __base_iter(in_place_index<_Indices>, std::__unchecked_get<_Indices>(std::move(__src_var)));
334	}...};
335	return __vtable[__idx](__src);
336	}(__i.__it_.index(), make_index_sequence<variant_size_v<__base_iter>>{})),
337	__parent_(__i.__parent_) {}
338
339	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const {
340	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
341	!__it_.valueless_by_exception(), "Trying to dereference a valueless iterator of concat_view.");
342	return __variant_detail::__visitation::__variant::__visit_value(
343	[](auto&& __it) -> __concat_reference_t<__maybe_const<_Const, _Views>...> { return *__it; }, __it_);
344	}
345
346	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator++() {
347	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
348	!__it_.valueless_by_exception(), "Trying to increment a valueless iterator of concat_view.");
349	size_t __active_index = __it_.index();
350	__apply_at_index<variant_size_v<decltype(__it_)>>(__active_index, [&](auto __index_constant) {
351	constexpr size_t __i = __index_constant.value;
352	++std::__unchecked_get<__i>(__it_);
353	__satisfy<__i>();
354	});
355	return *this;
356	}
357
358	_LIBCPP_HIDE_FROM_ABI constexpr void operator++(int) { ++*this; }
359
360	_LIBCPP_HIDE_FROM_ABI constexpr __iterator operator++(int)
361	requires(__all_forward<_Const, _Views...>)
362	{
363	auto __tmp = *this;
364	++*this;
365	return __tmp;
366	}
367
368	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator--()
369	requires __concat_is_bidirectional<_Const, _Views...>
370	{
371	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
372	!__it_.valueless_by_exception(), "Trying to decrement a valueless iterator of concat_view.");
373	size_t __active_index = __it_.index();
374	__apply_at_index<variant_size_v<decltype(__it_)>>(__active_index, [&](auto __index_constant) {
375	constexpr size_t __i = __index_constant.value;
376	__prev<__i>();
377	});
378	return *this;
379	}
380
381	_LIBCPP_HIDE_FROM_ABI constexpr __iterator operator--(int)
382	requires __concat_is_bidirectional<_Const, _Views...>
383	{
384	auto __tmp = *this;
385	--*this;
386	return __tmp;
387	}
388
389	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __x, const __iterator& __y)
390	requires(equality_comparable<iterator_t<__maybe_const<_Const, _Views>>> && ...)
391	{
392	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
393	"Trying to compare a valueless iterator of concat_view.");
394	return __x.__it_ == __y.__it_;
395	}
396
397	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const
398	requires __concat_is_random_access<_Const, _Views...>
399	{
400	return ((this) + __n);
401	}
402
403	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __it, difference_type __n)
404	requires __concat_is_random_access<_Const, _Views...>
405	{
406	auto __temp = __it;
407	__temp += __n;
408	return __temp;
409	}
410
411	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __it)
412	requires __concat_is_random_access<_Const, _Views...>
413	{
414	return __it + __n;
415	}
416
417	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator+=(difference_type __n)
418	requires __concat_is_random_access<_Const, _Views...>
419	{
420	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
421	!__it_.valueless_by_exception(), "Trying to increment a valueless iterator of concat_view.");
422	size_t __active_index = __it_.index();
423	if (__n > 0) {
424	__apply_at_index<tuple_size_v<decltype(__parent_->__views_)>>(__active_index, [&](auto __index_constant) {
425	constexpr size_t __i = __index_constant.value;
426	auto& __active_view = std::get<__i>(__parent_->__views_);
427	difference_type __idx = std::get<__i>(__it_) - ranges::begin(__active_view);
428	__advance_fwd<__i>(__idx, __n);
429	});
430
431	}
432
433	else if (__n < 0) {
434	__apply_at_index<tuple_size_v<decltype(__parent_->__views_)>>(__active_index, [&](auto __index_constant) {
435	constexpr size_t __i = __index_constant.value;
436	auto& __active_view = std::get<__i>(__parent_->__views_);
437	difference_type __idx = std::get<__i>(__it_) - ranges::begin(__active_view);
438	__advance_bwd<__i>(__idx, -__n);
439	});
440	}
441
442	return *this;
443	}
444
445	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator-=(difference_type __n)
446	requires __concat_is_random_access<_Const, _Views...>
447	{
448	*this += -__n;
449	return *this;
450	}
451
452	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __it, default_sentinel_t) {
453	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
454	!__it.__it_.valueless_by_exception(),
455	"Trying to compare a valueless iterator of concat_view with the default sentinel.");
456	constexpr auto __last_idx = sizeof...(_Views) - 1;
457	return __it.__it_.index() == __last_idx &&
458	std::__unchecked_get<__last_idx>(__it.__it_) == ranges::end(std::get<__last_idx>(__it.__parent_->__views_));
459	}
460
461	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator<(const __iterator& __x, const __iterator& __y)
462	requires(__all_random_access<_Const, _Views> && ...)
463	{
464	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
465	"Trying to compare a valueless iterator of concat_view.");
466	return __x.__it_ < __y.__it_;
467	}
468
469	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator>(const __iterator& __x, const __iterator& __y)
470	requires(__all_random_access<_Const, _Views> && ...)
471	{
472	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
473	"Trying to compare a valueless iterator of concat_view.");
474	return __x.__it_ > __y.__it_;
475	}
476
477	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator<=(const __iterator& __x, const __iterator& __y)
478	requires(__all_random_access<_Const, _Views> && ...)
479	{
480	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
481	"Trying to compare a valueless iterator of concat_view.");
482	return __x.__it_ <= __y.__it_;
483	}
484
485	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator>=(const __iterator& __x, const __iterator& __y)
486	requires(__all_random_access<_Const, _Views> && ...)
487	{
488	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
489	"Trying to compare a valueless iterator of concat_view.");
490	return __x.__it_ >= __y.__it_;
491	}
492
493	_LIBCPP_HIDE_FROM_ABI friend constexpr auto operator<=>(const __iterator& __x, const __iterator& __y)
494	requires((__all_random_access<_Const, _Views> && ...) &&
495	(three_way_comparable<iterator_t<__maybe_const<_Const, _Views>>> && ...))
496	{
497	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
498	"Trying to compare a valueless iterator of concat_view.");
499	return __x.__it_ <=> __y.__it_;
500	}
501
502	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto) iter_move(const __iterator& __it) noexcept(
503
504	((is_nothrow_invocable_v< decltype(ranges::iter_move), const iterator_t<__maybe_const<_Const, _Views>>& > &&
505	is_nothrow_convertible_v< range_rvalue_reference_t<__maybe_const<_Const, _Views>>,
506	__concat_rvalue_reference_t<__maybe_const<_Const, _Views>...> >) &&
507	...))
508
509	{
510	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
511	!__it.__it_.valueless_by_exception(), "Trying to apply iter_move to a valueless iterator of concat_view.");
512	return __variant_detail::__visitation::__variant::__visit_value(
513	[](const auto& __i) -> __concat_rvalue_reference_t<__maybe_const<_Const, _Views>...> {
514	return ranges::iter_move(__i);
515	},
516	__it.__it_);
517	}
518
519	_LIBCPP_HIDE_FROM_ABI friend constexpr void iter_swap(const __iterator& __x, const __iterator& __y)
520
521	noexcept((noexcept(ranges::swap(__x, __y))) &&
522	(noexcept(ranges::iter_swap(std::declval<const iterator_t<__maybe_const<_Const, _Views>>>(),
523	std::declval<const iterator_t<__maybe_const<_Const, _Views>>>())) &&
524	...))
525
526	requires swappable_with<iter_reference_t<__iterator>, iter_reference_t<__iterator>> &&
527	(... && indirectly_swappable<iterator_t<__maybe_const<_Const, _Views>>>)
528	{
529	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
530	!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
531	"Trying to swap iterators of concat_view where at least one iterator is valueless.");
532	__variant_detail::__visitation::__variant::__visit_value(
533	[&](const auto& __it1, const auto& __it2) {
534	if constexpr (is_same_v<decltype(__it1), decltype(__it2)>) {
535	ranges::iter_swap(__it1, __it2);
536	} else {
537	ranges::swap(__x, __y);
538	}
539	},
540	__x.__it_,
541	__y.__it_);
542	}
543
544	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
545	operator-(const __iterator& __x, const __iterator& __y)
546	requires __concat_is_random_access<_Const, _Views...>
547	{
548	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
549	!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
550	"Trying to subtract two iterators of concat_view where at least one iterator is valueless.");
551	return __x.__invoke_at_index([&]<std::size_t __index_x>() -> difference_type {
552	return __y.__invoke_at_index([&]<std::size_t __index_y>() -> difference_type {
553	if constexpr (__index_x > __index_y) {
554	auto __dx = ranges::distance(
555	ranges::begin(std::get<__index_x>(__x.__parent_->__views_)), std::get<__index_x>(__x.__it_));
556	auto __dy = ranges::distance(
557	std::get<__index_y>(__y.__it_), ranges::end(std::get<__index_y>(__y.__parent_->__views_)));
558	difference_type __s = [&]<std::size_t __start, std::size_t __end>(this auto&& __self) -> difference_type {
559	if constexpr (__start < __end) {
560	return ranges::size(std::get<__start>(__x.__parent_->__views_)) +
561	__self.template operator()<__start + 1, __end>();
562	}
563	return 0;
564	}.template operator()<__index_y + 1, __index_x>();
565	return __dy + __s + __dx;
566	} else if constexpr (__index_x < __index_y) {
567	return -(__y - __x);
568	} else {
569	return std::get<__index_x>(__x.__it_) - std::get<__index_y>(__y.__it_);
570	}
571	});
572	});
573	}
574
575	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __it, difference_type __n)
576	requires __concat_is_random_access<_Const, _Views...>
577	{
578	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
579	!__it.__it_.valueless_by_exception(), "Trying to subtract a valuess iterators of concat_view.");
580	auto __temp = __it;
581	__temp -= __n;
582	return __temp;
583	}
584
585	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
586	operator-(const __iterator& __x, default_sentinel_t)
587	requires(sized_sentinel_for<sentinel_t<__maybe_const<_Const, _Views>>, iterator_t<__maybe_const<_Const, _Views>>> &&
588	...) &&
589	(__all_but_first_model_sized_range<_Const, _Views...>::value)
590	{
591	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
592	!__x.__it_.valueless_by_exception(),
593	"Trying to subtract a valuess iterators of concat_view from the default sentinel.");
594	return __x.__invoke_at_index([&]<std::size_t __index_x>() -> difference_type {
595	auto __dx =
596	ranges::distance(std::get<__index_x>(__x.__it_), ranges::end(std::get<__index_x>(__x.__parent_->__views_)));
597	difference_type __s = [&]<std::size_t __start, std::size_t __end>(this auto&& __self) -> difference_type {
598	if constexpr (__start < __end) {
599	return ranges::size(std::get<__start>(__x.__parent_->__views_)) +
600	__self.template operator()<__start + 1, __end>();
601	}
602	return 0;
603	}.template operator()<__index_x + 1, sizeof...(_Views)>();
604	return -(__dx + __s);
605	});
606	}
607
608	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
609	operator-(default_sentinel_t, const __iterator& __x)
610	requires(sized_sentinel_for<sentinel_t<__maybe_const<_Const, _Views>>, iterator_t<__maybe_const<_Const, _Views>>> &&
611	...) &&
612	(__all_but_first_model_sized_range<_Const, _Views...>::value)
613	{
614	return -(__x - default_sentinel);
615	}
616	};
617
618	namespace views {
619	namespace __concat {
620	struct __fn {
621	template <input_range _Range>
622	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto
623	operator()(_Range&& __range) noexcept(noexcept(views::all((std::forward<_Range>(__range)))))
624	-> decltype(views::all((std::forward<_Range>(__range)))) {
625	return views::all(std::forward<_Range>(__range));
626	}
627
628	template <class _FirstRange, class... _TailRanges>
629	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto
630	operator()(_FirstRange&& __first, _TailRanges&&... __tail) noexcept(
631	noexcept(concat_view(std::forward<_FirstRange>(__first), std::forward<_TailRanges>(__tail)...)))
632	-> decltype(concat_view(std::forward<_FirstRange>(__first), std::forward<_TailRanges>(__tail)...)) {
633	return concat_view(std::forward<_FirstRange>(__first), std::forward<_TailRanges>(__tail)...);
634	}
635	};
636	} // namespace __concat
637
638	inline namespace __cpo {
639	inline constexpr auto concat = __concat::__fn{};
640	} // namespace __cpo
641	} // namespace views
642
643	} // namespace ranges
644
645	#endif // _LIBCPP_STD_VER >= 26
646
647	_LIBCPP_END_NAMESPACE_STD
648
649	_LIBCPP_POP_MACROS
650
651	#endif // _LIBCPP___RANGES_CONCAT_VIEW_H

lib/libcxx/include/__ranges/concepts.h+4-4

 @@ -39,10 +39,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 // [range.range]
 @@ -175,8 +175,8 @@ concept __concatable = requires {
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_CONCEPTS_H

lib/libcxx/include/__ranges/container_compatible_range.h+4-4

 @@ -18,16 +18,16 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Range, class _Tp>
 concept _ContainerCompatibleRange =
     ranges::input_range<_Range> && convertible_to<ranges::range_reference_t<_Range>, _Tp>;
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___RANGES_CONTAINER_COMPATIBLE_RANGE_H

lib/libcxx/include/__ranges/dangling.h+4-4

 @@ -19,10 +19,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 struct dangling {
   dangling() = default;
 @@ -35,8 +35,8 @@ using borrowed_iterator_t = _If<borrowed_range<_Rp>, iterator_t<_Rp>, dangling>;
 // borrowed_subrange_t defined in <__ranges/subrange.h>
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_DANGLING_H

lib/libcxx/include/__ranges/data.h+6-6

 @@ -28,10 +28,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [range.prim.data]
 namespace ranges {
 @@ -51,12 +51,12 @@ concept __ranges_begin_invocable = !__member_data<_Tp> && __can_borrow<_Tp> && r
 struct __fn {
   template <__member_data _Tp>
-  _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const noexcept(noexcept(__t.data())) {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const noexcept(noexcept(__t.data())) {
     return __t.data();
   }
   template <__ranges_begin_invocable _Tp>
-  _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Tp&& __t) const
       noexcept(noexcept(std::to_address(ranges::begin(__t)))) {
     return std::to_address(ranges::begin(__t));
   }
 @@ -95,8 +95,8 @@ inline constexpr auto cdata = __cdata::__fn{};
 } // namespace __cpo
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_DATA_H

lib/libcxx/include/__ranges/drop_view.h+1-2

...	@@ -74,8 +74,7 @@ public:	...	@@ -74,8 +74,7 @@ public:
74	requires default_initializable<_View>	74	requires default_initializable<_View>
75	= default;	75	= default;
76		76
77	_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23	77	_LIBCPP_HIDE_FROM_ABI constexpr explicit drop_view(_View __base, range_difference_t<_View> __count)
78	drop_view(_View __base, range_difference_t<_View> __count)
79	: __count_(__count), __base_(std::move(__base)) {	78	: __count_(__count), __base_(std::move(__base)) {
80	_LIBCPP_ASSERT_UNCATEGORIZED(__count_ >= 0, "count must be greater than or equal to zero.");	79	_LIBCPP_ASSERT_UNCATEGORIZED(__count_ >= 0, "count must be greater than or equal to zero.");
81	}	80	}

lib/libcxx/include/__ranges/drop_while_view.h+2-2

...	@@ -48,13 +48,13 @@ namespace ranges {	...	@@ -48,13 +48,13 @@ namespace ranges {
48		48
49	template <view _View, class _Pred>	49	template <view _View, class _Pred>
50	requires input_range<_View> && is_object_v<_Pred> && indirect_unary_predicate<const _Pred, iterator_t<_View>>	50	requires input_range<_View> && is_object_v<_Pred> && indirect_unary_predicate<const _Pred, iterator_t<_View>>
51	class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS drop_while_view : public view_interface<drop_while_view<_View, _Pred>> {	51	class _LIBCPP_LLVM18_NO_UNIQUE_ADDRESS_ABI_TAG drop_while_view : public view_interface<drop_while_view<_View, _Pred>> {
52	public:	52	public:
53	_LIBCPP_HIDE_FROM_ABI drop_while_view()	53	_LIBCPP_HIDE_FROM_ABI drop_while_view()
54	requires default_initializable<_View> && default_initializable<_Pred>	54	requires default_initializable<_View> && default_initializable<_Pred>
55	= default;	55	= default;
56		56
57	_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 drop_while_view(_View __base, _Pred __pred)	57	_LIBCPP_HIDE_FROM_ABI constexpr explicit drop_while_view(_View __base, _Pred __pred)
58	: __base_(std::move(__base)), __pred_(std::in_place, std::move(__pred)) {}	58	: __base_(std::move(__base)), __pred_(std::in_place, std::move(__pred)) {}
59		59
60	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&	60	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&

lib/libcxx/include/__ranges/elements_of.h+4-4

 @@ -23,10 +23,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <range _Range, class _Allocator = allocator<byte>>
 @@ -40,10 +40,10 @@ elements_of(_Range&&, _Allocator = _Allocator()) -> elements_of<_Range&&, _Alloc
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___RANGES_ELEMENTS_OF_H

lib/libcxx/include/__ranges/elements_view.h+21-20

 @@ -77,57 +77,57 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr explicit elements_view(_View __base) : __base_(std::move(__base)) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
     requires copy_constructible<_View>
   {
     return __base_;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin()
     requires(!__simple_view<_View>)
   {
     return __iterator</*_Const=*/false>(ranges::begin(__base_));
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
     requires range<const _View>
   {
     return __iterator</*_Const=*/true>(ranges::begin(__base_));
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end()
     requires(!__simple_view<_View> && !common_range<_View>)
   {
     return __sentinel</*_Const=*/false>{ranges::end(__base_)};
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end()
     requires(!__simple_view<_View> && common_range<_View>)
   {
     return __iterator</*_Const=*/false>{ranges::end(__base_)};
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
     requires range<const _View>
   {
     return __sentinel</*_Const=*/true>{ranges::end(__base_)};
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
     requires common_range<const _View>
   {
     return __iterator</*_Const=*/true>{ranges::end(__base_)};
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto size()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size()
     requires sized_range<_View>
   {
     return ranges::size(__base_);
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
     requires sized_range<const _View>
   {
     return ranges::size(__base_);
 @@ -211,11 +211,11 @@ public:
     requires _Const && convertible_to<iterator_t<_View>, iterator_t<_Base>>
       : __current_(std::move(__i.__current_)) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr const iterator_t<_Base>& base() const& noexcept { return __current_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const iterator_t<_Base>& base() const& noexcept { return __current_; }
-  _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_Base> base() && { return std::move(__current_); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_Base> base() && { return std::move(__current_); }
-  _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const { return __get_element(__current_); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const { return __get_element(__current_); }
   _LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator++() {
     ++__current_;
 @@ -261,7 +261,7 @@ public:
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const
     requires random_access_range<_Base>
   {
     return __get_element(__current_ + __n);
 @@ -303,25 +303,26 @@ public:
     return __x.__current_ <=> __y.__current_;
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __x, difference_type __y)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __x, difference_type __y)
     requires random_access_range<_Base>
   {
     return __iterator{__x} += __y;
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __x, const __iterator& __y)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __x, const __iterator& __y)
     requires random_access_range<_Base>
   {
     return __y + __x;
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __x, difference_type __y)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __x, difference_type __y)
     requires random_access_range<_Base>
   {
     return __iterator{__x} -= __y;
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type operator-(const __iterator& __x, const __iterator& __y)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
+  operator-(const __iterator& __x, const __iterator& __y)
     requires sized_sentinel_for<iterator_t<_Base>, iterator_t<_Base>>
   {
     return __x.__current_ - __y.__current_;
 @@ -365,14 +366,14 @@ public:
   template <bool _OtherConst>
     requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
-  _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
   operator-(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
     return __get_current(__x) - __y.__end_;
   }
   template <bool _OtherConst>
     requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
-  _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
   operator-(const __sentinel& __x, const __iterator<_OtherConst>& __y) {
     return __x.__end_ - __get_current(__y);
   }

lib/libcxx/include/__ranges/empty.h+4-4

 @@ -20,10 +20,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [range.prim.empty]
 namespace ranges {
 @@ -64,8 +64,8 @@ inline constexpr auto empty = __empty::__fn{};
 } // namespace __cpo
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_EMPTY_H

lib/libcxx/include/__ranges/enable_borrowed_range.h+4-4

 @@ -20,10 +20,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 // [range.range], ranges
 @@ -33,8 +33,8 @@ inline constexpr bool enable_borrowed_range = false;
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_ENABLE_BORROWED_RANGE_H

lib/libcxx/include/__ranges/enable_view.h+4-4

 @@ -20,10 +20,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 struct view_base {};
 @@ -43,8 +43,8 @@ inline constexpr bool enable_view = derived_from<_Tp, view_base> || requires {
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_ENABLE_VIEW_H

lib/libcxx/include/__ranges/enumerate_view.h created+350

...	@@ -0,0 +1,350 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___RANGES_ENUMERATE_VIEW_H
11	#define _LIBCPP___RANGES_ENUMERATE_VIEW_H
12
13	#include <__concepts/constructible.h>
14	#include <__concepts/convertible_to.h>
15	#include <__config>
16	#include <__iterator/concepts.h>
17	#include <__iterator/distance.h>
18	#include <__iterator/iter_move.h>
19	#include <__iterator/iterator_traits.h>
20	#include <__ranges/access.h>
21	#include <__ranges/all.h>
22	#include <__ranges/concepts.h>
23	#include <__ranges/enable_borrowed_range.h>
24	#include <__ranges/range_adaptor.h>
25	#include <__ranges/size.h>
26	#include <__ranges/view_interface.h>
27	#include <__type_traits/maybe_const.h>
28	#include <__utility/forward.h>
29	#include <__utility/move.h>
30	#include <tuple>
31
32	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
33	# pragma GCC system_header
34	#endif
35
36	_LIBCPP_PUSH_MACROS
37	#include <__undef_macros>
38
39	_LIBCPP_BEGIN_NAMESPACE_STD
40
41	#if _LIBCPP_STD_VER >= 23
42
43	namespace ranges {
44
45	// [concept.object]
46
47	template <class _Rp>
48	concept __range_with_movable_references =
49	input_range<_Rp> && std::move_constructible<range_reference_t<_Rp>> &&
50	std::move_constructible<range_rvalue_reference_t<_Rp>>;
51
52	// [range.enumerate.view]
53
54	template <view _View>
55	requires __range_with_movable_references<_View>
56	class enumerate_view : public view_interface<enumerate_view<_View>> {
57	_View __base_ = _View();
58
59	// [range.enumerate.iterator]
60	template <bool _Const>
61	class __iterator;
62
63	// [range.enumerate.sentinel]
64	template <bool _Const>
65	class __sentinel;
66
67	public:
68	_LIBCPP_HIDE_FROM_ABI constexpr enumerate_view()
69	requires default_initializable<_View>
70	= default;
71	_LIBCPP_HIDE_FROM_ABI constexpr explicit enumerate_view(_View __base) : __base_(std::move(__base)) {}
72
73	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin()
74	requires(!__simple_view<_View>)
75	{
76	return __iterator<false>(ranges::begin(__base_), 0);
77	}
78	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
79	requires __range_with_movable_references<const _View>
80	{
81	return __iterator<true>(ranges::begin(__base_), 0);
82	}
83
84	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end()
85	requires(!__simple_view<_View>)
86	{
87	if constexpr (forward_range<_View> && common_range<_View> && sized_range<_View>)
88	return __iterator<false>(ranges::end(__base_), ranges::distance(__base_));
89	else
90	return __sentinel<false>(ranges::end(__base_));
91	}
92	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
93	requires __range_with_movable_references<const _View>
94	{
95	if constexpr (forward_range<_View> && common_range<const _View> && sized_range<const _View>)
96	return __iterator<true>(ranges::end(__base_), ranges::distance(__base_));
97	else
98	return __sentinel<true>(ranges::end(__base_));
99	}
100
101	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size()
102	requires sized_range<_View>
103	{
104	return ranges::size(__base_);
105	}
106	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
107	requires sized_range<const _View>
108	{
109	return ranges::size(__base_);
110	}
111
112	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
113	requires copy_constructible<_View>
114	{
115	return __base_;
116	}
117	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
118	};
119
120	template <class _Range>
121	enumerate_view(_Range&&) -> enumerate_view<views::all_t<_Range>>;
122
123	// [range.enumerate.iterator]
124
125	template <view _View>
126	requires __range_with_movable_references<_View>
127	template <bool _Const>
128	class enumerate_view<_View>::__iterator {
129	using _Base _LIBCPP_NODEBUG = __maybe_const<_Const, _View>;
130
131	static consteval auto __get_iterator_concept() {
132	if constexpr (random_access_range<_Base>) {
133	return random_access_iterator_tag{};
134	} else if constexpr (bidirectional_range<_Base>) {
135	return bidirectional_iterator_tag{};
136	} else if constexpr (forward_range<_Base>) {
137	return forward_iterator_tag{};
138	} else {
139	return input_iterator_tag{};
140	}
141	}
142
143	friend class enumerate_view<_View>;
144
145	public:
146	using iterator_category = input_iterator_tag;
147	using iterator_concept = decltype(__get_iterator_concept());
148	using difference_type = range_difference_t<_Base>;
149	using value_type = tuple<difference_type, range_value_t<_Base>>;
150
151	private:
152	using __reference_type _LIBCPP_NODEBUG = tuple<difference_type, range_reference_t<_Base>>;
153
154	iterator_t<_Base> __current_ = iterator_t<_Base>();
155	difference_type __pos_ = 0;
156
157	_LIBCPP_HIDE_FROM_ABI constexpr explicit __iterator(iterator_t<_Base> __current, difference_type __pos)
158	: __current_(std::move(__current)), __pos_(__pos) {}
159
160	public:
161	_LIBCPP_HIDE_FROM_ABI __iterator()
162	requires default_initializable<iterator_t<_Base>>
163	= default;
164
165	_LIBCPP_HIDE_FROM_ABI constexpr __iterator(__iterator<!_Const> __i)
166	requires _Const && convertible_to<iterator_t<_View>, iterator_t<_Base>>
167	: __current_(std::move(__i.__current_)), __pos_(__i.__pos_) {}
168
169	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const iterator_t<_Base>& base() const& noexcept { return __current_; }
170
171	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_Base> base() && { return std::move(__current_); }
172
173	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr difference_type index() const noexcept { return __pos_; }
174
175	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator() const { return __reference_type(__pos_, __current_); }
176
177	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator++() {
178	++__current_;
179	++__pos_;
180	return *this;
181	}
182
183	_LIBCPP_HIDE_FROM_ABI constexpr void operator++(int) { return ++*this; }
184
185	_LIBCPP_HIDE_FROM_ABI constexpr __iterator operator++(int)
186	requires forward_range<_Base>
187	{
188	auto __temp = *this;
189	++*this;
190	return __temp;
191	}
192
193	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator--()
194	requires bidirectional_range<_Base>
195	{
196	--__current_;
197	--__pos_;
198	return *this;
199	}
200
201	_LIBCPP_HIDE_FROM_ABI constexpr __iterator operator--(int)
202	requires bidirectional_range<_Base>
203	{
204	auto __temp = *this;
205	--*this;
206	return *__temp;
207	}
208
209	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator+=(difference_type __n)
210	requires random_access_range<_Base>
211	{
212	__current_ += __n;
213	__pos_ += __n;
214	return *this;
215	}
216
217	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator-=(difference_type __n)
218	requires random_access_range<_Base>
219	{
220	__current_ -= __n;
221	__pos_ -= __n;
222	return *this;
223	}
224
225	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator[](difference_type __n) const
226	requires random_access_range<_Base>
227	{
228	return __reference_type(__pos_ + __n, __current_[__n]);
229	}
230
231	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __x, const __iterator& __y) noexcept {
232	return __x.__pos_ == __y.__pos_;
233	}
234
235	_LIBCPP_HIDE_FROM_ABI friend constexpr strong_ordering
236	operator<=>(const __iterator& __x, const __iterator& __y) noexcept {
237	return __x.__pos_ <=> __y.__pos_;
238	}
239
240	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n)
241	requires random_access_range<_Base>
242	{
243	auto __temp = __i;
244	__temp += __n;
245	return __temp;
246	}
247
248	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i)
249	requires random_access_range<_Base>
250	{
251	return __i + __n;
252	}
253
254	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n)
255	requires random_access_range<_Base>
256	{
257	auto __temp = __i;
258	__temp -= __n;
259	return __temp;
260	}
261
262	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
263	operator-(const __iterator& __x, const __iterator& __y) noexcept {
264	return __x.__pos_ - __y.__pos_;
265	}
266
267	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto iter_move(const __iterator& __i) noexcept(
268	noexcept(ranges::iter_move(__i.__current_)) && is_nothrow_move_constructible_v<range_rvalue_reference_t<_Base>>) {
269	return tuple<difference_type, range_rvalue_reference_t<_Base>>(__i.__pos_, ranges::iter_move(__i.__current_));
270	}
271	};
272
273	// [range.enumerate.sentinel]
274
275	template <view _View>
276	requires __range_with_movable_references<_View>
277	template <bool _Const>
278	class enumerate_view<_View>::__sentinel {
279	using _Base _LIBCPP_NODEBUG = __maybe_const<_Const, _View>;
280
281	sentinel_t<_Base> __end_ = sentinel_t<_Base>();
282
283	_LIBCPP_HIDE_FROM_ABI constexpr explicit __sentinel(sentinel_t<_Base> __end) : __end_(std::move(__end)) {}
284
285	friend class enumerate_view<_View>;
286
287	public:
288	_LIBCPP_HIDE_FROM_ABI __sentinel() = default;
289
290	_LIBCPP_HIDE_FROM_ABI constexpr __sentinel(__sentinel<!_Const> __other)
291	requires _Const && convertible_to<sentinel_t<_View>, sentinel_t<_Base>>
292	: __end_(std::move(__other.__end_)) {}
293
294	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr sentinel_t<_Base> base() const { return __end_; }
295
296	template <bool _OtherConst>
297	requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
298	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
299	return __x.__current_ == __y.__end_;
300	}
301
302	template <bool _OtherConst>
303	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
304	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
305	operator-(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
306	return __x.__current_ - __y.__end_;
307	}
308
309	template <bool _OtherConst>
310	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
311	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _View>>
312	operator-(const __sentinel& __x, const __iterator<_OtherConst>& __y) {
313	return __x.__end_ - __y.__current_;
314	}
315	};
316
317	template <class _View>
318	constexpr bool enable_borrowed_range<enumerate_view<_View>> = enable_borrowed_range<_View>;
319
320	namespace views {
321	namespace __enumerate {
322
323	// [range.enumerate.overview]
324
325	struct __fn : __range_adaptor_closure<__fn> {
326	template <class _Range>
327	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto
328	operator()(_Range&& __range) noexcept(noexcept(enumerate_view<views::all_t<_Range>>(std::forward<_Range>(__range))))
329	-> decltype(/--------------------------/ enumerate_view<views::all_t<_Range>>(std::forward<_Range>(__range))) {
330	return /---------------------------------/ enumerate_view<views::all_t<_Range>>(std::forward<_Range>(__range));
331	}
332	};
333
334	} // namespace __enumerate
335
336	inline namespace __cpo {
337
338	inline constexpr auto enumerate = __enumerate::__fn{};
339
340	} // namespace __cpo
341	} // namespace views
342	} // namespace ranges
343
344	#endif // _LIBCPP_STD_VER >= 23
345
346	_LIBCPP_END_NAMESPACE_STD
347
348	_LIBCPP_POP_MACROS
349
350	#endif // _LIBCPP___RANGES_ENUMERATE_VIEW_H

lib/libcxx/include/__ranges/filter_view.h+2-2

...	@@ -54,7 +54,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -54,7 +54,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
54	namespace ranges {	54	namespace ranges {
55	template <input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>	55	template <input_range _View, indirect_unary_predicate<iterator_t<_View>> _Pred>
56	requires view<_View> && is_object_v<_Pred>	56	requires view<_View> && is_object_v<_Pred>
57	class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS filter_view : public view_interface<filter_view<_View, _Pred>> {	57	class _LIBCPP_LLVM18_NO_UNIQUE_ADDRESS_ABI_TAG filter_view : public view_interface<filter_view<_View, _Pred>> {
58	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();	58	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();
59	_LIBCPP_NO_UNIQUE_ADDRESS __movable_box<_Pred> __pred_;	59	_LIBCPP_NO_UNIQUE_ADDRESS __movable_box<_Pred> __pred_;
60		60
...	@@ -72,7 +72,7 @@ public:	...	@@ -72,7 +72,7 @@ public:
72	requires default_initializable<_View> && default_initializable<_Pred>	72	requires default_initializable<_View> && default_initializable<_Pred>
73	= default;	73	= default;
74		74
75	_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 filter_view(_View __base, _Pred __pred)	75	_LIBCPP_HIDE_FROM_ABI constexpr explicit filter_view(_View __base, _Pred __pred)
76	: __base_(std::move(__base)), __pred_(in_place, std::move(__pred)) {}	76	: __base_(std::move(__base)), __pred_(in_place, std::move(__pred)) {}
77		77
78	template <class _Vp = _View>	78	template <class _Vp = _View>

lib/libcxx/include/__ranges/from_range.h+4-4

 @@ -16,18 +16,18 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 struct from_range_t {
   explicit from_range_t() = default;
 };
 inline constexpr from_range_t from_range{};
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___RANGES_FROM_RANGE_H

lib/libcxx/include/__ranges/iota_view.h+6-6

lib/libcxx/include/__ranges/istream_view.h+4-4

lib/libcxx/include/__ranges/join_view.h+8-8

lib/libcxx/include/__ranges/join_with_view.h+2-3

...	@@ -372,7 +372,7 @@ public:	...	@@ -372,7 +372,7 @@ public:
372	return __tmp;	372	return __tmp;
373	}	373	}
374		374
375	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __x, const __iterator& __y)	375	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __x, const __iterator& __y)
376	requires __ref_is_glvalue && forward_range<_Base> && equality_comparable<_InnerIter>	376	requires __ref_is_glvalue && forward_range<_Base> && equality_comparable<_InnerIter>
377	{	377	{
378	return __x.__outer_it_ == __y.__outer_it_ && __x.__inner_it_ == __y.__inner_it_;	378	return __x.__outer_it_ == __y.__outer_it_ && __x.__inner_it_ == __y.__inner_it_;
...	@@ -420,8 +420,7 @@ public:	...	@@ -420,8 +420,7 @@ public:
420		420
421	template <bool _OtherConst>	421	template <bool _OtherConst>
422	requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>	422	requires sentinel_for<sentinel_t<_Base>, iterator_t<__maybe_const<_OtherConst, _View>>>
423	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr bool	423	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
424	operator==(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
425	return __get_outer_of(__x) == __y.__end_;	424	return __get_outer_of(__x) == __y.__end_;
426	}	425	}
427	};	426	};

lib/libcxx/include/__ranges/lazy_split_view.h+19-15

 @@ -86,23 +86,23 @@ public:
     requires default_initializable<_View> && default_initializable<_Pattern>
   = default;
-  _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 lazy_split_view(_View __base, _Pattern __pattern)
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit lazy_split_view(_View __base, _Pattern __pattern)
       : __base_(std::move(__base)), __pattern_(std::move(__pattern)) {}
   template <input_range _Range>
     requires constructible_from<_View, views::all_t<_Range>> &&
                  constructible_from<_Pattern, single_view<range_value_t<_Range>>>
-  _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 lazy_split_view(_Range&& __r, range_value_t<_Range> __e)
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit lazy_split_view(_Range&& __r, range_value_t<_Range> __e)
       : __base_(views::all(std::forward<_Range>(__r))), __pattern_(views::single(std::move(__e))) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
     requires copy_constructible<_View>
   {
     return __base_;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin() {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() {
     if constexpr (forward_range<_View>) {
       return __outer_iterator < __simple_view<_View> && __simple_view < _Pattern >> {*this, ranges::begin(__base_)};
     } else {
 @@ -111,19 +111,19 @@ public:
     }
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
     requires forward_range<_View> && forward_range<const _View>
   {
     return __outer_iterator<true>{*this, ranges::begin(__base_)};
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end()
     requires forward_range<_View> && common_range<_View>
   {
     return __outer_iterator < __simple_view<_View> && __simple_view < _Pattern >> {*this, ranges::end(__base_)};
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end() const {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const {
     if constexpr (forward_range<_View> && forward_range<const _View> && common_range<const _View>) {
       return __outer_iterator<true>{*this, ranges::end(__base_)};
     } else {
 @@ -188,8 +188,10 @@ private:
       _LIBCPP_HIDE_FROM_ABI value_type() = default;
       _LIBCPP_HIDE_FROM_ABI constexpr explicit value_type(__outer_iterator __i) : __i_(std::move(__i)) {}
-      _LIBCPP_HIDE_FROM_ABI constexpr __inner_iterator<_Const> begin() const { return __inner_iterator<_Const>{__i_}; }
+      [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr __inner_iterator<_Const> begin() const {
-      _LIBCPP_HIDE_FROM_ABI constexpr default_sentinel_t end() const noexcept { return default_sentinel; }
+        return __inner_iterator<_Const>{__i_};
+      }
+      [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr default_sentinel_t end() const noexcept { return default_sentinel; }
     };
     _LIBCPP_HIDE_FROM_ABI __outer_iterator() = default;
 @@ -206,7 +208,7 @@ private:
       requires _Const && convertible_to<iterator_t<_View>, iterator_t<_Base>>
         : __parent_(__i.__parent_), __current_(std::move(__i.__current_)) {}
-    _LIBCPP_HIDE_FROM_ABI constexpr value_type operator*() const { return value_type{*this}; }
+    [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr value_type operator*() const { return value_type{*this}; }
     _LIBCPP_HIDE_FROM_ABI constexpr __outer_iterator& operator++() {
       const auto __end = ranges::end(__parent_->__base_);
 @@ -342,14 +344,16 @@ private:
     _LIBCPP_HIDE_FROM_ABI constexpr explicit __inner_iterator(__outer_iterator<_Const> __i) : __i_(std::move(__i)) {}
-    _LIBCPP_HIDE_FROM_ABI constexpr const iterator_t<_Base>& base() const& noexcept { return __i_.__current(); }
+    [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const iterator_t<_Base>& base() const& noexcept {
-    _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_Base> base() &&
+      return __i_.__current();
+    }
+    [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_Base> base() &&
       requires forward_range<_View>
     {
       return std::move(__i_.__current());
     }
-    _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const { return *__i_.__current(); }
+    [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const { return *__i_.__current(); }
     _LIBCPP_HIDE_FROM_ABI constexpr __inner_iterator& operator++() {
       __incremented_ = true;
 @@ -385,7 +389,7 @@ private:
       return __x.__is_done();
     }
-    _LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto)
+    [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto)
     iter_move(const __inner_iterator& __i) noexcept(noexcept(ranges::iter_move(__i.__outer_current()))) {
       return ranges::iter_move(__i.__outer_current());
     }

lib/libcxx/include/__ranges/owning_view.h+4-4

 @@ -30,10 +30,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <range _Rp>
   requires movable<_Rp> && (!__is_std_initializer_list<remove_cvref_t<_Rp>>)
 @@ -107,10 +107,10 @@ inline constexpr bool enable_borrowed_range<owning_view<_Tp>> = enable_borrowed_
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___RANGES_OWNING_VIEW_H

lib/libcxx/include/__ranges/range_adaptor.h+4-4

 @@ -34,10 +34,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 // CRTP base that one can derive from in order to be considered a range adaptor closure
 @@ -90,10 +90,10 @@ class _LIBCPP_NO_SPECIALIZATIONS range_adaptor_closure : public __range_adaptor_
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___RANGES_RANGE_ADAPTOR_H

lib/libcxx/include/__ranges/ref_view.h+4-4

 @@ -32,10 +32,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <range _Range>
   requires is_object_v<_Range>
 @@ -82,8 +82,8 @@ template <class _Tp>
 inline constexpr bool enable_borrowed_range<ref_view<_Tp>> = true;
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_REF_VIEW_H

lib/libcxx/include/__ranges/repeat_view.h+5-5

 @@ -40,10 +40,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <class _Tp>
 @@ -74,7 +74,7 @@ struct __fn;
 template <move_constructible _Tp, semiregular _Bound = unreachable_sentinel_t>
   requires(is_object_v<_Tp> && same_as<_Tp, remove_cv_t<_Tp>> &&
            (__integer_like_with_usable_difference_type<_Bound> || same_as<_Bound, unreachable_sentinel_t>))
-class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS repeat_view : public view_interface<repeat_view<_Tp, _Bound>> {
+class _LIBCPP_LLVM18_NO_UNIQUE_ADDRESS_ABI_TAG repeat_view : public view_interface<repeat_view<_Tp, _Bound>> {
   friend struct views::__take::__fn;
   friend struct views::__drop::__fn;
   class __iterator;
 @@ -265,10 +265,10 @@ inline constexpr bool __is_repeat_specialization<repeat_view<_Tp, _Bound>> = tru
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___RANGES_REPEAT_VIEW_H

lib/libcxx/include/__ranges/reverse_view.h+8-8

lib/libcxx/include/__ranges/single_view.h+1-1

...	@@ -41,7 +41,7 @@ template <move_constructible _Tp>	...	@@ -41,7 +41,7 @@ template <move_constructible _Tp>
41	template <copy_constructible _Tp>	41	template <copy_constructible _Tp>
42	# endif	42	# endif
43	requires is_object_v<_Tp>	43	requires is_object_v<_Tp>
44	class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS single_view : public view_interface<single_view<_Tp>> {	44	class _LIBCPP_LLVM18_NO_UNIQUE_ADDRESS_ABI_TAG single_view : public view_interface<single_view<_Tp>> {
45	_LIBCPP_NO_UNIQUE_ADDRESS __movable_box<_Tp> __value_;	45	_LIBCPP_NO_UNIQUE_ADDRESS __movable_box<_Tp> __value_;
46		46
47	public:	47	public:

lib/libcxx/include/__ranges/size.h+4-4

 @@ -29,10 +29,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <class>
 inline constexpr bool disable_sized_range = false;
 @@ -131,8 +131,8 @@ inline constexpr auto ssize = __ssize::__fn{};
 } // namespace __cpo
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_SIZE_H

lib/libcxx/include/__ranges/split_view.h+8-9

 @@ -78,32 +78,31 @@ public:
     requires default_initializable<_View> && default_initializable<_Pattern>
   = default;
-  _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 split_view(_View __base, _Pattern __pattern)
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit split_view(_View __base, _Pattern __pattern)
       : __base_(std::move(__base)), __pattern_(std::move((__pattern))) {}
   template <forward_range _Range>
     requires constructible_from<_View, views::all_t<_Range>> &&
                  constructible_from<_Pattern, single_view<range_value_t<_Range>>>
-  _LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit split_view(_Range&& __range, range_value_t<_Range> __elem)
-  split_view(_Range&& __range, range_value_t<_Range> __elem)
       : __base_(views::all(std::forward<_Range>(__range))), __pattern_(views::single(std::move(__elem))) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
     requires copy_constructible<_View>
   {
     return __base_;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
-  _LIBCPP_HIDE_FROM_ABI constexpr __iterator begin() {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr __iterator begin() {
     if (!__cached_begin_.__has_value()) {
       __cached_begin_.__emplace(__find_next(ranges::begin(__base_)));
     }
     return {*this, ranges::begin(__base_), *__cached_begin_};
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end() {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() {
     if constexpr (common_range<_View>) {
       return __iterator{*this, ranges::end(__base_), {}};
     } else {
 @@ -142,9 +141,9 @@ public:
       split_view<_View, _Pattern>& __parent, iterator_t<_View> __current, subrange<iterator_t<_View>> __next)
       : __parent_(std::addressof(__parent)), __cur_(std::move(__current)), __next_(std::move(__next)) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_View> base() const { return __cur_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_View> base() const { return __cur_; }
-  _LIBCPP_HIDE_FROM_ABI constexpr value_type operator*() const { return {__cur_, __next_.begin()}; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr value_type operator*() const { return {__cur_, __next_.begin()}; }
   _LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator++() {
     __cur_ = __next_.begin();

lib/libcxx/include/__ranges/stride_view.h created+410

...	@@ -0,0 +1,410 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___RANGES_STRIDE_VIEW_H
11	#define _LIBCPP___RANGES_STRIDE_VIEW_H
12
13	#include <__assert>
14	#include <__compare/three_way_comparable.h>
15	#include <__concepts/constructible.h>
16	#include <__concepts/convertible_to.h>
17	#include <__concepts/derived_from.h>
18	#include <__concepts/equality_comparable.h>
19	#include <__config>
20	#include <__functional/bind_back.h>
21	#include <__iterator/advance.h>
22	#include <__iterator/concepts.h>
23	#include <__iterator/default_sentinel.h>
24	#include <__iterator/distance.h>
25	#include <__iterator/iter_move.h>
26	#include <__iterator/iter_swap.h>
27	#include <__iterator/iterator_traits.h>
28	#include <__ranges/access.h>
29	#include <__ranges/all.h>
30	#include <__ranges/concepts.h>
31	#include <__ranges/enable_borrowed_range.h>
32	#include <__ranges/range_adaptor.h>
33	#include <__ranges/view_interface.h>
34	#include <__type_traits/make_unsigned.h>
35
36	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
37	# pragma GCC system_header
38	#endif
39
40	_LIBCPP_PUSH_MACROS
41	#include <__undef_macros>
42
43	_LIBCPP_BEGIN_NAMESPACE_STD
44
45	#if _LIBCPP_STD_VER >= 23
46
47	namespace ranges {
48
49	template <class _Value>
50	_LIBCPP_HIDE_FROM_ABI constexpr _Value __div_ceil(_Value __left, _Value __right) {
51	_Value __r = __left / __right;
52	if (__left % __right) {
53	++__r;
54	}
55	return __r;
56	}
57
58	template <input_range _View>
59	requires view<_View>
60	class stride_view : public view_interface<stride_view<_View>> {
61	_LIBCPP_NO_UNIQUE_ADDRESS _View __base_ = _View();
62	range_difference_t<_View> __stride_ = 0;
63
64	template <bool _Const>
65	class __iterator;
66
67	public:
68	_LIBCPP_HIDE_FROM_ABI constexpr explicit stride_view(_View __base, range_difference_t<_View> __stride)
69	: __base_(std::move(__base)), __stride_(__stride) {
70	_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(__stride > 0, "The value of stride must be greater than 0");
71	}
72
73	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
74	requires copy_constructible<_View>
75	{
76	return __base_;
77	}
78
79	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
80
81	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr range_difference_t<_View> stride() const noexcept { return __stride_; }
82
83	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin()
84	requires(!__simple_view<_View>)
85	{
86	return __iterator</_Const=/false>(this, ranges::begin(__base_), 0);
87	}
88
89	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
90	requires range<const _View>
91	{
92	return __iterator</_Const=/true>(this, ranges::begin(__base_), 0);
93	}
94
95	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end()
96	requires(!__simple_view<_View>)
97	{
98	if constexpr (common_range<_View> && sized_range<_View> && forward_range<_View>) {
99	auto __missing = (__stride_ - ranges::distance(__base_) % __stride_) % __stride_;
100	return __iterator</_Const=/false>(this, ranges::end(__base_), __missing);
101	} else if constexpr (common_range<_View> && !bidirectional_range<_View>) {
102	return __iterator</_Const=/false>(this, ranges::end(__base_), 0);
103	} else {
104	return default_sentinel;
105	}
106	}
107
108	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
109	requires(range<const _View>)
110	{
111	if constexpr (common_range<const _View> && sized_range<const _View> && forward_range<const _View>) {
112	auto __missing = (__stride_ - ranges::distance(__base_) % __stride_) % __stride_;
113	return __iterator</_Const=/true>(this, ranges::end(__base_), __missing);
114	} else if constexpr (common_range<const _View> && !bidirectional_range<const _View>) {
115	return __iterator</_Const=/true>(this, ranges::end(__base_), 0);
116	} else {
117	return default_sentinel;
118	}
119	}
120
121	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size()
122	requires sized_range<_View>
123	{
124	return std::__to_unsigned_like(ranges::__div_ceil(ranges::distance(__base_), __stride_));
125	}
126
127	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
128	requires sized_range<const _View>
129	{
130	return std::__to_unsigned_like(ranges::__div_ceil(ranges::distance(__base_), __stride_));
131	}
132	}; // class stride_view
133
134	template <class _Range>
135	stride_view(_Range&&, range_difference_t<_Range>) -> stride_view<views::all_t<_Range>>;
136
137	template <class _View>
138	struct __stride_iterator_category {};
139
140	template <forward_range _View>
141	struct __stride_iterator_category<_View> {
142	using _Cat _LIBCPP_NODEBUG = typename iterator_traits<iterator_t<_View>>::iterator_category;
143	using iterator_category =
144	_If<derived_from<_Cat, random_access_iterator_tag>,
145	/* then */ random_access_iterator_tag,
146	/* else */ _Cat >;
147	};
148
149	template <input_range _View>
150	requires view<_View>
151	template <bool _Const>
152	class stride_view<_View>::__iterator : public __stride_iterator_category<__maybe_const<_Const, _View>> {
153	using _Parent _LIBCPP_NODEBUG = __maybe_const<_Const, stride_view<_View>>;
154	using _Base _LIBCPP_NODEBUG = __maybe_const<_Const, _View>;
155
156	_LIBCPP_NO_UNIQUE_ADDRESS iterator_t<_Base> __current_ = iterator_t<_Base>();
157	_LIBCPP_NO_UNIQUE_ADDRESS ranges::sentinel_t<_Base> __end_ = ranges::sentinel_t<_Base>();
158	range_difference_t<_Base> __stride_ = 0;
159	range_difference_t<_Base> __missing_ = 0;
160
161	friend stride_view;
162
163	_LIBCPP_HIDE_FROM_ABI constexpr __iterator(
164	_Parent* __parent, ranges::iterator_t<_Base> __current, range_difference_t<_Base> __missing)
165	: __current_(std::move(__current)),
166	__end_(ranges::end(__parent->__base_)),
167	__stride_(__parent->__stride_),
168	__missing_(__missing) {}
169
170	static consteval auto __get_stride_view_iterator_concept() {
171	if constexpr (random_access_range<_Base>) {
172	return random_access_iterator_tag{};
173	} else if constexpr (bidirectional_range<_Base>) {
174	return bidirectional_iterator_tag{};
175	} else if constexpr (forward_range<_Base>) {
176	return forward_iterator_tag{};
177	} else {
178	return input_iterator_tag{};
179	}
180	}
181
182	public:
183	using difference_type = range_difference_t<_Base>;
184	using value_type = range_value_t<_Base>;
185	using iterator_concept = decltype(__get_stride_view_iterator_concept());
186	// using iterator_category = inherited;
187
188	_LIBCPP_HIDE_FROM_ABI __iterator()
189	requires default_initializable<iterator_t<_Base>>
190	= default;
191
192	_LIBCPP_HIDE_FROM_ABI constexpr __iterator(__iterator<!_Const> __i)
193	requires _Const && convertible_to<ranges::iterator_t<_View>, iterator_t<_Base>> &&
194	convertible_to<sentinel_t<_View>, sentinel_t<_Base>>
195	: __current_(std::move(__i.__current_)),
196	__end_(std::move(__i.__end_)),
197	__stride_(__i.__stride_),
198	__missing_(__i.__missing_) {}
199
200	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_Base> const& base() const& noexcept { return __current_; }
201	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator_t<_Base> base() && { return std::move(__current_); }
202
203	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const {
204	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__current_ != __end_, "Cannot dereference an iterator at the end.");
205	return *__current_;
206	}
207
208	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator++() {
209	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__current_ != __end_, "Cannot increment an iterator already at the end.");
210	__missing_ = ranges::advance(__current_, __stride_, __end_);
211	return *this;
212	}
213
214	_LIBCPP_HIDE_FROM_ABI constexpr void operator++(int) {
215	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__current_ != __end_, "Cannot increment an iterator already at the end.");
216	++*this;
217	}
218	_LIBCPP_HIDE_FROM_ABI constexpr __iterator operator++(int)
219	requires forward_range<_Base>
220	{
221	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__current_ != __end_, "Cannot increment an iterator already at the end.");
222	auto __tmp = *this;
223	++*this;
224	return __tmp;
225	}
226
227	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator--()
228	requires bidirectional_range<_Base>
229	{
230	ranges::advance(__current_, __missing_ - __stride_);
231	__missing_ = 0;
232	return *this;
233	}
234	_LIBCPP_HIDE_FROM_ABI constexpr __iterator operator--(int)
235	requires bidirectional_range<_Base>
236	{
237	auto __tmp = *this;
238	--*this;
239	return __tmp;
240	}
241
242	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator+=(difference_type __n)
243	requires random_access_range<_Base>
244	{
245	if (__n > 0) {
246	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(ranges::distance(__current_, __end_) > __stride_ * (__n - 1),
247	"Advancing the iterator beyond the end is not allowed.");
248	ranges::advance(__current_, __stride_ * (__n - 1));
249	__missing_ = ranges::advance(__current_, __stride_, __end_);
250
251	} else if (__n < 0) {
252	ranges::advance(__current_, __stride_ * __n + __missing_);
253	__missing_ = 0;
254	}
255	return *this;
256	}
257
258	_LIBCPP_HIDE_FROM_ABI constexpr __iterator& operator-=(difference_type __n)
259	requires random_access_range<_Base>
260	{
261	return *this += -__n;
262	}
263
264	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const
265	requires random_access_range<_Base>
266	{
267	return (this + __n);
268	}
269
270	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(__iterator const& __x, default_sentinel_t) {
271	return __x.__current_ == __x.__end_;
272	}
273
274	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(__iterator const& __x, __iterator const& __y)
275	requires equality_comparable<iterator_t<_Base>>
276	{
277	return __x.__current_ == __y.__current_;
278	}
279
280	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator<(__iterator const& __x, __iterator const& __y)
281	requires random_access_range<_Base>
282	{
283	return __x.__current_ < __y.__current_;
284	}
285
286	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator>(__iterator const& __x, __iterator const& __y)
287	requires random_access_range<_Base>
288	{
289	return __y < __x;
290	}
291
292	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator<=(__iterator const& __x, __iterator const& __y)
293	requires random_access_range<_Base>
294	{
295	return !(__y < __x);
296	}
297
298	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator>=(__iterator const& __x, __iterator const& __y)
299	requires random_access_range<_Base>
300	{
301	return !(__x < __y);
302	}
303
304	_LIBCPP_HIDE_FROM_ABI friend constexpr auto operator<=>(__iterator const& __x, __iterator const& __y)
305	requires random_access_range<_Base> && three_way_comparable<iterator_t<_Base>>
306	{
307	return __x.__current_ <=> __y.__current_;
308	}
309
310	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(__iterator const& __i, difference_type __s)
311	requires random_access_range<_Base>
312	{
313	auto __r = __i;
314	__r += __s;
315	return __r;
316	}
317	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __s, __iterator const& __i)
318	requires random_access_range<_Base>
319	{
320	auto __r = __i;
321	__r += __s;
322	return __r;
323	}
324
325	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(__iterator const& __i, difference_type __s)
326	requires random_access_range<_Base>
327	{
328	auto __r = __i;
329	__r -= __s;
330	return __r;
331	}
332
333	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
334	operator-(__iterator const& __x, __iterator const& __y)
335	requires sized_sentinel_for<iterator_t<_Base>, iterator_t<_Base>>
336	{
337	if constexpr (forward_range<_Base>) {
338	auto __n = __x.__current_ - __y.__current_;
339	return (__n + __x.__missing_ - __y.__missing_) / __x.__stride_;
340	}
341	auto __n = __x.__current_ - __y.__current_;
342	if (__n < 0) {
343	return -ranges::__div_ceil(-__n, __x.__stride_);
344	}
345	return ranges::__div_ceil(__n, __x.__stride_);
346	}
347
348	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
349	operator-(default_sentinel_t, __iterator const& __x)
350	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<_Base>>
351	{
352	return ranges::__div_ceil(__x.__end_ - __x.__current_, __x.__stride_);
353	}
354	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
355	operator-(__iterator const& __x, default_sentinel_t __y)
356	requires sized_sentinel_for<sentinel_t<_Base>, iterator_t<_Base>>
357	{
358	return -(__y - __x);
359	}
360
361	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_rvalue_reference_t<_Base>
362	iter_move(__iterator const& __it) noexcept(noexcept(ranges::iter_move(__it.__current_))) {
363	return ranges::iter_move(__it.__current_);
364	}
365
366	_LIBCPP_HIDE_FROM_ABI friend constexpr void
367	iter_swap(__iterator const& __x,
368	__iterator const& __y) noexcept(noexcept(ranges::iter_swap(__x.__current_, __y.__current_)))
369	requires indirectly_swappable<iterator_t<_Base>>
370	{
371	return ranges::iter_swap(__x.__current_, __y.__current_);
372	}
373	}; // class stride_view::__iterator
374
375	template <class _Tp>
376	inline constexpr bool enable_borrowed_range<stride_view<_Tp>> = enable_borrowed_range<_Tp>;
377
378	namespace views {
379	namespace __stride_view {
380	struct __fn {
381	// clang-format off
382	template <viewable_range _Range>
383	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI
384	constexpr auto operator()(_Range&& __range, range_difference_t<_Range> __n) const
385	noexcept(noexcept(stride_view{std::forward<_Range>(__range), __n}))
386	-> decltype( stride_view{std::forward<_Range>(__range), __n})
387	{ return stride_view(std::forward<_Range>(__range), __n); }
388	// clang-format on
389
390	template <class _Np>
391	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Np&& __n) const {
392	return __pipeable(std::__bind_back(*this, std::forward<_Np>(__n)));
393	}
394	};
395	} // namespace __stride_view
396
397	inline namespace __cpo {
398	inline constexpr auto stride = __stride_view::__fn{};
399	} // namespace __cpo
400	} // namespace views
401
402	} // namespace ranges
403
404	#endif // _LIBCPP_STD_VER >= 23
405
406	_LIBCPP_END_NAMESPACE_STD
407
408	_LIBCPP_POP_MACROS
409
410	#endif // _LIBCPP___RANGES_STRIDE_VIEW_H

lib/libcxx/include/__ranges/subrange.h+15-14

 @@ -49,10 +49,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <class _From, class _To>
 concept __uses_nonqualification_pointer_conversion =
 @@ -131,7 +131,7 @@ public:
     return _Pair(__begin_, __end_);
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr _Iter begin() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Iter begin() const
     requires copyable<_Iter>
   {
     return __begin_;
 @@ -143,11 +143,11 @@ public:
     return std::move(__begin_);
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr _Sent end() const { return __end_; }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Sent end() const { return __end_; }
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool empty() const { return __begin_ == __end_; }
-  _LIBCPP_HIDE_FROM_ABI constexpr make_unsigned_t<iter_difference_t<_Iter>> size() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr make_unsigned_t<iter_difference_t<_Iter>> size() const
     requires(_Kind == subrange_kind::sized)
   {
     if constexpr (_StoreSize)
 @@ -201,11 +201,12 @@ template <input_or_output_iterator _Iter, sentinel_for<_Iter> _Sent>
 subrange(_Iter, _Sent, make_unsigned_t<iter_difference_t<_Iter>>) -> subrange<_Iter, _Sent, subrange_kind::sized>;
 template <borrowed_range _Range>
-subrange(_Range&&) -> subrange<iterator_t<_Range>,
+subrange(_Range&&)
-                               sentinel_t<_Range>,
+    -> subrange<iterator_t<_Range>,
-                               (sized_range<_Range> || sized_sentinel_for<sentinel_t<_Range>, iterator_t<_Range>>)
+                sentinel_t<_Range>,
-                                   ? subrange_kind::sized
+                (sized_range<_Range> || sized_sentinel_for<sentinel_t<_Range>, iterator_t<_Range>>)
-                                   : subrange_kind::unsized>;
+                    ? subrange_kind::sized
+                    : subrange_kind::unsized>;
 template <borrowed_range _Range>
 subrange(_Range&&, make_unsigned_t<range_difference_t<_Range>>)
 @@ -213,7 +214,7 @@ subrange(_Range&&, make_unsigned_t<range_difference_t<_Range>>)
 template <size_t _Index, class _Iter, class _Sent, subrange_kind _Kind>
   requires((_Index == 0 && copyable<_Iter>) || _Index == 1)
-_LIBCPP_HIDE_FROM_ABI constexpr auto get(const subrange<_Iter, _Sent, _Kind>& __subrange) {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto get(const subrange<_Iter, _Sent, _Kind>& __subrange) {
   if constexpr (_Index == 0)
     return __subrange.begin();
   else
 @@ -222,7 +223,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr auto get(const subrange<_Iter, _Sent, _Kind>& __
 template <size_t _Index, class _Iter, class _Sent, subrange_kind _Kind>
   requires(_Index < 2)
-_LIBCPP_HIDE_FROM_ABI constexpr auto get(subrange<_Iter, _Sent, _Kind>&& __subrange) {
+[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto get(subrange<_Iter, _Sent, _Kind>&& __subrange) {
   if constexpr (_Index == 0)
     return __subrange.begin();
   else
 @@ -265,10 +266,10 @@ struct tuple_element<1, const ranges::subrange<_Ip, _Sp, _Kp>> {
   using type _LIBCPP_NODEBUG = _Sp;
 };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___RANGES_SUBRANGE_H

lib/libcxx/include/__ranges/take_view.h+1-2

...	@@ -69,8 +69,7 @@ public:	...	@@ -69,8 +69,7 @@ public:
69	requires default_initializable<_View>	69	requires default_initializable<_View>
70	= default;	70	= default;
71		71
72	_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23	72	_LIBCPP_HIDE_FROM_ABI constexpr explicit take_view(_View __base, range_difference_t<_View> __count)
73	take_view(_View __base, range_difference_t<_View> __count)
74	: __base_(std::move(__base)), __count_(__count) {	73	: __base_(std::move(__base)), __count_(__count) {
75	_LIBCPP_ASSERT_UNCATEGORIZED(__count >= 0, "count has to be greater than or equal to zero");	74	_LIBCPP_ASSERT_UNCATEGORIZED(__count >= 0, "count has to be greater than or equal to zero");
76	}	75	}

lib/libcxx/include/__ranges/take_while_view.h+10-10

lib/libcxx/include/__ranges/transform_view.h+35-24

lib/libcxx/include/__ranges/view_interface.h+4-4

 @@ -30,10 +30,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 namespace ranges {
 template <class _Derived>
 @@ -163,8 +163,8 @@ public:
 } // namespace ranges
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___RANGES_VIEW_INTERFACE_H

lib/libcxx/include/__ranges/views.h+2-1

...	@@ -22,7 +22,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -22,7 +22,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	namespace ranges {	23	namespace ranges {
24		24
25	namespace views {}	25	namespace views { // NOLINT(libcpp-avoid-empty-namespaces) // This is needed to declare the alias below.
		26	} // namespace views
26		27
27	} // namespace ranges	28	} // namespace ranges
28		29

lib/libcxx/include/__ranges/zip_transform_view.h+18-17

 @@ -17,6 +17,7 @@
 #include <__concepts/derived_from.h>
 #include <__concepts/equality_comparable.h>
 #include <__concepts/invocable.h>
+#include <__concepts/referenceable.h>
 #include <__functional/invoke.h>
 #include <__iterator/concepts.h>
 #include <__iterator/incrementable_traits.h>
 @@ -33,7 +34,6 @@
 #include <__type_traits/invoke.h>
 #include <__type_traits/is_object.h>
 #include <__type_traits/is_reference.h>
-#include <__type_traits/is_referenceable.h>
 #include <__type_traits/maybe_const.h>
 #include <__type_traits/remove_cvref.h>
 #include <__utility/forward.h>
 @@ -79,15 +79,15 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr explicit zip_transform_view(_Fn __fun, _Views... __views)
       : __zip_(std::move(__views)...), __fun_(in_place, std::move(__fun)) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin() { return __iterator<false>(*this, __zip_.begin()); }
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() { return __iterator<false>(*this, __zip_.begin()); }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
     requires range<const _InnerView> && regular_invocable<const _Fn&, range_reference_t<const _Views>...>
   {
     return __iterator<true>(*this, __zip_.begin());
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end() {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() {
     if constexpr (common_range<_InnerView>) {
       return __iterator<false>(*this, __zip_.end());
     } else {
 @@ -95,7 +95,7 @@ public:
     }
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
     requires range<const _InnerView> && regular_invocable<const _Fn&, range_reference_t<const _Views>...>
   {
     if constexpr (common_range<const _InnerView>) {
 @@ -105,13 +105,13 @@ public:
     }
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto size()
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size()
     requires sized_range<_InnerView>
   {
     return __zip_.size();
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
     requires sized_range<const _InnerView>
   {
     return __zip_.size();
 @@ -184,7 +184,7 @@ public:
     requires _Const && convertible_to<__ziperator<false>, __ziperator<_Const>>
       : __parent_(__i.__parent_), __inner_(std::move(__i.__inner_)) {}
-  _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const
       noexcept(noexcept(std::apply(__get_deref_and_invoke(), __zip_view_iterator_access::__get_underlying(__inner_)))) {
     return std::apply(__get_deref_and_invoke(), __zip_view_iterator_access::__get_underlying(__inner_));
   }
 @@ -233,7 +233,7 @@ public:
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](difference_type __n) const
     requires random_access_range<_Base>
   {
     return std::apply(
 @@ -255,25 +255,26 @@ public:
     return __x.__inner_ <=> __y.__inner_;
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n)
     requires random_access_range<_Base>
   {
     return __iterator(*__i.__parent_, __i.__inner_ + __n);
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i)
     requires random_access_range<_Base>
   {
     return __iterator(*__i.__parent_, __i.__inner_ + __n);
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n)
     requires random_access_range<_Base>
   {
     return __iterator(*__i.__parent_, __i.__inner_ - __n);
   }
-  _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type operator-(const __iterator& __x, const __iterator& __y)
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
+  operator-(const __iterator& __x, const __iterator& __y)
     requires sized_sentinel_for<__ziperator<_Const>, __ziperator<_Const>>
   {
     return __x.__inner_ - __y.__inner_;
 @@ -307,14 +308,14 @@ public:
   template <bool _OtherConst>
     requires sized_sentinel_for<__zentinel<_Const>, __ziperator<_OtherConst>>
-  _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _InnerView>>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _InnerView>>
   operator-(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
     return __x.__inner_ - __y.__inner_;
   }
   template <bool _OtherConst>
     requires sized_sentinel_for<__zentinel<_Const>, __ziperator<_OtherConst>>
-  _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _InnerView>>
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr range_difference_t<__maybe_const<_OtherConst, _InnerView>>
   operator-(const __sentinel& __x, const __iterator<_OtherConst>& __y) {
     return __x.__inner_ - __y.__inner_;
   }
 @@ -327,14 +328,14 @@ struct __fn {
   template <class _Fn>
     requires(move_constructible<decay_t<_Fn>> && regular_invocable<decay_t<_Fn>&> &&
              is_object_v<invoke_result_t<decay_t<_Fn>&>>)
-  _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Fn&&) const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Fn&&) const
       noexcept(noexcept(auto(views::empty<decay_t<invoke_result_t<decay_t<_Fn>&>>>))) {
     return views::empty<decay_t<invoke_result_t<decay_t<_Fn>&>>>;
   }
   template <class _Fn, class... _Ranges>
     requires(sizeof...(_Ranges) > 0)
-  _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Fn&& __fun, _Ranges&&... __rs) const
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Fn&& __fun, _Ranges&&... __rs) const
       noexcept(noexcept(zip_transform_view(std::forward<_Fn>(__fun), std::forward<_Ranges>(__rs)...)))
           -> decltype(zip_transform_view(std::forward<_Fn>(__fun), std::forward<_Ranges>(__rs)...)) {
     return zip_transform_view(std::forward<_Fn>(__fun), std::forward<_Ranges>(__rs)...);

lib/libcxx/include/__ranges/zip_view.h+18-15

lib/libcxx/include/__split_buffer+131-16

...	@@ -25,6 +25,7 @@	...	@@ -25,6 +25,7 @@
25	#include <__memory/compressed_pair.h>	25	#include <__memory/compressed_pair.h>
26	#include <__memory/pointer_traits.h>	26	#include <__memory/pointer_traits.h>
27	#include <__memory/swap_allocator.h>	27	#include <__memory/swap_allocator.h>
		28	#include <__memory/uninitialized_algorithms.h>
28	#include <__type_traits/conditional.h>	29	#include <__type_traits/conditional.h>
29	#include <__type_traits/enable_if.h>	30	#include <__type_traits/enable_if.h>
30	#include <__type_traits/integral_constant.h>	31	#include <__type_traits/integral_constant.h>
...	@@ -156,10 +157,8 @@ public:	...	@@ -156,10 +157,8 @@ public:
156		157
157	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference back() const _NOEXCEPT { return *(__end_ - 1); }	158	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference back() const _NOEXCEPT { return *(__end_ - 1); }
158		159
159	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __swap_without_allocator(	160	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
160	__split_buffer_pointer_layout<__split_buffer<value_type, allocator_type, __split_buffer_pointer_layout>,	161	__swap_without_allocator(__split_buffer_pointer_layout& __other) _NOEXCEPT {
161	value_type,
162	allocator_type>& __other) _NOEXCEPT {
163	std::swap(__front_cap_, __other.__front_cap_);	162	std::swap(__front_cap_, __other.__front_cap_);
164	std::swap(__begin_, __other.__begin_);	163	std::swap(__begin_, __other.__begin_);
165	std::swap(__back_cap_, __other.__back_cap_);	164	std::swap(__back_cap_, __other.__back_cap_);
...	@@ -190,6 +189,65 @@ public:	...	@@ -190,6 +189,65 @@ public:
190	__back_cap_ = __other.__back_cap_;	189	__back_cap_ = __other.__back_cap_;
191	}	190	}
192		191
		192	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
		193	__swap_layouts(pointer& __begin, pointer& __end, pointer& __back_capacity) {
		194	using std::swap;
		195	swap(__begin_, __begin);
		196	swap(__end_, __end);
		197	swap(__back_cap_, __back_capacity);
		198	}
		199
		200	/// Relocates the objects in the range `[__first, __last)` to the front of the buffer, then swaps
		201	/// `__first`, `__last`, and `__capacity` with `__begin_`, `__end_`, and `__back_cap_`,
		202	/// respectively.
		203	///
		204	/// Precondition: `__front_spare() == __last - __first`.
		205	/// Exceptions: This function has a strong exception guarantee.
		206	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
		207	__relocate(pointer& __first, pointer& __last, pointer& __capacity) {
		208	auto __size = __last - __first;
		209	auto __new_begin = __begin_ - __size;
		210	std::__uninitialized_allocator_relocate(
		211	__alloc_, std::__to_address(__first), std::__to_address(__last), std::__to_address(__new_begin));
		212	__begin_ = __new_begin;
		213	__last = __first;
		214
		215	__swap_layouts(__first, __last, __capacity);
		216	__front_cap_ = __begin_;
		217	}
		218
		219	/// Relocates the objects in the range `[__first, __pivot)` to the front of the buffer, the
		220	/// objects in `[__pivot, __last)` into the back of the buffer, then swaps `__first`, `__last`,
		221	/// and `__capacity` with `__begin_`, `__end_`, and `__back_cap_`, respectively.
		222	///
		223	/// Preconditions:
		224	/// * `__front_spare() == __pivot - __first`
		225	/// * `__back_spare() == __last - __pivot`
		226	/// Exceptions: This function has a strong exception guarantee if `__first == __pivot` or
		227	/// `__last == __pivot`.
		228	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer
		229	__relocate_with_pivot(pointer __pivot, pointer& __first, pointer& __last, pointer& __capacity) {
		230	pointer __result = __begin_;
		231
		232	// Relocate [__p, __last) first to avoid having a hole in [__first, __last)
		233	// in case something in [__first, __p) throws.
		234	std::__uninitialized_allocator_relocate(
		235	__alloc_, std::__to_address(__pivot), std::__to_address(__last), std::__to_address(__end_));
		236	auto __relocated_so_far = __last - __pivot;
		237	__end_ += __relocated_so_far;
		238	__last = __pivot; // The objects in [__p, __last) have been destroyed by relocating them.
		239
		240	auto __new_begin = __begin_ - (__pivot - __first);
		241	std::__uninitialized_allocator_relocate(
		242	__alloc_, std::__to_address(__first), std::__to_address(__pivot), std::__to_address(__new_begin));
		243	__begin_ = __new_begin;
		244
		245	__last = __first; // All the objects have been destroyed by relocating them.
		246	__swap_layouts(__first, __last, __capacity);
		247	__front_cap_ = __begin_;
		248	return __result;
		249	}
		250
193	private:	251	private:
194	pointer __front_cap_ = nullptr;	252	pointer __front_cap_ = nullptr;
195	pointer __begin_ = nullptr;	253	pointer __begin_ = nullptr;
...	@@ -263,25 +321,19 @@ public:	...	@@ -263,25 +321,19 @@ public:
263		321
264	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void	322	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
265	__set_valid_range(pointer __new_begin, pointer __new_end) _NOEXCEPT {	323	__set_valid_range(pointer __new_begin, pointer __new_end) _NOEXCEPT {
266	// Size-based __split_buffers track their size directly: we need to explicitly update the size
267	// when the front is adjusted.
268	__size_ -= __new_begin - __begin_;
269	__begin_ = __new_begin;	324	__begin_ = __new_begin;
270	__set_sentinel(__new_end);	325	__set_sentinel(__new_end);
271	}	326	}
272		327
273	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void	328	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
274	__set_valid_range(pointer __new_begin, size_type __new_size) _NOEXCEPT {	329	__set_valid_range(pointer __new_begin, size_type __new_size) _NOEXCEPT {
275	// Size-based __split_buffers track their size directly: we need to explicitly update the size
276	// when the front is adjusted.
277	__size_ -= __new_begin - __begin_;
278	__begin_ = __new_begin;	330	__begin_ = __new_begin;
279	__set_sentinel(__new_size);	331	__set_sentinel(__new_size);
280	}	332	}
281		333
282	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __set_sentinel(pointer __new_end) _NOEXCEPT {	334	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __set_sentinel(pointer __new_end) _NOEXCEPT {
283	_LIBCPP_ASSERT_INTERNAL(__front_cap_ <= __new_end, "__new_end cannot precede __front_cap_");	335	_LIBCPP_ASSERT_INTERNAL(__front_cap_ <= __new_end, "__new_end cannot precede __front_cap_");
284	__size_ += __new_end - end();	336	__size_ = __new_end - __begin_;
285	}	337	}
286		338
287	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __set_sentinel(size_type __new_size) _NOEXCEPT {	339	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __set_sentinel(size_type __new_size) _NOEXCEPT {
...	@@ -312,10 +364,8 @@ public:	...	@@ -312,10 +364,8 @@ public:
312	return __begin_[__size_ - 1];	364	return __begin_[__size_ - 1];
313	}	365	}
314		366
315	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __swap_without_allocator(	367	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
316	__split_buffer_pointer_layout<__split_buffer<value_type, allocator_type, __split_buffer_pointer_layout>,	368	__swap_without_allocator(__split_buffer_size_layout& __other) _NOEXCEPT {
317	value_type,
318	allocator_type>& __other) _NOEXCEPT {
319	std::swap(__front_cap_, __other.__front_cap_);	369	std::swap(__front_cap_, __other.__front_cap_);
320	std::swap(__begin_, __other.__begin_);	370	std::swap(__begin_, __other.__begin_);
321	std::swap(__cap_, __other.__cap_);	371	std::swap(__cap_, __other.__cap_);
...	@@ -346,6 +396,68 @@ public:	...	@@ -346,6 +396,68 @@ public:
346	__size_ = __other.__size_;	396	__size_ = __other.__size_;
347	}	397	}
348		398
		399	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
		400	__swap_layouts(pointer& __begin, size_type& __size, size_type& __capacity) {
		401	using std::swap;
		402	swap(__begin_, __begin);
		403	swap(__size_, __size);
		404	swap(__cap_, __capacity);
		405	}
		406
		407	/// Relocates the objects in the range `[__first, __first + __n)` to the front of the buffer, then
		408	/// swaps `__first`, `__n`, and `__capacity` with `__begin_`, `__size_`, and `__capacity_`,
		409	/// respectively.
		410	///
		411	/// Precondition: `__front_spare() == __n`.
		412	/// Exceptions: This function has a strong exception guarantee.
		413	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
		414	__relocate(pointer& __first, size_type& __n, size_type& __capacity) {
		415	auto __new_begin = __begin_ - __n;
		416	auto __last = __first + __n;
		417	std::__uninitialized_allocator_relocate(
		418	__alloc_, std::__to_address(__first), std::__to_address(__last), std::__to_address(__new_begin));
		419	__set_valid_range(__new_begin, end());
		420	__n = 0;
		421
		422	__swap_layouts(__first, __n, __capacity);
		423	__front_cap_ = __begin_;
		424	}
		425
		426	/// Relocates the objects in the range `[__first, __pivot)` to the front of the buffer, the
		427	/// objects in `[__pivot, __first + __n)` to the back of the buffer, then swaps `__first`, `__n`,
		428	/// and `__capacity` with `__begin_`, `__size_`, and `__capacity_`, respectively.
		429	///
		430	/// Preconditions:
		431	/// * `__front_spare() == __pivot - __first`
		432	/// * `__back_spare() == __last - __pivot`
		433	/// Exceptions: This function has a strong exception guarantee if `__first == __pivot` or
		434	/// `__first + __n == __pivot`.
		435	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer
		436	__relocate_with_pivot(pointer __pivot, pointer& __first, size_type& __n, size_type& __capacity) {
		437	pointer __result = __begin_;
		438	pointer __last = __first + __n;
		439
		440	// We relocate elements in reverse order to ensure that a throwing relocation operation leaves the
		441	// buffer in a valid state.
		442	std::__uninitialized_allocator_relocate(
		443	__alloc_, std::__to_address(__pivot), std::__to_address(__last), std::__to_address(end()));
		444
		445	auto const __relocated_so_far = __last - __pivot;
		446	__size_ += __relocated_so_far;
		447	__n -= __relocated_so_far; // The objects in [__pivot, __last) have been destroyed by relocating them.
		448
		449	auto __new_begin = __begin_ - __n;
		450	std::__uninitialized_allocator_relocate(
		451	__alloc_, std::__to_address(__first), std::__to_address(__pivot), std::__to_address(__new_begin));
		452	__begin_ = __new_begin;
		453	__size_ += __n;
		454	__n = 0; // All the objects have been destroyed by relocating them.
		455
		456	__swap_layouts(__first, __n, __capacity);
		457	__front_cap_ = __begin_;
		458	return __result;
		459	}
		460
349	private:	461	private:
350	pointer __front_cap_ = nullptr;	462	pointer __front_cap_ = nullptr;
351	pointer __begin_ = nullptr;	463	pointer __begin_ = nullptr;
...	@@ -452,11 +564,14 @@ public:	...	@@ -452,11 +564,14 @@ public:
452	using __base_type::__get_allocator;	564	using __base_type::__get_allocator;
453	using __base_type::__raw_capacity;	565	using __base_type::__raw_capacity;
454	using __base_type::__raw_sentinel;	566	using __base_type::__raw_sentinel;
		567	using __base_type::__relocate;
		568	using __base_type::__relocate_with_pivot;
455	using __base_type::__reset;	569	using __base_type::__reset;
456	using __base_type::__set_capacity;	570	using __base_type::__set_capacity;
457	using __base_type::__set_data;	571	using __base_type::__set_data;
458	using __base_type::__set_sentinel;	572	using __base_type::__set_sentinel;
459	using __base_type::__set_valid_range;	573	using __base_type::__set_valid_range;
		574	using __base_type::__swap_layouts;
460		575
461	using typename __base_type::__alloc_traits;	576	using typename __base_type::__alloc_traits;
462	using typename __base_type::allocator_type;	577	using typename __base_type::allocator_type;
...	@@ -585,7 +700,7 @@ public:	...	@@ -585,7 +700,7 @@ public:
585		700
586	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void	701	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
587	__swap_without_allocator(__split_buffer<value_type, allocator_type, _Layout>& __other) _NOEXCEPT {	702	__swap_without_allocator(__split_buffer<value_type, allocator_type, _Layout>& __other) _NOEXCEPT {
588	__base_type::__swap_without_allocator(__other);	703	__base_type::__swap_without_allocator(static_cast<__base_type&>(__other));
589	}	704	}
590		705
591	private:	706	private:

lib/libcxx/include/__stop_token/atomic_unique_lock.h+8-7

 @@ -10,25 +10,26 @@
 #ifndef _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_LOCK_H
 #define _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_LOCK_H
-#include <__bit/popcount.h>
+#include <__atomic/atomic.h>
+#include <__atomic/memory_order.h>
+#include <__bit/has_single_bit.h>
 #include <__config>
-#include <atomic>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // This class implements an RAII unique_lock without a mutex.
 // It uses std::atomic<State>,
 // where State contains a lock bit and might contain other data,
 // and LockedBit is the value of State when the lock bit is set, e.g  1 << 2
 template <class _State, _State _LockedBit>
 class __atomic_unique_lock {
-  static_assert(std::__popcount(static_cast<unsigned long long>(_LockedBit)) == 1,
+  static_assert(std::has_single_bit(static_cast<unsigned long long>(_LockedBit)),
                 "LockedBit must be an integer where only one bit is set");
   std::atomic<_State>& __state_;
 @@ -133,8 +134,8 @@ private:
   _LIBCPP_HIDE_FROM_ABI static constexpr auto __set_locked_bit = [](_State __state) { return __state | _LockedBit; };
 };
-#endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_LOCK_H

lib/libcxx/include/__stop_token/intrusive_list_view.h+4-4

 @@ -17,10 +17,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Derived>
 struct __intrusive_node_base {
   _Derived* __next_ = nullptr;
 @@ -78,8 +78,8 @@ private:
   _Node* __head_ = nullptr;
 };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___STOP_TOKEN_INTRUSIVE_LIST_VIEW_H

lib/libcxx/include/__stop_token/intrusive_shared_ptr.h+4-5

 @@ -10,7 +10,6 @@
 #ifndef _LIBCPP___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
 #define _LIBCPP___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
-#include <__atomic/atomic.h>
 #include <__atomic/memory_order.h>
 #include <__config>
 #include <__cstddef/nullptr_t.h>
 @@ -26,10 +25,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 // For intrusive_shared_ptr to work with a type T, specialize __intrusive_shared_ptr_traits<T> and implement
 // the following function:
 //
 @@ -126,10 +125,10 @@ private:
   }
 };
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H

lib/libcxx/include/__stop_token/stop_callback.h+4-4

 @@ -29,10 +29,10 @@
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Callback>
 class stop_callback : private __stop_callback_base {
   static_assert(invocable<_Callback>,
 @@ -93,10 +93,10 @@ private:
 template <class _Callback>
 stop_callback(stop_token, _Callback) -> stop_callback<_Callback>;
-#endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
 _LIBCPP_POP_MACROS
 #endif // _LIBCPP___STOP_TOKEN_STOP_CALLBACK_H

lib/libcxx/include/__stop_token/stop_state.h+6-5

 @@ -11,21 +11,22 @@
 #define _LIBCPP___STOP_TOKEN_STOP_STATE_H
 #include <__assert>
+#include <__atomic/atomic.h>
+#include <__atomic/memory_order.h>
 #include <__config>
 #include <__stop_token/atomic_unique_lock.h>
 #include <__stop_token/intrusive_list_view.h>
 #include <__thread/id.h>
-#include <atomic>
 #include <cstdint>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
+_LIBCPP_BEGIN_NAMESPACE_STD
 struct __stop_callback_base : __intrusive_node_base<__stop_callback_base> {
   using __callback_fn_t _LIBCPP_NODEBUG = void(__stop_callback_base*) noexcept;
   _LIBCPP_HIDE_FROM_ABI explicit __stop_callback_base(__callback_fn_t* __callback_fn) : __callback_fn_(__callback_fn) {}
 @@ -229,8 +230,8 @@ struct __intrusive_shared_ptr_traits<__stop_state> {
   }
 };
-#endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
 #endif // _LIBCPP___STOP_TOKEN_STOP_STATE_H

lib/libcxx/include/__stop_token/stop_token.h+4-4

 @@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
+_LIBCPP_BEGIN_NAMESPACE_STD
 class stop_token {
 public:
   _LIBCPP_HIDE_FROM_ABI stop_token() noexcept = default;
 @@ -56,8 +56,8 @@ private:
   _LIBCPP_HIDE_FROM_ABI explicit stop_token(const __intrusive_shared_ptr<__stop_state>& __state) : __state_(__state) {}
 };
-#endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_THREADS
 #endif // _LIBCPP___STOP_TOKEN_STOP_TOKEN_H

lib/libcxx/include/__support/xlocale/__nop_locale_mgmt.h deleted-33

...	@@ -1,33 +0,0 @@
1	// -- C++ --
2	//===-----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
11	#define _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
12
13	#include <__config>
14
15	// Patch over lack of extended locale support
16	typedef void* locale_t;
17
18	inline _LIBCPP_HIDE_FROM_ABI locale_t duplocale(locale_t) { return nullptr; }
19
20	inline _LIBCPP_HIDE_FROM_ABI void freelocale(locale_t) {}
21
22	inline _LIBCPP_HIDE_FROM_ABI locale_t newlocale(int, const char*, locale_t) { return nullptr; }
23
24	#define LC_COLLATE_MASK (1 << LC_COLLATE)
25	#define LC_CTYPE_MASK (1 << LC_CTYPE)
26	#define LC_MESSAGES_MASK (1 << LC_MESSAGES)
27	#define LC_MONETARY_MASK (1 << LC_MONETARY)
28	#define LC_NUMERIC_MASK (1 << LC_NUMERIC)
29	#define LC_TIME_MASK (1 << LC_TIME)
30	#define LC_ALL_MASK \
31	(LC_COLLATE_MASK \| LC_CTYPE_MASK \| LC_MONETARY_MASK \| LC_NUMERIC_MASK \| LC_TIME_MASK \| LC_MESSAGES_MASK)
32
33	#endif // _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H

lib/libcxx/include/__support/xlocale/__strtonum_fallback.h deleted-37

...	@@ -1,37 +0,0 @@
1	// -- C++ --
2	//===-----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9	// These are reimplementations of some extended locale functions ( *_l ) that
10	// aren't part of POSIX. They are widely available though (GLIBC, BSD, maybe
11	// others). The unifying aspect in this case is that all of these functions
12	// convert strings to some numeric type.
13	//===----------------------------------------------------------------------===//
14
15	#ifndef _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
16	#define _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
17
18	#include <__config>
19	#include <stdlib.h>
20
21	#if _LIBCPP_HAS_WIDE_CHARACTERS
22	# include <wchar.h>
23	#endif
24
25	inline _LIBCPP_HIDE_FROM_ABI float strtof_l(const char* __nptr, char** __endptr, locale_t) {
26	return ::strtof(__nptr, __endptr);
27	}
28
29	inline _LIBCPP_HIDE_FROM_ABI double strtod_l(const char* __nptr, char** __endptr, locale_t) {
30	return ::strtod(__nptr, __endptr);
31	}
32
33	inline _LIBCPP_HIDE_FROM_ABI long double strtold_l(const char* __nptr, char** __endptr, locale_t) {
34	return ::strtold(__nptr, __endptr);
35	}
36
37	#endif // _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H

lib/libcxx/include/__system_error/error_category.h+2

...	@@ -19,6 +19,7 @@	...	@@ -19,6 +19,7 @@
19	#endif	19	#endif
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
		22	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
22		23
23	class error_condition;	24	class error_condition;
24	class _LIBCPP_EXPORTED_FROM_ABI error_code;	25	class _LIBCPP_EXPORTED_FROM_ABI error_code;
...	@@ -70,6 +71,7 @@ public:	...	@@ -70,6 +71,7 @@ public:
70	[[__gnu__::__const__]] [[__nodiscard__]] _LIBCPP_EXPORTED_FROM_ABI const error_category& generic_category() _NOEXCEPT;	71	[[__gnu__::__const__]] [[__nodiscard__]] _LIBCPP_EXPORTED_FROM_ABI const error_category& generic_category() _NOEXCEPT;
71	[[__gnu__::__const__]] [[__nodiscard__]] _LIBCPP_EXPORTED_FROM_ABI const error_category& system_category() _NOEXCEPT;	72	[[__gnu__::__const__]] [[__nodiscard__]] _LIBCPP_EXPORTED_FROM_ABI const error_category& system_category() _NOEXCEPT;
72		73
		74	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
73	_LIBCPP_END_NAMESPACE_STD	75	_LIBCPP_END_NAMESPACE_STD
74		76
75	#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CATEGORY_H	77	#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CATEGORY_H

lib/libcxx/include/__system_error/error_code.h+2

...	@@ -24,6 +24,7 @@	...	@@ -24,6 +24,7 @@
24	#endif	24	#endif
25		25
26	_LIBCPP_BEGIN_NAMESPACE_STD	26	_LIBCPP_BEGIN_NAMESPACE_STD
		27	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
27		28
28	template <class _Tp>	29	template <class _Tp>
29	struct is_error_code_enum : public false_type {};	30	struct is_error_code_enum : public false_type {};
...	@@ -137,6 +138,7 @@ struct hash<error_code> : public __unary_function<error_code, size_t> {	...	@@ -137,6 +138,7 @@ struct hash<error_code> : public __unary_function<error_code, size_t> {
137	}	138	}
138	};	139	};
139		140
		141	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
140	_LIBCPP_END_NAMESPACE_STD	142	_LIBCPP_END_NAMESPACE_STD
141		143
142	#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CODE_H	144	#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CODE_H

lib/libcxx/include/__system_error/error_condition.h+2

...	@@ -23,6 +23,7 @@	...	@@ -23,6 +23,7 @@
23	#endif	23	#endif
24		24
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
		26	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
26		27
27	template <class _Tp>	28	template <class _Tp>
28	struct is_error_condition_enum : public false_type {};	29	struct is_error_condition_enum : public false_type {};
...	@@ -124,6 +125,7 @@ struct hash<error_condition> : public __unary_function<error_condition, size_t>	...	@@ -124,6 +125,7 @@ struct hash<error_condition> : public __unary_function<error_condition, size_t>
124	}	125	}
125	};	126	};
126		127
		128	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
127	_LIBCPP_END_NAMESPACE_STD	129	_LIBCPP_END_NAMESPACE_STD
128		130
129	#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CONDITION_H	131	#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CONDITION_H

lib/libcxx/include/__system_error/system_error.h+2

...	@@ -22,6 +22,7 @@	...	@@ -22,6 +22,7 @@
22	#endif	22	#endif
23		23
24	_LIBCPP_BEGIN_NAMESPACE_STD	24	_LIBCPP_BEGIN_NAMESPACE_STD
		25	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
25		26
26	class _LIBCPP_EXPORTED_FROM_ABI system_error : public runtime_error {	27	class _LIBCPP_EXPORTED_FROM_ABI system_error : public runtime_error {
27	error_code __ec_;	28	error_code __ec_;
...	@@ -52,6 +53,7 @@ public:	...	@@ -52,6 +53,7 @@ public:
52	#endif	53	#endif
53	}	54	}
54		55
		56	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
55	_LIBCPP_END_NAMESPACE_STD	57	_LIBCPP_END_NAMESPACE_STD
56		58
57	#endif // _LIBCPP___SYSTEM_ERROR_SYSTEM_ERROR_H	59	#endif // _LIBCPP___SYSTEM_ERROR_SYSTEM_ERROR_H

lib/libcxx/include/__system_error/throw_system_error.h+2

 @@ -17,9 +17,11 @@
 #endif
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 [[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void __throw_system_error(int __ev, const char* __what_arg);
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 #endif // _LIBCPP___SYSTEM_ERROR_THROW_SYSTEM_ERROR_H

lib/libcxx/include/__thread/formatter.h+1-8

 @@ -51,20 +51,13 @@ public:
     // On Linux systems pthread_t is an unsigned long long.
     // On Apple systems pthread_t is a pointer type.
     //
-    // Note the output should match what the stream operator does. Since
+    // Note the output should match what the stream operator does.
-    // the ostream operator has been shipped years before this formatter
-    // was added to the Standard, this formatter does what the stream
-    // operator does. This may require platform specific changes.
     using _Tp = decltype(__get_underlying_id(__id));
     using _Cp = conditional_t<integral<_Tp>, _Tp, conditional_t<is_pointer_v<_Tp>, uintptr_t, void>>;
     static_assert(!is_same_v<_Cp, void>, "unsupported thread::id type, please file a bug report");
     __format_spec::__parsed_specifications<_CharT> __specs = __parser_.__get_parsed_std_specifications(__ctx);
-    if constexpr (is_pointer_v<_Tp>) {
-      __specs.__std_.__alternate_form_ = true;
-      __specs.__std_.__type_           = __format_spec::__type::__hexadecimal_lower_case;
-    }
     return __formatter::__format_integer(reinterpret_cast<_Cp>(__get_underlying_id(__id)), __ctx, __specs);
   }

lib/libcxx/include/__thread/id.h+4-3

 @@ -20,9 +20,10 @@
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_HAS_THREADS
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_HAS_THREADS
 class __thread_id;
 namespace this_thread {
 @@ -114,8 +115,8 @@ inline _LIBCPP_HIDE_FROM_ABI __thread_id get_id() _NOEXCEPT { return __libcpp_th
 } // namespace this_thread
-#endif // _LIBCPP_HAS_THREADS
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_HAS_THREADS
 #endif // _LIBCPP___THREAD_ID_H

lib/libcxx/include/__thread/support/pthread.h+16-3

 @@ -144,7 +144,9 @@ inline _LIBCPP_HIDE_FROM_ABI int __libcpp_execute_once(__libcpp_exec_once_flag*
 //
 // Thread id
 //
-#if defined(__MVS__)
+#if _LIBCPP_LIBC_LLVM_LIBC
+typedef pthread_id_np_t __libcpp_thread_id;
+#elif defined(__MVS__)
 typedef unsigned long long __libcpp_thread_id;
 #else
 typedef pthread_t __libcpp_thread_id;
 @@ -163,11 +165,18 @@ inline _LIBCPP_HIDE_FROM_ABI bool __libcpp_thread_id_less(__libcpp_thread_id __t
 //
 // Thread
 //
-#define _LIBCPP_NULL_THREAD ((__libcpp_thread_t()))
+#if defined(PTHREAD_NULL)
+#  define _LIBCPP_NULL_THREAD PTHREAD_NULL
+#else
+#  define _LIBCPP_NULL_THREAD ((__libcpp_thread_t()))
+#endif
 typedef pthread_t __libcpp_thread_t;
 inline _LIBCPP_HIDE_FROM_ABI __libcpp_thread_id __libcpp_thread_get_id(const __libcpp_thread_t* __t) {
-#if defined(__MVS__)
+#if _LIBCPP_LIBC_LLVM_LIBC
+  __libcpp_thread_id __id;
+  return pthread_getunique_np(__t, &__id) ? 0 : __id;
+#elif defined(__MVS__)
   return __t->__;
 #else
   return *__t;
 @@ -183,8 +192,12 @@ inline _LIBCPP_HIDE_FROM_ABI int __libcpp_thread_create(__libcpp_thread_t* __t,
 }
 inline _LIBCPP_HIDE_FROM_ABI __libcpp_thread_id __libcpp_thread_get_current_id() {
+#if _LIBCPP_LIBC_LLVM_LIBC
+  return pthread_getthreadid_np();
+#else
   const __libcpp_thread_t __current_thread = pthread_self();
   return __libcpp_thread_get_id(&__current_thread);
+#endif
 }
 inline _LIBCPP_HIDE_FROM_ABI int __libcpp_thread_join(__libcpp_thread_t* __t) { return pthread_join(*__t, nullptr); }

lib/libcxx/include/__thread/support/windows.h+2

...	@@ -19,6 +19,7 @@	...	@@ -19,6 +19,7 @@
19	#endif	19	#endif
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
		22	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
22		23
23	using __libcpp_timespec_t = ::timespec;	24	using __libcpp_timespec_t = ::timespec;
24		25
...	@@ -126,6 +127,7 @@ _LIBCPP_EXPORTED_FROM_ABI void* __libcpp_tls_get(__libcpp_tls_key __key);	...	@@ -126,6 +127,7 @@ _LIBCPP_EXPORTED_FROM_ABI void* __libcpp_tls_get(__libcpp_tls_key __key);
126		127
127	_LIBCPP_EXPORTED_FROM_ABI int __libcpp_tls_set(__libcpp_tls_key __key, void* __p);	128	_LIBCPP_EXPORTED_FROM_ABI int __libcpp_tls_set(__libcpp_tls_key __key, void* __p);
128		129
		130	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
129	_LIBCPP_END_NAMESPACE_STD	131	_LIBCPP_END_NAMESPACE_STD
130		132
131	#endif // _LIBCPP___THREAD_SUPPORT_WINDOWS_H	133	#endif // _LIBCPP___THREAD_SUPPORT_WINDOWS_H

lib/libcxx/include/__thread/this_thread.h+2

...	@@ -32,7 +32,9 @@ namespace this_thread {	...	@@ -32,7 +32,9 @@ namespace this_thread {
32		32
33	#if _LIBCPP_HAS_THREADS	33	#if _LIBCPP_HAS_THREADS
34		34
		35	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
35	_LIBCPP_EXPORTED_FROM_ABI void sleep_for(const chrono::nanoseconds& __ns);	36	_LIBCPP_EXPORTED_FROM_ABI void sleep_for(const chrono::nanoseconds& __ns);
		37	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
36		38
37	template <class _Rep, class _Period>	39	template <class _Rep, class _Period>
38	_LIBCPP_HIDE_FROM_ABI void sleep_for(const chrono::duration<_Rep, _Period>& __d) {	40	_LIBCPP_HIDE_FROM_ABI void sleep_for(const chrono::duration<_Rep, _Period>& __d) {

lib/libcxx/include/__thread/thread.h+23-14

...	@@ -11,12 +11,13 @@	...	@@ -11,12 +11,13 @@
11	#define _LIBCPP___THREAD_THREAD_H	11	#define _LIBCPP___THREAD_THREAD_H
12		12
13	#include <__assert>	13	#include <__assert>
		14	#include <__charconv/to_chars_integral.h>
14	#include <__condition_variable/condition_variable.h>	15	#include <__condition_variable/condition_variable.h>
15	#include <__config>	16	#include <__config>
16	#include <__exception/terminate.h>	17	#include <__exception/terminate.h>
17	#include <__functional/hash.h>	18	#include <__functional/hash.h>
18	#include <__functional/unary_function.h>	19	#include <__functional/unary_function.h>
19	#include <__locale>	20	#include <__fwd/ostream.h>
20	#include <__memory/addressof.h>	21	#include <__memory/addressof.h>
21	#include <__memory/unique_ptr.h>	22	#include <__memory/unique_ptr.h>
22	#include <__mutex/mutex.h>	23	#include <__mutex/mutex.h>
...	@@ -27,15 +28,16 @@	...	@@ -27,15 +28,16 @@
27	#include <__type_traits/enable_if.h>	28	#include <__type_traits/enable_if.h>
28	#include <__type_traits/invoke.h>	29	#include <__type_traits/invoke.h>
29	#include <__type_traits/is_constructible.h>	30	#include <__type_traits/is_constructible.h>
		31	#include <__type_traits/is_integral.h>
		32	#include <__type_traits/is_pointer.h>
30	#include <__type_traits/is_same.h>	33	#include <__type_traits/is_same.h>
31	#include <__type_traits/remove_cvref.h>	34	#include <__type_traits/remove_cvref.h>
		35	#include <__utility/exchange.h>
32	#include <__utility/forward.h>	36	#include <__utility/forward.h>
		37	#include <cstdint>
		38	#include <limits>
33	#include <tuple>	39	#include <tuple>
34		40
35	#if _LIBCPP_HAS_LOCALIZATION
36	# include <sstream>
37	#endif
38
39	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	41	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
40	# pragma GCC system_header	42	# pragma GCC system_header
41	#endif	43	#endif
...	@@ -44,6 +46,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -44,6 +46,7 @@ _LIBCPP_PUSH_MACROS
44	#include <__undef_macros>	46	#include <__undef_macros>
45		47
46	_LIBCPP_BEGIN_NAMESPACE_STD	48	_LIBCPP_BEGIN_NAMESPACE_STD
		49	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
47		50
48	#if _LIBCPP_HAS_THREADS	51	#if _LIBCPP_HAS_THREADS
49		52
...	@@ -144,13 +147,19 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, __thread_id __id) {	...	@@ -144,13 +147,19 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, __thread_id __id) {
144	//	147	//
145	// Since various flags in the output stream can affect how the	148	// Since various flags in the output stream can affect how the
146	// thread id is represented (e.g. numpunct or showbase), we	149	// thread id is represented (e.g. numpunct or showbase), we
147	// use a temporary stream instead and just output the thread	150	// use `to_chars` directly and output the id as a string.
148	// id representation as a string.	151
		152	static_assert(is_pointer<__libcpp_thread_id>::value \|\| is_integral<__libcpp_thread_id>::value);
		153
		154	using __int_type = __conditional_t<is_pointer<__libcpp_thread_id>::value, uintptr_t, __libcpp_thread_id>;
149		155
150	basic_ostringstream<_CharT, _Traits> __sstr;	156	static const size_t __buffer_size = numeric_limits<__int_type>::digits10 + 2;
151	__sstr.imbue(locale::classic());	157	char __buffer[__buffer_size];
152	__sstr << __id.__id_;	158	auto __ret =
153	return __os << __sstr.str();	159	std::__to_chars_integral(__buffer, __buffer + __buffer_size - 1, reinterpret_cast<__int_type>(__id.__id_), 10);
		160	_LIBCPP_ASSERT_INTERNAL(__ret.__ec == std::errc(), "to_chars failed!");
		161	*__ret.__ptr = '\0';
		162	return __os << __buffer;
154	}	163	}
155	# endif // _LIBCPP_HAS_LOCALIZATION	164	# endif // _LIBCPP_HAS_LOCALIZATION
156		165
...	@@ -236,13 +245,12 @@ public:	...	@@ -236,13 +245,12 @@ public:
236	# endif	245	# endif
237	~thread();	246	~thread();
238		247
239	_LIBCPP_HIDE_FROM_ABI thread(thread&& __t) _NOEXCEPT : __t_(__t.__t_) { __t.__t_ = _LIBCPP_NULL_THREAD; }	248	_LIBCPP_HIDE_FROM_ABI thread(thread&& __t) _NOEXCEPT : __t_(std::__exchange(__t.__t_, __libcpp_thread_t())) {}
240		249
241	_LIBCPP_HIDE_FROM_ABI thread& operator=(thread&& __t) _NOEXCEPT {	250	_LIBCPP_HIDE_FROM_ABI thread& operator=(thread&& __t) _NOEXCEPT {
242	if (!__libcpp_thread_isnull(&__t_))	251	if (!__libcpp_thread_isnull(&__t_))
243	terminate();	252	terminate();
244	__t_ = __t.__t_;	253	__t_ = std::__exchange(__t.__t_, __libcpp_thread_t());
245	__t.__t_ = _LIBCPP_NULL_THREAD;
246	return *this;	254	return *this;
247	}	255	}
248		256
...	@@ -261,6 +269,7 @@ inline _LIBCPP_HIDE_FROM_ABI void swap(thread& __x, thread& __y) _NOEXCEPT { __x	...	@@ -261,6 +269,7 @@ inline _LIBCPP_HIDE_FROM_ABI void swap(thread& __x, thread& __y) _NOEXCEPT { __x
261		269
262	#endif // _LIBCPP_HAS_THREADS	270	#endif // _LIBCPP_HAS_THREADS
263		271
		272	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
264	_LIBCPP_END_NAMESPACE_STD	273	_LIBCPP_END_NAMESPACE_STD
265		274
266	_LIBCPP_POP_MACROS	275	_LIBCPP_POP_MACROS

lib/libcxx/include/__tree+472-361

 @@ -113,7 +113,7 @@ __root, have a non-null __parent_ field.
 // Returns:  true if __x is a left child of its parent, else false
 // Precondition:  __x != nullptr.
 template <class _NodePtr>
-inline _LIBCPP_HIDE_FROM_ABI bool __tree_is_left_child(_NodePtr __x) _NOEXCEPT {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool __tree_is_left_child(_NodePtr __x) _NOEXCEPT {
   return __x == __x->__parent_->__left_;
 }
 @@ -121,7 +121,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool __tree_is_left_child(_NodePtr __x) _NOEXCEPT {
 //    __x is a proper subtree, returns the black height (null counts as 1).  If
 //    __x is an improper subtree, returns 0.
 template <class _NodePtr>
-unsigned __tree_sub_invariant(_NodePtr __x) {
+_LIBCPP_CONSTEXPR_SINCE_CXX26 unsigned __tree_sub_invariant(_NodePtr __x) {
   if (__x == nullptr)
     return 1;
   // parent consistency checked by caller
 @@ -153,7 +153,7 @@ unsigned __tree_sub_invariant(_NodePtr __x) {
 //    __root == nullptr is a proper tree.  Returns true if __root is a proper
 //    red black tree, else returns false.
 template <class _NodePtr>
-_LIBCPP_HIDE_FROM_ABI bool __tree_invariant(_NodePtr __root) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool __tree_invariant(_NodePtr __root) {
   if (__root == nullptr)
     return true;
   // check __x->__parent_ consistency
 @@ -170,7 +170,7 @@ _LIBCPP_HIDE_FROM_ABI bool __tree_invariant(_NodePtr __root) {
 // Returns:  pointer to the left-most node under __x.
 template <class _NodePtr>
-inline _LIBCPP_HIDE_FROM_ABI _NodePtr __tree_min(_NodePtr __x) _NOEXCEPT {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _NodePtr __tree_min(_NodePtr __x) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__x != nullptr, "Root node shouldn't be null");
   while (__x->__left_ != nullptr)
     __x = __x->__left_;
 @@ -179,7 +179,7 @@ inline _LIBCPP_HIDE_FROM_ABI _NodePtr __tree_min(_NodePtr __x) _NOEXCEPT {
 // Returns:  pointer to the right-most node under __x.
 template <class _NodePtr>
-inline _LIBCPP_HIDE_FROM_ABI _NodePtr __tree_max(_NodePtr __x) _NOEXCEPT {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _NodePtr __tree_max(_NodePtr __x) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__x != nullptr, "Root node shouldn't be null");
   while (__x->__right_ != nullptr)
     __x = __x->__right_;
 @@ -188,7 +188,7 @@ inline _LIBCPP_HIDE_FROM_ABI _NodePtr __tree_max(_NodePtr __x) _NOEXCEPT {
 // Returns:  pointer to the next in-order node after __x.
 template <class _NodePtr>
-_LIBCPP_HIDE_FROM_ABI _NodePtr __tree_next(_NodePtr __x) _NOEXCEPT {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _NodePtr __tree_next(_NodePtr __x) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__x != nullptr, "node shouldn't be null");
   if (__x->__right_ != nullptr)
     return std::__tree_min(__x->__right_);
 @@ -203,23 +203,23 @@ _LIBCPP_HIDE_FROM_ABI _NodePtr __tree_next(_NodePtr __x) _NOEXCEPT {
 // to the actual root of the tree through a __left_ pointer. Incrementing the end() pointer is UB, so we can assume that
 // never happens.
 template <class _EndNodePtr, class _NodePtr>
-inline _LIBCPP_HIDE_FROM_ABI _EndNodePtr __tree_next_iter(_NodePtr __x) _NOEXCEPT {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _EndNodePtr __tree_next_iter(_NodePtr __x) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__x != nullptr, "node shouldn't be null");
   if (__x->__right_ != nullptr)
-    return static_cast<_EndNodePtr>(std::__tree_min(__x->__right_));
+    return std::__static_fancy_pointer_cast<_EndNodePtr>(std::__tree_min(__x->__right_));
   while (!std::__tree_is_left_child(__x))
     __x = __x->__parent_unsafe();
-  return static_cast<_EndNodePtr>(__x->__parent_);
+  return std::__static_fancy_pointer_cast<_EndNodePtr>(__x->__parent_);
 }
 // Returns:  pointer to the previous in-order node before __x.
 // Note: __x may be the end node.
 template <class _NodePtr, class _EndNodePtr>
-inline _LIBCPP_HIDE_FROM_ABI _NodePtr __tree_prev_iter(_EndNodePtr __x) _NOEXCEPT {
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _NodePtr __tree_prev_iter(_EndNodePtr __x) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__x != nullptr, "node shouldn't be null");
   if (__x->__left_ != nullptr)
     return std::__tree_max(__x->__left_);
-  _NodePtr __xx = static_cast<_NodePtr>(__x);
+  _NodePtr __xx = std::__static_fancy_pointer_cast<_NodePtr>(__x);
   while (std::__tree_is_left_child(__xx))
     __xx = __xx->__parent_unsafe();
   return __xx->__parent_unsafe();
 @@ -227,7 +227,7 @@ inline _LIBCPP_HIDE_FROM_ABI _NodePtr __tree_prev_iter(_EndNodePtr __x) _NOEXCEP
 // Returns:  pointer to a node which has no children
 template <class _NodePtr>
-_LIBCPP_HIDE_FROM_ABI _NodePtr __tree_leaf(_NodePtr __x) _NOEXCEPT {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _NodePtr __tree_leaf(_NodePtr __x) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__x != nullptr, "node shouldn't be null");
   while (true) {
     if (__x->__left_ != nullptr) {
 @@ -246,7 +246,7 @@ _LIBCPP_HIDE_FROM_ABI _NodePtr __tree_leaf(_NodePtr __x) _NOEXCEPT {
 // Effects:  Makes __x->__right_ the subtree root with __x as its left child
 //           while preserving in-order order.
 template <class _NodePtr>
-_LIBCPP_HIDE_FROM_ABI void __tree_left_rotate(_NodePtr __x) _NOEXCEPT {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree_left_rotate(_NodePtr __x) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__x != nullptr, "node shouldn't be null");
   _LIBCPP_ASSERT_INTERNAL(__x->__right_ != nullptr, "node should have a right child");
   _NodePtr __y  = __x->__right_;
 @@ -265,7 +265,7 @@ _LIBCPP_HIDE_FROM_ABI void __tree_left_rotate(_NodePtr __x) _NOEXCEPT {
 // Effects:  Makes __x->__left_ the subtree root with __x as its right child
 //           while preserving in-order order.
 template <class _NodePtr>
-_LIBCPP_HIDE_FROM_ABI void __tree_right_rotate(_NodePtr __x) _NOEXCEPT {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree_right_rotate(_NodePtr __x) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__x != nullptr, "node shouldn't be null");
   _LIBCPP_ASSERT_INTERNAL(__x->__left_ != nullptr, "node should have a left child");
   _NodePtr __y = __x->__left_;
 @@ -289,7 +289,8 @@ _LIBCPP_HIDE_FROM_ABI void __tree_right_rotate(_NodePtr __x) _NOEXCEPT {
 // Postcondition: __tree_invariant(end_node->__left_) == true.  end_node->__left_
 //                may be different than the value passed in as __root.
 template <class _NodePtr>
-_LIBCPP_HIDE_FROM_ABI void __tree_balance_after_insert(_NodePtr __root, _NodePtr __x) _NOEXCEPT {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+__tree_balance_after_insert(_NodePtr __root, _NodePtr __x) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__root != nullptr, "Root of the tree shouldn't be null");
   _LIBCPP_ASSERT_INTERNAL(__x != nullptr, "Can't attach null node to a leaf");
   __x->__is_black_ = __x == __root;
 @@ -345,7 +346,7 @@ _LIBCPP_HIDE_FROM_ABI void __tree_balance_after_insert(_NodePtr __root, _NodePtr
 //                nor any of its children refer to __z.  end_node->__left_
 //                may be different than the value passed in as __root.
 template <class _NodePtr>
-_LIBCPP_HIDE_FROM_ABI void __tree_remove(_NodePtr __root, _NodePtr __z) _NOEXCEPT {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree_remove(_NodePtr __root, _NodePtr __z) _NOEXCEPT {
   _LIBCPP_ASSERT_INTERNAL(__root != nullptr, "Root node should not be null");
   _LIBCPP_ASSERT_INTERNAL(__z != nullptr, "The node to remove should not be null");
   _LIBCPP_ASSERT_INTERNAL(std::__tree_invariant(__root), "The tree invariants should hold");
 @@ -560,7 +561,7 @@ public:
   using pointer = _Pointer;
   pointer __left_;
-  _LIBCPP_HIDE_FROM_ABI __tree_end_node() _NOEXCEPT : __left_() {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_end_node() _NOEXCEPT : __left_() {}
 };
 template <class _VoidPtr>
 @@ -573,9 +574,13 @@ public:
   __end_node_pointer __parent_;
   bool __is_black_;
-  _LIBCPP_HIDE_FROM_ABI pointer __parent_unsafe() const { return static_cast<pointer>(__parent_); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pointer __parent_unsafe() const {
+    return std::__static_fancy_pointer_cast<pointer>(__parent_);
+  }
-  _LIBCPP_HIDE_FROM_ABI void __set_parent(pointer __p) { __parent_ = static_cast<__end_node_pointer>(__p); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __set_parent(pointer __p) {
+    __parent_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__p);
+  }
   _LIBCPP_HIDE_FROM_ABI __tree_node_base()             = default;
   __tree_node_base(__tree_node_base const&)            = delete;
 @@ -598,7 +603,7 @@ private:
   };
 public:
-  _LIBCPP_HIDE_FROM_ABI __node_value_type& __get_value() { return __value_; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_value_type& __get_value() { return __value_; }
 #else
 private:
 @@ -609,9 +614,10 @@ public:
 #endif
   template <class _Alloc, class... _Args>
-  _LIBCPP_HIDE_FROM_ABI explicit __tree_node(_Alloc& __na, _Args&&... __args) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit __tree_node(_Alloc& __na, _Args&&... __args) {
     allocator_traits<_Alloc>::construct(__na, std::addressof(__get_value()), std::forward<_Args>(__args)...);
   }
   ~__tree_node()                             = delete;
   __tree_node(__tree_node const&)            = delete;
   __tree_node& operator=(__tree_node const&) = delete;
 @@ -631,14 +637,15 @@ private:
 public:
   bool __value_constructed;
-  _LIBCPP_HIDE_FROM_ABI __tree_node_destructor(const __tree_node_destructor&) = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_node_destructor(const __tree_node_destructor&) = default;
   __tree_node_destructor& operator=(const __tree_node_destructor&)            = delete;
-  _LIBCPP_HIDE_FROM_ABI explicit __tree_node_destructor(allocator_type& __na, bool __val = false) _NOEXCEPT
+  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit __tree_node_destructor(allocator_type& __na, bool __val = false) _NOEXCEPT
       : __na_(__na),
         __value_constructed(__val) {}
-  _LIBCPP_HIDE_FROM_ABI void operator()(pointer __p) _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void operator()(pointer __p) _NOEXCEPT {
     if (__value_constructed)
       __alloc_traits::destroy(__na_, std::addressof(__p->__get_value()));
     if (__p)
 @@ -663,7 +670,8 @@ template <class _Reference, class _Break, class _NodePtr, class _Func, class _Pr
 #ifndef _LIBCPP_COMPILER_GCC // This function is recursive, so GCC complains about always_inline.
 _LIBCPP_HIDE_FROM_ABI
 #endif
-bool __tree_iterate_from_root(_Break __break, _NodePtr __root, _Func& __func, _Proj& __proj) {
+_LIBCPP_CONSTEXPR_SINCE_CXX26 bool
+__tree_iterate_from_root(_Break __break, _NodePtr __root, _Func& __func, _Proj& __proj) {
   if (__root->__left_) {
     if (std::__tree_iterate_from_root<_Reference>(__break, static_cast<_NodePtr>(__root->__left_), __func, __proj))
       return true;
 @@ -678,7 +686,7 @@ bool __tree_iterate_from_root(_Break __break, _NodePtr __root, _Func& __func, _P
 // Do an in-order traversal of the tree from __first to __last.
 template <class _NodeIter, class _Func, class _Proj>
-_LIBCPP_HIDE_FROM_ABI void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
 __tree_iterate_subrange(_NodeIter __first_it, _NodeIter __last_it, _Func& __func, _Proj& __proj) {
   using _NodePtr   = typename _NodeIter::__node_pointer;
   using _Reference = typename _NodeIter::reference;
 @@ -722,51 +730,57 @@ public:
   using reference         = value_type&;
   using pointer           = __rebind_pointer_t<_NodePtr, value_type>;
-  _LIBCPP_HIDE_FROM_ABI __tree_iterator() _NOEXCEPT : __ptr_(nullptr) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_iterator() _NOEXCEPT : __ptr_(nullptr) {}
-  _LIBCPP_HIDE_FROM_ABI reference operator*() const { return __get_np()->__get_value(); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reference operator*() const { return __get_np()->__get_value(); }
-  _LIBCPP_HIDE_FROM_ABI pointer operator->() const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pointer operator->() const {
     return pointer_traits<pointer>::pointer_to(__get_np()->__get_value());
   }
-  _LIBCPP_HIDE_FROM_ABI __tree_iterator& operator++() {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_iterator& operator++() {
-    __ptr_ = std::__tree_next_iter<__end_node_pointer>(static_cast<__node_base_pointer>(__ptr_));
+    __ptr_ = std::__tree_next_iter<__end_node_pointer>(std::__static_fancy_pointer_cast<__node_base_pointer>(__ptr_));
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI __tree_iterator operator++(int) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_iterator operator++(int) {
     __tree_iterator __t(*this);
     ++(*this);
     return __t;
   }
-  _LIBCPP_HIDE_FROM_ABI __tree_iterator& operator--() {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_iterator& operator--() {
-    __ptr_ = static_cast<__end_node_pointer>(std::__tree_prev_iter<__node_base_pointer>(__ptr_));
+    __ptr_ = std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_prev_iter<__node_base_pointer>(__ptr_));
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI __tree_iterator operator--(int) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_iterator operator--(int) {
     __tree_iterator __t(*this);
     --(*this);
     return __t;
   }
-  friend _LIBCPP_HIDE_FROM_ABI bool operator==(const __tree_iterator& __x, const __tree_iterator& __y) {
+  friend _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
+  operator==(const __tree_iterator& __x, const __tree_iterator& __y) {
     return __x.__ptr_ == __y.__ptr_;
   }
-  friend _LIBCPP_HIDE_FROM_ABI bool operator!=(const __tree_iterator& __x, const __tree_iterator& __y) {
+  friend _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
+  operator!=(const __tree_iterator& __x, const __tree_iterator& __y) {
     return !(__x == __y);
   }
 private:
-  _LIBCPP_HIDE_FROM_ABI explicit __tree_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit __tree_iterator(__node_pointer __p) _NOEXCEPT
-  _LIBCPP_HIDE_FROM_ABI explicit __tree_iterator(__end_node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
+      : __ptr_(std::__static_fancy_pointer_cast<__end_node_pointer>(__p)) {}
-  _LIBCPP_HIDE_FROM_ABI __node_pointer __get_np() const { return static_cast<__node_pointer>(__ptr_); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit __tree_iterator(__end_node_pointer __p) _NOEXCEPT
+      : __ptr_(__p) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer __get_np() const {
+    return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_);
+  }
   template <class, class, class>
   friend class __tree;
   template <class, class, class>
   friend class __tree_const_iterator;
   template <class _NodeIter, class _Func, class _Proj>
-  friend void __tree_iterate_subrange(_NodeIter, _NodeIter, _Func&, _Proj&);
+  _LIBCPP_CONSTEXPR_SINCE_CXX26 friend void __tree_iterate_subrange(_NodeIter, _NodeIter, _Func&, _Proj&);
 };
 #ifndef _LIBCPP_CXX03_LANG
 @@ -780,7 +794,8 @@ struct __specialized_algorithm<
   using __iterator _LIBCPP_NODEBUG = __tree_iterator<_Tp, _NodePtr, _DiffType>;
   template <class _Func, class _Proj>
-  _LIBCPP_HIDE_FROM_ABI static void operator()(__iterator __first, __iterator __last, _Func& __func, _Proj& __proj) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static void
+  operator()(__iterator __first, __iterator __last, _Func& __func, _Proj& __proj) {
     std::__tree_iterate_subrange(__first, __last, __func, __proj);
   }
 };
 @@ -804,54 +819,61 @@ public:
   using pointer                              = __rebind_pointer_t<_NodePtr, const value_type>;
   using __non_const_iterator _LIBCPP_NODEBUG = __tree_iterator<_Tp, __node_pointer, difference_type>;
-  _LIBCPP_HIDE_FROM_ABI __tree_const_iterator() _NOEXCEPT : __ptr_(nullptr) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_const_iterator() _NOEXCEPT : __ptr_(nullptr) {}
-  _LIBCPP_HIDE_FROM_ABI __tree_const_iterator(__non_const_iterator __p) _NOEXCEPT : __ptr_(__p.__ptr_) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_const_iterator(__non_const_iterator __p) _NOEXCEPT
+      : __ptr_(__p.__ptr_) {}
-  _LIBCPP_HIDE_FROM_ABI reference operator*() const { return __get_np()->__get_value(); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reference operator*() const { return __get_np()->__get_value(); }
-  _LIBCPP_HIDE_FROM_ABI pointer operator->() const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pointer operator->() const {
     return pointer_traits<pointer>::pointer_to(__get_np()->__get_value());
   }
-  _LIBCPP_HIDE_FROM_ABI __tree_const_iterator& operator++() {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_const_iterator& operator++() {
-    __ptr_ = std::__tree_next_iter<__end_node_pointer>(static_cast<__node_base_pointer>(__ptr_));
+    __ptr_ = std::__tree_next_iter<__end_node_pointer>(std::__static_fancy_pointer_cast<__node_base_pointer>(__ptr_));
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI __tree_const_iterator operator++(int) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_const_iterator operator++(int) {
     __tree_const_iterator __t(*this);
     ++(*this);
     return __t;
   }
-  _LIBCPP_HIDE_FROM_ABI __tree_const_iterator& operator--() {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_const_iterator& operator--() {
-    __ptr_ = static_cast<__end_node_pointer>(std::__tree_prev_iter<__node_base_pointer>(__ptr_));
+    __ptr_ = std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_prev_iter<__node_base_pointer>(__ptr_));
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI __tree_const_iterator operator--(int) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_const_iterator operator--(int) {
     __tree_const_iterator __t(*this);
     --(*this);
     return __t;
   }
-  friend _LIBCPP_HIDE_FROM_ABI bool operator==(const __tree_const_iterator& __x, const __tree_const_iterator& __y) {
+  friend _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
+  operator==(const __tree_const_iterator& __x, const __tree_const_iterator& __y) {
     return __x.__ptr_ == __y.__ptr_;
   }
-  friend _LIBCPP_HIDE_FROM_ABI bool operator!=(const __tree_const_iterator& __x, const __tree_const_iterator& __y) {
+  friend _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
+  operator!=(const __tree_const_iterator& __x, const __tree_const_iterator& __y) {
     return !(__x == __y);
   }
 private:
-  _LIBCPP_HIDE_FROM_ABI explicit __tree_const_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit __tree_const_iterator(__node_pointer __p) _NOEXCEPT
-  _LIBCPP_HIDE_FROM_ABI explicit __tree_const_iterator(__end_node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
+      : __ptr_(std::__static_fancy_pointer_cast<__end_node_pointer>(__p)) {}
-  _LIBCPP_HIDE_FROM_ABI __node_pointer __get_np() const { return static_cast<__node_pointer>(__ptr_); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit __tree_const_iterator(__end_node_pointer __p) _NOEXCEPT
+      : __ptr_(std::__static_fancy_pointer_cast<__end_node_pointer>(__p)) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer __get_np() const {
+    return std::__static_fancy_pointer_cast<__node_pointer>(__ptr_);
+  }
   template <class, class, class>
   friend class __tree;
   template <class _NodeIter, class _Func, class _Proj>
-  friend void __tree_iterate_subrange(_NodeIter, _NodeIter, _Func&, _Proj&);
+  _LIBCPP_CONSTEXPR_SINCE_CXX26 friend void __tree_iterate_subrange(_NodeIter, _NodeIter, _Func&, _Proj&);
 };
 #ifndef _LIBCPP_CXX03_LANG
 @@ -865,7 +887,8 @@ struct __specialized_algorithm<
   using __iterator _LIBCPP_NODEBUG = __tree_const_iterator<_Tp, _NodePtr, _DiffType>;
   template <class _Func, class _Proj>
-  _LIBCPP_HIDE_FROM_ABI static void operator()(__iterator __first, __iterator __last, _Func& __func, _Proj& __proj) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static void
+  operator()(__iterator __first, __iterator __last, _Func& __func, _Proj& __proj) {
     std::__tree_iterate_subrange(__first, __last, __func, __proj);
   }
 };
 @@ -927,98 +950,114 @@ private:
   _LIBCPP_COMPRESSED_PAIR(size_type, __size_, value_compare, __value_comp_);
 public:
-  _LIBCPP_HIDE_FROM_ABI __end_node_pointer __end_node() _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __end_node_pointer __end_node() _NOEXCEPT {
     return pointer_traits<__end_node_pointer>::pointer_to(__end_node_);
   }
-  _LIBCPP_HIDE_FROM_ABI __end_node_pointer __end_node() const _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __end_node_pointer __end_node() const _NOEXCEPT {
     return pointer_traits<__end_node_pointer>::pointer_to(const_cast<__end_node_t&>(__end_node_));
   }
-  _LIBCPP_HIDE_FROM_ABI __node_allocator& __node_alloc() _NOEXCEPT { return __node_alloc_; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_allocator& __node_alloc() _NOEXCEPT {
+    return __node_alloc_;
+  }
 private:
-  _LIBCPP_HIDE_FROM_ABI const __node_allocator& __node_alloc() const _NOEXCEPT { return __node_alloc_; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const __node_allocator& __node_alloc() const _NOEXCEPT {
+    return __node_alloc_;
+  }
 public:
-  _LIBCPP_HIDE_FROM_ABI allocator_type __alloc() const _NOEXCEPT { return allocator_type(__node_alloc()); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 allocator_type __alloc() const _NOEXCEPT {
+    return allocator_type(__node_alloc());
+  }
-  _LIBCPP_HIDE_FROM_ABI size_type size() const _NOEXCEPT { return __size_; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type size() const _NOEXCEPT { return __size_; }
-  _LIBCPP_HIDE_FROM_ABI value_compare& value_comp() _NOEXCEPT { return __value_comp_; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 value_compare& value_comp() _NOEXCEPT { return __value_comp_; }
-  _LIBCPP_HIDE_FROM_ABI const value_compare& value_comp() const _NOEXCEPT { return __value_comp_; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const value_compare& value_comp() const _NOEXCEPT {
+    return __value_comp_;
+  }
 public:
-  _LIBCPP_HIDE_FROM_ABI __node_pointer __root() const _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer __root() const _NOEXCEPT {
-    return static_cast<__node_pointer>(__end_node()->__left_);
+    return std::__static_fancy_pointer_cast<__node_pointer>(__end_node()->__left_);
   }
-  _LIBCPP_HIDE_FROM_ABI __node_base_pointer* __root_ptr() const _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_base_pointer* __root_ptr() const _NOEXCEPT {
     return std::addressof(__end_node()->__left_);
   }
   using iterator       = __tree_iterator<_Tp, __node_pointer, difference_type>;
   using const_iterator = __tree_const_iterator<_Tp, __node_pointer, difference_type>;
-  _LIBCPP_HIDE_FROM_ABI explicit __tree(const value_compare& __comp) _NOEXCEPT_(
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit __tree(const value_compare& __comp) _NOEXCEPT_(
       is_nothrow_default_constructible<__node_allocator>::value&& is_nothrow_copy_constructible<value_compare>::value)
       : __size_(0), __value_comp_(__comp) {
     __begin_node_ = __end_node();
   }
-  _LIBCPP_HIDE_FROM_ABI explicit __tree(const allocator_type& __a)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit __tree(const allocator_type& __a)
       : __begin_node_(), __node_alloc_(__node_allocator(__a)), __size_(0) {
     __begin_node_ = __end_node();
   }
-  _LIBCPP_HIDE_FROM_ABI __tree(const value_compare& __comp, const allocator_type& __a)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree(const value_compare& __comp, const allocator_type& __a)
       : __begin_node_(), __node_alloc_(__node_allocator(__a)), __size_(0), __value_comp_(__comp) {
     __begin_node_ = __end_node();
   }
-  _LIBCPP_HIDE_FROM_ABI __tree(const __tree& __t);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree(const __tree& __t);
-  _LIBCPP_HIDE_FROM_ABI __tree(const __tree& __other, const allocator_type& __alloc)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree(const __tree& __other, const allocator_type& __alloc)
       : __begin_node_(__end_node()), __node_alloc_(__alloc), __size_(0), __value_comp_(__other.value_comp()) {
     if (__other.size() == 0)
       return;
-    *__root_ptr()       = static_cast<__node_base_pointer>(__copy_construct_tree(__other.__root()));
+    *__root_ptr() = std::__static_fancy_pointer_cast<__node_base_pointer>(__copy_construct_tree(__other.__root()));
     __root()->__parent_ = __end_node();
-    __begin_node_       = static_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_));
+    __begin_node_       = std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_));
     __size_             = __other.size();
   }
-  _LIBCPP_HIDE_FROM_ABI __tree& operator=(const __tree& __t);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree& operator=(const __tree& __t);
   template <class _ForwardIterator>
-  _LIBCPP_HIDE_FROM_ABI void __assign_unique(_ForwardIterator __first, _ForwardIterator __last);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
-  _LIBCPP_HIDE_FROM_ABI __tree(__tree&& __t) _NOEXCEPT_(
+  __assign_unique(_ForwardIterator __first, _ForwardIterator __last);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree(__tree&& __t) _NOEXCEPT_(
       is_nothrow_move_constructible<__node_allocator>::value&& is_nothrow_move_constructible<value_compare>::value);
-  _LIBCPP_HIDE_FROM_ABI __tree(__tree&& __t, const allocator_type& __a);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree(__tree&& __t, const allocator_type& __a);
-  _LIBCPP_HIDE_FROM_ABI __tree& operator=(__tree&& __t)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree& operator=(__tree&& __t)
       _NOEXCEPT_(is_nothrow_move_assignable<value_compare>::value &&
                  ((__node_traits::propagate_on_container_move_assignment::value &&
                    is_nothrow_move_assignable<__node_allocator>::value) ||
                   allocator_traits<__node_allocator>::is_always_equal::value)) {
-    __move_assign(__t, integral_constant<bool, __node_traits::propagate_on_container_move_assignment::value>());
+    __move_assign(__t,
+                  integral_constant<bool,
+                                    __node_traits::propagate_on_container_move_assignment::value ||
+                                        __node_traits::is_always_equal::value>());
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI ~__tree() {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 ~__tree() {
     static_assert(is_copy_constructible<value_compare>::value, "Comparator must be copy-constructible.");
     destroy(__root());
   }
-  _LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT { return iterator(__begin_node_); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator begin() _NOEXCEPT { return iterator(__begin_node_); }
-  _LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT { return const_iterator(__begin_node_); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator begin() const _NOEXCEPT {
-  _LIBCPP_HIDE_FROM_ABI iterator end() _NOEXCEPT { return iterator(__end_node()); }
+    return const_iterator(__begin_node_);
-  _LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT { return const_iterator(__end_node()); }
+  }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator end() _NOEXCEPT { return iterator(__end_node()); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator end() const _NOEXCEPT {
+    return const_iterator(__end_node());
+  }
-  _LIBCPP_HIDE_FROM_ABI size_type max_size() const _NOEXCEPT {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type max_size() const _NOEXCEPT {
     return std::min<size_type>(__node_traits::max_size(__node_alloc()), numeric_limits<difference_type >::max());
   }
-  _LIBCPP_HIDE_FROM_ABI void clear() _NOEXCEPT;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void clear() _NOEXCEPT;
-  _LIBCPP_HIDE_FROM_ABI void swap(__tree& __t)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void swap(__tree& __t)
 #if _LIBCPP_STD_VER <= 11
       _NOEXCEPT_(__is_nothrow_swappable_v<value_compare> &&
                  (!__node_traits::propagate_on_container_swap::value || __is_nothrow_swappable_v<__node_allocator>));
 @@ -1027,21 +1066,22 @@ public:
 #endif
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI iterator __emplace_multi(_Args&&... __args);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __emplace_multi(_Args&&... __args);
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI iterator __emplace_hint_multi(const_iterator __p, _Args&&... __args);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
+  __emplace_hint_multi(const_iterator __p, _Args&&... __args);
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI pair<iterator, bool> __emplace_unique(_Args&&... __args) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool> __emplace_unique(_Args&&... __args) {
-    return std::__try_key_extraction<key_type>(
+    return std::__try_key_extraction<key_type, value_type>(
         [this](const key_type& __key, _Args&&... __args2) {
           auto [__parent, __child] = __find_equal(__key);
-          __node_pointer __r       = static_cast<__node_pointer>(__child);
+          __node_pointer __r       = std::__static_fancy_pointer_cast<__node_pointer>(__child);
           bool __inserted          = false;
           if (__child == nullptr) {
             __node_holder __h = __construct_node(std::forward<_Args>(__args2)...);
-            __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
+            __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__h.get()));
             __r        = __h.release();
             __inserted = true;
           }
 @@ -1050,10 +1090,10 @@ public:
         [this](_Args&&... __args2) {
           __node_holder __h        = __construct_node(std::forward<_Args>(__args2)...);
           auto [__parent, __child] = __find_equal(__h->__get_value());
-          __node_pointer __r       = static_cast<__node_pointer>(__child);
+          __node_pointer __r       = std::__static_fancy_pointer_cast<__node_pointer>(__child);
           bool __inserted          = false;
           if (__child == nullptr) {
-            __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
+            __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__h.get()));
             __r        = __h.release();
             __inserted = true;
           }
 @@ -1063,16 +1103,17 @@ public:
   }
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI pair<iterator, bool> __emplace_hint_unique(const_iterator __p, _Args&&... __args) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool>
-    return std::__try_key_extraction<key_type>(
+  __emplace_hint_unique(const_iterator __p, _Args&&... __args) {
+    return std::__try_key_extraction<key_type, value_type>(
         [this, __p](const key_type& __key, _Args&&... __args2) {
           __node_base_pointer __dummy;
           auto [__parent, __child] = __find_equal(__p, __dummy, __key);
-          __node_pointer __r       = static_cast<__node_pointer>(__child);
+          __node_pointer __r       = std::__static_fancy_pointer_cast<__node_pointer>(__child);
           bool __inserted          = false;
           if (__child == nullptr) {
             __node_holder __h = __construct_node(std::forward<_Args>(__args2)...);
-            __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
+            __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__h.get()));
             __r        = __h.release();
             __inserted = true;
           }
 @@ -1082,9 +1123,9 @@ public:
           __node_holder __h = __construct_node(std::forward<_Args>(__args2)...);
           __node_base_pointer __dummy;
           auto [__parent, __child] = __find_equal(__p, __dummy, __h->__get_value());
-          __node_pointer __r       = static_cast<__node_pointer>(__child);
+          __node_pointer __r       = std::__static_fancy_pointer_cast<__node_pointer>(__child);
           if (__child == nullptr) {
-            __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
+            __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__h.get()));
             __r = __h.release();
           }
           return pair<iterator, bool>(iterator(__r), __child == nullptr);
 @@ -1093,77 +1134,83 @@ public:
   }
   template <class _InIter, class _Sent>
-  _LIBCPP_HIDE_FROM_ABI void __insert_range_multi(_InIter __first, _Sent __last) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __insert_range_multi(_InIter __first, _Sent __last) {
     if (__first == __last)
       return;
     if (__root() == nullptr) { // Make sure we always have a root node
-      __insert_node_at(
+      __insert_node_at(__end_node(),
-          __end_node(), __end_node()->__left_, static_cast<__node_base_pointer>(__construct_node(*__first).release()));
+                       __end_node()->__left_,
+                       std::__static_fancy_pointer_cast<__node_base_pointer>(__construct_node(*__first).release()));
       ++__first;
     }
-    auto __max_node = static_cast<__node_pointer>(std::__tree_max(static_cast<__node_base_pointer>(__root())));
+    auto __max_node = std::__static_fancy_pointer_cast<__node_pointer>(
+        std::__tree_max(std::__static_fancy_pointer_cast<__node_base_pointer>(__root())));
     for (; __first != __last; ++__first) {
       __node_holder __nd = __construct_node(*__first);
       // Always check the max node first. This optimizes for sorted ranges inserted at the end.
       if (!value_comp()(__nd->__get_value(), __max_node->__get_value())) { // __node >= __max_val
-        __insert_node_at(static_cast<__end_node_pointer>(__max_node),
+        __insert_node_at(std::__static_fancy_pointer_cast<__end_node_pointer>(__max_node),
                          __max_node->__right_,
-                         static_cast<__node_base_pointer>(__nd.get()));
+                         std::__static_fancy_pointer_cast<__node_base_pointer>(__nd.get()));
         __max_node = __nd.release();
       } else {
         __end_node_pointer __parent;
         __node_base_pointer& __child = __find_leaf_high(__parent, __nd->__get_value());
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd.release()));
+        __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__nd.release()));
       }
     }
   }
   template <class _InIter, class _Sent>
-  _LIBCPP_HIDE_FROM_ABI void __insert_range_unique(_InIter __first, _Sent __last) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __insert_range_unique(_InIter __first, _Sent __last) {
     if (__first == __last)
       return;
     if (__root() == nullptr) {
-      __insert_node_at(
+      __insert_node_at(__end_node(),
-          __end_node(), __end_node()->__left_, static_cast<__node_base_pointer>(__construct_node(*__first).release()));
+                       __end_node()->__left_,
+                       std::__static_fancy_pointer_cast<__node_base_pointer>(__construct_node(*__first).release()));
       ++__first;
     }
-    auto __max_node = static_cast<__node_pointer>(std::__tree_max(static_cast<__node_base_pointer>(__root())));
+    auto __max_node = std::__static_fancy_pointer_cast<__node_pointer>(
+        std::__tree_max(std::__static_fancy_pointer_cast<__node_base_pointer>(__root())));
     using __reference = decltype(*__first);
     for (; __first != __last; ++__first) {
-      std::__try_key_extraction<key_type>(
+      std::__try_key_extraction<key_type, value_type>(
           [this, &__max_node](const key_type& __key, __reference&& __val) {
             if (value_comp()(__max_node->__get_value(), __key)) { // __key > __max_node
               __node_holder __nd = __construct_node(std::forward<__reference>(__val));
-              __insert_node_at(static_cast<__end_node_pointer>(__max_node),
+              __insert_node_at(std::__static_fancy_pointer_cast<__end_node_pointer>(__max_node),
                                __max_node->__right_,
-                               static_cast<__node_base_pointer>(__nd.get()));
+                               std::__static_fancy_pointer_cast<__node_base_pointer>(__nd.get()));
               __max_node = __nd.release();
             } else {
               auto [__parent, __child] = __find_equal(__key);
               if (__child == nullptr) {
                 __node_holder __nd = __construct_node(std::forward<__reference>(__val));
-                __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd.release()));
+                __insert_node_at(
+                    __parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__nd.release()));
               }
             }
           },
           [this, &__max_node](__reference&& __val) {
             __node_holder __nd = __construct_node(std::forward<__reference>(__val));
             if (value_comp()(__max_node->__get_value(), __nd->__get_value())) { // __node > __max_node
-              __insert_node_at(static_cast<__end_node_pointer>(__max_node),
+              __insert_node_at(std::__static_fancy_pointer_cast<__end_node_pointer>(__max_node),
                                __max_node->__right_,
-                               static_cast<__node_base_pointer>(__nd.get()));
+                               std::__static_fancy_pointer_cast<__node_base_pointer>(__nd.get()));
               __max_node = __nd.release();
             } else {
               auto [__parent, __child] = __find_equal(__nd->__get_value());
               if (__child == nullptr) {
-                __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd.release()));
+                __insert_node_at(
+                    __parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__nd.release()));
               }
             }
           },
 @@ -1171,62 +1218,67 @@ public:
     }
   }
-  _LIBCPP_HIDE_FROM_ABI iterator __remove_node_pointer(__node_pointer) _NOEXCEPT;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __remove_node_pointer(__node_pointer) _NOEXCEPT;
 #if _LIBCPP_STD_VER >= 17
   template <class _NodeHandle, class _InsertReturnType>
-  _LIBCPP_HIDE_FROM_ABI _InsertReturnType __node_handle_insert_unique(_NodeHandle&&);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _InsertReturnType __node_handle_insert_unique(_NodeHandle&&);
   template <class _NodeHandle>
-  _LIBCPP_HIDE_FROM_ABI iterator __node_handle_insert_unique(const_iterator, _NodeHandle&&);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
+  __node_handle_insert_unique(const_iterator, _NodeHandle&&);
   template <class _Comp2>
-  _LIBCPP_HIDE_FROM_ABI void __node_handle_merge_unique(__tree<_Tp, _Comp2, _Allocator>& __source);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+  __node_handle_merge_unique(__tree<_Tp, _Comp2, _Allocator>& __source);
   template <class _NodeHandle>
-  _LIBCPP_HIDE_FROM_ABI iterator __node_handle_insert_multi(_NodeHandle&&);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __node_handle_insert_multi(_NodeHandle&&);
   template <class _NodeHandle>
-  _LIBCPP_HIDE_FROM_ABI iterator __node_handle_insert_multi(const_iterator, _NodeHandle&&);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
+  __node_handle_insert_multi(const_iterator, _NodeHandle&&);
   template <class _Comp2>
-  _LIBCPP_HIDE_FROM_ABI void __node_handle_merge_multi(__tree<_Tp, _Comp2, _Allocator>& __source);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+  __node_handle_merge_multi(__tree<_Tp, _Comp2, _Allocator>& __source);
   template <class _NodeHandle>
-  _LIBCPP_HIDE_FROM_ABI _NodeHandle __node_handle_extract(key_type const&);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _NodeHandle __node_handle_extract(key_type const&);
   template <class _NodeHandle>
-  _LIBCPP_HIDE_FROM_ABI _NodeHandle __node_handle_extract(const_iterator);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _NodeHandle __node_handle_extract(const_iterator);
 #endif
-  _LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __p);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __p);
-  _LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __f, const_iterator __l);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __f, const_iterator __l);
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI size_type __erase_unique(const _Key& __k);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type __erase_unique(const _Key& __k);
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI size_type __erase_multi(const _Key& __k);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type __erase_multi(const _Key& __k);
-  _LIBCPP_HIDE_FROM_ABI void
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
   __insert_node_at(__end_node_pointer __parent, __node_base_pointer& __child, __node_base_pointer __new_node) _NOEXCEPT;
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI iterator find(const _Key& __key) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator find(const _Key& __key) {
-    auto [__, __match] = __find_equal(__key);
+    auto [__dummy, __match] = __find_equal(__key);
     if (__match == nullptr)
       return end();
-    return iterator(static_cast<__node_pointer>(__match));
+    return iterator(std::__static_fancy_pointer_cast<__node_pointer>(__match));
   }
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI const_iterator find(const _Key& __key) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator find(const _Key& __key) const {
-    auto [__, __match] = __find_equal(__key);
+    auto [__dummy, __match] = __find_equal(__key);
     if (__match == nullptr)
       return end();
-    return const_iterator(static_cast<__node_pointer>(__match));
+    return const_iterator(std::__static_fancy_pointer_cast<__node_pointer>(__match));
   }
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI size_type __count_unique(const _Key& __k) const;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type __count_unique(const _Key& __k) const;
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI size_type __count_multi(const _Key& __k) const;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type __count_multi(const _Key& __k) const;
   template <bool _LowerBound, class _Key>
-  _LIBCPP_HIDE_FROM_ABI __end_node_pointer __lower_upper_bound_unique_impl(const _Key& __v) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __end_node_pointer
+  __lower_upper_bound_unique_impl(const _Key& __v) const {
     auto __rt     = __root();
     auto __result = __end_node();
     auto __comp   = __lazy_synth_three_way_comparator<_Compare, _Key, value_type>(value_comp());
 @@ -1234,14 +1286,15 @@ public:
       auto __comp_res = __comp(__v, __rt->__get_value());
       if (__comp_res.__less()) {
-        __result = static_cast<__end_node_pointer>(__rt);
+        __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__rt);
-        __rt     = static_cast<__node_pointer>(__rt->__left_);
+        __rt     = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_);
       } else if (__comp_res.__greater()) {
-        __rt = static_cast<__node_pointer>(__rt->__right_);
+        __rt = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_);
       } else if _LIBCPP_CONSTEXPR (_LowerBound) {
-        return static_cast<__end_node_pointer>(__rt);
+        return std::__static_fancy_pointer_cast<__end_node_pointer>(__rt);
       } else {
-        return __rt->__right_ ? static_cast<__end_node_pointer>(std::__tree_min(__rt->__right_)) : __result;
+        return __rt->__right_ ? std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_min(__rt->__right_))
+                              : __result;
       }
     }
     return __result;
 @@ -1282,7 +1335,7 @@ public:
 #endif // _LIBCPP_ENABLE_LEGACY_TREE_LOWER_UPPER_BOUND
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI iterator __lower_bound_unique(const _Key& __v) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __lower_bound_unique(const _Key& __v) {
 #if defined(_LIBCPP_ENABLE_LEGACY_TREE_LOWER_UPPER_BOUND)
     return iterator(__lower_bound_unique_compat_impl(__v));
 #else
 @@ -1291,7 +1344,7 @@ public:
   }
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI const_iterator __lower_bound_unique(const _Key& __v) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator __lower_bound_unique(const _Key& __v) const {
 #if defined(_LIBCPP_ENABLE_LEGACY_TREE_LOWER_UPPER_BOUND)
     return const_iterator(__lower_bound_unique_compat_impl(__v));
 #else
 @@ -1300,7 +1353,7 @@ public:
   }
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI iterator __upper_bound_unique(const _Key& __v) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __upper_bound_unique(const _Key& __v) {
 #if defined(_LIBCPP_ENABLE_LEGACY_TREE_LOWER_UPPER_BOUND)
     return iterator(__upper_bound_unique_compat_impl(__v));
 #else
 @@ -1309,7 +1362,7 @@ public:
   }
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI const_iterator __upper_bound_unique(const _Key& __v) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator __upper_bound_unique(const _Key& __v) const {
 #if defined(_LIBCPP_ENABLE_LEGACY_TREE_LOWER_UPPER_BOUND)
     return iterator(__upper_bound_unique_compat_impl(__v));
 #else
 @@ -1319,117 +1372,138 @@ public:
 private:
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI iterator
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
   __lower_bound_multi(const _Key& __v, __node_pointer __root, __end_node_pointer __result);
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI const_iterator
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
   __lower_bound_multi(const _Key& __v, __node_pointer __root, __end_node_pointer __result) const;
 public:
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI iterator __lower_bound_multi(const _Key& __v) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __lower_bound_multi(const _Key& __v) {
     return __lower_bound_multi(__v, __root(), __end_node());
   }
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI const_iterator __lower_bound_multi(const _Key& __v) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator __lower_bound_multi(const _Key& __v) const {
     return __lower_bound_multi(__v, __root(), __end_node());
   }
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI iterator __upper_bound_multi(const _Key& __v) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator __upper_bound_multi(const _Key& __v) {
     return __upper_bound_multi(__v, __root(), __end_node());
   }
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI const_iterator __upper_bound_multi(const _Key& __v) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator __upper_bound_multi(const _Key& __v) const {
     return __upper_bound_multi(__v, __root(), __end_node());
   }
 private:
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI iterator
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
   __upper_bound_multi(const _Key& __v, __node_pointer __root, __end_node_pointer __result);
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI const_iterator
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
   __upper_bound_multi(const _Key& __v, __node_pointer __root, __end_node_pointer __result) const;
 public:
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> __equal_range_unique(const _Key& __k);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> __equal_range_unique(const _Key& __k);
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> __equal_range_unique(const _Key& __k) const;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
+  __equal_range_unique(const _Key& __k) const;
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> __equal_range_multi(const _Key& __k);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> __equal_range_multi(const _Key& __k);
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> __equal_range_multi(const _Key& __k) const;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
+  __equal_range_multi(const _Key& __k) const;
   using _Dp _LIBCPP_NODEBUG           = __tree_node_destructor<__node_allocator>;
   using __node_holder _LIBCPP_NODEBUG = unique_ptr<__node, _Dp>;
-  _LIBCPP_HIDE_FROM_ABI __node_holder remove(const_iterator __p) _NOEXCEPT;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_holder remove(const_iterator __p) _NOEXCEPT;
   // FIXME: Make this function const qualified. Unfortunately doing so
   // breaks existing code which uses non-const callable comparators.
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI pair<__end_node_pointer, __node_base_pointer&> __find_equal(const _Key& __v);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<__end_node_pointer, __node_base_pointer&>
+  __find_equal(const _Key& __v);
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI pair<__end_node_pointer, __node_base_pointer&> __find_equal(const _Key& __v) const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<__end_node_pointer, __node_base_pointer&>
+  __find_equal(const _Key& __v) const {
     return const_cast<__tree*>(this)->__find_equal(__v);
   }
   template <class _Key>
-  _LIBCPP_HIDE_FROM_ABI pair<__end_node_pointer, __node_base_pointer&>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<__end_node_pointer, __node_base_pointer&>
   __find_equal(const_iterator __hint, __node_base_pointer& __dummy, const _Key& __v);
-  _LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc(const __tree& __t) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __copy_assign_alloc(const __tree& __t) {
     __copy_assign_alloc(__t, integral_constant<bool, __node_traits::propagate_on_container_copy_assignment::value>());
   }
-  _LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc(const __tree& __t, true_type) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __copy_assign_alloc(const __tree& __t, true_type) {
     if (__node_alloc() != __t.__node_alloc())
       clear();
     __node_alloc() = __t.__node_alloc();
   }
-  _LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc(const __tree&, false_type) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __copy_assign_alloc(const __tree&, false_type) {}
 private:
-  _LIBCPP_HIDE_FROM_ABI __node_base_pointer& __find_leaf_low(__end_node_pointer& __parent, const value_type& __v);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_base_pointer&
+  __find_leaf_low(__end_node_pointer& __parent, const value_type& __v);
-  _LIBCPP_HIDE_FROM_ABI __node_base_pointer& __find_leaf_high(__end_node_pointer& __parent, const value_type& __v);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_base_pointer&
+  __find_leaf_high(__end_node_pointer& __parent, const value_type& __v);
-  _LIBCPP_HIDE_FROM_ABI __node_base_pointer&
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_base_pointer&
   __find_leaf(const_iterator __hint, __end_node_pointer& __parent, const value_type& __v);
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI __node_holder __construct_node(_Args&&... __args);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_holder __construct_node(_Args&&... __args);
   // TODO: Make this _LIBCPP_HIDE_FROM_ABI
-  _LIBCPP_HIDDEN void destroy(__node_pointer __nd) _NOEXCEPT { (__tree_deleter(__node_alloc_))(__nd); }
+  _LIBCPP_HIDDEN _LIBCPP_CONSTEXPR_SINCE_CXX26 void destroy(__node_pointer __nd) _NOEXCEPT {
+    (__tree_deleter(__node_alloc_))(__nd);
+  }
-  _LIBCPP_HIDE_FROM_ABI void __move_assign(__tree& __t, false_type);
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __move_assign(__tree& __t, false_type);
-  _LIBCPP_HIDE_FROM_ABI void __move_assign(__tree& __t, true_type) _NOEXCEPT_(
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __move_assign(__tree& __t, true_type) _NOEXCEPT_(
       is_nothrow_move_assignable<value_compare>::value&& is_nothrow_move_assignable<__node_allocator>::value);
-  _LIBCPP_HIDE_FROM_ABI void __move_assign_alloc(__tree& __t)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __move_assign_alloc(__tree& __t)
       _NOEXCEPT_(!__node_traits::propagate_on_container_move_assignment::value ||
                  is_nothrow_move_assignable<__node_allocator>::value) {
     __move_assign_alloc(__t, integral_constant<bool, __node_traits::propagate_on_container_move_assignment::value>());
   }
-  _LIBCPP_HIDE_FROM_ABI void __move_assign_alloc(__tree& __t, true_type)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __move_assign_alloc(__tree& __t, true_type)
       _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value) {
     __node_alloc() = std::move(__t.__node_alloc());
   }
-  _LIBCPP_HIDE_FROM_ABI void __move_assign_alloc(__tree&, false_type) _NOEXCEPT {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void __move_assign_alloc(__tree&, false_type) _NOEXCEPT {}
   template <class _From, class _ValueT = _Tp, __enable_if_t<__is_tree_value_type_v<_ValueT>, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI static void __assign_value(__get_node_value_type_t<value_type>& __lhs, _From&& __rhs) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static void
+  __assign_value(__get_node_value_type_t<value_type>& __lhs, _From&& __rhs) {
     using __key_type = __remove_const_t<typename value_type::first_type>;
+#if _LIBCPP_STD_VER >= 26
+    if constexpr (std::is_copy_constructible_v<decltype(__rhs.first)>) {
+      // We need to replace the `const key_type` subobject by reconstruction during constant evaluation to avoid
+      // undefined behavior. Currently, there is no constexpr-friend way to replacing a move-only key subobject.
+      if consteval {
+        std::destroy_at(std::addressof(__lhs));
+        std::construct_at(std::addressof(__lhs), __rhs.first, std::forward<_From>(__rhs).second);
+        return;
+      }
+    }
+#endif
     // This is technically UB, since the object was constructed as `const`.
     // Clang doesn't optimize on this currently though.
     const_cast<__key_type&>(__lhs.first) = const_cast<__copy_cvref_t<_From, __key_type>&&>(__rhs.first);
 @@ -1437,7 +1511,7 @@ private:
   }
   template <class _To, class _From, class _ValueT = _Tp, __enable_if_t<!__is_tree_value_type_v<_ValueT>, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI static void __assign_value(_To& __lhs, _From&& __rhs) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static void __assign_value(_To& __lhs, _From&& __rhs) {
     __lhs = std::forward<_From>(__rhs);
   }
 @@ -1447,24 +1521,23 @@ private:
   public:
     using pointer = __node_pointer;
-    _LIBCPP_HIDE_FROM_ABI __tree_deleter(__node_allocator& __alloc) : __alloc_(__alloc) {}
+    _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __tree_deleter(__node_allocator& __alloc) : __alloc_(__alloc) {}
 #ifdef _LIBCPP_COMPILER_CLANG_BASED // FIXME: GCC complains about not being able to always_inline a recursive function
     _LIBCPP_HIDE_FROM_ABI
 #endif
-    void
+    _LIBCPP_CONSTEXPR_SINCE_CXX26 void operator()(__node_pointer __ptr) {
-    operator()(__node_pointer __ptr) {
       if (!__ptr)
         return;
-      (*this)(static_cast<__node_pointer>(__ptr->__left_));
+      (*this)(std::__static_fancy_pointer_cast<__node_pointer>(__ptr->__left_));
       auto __right = __ptr->__right_;
       __node_traits::destroy(__alloc_, std::addressof(__ptr->__get_value()));
       __node_traits::deallocate(__alloc_, __ptr, 1);
-      (*this)(static_cast<__node_pointer>(__right));
+      (*this)(std::__static_fancy_pointer_cast<__node_pointer>(__right));
     }
   };
 @@ -1476,41 +1549,54 @@ private:
 #ifdef _LIBCPP_COMPILER_CLANG_BASED // FIXME: GCC complains about not being able to always_inline a recursive function
   _LIBCPP_HIDE_FROM_ABI
 #endif
-  __node_pointer __construct_from_tree(__node_pointer __src, _NodeConstructor __construct) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer
+  __construct_from_tree(__node_pointer __src, _NodeConstructor __construct) {
     if (!__src)
       return nullptr;
     __node_holder __new_node = __construct(__src->__get_value());
     unique_ptr<__node, __tree_deleter> __left(
-        __construct_from_tree(static_cast<__node_pointer>(__src->__left_), __construct), __node_alloc_);
+        __construct_from_tree(std::__static_fancy_pointer_cast<__node_pointer>(__src->__left_), __construct),
-    __node_pointer __right = __construct_from_tree(static_cast<__node_pointer>(__src->__right_), __construct);
+        __node_alloc_);
+    __node_pointer __right =
+        __construct_from_tree(std::__static_fancy_pointer_cast<__node_pointer>(__src->__right_), __construct);
     __node_pointer __new_node_ptr = __new_node.release();
     __new_node_ptr->__is_black_ = __src->__is_black_;
-    __new_node_ptr->__left_     = static_cast<__node_base_pointer>(__left.release());
+    __new_node_ptr->__left_     = std::__static_fancy_pointer_cast<__node_base_pointer>(__left.release());
-    __new_node_ptr->__right_    = static_cast<__node_base_pointer>(__right);
+    __new_node_ptr->__right_    = std::__static_fancy_pointer_cast<__node_base_pointer>(__right);
     if (__new_node_ptr->__left_)
-      __new_node_ptr->__left_->__parent_ = static_cast<__end_node_pointer>(__new_node_ptr);
+      __new_node_ptr->__left_->__parent_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__new_node_ptr);
     if (__new_node_ptr->__right_)
-      __new_node_ptr->__right_->__parent_ = static_cast<__end_node_pointer>(__new_node_ptr);
+      __new_node_ptr->__right_->__parent_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__new_node_ptr);
     return __new_node_ptr;
   }
-  _LIBCPP_HIDE_FROM_ABI __node_pointer __copy_construct_tree(__node_pointer __src) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer __copy_construct_tree(__node_pointer __src) {
     return __construct_from_tree(__src, [this](const value_type& __val) { return __construct_node(__val); });
   }
   template <class _ValueT = _Tp, __enable_if_t<__is_tree_value_type_v<_ValueT>, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI __node_pointer __move_construct_tree(__node_pointer __src) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer __move_construct_tree(__node_pointer __src) {
     return __construct_from_tree(__src, [this](value_type& __val) {
+#if _LIBCPP_STD_VER >= 26
+      // We need to replace the `const key_type` subobject by reconstruction during constant evaluation to avoid
+      // undefined behavior. Currently, there is no constexpr-friend way to replacing a move-only key subobject.
+      if constexpr (std::is_copy_constructible_v<decltype(__val.first)>) {
+        if consteval {
+          return __construct_node(__val.first, std::move(__val.second));
+        }
+      }
+#endif
       return __construct_node(const_cast<key_type&&>(__val.first), std::move(__val.second));
     });
   }
   template <class _ValueT = _Tp, __enable_if_t<!__is_tree_value_type_v<_ValueT>, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI __node_pointer __move_construct_tree(__node_pointer __src) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer __move_construct_tree(__node_pointer __src) {
     return __construct_from_tree(__src, [this](value_type& __val) { return __construct_node(std::move(__val)); });
   }
 @@ -1521,7 +1607,7 @@ private:
 #ifdef _LIBCPP_COMPILER_CLANG_BASED // FIXME: GCC complains about not being able to always_inline a recursive function
   _LIBCPP_HIDE_FROM_ABI
 #endif
-  __node_pointer __assign_from_tree(
+  _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer __assign_from_tree(
       __node_pointer __dest, __node_pointer __src, _Assignment __assign, _ConstructionAlg __construct_subtree) {
     if (!__src) {
       destroy(__dest);
 @@ -1533,36 +1619,37 @@ private:
     // If we already have a left node in the destination tree, reuse it and copy-assign recursively
     if (__dest->__left_) {
-      __dest->__left_ = static_cast<__node_base_pointer>(__assign_from_tree(
+      __dest->__left_ = std::__static_fancy_pointer_cast<__node_base_pointer>(__assign_from_tree(
-          static_cast<__node_pointer>(__dest->__left_),
+          std::__static_fancy_pointer_cast<__node_pointer>(__dest->__left_),
-          static_cast<__node_pointer>(__src->__left_),
+          std::__static_fancy_pointer_cast<__node_pointer>(__src->__left_),
           __assign,
           __construct_subtree));
       // Otherwise, we must create new nodes; copy-construct from here on
     } else if (__src->__left_) {
-      auto __new_left       = __construct_subtree(static_cast<__node_pointer>(__src->__left_));
+      auto __new_left       = __construct_subtree(std::__static_fancy_pointer_cast<__node_pointer>(__src->__left_));
-      __dest->__left_       = static_cast<__node_base_pointer>(__new_left);
+      __dest->__left_       = std::__static_fancy_pointer_cast<__node_base_pointer>(__new_left);
-      __new_left->__parent_ = static_cast<__end_node_pointer>(__dest);
+      __new_left->__parent_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__dest);
     }
     // Identical to the left case above, just for the right nodes
     if (__dest->__right_) {
-      __dest->__right_ = static_cast<__node_base_pointer>(__assign_from_tree(
+      __dest->__right_ = std::__static_fancy_pointer_cast<__node_base_pointer>(__assign_from_tree(
-          static_cast<__node_pointer>(__dest->__right_),
+          std::__static_fancy_pointer_cast<__node_pointer>(__dest->__right_),
-          static_cast<__node_pointer>(__src->__right_),
+          std::__static_fancy_pointer_cast<__node_pointer>(__src->__right_),
           __assign,
           __construct_subtree));
     } else if (__src->__right_) {
-      auto __new_right       = __construct_subtree(static_cast<__node_pointer>(__src->__right_));
+      auto __new_right       = __construct_subtree(std::__static_fancy_pointer_cast<__node_pointer>(__src->__right_));
-      __dest->__right_       = static_cast<__node_base_pointer>(__new_right);
+      __dest->__right_       = std::__static_fancy_pointer_cast<__node_base_pointer>(__new_right);
-      __new_right->__parent_ = static_cast<__end_node_pointer>(__dest);
+      __new_right->__parent_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__dest);
     }
     return __dest;
   }
-  _LIBCPP_HIDE_FROM_ABI __node_pointer __copy_assign_tree(__node_pointer __dest, __node_pointer __src) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer
+  __copy_assign_tree(__node_pointer __dest, __node_pointer __src) {
     return __assign_from_tree(
         __dest,
         __src,
 @@ -1570,7 +1657,8 @@ private:
         [this](__node_pointer __nd) { return __copy_construct_tree(__nd); });
   }
-  _LIBCPP_HIDE_FROM_ABI __node_pointer __move_assign_tree(__node_pointer __dest, __node_pointer __src) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __node_pointer
+  __move_assign_tree(__node_pointer __dest, __node_pointer __src) {
     return __assign_from_tree(
         __dest,
         __src,
 @@ -1589,7 +1677,8 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<__tree<_Tp
   using __node_pointer _LIBCPP_NODEBUG = typename __tree<_Tp, _Compare, _Allocator>::__node_pointer;
   template <class _Tree, class _Func, class _Proj>
-  _LIBCPP_HIDE_FROM_ABI static auto operator()(_Tree&& __range, _Func __func, _Proj __proj) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static auto
+  operator()(_Tree&& __range, _Func __func, _Proj __proj) {
     if (__range.size() != 0)
       std::__tree_iterate_from_root<__copy_cvref_t<_Tree, typename __remove_cvref_t<_Tree>::value_type>>(
           [](__node_pointer) { return false; }, __range.__root(), __func, __proj);
 @@ -1599,7 +1688,8 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<__tree<_Tp
 #endif
 template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>& __tree<_Tp, _Compare, _Allocator>::operator=(const __tree& __t) {
+_LIBCPP_CONSTEXPR_SINCE_CXX26 __tree<_Tp, _Compare, _Allocator>&
+__tree<_Tp, _Compare, _Allocator>::operator=(const __tree& __t) {
   if (this == std::addressof(__t))
     return *this;
 @@ -1607,21 +1697,22 @@ __tree<_Tp, _Compare, _Allocator>& __tree<_Tp, _Compare, _Allocator>::operator=(
   __copy_assign_alloc(__t);
   if (__size_ != 0) {
-    *__root_ptr() = static_cast<__node_base_pointer>(__copy_assign_tree(__root(), __t.__root()));
+    *__root_ptr() = std::__static_fancy_pointer_cast<__node_base_pointer>(__copy_assign_tree(__root(), __t.__root()));
   } else {
-    *__root_ptr() = static_cast<__node_base_pointer>(__copy_construct_tree(__t.__root()));
+    *__root_ptr() = std::__static_fancy_pointer_cast<__node_base_pointer>(__copy_construct_tree(__t.__root()));
     if (__root())
       __root()->__parent_ = __end_node();
   }
-  __begin_node_ =
+  __begin_node_ = __end_node()->__left_
-      __end_node()->__left_ ? static_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_)) : __end_node();
+                    ? std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_))
+                    : __end_node();
   __size_ = __t.size();
   return *this;
 }
 template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(const __tree& __t)
+_LIBCPP_CONSTEXPR_SINCE_CXX26 __tree<_Tp, _Compare, _Allocator>::__tree(const __tree& __t)
     : __begin_node_(__end_node()),
       __node_alloc_(__node_traits::select_on_container_copy_construction(__t.__node_alloc())),
       __size_(0),
 @@ -1629,14 +1720,14 @@ __tree<_Tp, _Compare, _Allocator>::__tree(const __tree& __t)
   if (__t.size() == 0)
     return;
-  *__root_ptr()       = static_cast<__node_base_pointer>(__copy_construct_tree(__t.__root()));
+  *__root_ptr()       = std::__static_fancy_pointer_cast<__node_base_pointer>(__copy_construct_tree(__t.__root()));
   __root()->__parent_ = __end_node();
-  __begin_node_       = static_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_));
+  __begin_node_       = std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_));
   __size_             = __t.size();
 }
 template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t) _NOEXCEPT_(
+_LIBCPP_CONSTEXPR_SINCE_CXX26 __tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t) _NOEXCEPT_(
     is_nothrow_move_constructible<__node_allocator>::value&& is_nothrow_move_constructible<value_compare>::value)
     : __begin_node_(std::move(__t.__begin_node_)),
       __end_node_(std::move(__t.__end_node_)),
 @@ -1646,7 +1737,7 @@ __tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t) _NOEXCEPT_(
   if (__size_ == 0)
     __begin_node_ = __end_node();
   else {
-    __end_node()->__left_->__parent_ = static_cast<__end_node_pointer>(__end_node());
+    __end_node()->__left_->__parent_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__end_node());
     __t.__begin_node_                = __t.__end_node();
     __t.__end_node()->__left_        = nullptr;
     __t.__size_                      = 0;
 @@ -1654,7 +1745,7 @@ __tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t) _NOEXCEPT_(
 }
 template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t, const allocator_type& __a)
+_LIBCPP_CONSTEXPR_SINCE_CXX26 __tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t, const allocator_type& __a)
     : __begin_node_(__end_node()),
       __node_alloc_(__node_allocator(__a)),
       __size_(0),
 @@ -1664,24 +1755,24 @@ __tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t, const allocator_type& __
   if (__a == __t.__alloc()) {
     __begin_node_                    = __t.__begin_node_;
     __end_node()->__left_            = __t.__end_node()->__left_;
-    __end_node()->__left_->__parent_ = static_cast<__end_node_pointer>(__end_node());
+    __end_node()->__left_->__parent_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__end_node());
     __size_                          = __t.__size_;
     __t.__begin_node_                = __t.__end_node();
     __t.__end_node()->__left_        = nullptr;
     __t.__size_                      = 0;
   } else {
-    *__root_ptr()       = static_cast<__node_base_pointer>(__move_construct_tree(__t.__root()));
+    *__root_ptr()       = std::__static_fancy_pointer_cast<__node_base_pointer>(__move_construct_tree(__t.__root()));
     __root()->__parent_ = __end_node();
-    __begin_node_       = static_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_));
+    __begin_node_       = std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_));
     __size_             = __t.size();
     __t.clear(); // Ensure that __t is in a valid state after moving out the keys
   }
 }
 template <class _Tp, class _Compare, class _Allocator>
-void __tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, true_type)
+_LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, true_type)
     _NOEXCEPT_(is_nothrow_move_assignable<value_compare>::value&& is_nothrow_move_assignable<__node_allocator>::value) {
-  destroy(static_cast<__node_pointer>(__end_node()->__left_));
+  destroy(std::__static_fancy_pointer_cast<__node_pointer>(__end_node()->__left_));
   __begin_node_ = __t.__begin_node_;
   __end_node_   = __t.__end_node_;
   __move_assign_alloc(__t);
 @@ -1690,7 +1781,7 @@ void __tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, true_type)
   if (__size_ == 0)
     __begin_node_ = __end_node();
   else {
-    __end_node()->__left_->__parent_ = static_cast<__end_node_pointer>(__end_node());
+    __end_node()->__left_->__parent_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__end_node());
     __t.__begin_node_                = __t.__end_node();
     __t.__end_node()->__left_        = nullptr;
     __t.__size_                      = 0;
 @@ -1698,27 +1789,28 @@ void __tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, true_type)
 }
 template <class _Tp, class _Compare, class _Allocator>
-void __tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, false_type) {
+_LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, false_type) {
   if (__node_alloc() == __t.__node_alloc()) {
     __move_assign(__t, true_type());
   } else {
     value_comp() = std::move(__t.value_comp());
     if (__size_ != 0) {
-      *__root_ptr() = static_cast<__node_base_pointer>(__move_assign_tree(__root(), __t.__root()));
+      *__root_ptr() = std::__static_fancy_pointer_cast<__node_base_pointer>(__move_assign_tree(__root(), __t.__root()));
     } else {
-      *__root_ptr() = static_cast<__node_base_pointer>(__move_construct_tree(__t.__root()));
+      *__root_ptr() = std::__static_fancy_pointer_cast<__node_base_pointer>(__move_construct_tree(__t.__root()));
       if (__root())
         __root()->__parent_ = __end_node();
     }
-    __begin_node_ =
+    __begin_node_ = __end_node()->__left_
-        __end_node()->__left_ ? static_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_)) : __end_node();
+                      ? std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_min(__end_node()->__left_))
+                      : __end_node();
     __size_ = __t.size();
     __t.clear(); // Ensure that __t is in a valid state after moving out the keys
   }
 }
 template <class _Tp, class _Compare, class _Allocator>
-void __tree<_Tp, _Compare, _Allocator>::swap(__tree& __t)
+_LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree<_Tp, _Compare, _Allocator>::swap(__tree& __t)
 #if _LIBCPP_STD_VER <= 11
     _NOEXCEPT_(__is_nothrow_swappable_v<value_compare> &&
                (!__node_traits::propagate_on_container_swap::value || __is_nothrow_swappable_v<__node_allocator>))
 @@ -1743,7 +1835,7 @@ void __tree<_Tp, _Compare, _Allocator>::swap(__tree& __t)
 }
 template <class _Tp, class _Compare, class _Allocator>
-void __tree<_Tp, _Compare, _Allocator>::clear() _NOEXCEPT {
+_LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree<_Tp, _Compare, _Allocator>::clear() _NOEXCEPT {
   destroy(__root());
   __size_               = 0;
   __begin_node_         = __end_node();
 @@ -1754,23 +1846,23 @@ void __tree<_Tp, _Compare, _Allocator>::clear() _NOEXCEPT {
 // Set __parent to parent of null leaf
 // Return reference to null leaf
 template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer&
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer&
 __tree<_Tp, _Compare, _Allocator>::__find_leaf_low(__end_node_pointer& __parent, const value_type& __v) {
   __node_pointer __nd = __root();
   if (__nd != nullptr) {
     while (true) {
       if (value_comp()(__nd->__get_value(), __v)) {
         if (__nd->__right_ != nullptr)
-          __nd = static_cast<__node_pointer>(__nd->__right_);
+          __nd = std::__static_fancy_pointer_cast<__node_pointer>(__nd->__right_);
         else {
-          __parent = static_cast<__end_node_pointer>(__nd);
+          __parent = std::__static_fancy_pointer_cast<__end_node_pointer>(__nd);
           return __nd->__right_;
         }
       } else {
         if (__nd->__left_ != nullptr)
-          __nd = static_cast<__node_pointer>(__nd->__left_);
+          __nd = std::__static_fancy_pointer_cast<__node_pointer>(__nd->__left_);
         else {
-          __parent = static_cast<__end_node_pointer>(__nd);
+          __parent = std::__static_fancy_pointer_cast<__end_node_pointer>(__nd);
           return __parent->__left_;
         }
       }
 @@ -1784,23 +1876,23 @@ __tree<_Tp, _Compare, _Allocator>::__find_leaf_low(__end_node_pointer& __parent,
 // Set __parent to parent of null leaf
 // Return reference to null leaf
 template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer&
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer&
 __tree<_Tp, _Compare, _Allocator>::__find_leaf_high(__end_node_pointer& __parent, const value_type& __v) {
   __node_pointer __nd = __root();
   if (__nd != nullptr) {
     while (true) {
       if (value_comp()(__v, __nd->__get_value())) {
         if (__nd->__left_ != nullptr)
-          __nd = static_cast<__node_pointer>(__nd->__left_);
+          __nd = std::__static_fancy_pointer_cast<__node_pointer>(__nd->__left_);
         else {
-          __parent = static_cast<__end_node_pointer>(__nd);
+          __parent = std::__static_fancy_pointer_cast<__end_node_pointer>(__nd);
           return __parent->__left_;
         }
       } else {
         if (__nd->__right_ != nullptr)
-          __nd = static_cast<__node_pointer>(__nd->__right_);
+          __nd = std::__static_fancy_pointer_cast<__node_pointer>(__nd->__right_);
         else {
-          __parent = static_cast<__end_node_pointer>(__nd);
+          __parent = std::__static_fancy_pointer_cast<__end_node_pointer>(__nd);
           return __nd->__right_;
         }
       }
 @@ -1817,7 +1909,8 @@ __tree<_Tp, _Compare, _Allocator>::__find_leaf_high(__end_node_pointer& __parent
 // Set __parent to parent of null leaf
 // Return reference to null leaf
 template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer& __tree<_Tp, _Compare, _Allocator>::__find_leaf(
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer&
+__tree<_Tp, _Compare, _Allocator>::__find_leaf(
     const_iterator __hint, __end_node_pointer& __parent, const value_type& __v) {
   if (__hint == end() || !value_comp()(*__hint, __v)) // check before
   {
 @@ -1826,11 +1919,11 @@ typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer& __tree<_Tp, _Co
     if (__prior == begin() || !value_comp()(__v, *--__prior)) {
       // *prev(__hint) <= __v <= *__hint
       if (__hint.__ptr_->__left_ == nullptr) {
-        __parent = static_cast<__end_node_pointer>(__hint.__ptr_);
+        __parent = std::__static_fancy_pointer_cast<__end_node_pointer>(__hint.__ptr_);
         return __parent->__left_;
       } else {
-        __parent = static_cast<__end_node_pointer>(__prior.__ptr_);
+        __parent = std::__static_fancy_pointer_cast<__end_node_pointer>(__prior.__ptr_);
-        return static_cast<__node_base_pointer>(__prior.__ptr_)->__right_;
+        return std::__static_fancy_pointer_cast<__node_base_pointer>(__prior.__ptr_)->__right_;
       }
     }
     // __v < *prev(__hint)
 @@ -1845,8 +1938,9 @@ typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer& __tree<_Tp, _Co
 // If __v doesn't exist, return the parent of the null leaf and a reference to the pointer to the null leaf.
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-_LIBCPP_HIDE_FROM_ABI pair<typename __tree<_Tp, _Compare, _Allocator>::__end_node_pointer,
+_LIBCPP_HIDE_FROM_ABI
-                           typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer&>
+_LIBCPP_CONSTEXPR_SINCE_CXX26 pair<typename __tree<_Tp, _Compare, _Allocator>::__end_node_pointer,
+                                   typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer&>
 __tree<_Tp, _Compare, _Allocator>::__find_equal(const _Key& __v) {
   using _Pair = pair<__end_node_pointer, __node_base_pointer&>;
 @@ -1858,27 +1952,27 @@ __tree<_Tp, _Compare, _Allocator>::__find_equal(const _Key& __v) {
   }
   __node_base_pointer* __node_ptr = __root_ptr();
-  auto&& __transparent            = std::__as_transparent<_Key>(value_comp());
+  auto&& __transparent            = std::__as_transparent<key_type>(value_comp());
   auto __comp =
-      __lazy_synth_three_way_comparator<__make_transparent_t<_Key, _Compare>, _Key, value_type>(__transparent);
+      __lazy_synth_three_way_comparator<__make_transparent_t<key_type, _Compare>, _Key, value_type>(__transparent);
   while (true) {
     auto __comp_res = __comp(__v, __nd->__get_value());
     if (__comp_res.__less()) {
       if (__nd->__left_ == nullptr)
-        return _Pair(static_cast<__end_node_pointer>(__nd), __nd->__left_);
+        return _Pair(std::__static_fancy_pointer_cast<__end_node_pointer>(__nd), __nd->__left_);
       __node_ptr = std::addressof(__nd->__left_);
-      __nd       = static_cast<__node_pointer>(__nd->__left_);
+      __nd       = std::__static_fancy_pointer_cast<__node_pointer>(__nd->__left_);
     } else if (__comp_res.__greater()) {
       if (__nd->__right_ == nullptr)
-        return _Pair(static_cast<__end_node_pointer>(__nd), __nd->__right_);
+        return _Pair(std::__static_fancy_pointer_cast<__end_node_pointer>(__nd), __nd->__right_);
       __node_ptr = std::addressof(__nd->__right_);
-      __nd       = static_cast<__node_pointer>(__nd->__right_);
+      __nd       = std::__static_fancy_pointer_cast<__node_pointer>(__nd->__right_);
     } else {
-      return _Pair(static_cast<__end_node_pointer>(__nd), *__node_ptr);
+      return _Pair(std::__static_fancy_pointer_cast<__end_node_pointer>(__nd), *__node_ptr);
     }
   }
 }
 @@ -1891,8 +1985,9 @@ __tree<_Tp, _Compare, _Allocator>::__find_equal(const _Key& __v) {
 // If __v doesn't exist, return the parent of the null leaf and a reference to the pointer to the null leaf.
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-_LIBCPP_HIDE_FROM_ABI pair<typename __tree<_Tp, _Compare, _Allocator>::__end_node_pointer,
+_LIBCPP_HIDE_FROM_ABI
-                           typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer&>
+_LIBCPP_CONSTEXPR_SINCE_CXX26 pair<typename __tree<_Tp, _Compare, _Allocator>::__end_node_pointer,
+                                   typename __tree<_Tp, _Compare, _Allocator>::__node_base_pointer&>
 __tree<_Tp, _Compare, _Allocator>::__find_equal(const_iterator __hint, __node_base_pointer& __dummy, const _Key& __v) {
   using _Pair = pair<__end_node_pointer, __node_base_pointer&>;
 @@ -1903,7 +1998,7 @@ __tree<_Tp, _Compare, _Allocator>::__find_equal(const_iterator __hint, __node_ba
       // *prev(__hint) < __v < *__hint
       if (__hint.__ptr_->__left_ == nullptr)
         return _Pair(__hint.__ptr_, __hint.__ptr_->__left_);
-      return _Pair(__prior.__ptr_, static_cast<__node_pointer>(__prior.__ptr_)->__right_);
+      return _Pair(__prior.__ptr_, std::__static_fancy_pointer_cast<__node_pointer>(__prior.__ptr_)->__right_);
     }
     // __v <= *prev(__hint)
     return __find_equal(__v);
 @@ -1915,7 +2010,7 @@ __tree<_Tp, _Compare, _Allocator>::__find_equal(const_iterator __hint, __node_ba
     if (__next == end() || value_comp()(__v, *__next)) {
       // *__hint < __v < *std::next(__hint)
       if (__hint.__get_np()->__right_ == nullptr)
-        return _Pair(__hint.__ptr_, static_cast<__node_pointer>(__hint.__ptr_)->__right_);
+        return _Pair(__hint.__ptr_, std::__static_fancy_pointer_cast<__node_pointer>(__hint.__ptr_)->__right_);
       return _Pair(__next.__ptr_, __next.__ptr_->__left_);
     }
     // *next(__hint) <= __v
 @@ -1923,12 +2018,12 @@ __tree<_Tp, _Compare, _Allocator>::__find_equal(const_iterator __hint, __node_ba
   }
   // else __v == *__hint
-  __dummy = static_cast<__node_base_pointer>(__hint.__ptr_);
+  __dummy = std::__static_fancy_pointer_cast<__node_base_pointer>(__hint.__ptr_);
   return _Pair(__hint.__ptr_, __dummy);
 }
 template <class _Tp, class _Compare, class _Allocator>
-void __tree<_Tp, _Compare, _Allocator>::__insert_node_at(
+_LIBCPP_CONSTEXPR_SINCE_CXX26 void __tree<_Tp, _Compare, _Allocator>::__insert_node_at(
     __end_node_pointer __parent, __node_base_pointer& __child, __node_base_pointer __new_node) _NOEXCEPT {
   __new_node->__left_   = nullptr;
   __new_node->__right_  = nullptr;
 @@ -1936,14 +2031,14 @@ void __tree<_Tp, _Compare, _Allocator>::__insert_node_at(
   // __new_node->__is_black_ is initialized in __tree_balance_after_insert
   __child = __new_node;
   if (__begin_node_->__left_ != nullptr)
-    __begin_node_ = static_cast<__end_node_pointer>(__begin_node_->__left_);
+    __begin_node_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__begin_node_->__left_);
   std::__tree_balance_after_insert(__end_node()->__left_, __child);
   ++__size_;
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class... _Args>
-typename __tree<_Tp, _Compare, _Allocator>::__node_holder
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::__node_holder
 __tree<_Tp, _Compare, _Allocator>::__construct_node(_Args&&... __args) {
   __node_allocator& __na = __node_alloc();
   __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
 @@ -1954,42 +2049,42 @@ __tree<_Tp, _Compare, _Allocator>::__construct_node(_Args&&... __args) {
 template <class _Tp, class _Compare, class _Allocator>
 template <class... _Args>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
+typename __tree<_Tp, _Compare, _Allocator>::iterator _LIBCPP_CONSTEXPR_SINCE_CXX26
 __tree<_Tp, _Compare, _Allocator>::__emplace_multi(_Args&&... __args) {
   __node_holder __h = __construct_node(std::forward<_Args>(__args)...);
   __end_node_pointer __parent;
   __node_base_pointer& __child = __find_leaf_high(__parent, __h->__get_value());
-  __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
+  __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__h.get()));
-  return iterator(static_cast<__node_pointer>(__h.release()));
+  return iterator(std::__static_fancy_pointer_cast<__node_pointer>(__h.release()));
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class... _Args>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
+typename __tree<_Tp, _Compare, _Allocator>::iterator _LIBCPP_CONSTEXPR_SINCE_CXX26
 __tree<_Tp, _Compare, _Allocator>::__emplace_hint_multi(const_iterator __p, _Args&&... __args) {
   __node_holder __h = __construct_node(std::forward<_Args>(__args)...);
   __end_node_pointer __parent;
   __node_base_pointer& __child = __find_leaf(__p, __parent, __h->__get_value());
-  __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
+  __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__h.get()));
-  return iterator(static_cast<__node_pointer>(__h.release()));
+  return iterator(std::__static_fancy_pointer_cast<__node_pointer>(__h.release()));
 }
 template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
+typename __tree<_Tp, _Compare, _Allocator>::iterator _LIBCPP_CONSTEXPR_SINCE_CXX26
 __tree<_Tp, _Compare, _Allocator>::__remove_node_pointer(__node_pointer __ptr) _NOEXCEPT {
   iterator __r(__ptr);
   ++__r;
   if (__begin_node_ == __ptr)
     __begin_node_ = __r.__ptr_;
   --__size_;
-  std::__tree_remove(__end_node()->__left_, static_cast<__node_base_pointer>(__ptr));
+  std::__tree_remove(__end_node()->__left_, std::__static_fancy_pointer_cast<__node_base_pointer>(__ptr));
   return __r;
 }
 #if _LIBCPP_STD_VER >= 17
 template <class _Tp, class _Compare, class _Allocator>
 template <class _NodeHandle, class _InsertReturnType>
-_LIBCPP_HIDE_FROM_ABI _InsertReturnType
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _InsertReturnType
 __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(_NodeHandle&& __nh) {
   if (__nh.empty())
     return _InsertReturnType{end(), false, _NodeHandle()};
 @@ -1997,16 +2092,17 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(_NodeHandle&& __n
   __node_pointer __ptr = __nh.__ptr_;
   auto [__parent, __child] = __find_equal(__ptr->__get_value());
   if (__child != nullptr)
-    return _InsertReturnType{iterator(static_cast<__node_pointer>(__child)), false, std::move(__nh)};
+    return _InsertReturnType{
+        iterator(std::__static_fancy_pointer_cast<__node_pointer>(__child)), false, std::move(__nh)};
-  __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
+  __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__ptr));
   __nh.__release_ptr();
   return _InsertReturnType{iterator(__ptr), true, _NodeHandle()};
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _NodeHandle>
-_LIBCPP_HIDE_FROM_ABI typename __tree<_Tp, _Compare, _Allocator>::iterator
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterator
 __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(const_iterator __hint, _NodeHandle&& __nh) {
   if (__nh.empty())
     return end();
 @@ -2014,9 +2110,9 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(const_iterator __
   __node_pointer __ptr = __nh.__ptr_;
   __node_base_pointer __dummy;
   auto [__parent, __child] = __find_equal(__hint, __dummy, __ptr->__get_value());
-  __node_pointer __r       = static_cast<__node_pointer>(__child);
+  __node_pointer __r       = std::__static_fancy_pointer_cast<__node_pointer>(__child);
   if (__child == nullptr) {
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
+    __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__ptr));
     __r = __ptr;
     __nh.__release_ptr();
   }
 @@ -2025,7 +2121,8 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_unique(const_iterator __
 template <class _Tp, class _Compare, class _Allocator>
 template <class _NodeHandle>
-_LIBCPP_HIDE_FROM_ABI _NodeHandle __tree<_Tp, _Compare, _Allocator>::__node_handle_extract(key_type const& __key) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _NodeHandle
+__tree<_Tp, _Compare, _Allocator>::__node_handle_extract(key_type const& __key) {
   iterator __it = __lower_bound_multi(__key);
   if (__it == end() || __value_comp_(__key, *__it))
     return _NodeHandle();
 @@ -2034,7 +2131,8 @@ _LIBCPP_HIDE_FROM_ABI _NodeHandle __tree<_Tp, _Compare, _Allocator>::__node_hand
 template <class _Tp, class _Compare, class _Allocator>
 template <class _NodeHandle>
-_LIBCPP_HIDE_FROM_ABI _NodeHandle __tree<_Tp, _Compare, _Allocator>::__node_handle_extract(const_iterator __p) {
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _NodeHandle
+__tree<_Tp, _Compare, _Allocator>::__node_handle_extract(const_iterator __p) {
   __node_pointer __np = __p.__get_np();
   __remove_node_pointer(__np);
   return _NodeHandle(__np, __alloc());
 @@ -2042,7 +2140,7 @@ _LIBCPP_HIDE_FROM_ABI _NodeHandle __tree<_Tp, _Compare, _Allocator>::__node_hand
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Comp2>
-_LIBCPP_HIDE_FROM_ABI void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
 __tree<_Tp, _Compare, _Allocator>::__node_handle_merge_unique(__tree<_Tp, _Comp2, _Allocator>& __source) {
   for (iterator __i = __source.begin(); __i != __source.end();) {
     __node_pointer __src_ptr = __i.__get_np();
 @@ -2051,27 +2149,27 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_merge_unique(__tree<_Tp, _Comp2
     if (__child != nullptr)
       continue;
     __source.__remove_node_pointer(__src_ptr);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__src_ptr));
+    __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__src_ptr));
   }
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _NodeHandle>
-_LIBCPP_HIDE_FROM_ABI typename __tree<_Tp, _Compare, _Allocator>::iterator
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterator
 __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_multi(_NodeHandle&& __nh) {
   if (__nh.empty())
     return end();
   __node_pointer __ptr = __nh.__ptr_;
   __end_node_pointer __parent;
   __node_base_pointer& __child = __find_leaf_high(__parent, __ptr->__get_value());
-  __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
+  __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__ptr));
   __nh.__release_ptr();
   return iterator(__ptr);
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _NodeHandle>
-_LIBCPP_HIDE_FROM_ABI typename __tree<_Tp, _Compare, _Allocator>::iterator
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterator
 __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_multi(const_iterator __hint, _NodeHandle&& __nh) {
   if (__nh.empty())
     return end();
 @@ -2079,14 +2177,14 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_insert_multi(const_iterator __h
   __node_pointer __ptr = __nh.__ptr_;
   __end_node_pointer __parent;
   __node_base_pointer& __child = __find_leaf(__hint, __parent, __ptr->__get_value());
-  __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__ptr));
+  __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__ptr));
   __nh.__release_ptr();
   return iterator(__ptr);
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Comp2>
-_LIBCPP_HIDE_FROM_ABI void
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
 __tree<_Tp, _Compare, _Allocator>::__node_handle_merge_multi(__tree<_Tp, _Comp2, _Allocator>& __source) {
   for (iterator __i = __source.begin(); __i != __source.end();) {
     __node_pointer __src_ptr = __i.__get_np();
 @@ -2094,14 +2192,14 @@ __tree<_Tp, _Compare, _Allocator>::__node_handle_merge_multi(__tree<_Tp, _Comp2,
     __node_base_pointer& __child = __find_leaf_high(__parent, __src_ptr->__get_value());
     ++__i;
     __source.__remove_node_pointer(__src_ptr);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__src_ptr));
+    __insert_node_at(__parent, __child, std::__static_fancy_pointer_cast<__node_base_pointer>(__src_ptr));
   }
 }
 #endif // _LIBCPP_STD_VER >= 17
 template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator __tree<_Tp, _Compare, _Allocator>::erase(const_iterator __p) {
+_LIBCPP_CONSTEXPR_SINCE_CXX26
+    typename __tree<_Tp, _Compare, _Allocator>::iterator __tree<_Tp, _Compare, _Allocator>::erase(const_iterator __p) {
   __node_pointer __np    = __p.__get_np();
   iterator __r           = __remove_node_pointer(__np);
   __node_allocator& __na = __node_alloc();
 @@ -2111,7 +2209,7 @@ typename __tree<_Tp, _Compare, _Allocator>::iterator __tree<_Tp, _Compare, _Allo
 }
 template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterator
 __tree<_Tp, _Compare, _Allocator>::erase(const_iterator __f, const_iterator __l) {
   while (__f != __l)
     __f = erase(__f);
 @@ -2120,7 +2218,7 @@ __tree<_Tp, _Compare, _Allocator>::erase(const_iterator __f, const_iterator __l)
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::size_type
 __tree<_Tp, _Compare, _Allocator>::__erase_unique(const _Key& __k) {
   iterator __i = find(__k);
   if (__i == end())
 @@ -2131,7 +2229,7 @@ __tree<_Tp, _Compare, _Allocator>::__erase_unique(const _Key& __k) {
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::size_type
 __tree<_Tp, _Compare, _Allocator>::__erase_multi(const _Key& __k) {
   pair<iterator, iterator> __p = __equal_range_multi(__k);
   size_type __r                = 0;
 @@ -2142,16 +2240,16 @@ __tree<_Tp, _Compare, _Allocator>::__erase_multi(const _Key& __k) {
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::size_type
 __tree<_Tp, _Compare, _Allocator>::__count_unique(const _Key& __k) const {
   __node_pointer __rt = __root();
   auto __comp         = __lazy_synth_three_way_comparator<value_compare, _Key, value_type>(value_comp());
   while (__rt != nullptr) {
     auto __comp_res = __comp(__k, __rt->__get_value());
     if (__comp_res.__less()) {
-      __rt = static_cast<__node_pointer>(__rt->__left_);
+      __rt = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_);
     } else if (__comp_res.__greater())
-      __rt = static_cast<__node_pointer>(__rt->__right_);
+      __rt = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_);
     else
       return 1;
   }
 @@ -2160,7 +2258,7 @@ __tree<_Tp, _Compare, _Allocator>::__count_unique(const _Key& __k) const {
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::size_type
 __tree<_Tp, _Compare, _Allocator>::__count_multi(const _Key& __k) const {
   __end_node_pointer __result = __end_node();
   __node_pointer __rt         = __root();
 @@ -2168,78 +2266,85 @@ __tree<_Tp, _Compare, _Allocator>::__count_multi(const _Key& __k) const {
   while (__rt != nullptr) {
     auto __comp_res = __comp(__k, __rt->__get_value());
     if (__comp_res.__less()) {
-      __result = static_cast<__end_node_pointer>(__rt);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__rt);
-      __rt     = static_cast<__node_pointer>(__rt->__left_);
+      __rt     = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_);
     } else if (__comp_res.__greater())
-      __rt = static_cast<__node_pointer>(__rt->__right_);
+      __rt = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_);
     else
       return std::distance(
-          __lower_bound_multi(__k, static_cast<__node_pointer>(__rt->__left_), static_cast<__end_node_pointer>(__rt)),
+          __lower_bound_multi(__k,
-          __upper_bound_multi(__k, static_cast<__node_pointer>(__rt->__right_), __result));
+                              std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_),
+                              std::__static_fancy_pointer_cast<__end_node_pointer>(__rt)),
+          __upper_bound_multi(__k, std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_), __result));
   }
   return 0;
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::iterator __tree<_Tp, _Compare, _Allocator>::__lower_bound_multi(
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterator
+__tree<_Tp, _Compare, _Allocator>::__lower_bound_multi(
     const _Key& __v, __node_pointer __root, __end_node_pointer __result) {
   while (__root != nullptr) {
     if (!value_comp()(__root->__get_value(), __v)) {
-      __result = static_cast<__end_node_pointer>(__root);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__root);
-      __root   = static_cast<__node_pointer>(__root->__left_);
+      __root   = std::__static_fancy_pointer_cast<__node_pointer>(__root->__left_);
     } else
-      __root = static_cast<__node_pointer>(__root->__right_);
+      __root = std::__static_fancy_pointer_cast<__node_pointer>(__root->__right_);
   }
   return iterator(__result);
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::const_iterator __tree<_Tp, _Compare, _Allocator>::__lower_bound_multi(
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::const_iterator
+__tree<_Tp, _Compare, _Allocator>::__lower_bound_multi(
     const _Key& __v, __node_pointer __root, __end_node_pointer __result) const {
   while (__root != nullptr) {
     if (!value_comp()(__root->__get_value(), __v)) {
-      __result = static_cast<__end_node_pointer>(__root);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__root);
-      __root   = static_cast<__node_pointer>(__root->__left_);
+      __root   = std::__static_fancy_pointer_cast<__node_pointer>(__root->__left_);
     } else
-      __root = static_cast<__node_pointer>(__root->__right_);
+      __root = std::__static_fancy_pointer_cast<__node_pointer>(__root->__right_);
   }
   return const_iterator(__result);
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::iterator __tree<_Tp, _Compare, _Allocator>::__upper_bound_multi(
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::iterator
+__tree<_Tp, _Compare, _Allocator>::__upper_bound_multi(
     const _Key& __v, __node_pointer __root, __end_node_pointer __result) {
   while (__root != nullptr) {
     if (value_comp()(__v, __root->__get_value())) {
-      __result = static_cast<__end_node_pointer>(__root);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__root);
-      __root   = static_cast<__node_pointer>(__root->__left_);
+      __root   = std::__static_fancy_pointer_cast<__node_pointer>(__root->__left_);
     } else
-      __root = static_cast<__node_pointer>(__root->__right_);
+      __root = std::__static_fancy_pointer_cast<__node_pointer>(__root->__right_);
   }
   return iterator(__result);
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::const_iterator __tree<_Tp, _Compare, _Allocator>::__upper_bound_multi(
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::const_iterator
+__tree<_Tp, _Compare, _Allocator>::__upper_bound_multi(
     const _Key& __v, __node_pointer __root, __end_node_pointer __result) const {
   while (__root != nullptr) {
     if (value_comp()(__v, __root->__get_value())) {
-      __result = static_cast<__end_node_pointer>(__root);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__root);
-      __root   = static_cast<__node_pointer>(__root->__left_);
+      __root   = std::__static_fancy_pointer_cast<__node_pointer>(__root->__left_);
     } else
-      __root = static_cast<__node_pointer>(__root->__right_);
+      __root = std::__static_fancy_pointer_cast<__node_pointer>(__root->__right_);
   }
   return const_iterator(__result);
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, typename __tree<_Tp, _Compare, _Allocator>::iterator>
+_LIBCPP_CONSTEXPR_SINCE_CXX26
-__tree<_Tp, _Compare, _Allocator>::__equal_range_unique(const _Key& __k) {
+    pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, typename __tree<_Tp, _Compare, _Allocator>::iterator>
+    __tree<_Tp, _Compare, _Allocator>::__equal_range_unique(const _Key& __k) {
   using _Pp                   = pair<iterator, iterator>;
   __end_node_pointer __result = __end_node();
   __node_pointer __rt         = __root();
 @@ -2247,22 +2352,23 @@ __tree<_Tp, _Compare, _Allocator>::__equal_range_unique(const _Key& __k) {
   while (__rt != nullptr) {
     auto __comp_res = __comp(__k, __rt->__get_value());
     if (__comp_res.__less()) {
-      __result = static_cast<__end_node_pointer>(__rt);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__rt);
-      __rt     = static_cast<__node_pointer>(__rt->__left_);
+      __rt     = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_);
     } else if (__comp_res.__greater())
-      __rt = static_cast<__node_pointer>(__rt->__right_);
+      __rt = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_);
     else
       return _Pp(iterator(__rt),
-                 iterator(__rt->__right_ != nullptr ? static_cast<__end_node_pointer>(std::__tree_min(__rt->__right_))
+                 iterator(__rt->__right_ != nullptr
-                                                    : __result));
+                              ? std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_min(__rt->__right_))
+                              : __result));
   }
   return _Pp(iterator(__result), iterator(__result));
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::const_iterator,
+_LIBCPP_CONSTEXPR_SINCE_CXX26 pair<typename __tree<_Tp, _Compare, _Allocator>::const_iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::const_iterator>
+                                   typename __tree<_Tp, _Compare, _Allocator>::const_iterator>
 __tree<_Tp, _Compare, _Allocator>::__equal_range_unique(const _Key& __k) const {
   using _Pp                   = pair<const_iterator, const_iterator>;
   __end_node_pointer __result = __end_node();
 @@ -2271,23 +2377,25 @@ __tree<_Tp, _Compare, _Allocator>::__equal_range_unique(const _Key& __k) const {
   while (__rt != nullptr) {
     auto __comp_res = __comp(__k, __rt->__get_value());
     if (__comp_res.__less()) {
-      __result = static_cast<__end_node_pointer>(__rt);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__rt);
-      __rt     = static_cast<__node_pointer>(__rt->__left_);
+      __rt     = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_);
     } else if (__comp_res.__greater())
-      __rt = static_cast<__node_pointer>(__rt->__right_);
+      __rt = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_);
     else
       return _Pp(
           const_iterator(__rt),
-          const_iterator(
+          const_iterator(__rt->__right_ != nullptr
-              __rt->__right_ != nullptr ? static_cast<__end_node_pointer>(std::__tree_min(__rt->__right_)) : __result));
+                             ? std::__static_fancy_pointer_cast<__end_node_pointer>(std::__tree_min(__rt->__right_))
+                             : __result));
   }
   return _Pp(const_iterator(__result), const_iterator(__result));
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, typename __tree<_Tp, _Compare, _Allocator>::iterator>
+_LIBCPP_CONSTEXPR_SINCE_CXX26
-__tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k) {
+    pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, typename __tree<_Tp, _Compare, _Allocator>::iterator>
+    __tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k) {
   using _Pp                   = pair<iterator, iterator>;
   __end_node_pointer __result = __end_node();
   __node_pointer __rt         = __root();
 @@ -2295,22 +2403,23 @@ __tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k) {
   while (__rt != nullptr) {
     auto __comp_res = __comp(__k, __rt->__get_value());
     if (__comp_res.__less()) {
-      __result = static_cast<__end_node_pointer>(__rt);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__rt);
-      __rt     = static_cast<__node_pointer>(__rt->__left_);
+      __rt     = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_);
     } else if (__comp_res.__greater())
-      __rt = static_cast<__node_pointer>(__rt->__right_);
+      __rt = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_);
     else
-      return _Pp(
+      return _Pp(__lower_bound_multi(__k,
-          __lower_bound_multi(__k, static_cast<__node_pointer>(__rt->__left_), static_cast<__end_node_pointer>(__rt)),
+                                     std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_),
-          __upper_bound_multi(__k, static_cast<__node_pointer>(__rt->__right_), __result));
+                                     std::__static_fancy_pointer_cast<__end_node_pointer>(__rt)),
+                 __upper_bound_multi(__k, std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_), __result));
   }
   return _Pp(iterator(__result), iterator(__result));
 }
 template <class _Tp, class _Compare, class _Allocator>
 template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::const_iterator,
+_LIBCPP_CONSTEXPR_SINCE_CXX26 pair<typename __tree<_Tp, _Compare, _Allocator>::const_iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::const_iterator>
+                                   typename __tree<_Tp, _Compare, _Allocator>::const_iterator>
 __tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k) const {
   using _Pp                   = pair<const_iterator, const_iterator>;
   __end_node_pointer __result = __end_node();
 @@ -2319,35 +2428,37 @@ __tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k) const {
   while (__rt != nullptr) {
     auto __comp_res = __comp(__k, __rt->__get_value());
     if (__comp_res.__less()) {
-      __result = static_cast<__end_node_pointer>(__rt);
+      __result = std::__static_fancy_pointer_cast<__end_node_pointer>(__rt);
-      __rt     = static_cast<__node_pointer>(__rt->__left_);
+      __rt     = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_);
     } else if (__comp_res.__greater())
-      __rt = static_cast<__node_pointer>(__rt->__right_);
+      __rt = std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_);
     else
-      return _Pp(
+      return _Pp(__lower_bound_multi(__k,
-          __lower_bound_multi(__k, static_cast<__node_pointer>(__rt->__left_), static_cast<__end_node_pointer>(__rt)),
+                                     std::__static_fancy_pointer_cast<__node_pointer>(__rt->__left_),
-          __upper_bound_multi(__k, static_cast<__node_pointer>(__rt->__right_), __result));
+                                     std::__static_fancy_pointer_cast<__end_node_pointer>(__rt)),
+                 __upper_bound_multi(__k, std::__static_fancy_pointer_cast<__node_pointer>(__rt->__right_), __result));
   }
   return _Pp(const_iterator(__result), const_iterator(__result));
 }
 template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_holder
+_LIBCPP_CONSTEXPR_SINCE_CXX26 typename __tree<_Tp, _Compare, _Allocator>::__node_holder
 __tree<_Tp, _Compare, _Allocator>::remove(const_iterator __p) _NOEXCEPT {
   __node_pointer __np = __p.__get_np();
   if (__begin_node_ == __p.__ptr_) {
     if (__np->__right_ != nullptr)
-      __begin_node_ = static_cast<__end_node_pointer>(__np->__right_);
+      __begin_node_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__np->__right_);
     else
-      __begin_node_ = static_cast<__end_node_pointer>(__np->__parent_);
+      __begin_node_ = std::__static_fancy_pointer_cast<__end_node_pointer>(__np->__parent_);
   }
   --__size_;
-  std::__tree_remove(__end_node()->__left_, static_cast<__node_base_pointer>(__np));
+  std::__tree_remove(__end_node()->__left_, std::__static_fancy_pointer_cast<__node_base_pointer>(__np));
   return __node_holder(__np, _Dp(__node_alloc(), true));
 }
 template <class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI void swap(__tree<_Tp, _Compare, _Allocator>& __x, __tree<_Tp, _Compare, _Allocator>& __y)
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+swap(__tree<_Tp, _Compare, _Allocator>& __x, __tree<_Tp, _Compare, _Allocator>& __y)
     _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {
   __x.swap(__y);
 }

lib/libcxx/include/__tuple/make_tuple_types.h deleted-80

...	@@ -1,80 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H
10	#define _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H
11
12	#include <__config>
13	#include <__cstddef/size_t.h>
14	#include <__fwd/array.h>
15	#include <__fwd/tuple.h>
16	#include <__tuple/tuple_element.h>
17	#include <__tuple/tuple_indices.h>
18	#include <__tuple/tuple_size.h>
19	#include <__tuple/tuple_types.h>
20	#include <__type_traits/copy_cvref.h>
21	#include <__type_traits/remove_cvref.h>
22	#include <__type_traits/remove_reference.h>
23
24	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
25	# pragma GCC system_header
26	#endif
27
28	#ifndef _LIBCPP_CXX03_LANG
29
30	_LIBCPP_BEGIN_NAMESPACE_STD
31
32	// __make_tuple_types<_Tuple<_Types...>, _Ep, _Sp>::type is a
33	// __tuple_types<_Types...> using only those _Types in the range [_Sp, _Ep).
34	// _Sp defaults to 0 and _Ep defaults to tuple_size<_Tuple>. If _Tuple is a
35	// lvalue_reference type, then __tuple_types<_Types&...> is the result.
36
37	template <class _TupleTypes, class _TupleIndices>
38	struct __make_tuple_types_flat;
39
40	template <template <class...> class _Tuple, class... _Types, size_t... _Idx>
41	struct __make_tuple_types_flat<_Tuple<_Types...>, __tuple_indices<_Idx...>> {
42	// Specialization for pair, tuple, and __tuple_types
43	template <class _Tp>
44	using __apply_quals _LIBCPP_NODEBUG = __tuple_types<__copy_cvref_t<_Tp, __type_pack_element<_Idx, _Types...>>...>;
45	};
46
47	template <class _Vt, size_t _Np, size_t... _Idx>
48	struct __make_tuple_types_flat<array<_Vt, _Np>, __tuple_indices<_Idx...>> {
49	template <size_t>
50	using __value_type _LIBCPP_NODEBUG = _Vt;
51	template <class _Tp>
52	using __apply_quals _LIBCPP_NODEBUG = __tuple_types<__copy_cvref_t<_Tp, __value_type<_Idx>>...>;
53	};
54
55	template <class _Tp,
56	size_t _Ep = tuple_size<__libcpp_remove_reference_t<_Tp> >::value,
57	size_t _Sp = 0,
58	bool _SameSize = (_Ep == tuple_size<__libcpp_remove_reference_t<_Tp> >::value)>
59	struct __make_tuple_types {
60	static_assert(_Sp <= _Ep, "__make_tuple_types input error");
61	using _RawTp _LIBCPP_NODEBUG = __remove_cvref_t<_Tp>;
62	using _Maker _LIBCPP_NODEBUG = __make_tuple_types_flat<_RawTp, typename __make_tuple_indices<_Ep, _Sp>::type>;
63	using type _LIBCPP_NODEBUG = typename _Maker::template __apply_quals<_Tp>;
64	};
65
66	template <class... _Types, size_t _Ep>
67	struct __make_tuple_types<tuple<_Types...>, _Ep, 0, true> {
68	using type _LIBCPP_NODEBUG = __tuple_types<_Types...>;
69	};
70
71	template <class... _Types, size_t _Ep>
72	struct __make_tuple_types<__tuple_types<_Types...>, _Ep, 0, true> {
73	using type _LIBCPP_NODEBUG = __tuple_types<_Types...>;
74	};
75
76	_LIBCPP_END_NAMESPACE_STD
77
78	#endif // _LIBCPP_CXX03_LANG
79
80	#endif // _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H

lib/libcxx/include/__tuple/sfinae_helpers.h+6-5

 @@ -15,10 +15,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #ifndef _LIBCPP_CXX03_LANG
+_LIBCPP_BEGIN_NAMESPACE_STD
 struct __check_tuple_constructor_fail {
   static _LIBCPP_HIDE_FROM_ABI constexpr bool __enable_explicit_default() { return false; }
   static _LIBCPP_HIDE_FROM_ABI constexpr bool __enable_implicit_default() { return false; }
 @@ -35,9 +35,8 @@ struct __check_tuple_constructor_fail {
     return false;
   }
 };
-#endif // !defined(_LIBCPP_CXX03_LANG)
-#if _LIBCPP_STD_VER >= 17
+#  if _LIBCPP_STD_VER >= 17
 template <bool _CanCopy, bool _CanMove>
 struct __sfinae_ctor_base {};
 @@ -92,8 +91,10 @@ struct __sfinae_assign_base<false, true> {
   __sfinae_assign_base& operator=(__sfinae_assign_base const&) = delete;
   __sfinae_assign_base& operator=(__sfinae_assign_base&&)      = default;
 };
-#endif // _LIBCPP_STD_VER >= 17
+#  endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // !defined(_LIBCPP_CXX03_LANG)
 #endif // _LIBCPP___TUPLE_SFINAE_HELPERS_H

lib/libcxx/include/__tuple/tuple_indices.h deleted-37

...	@@ -1,37 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H
10	#define _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H
11
12	#include <__config>
13	#include <__cstddef/size_t.h>
14	#include <__utility/integer_sequence.h>
15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header
18	#endif
19
20	#ifndef _LIBCPP_CXX03_LANG
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	template <size_t...>
25	struct __tuple_indices {};
26
27	template <size_t _Ep, size_t _Sp = 0>
28	struct __make_tuple_indices {
29	static_assert(_Sp <= _Ep, "__make_tuple_indices input error");
30	typedef __make_indices_imp<_Ep, _Sp> type;
31	};
32
33	_LIBCPP_END_NAMESPACE_STD
34
35	#endif // _LIBCPP_CXX03_LANG
36
37	#endif // _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H

lib/libcxx/include/__tuple/tuple_like.h+4-4

 @@ -19,10 +19,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 inline constexpr bool __is_ranges_subrange_v = false;
 @@ -35,8 +35,8 @@ concept __tuple_like = __tuple_like_no_subrange<_Tp> || __is_ranges_subrange_v<r
 // As of writing this comment every use of `pair-like` in the standard excludes `ranges::subrange`, so
 // you most likely want to use `__pair_like_no_subrange` if you're looking for `pair-like`.
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___TUPLE_TUPLE_LIKE_H

lib/libcxx/include/__tuple/tuple_like_ext.h deleted-52

...	@@ -1,52 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H
10	#define _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H
11
12	#include <__config>
13	#include <__cstddef/size_t.h>
14	#include <__fwd/array.h>
15	#include <__fwd/pair.h>
16	#include <__fwd/tuple.h>
17	#include <__tuple/tuple_types.h>
18	#include <__type_traits/integral_constant.h>
19
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header
22	#endif
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	template <class _Tp>
27	struct __tuple_like_ext : false_type {};
28
29	template <class _Tp>
30	struct __tuple_like_ext<const _Tp> : public __tuple_like_ext<_Tp> {};
31	template <class _Tp>
32	struct __tuple_like_ext<volatile _Tp> : public __tuple_like_ext<_Tp> {};
33	template <class _Tp>
34	struct __tuple_like_ext<const volatile _Tp> : public __tuple_like_ext<_Tp> {};
35
36	#ifndef _LIBCPP_CXX03_LANG
37	template <class... _Tp>
38	struct __tuple_like_ext<tuple<_Tp...> > : true_type {};
39	#endif
40
41	template <class _T1, class _T2>
42	struct __tuple_like_ext<pair<_T1, _T2> > : true_type {};
43
44	template <class _Tp, size_t _Size>
45	struct __tuple_like_ext<array<_Tp, _Size> > : true_type {};
46
47	template <class... _Tp>
48	struct __tuple_like_ext<__tuple_types<_Tp...> > : true_type {};
49
50	_LIBCPP_END_NAMESPACE_STD
51
52	#endif // _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H

lib/libcxx/include/__tuple/tuple_like_no_subrange.h+4-4

 @@ -22,10 +22,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 inline constexpr bool __tuple_like_no_subrange_impl = false;
 @@ -54,8 +54,8 @@ concept __tuple_like_no_subrange = __tuple_like_no_subrange_impl<remove_cvref_t<
 template <class _Tp>
 concept __pair_like_no_subrange = __tuple_like_no_subrange<_Tp> && tuple_size<remove_cvref_t<_Tp>>::value == 2;
-#endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___TUPLE_TUPLE_LIKE_NO_SUBRANGE_H

lib/libcxx/include/__tuple/tuple_types.h deleted-25

...	@@ -1,25 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TUPLE_TUPLE_TYPES_H
10	#define _LIBCPP___TUPLE_TUPLE_TYPES_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	template <class... _Tp>
21	struct __tuple_types {};
22
23	_LIBCPP_END_NAMESPACE_STD
24
25	#endif // _LIBCPP___TUPLE_TUPLE_TYPES_H

lib/libcxx/include/__type_traits/add_pointer.h+3-28

...	@@ -10,9 +10,6 @@	...	@@ -10,9 +10,6 @@
10	#define _LIBCPP___TYPE_TRAITS_ADD_POINTER_H	10	#define _LIBCPP___TYPE_TRAITS_ADD_POINTER_H
11		11
12	#include <__config>	12	#include <__config>
13	#include <__type_traits/is_referenceable.h>
14	#include <__type_traits/is_void.h>
15	#include <__type_traits/remove_reference.h>
16		13
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header	15	# pragma GCC system_header
...	@@ -20,40 +17,18 @@	...	@@ -20,40 +17,18 @@
20		17
21	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
22		19
23	#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS)
24
25	template <class _Tp>	20	template <class _Tp>
26	struct _LIBCPP_NO_SPECIALIZATIONS add_pointer {	21	struct _LIBCPP_NO_SPECIALIZATIONS add_pointer {
27	using type _LIBCPP_NODEBUG = __add_pointer(_Tp);	22	using type _LIBCPP_NODEBUG = __add_pointer(_Tp);
28	};	23	};
29		24
30	# ifdef _LIBCPP_COMPILER_GCC	25	#ifdef _LIBCPP_COMPILER_GCC
31	template <class _Tp>	26	template <class _Tp>
32	using __add_pointer_t _LIBCPP_NODEBUG = typename add_pointer<_Tp>::type;	27	using __add_pointer_t _LIBCPP_NODEBUG = typename add_pointer<_Tp>::type;
33	# else
34	template <class _Tp>
35	using __add_pointer_t _LIBCPP_NODEBUG = __add_pointer(_Tp);
36	# endif
37
38	#else	28	#else
39	template <class _Tp, bool = __is_referenceable_v<_Tp> \|\| is_void<_Tp>::value>
40	struct __add_pointer_impl {
41	using type _LIBCPP_NODEBUG = __libcpp_remove_reference_t<_Tp>*;
42	};
43	template <class _Tp>
44	struct __add_pointer_impl<_Tp, false> {
45	using type _LIBCPP_NODEBUG = _Tp;
46	};
47
48	template <class _Tp>	29	template <class _Tp>
49	using __add_pointer_t = typename __add_pointer_impl<_Tp>::type;	30	using __add_pointer_t _LIBCPP_NODEBUG = __add_pointer(_Tp);
50		31	#endif
51	template <class _Tp>
52	struct _LIBCPP_NO_SPECIALIZATIONS add_pointer {
53	using type _LIBCPP_NODEBUG = __add_pointer_t<_Tp>;
54	};
55
56	#endif // !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS)
57		32
58	#if _LIBCPP_STD_VER >= 14	33	#if _LIBCPP_STD_VER >= 14
59	template <class _Tp>	34	template <class _Tp>

lib/libcxx/include/__type_traits/aligned_union.h+10-13

...	@@ -19,25 +19,22 @@	...	@@ -19,25 +19,22 @@
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	template <size_t _I0, size_t... _In>	22	template <class _Arg0, class... _Args>
23	struct __static_max;	23	union __union {
24		24	_ALIGNAS(_LIBCPP_PREFERRED_ALIGNOF(_Arg0)) _Arg0 __arg;
25	template <size_t _I0>	25	__union<_Args...> __u;
26	struct __static_max<_I0> {
27	static const size_t value = _I0;
28	};	26	};
29		27
30	template <size_t _I0, size_t _I1, size_t... _In>	28	template <class _Arg>
31	struct __static_max<_I0, _I1, _In...> {	29	union __union<_Arg> {
32	static const size_t value = _I0 >= _I1 ? __static_max<_I0, _In...>::value : __static_max<_I1, _In...>::value;	30	_ALIGNAS(_LIBCPP_PREFERRED_ALIGNOF(_Arg)) _Arg __arg;
33	};	31	};
34		32
35	template <size_t _Len, class _Type0, class... _Types>	33	template <size_t _Len, class _Type0, class... _Types>
36	struct _LIBCPP_DEPRECATED_IN_CXX23 _LIBCPP_NO_SPECIALIZATIONS aligned_union {	34	struct _LIBCPP_DEPRECATED_IN_CXX23 _LIBCPP_NO_SPECIALIZATIONS aligned_union {
37	static const size_t alignment_value =	35	using _Union _LIBCPP_NODEBUG = __union<char[_Len], _Type0, _Types...>;
38	__static_max<_LIBCPP_PREFERRED_ALIGNOF(_Type0), _LIBCPP_PREFERRED_ALIGNOF(_Types)...>::value;	36	static const size_t alignment_value = _LIBCPP_ALIGNOF(_Union);
39	static const size_t __len = __static_max<_Len, sizeof(_Type0), sizeof(_Types)...>::value;	37	using type _LIBCPP_NODEBUG = typename aligned_storage<sizeof(_Union), alignment_value>::type;
40	typedef typename aligned_storage<__len, alignment_value>::type type;
41	};	38	};
42		39
43	#if _LIBCPP_STD_VER >= 14	40	#if _LIBCPP_STD_VER >= 14

lib/libcxx/include/__type_traits/can_extract_key.h deleted-53

...	@@ -1,53 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H
10	#define _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H
11
12	#include <__config>
13	#include <__fwd/pair.h>
14	#include <__type_traits/conditional.h>
15	#include <__type_traits/integral_constant.h>
16	#include <__type_traits/is_same.h>
17	#include <__type_traits/remove_const.h>
18	#include <__type_traits/remove_const_ref.h>
19
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header
22	#endif
23
24	_LIBCPP_BEGIN_NAMESPACE_STD
25
26	// These traits are used in __tree and __hash_table
27	struct __extract_key_fail_tag {};
28	struct __extract_key_self_tag {};
29	struct __extract_key_first_tag {};
30
31	template <class _ValTy, class _Key, class _RawValTy = __remove_const_ref_t<_ValTy> >
32	struct __can_extract_key
33	: __conditional_t<_IsSame<_RawValTy, _Key>::value, __extract_key_self_tag, __extract_key_fail_tag> {};
34
35	template <class _Pair, class _Key, class _First, class _Second>
36	struct __can_extract_key<_Pair, _Key, pair<_First, _Second> >
37	: __conditional_t<_IsSame<__remove_const_t<_First>, _Key>::value, __extract_key_first_tag, __extract_key_fail_tag> {
38	};
39
40	// __can_extract_map_key uses true_type/false_type instead of the tags.
41	// It returns true if _Key != _ContainerValueTy (the container is a map not a set)
42	// and _ValTy == _Key.
43	template <class _ValTy, class _Key, class _ContainerValueTy, class _RawValTy = __remove_const_ref_t<_ValTy> >
44	struct __can_extract_map_key : integral_constant<bool, _IsSame<_RawValTy, _Key>::value> {};
45
46	// This specialization returns __extract_key_fail_tag for non-map containers
47	// because _Key == _ContainerValueTy
48	template <class _ValTy, class _Key, class _RawValTy>
49	struct __can_extract_map_key<_ValTy, _Key, _Key, _RawValTy> : false_type {};
50
51	_LIBCPP_END_NAMESPACE_STD
52
53	#endif // _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H

lib/libcxx/include/__type_traits/common_reference.h+5-3

...	@@ -24,10 +24,12 @@	...	@@ -24,10 +24,12 @@
24	# pragma GCC system_header	24	# pragma GCC system_header
25	#endif	25	#endif
26		26
		27	#if _LIBCPP_STD_VER >= 20
		28
27	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
28		30
29	// common_reference	31	// common_reference
30	#if _LIBCPP_STD_VER >= 20	32
31	// Let COND_RES(X, Y) be:	33	// Let COND_RES(X, Y) be:
32	template <class _Xp, class _Yp>	34	template <class _Xp, class _Yp>
33	using __cond_res _LIBCPP_NODEBUG = decltype(false ? std::declval<_Xp (&)()>()() : std::declval<_Yp (&)()>()());	35	using __cond_res _LIBCPP_NODEBUG = decltype(false ? std::declval<_Xp (&)()>()() : std::declval<_Yp (&)()>()());
...	@@ -195,8 +197,8 @@ _LIBCPP_DIAGNOSTIC_POP	...	@@ -195,8 +197,8 @@ _LIBCPP_DIAGNOSTIC_POP
195	template <class...>	197	template <class...>
196	struct _LIBCPP_NO_SPECIALIZATIONS common_reference {};	198	struct _LIBCPP_NO_SPECIALIZATIONS common_reference {};
197		199
198	#endif // _LIBCPP_STD_VER >= 20
199
200	_LIBCPP_END_NAMESPACE_STD	200	_LIBCPP_END_NAMESPACE_STD
201		201
		202	#endif // _LIBCPP_STD_VER >= 20
		203
202	#endif // _LIBCPP___TYPE_TRAITS_COMMON_REFERENCE_H	204	#endif // _LIBCPP___TYPE_TRAITS_COMMON_REFERENCE_H

lib/libcxx/include/__type_traits/conditional.h+2-12

...	@@ -35,20 +35,10 @@ struct _IfImpl<false> {	...	@@ -35,20 +35,10 @@ struct _IfImpl<false> {
35	template <bool _Cond, class _IfRes, class _ElseRes>	35	template <bool _Cond, class _IfRes, class _ElseRes>
36	using _If _LIBCPP_NODEBUG = typename _IfImpl<_Cond>::template _Select<_IfRes, _ElseRes>;	36	using _If _LIBCPP_NODEBUG = typename _IfImpl<_Cond>::template _Select<_IfRes, _ElseRes>;
37		37
38	template <bool _Bp, class _If, class _Then>	38	template <bool _Bp, class _IfRes, class _ElseRes>
39	struct _LIBCPP_NO_SPECIALIZATIONS conditional {	39	struct _LIBCPP_NO_SPECIALIZATIONS conditional {
40	using type _LIBCPP_NODEBUG = _If;	40	using type _LIBCPP_NODEBUG = _If<_Bp, _IfRes, _ElseRes>;
41	};
42
43	_LIBCPP_DIAGNOSTIC_PUSH
44	#if __has_warning("-Winvalid-specialization")
45	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Winvalid-specialization")
46	#endif
47	template <class _If, class _Then>
48	struct conditional<false, _If, _Then> {
49	using type _LIBCPP_NODEBUG = _Then;
50	};	41	};
51	_LIBCPP_DIAGNOSTIC_POP
52		42
53	#if _LIBCPP_STD_VER >= 14	43	#if _LIBCPP_STD_VER >= 14
54	template <bool _Bp, class _IfRes, class _ElseRes>	44	template <bool _Bp, class _IfRes, class _ElseRes>

lib/libcxx/include/__type_traits/conjunction.h+1-1

...	@@ -34,7 +34,7 @@ false_type __and_helper(...);	...	@@ -34,7 +34,7 @@ false_type __and_helper(...);
34	//	34	//
35	// However, `_And<_Pred...>` itself will evaluate its result immediately (without having to	35	// However, `_And<_Pred...>` itself will evaluate its result immediately (without having to
36	// be instantiated) since it is an alias, unlike `conjunction<_Pred...>`, which is a struct.	36	// be instantiated) since it is an alias, unlike `conjunction<_Pred...>`, which is a struct.
37	// If you want to defer the evaluation of `_And<_Pred...>` itself, use `_Lazy<_And, _Pred...>`.	37	// If you want to defer the evaluation, use `conjunction{,_v}<_Pred...>`.
38	template <class... _Pred>	38	template <class... _Pred>
39	using _And _LIBCPP_NODEBUG = decltype(std::__and_helper<_Pred...>(0));	39	using _And _LIBCPP_NODEBUG = decltype(std::__and_helper<_Pred...>(0));
40		40

lib/libcxx/include/__type_traits/dependent_type.h deleted-25

...	@@ -1,25 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H
10	#define _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	template <class _Tp, bool>
21	struct __dependent_type : public _Tp {};
22
23	_LIBCPP_END_NAMESPACE_STD
24
25	#endif // _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H

lib/libcxx/include/__type_traits/disjunction.h+1-2

...	@@ -38,8 +38,7 @@ struct _OrImpl<false> {	...	@@ -38,8 +38,7 @@ struct _OrImpl<false> {
38	//	38	//
39	// However, `_Or<_Pred...>` itself will evaluate its result immediately (without having to	39	// However, `_Or<_Pred...>` itself will evaluate its result immediately (without having to
40	// be instantiated) since it is an alias, unlike `disjunction<_Pred...>`, which is a struct.	40	// be instantiated) since it is an alias, unlike `disjunction<_Pred...>`, which is a struct.
41	// If you want to defer the evaluation of `_Or<_Pred...>` itself, use `_Lazy<_Or, _Pred...>`	41	// If you want to defer the evaluation , use `disjunction{,_v}<_Pred...>`.
42	// or `disjunction<_Pred...>` directly.
43	template <class... _Args>	42	template <class... _Args>
44	using _Or _LIBCPP_NODEBUG = typename _OrImpl<sizeof...(_Args) != 0>::template _Result<false_type, _Args...>;	43	using _Or _LIBCPP_NODEBUG = typename _OrImpl<sizeof...(_Args) != 0>::template _Result<false_type, _Args...>;
45		44

lib/libcxx/include/__type_traits/has_unique_object_representation.h+4-4

 @@ -16,10 +16,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 struct _LIBCPP_NO_SPECIALIZATIONS has_unique_object_representations
     : integral_constant<bool, __has_unique_object_representations(_Tp)> {};
 @@ -28,8 +28,8 @@ template <class _Tp>
 _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool has_unique_object_representations_v =
     __has_unique_object_representations(_Tp);
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H

lib/libcxx/include/__type_traits/integer_traits.h+26-29

...	@@ -10,6 +10,11 @@	...	@@ -10,6 +10,11 @@
10	#define _LIBCPP___TYPE_TRAITS_INTEGER_TRAITS_H	10	#define _LIBCPP___TYPE_TRAITS_INTEGER_TRAITS_H
11		11
12	#include <__config>	12	#include <__config>
		13	#include <__type_traits/is_integral.h>
		14	#include <__type_traits/is_same.h>
		15	#include <__type_traits/is_signed.h>
		16	#include <__type_traits/is_unqualified.h>
		17	#include <__type_traits/is_unsigned.h>
13		18
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	19	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header	20	# pragma GCC system_header
...	@@ -17,43 +22,35 @@	...	@@ -17,43 +22,35 @@
17		22
18	_LIBCPP_BEGIN_NAMESPACE_STD	23	_LIBCPP_BEGIN_NAMESPACE_STD
19		24
20	// This trait is to determine whether a type is a /signed integer type/	25	// /signed integer type/ and /unsigned integer type/ per [basic.fundamental]
21	// See [basic.fundamental]/p1	26	// /p1-2: specific unqualified types plus extended integer types. bool and
		27	// character types are integral but excluded. cv-qualified versions are
		28	// distinct types ([basic.type.qualifier]) and so excluded.
		29
22	template <class _Tp>	30	template <class _Tp>
23	inline const bool __is_signed_integer_v = false;	31	inline const bool __is_character_v = false;
24	template <>
25	inline const bool __is_signed_integer_v<signed char> = true;
26	template <>	32	template <>
27	inline const bool __is_signed_integer_v<signed short> = true;	33	inline const bool __is_character_v<char> = true;
28	template <>	34	template <>
29	inline const bool __is_signed_integer_v<signed int> = true;	35	inline const bool __is_character_v<wchar_t> = true;
		36	#if _LIBCPP_HAS_CHAR8_T
30	template <>	37	template <>
31	inline const bool __is_signed_integer_v<signed long> = true;	38	inline const bool __is_character_v<char8_t> = true;
		39	#endif
32	template <>	40	template <>
33	inline const bool __is_signed_integer_v<signed long long> = true;	41	inline const bool __is_character_v<char16_t> = true;
34	#if _LIBCPP_HAS_INT128
35	template <>	42	template <>
36	inline const bool __is_signed_integer_v<__int128_t> = true;	43	inline const bool __is_character_v<char32_t> = true;
37	#endif
38		44
39	// This trait is to determine whether a type is an /unsigned integer type/
40	// See [basic.fundamental]/p2
41	template <class _Tp>	45	template <class _Tp>
42	inline const bool __is_unsigned_integer_v = false;	46	inline const bool __is_signed_integer_v =
43	template <>	47	is_integral<_Tp>::value && is_signed<_Tp>::value && !__is_character_v<_Tp> && !is_same<_Tp, bool>::value &&
44	inline const bool __is_unsigned_integer_v<unsigned char> = true;	48	__is_unqualified_v<_Tp>;
45	template <>	49
46	inline const bool __is_unsigned_integer_v<unsigned short> = true;	50	template <class _Tp>
47	template <>	51	inline const bool __is_unsigned_integer_v =
48	inline const bool __is_unsigned_integer_v<unsigned int> = true;	52	is_integral<_Tp>::value && is_unsigned<_Tp>::value && !__is_character_v<_Tp> && !is_same<_Tp, bool>::value &&
49	template <>	53	__is_unqualified_v<_Tp>;
50	inline const bool __is_unsigned_integer_v<unsigned long> = true;
51	template <>
52	inline const bool __is_unsigned_integer_v<unsigned long long> = true;
53	#if _LIBCPP_HAS_INT128
54	template <>
55	inline const bool __is_unsigned_integer_v<__uint128_t> = true;
56	#endif
57		54
58	#if _LIBCPP_STD_VER >= 20	55	#if _LIBCPP_STD_VER >= 20
59	template <class _Tp>	56	template <class _Tp>

lib/libcxx/include/__type_traits/integral_constant.h+1-1

...	@@ -24,7 +24,7 @@ struct _LIBCPP_NO_SPECIALIZATIONS integral_constant {	...	@@ -24,7 +24,7 @@ struct _LIBCPP_NO_SPECIALIZATIONS integral_constant {
24	typedef integral_constant type;	24	typedef integral_constant type;
25	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR operator value_type() const _NOEXCEPT { return value; }	25	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR operator value_type() const _NOEXCEPT { return value; }
26	#if _LIBCPP_STD_VER >= 14	26	#if _LIBCPP_STD_VER >= 14
27	_LIBCPP_HIDE_FROM_ABI constexpr value_type operator()() const _NOEXCEPT { return value; }	27	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI constexpr value_type operator()() const _NOEXCEPT { return value; }
28	#endif	28	#endif
29	};	29	};
30		30

lib/libcxx/include/__type_traits/is_bounded_array.h deleted-36

...	@@ -1,36 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
10	#define _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
11
12	#include <__config>
13	#include <__type_traits/integral_constant.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	template <class _Tp>
22	inline const bool __is_bounded_array_v = __is_bounded_array(_Tp);
23
24	#if _LIBCPP_STD_VER >= 20
25
26	template <class _Tp>
27	struct _LIBCPP_NO_SPECIALIZATIONS is_bounded_array : bool_constant<__is_bounded_array(_Tp)> {};
28
29	template <class _Tp>
30	_LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_bounded_array_v = __is_bounded_array(_Tp);
31
32	#endif
33
34	_LIBCPP_END_NAMESPACE_STD
35
36	#endif // _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H

lib/libcxx/include/__type_traits/is_constant_evaluated.h+1-1

...	@@ -18,7 +18,7 @@	...	@@ -18,7 +18,7 @@
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	#if _LIBCPP_STD_VER >= 20	20	#if _LIBCPP_STD_VER >= 20
21	_LIBCPP_HIDE_FROM_ABI inline constexpr bool is_constant_evaluated() noexcept {	21	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool is_constant_evaluated() noexcept {
22	return __builtin_is_constant_evaluated();	22	return __builtin_is_constant_evaluated();
23	}	23	}
24	#endif	24	#endif

lib/libcxx/include/__type_traits/is_implicit_lifetime.h+4-2

 @@ -16,9 +16,10 @@
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_STD_VER >= 23
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 23
 #  if __has_builtin(__builtin_is_implicit_lifetime)
 template <class _Tp>
 @@ -28,8 +29,9 @@ template <class _Tp>
 _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_implicit_lifetime_v = __builtin_is_implicit_lifetime(_Tp);
 #  endif
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___TYPE_TRAITS_IS_IMPLICIT_LIFETIME_H

lib/libcxx/include/__type_traits/is_implicitly_default_constructible.h+4-2

 @@ -17,9 +17,10 @@
 #  pragma GCC system_header
 #endif
+#ifndef _LIBCPP_CXX03_LANG
 _LIBCPP_BEGIN_NAMESPACE_STD
-#ifndef _LIBCPP_CXX03_LANG
 // First of all, we can't implement this check in C++03 mode because the {}
 // default initialization syntax isn't valid.
 // Second, we implement the trait in a funny manner with two defaulted template
 @@ -39,8 +40,9 @@ template <class _Tp>
 struct __is_implicitly_default_constructible<_Tp,
                                              decltype(std::__test_implicit_default_constructible<_Tp const&>({})),
                                              false_type> : false_type {};
-#endif // !C++03
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_CXX03_LANG
 #endif // _LIBCPP___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H

lib/libcxx/include/__type_traits/is_literal_type.h+4-2

 @@ -16,9 +16,10 @@
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
 template <class _Tp>
 struct _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_NO_SPECIALIZATIONS is_literal_type
     : integral_constant<bool, __is_literal_type(_Tp)> {};
 @@ -27,8 +28,9 @@ struct _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_NO_SPECIALIZATIONS is_literal_type
 template <class _Tp>
 _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_literal_type_v = __is_literal_type(_Tp);
 #  endif // _LIBCPP_STD_VER >= 17
-#endif   // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
 #endif // _LIBCPP___TYPE_TRAITS_IS_LITERAL_TYPE

lib/libcxx/include/__type_traits/is_primary_template.h deleted-32

...	@@ -1,32 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
10	#define _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
11
12	#include <__config>
13	#include <__type_traits/enable_if.h>
14	#include <__type_traits/is_same.h>
15	#include <__type_traits/is_valid_expansion.h>
16
17	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
18	# pragma GCC system_header
19	#endif
20
21	_LIBCPP_BEGIN_NAMESPACE_STD
22
23	template <class _Tp>
24	using __test_for_primary_template _LIBCPP_NODEBUG =
25	__enable_if_t<_IsSame<_Tp, typename _Tp::__primary_template>::value>;
26
27	template <class _Tp>
28	using __is_primary_template _LIBCPP_NODEBUG = _IsValidExpansion<__test_for_primary_template, _Tp>;
29
30	_LIBCPP_END_NAMESPACE_STD
31
32	#endif // _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H

lib/libcxx/include/__type_traits/is_referenceable.h deleted-34

...	@@ -1,34 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H
10	#define _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H
11
12	#include <__config>
13	#include <__type_traits/void_t.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	template <class _Tp, class = void>
22	inline const bool __is_referenceable_v = false;
23
24	template <class _Tp>
25	inline const bool __is_referenceable_v<_Tp, __void_t<_Tp&> > = true;
26
27	#if _LIBCPP_STD_VER >= 20
28	template <class _Tp>
29	concept __referenceable = __is_referenceable_v<_Tp>;
30	#endif
31
32	_LIBCPP_END_NAMESPACE_STD
33
34	#endif // _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H

lib/libcxx/include/__type_traits/is_replaceable.h deleted-61

...	@@ -1,61 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_REPLACEABLE_H
10	#define _LIBCPP___TYPE_TRAITS_IS_REPLACEABLE_H
11
12	#include <__config>
13	#include <__type_traits/enable_if.h>
14	#include <__type_traits/integral_constant.h>
15	#include <__type_traits/is_same.h>
16	#include <__type_traits/is_trivially_copyable.h>
17
18	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
19	# pragma GCC system_header
20	#endif
21
22	_LIBCPP_BEGIN_NAMESPACE_STD
23
24	// A type is replaceable if, with `x` and `y` being different objects, `x = std::move(y)` is equivalent to:
25	//
26	// std::destroy_at(&x)
27	// std::construct_at(&x, std::move(y))
28	//
29	// This allows turning a move-assignment into a sequence of destroy + move-construct, which
30	// is often more efficient. This is especially relevant when the move-construct is in fact
31	// part of a trivial relocation from somewhere else, in which case there is a huge win.
32	//
33	// Note that this requires language support in order to be really effective, but we
34	// currently emulate the base template with something very conservative.
35	template <class _Tp, class = void>
36	struct __is_replaceable : is_trivially_copyable<_Tp> {};
37
38	template <class _Tp>
39	struct __is_replaceable<_Tp, __enable_if_t<is_same<_Tp, typename _Tp::__replaceable>::value> > : true_type {};
40
41	template <class _Tp>
42	inline const bool __is_replaceable_v = __is_replaceable<_Tp>::value;
43
44	// Determines whether an allocator member of a container is replaceable.
45	//
46	// First, we require the allocator type to be considered replaceable. If not, then something fishy might be
47	// happening. Assuming the allocator type is replaceable, we conclude replaceability of the allocator as a
48	// member of the container if the allocator always compares equal (in which case propagation doesn't matter),
49	// or if the allocator always propagates on assignment, which is required in order for move construction and
50	// assignment to be equivalent.
51	template <class _AllocatorTraits>
52	struct __container_allocator_is_replaceable
53	: integral_constant<bool,
54	__is_replaceable_v<typename _AllocatorTraits::allocator_type> &&
55	(_AllocatorTraits::is_always_equal::value \|\|
56	(_AllocatorTraits::propagate_on_container_move_assignment::value &&
57	_AllocatorTraits::propagate_on_container_copy_assignment::value))> {};
58
59	_LIBCPP_END_NAMESPACE_STD
60
61	#endif // _LIBCPP___TYPE_TRAITS_IS_REPLACEABLE_H

lib/libcxx/include/__type_traits/is_trivially_relocatable.h+4

 @@ -34,10 +34,14 @@ template <class _Tp, class = void>
 struct __libcpp_is_trivially_relocatable : is_trivially_copyable<_Tp> {};
 #endif
+// __trivially_relocatable on libc++'s builtin types does not currently return the right answer with PFP
+// in tagged mode, in which the address of the pointer is used as part of the pointer encoding.
+#if !defined(__POINTER_FIELD_PROTECTION_TAGGED__)
 template <class _Tp>
 struct __libcpp_is_trivially_relocatable<_Tp,
                                          __enable_if_t<is_same<_Tp, typename _Tp::__trivially_relocatable>::value> >
     : true_type {};
+#endif
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/is_unbounded_array.h deleted-38

...	@@ -1,38 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
10	#define _LIBCPP___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
11
12	#include <__config>
13	#include <__type_traits/integral_constant.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	template <class>
22	inline const bool __is_unbounded_array_v = false;
23	template <class _Tp>
24	inline const bool __is_unbounded_array_v<_Tp[]> = true;
25
26	#if _LIBCPP_STD_VER >= 20
27
28	template <class _Tp>
29	struct _LIBCPP_NO_SPECIALIZATIONS is_unbounded_array : bool_constant<__is_unbounded_array_v<_Tp>> {};
30
31	template <class _Tp>
32	_LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_unbounded_array_v = __is_unbounded_array_v<_Tp>;
33
34	#endif
35
36	_LIBCPP_END_NAMESPACE_STD
37
38	#endif // _LIBCPP___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H

lib/libcxx/include/__type_traits/is_valid_expansion.h deleted-31

...	@@ -1,31 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_IS_VALID_EXPANSION_H
10	#define _LIBCPP___TYPE_TRAITS_IS_VALID_EXPANSION_H
11
12	#include <__config>
13	#include <__type_traits/integral_constant.h>
14
15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
16	# pragma GCC system_header
17	#endif
18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	template <template <class...> class _Templ, class... _Args, class = _Templ<_Args...> >
22	true_type __sfinae_test_impl(int);
23	template <template <class...> class, class...>
24	false_type __sfinae_test_impl(...);
25
26	template <template <class...> class _Templ, class... _Args>
27	using _IsValidExpansion _LIBCPP_NODEBUG = decltype(std::__sfinae_test_impl<_Templ, _Args...>(0));
28
29	_LIBCPP_END_NAMESPACE_STD
30
31	#endif // _LIBCPP___TYPE_TRAITS_IS_VALID_EXPANSION_H

lib/libcxx/include/__type_traits/is_within_lifetime.h+1-1

...	@@ -19,7 +19,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -19,7 +19,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
19		19
20	#if _LIBCPP_STD_VER >= 26 && __has_builtin(__builtin_is_within_lifetime)	20	#if _LIBCPP_STD_VER >= 26 && __has_builtin(__builtin_is_within_lifetime)
21	template <class _Tp>	21	template <class _Tp>
22	_LIBCPP_HIDE_FROM_ABI consteval bool is_within_lifetime(const _Tp* __p) noexcept {	22	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI consteval bool is_within_lifetime(const _Tp* __p) noexcept {
23	return __builtin_is_within_lifetime(__p);	23	return __builtin_is_within_lifetime(__p);
24	}	24	}
25	#endif	25	#endif

lib/libcxx/include/__type_traits/lazy.h deleted-25

...	@@ -1,25 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___TYPE_TRAITS_LAZY_H
10	#define _LIBCPP___TYPE_TRAITS_LAZY_H
11
12	#include <__config>
13
14	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
15	# pragma GCC system_header
16	#endif
17
18	_LIBCPP_BEGIN_NAMESPACE_STD
19
20	template <template <class...> class _Func, class... _Args>
21	struct _Lazy : _Func<_Args...> {};
22
23	_LIBCPP_END_NAMESPACE_STD
24
25	#endif // _LIBCPP___TYPE_TRAITS_LAZY_H

lib/libcxx/include/__type_traits/make_transparent.h+13-11

...	@@ -22,29 +22,31 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -22,29 +22,31 @@ _LIBCPP_BEGIN_NAMESPACE_STD
22		22
23	// __make_transparent tries to create a transparent comparator from its non-transparent counterpart, e.g. obtain	23	// __make_transparent tries to create a transparent comparator from its non-transparent counterpart, e.g. obtain
24	// `less<>` from `less<T>`. This is useful in cases where conversions can be avoided (e.g. a string literal to a	24	// `less<>` from `less<T>`. This is useful in cases where conversions can be avoided (e.g. a string literal to a
25	// std::string).	25	// std::string). This depends on the argument type provided to the comparator, because a comparator might be
		26	// transparent for some argument types but not for others.
26		27
27	template <class _Tp, class _Comparator>	28	template <class _ArgumentType, class _Comparator>
28	struct __make_transparent {	29	struct __make_transparent {
29	using type _LIBCPP_NODEBUG = _Comparator;	30	using type _LIBCPP_NODEBUG = _Comparator;
30	};	31	};
31		32
32	template <class _Tp, class _Comparator>	33	template <class _ArgumentType, class _Comparator>
33	using __make_transparent_t _LIBCPP_NODEBUG = typename __make_transparent<_Tp, _Comparator>::type;	34	using __make_transparent_t _LIBCPP_NODEBUG = typename __make_transparent<_ArgumentType, _Comparator>::type;
34		35
35	template <class _Tp,	36	template <class _ArgumentType,
36	class _Comparator,	37	class _Comparator,
37	__enable_if_t<is_same<_Comparator, __make_transparent_t<_Tp, _Comparator> >::value, int> = 0>	38	__enable_if_t<is_same<_Comparator, __make_transparent_t<_ArgumentType, _Comparator> >::value, int> = 0>
38	_LIBCPP_HIDE_FROM_ABI _Comparator& __as_transparent(_Comparator& __comp) {	39	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _Comparator& __as_transparent(_Comparator& __comp) {
39	return __comp;	40	return __comp;
40	}	41	}
41		42
42	template <class _Tp,	43	template <class _ArgumentType,
43	class _Comparator,	44	class _Comparator,
44	__enable_if_t<!is_same<_Comparator, __make_transparent_t<_Tp, _Comparator> >::value, int> = 0>	45	__enable_if_t<!is_same<_Comparator, __make_transparent_t<_ArgumentType, _Comparator> >::value, int> = 0>
45	_LIBCPP_HIDE_FROM_ABI __make_transparent_t<_Tp, _Comparator> __as_transparent(_Comparator&) {	46	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __make_transparent_t<_ArgumentType, _Comparator>
		47	__as_transparent(_Comparator&) {
46	static_assert(is_empty<_Comparator>::value);	48	static_assert(is_empty<_Comparator>::value);
47	return __make_transparent_t<_Tp, _Comparator>();	49	return __make_transparent_t<_ArgumentType, _Comparator>();
48	}	50	}
49		51
50	_LIBCPP_END_NAMESPACE_STD	52	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/rank.h+1-21

...	@@ -19,32 +19,12 @@	...	@@ -19,32 +19,12 @@
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
21		21
22	#if __has_builtin(__array_rank) && !defined(_LIBCPP_COMPILER_CLANG_BASED) \|\| \
23	(defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 2001)
24
25	template <class _Tp>	22	template <class _Tp>
26	struct _LIBCPP_NO_SPECIALIZATIONS rank : integral_constant<size_t, __array_rank(_Tp)> {};	23	struct _LIBCPP_NO_SPECIALIZATIONS rank : integral_constant<size_t, __array_rank(_Tp)> {};
27		24
28	#else
29
30	template <class _Tp>
31	struct _LIBCPP_NO_SPECIALIZATIONS rank : public integral_constant<size_t, 0> {};
32
33	_LIBCPP_DIAGNOSTIC_PUSH
34	# if __has_warning("-Winvalid-specialization")
35	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Winvalid-specialization")
36	# endif
37	template <class _Tp>
38	struct rank<_Tp[]> : public integral_constant<size_t, rank<_Tp>::value + 1> {};
39	template <class _Tp, size_t _Np>
40	struct rank<_Tp[_Np]> : public integral_constant<size_t, rank<_Tp>::value + 1> {};
41	_LIBCPP_DIAGNOSTIC_POP
42
43	#endif // __has_builtin(__array_rank)
44
45	#if _LIBCPP_STD_VER >= 17	25	#if _LIBCPP_STD_VER >= 17
46	template <class _Tp>	26	template <class _Tp>
47	_LIBCPP_NO_SPECIALIZATIONS inline constexpr size_t rank_v = rank<_Tp>::value;	27	_LIBCPP_NO_SPECIALIZATIONS inline constexpr size_t rank_v = __array_rank(_Tp);
48	#endif	28	#endif
49		29
50	_LIBCPP_END_NAMESPACE_STD	30	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__type_traits/reference_converts_from_temporary.h+4-4

 @@ -16,10 +16,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, class _Up>
 struct _LIBCPP_NO_SPECIALIZATIONS reference_converts_from_temporary
     : public bool_constant<__reference_converts_from_temporary(_Tp, _Up)> {};
 @@ -28,8 +28,8 @@ template <class _Tp, class _Up>
 _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool reference_converts_from_temporary_v =
     __reference_converts_from_temporary(_Tp, _Up);
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif //  _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___TYPE_TRAITS_REFERENCE_CONVERTS_FROM_TEMPORARY_H

lib/libcxx/include/__type_traits/remove_pointer.h+3-16

 @@ -17,31 +17,18 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__remove_pointer)
 template <class _Tp>
 struct _LIBCPP_NO_SPECIALIZATIONS remove_pointer {
   using type _LIBCPP_NODEBUG = __remove_pointer(_Tp);
 };
-#  ifdef _LIBCPP_COMPILER_GCC
+#ifdef _LIBCPP_COMPILER_GCC
 template <class _Tp>
 using __remove_pointer_t _LIBCPP_NODEBUG = typename remove_pointer<_Tp>::type;
-#  else
-template <class _Tp>
-using __remove_pointer_t _LIBCPP_NODEBUG = __remove_pointer(_Tp);
-#  endif
 #else
-// clang-format off
-template <class _Tp> struct remove_pointer                      {using type _LIBCPP_NODEBUG = _Tp;};
-template <class _Tp> struct remove_pointer<_Tp*>                {using type _LIBCPP_NODEBUG = _Tp;};
-template <class _Tp> struct remove_pointer<_Tp* const>          {using type _LIBCPP_NODEBUG = _Tp;};
-template <class _Tp> struct remove_pointer<_Tp* volatile>       {using type _LIBCPP_NODEBUG = _Tp;};
-template <class _Tp> struct remove_pointer<_Tp* const volatile> {using type _LIBCPP_NODEBUG = _Tp;};
-// clang-format on
 template <class _Tp>
-using __remove_pointer_t = typename remove_pointer<_Tp>::type;
+using __remove_pointer_t _LIBCPP_NODEBUG = __remove_pointer(_Tp);
-#endif // !defined(_LIBCPP_WORKAROUND_OBJCXX_COMPILER_INTRINSICS) && __has_builtin(__remove_pointer)
+#endif
 #if _LIBCPP_STD_VER >= 14
 template <class _Tp>

lib/libcxx/include/__type_traits/result_of.h+6-4

 @@ -16,18 +16,19 @@
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
 _LIBCPP_BEGIN_NAMESPACE_STD
 // result_of
-#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
 template <class _Callable>
 struct _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_NO_SPECIALIZATIONS result_of;
 _LIBCPP_DIAGNOSTIC_PUSH
-#if __has_warning("-Winvalid-specialization")
+#  if __has_warning("-Winvalid-specialization")
 _LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Winvalid-specialization")
-#endif
+#  endif
 template <class _Fp, class... _Args>
 struct result_of<_Fp(_Args...)> : __invoke_result<_Fp, _Args...> {};
 _LIBCPP_DIAGNOSTIC_POP
 @@ -36,8 +37,9 @@ _LIBCPP_DIAGNOSTIC_POP
 template <class _Tp>
 using result_of_t _LIBCPP_DEPRECATED_IN_CXX17 = typename result_of<_Tp>::type;
 #  endif // _LIBCPP_STD_VER >= 14
-#endif   // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_TYPE_TRAITS)
 #endif // _LIBCPP___TYPE_TRAITS_RESULT_OF_H

lib/libcxx/include/__type_traits/strip_signature.h+3

...	@@ -74,6 +74,9 @@ template<class _Rp, class _Gp, class ..._Ap>	...	@@ -74,6 +74,9 @@ template<class _Rp, class _Gp, class ..._Ap>
74	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile & noexcept> { using type _LIBCPP_NODEBUG = _Rp(_Ap...); };	74	struct __strip_signature<_Rp (_Gp::*) (_Ap...) const volatile & noexcept> { using type _LIBCPP_NODEBUG = _Rp(_Ap...); };
75	// clang-format on	75	// clang-format on
76		76
		77	template <class _Fp>
		78	using __strip_signature_t _LIBCPP_NODEBUG = typename __strip_signature<_Fp>::type;
		79
77	_LIBCPP_END_NAMESPACE_STD	80	_LIBCPP_END_NAMESPACE_STD
78		81
79	#endif // _LIBCPP_STD_VER >= 17	82	#endif // _LIBCPP_STD_VER >= 17

lib/libcxx/include/__utility/as_const.h+4-2

 @@ -15,9 +15,10 @@
 #  pragma GCC system_header
 #endif
+#if _LIBCPP_STD_VER >= 17
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 17
 template <class _Tp>
 [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _Tp& as_const(_Tp& __t) noexcept {
   return __t;
 @@ -25,8 +26,9 @@ template <class _Tp>
 template <class _Tp>
 void as_const(const _Tp&&) = delete;
-#endif
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___UTILITY_AS_CONST_H

lib/libcxx/include/__utility/constant_wrapper.h created+326

...	@@ -0,0 +1,326 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___UTILITY_CONSTANT_WRAPPER_H
10	#define _LIBCPP___UTILITY_CONSTANT_WRAPPER_H
11
12	#include <__config>
13	#include <__cstddef/size_t.h>
14	#include <__functional/invoke.h>
15	#include <__type_traits/invoke.h>
16	#include <__type_traits/is_constructible.h>
17	#include <__type_traits/is_same.h>
18	#include <__type_traits/remove_cvref.h>
19	#include <__utility/declval.h>
20	#include <__utility/forward.h>
21	#include <__utility/integer_sequence.h>
22
23	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
24	# pragma GCC system_header
25	#endif
26
27	_LIBCPP_BEGIN_NAMESPACE_STD
28
29	#if _LIBCPP_STD_VER >= 26
30
31	template <auto _Xp, class = remove_cvref_t<decltype(_Xp)>>
32	struct constant_wrapper;
33
34	template <class _Tp>
35	concept __constexpr_param = requires { typename constant_wrapper<_Tp::value>; };
36
37	template <auto _Xp>
38	constexpr auto cw = constant_wrapper<_Xp>{};
39
40	struct __cw_operators {
41	// unary operators
42	template <__constexpr_param _Tp>
43	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator+(_Tp) noexcept -> constant_wrapper<(+_Tp::value)> {
44	return {};
45	}
46	template <__constexpr_param _Tp>
47	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator-(_Tp) noexcept -> constant_wrapper<(-_Tp::value)> {
48	return {};
49	}
50	template <__constexpr_param _Tp>
51	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator~(_Tp) noexcept -> constant_wrapper<(~_Tp::value)> {
52	return {};
53	}
54	template <__constexpr_param _Tp>
55	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator!(_Tp) noexcept -> constant_wrapper<(!_Tp::value)> {
56	return {};
57	}
58	template <__constexpr_param _Tp>
59	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator&(_Tp) noexcept -> constant_wrapper<(&_Tp::value)> {
60	return {};
61	}
62	template <__constexpr_param _Tp>
63	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator(_Tp) noexcept -> constant_wrapper<(_Tp::value)> {
64	return {};
65	}
66
67	// binary operators
68	template <__constexpr_param _Lp, __constexpr_param _Rp>
69	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator+(_Lp, _Rp) noexcept
70	-> constant_wrapper<(_Lp::value + _Rp::value)> {
71	return {};
72	}
73	template <__constexpr_param _Lp, __constexpr_param _Rp>
74	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator-(_Lp, _Rp) noexcept
75	-> constant_wrapper<(_Lp::value - _Rp::value)> {
76	return {};
77	}
78	template <__constexpr_param _Lp, __constexpr_param _Rp>
79	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator*(_Lp, _Rp) noexcept
80	-> constant_wrapper<(_Lp::value * _Rp::value)> {
81	return {};
82	}
83	template <__constexpr_param _Lp, __constexpr_param _Rp>
84	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator/(_Lp, _Rp) noexcept
85	-> constant_wrapper<(_Lp::value / _Rp::value)> {
86	return {};
87	}
88	template <__constexpr_param _Lp, __constexpr_param _Rp>
89	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator%(_Lp, _Rp) noexcept
90	-> constant_wrapper<(_Lp::value % _Rp::value)> {
91	return {};
92	}
93
94	template <__constexpr_param _Lp, __constexpr_param _Rp>
95	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator<<(_Lp, _Rp) noexcept
96	-> constant_wrapper<(_Lp::value << _Rp::value)> {
97	return {};
98	}
99	template <__constexpr_param _Lp, __constexpr_param _Rp>
100	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator>>(_Lp, _Rp) noexcept
101	-> constant_wrapper<(_Lp::value >> _Rp::value)> {
102	return {};
103	}
104	template <__constexpr_param _Lp, __constexpr_param _Rp>
105	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator&(_Lp, _Rp) noexcept
106	-> constant_wrapper<(_Lp::value & _Rp::value)> {
107	return {};
108	}
109	template <__constexpr_param _Lp, __constexpr_param _Rp>
110	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator\|(_Lp, _Rp) noexcept
111	-> constant_wrapper<(_Lp::value \| _Rp::value)> {
112	return {};
113	}
114	template <__constexpr_param _Lp, __constexpr_param _Rp>
115	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator^(_Lp, _Rp) noexcept
116	-> constant_wrapper<(_Lp::value ^ _Rp::value)> {
117	return {};
118	}
119
120	template <__constexpr_param _Lp, __constexpr_param _Rp>
121	requires(!is_constructible_v<bool, decltype(_Lp::value)> \|\| !is_constructible_v<bool, decltype(_Rp::value)>)
122	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator&&(_Lp, _Rp) noexcept
123	-> constant_wrapper<(_Lp::value && _Rp::value)> {
124	return {};
125	}
126	template <__constexpr_param _Lp, __constexpr_param _Rp>
127	requires(!is_constructible_v<bool, decltype(_Lp::value)> \|\| !is_constructible_v<bool, decltype(_Rp::value)>)
128	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator\|\|(_Lp, _Rp) noexcept
129	-> constant_wrapper<(_Lp::value \|\| _Rp::value)> {
130	return {};
131	}
132
133	// comparisons
134	template <__constexpr_param _Lp, __constexpr_param _Rp>
135	_LIBCPP_HIDE_FROM_ABI friend constexpr auto operator<=>(_Lp, _Rp) noexcept
136	-> constant_wrapper<(_Lp::value <=> _Rp::value)> {
137	return {};
138	}
139	template <__constexpr_param _Lp, __constexpr_param _Rp>
140	_LIBCPP_HIDE_FROM_ABI friend constexpr auto operator<(_Lp, _Rp) noexcept
141	-> constant_wrapper<(_Lp::value < _Rp::value)> {
142	return {};
143	}
144	template <__constexpr_param _Lp, __constexpr_param _Rp>
145	_LIBCPP_HIDE_FROM_ABI friend constexpr auto operator<=(_Lp, _Rp) noexcept
146	-> constant_wrapper<(_Lp::value <= _Rp::value)> {
147	return {};
148	}
149	template <__constexpr_param _Lp, __constexpr_param _Rp>
150	_LIBCPP_HIDE_FROM_ABI friend constexpr auto operator==(_Lp, _Rp) noexcept
151	-> constant_wrapper<(_Lp::value == _Rp::value)> {
152	return {};
153	}
154	template <__constexpr_param _Lp, __constexpr_param _Rp>
155	_LIBCPP_HIDE_FROM_ABI friend constexpr auto operator!=(_Lp, _Rp) noexcept
156	-> constant_wrapper<(_Lp::value != _Rp::value)> {
157	return {};
158	}
159	template <__constexpr_param _Lp, __constexpr_param _Rp>
160	_LIBCPP_HIDE_FROM_ABI friend constexpr auto operator>(_Lp, _Rp) noexcept
161	-> constant_wrapper<(_Lp::value > _Rp::value)> {
162	return {};
163	}
164	template <__constexpr_param _Lp, __constexpr_param _Rp>
165	_LIBCPP_HIDE_FROM_ABI friend constexpr auto operator>=(_Lp, _Rp) noexcept
166	-> constant_wrapper<(_Lp::value >= _Rp::value)> {
167	return {};
168	}
169
170	template <__constexpr_param _Lp, __constexpr_param _Rp>
171	friend auto operator,(_Lp, _Rp) = delete;
172
173	template <__constexpr_param _Lp, __constexpr_param _Rp>
174	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto operator->*(_Lp, _Rp) noexcept
175	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
176	-> constant_wrapper<auto(_Lp::value->*_Rp::value)> {
177	return {};
178	}
179
180	// pseudo-mutators
181	template <__constexpr_param _Tp>
182	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator++(this _Tp) noexcept -> constant_wrapper<(++_Tp::value)> {
183	return {};
184	}
185	template <__constexpr_param _Tp>
186	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator++(this _Tp, int) noexcept
187	-> constant_wrapper<(_Tp::value++)> {
188	return {};
189	}
190	template <__constexpr_param _Tp>
191	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator--(this _Tp) noexcept -> constant_wrapper<(--_Tp::value)> {
192	return {};
193	}
194	template <__constexpr_param _Tp>
195	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator--(this _Tp, int) noexcept
196	-> constant_wrapper<(_Tp::value--)> {
197	return {};
198	}
199
200	template <__constexpr_param _Tp, __constexpr_param _Rp>
201	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator+=(this _Tp, _Rp) noexcept
202	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
203	-> constant_wrapper<auto(_Tp::value += _Rp::value)> {
204	return {};
205	}
206	template <__constexpr_param _Tp, __constexpr_param _Rp>
207	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator-=(this _Tp, _Rp) noexcept
208	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
209	-> constant_wrapper<auto(_Tp::value -= _Rp::value)> {
210	return {};
211	}
212	template <__constexpr_param _Tp, __constexpr_param _Rp>
213	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator*=(this _Tp, _Rp) noexcept
214	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
215	-> constant_wrapper<auto(_Tp::value *= _Rp::value)> {
216	return {};
217	}
218	template <__constexpr_param _Tp, __constexpr_param _Rp>
219	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator/=(this _Tp, _Rp) noexcept
220	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
221	-> constant_wrapper<auto(_Tp::value /= _Rp::value)> {
222	return {};
223	}
224	template <__constexpr_param _Tp, __constexpr_param _Rp>
225	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator%=(this _Tp, _Rp) noexcept
226	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
227	-> constant_wrapper<auto(_Tp::value %= _Rp::value)> {
228	return {};
229	}
230	template <__constexpr_param _Tp, __constexpr_param _Rp>
231	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator&=(this _Tp, _Rp) noexcept
232	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
233	-> constant_wrapper<auto(_Tp::value &= _Rp::value)> {
234	return {};
235	}
236	template <__constexpr_param _Tp, __constexpr_param _Rp>
237	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator\|=(this _Tp, _Rp) noexcept
238	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
239	-> constant_wrapper<auto(_Tp::value \|= _Rp::value)> {
240	return {};
241	}
242	template <__constexpr_param _Tp, __constexpr_param _Rp>
243	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator^=(this _Tp, _Rp) noexcept
244	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
245	-> constant_wrapper<auto(_Tp::value ^= _Rp::value)> {
246	return {};
247	}
248	template <__constexpr_param _Tp, __constexpr_param _Rp>
249	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator<<=(this _Tp, _Rp) noexcept
250	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
251	-> constant_wrapper<auto(_Tp::value <<= _Rp::value)> {
252	return {};
253	}
254	template <__constexpr_param _Tp, __constexpr_param _Rp>
255	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator>>=(this _Tp, _Rp) noexcept
256	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
257	-> constant_wrapper<auto(_Tp::value >>= _Rp::value)> {
258	return {};
259	}
260	};
261
262	template <const auto& _Callable, class... _Args>
263	concept __constexpr_callable = (__constexpr_param<remove_cvref_t<_Args>> && ...) && requires {
264	typename constant_wrapper<std::invoke(_Callable, remove_cvref_t<_Args>::value...)>;
265	};
266
267	template <const auto& _Obj, class... _Args>
268	concept __constexpr_indexable = (__constexpr_param<remove_cvref_t<_Args>> && ...) && requires {
269	typename constant_wrapper<auto(_Obj[remove_cvref_t<_Args>::value...])>;
270	};
271
272	template <auto _Xp, class _Tp>
273	struct constant_wrapper : __cw_operators {
274	static constexpr decltype((_Xp)) value = (_Xp);
275
276	using type = constant_wrapper;
277	using value_type = decltype(_Xp);
278
279	static_assert(is_same_v<_Tp, value_type>,
280	"the second template parameter of std::constant_wrapper must be its value_type");
281
282	template <__constexpr_param _Rp>
283	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator=(_Rp) const noexcept
284	// TODO: Remove `auto` when all support versions of Clang have https://llvm.org/PR202693 fixed.
285	-> constant_wrapper<auto(value = _Rp::value)> {
286	return {};
287	}
288
289	_LIBCPP_HIDE_FROM_ABI constexpr operator decltype(value)() const noexcept { return value; }
290
291	template <class... _Args>
292	requires __constexpr_callable<value, _Args...>
293	[[nodiscard]]
294	_LIBCPP_HIDE_FROM_ABI static constexpr constant_wrapper<std::invoke(value, remove_cvref_t<_Args>::value...)>
295	operator()(_Args&&...) noexcept {
296	return {};
297	}
298
299	template <class... _Args>
300	requires(!__constexpr_callable<value, _Args...> && is_invocable_v<const value_type&, _Args && ...>)
301	_LIBCPP_HIDE_FROM_ABI static constexpr decltype(auto)
302	operator()(_Args&&... __args) noexcept(noexcept(std::invoke(value, std::forward<_Args>(__args)...))) {
303	return std::invoke(value, std::forward<_Args>(__args)...);
304	}
305
306	template <class... _Args>
307	requires __constexpr_indexable<value, _Args...>
308	[[nodiscard]]
309	_LIBCPP_HIDE_FROM_ABI static constexpr constant_wrapper<auto(value[remove_cvref_t<_Args>::value...])>
310	operator[](_Args&&...) noexcept {
311	return {};
312	}
313
314	template <class... _Args>
315	requires(!__constexpr_indexable<value, _Args...> && requires { value[std::declval<_Args>()...]; })
316	_LIBCPP_HIDE_FROM_ABI static constexpr decltype(auto)
317	operator[](_Args&&... __args) noexcept(noexcept(value[std::forward<_Args>(__args)...])) {
318	return value[std::forward<_Args>(__args)...];
319	}
320	};
321
322	#endif // _LIBCPP_STD_VER >= 26
323
324	_LIBCPP_END_NAMESPACE_STD
325
326	#endif // _LIBCPP___UTILITY_CONSTANT_WRAPPER_H

lib/libcxx/include/__utility/default_three_way_comparator.h+2-2

...	@@ -31,7 +31,7 @@ template <class _LHS, class _RHS>	...	@@ -31,7 +31,7 @@ template <class _LHS, class _RHS>
31	struct __default_three_way_comparator<_LHS,	31	struct __default_three_way_comparator<_LHS,
32	_RHS,	32	_RHS,
33	__enable_if_t<is_arithmetic<_LHS>::value && is_arithmetic<_RHS>::value> > {	33	__enable_if_t<is_arithmetic<_LHS>::value && is_arithmetic<_RHS>::value> > {
34	_LIBCPP_HIDE_FROM_ABI static int operator()(_LHS __lhs, _RHS __rhs) {	34	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static int operator()(_LHS __lhs, _RHS __rhs) {
35	if (__lhs < __rhs)	35	if (__lhs < __rhs)
36	return -1;	36	return -1;
37	if (__lhs > __rhs)	37	if (__lhs > __rhs)
...	@@ -47,7 +47,7 @@ struct __default_three_way_comparator<	...	@@ -47,7 +47,7 @@ struct __default_three_way_comparator<
47	_RHS,	47	_RHS,
48	__enable_if_t<!(is_arithmetic<_LHS>::value && is_arithmetic<_RHS>::value) &&	48	__enable_if_t<!(is_arithmetic<_LHS>::value && is_arithmetic<_RHS>::value) &&
49	__builtin_lt_synthesizes_from_spaceship(const _LHS&, const _RHS&)>> {	49	__builtin_lt_synthesizes_from_spaceship(const _LHS&, const _RHS&)>> {
50	_LIBCPP_HIDE_FROM_ABI static int operator()(const _LHS& __lhs, const _RHS& __rhs) {	50	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static int operator()(const _LHS& __lhs, const _RHS& __rhs) {
51	auto __res = __lhs <=> __rhs;	51	auto __res = __lhs <=> __rhs;
52	if (__res < 0)	52	if (__res < 0)
53	return -1;	53	return -1;

lib/libcxx/include/__utility/exchange.h+14-3

 @@ -10,6 +10,9 @@
 #define _LIBCPP___UTILITY_EXCHANGE_H
 #include <__config>
+#include <__type_traits/enable_if.h>
+#include <__type_traits/is_assignable.h>
+#include <__type_traits/is_constructible.h>
 #include <__type_traits/is_nothrow_assignable.h>
 #include <__type_traits/is_nothrow_constructible.h>
 #include <__utility/forward.h>
 @@ -24,14 +27,22 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
-#if _LIBCPP_STD_VER >= 14
 template <class _T1, class _T2 = _T1>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _T1 exchange(_T1& __obj, _T2&& __new_value) noexcept(
+[[__nodiscard__]] _LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _T1
-    is_nothrow_move_constructible<_T1>::value && is_nothrow_assignable<_T1&, _T2>::value) {
+__exchange(_T1& __obj, _T2&& __new_value)
+    _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value&& is_nothrow_assignable<_T1&, _T2>::value) {
   _T1 __old_value = std::move(__obj);
   __obj           = std::forward<_T2>(__new_value);
   return __old_value;
 }
+#if _LIBCPP_STD_VER >= 14
+template <class _T1, class _T2 = _T1>
+[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _T1 exchange(_T1& __obj, _T2&& __new_value) noexcept(
+    is_nothrow_move_constructible<_T1>::value && is_nothrow_assignable<_T1&, _T2>::value) {
+  return std::__exchange(__obj, std::forward<_T2>(__new_value));
+}
 #endif // _LIBCPP_STD_VER >= 14
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/include/__utility/forward_like.h+4-4

 @@ -21,10 +21,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Ap, class _Bp>
 using _CopyConst _LIBCPP_NODEBUG = _If<is_const_v<_Ap>, const _Bp, _Bp>;
 @@ -56,8 +56,8 @@ __forward_as(_LIBCPP_LIFETIMEBOUND _Up&& __val) noexcept {
   return static_cast<_ForwardLike<_Tp, _As>>(__val);
 }
-#endif // _LIBCPP_STD_VER >= 23
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 23
 #endif // _LIBCPP___UTILITY_FORWARD_LIKE_H

lib/libcxx/include/__utility/in_place.h+4-4

 @@ -18,10 +18,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 struct in_place_t {
   explicit in_place_t() = default;
 };
 @@ -57,8 +57,8 @@ struct __is_inplace_index_imp<in_place_index_t<_Idx>> : true_type {};
 template <class _Tp>
 using __is_inplace_index _LIBCPP_NODEBUG = __is_inplace_index_imp<__remove_cvref_t<_Tp>>;
-#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___UTILITY_IN_PLACE_H

lib/libcxx/include/__utility/is_pointer_in_range.h+6-6

 @@ -12,12 +12,12 @@
 #include <__algorithm/comp.h>
 #include <__assert>
 #include <__config>
+#include <__memory/valid_range.h>
 #include <__type_traits/enable_if.h>
 #include <__type_traits/integral_constant.h>
 #include <__type_traits/is_constant_evaluated.h>
 #include <__type_traits/void_t.h>
 #include <__utility/declval.h>
-#include <__utility/is_valid_range.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 @@ -26,13 +26,13 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, class _Up, class = void>
-struct __is_less_than_comparable : false_type {};
+inline const bool __is_less_than_comparable_v = false;
 template <class _Tp, class _Up>
-struct __is_less_than_comparable<_Tp, _Up, __void_t<decltype(std::declval<_Tp>() < std::declval<_Up>())> > : true_type {
+inline const bool
-};
+    __is_less_than_comparable_v<_Tp, _Up, __void_t<decltype(std::declval<_Tp>() < std::declval<_Up>())> > = true;
-template <class _Tp, class _Up, __enable_if_t<__is_less_than_comparable<const _Tp*, const _Up*>::value, int> = 0>
+template <class _Tp, class _Up, __enable_if_t<__is_less_than_comparable_v<const _Tp*, const _Up*>, int> = 0>
 _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_SANITIZE("address") bool
 __is_pointer_in_range(const _Tp* __begin, const _Tp* __end, const _Up* __ptr) {
   _LIBCPP_ASSERT_VALID_INPUT_RANGE(std::__is_valid_range(__begin, __end), "[__begin, __end) is not a valid range");
 @@ -47,7 +47,7 @@ __is_pointer_in_range(const _Tp* __begin, const _Tp* __end, const _Up* __ptr) {
   return !__less<>()(__ptr, __begin) && __less<>()(__ptr, __end);
 }
-template <class _Tp, class _Up, __enable_if_t<!__is_less_than_comparable<const _Tp*, const _Up*>::value, int> = 0>
+template <class _Tp, class _Up, __enable_if_t<!__is_less_than_comparable_v<const _Tp*, const _Up*>, int> = 0>
 _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_SANITIZE("address") bool
 __is_pointer_in_range(const _Tp* __begin, const _Tp* __end, const _Up* __ptr) {
   if (__libcpp_is_constant_evaluated())

lib/libcxx/include/__utility/is_valid_range.h deleted-37

...	@@ -1,37 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___UTILITY_IS_VALID_RANGE_H
10	#define _LIBCPP___UTILITY_IS_VALID_RANGE_H
11
12	#include <__algorithm/comp.h>
13	#include <__config>
14	#include <__type_traits/is_constant_evaluated.h>
15
16	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
17	# pragma GCC system_header
18	#endif
19
20	_LIBCPP_BEGIN_NAMESPACE_STD
21
22	template <class _Tp>
23	_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_SANITIZE("address") bool
24	__is_valid_range(const _Tp* __first, const _Tp* __last) {
25	if (__libcpp_is_constant_evaluated()) {
26	// If this is not a constant during constant evaluation, that is because __first and __last are not
27	// part of the same allocation. If they are part of the same allocation, we must still make sure they
28	// are ordered properly.
29	return __builtin_constant_p(__first <= __last) && __first <= __last;
30	}
31
32	return !__less<>()(__last, __first);
33	}
34
35	_LIBCPP_END_NAMESPACE_STD
36
37	#endif // _LIBCPP___UTILITY_IS_VALID_RANGE_H

lib/libcxx/include/__utility/lazy_synth_three_way_comparator.h+18-15

 @@ -35,20 +35,20 @@ struct __lazy_compare_result {
   const _LHS& __lhs_;
   const _RHS& __rhs_;
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __lazy_compare_result(
-  __lazy_compare_result(_LIBCPP_CTOR_LIFETIMEBOUND const _Comparator& __comp,
+      _LIBCPP_CTOR_LIFETIMEBOUND const _Comparator& __comp,
-                        _LIBCPP_CTOR_LIFETIMEBOUND const _LHS& __lhs,
+      _LIBCPP_CTOR_LIFETIMEBOUND const _LHS& __lhs,
-                        _LIBCPP_CTOR_LIFETIMEBOUND const _RHS& __rhs)
+      _LIBCPP_CTOR_LIFETIMEBOUND const _RHS& __rhs)
       : __comp_(__comp), __lhs_(__lhs), __rhs_(__rhs) {}
-  _LIBCPP_HIDE_FROM_ABI bool __less() const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool __less() const {
     bool __result = __comp_(__lhs_, __rhs_);
     _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(__result ? !static_cast<bool>(__comp_(__rhs_, __lhs_)) : true,
                                         "Comparator does not induce a strict weak ordering");
     return __result;
   }
-  _LIBCPP_HIDE_FROM_ABI bool __greater() const {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool __greater() const {
     bool __result = __comp_(__rhs_, __lhs_);
     _LIBCPP_ASSERT_SEMANTIC_REQUIREMENT(__result ? !static_cast<bool>(__comp_(__lhs_, __rhs_)) : true,
                                         "Comparator does not induce a strict weak ordering");
 @@ -63,10 +63,11 @@ template <class _Comparator, class _LHS, class _RHS, class = void>
 struct __lazy_synth_three_way_comparator {
   const _Comparator& __comp_;
-  _LIBCPP_HIDE_FROM_ABI __lazy_synth_three_way_comparator(_LIBCPP_CTOR_LIFETIMEBOUND const _Comparator& __comp)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  __lazy_synth_three_way_comparator(_LIBCPP_CTOR_LIFETIMEBOUND const _Comparator& __comp)
       : __comp_(__comp) {}
-  _LIBCPP_HIDE_FROM_ABI __lazy_compare_result<_Comparator, _LHS, _RHS>
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __lazy_compare_result<_Comparator, _LHS, _RHS>
   operator()(_LIBCPP_LIFETIMEBOUND const _LHS& __lhs, _LIBCPP_LIFETIMEBOUND const _RHS& __rhs) const {
     return __lazy_compare_result<_Comparator, _LHS, _RHS>(__comp_, __lhs, __rhs);
   }
 @@ -75,10 +76,10 @@ struct __lazy_synth_three_way_comparator {
 struct __eager_compare_result {
   int __res_;
-  _LIBCPP_HIDE_FROM_ABI explicit __eager_compare_result(int __res) : __res_(__res) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit __eager_compare_result(int __res) : __res_(__res) {}
-  _LIBCPP_HIDE_FROM_ABI bool __less() const { return __res_ < 0; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool __less() const { return __res_ < 0; }
-  _LIBCPP_HIDE_FROM_ABI bool __greater() const { return __res_ > 0; }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool __greater() const { return __res_ > 0; }
 };
 template <class _Comparator, class _LHS, class _RHS>
 @@ -89,10 +90,11 @@ struct __lazy_synth_three_way_comparator<_Comparator,
                                                             __has_default_three_way_comparator<_LHS, _RHS> >::value> > {
   // This lifetimebound annotation is technically incorrect, but other specializations actually capture the lifetime of
   // the comparator.
-  _LIBCPP_HIDE_FROM_ABI __lazy_synth_three_way_comparator(_LIBCPP_CTOR_LIFETIMEBOUND const _Comparator&) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  __lazy_synth_three_way_comparator(_LIBCPP_CTOR_LIFETIMEBOUND const _Comparator&) {}
   // Same comment as above.
-  _LIBCPP_HIDE_FROM_ABI static __eager_compare_result
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static __eager_compare_result
   operator()(_LIBCPP_LIFETIMEBOUND const _LHS& __lhs, _LIBCPP_LIFETIMEBOUND const _RHS& __rhs) {
     return __eager_compare_result(__default_three_way_comparator<_LHS, _RHS>()(__lhs, __rhs));
   }
 @@ -106,10 +108,11 @@ struct __lazy_synth_three_way_comparator<_Comparator,
                                                             __has_default_three_way_comparator<_LHS, _RHS> >::value> > {
   // This lifetimebound annotation is technically incorrect, but other specializations actually capture the lifetime of
   // the comparator.
-  _LIBCPP_HIDE_FROM_ABI __lazy_synth_three_way_comparator(_LIBCPP_CTOR_LIFETIMEBOUND const _Comparator&) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  __lazy_synth_three_way_comparator(_LIBCPP_CTOR_LIFETIMEBOUND const _Comparator&) {}
   // Same comment as above.
-  _LIBCPP_HIDE_FROM_ABI static __eager_compare_result
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static __eager_compare_result
   operator()(_LIBCPP_LIFETIMEBOUND const _LHS& __lhs, _LIBCPP_LIFETIMEBOUND const _RHS& __rhs) {
     return __eager_compare_result(-__default_three_way_comparator<_LHS, _RHS>()(__lhs, __rhs));
   }

lib/libcxx/include/__utility/pair.h+77-97

 @@ -55,22 +55,22 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _T1, class _T2>
 struct __check_pair_construction {
   template <int&...>
-  static _LIBCPP_HIDE_FROM_ABI constexpr bool __enable_implicit_default() {
+  static constexpr bool __enable_implicit_default() {
     return __is_implicitly_default_constructible<_T1>::value && __is_implicitly_default_constructible<_T2>::value;
   }
   template <int&...>
-  static _LIBCPP_HIDE_FROM_ABI constexpr bool __enable_default() {
+  static constexpr bool __enable_default() {
     return is_default_constructible<_T1>::value && is_default_constructible<_T2>::value;
   }
   template <class _U1, class _U2>
-  static _LIBCPP_HIDE_FROM_ABI constexpr bool __is_pair_constructible() {
+  static constexpr bool __is_pair_constructible() {
     return is_constructible<_T1, _U1>::value && is_constructible<_T2, _U2>::value;
   }
   template <class _U1, class _U2>
-  static _LIBCPP_HIDE_FROM_ABI constexpr bool __is_implicit() {
+  static constexpr bool __is_implicit() {
     return is_convertible<_U1, _T1>::value && is_convertible<_U2, _T2>::value;
   }
 };
 @@ -79,9 +79,8 @@ struct __check_pair_construction {
 template <class, class>
 struct __non_trivially_copyable_base {
-  _LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI __non_trivially_copyable_base() _NOEXCEPT {}
+  _LIBCPP_CONSTEXPR __non_trivially_copyable_base() _NOEXCEPT {}
-  _LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 __non_trivially_copyable_base(__non_trivially_copyable_base const&) _NOEXCEPT {}
-  __non_trivially_copyable_base(__non_trivially_copyable_base const&) _NOEXCEPT {}
 };
 template <class _T1, class _T2>
 @@ -101,18 +100,18 @@ struct pair
                       pair,
                       void>;
-  _LIBCPP_HIDE_FROM_ABI pair(pair const&) = default;
+  pair(pair const&) = default;
-  _LIBCPP_HIDE_FROM_ABI pair(pair&&)      = default;
+  pair(pair&&)      = default;
 #ifdef _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI pair() : first(), second() {}
+  pair() : first(), second() {}
-  _LIBCPP_HIDE_FROM_ABI pair(_T1 const& __t1, _T2 const& __t2) : first(__t1), second(__t2) {}
+  pair(_T1 const& __t1, _T2 const& __t2) : first(__t1), second(__t2) {}
   template <class _U1, class _U2>
-  _LIBCPP_HIDE_FROM_ABI pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {}
+  pair(const pair<_U1, _U2>& __p) : first(__p.first), second(__p.second) {}
-  _LIBCPP_HIDE_FROM_ABI pair& operator=(pair const& __p) {
+  pair& operator=(pair const& __p) {
     first  = __p.first;
     second = __p.second;
     return *this;
 @@ -126,7 +125,7 @@ struct pair
       class _U2,
       __enable_if_t<is_assignable<first_type&, _U1 const&>::value && is_assignable<second_type&, _U2 const&>::value,
                     int> = 0>
-  _LIBCPP_HIDE_FROM_ABI pair& operator=(pair<_U1, _U2> const& __p) {
+  pair& operator=(pair<_U1, _U2> const& __p) {
     first  = __p.first;
     second = __p.second;
     return *this;
 @@ -134,13 +133,12 @@ struct pair
 #else
   template <class _CheckArgsDep                                   = __check_pair_construction<_T1, _T2>,
             __enable_if_t<_CheckArgsDep::__enable_default(), int> = 0>
-  explicit(!_CheckArgsDep::__enable_implicit_default()) _LIBCPP_HIDE_FROM_ABI constexpr pair() noexcept(
+  explicit(!_CheckArgsDep::__enable_implicit_default()) constexpr pair() noexcept(
       is_nothrow_default_constructible<first_type>::value && is_nothrow_default_constructible<second_type>::value)
       : first(), second() {}
   template <class _CheckArgsDep = __check_pair_construction<_T1, _T2>,
             __enable_if_t<_CheckArgsDep::template __is_pair_constructible<_T1 const&, _T2 const&>(), int> = 0>
-  _LIBCPP_HIDE_FROM_ABI
   _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(!_CheckArgsDep::template __is_implicit<_T1 const&, _T2 const&>())
       pair(_T1 const& __t1, _T2 const& __t2) noexcept(is_nothrow_copy_constructible<first_type>::value &&
                                                       is_nothrow_copy_constructible<second_type>::value)
 @@ -155,7 +153,6 @@ struct pair
       class _U2,
 #  endif
       __enable_if_t<__check_pair_construction<_T1, _T2>::template __is_pair_constructible<_U1, _U2>(), int> = 0 >
-  _LIBCPP_HIDE_FROM_ABI
   _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(!__check_pair_construction<_T1, _T2>::template __is_implicit<_U1, _U2>())
       pair(_U1&& __u1, _U2&& __u2) noexcept(is_nothrow_constructible<first_type, _U1>::value &&
                                             is_nothrow_constructible<second_type, _U2>::value)
 @@ -166,7 +163,7 @@ struct pair
   template <class _U1,
             class _U2,
             __enable_if_t<__check_pair_construction<_T1, _T2>::template __is_pair_constructible<_U1&, _U2&>(), int> = 0>
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!__check_pair_construction<_T1, _T2>::template __is_implicit<_U1&, _U2&>())
+  constexpr explicit(!__check_pair_construction<_T1, _T2>::template __is_implicit<_U1&, _U2&>())
       pair(pair<_U1, _U2>& __p) noexcept((is_nothrow_constructible<first_type, _U1&>::value &&
                                           is_nothrow_constructible<second_type, _U2&>::value))
       : first(__p.first), second(__p.second) {}
 @@ -177,7 +174,7 @@ struct pair
       class _U2,
       __enable_if_t<__check_pair_construction<_T1, _T2>::template __is_pair_constructible<_U1 const&, _U2 const&>(),
                     int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(
       !__check_pair_construction<_T1, _T2>::template __is_implicit<_U1 const&, _U2 const&>())
       pair(pair<_U1, _U2> const& __p) noexcept(is_nothrow_constructible<first_type, _U1 const&>::value &&
                                                is_nothrow_constructible<second_type, _U2 const&>::value)
 @@ -186,7 +183,6 @@ struct pair
   template <class _U1,
             class _U2,
             __enable_if_t<__check_pair_construction<_T1, _T2>::template __is_pair_constructible<_U1, _U2>(), int> = 0>
-  _LIBCPP_HIDE_FROM_ABI
   _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(!__check_pair_construction<_T1, _T2>::template __is_implicit<_U1, _U2>())
       pair(pair<_U1, _U2>&& __p) noexcept(is_nothrow_constructible<first_type, _U1&&>::value &&
                                           is_nothrow_constructible<second_type, _U2&&>::value)
 @@ -198,8 +194,7 @@ struct pair
       class _U2,
       __enable_if_t<__check_pair_construction<_T1, _T2>::template __is_pair_constructible<const _U1&&, const _U2&&>(),
                     int> = 0>
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit(
+  constexpr explicit(!__check_pair_construction<_T1, _T2>::template __is_implicit<const _U1&&, const _U2&&>())
-      !__check_pair_construction<_T1, _T2>::template __is_implicit<const _U1&&, const _U2&&>())
       pair(const pair<_U1, _U2>&& __p) noexcept(is_nothrow_constructible<first_type, const _U1&&>::value &&
                                                 is_nothrow_constructible<second_type, const _U2&&>::value)
       : first(std::move(__p.first)), second(std::move(__p.second)) {}
 @@ -209,19 +204,19 @@ struct pair
   template <__pair_like_no_subrange _PairLike>
     requires(is_constructible_v<first_type, decltype(std::get<0>(std::declval<_PairLike &&>()))> &&
              is_constructible_v<second_type, decltype(std::get<1>(std::declval<_PairLike &&>()))>)
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit(
+  constexpr explicit(!is_convertible_v<decltype(std::get<0>(std::declval<_PairLike&&>())), first_type> ||
-      !is_convertible_v<decltype(std::get<0>(std::declval<_PairLike&&>())), first_type> ||
+                     !is_convertible_v<decltype(std::get<1>(std::declval<_PairLike&&>())), second_type>)
-      !is_convertible_v<decltype(std::get<1>(std::declval<_PairLike&&>())), second_type>) pair(_PairLike&& __p)
+      pair(_PairLike&& __p)
       : first(std::get<0>(std::forward<_PairLike>(__p))), second(std::get<1>(std::forward<_PairLike>(__p))) {}
 #  endif
   template <class... _Args1, class... _Args2>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
+  _LIBCPP_CONSTEXPR_SINCE_CXX20
   pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args, tuple<_Args2...> __second_args) noexcept(
       is_nothrow_constructible<first_type, _Args1...>::value && is_nothrow_constructible<second_type, _Args2...>::value)
       : pair(__pc, __first_args, __second_args, __index_sequence_for<_Args1...>(), __index_sequence_for<_Args2...>()) {}
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair&
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 pair&
   operator=(__conditional_t<is_copy_assignable<first_type>::value && is_copy_assignable<second_type>::value,
                             pair,
                             __nat> const& __p) noexcept(is_nothrow_copy_assignable<first_type>::value &&
 @@ -231,7 +226,7 @@ struct pair
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair& operator=(
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 pair& operator=(
       __conditional_t<is_move_assignable<first_type>::value && is_move_assignable<second_type>::value, pair, __nat>&&
           __p) noexcept(is_nothrow_move_assignable<first_type>::value &&
                         is_nothrow_move_assignable<second_type>::value) {
 @@ -245,7 +240,7 @@ struct pair
       class _U2,
       __enable_if_t<is_assignable<first_type&, _U1 const&>::value && is_assignable<second_type&, _U2 const&>::value,
                     int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair& operator=(pair<_U1, _U2> const& __p) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 pair& operator=(pair<_U1, _U2> const& __p) {
     first  = __p.first;
     second = __p.second;
     return *this;
 @@ -254,7 +249,7 @@ struct pair
   template <class _U1,
             class _U2,
             __enable_if_t<is_assignable<first_type&, _U1>::value && is_assignable<second_type&, _U2>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair& operator=(pair<_U1, _U2>&& __p) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 pair& operator=(pair<_U1, _U2>&& __p) {
     first  = std::forward<_U1>(__p.first);
     second = std::forward<_U2>(__p.second);
     return *this;
 @@ -262,7 +257,7 @@ struct pair
 #  if _LIBCPP_STD_VER >= 23
   template <class = void>
-  _LIBCPP_HIDE_FROM_ABI constexpr const pair& operator=(pair const& __p) const
+  constexpr const pair& operator=(pair const& __p) const
       noexcept(is_nothrow_copy_assignable_v<const first_type> && is_nothrow_copy_assignable_v<const second_type>)
     requires(is_copy_assignable_v<const first_type> && is_copy_assignable_v<const second_type>)
   {
 @@ -272,7 +267,7 @@ struct pair
   }
   template <class = void>
-  _LIBCPP_HIDE_FROM_ABI constexpr const pair& operator=(pair&& __p) const
+  constexpr const pair& operator=(pair&& __p) const
       noexcept(is_nothrow_assignable_v<const first_type&, first_type> &&
                is_nothrow_assignable_v<const second_type&, second_type>)
     requires(is_assignable_v<const first_type&, first_type> && is_assignable_v<const second_type&, second_type>)
 @@ -283,7 +278,7 @@ struct pair
   }
   template <class _U1, class _U2>
-  _LIBCPP_HIDE_FROM_ABI constexpr const pair& operator=(const pair<_U1, _U2>& __p) const
+  constexpr const pair& operator=(const pair<_U1, _U2>& __p) const
     requires(is_assignable_v<const first_type&, const _U1&> && is_assignable_v<const second_type&, const _U2&>)
   {
     first  = __p.first;
 @@ -292,7 +287,7 @@ struct pair
   }
   template <class _U1, class _U2>
-  _LIBCPP_HIDE_FROM_ABI constexpr const pair& operator=(pair<_U1, _U2>&& __p) const
+  constexpr const pair& operator=(pair<_U1, _U2>&& __p) const
     requires(is_assignable_v<const first_type&, _U1> && is_assignable_v<const second_type&, _U2>)
   {
     first  = std::forward<_U1>(__p.first);
 @@ -304,7 +299,7 @@ struct pair
     requires(__different_from<_PairLike, pair> &&
              is_assignable_v<first_type&, decltype(std::get<0>(std::declval<_PairLike>()))> &&
              is_assignable_v<second_type&, decltype(std::get<1>(std::declval<_PairLike>()))>)
-  _LIBCPP_HIDE_FROM_ABI constexpr pair& operator=(_PairLike&& __p) {
+  constexpr pair& operator=(_PairLike&& __p) {
     first  = std::get<0>(std::forward<_PairLike>(__p));
     second = std::get<1>(std::forward<_PairLike>(__p));
     return *this;
 @@ -314,7 +309,7 @@ struct pair
     requires(__different_from<_PairLike, pair> &&
              is_assignable_v<first_type const&, decltype(std::get<0>(std::declval<_PairLike>()))> &&
              is_assignable_v<second_type const&, decltype(std::get<1>(std::declval<_PairLike>()))>)
-  _LIBCPP_HIDE_FROM_ABI constexpr pair const& operator=(_PairLike&& __p) const {
+  constexpr pair const& operator=(_PairLike&& __p) const {
     first  = std::get<0>(std::forward<_PairLike>(__p));
     second = std::get<1>(std::forward<_PairLike>(__p));
     return *this;
 @@ -328,34 +323,33 @@ struct pair
   template <class _U1,
             class _U2,
             __enable_if_t<is_convertible<_U1 const&, _T1>::value && is_convertible<_U2 const&, _T2>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair(tuple<_U1, _U2> const& __p)
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 pair(tuple<_U1, _U2> const& __p) : first(std::get<0>(__p)), second(std::get<1>(__p)) {}
-      : first(std::get<0>(__p)), second(std::get<1>(__p)) {}
   template < class _U1,
              class _U2,
              __enable_if_t<is_constructible<_T1, _U1 const&>::value && is_constructible<_T2, _U2 const&>::value &&
                                !(is_convertible<_U1 const&, _T1>::value && is_convertible<_U2 const&, _T2>::value),
                            int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit pair(tuple<_U1, _U2> const& __p)
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit pair(tuple<_U1, _U2> const& __p)
       : first(std::get<0>(__p)), second(std::get<1>(__p)) {}
   template <class _U1,
             class _U2,
             __enable_if_t<is_convertible<_U1, _T1>::value && is_convertible<_U2, _T2>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair(tuple<_U1, _U2>&& __p)
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 pair(tuple<_U1, _U2>&& __p)
       : first(std::get<0>(std::move(__p))), second(std::get<1>(std::move(__p))) {}
   template <class _U1,
             class _U2,
             __enable_if_t<is_constructible<_T1, _U1>::value && is_constructible<_T2, _U2>::value &&
                           !(is_convertible<_U1, _T1>::value && is_convertible<_U2, _T2>::value) > = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit pair(tuple<_U1, _U2>&& __p)
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit pair(tuple<_U1, _U2>&& __p)
       : first(std::get<0>(std::move(__p))), second(std::get<1>(std::move(__p))) {}
   template <class _U1,
             class _U2,
             __enable_if_t<is_assignable<_T1&, _U1 const&>::value && is_assignable<_T2&, _U2 const&>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair& operator=(tuple<_U1, _U2> const& __p) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 pair& operator=(tuple<_U1, _U2> const& __p) {
     first  = std::get<0>(__p);
     second = std::get<1>(__p);
     return *this;
 @@ -364,7 +358,7 @@ struct pair
   template <class _U1,
             class _U2,
             __enable_if_t<is_assignable<_T1&, _U1&&>::value && is_assignable<_T2&, _U2&&>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair& operator=(tuple<_U1, _U2>&& __p) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 pair& operator=(tuple<_U1, _U2>&& __p) {
     first  = std::get<0>(std::move(__p));
     second = std::get<1>(std::move(__p));
     return *this;
 @@ -373,36 +367,34 @@ struct pair
   // from std::array
   template <class _Up,
             __enable_if_t<is_convertible<_Up const&, _T1>::value && is_convertible<_Up const&, _T2>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair(array<_Up, 2> const& __p) : first(__p[0]), second(__p[1]) {}
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 pair(array<_Up, 2> const& __p) : first(__p[0]), second(__p[1]) {}
   template <class _Up,
             __enable_if_t<is_constructible<_T1, _Up const&>::value && is_constructible<_T2, _Up const&>::value &&
                               !(is_convertible<_Up const&, _T1>::value && is_convertible<_Up const&, _T2>::value),
                           int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit pair(array<_Up, 2> const& __p)
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit pair(array<_Up, 2> const& __p) : first(__p[0]), second(__p[1]) {}
-      : first(__p[0]), second(__p[1]) {}
   template <class _Up, __enable_if_t< is_convertible<_Up, _T1>::value && is_convertible<_Up, _T2>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair(array<_Up, 2>&& __p)
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 pair(array<_Up, 2>&& __p) : first(std::move(__p)[0]), second(std::move(__p)[1]) {}
-      : first(std::move(__p)[0]), second(std::move(__p)[1]) {}
   template <class _Up,
             __enable_if_t<is_constructible<_T1, _Up>::value && is_constructible<_T2, _Up>::value &&
                               !(is_convertible<_Up, _T1>::value && is_convertible<_Up, _T2>::value),
                           int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit pair(array<_Up, 2>&& __p)
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit pair(array<_Up, 2>&& __p)
       : first(std::move(__p)[0]), second(std::move(__p)[1]) {}
   template <class _Up,
             __enable_if_t<is_assignable<_T1&, _Up const&>::value && is_assignable<_T2&, _Up const&>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair& operator=(array<_Up, 2> const& __p) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 pair& operator=(array<_Up, 2> const& __p) {
     first  = std::get<0>(__p);
     second = std::get<1>(__p);
     return *this;
   }
   template <class _Up, __enable_if_t<is_assignable<_T1&, _Up>::value && is_assignable<_T2&, _Up>::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 pair& operator=(array<_Up, 2>&& __p) {
+  _LIBCPP_CONSTEXPR_SINCE_CXX14 pair& operator=(array<_Up, 2>&& __p) {
     first  = std::get<0>(std::move(__p));
     second = std::get<1>(std::move(__p));
     return *this;
 @@ -410,7 +402,7 @@ struct pair
 #  endif // _LIBCPP_STD_VER < 23
 #endif   // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(pair& __p)
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(pair& __p)
       _NOEXCEPT_(__is_nothrow_swappable_v<first_type>&& __is_nothrow_swappable_v<second_type>) {
     using std::swap;
     swap(first, __p.first);
 @@ -418,7 +410,7 @@ struct pair
   }
 #if _LIBCPP_STD_VER >= 23
-  _LIBCPP_HIDE_FROM_ABI constexpr void swap(const pair& __p) const
+  constexpr void swap(const pair& __p) const
       noexcept(__is_nothrow_swappable_v<const first_type> && __is_nothrow_swappable_v<const second_type>) {
     using std::swap;
     swap(first, __p.first);
 @@ -429,7 +421,7 @@ struct pair
 private:
 #ifndef _LIBCPP_CXX03_LANG
   template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
+  _LIBCPP_CONSTEXPR_SINCE_CXX20
   pair(piecewise_construct_t,
        tuple<_Args1...>& __first_args,
        tuple<_Args2...>& __second_args,
 @@ -448,8 +440,7 @@ pair(_T1, _T2) -> pair<_T1, _T2>;
 // [pairs.spec], specialized algorithms
 template <class _T1, class _T2, class _U1, class _U2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator==(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y)
-operator==(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y)
 #if _LIBCPP_STD_VER >= 26
   requires requires {
     { __x.first == __y.first } -> __boolean_testable;
 @@ -463,8 +454,7 @@ operator==(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y)
 #if _LIBCPP_STD_VER >= 20
 template <class _T1, class _T2, class _U1, class _U2>
-_LIBCPP_HIDE_FROM_ABI constexpr common_comparison_category_t< __synth_three_way_result<_T1, _U1>,
+constexpr common_comparison_category_t< __synth_three_way_result<_T1, _U1>, __synth_three_way_result<_T2, _U2> >
-                                                              __synth_three_way_result<_T2, _U2> >
 operator<=>(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
   if (auto __c = std::__synth_three_way(__x.first, __y.first); __c != 0) {
     return __c;
 @@ -475,32 +465,27 @@ operator<=>(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
 #else // _LIBCPP_STD_VER >= 20
 template <class _T1, class _T2, class _U1, class _U2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator!=(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
-operator!=(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
   return !(__x == __y);
 }
 template <class _T1, class _T2, class _U1, class _U2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator<(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
-operator<(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
   return __x.first < __y.first || (!(__y.first < __x.first) && __x.second < __y.second);
 }
 template <class _T1, class _T2, class _U1, class _U2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator>(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
-operator>(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
   return __y < __x;
 }
 template <class _T1, class _T2, class _U1, class _U2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator>=(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
-operator>=(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
   return !(__x < __y);
 }
 template <class _T1, class _T2, class _U1, class _U2>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool
+inline _LIBCPP_CONSTEXPR_SINCE_CXX14 bool operator<=(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
-operator<=(const pair<_T1, _T2>& __x, const pair<_U1, _U2>& __y) {
   return !(__y < __x);
 }
 @@ -524,7 +509,7 @@ struct common_type<pair<_T1, _T2>, pair<_U1, _U2>> {
 #endif // _LIBCPP_STD_VER >= 23
 template <class _T1, class _T2, __enable_if_t<__is_swappable_v<_T1> && __is_swappable_v<_T2>, int> = 0>
-inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(pair<_T1, _T2>& __x, pair<_T1, _T2>& __y)
+inline _LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(pair<_T1, _T2>& __x, pair<_T1, _T2>& __y)
     _NOEXCEPT_(__is_nothrow_swappable_v<_T1>&& __is_nothrow_swappable_v<_T2>) {
   __x.swap(__y);
 }
 @@ -532,15 +517,14 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(pair<_T1, _
 #if _LIBCPP_STD_VER >= 23
 template <class _T1, class _T2>
   requires(__is_swappable_v<const _T1> && __is_swappable_v<const _T2>)
-_LIBCPP_HIDE_FROM_ABI constexpr void
+constexpr void swap(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) noexcept(noexcept(__x.swap(__y))) {
-swap(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y) noexcept(noexcept(__x.swap(__y))) {
   __x.swap(__y);
 }
 #endif
 template <class _T1, class _T2>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
+[[__nodiscard__]] inline _LIBCPP_CONSTEXPR_SINCE_CXX14 pair<__unwrap_ref_decay_t<_T1>, __unwrap_ref_decay_t<_T2> >
-pair<__unwrap_ref_decay_t<_T1>, __unwrap_ref_decay_t<_T2> > make_pair(_T1&& __t1, _T2&& __t2) {
+make_pair(_T1&& __t1, _T2&& __t2) {
   return pair<__unwrap_ref_decay_t<_T1>, __unwrap_ref_decay_t<_T2> >(std::forward<_T1>(__t1), std::forward<_T2>(__t2));
 }
 @@ -568,22 +552,22 @@ struct __get_pair;
 template <>
 struct __get_pair<0> {
   template <class _T1, class _T2>
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _T1& get(pair<_T1, _T2>& __p) _NOEXCEPT {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX14 _T1& get(pair<_T1, _T2>& __p) _NOEXCEPT {
     return __p.first;
   }
   template <class _T1, class _T2>
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const _T1& get(const pair<_T1, _T2>& __p) _NOEXCEPT {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX14 const _T1& get(const pair<_T1, _T2>& __p) _NOEXCEPT {
     return __p.first;
   }
   template <class _T1, class _T2>
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _T1&& get(pair<_T1, _T2>&& __p) _NOEXCEPT {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX14 _T1&& get(pair<_T1, _T2>&& __p) _NOEXCEPT {
     return std::forward<_T1>(__p.first);
   }
   template <class _T1, class _T2>
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const _T1&& get(const pair<_T1, _T2>&& __p) _NOEXCEPT {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX14 const _T1&& get(const pair<_T1, _T2>&& __p) _NOEXCEPT {
     return std::forward<const _T1>(__p.first);
   }
 };
 @@ -591,92 +575,88 @@ struct __get_pair<0> {
 template <>
 struct __get_pair<1> {
   template <class _T1, class _T2>
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _T2& get(pair<_T1, _T2>& __p) _NOEXCEPT {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX14 _T2& get(pair<_T1, _T2>& __p) _NOEXCEPT {
     return __p.second;
   }
   template <class _T1, class _T2>
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const _T2& get(const pair<_T1, _T2>& __p) _NOEXCEPT {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX14 const _T2& get(const pair<_T1, _T2>& __p) _NOEXCEPT {
     return __p.second;
   }
   template <class _T1, class _T2>
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _T2&& get(pair<_T1, _T2>&& __p) _NOEXCEPT {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX14 _T2&& get(pair<_T1, _T2>&& __p) _NOEXCEPT {
     return std::forward<_T2>(__p.second);
   }
   template <class _T1, class _T2>
-  static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const _T2&& get(const pair<_T1, _T2>&& __p) _NOEXCEPT {
+  static _LIBCPP_CONSTEXPR_SINCE_CXX14 const _T2&& get(const pair<_T1, _T2>&& __p) _NOEXCEPT {
     return std::forward<const _T2>(__p.second);
   }
 };
 template <size_t _Ip, class _T1, class _T2>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
+[[__nodiscard__]] inline _LIBCPP_CONSTEXPR_SINCE_CXX14 typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&
 get(pair<_T1, _T2>& __p) _NOEXCEPT {
   return __get_pair<_Ip>::get(__p);
 }
 template <size_t _Ip, class _T1, class _T2>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI
+[[__nodiscard__]] inline _LIBCPP_CONSTEXPR_SINCE_CXX14 const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-_LIBCPP_CONSTEXPR_SINCE_CXX14 const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
 get(const pair<_T1, _T2>& __p) _NOEXCEPT {
   return __get_pair<_Ip>::get(__p);
 }
 template <size_t _Ip, class _T1, class _T2>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14
+[[__nodiscard__]] inline _LIBCPP_CONSTEXPR_SINCE_CXX14 typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
 get(pair<_T1, _T2>&& __p) _NOEXCEPT {
   return __get_pair<_Ip>::get(std::move(__p));
 }
 template <size_t _Ip, class _T1, class _T2>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI
+[[__nodiscard__]] inline _LIBCPP_CONSTEXPR_SINCE_CXX14 const typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
-_LIBCPP_CONSTEXPR_SINCE_CXX14 const typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
 get(const pair<_T1, _T2>&& __p) _NOEXCEPT {
   return __get_pair<_Ip>::get(std::move(__p));
 }
 #if _LIBCPP_STD_VER >= 14
 template <class _T1, class _T2>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI constexpr _T1& get(pair<_T1, _T2>& __p) _NOEXCEPT {
+[[__nodiscard__]] inline constexpr _T1& get(pair<_T1, _T2>& __p) _NOEXCEPT {
   return __p.first;
 }
 template <class _T1, class _T2>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI constexpr _T1 const& get(pair<_T1, _T2> const& __p) _NOEXCEPT {
+[[__nodiscard__]] inline constexpr _T1 const& get(pair<_T1, _T2> const& __p) _NOEXCEPT {
   return __p.first;
 }
 template <class _T1, class _T2>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI constexpr _T1&& get(pair<_T1, _T2>&& __p) _NOEXCEPT {
+[[__nodiscard__]] inline constexpr _T1&& get(pair<_T1, _T2>&& __p) _NOEXCEPT {
   return std::forward<_T1&&>(__p.first);
 }
 template <class _T1, class _T2>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI constexpr _T1 const&& get(pair<_T1, _T2> const&& __p) _NOEXCEPT {
+[[__nodiscard__]] inline constexpr _T1 const&& get(pair<_T1, _T2> const&& __p) _NOEXCEPT {
   return std::forward<_T1 const&&>(__p.first);
 }
 template <class _T2, class _T1>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI constexpr _T2& get(pair<_T1, _T2>& __p) _NOEXCEPT {
+[[__nodiscard__]] inline constexpr _T2& get(pair<_T1, _T2>& __p) _NOEXCEPT {
   return __p.second;
 }
 template <class _T2, class _T1>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI constexpr _T2 const& get(pair<_T1, _T2> const& __p) _NOEXCEPT {
+[[__nodiscard__]] inline constexpr _T2 const& get(pair<_T1, _T2> const& __p) _NOEXCEPT {
   return __p.second;
 }
 template <class _T2, class _T1>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI constexpr _T2&& get(pair<_T1, _T2>&& __p) _NOEXCEPT {
+[[__nodiscard__]] inline constexpr _T2&& get(pair<_T1, _T2>&& __p) _NOEXCEPT {
   return std::forward<_T2&&>(__p.second);
 }
 template <class _T2, class _T1>
-[[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI constexpr _T2 const&& get(pair<_T1, _T2> const&& __p) _NOEXCEPT {
+[[__nodiscard__]] inline constexpr _T2 const&& get(pair<_T1, _T2> const&& __p) _NOEXCEPT {
   return std::forward<_T2 const&&>(__p.second);
 }

lib/libcxx/include/__utility/try_key_extraction.h+16-12

 @@ -27,61 +27,65 @@
 _LIBCPP_BEGIN_NAMESPACE_STD
-template <class _KeyT, class _Ret, class _WithKey, class _WithoutKey, class... _Args>
+template <class _KeyT, bool, class _Ret, class _WithKey, class _WithoutKey, class... _Args>
-_LIBCPP_HIDE_FROM_ABI _Ret
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _Ret
 __try_key_extraction_impl(__priority_tag<0>, _WithKey, _WithoutKey __without_key, _Args&&... __args) {
   return __without_key(std::forward<_Args>(__args)...);
 }
 template <class _KeyT,
+          bool,
           class _Ret,
           class _WithKey,
           class _WithoutKey,
           class _Arg,
           __enable_if_t<is_same<_KeyT, __remove_const_ref_t<_Arg> >::value, int> = 0>
-_LIBCPP_HIDE_FROM_ABI _Ret
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _Ret
 __try_key_extraction_impl(__priority_tag<1>, _WithKey __with_key, _WithoutKey, _Arg&& __arg) {
   return __with_key(__arg, std::forward<_Arg>(__arg));
 }
 template <class _KeyT,
+          bool __is_map,
           class _Ret,
           class _WithKey,
           class _WithoutKey,
           class _Arg,
-          __enable_if_t<__is_pair_v<__remove_const_ref_t<_Arg> > &&
+          __enable_if_t<__is_map && __is_pair_v<__remove_const_ref_t<_Arg> > &&
                             is_same<__remove_const_t<typename __remove_const_ref_t<_Arg>::first_type>, _KeyT>::value,
                         int> = 0>
-_LIBCPP_HIDE_FROM_ABI _Ret
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _Ret
 __try_key_extraction_impl(__priority_tag<1>, _WithKey __with_key, _WithoutKey, _Arg&& __arg) {
   return __with_key(__arg.first, std::forward<_Arg>(__arg));
 }
 template <class _KeyT,
+          bool __is_map,
           class _Ret,
           class _WithKey,
           class _WithoutKey,
           class _Arg1,
           class _Arg2,
-          __enable_if_t<is_same<_KeyT, __remove_const_ref_t<_Arg1> >::value, int> = 0>
+          __enable_if_t<__is_map && is_same<_KeyT, __remove_const_ref_t<_Arg1> >::value, int> = 0>
-_LIBCPP_HIDE_FROM_ABI _Ret
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _Ret
 __try_key_extraction_impl(__priority_tag<1>, _WithKey __with_key, _WithoutKey, _Arg1&& __arg1, _Arg2&& __arg2) {
   return __with_key(__arg1, std::forward<_Arg1>(__arg1), std::forward<_Arg2>(__arg2));
 }
 #ifndef _LIBCPP_CXX03_LANG
 template <class _KeyT,
+          bool __is_map,
           class _Ret,
           class _WithKey,
           class _WithoutKey,
           class _PiecewiseConstruct,
           class _Tuple1,
           class _Tuple2,
-          __enable_if_t<is_same<__remove_const_ref_t<_PiecewiseConstruct>, piecewise_construct_t>::value &&
+          __enable_if_t<__is_map && is_same<__remove_const_ref_t<_PiecewiseConstruct>, piecewise_construct_t>::value &&
                             __is_tuple_v<_Tuple1> && tuple_size<_Tuple1>::value == 1 &&
                             is_same<__remove_const_ref_t<typename tuple_element<0, _Tuple1>::type>, _KeyT>::value,
                         int> = 0>
-_LIBCPP_HIDE_FROM_ABI _Ret __try_key_extraction_impl(
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 _Ret __try_key_extraction_impl(
     __priority_tag<1>,
     _WithKey __with_key,
     _WithoutKey,
 @@ -101,11 +105,11 @@ _LIBCPP_HIDE_FROM_ABI _Ret __try_key_extraction_impl(
 // arguments. Otherwise it calls the `__without_key` function with all of the arguments.
 //
 // Both `__with_key` and `__without_key` must take all arguments by reference.
-template <class _KeyT, class _WithKey, class _WithoutKey, class... _Args>
+template <class _KeyT, class _ValT, class _WithKey, class _WithoutKey, class... _Args>
-_LIBCPP_HIDE_FROM_ABI decltype(std::declval<_WithoutKey>()(std::declval<_Args>()...))
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 decltype(std::declval<_WithoutKey>()(std::declval<_Args>()...))
 __try_key_extraction(_WithKey __with_key, _WithoutKey __without_key, _Args&&... __args) {
   using _Ret = decltype(__without_key(std::forward<_Args>(__args)...));
-  return std::__try_key_extraction_impl<_KeyT, _Ret>(
+  return std::__try_key_extraction_impl<_KeyT, !is_same<_KeyT, _ValT>::value, _Ret>(
       __priority_tag<1>(), __with_key, __without_key, std::forward<_Args>(__args)...);
 }

lib/libcxx/include/__variant/monostate.h+4-4

 @@ -19,10 +19,10 @@
 #  pragma GCC system_header
 #endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 struct monostate {};
 _LIBCPP_HIDE_FROM_ABI inline constexpr bool operator==(monostate, monostate) noexcept { return true; }
 @@ -59,8 +59,8 @@ struct hash<monostate> {
   }
 };
-#endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#endif // _LIBCPP_STD_VER >= 17
 #endif // _LIBCPP___VARIANT_MONOSTATE_H

lib/libcxx/include/__vector/layout.h created+479

...	@@ -0,0 +1,479 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP___VECTOR_LAYOUT_H
10	#define _LIBCPP___VECTOR_LAYOUT_H
11
12	#include <__assert>
13	#include <__config>
14	#include <__debug_utils/sanitizers.h>
15	#include <__memory/allocator_traits.h>
16	#include <__memory/compressed_pair.h>
17	#include <__memory/pointer_traits.h>
18	#include <__memory/swap_allocator.h>
19	#include <__memory/uninitialized_algorithms.h>
20	#include <__split_buffer>
21	#include <__type_traits/is_nothrow_constructible.h>
22	#include <__utility/exchange.h>
23	#include <__utility/move.h>
24	#include <__utility/swap.h>
25
26	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
27	# pragma GCC system_header
28	#endif
29
30	_LIBCPP_PUSH_MACROS
31	#include <__undef_macros>
32
33	_LIBCPP_BEGIN_NAMESPACE_STD
34
35	/// Defines `std::vector`'s storage layout and any operations that are affected by a change in the
36	/// layout.
37	///
38	/// `std::vector` can be represented in a variety of ways. Each representation strongly influences
39	/// the codegen when calling vector operations, which can significantly impact runtime performance
40	/// and memory utilisation. libc++ provides two alternative layouts for `std::vector`, although only
41	/// one can be active for an entire binary:
42	///
43	/// * pointer-based layout (stable ABI default)
44	/// * size-based layout (unstable ABI alternative)
45	//
46	/// We describe these layouts below. All vector representations have a pointer that points to where
47	/// the memory is allocated (called `__begin_`).
48	///
49	/// Pointer-based layout
50	///
51	/// The pointer-based layout uses two more pointers in addition to `__begin_`. The second pointer
52	/// (called `__end_`) points past the end of the part of the buffer that holds valid elements.
53	/// Another pointer (called `__capacity_`) points past the end of the allocated buffer. The original
54	/// libc++ `std::vector` implementation only provided the pointer-based layout. libc++ continues to
55	/// use the pointer-based layout, by default, in order to maintain binary compatibility with
56	/// existing software.
57	///
58	/// The `__end_` pointer has three primary use-cases:
59	/// * to compute the size of the vector; and
60	/// * to construct the past-the-end iterator; and
61	/// * to indicate where the next element should be appended.
62	///
63	/// The `__capacity_` is used to compute the capacity of the vector, which lets the vector know how
64	/// many elements can be added to the vector before a reallocation is necessary.
65	///
66	/// __begin_ = 0xE4FD0, __end_ = 0xE4FF0, __capacity_ = 0xE5000
67	/// 0xE4FD0 0xE4FF0 0xE5000
68	/// v v v
69	/// +---------------+--------+--------+--------+--------+--------+--------+---------------------+
70	/// \| ????????????? \| 3174 \| 5656 \| 648 \| 489 \| ------ \| ------ \| ??????????????????? \|
71	/// +---------------+--------+--------+--------+--------+--------+--------+---------------------+
72	/// ^ ^ ^
73	/// __begin_ __end_ __capacity_
74	///
75	/// Figure 1: A visual representation of a pointer-based `std::vector<short>`. This vector has
76	/// four elements, with the capacity to store six. Boxes with numbers are valid elements within
77	/// the vector, and boxes with `xx` have been allocated, but aren't being used as elements right
78	/// now.
79	///
80	/// This is the default layout for libc++.
81	///
82	/// Size-based layout
83	///
84	/// The size-based layout uses integers to track its size and capacity, and computes pointers to
85	/// past-the-end of the valid range and the whole buffer only when it's necessary. Programs using
86	/// the size-based layout have been measured to yield improved compute and memory performance over
87	/// the pointer-based layout. Despite these promising measurements, the size-based layout is opt-in,
88	/// to preserve ABI compatibility with prebuilt binaries. Given the improved performance, we
89	/// recommend preferring the size-based layout in the absence of such ABI constraints.
90	///
91	/// __begin_ = 0xE4FD0, __size_ = 4, __capacity_ = 6
92	/// 0xE4FD0
93	/// v
94	/// +---------------+--------+--------+--------+--------+--------+--------+---------------------+
95	/// \| ????????????? \| 3174 \| 5656 \| 648 \| 489 \| ------ \| ------ \| ??????????????????? \|
96	/// +---------------+--------+--------+--------+--------+--------+--------+---------------------+
97	/// ^
98	/// __begin_
99	///
100	/// Figure 2: A visual representation of this a size-based layout. Blank boxes are not a part
101	/// of the vector's allocated buffer.
102	///
103	/// Class design
104	///
105	/// __vector_layout was designed with the following goals:
106	/// 1. to abstractly represent the buffer's boundaries; and
107	/// 2. to limit the number of `#ifdef` blocks that a reader needs to pass through; and
108	/// 3. given (1) and (2), to have no logically identical components in multiple `#ifdef` clauses.
109	///
110	/// To facilitate these goals, there is a single `__vector_layout` definition. Users must choose
111	/// their vector's layout when libc++ is being configured, so there is no need to manage multiple
112	/// vector layout types (e.g. `__vector_size_layout`, `__vector_pointer_layout`, etc.). In doing so,
113	/// we reduce a significant portion of duplicate code.
114	template <class _Tp, class _Allocator>
115	class __vector_layout {
116	public:
117	using value_type _LIBCPP_NODEBUG = _Tp;
118	using allocator_type _LIBCPP_NODEBUG = _Allocator;
119	using __alloc_traits _LIBCPP_NODEBUG = allocator_traits<allocator_type>;
120	using size_type _LIBCPP_NODEBUG = typename __alloc_traits::size_type;
121	using pointer _LIBCPP_NODEBUG = typename __alloc_traits::pointer;
122	using const_pointer _LIBCPP_NODEBUG = typename __alloc_traits::const_pointer;
123	#ifdef _LIBCPP_ABI_VECTOR_LAYOUT_SIZE_BASED
124	using _SplitBuffer _LIBCPP_NODEBUG = __split_buffer<_Tp, _Allocator, __split_buffer_size_layout>;
125	using __bound_type _LIBCPP_NODEBUG = size_type;
126	#else
127	using _SplitBuffer _LIBCPP_NODEBUG = __split_buffer<_Tp, _Allocator, __split_buffer_pointer_layout>;
128	using __bound_type _LIBCPP_NODEBUG = pointer;
129	#endif
130
131	// Cannot be defaulted, since `_LIBCPP_COMPRESSED_PAIR` isn't an aggregate before C++14.
132	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __vector_layout()
133	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
134	: __capacity_() {}
135
136	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit __vector_layout(allocator_type const& __a)
137	_NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)
138	: __capacity_(), __alloc_(__a) {}
139
140	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit __vector_layout(allocator_type&& __a)
141	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
142	: __capacity_(), __alloc_(std::move(__a)) {}
143
144	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __vector_layout(__vector_layout&& __other)
145	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
146
147	/// Returns a reference to the stored allocator.
148	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI allocator_type& __alloc() _NOEXCEPT {
149	return __alloc_;
150	}
151
152	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI allocator_type const&
153	__alloc() const _NOEXCEPT {
154	return __alloc_;
155	}
156
157	/// Returns a pointer to the beginning of the buffer.
158	///
159	/// `__begin_ptr()` is not called `data()` because `vector::data()` returns `T*`, but `__begin_`
160	/// is allowed to be a fancy pointer.
161	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer __begin_ptr() _NOEXCEPT {
162	return __begin_;
163	}
164
165	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_pointer __begin_ptr() const _NOEXCEPT {
166	return __begin_;
167	}
168
169	/// Returns a built-in pointer to the beginning of the buffer.
170	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI _Tp* __data() _NOEXCEPT {
171	return std::__to_address(__begin_);
172	}
173
174	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI _Tp const* __data() const _NOEXCEPT {
175	return std::__to_address(__begin_);
176	}
177
178	/// Returns how many elements can be added before a reallocation occurs.
179	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type
180	__remaining_capacity() const _NOEXCEPT;
181
182	/// Sets the member pointing to the first element in the vector to `__new_begin`, the member used
183	/// to obtain the vector's bound to the equivalent of `__new_size`, and the member that represents
184	/// the vector's capacity to the equivalent to `__new_capacity`.
185	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
186	__set_layout(pointer __new_begin, size_type __new_size, size_type __new_capacity) _NOEXCEPT;
187
188	/// Sets the member used to obtain the vector's bound to the equivalent of `__ptr`.
189	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __set_bound_using_pointer(pointer __ptr) _NOEXCEPT;
190
191	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __reset_without_allocator() _NOEXCEPT;
192	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __swap(__vector_layout& __other) _NOEXCEPT;
193	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
194	__move_assign_without_allocator(__vector_layout& __other) _NOEXCEPT;
195
196	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __relocate(_SplitBuffer& __buffer);
197	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer
198	__relocate_with_pivot(_SplitBuffer& __buffer, pointer __pivot);
199
200	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type __size() const _NOEXCEPT;
201	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type __capacity() const _NOEXCEPT;
202	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __empty() const _NOEXCEPT;
203	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer __end_ptr() _NOEXCEPT;
204	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_pointer __end_ptr() const _NOEXCEPT;
205	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer __capacity_ptr() _NOEXCEPT;
206	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_pointer __capacity_ptr() const _NOEXCEPT;
207	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __invariants() const _NOEXCEPT;
208
209	private:
210	pointer __begin_ = nullptr;
211
212	#ifdef _LIBCPP_ABI_VECTOR_LAYOUT_SIZE_BASED
213	size_type __size_ = 0;
214	size_type __capacity_ = 0;
215	_LIBCPP_NO_UNIQUE_ADDRESS allocator_type __alloc_;
216	#else
217	pointer __end_ = nullptr;
218	_LIBCPP_COMPRESSED_PAIR(pointer, __capacity_ = nullptr, allocator_type, __alloc_);
219	#endif
220
221	_LIBCPP_CONSTEXPR_SINCE_CXX20
222	_LIBCPP_HIDE_FROM_ABI void __annotate_contiguous_container(const void* __old_mid, const void* __new_mid) const {
223	std::__annotate_contiguous_container<_Allocator>(__data(), __data() + __capacity(), __old_mid, __new_mid);
224	}
225
226	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __annotate_new(size_type __current_size) const _NOEXCEPT {
227	__annotate_contiguous_container(__data() + __capacity(), __data() + __current_size);
228	}
229
230	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __annotate_delete() const _NOEXCEPT {
231	__annotate_contiguous_container(__data() + __size(), __data() + __capacity());
232	}
233	};
234
235	#ifdef _LIBCPP_ABI_VECTOR_LAYOUT_SIZE_BASED
236	template <class _Tp, class _Alloc>
237	_LIBCPP_CONSTEXPR_SINCE_CXX20 __vector_layout<_Tp, _Alloc>::__vector_layout(__vector_layout&& __other)
238	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
239	: __begin_(std::__exchange(__other.__begin_, nullptr)),
240	__size_(std::__exchange(__other.__size_, 0)),
241	__capacity_(std::__exchange(__other.__capacity_, 0)),
242	__alloc_(std::move(__other.__alloc_)) {}
243
244	template <class _Tp, class _Alloc>
245	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::size_type
246	__vector_layout<_Tp, _Alloc>::__remaining_capacity() const _NOEXCEPT {
247	return __capacity_ - __size_;
248	}
249
250	template <class _Tp, class _Alloc>
251	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__set_layout(
252	pointer __new_begin, size_type __new_size, size_type __new_capacity) _NOEXCEPT {
253	__begin_ = __new_begin;
254	__size_ = __new_size;
255	__capacity_ = __new_capacity;
256	}
257
258	template <class _Tp, class _Alloc>
259	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__set_bound_using_pointer(pointer __ptr) _NOEXCEPT {
260	__size_ = static_cast<size_type>(__ptr - __begin_);
261	}
262
263	template <class _Tp, class _Alloc>
264	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__reset_without_allocator() _NOEXCEPT {
265	__begin_ = nullptr;
266	__size_ = 0;
267	__capacity_ = 0;
268	}
269
270	template <class _Tp, class _Alloc>
271	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__swap(__vector_layout& __other) _NOEXCEPT {
272	using std::swap;
273	swap(__begin_, __other.__begin_);
274	swap(__size_, __other.__size_);
275	swap(__capacity_, __other.__capacity_);
276	std::__swap_allocator(__alloc_, __other.__alloc_);
277	}
278
279	template <class _Tp, class _Alloc>
280	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
281	__vector_layout<_Tp, _Alloc>::__move_assign_without_allocator(__vector_layout& __other) _NOEXCEPT {
282	__begin_ = __other.__begin_;
283	__size_ = __other.__size_;
284	__capacity_ = __other.__capacity_;
285
286	__other.__reset_without_allocator();
287	}
288
289	template <class _Tp, class _Alloc>
290	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__relocate(_SplitBuffer& __buffer) {
291	__annotate_delete();
292	__buffer.__relocate(__begin_, __size_, __capacity_);
293	__annotate_new(__size_);
294	}
295
296	template <class _Tp, class _Alloc>
297	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::pointer
298	__vector_layout<_Tp, _Alloc>::__relocate_with_pivot(_SplitBuffer& __buffer, pointer __pivot) {
299	__annotate_delete();
300	auto __result = __buffer.__relocate_with_pivot(__pivot, __begin_, __size_, __capacity_);
301	__annotate_new(__size_);
302	return __result;
303	}
304
305	template <class _Tp, class _Alloc>
306	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::size_type
307	__vector_layout<_Tp, _Alloc>::__size() const _NOEXCEPT {
308	return __size_;
309	}
310
311	template <class _Tp, class _Alloc>
312	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::size_type
313	__vector_layout<_Tp, _Alloc>::__capacity() const _NOEXCEPT {
314	return __capacity_;
315	}
316
317	template <class _Tp, class _Alloc>
318	_LIBCPP_CONSTEXPR_SINCE_CXX20 bool __vector_layout<_Tp, _Alloc>::__empty() const _NOEXCEPT {
319	return __size_ == 0;
320	}
321
322	template <class _Tp, class _Alloc>
323	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::pointer
324	__vector_layout<_Tp, _Alloc>::__end_ptr() _NOEXCEPT {
325	return __begin_ + __size_;
326	}
327
328	template <class _Tp, class _Alloc>
329	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::const_pointer
330	__vector_layout<_Tp, _Alloc>::__end_ptr() const _NOEXCEPT {
331	return __begin_ + __size_;
332	}
333
334	template <class _Tp, class _Alloc>
335	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::pointer
336	__vector_layout<_Tp, _Alloc>::__capacity_ptr() _NOEXCEPT {
337	return __begin_ + __capacity_;
338	}
339
340	template <class _Tp, class _Alloc>
341	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::const_pointer
342	__vector_layout<_Tp, _Alloc>::__capacity_ptr() const _NOEXCEPT {
343	return __begin_ + __capacity_;
344	}
345
346	template <class _Tp, class _Alloc>
347	_LIBCPP_CONSTEXPR_SINCE_CXX20 bool __vector_layout<_Tp, _Alloc>::__invariants() const _NOEXCEPT {
348	if (__begin_ == nullptr)
349	return __size_ == 0 && __capacity_ == 0;
350	return __size_ <= __capacity_;
351	}
352	#else // !defined(_LIBCPP_ABI_VECTOR_LAYOUT_SIZE_BASED)
353	template <class _Tp, class _Alloc>
354	_LIBCPP_CONSTEXPR_SINCE_CXX20 __vector_layout<_Tp, _Alloc>::__vector_layout(__vector_layout&& __other)
355	_NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
356	: __begin_(std::__exchange(__other.__begin_, nullptr)),
357	__end_(std::__exchange(__other.__end_, nullptr)),
358	__capacity_(std::__exchange(__other.__capacity_, nullptr)),
359	__alloc_(std::move(__other.__alloc_)) {}
360
361	template <class _Tp, class _Alloc>
362	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::size_type
363	__vector_layout<_Tp, _Alloc>::__remaining_capacity() const _NOEXCEPT {
364	return __capacity_ - __end_;
365	}
366
367	template <class _Tp, class _Alloc>
368	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__set_layout(
369	pointer __new_begin, size_type __new_size, size_type __new_capacity) _NOEXCEPT {
370	__begin_ = __new_begin;
371	__end_ = __new_begin + __new_size;
372	__capacity_ = __new_begin + __new_capacity;
373	}
374
375	template <class _Tp, class _Alloc>
376	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__set_bound_using_pointer(pointer __ptr) _NOEXCEPT {
377	__end_ = __ptr;
378	}
379
380	template <class _Tp, class _Alloc>
381	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__reset_without_allocator() _NOEXCEPT {
382	__begin_ = nullptr;
383	__end_ = nullptr;
384	__capacity_ = nullptr;
385	}
386
387	template <class _Tp, class _Alloc>
388	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__swap(__vector_layout& __other) _NOEXCEPT {
389	using std::swap;
390	swap(__begin_, __other.__begin_);
391	swap(__end_, __other.__end_);
392	swap(__capacity_, __other.__capacity_);
393	std::__swap_allocator(__alloc_, __other.__alloc_);
394	}
395
396	template <class _Tp, class _Alloc>
397	_LIBCPP_CONSTEXPR_SINCE_CXX20 void
398	__vector_layout<_Tp, _Alloc>::__move_assign_without_allocator(__vector_layout& __other) _NOEXCEPT {
399	__begin_ = __other.__begin_;
400	__end_ = __other.__end_;
401	__capacity_ = __other.__capacity_;
402
403	__other.__reset_without_allocator();
404	}
405
406	template <class _Tp, class _Alloc>
407	_LIBCPP_CONSTEXPR_SINCE_CXX20 void __vector_layout<_Tp, _Alloc>::__relocate(_SplitBuffer& __buffer) {
408	__annotate_delete();
409	__buffer.__relocate(__begin_, __end_, __capacity_);
410	__annotate_new(__size());
411	}
412
413	template <class _Tp, class _Alloc>
414	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::pointer
415	__vector_layout<_Tp, _Alloc>::__relocate_with_pivot(_SplitBuffer& __buffer, pointer __pivot) {
416	__annotate_delete();
417	auto __result = __buffer.__relocate_with_pivot(__pivot, __begin_, __end_, __capacity_);
418	__annotate_new(__size());
419	return __result;
420	}
421
422	template <class _Tp, class _Alloc>
423	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::size_type
424	__vector_layout<_Tp, _Alloc>::__size() const _NOEXCEPT {
425	return static_cast<size_type>(__end_ - __begin_);
426	}
427
428	template <class _Tp, class _Alloc>
429	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::size_type
430	__vector_layout<_Tp, _Alloc>::__capacity() const _NOEXCEPT {
431	return static_cast<size_type>(__capacity_ - __begin_);
432	}
433
434	template <class _Tp, class _Alloc>
435	_LIBCPP_CONSTEXPR_SINCE_CXX20 bool __vector_layout<_Tp, _Alloc>::__empty() const _NOEXCEPT {
436	return __begin_ == __end_;
437	}
438
439	template <class _Tp, class _Alloc>
440	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::pointer
441	__vector_layout<_Tp, _Alloc>::__end_ptr() _NOEXCEPT {
442	return __end_;
443	}
444
445	template <class _Tp, class _Alloc>
446	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::const_pointer
447	__vector_layout<_Tp, _Alloc>::__end_ptr() const _NOEXCEPT {
448	return __end_;
449	}
450
451	template <class _Tp, class _Alloc>
452	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::pointer
453	__vector_layout<_Tp, _Alloc>::__capacity_ptr() _NOEXCEPT {
454	return __capacity_;
455	}
456
457	template <class _Tp, class _Alloc>
458	_LIBCPP_CONSTEXPR_SINCE_CXX20 typename __vector_layout<_Tp, _Alloc>::const_pointer
459	__vector_layout<_Tp, _Alloc>::__capacity_ptr() const _NOEXCEPT {
460	return __capacity_;
461	}
462
463	template <class _Tp, class _Alloc>
464	_LIBCPP_CONSTEXPR_SINCE_CXX20 bool __vector_layout<_Tp, _Alloc>::__invariants() const _NOEXCEPT {
465	if (__begin_ == nullptr)
466	return __end_ == nullptr && __capacity_ == nullptr;
467	if (__begin_ > __end_)
468	return false;
469	if (__begin_ == __capacity_)
470	return false;
471	return __end_ <= __capacity_;
472	}
473	#endif // _LIBCPP_ABI_VECTOR_LAYOUT_SIZE_BASED
474
475	_LIBCPP_END_NAMESPACE_STD
476
477	_LIBCPP_POP_MACROS
478
479	#endif // _LIBCPP___VECTOR_LAYOUT_H

lib/libcxx/include/__vector/vector.h+218-301

 @@ -56,6 +56,7 @@
 #include <__type_traits/is_nothrow_constructible.h>
 #include <__type_traits/is_pointer.h>
 #include <__type_traits/is_same.h>
+#include <__type_traits/is_swappable.h>
 #include <__type_traits/is_trivially_relocatable.h>
 #include <__type_traits/type_identity.h>
 #include <__utility/declval.h>
 @@ -72,6 +73,7 @@
 // These headers define parts of vectors definition, since they define ADL functions or class specializations.
 #include <__vector/comparison.h>
 #include <__vector/container_traits.h>
+#include <__vector/layout.h>
 #include <__vector/swap.h>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 @@ -85,19 +87,19 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp, class _Allocator /* = allocator<_Tp> */>
 class vector {
-  template <class _Up, class _Alloc>
+  using __base_type _LIBCPP_NODEBUG  = __vector_layout<_Tp, _Allocator>;
-  using __split_buffer _LIBCPP_NODEBUG = std::__split_buffer<_Up, _Alloc, __split_buffer_pointer_layout>;
+  using __bound_type _LIBCPP_NODEBUG = typename __base_type::__bound_type;
+  using _SplitBuffer _LIBCPP_NODEBUG = typename __base_type::_SplitBuffer;
 public:
   //
   // Types
   //
-  using __self _LIBCPP_NODEBUG         = vector;
   using value_type                     = _Tp;
   using allocator_type                 = _Allocator;
-  using __alloc_traits _LIBCPP_NODEBUG = allocator_traits<allocator_type>;
+  using __alloc_traits _LIBCPP_NODEBUG = allocator_traits<_Allocator>;
-  using reference                      = value_type&;
+  using reference                      = _Tp&;
-  using const_reference                = const value_type&;
+  using const_reference                = const _Tp&;
   using size_type                      = typename __alloc_traits::size_type;
   using difference_type                = typename __alloc_traits::difference_type;
   using pointer                        = typename __alloc_traits::pointer;
 @@ -106,8 +108,8 @@ public:
   // Users might provide custom allocators, and prior to C++20 we have no existing way to detect whether the allocator's
   // pointer type is contiguous (though it has to be by the Standard). Using the wrapper type ensures the iterator is
   // considered contiguous.
-  using iterator       = __bounded_iter<__wrap_iter<pointer> >;
+  using iterator       = __bounded_iter<pointer>;
-  using const_iterator = __bounded_iter<__wrap_iter<const_pointer> >;
+  using const_iterator = __bounded_iter<const_pointer>;
 #else
   using iterator       = __wrap_iter<pointer>;
   using const_iterator = __wrap_iter<const_pointer>;
 @@ -139,7 +141,7 @@ public:
 #else
       noexcept
 #endif
-      : __alloc_(__a) {
+      : __layout_(__a) {
   }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit vector(size_type __n) {
 @@ -151,9 +153,8 @@ public:
     __guard.__complete();
   }
-#if _LIBCPP_STD_VER >= 14
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit vector(size_type __n, const allocator_type& __a)
-      : __alloc_(__a) {
+      : __layout_(__a) {
     auto __guard = std::__make_exception_guard(__destroy_vector(*this));
     if (__n > 0) {
       __vallocate(__n);
 @@ -161,7 +162,6 @@ public:
     }
     __guard.__complete();
   }
-#endif
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector(size_type __n, const value_type& __x) {
     auto __guard = std::__make_exception_guard(__destroy_vector(*this));
 @@ -175,7 +175,7 @@ public:
   template <__enable_if_t<__is_allocator_v<_Allocator>, int> = 0>
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
   vector(size_type __n, const value_type& __x, const allocator_type& __a)
-      : __alloc_(__a) {
+      : __layout_(__a) {
     auto __guard = std::__make_exception_guard(__destroy_vector(*this));
     if (__n > 0) {
       __vallocate(__n);
 @@ -198,7 +198,7 @@ public:
                           int> = 0>
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
   vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a)
-      : __alloc_(__a) {
+      : __layout_(__a) {
     __init_with_sentinel(__first, __last);
   }
 @@ -219,16 +219,15 @@ public:
                     int> = 0>
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
   vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a)
-      : __alloc_(__a) {
+      : __layout_(__a) {
     size_type __n = static_cast<size_type>(std::distance(__first, __last));
     __init_with_size(__first, __last, __n);
   }
 #if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<_Tp> _Range>
-  _LIBCPP_HIDE_FROM_ABI constexpr vector(
+  _LIBCPP_HIDE_FROM_ABI constexpr vector(from_range_t, _Range&& __range, const allocator_type& __a = allocator_type())
-      from_range_t, _Range&& __range, const allocator_type& __alloc = allocator_type())
+      : __layout_(__a) {
-      : __alloc_(__alloc) {
     if constexpr (ranges::forward_range<_Range> || ranges::sized_range<_Range>) {
       auto __n = static_cast<size_type>(ranges::distance(__range));
       __init_with_size(ranges::begin(__range), ranges::end(__range), __n);
 @@ -245,10 +244,10 @@ private:
     _LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI __destroy_vector(vector& __vec) : __vec_(__vec) {}
     _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void operator()() {
-      if (__vec_.__begin_ != nullptr) {
+      if (__vec_.__layout_.__begin_ptr() != nullptr) {
         __vec_.clear();
         __vec_.__annotate_delete();
-        __alloc_traits::deallocate(__vec_.__alloc_, __vec_.__begin_, __vec_.capacity());
+        __alloc_traits::deallocate(__vec_.__layout_.__alloc(), __vec_.__layout_.__begin_ptr(), __vec_.capacity());
       }
     }
 @@ -256,17 +255,19 @@ private:
     vector& __vec_;
   };
+  using __emplace_back_result_t _LIBCPP_NODEBUG = _If<(_LIBCPP_STD_VER < 17), void, reference>;
 public:
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI ~vector() { __destroy_vector (*this)(); }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector(const vector& __x)
-      : __alloc_(__alloc_traits::select_on_container_copy_construction(__x.__alloc_)) {
+      : __layout_(__alloc_traits::select_on_container_copy_construction(__x.__layout_.__alloc())) {
-    __init_with_size(__x.__begin_, __x.__end_, __x.size());
+    __init_with_size(__x.__layout_.__begin_ptr(), __x.__layout_.__end_ptr(), __x.size());
   }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
   vector(const vector& __x, const __type_identity_t<allocator_type>& __a)
-      : __alloc_(__a) {
+      : __layout_(__a) {
-    __init_with_size(__x.__begin_, __x.__end_, __x.size());
+    __init_with_size(__x.__layout_.__begin_ptr(), __x.__layout_.__end_ptr(), __x.size());
   }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector& operator=(const vector& __x);
 @@ -277,7 +278,7 @@ public:
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
   vector(initializer_list<value_type> __il, const allocator_type& __a)
-      : __alloc_(__a) {
+      : __layout_(__a) {
     __init_with_size(__il.begin(), __il.end(), __il.size());
   }
 @@ -294,8 +295,8 @@ public:
       _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
 #endif
-  _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX20
-  vector(vector&& __x, const __type_identity_t<allocator_type>& __a);
+  _LIBCPP_HIDE_FROM_ABI vector(vector&& __x, const __type_identity_t<allocator_type>& __a);
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI vector& operator=(vector&& __x)
       _NOEXCEPT_(__noexcept_move_assign_container<_Allocator, __alloc_traits>::value) {
     __move_assign(__x, integral_constant<bool, __alloc_traits::propagate_on_container_move_assignment::value>());
 @@ -340,23 +341,23 @@ public:
 #endif
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const _NOEXCEPT {
-    return this->__alloc_;
+    return this->__layout_.__alloc();
   }
   //
   // Iterators
   //
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT {
-    return __make_iter(__add_alignment_assumption(this->__begin_));
+    return __make_iter(__add_alignment_assumption(this->__layout_.__begin_ptr()));
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT {
-    return __make_iter(__add_alignment_assumption(this->__begin_));
+    return __make_iter(__add_alignment_assumption(this->__layout_.__begin_ptr()));
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator end() _NOEXCEPT {
-    return __make_iter(__add_alignment_assumption(this->__end_));
+    return __make_iter(__add_alignment_assumption(__layout_.__end_ptr()));
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT {
-    return __make_iter(__add_alignment_assumption(this->__end_));
+    return __make_iter(__add_alignment_assumption(__layout_.__end_ptr()));
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reverse_iterator rbegin() _NOEXCEPT {
 @@ -391,16 +392,17 @@ public:
   // [vector.capacity], capacity
   //
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type size() const _NOEXCEPT {
-    return static_cast<size_type>(this->__end_ - this->__begin_);
+    return __layout_.__size();
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type capacity() const _NOEXCEPT {
-    return static_cast<size_type>(this->__cap_ - this->__begin_);
+    return __layout_.__capacity();
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool empty() const _NOEXCEPT {
-    return this->__begin_ == this->__end_;
+    return __layout_.__empty();
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI size_type max_size() const _NOEXCEPT {
-    return std::min<size_type>(__alloc_traits::max_size(this->__alloc_), numeric_limits<difference_type>::max());
+    return std::min<size_type>(__alloc_traits::max_size(__layout_.__alloc()), numeric_limits<difference_type>::max());
   }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void reserve(size_type __n);
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void shrink_to_fit() _NOEXCEPT;
 @@ -410,50 +412,50 @@ public:
   //
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference operator[](size_type __n) _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__n < size(), "vector[] index out of bounds");
-    return this->__begin_[__n];
+    return this->__layout_.__begin_ptr()[__n];
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference
   operator[](size_type __n) const _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__n < size(), "vector[] index out of bounds");
-    return this->__begin_[__n];
+    return this->__layout_.__begin_ptr()[__n];
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference at(size_type __n) {
     if (__n >= size())
       this->__throw_out_of_range();
-    return this->__begin_[__n];
+    return this->__layout_.__begin_ptr()[__n];
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference at(size_type __n) const {
     if (__n >= size())
       this->__throw_out_of_range();
-    return this->__begin_[__n];
+    return this->__layout_.__begin_ptr()[__n];
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference front() _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!empty(), "front() called on an empty vector");
-    return *this->__begin_;
+    return *this->__layout_.__begin_ptr();
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference front() const _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!empty(), "front() called on an empty vector");
-    return *this->__begin_;
+    return *this->__layout_.__begin_ptr();
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI reference back() _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!empty(), "back() called on an empty vector");
-    return *(this->__end_ - 1);
+    return end()[-1];
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_reference back() const _NOEXCEPT {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!empty(), "back() called on an empty vector");
-    return *(this->__end_ - 1);
+    return end()[-1];
   }
   //
   // [vector.data], data access
   //
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI value_type* data() _NOEXCEPT {
-    return std::__to_address(this->__begin_);
+    return __layout_.__data();
   }
   [[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const value_type* data() const _NOEXCEPT {
-    return std::__to_address(this->__begin_);
+    return __layout_.__data();
   }
   //
 @@ -464,21 +466,15 @@ public:
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void push_back(value_type&& __x) { emplace_back(std::move(__x)); }
   template <class... _Args>
-  _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI __emplace_back_result_t emplace_back(_Args&&... __args);
-#if _LIBCPP_STD_VER >= 17
-  reference
-  emplace_back(_Args&&... __args);
-#else
-  void
-  emplace_back(_Args&&... __args);
-#endif
   template <class... _Args>
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __emplace_back_assume_capacity(_Args&&... __args) {
     _LIBCPP_ASSERT_INTERNAL(
         size() < capacity(), "We assume that we have enough space to insert an element at the end of the vector");
     _ConstructTransaction __tx(*this, 1);
-    __alloc_traits::construct(this->__alloc_, std::__to_address(__tx.__pos_), std::forward<_Args>(__args)...);
+    __alloc_traits::construct(
+        this->__layout_.__alloc(), std::__to_address(__tx.__pos_), std::forward<_Args>(__args)...);
     ++__tx.__pos_;
   }
 @@ -487,15 +483,15 @@ public:
   _LIBCPP_HIDE_FROM_ABI constexpr void append_range(_Range&& __range) {
     if constexpr (ranges::forward_range<_Range> || ranges::sized_range<_Range>) {
       auto __len = ranges::distance(__range);
-      if (__len <= __cap_ - __end_) {
+      if (__len <= static_cast<difference_type>(__layout_.__remaining_capacity())) {
         __construct_at_end(ranges::begin(__range), ranges::end(__range), __len);
       } else {
-        __split_buffer<value_type, allocator_type> __buffer(__recommend(size() + __len), size(), __alloc_);
+        _SplitBuffer __buffer(__recommend(size() + __len), size(), __layout_.__alloc());
         __buffer.__construct_at_end_with_size(ranges::begin(__range), __len);
-        __swap_out_circular_buffer(__buffer);
+        __layout_.__relocate(__buffer);
       }
     } else {
-      vector __buffer(__alloc_);
+      vector __buffer(__layout_.__alloc());
       for (auto&& __val : __range)
         __buffer.emplace_back(std::forward<decltype(__val)>(__val));
       append_range(ranges::as_rvalue_view(__buffer));
 @@ -505,7 +501,7 @@ public:
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void pop_back() {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!empty(), "vector::pop_back called on an empty vector");
-    this->__destruct_at_end(this->__end_ - 1);
+    this->__destruct_at_end(__layout_.__end_ptr() - 1);
   }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __position, const_reference __x);
 @@ -550,8 +546,8 @@ public:
 #endif
 #ifndef _LIBCPP_CXX03_LANG
-  _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI iterator
+  _LIBCPP_CONSTEXPR_SINCE_CXX20
-  insert(const_iterator __position, initializer_list<value_type> __il) {
+  _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __position, initializer_list<value_type> __il) {
     return insert(__position, __il.begin(), __il.end());
   }
 #endif
 @@ -561,7 +557,7 @@ public:
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void clear() _NOEXCEPT {
     size_type __old_size = size();
-    __base_destruct_at_end(this->__begin_);
+    __base_destruct_at_end(this->__layout_.__begin_ptr());
     __annotate_shrink(__old_size);
   }
 @@ -575,27 +571,41 @@ public:
       _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value || __is_nothrow_swappable_v<allocator_type>);
 #endif
-  _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __invariants() const;
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI bool __invariants() const _NOEXCEPT {
+    return __layout_.__invariants();
+  }
 private:
-  pointer __begin_ = nullptr;
+  __base_type __layout_;
-  pointer __end_   = nullptr;
-  _LIBCPP_COMPRESSED_PAIR(pointer, __cap_ = nullptr, allocator_type, __alloc_);
   //  Allocate space for __n objects
   //  throws length_error if __n > max_size()
   //  throws (probably bad_alloc) if memory run out
-  //  Precondition:  __begin_ == __end_ == __cap_ == nullptr
+  //  Precondition:  begin() == nullptr
+  //  Precondition:  size() == 0
+  //  Precondition:  capacity() == 0
   //  Precondition:  __n > 0
   //  Postcondition:  capacity() >= __n
   //  Postcondition:  size() == 0
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __vallocate(size_type __n) {
+    _LIBCPP_ASSERT_INTERNAL(
+        __layout_.__begin_ptr() == nullptr,
+        "vector::__vallocate can only be called on a vector that hasn't allocated memory. This vector either already "
+        "owns a buffer, or a deallocation function didn't reset the layout's begin pointer.");
+    _LIBCPP_ASSERT_INTERNAL(
+        size() == 0,
+        "vector::__vallocate can only be called on a vector that hasn't allocated memory. This vector either already "
+        "owns a buffer, or a deallocation function didn't reset the layout's size.");
+    _LIBCPP_ASSERT_INTERNAL(
+        __layout_.__capacity() == 0,
+        "vector::__vallocate can only be called on a vector that hasn't allocated memory. This vector either already "
+        "owns a buffer, or a deallocation function didn't reset the layout's capacity.");
+    _LIBCPP_ASSERT_INTERNAL(__n > 0, "vector::__vallocate cannot allocate 0 bytes");
     if (__n > max_size())
       this->__throw_length_error();
-    auto __allocation = std::__allocate_at_least(this->__alloc_, __n);
+    auto __allocation = std::__allocate_at_least(this->__layout_.__alloc(), __n);
-    __begin_          = __allocation.ptr;
+    __layout_.__set_layout(__allocation.ptr, 0, __allocation.count);
-    __end_            = __allocation.ptr;
-    __cap_            = __begin_ + __allocation.count;
     __annotate_new(0);
   }
 @@ -644,7 +654,7 @@ private:
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
   __insert_assign_n_unchecked(_Iterator __first, difference_type __n, pointer __position) {
     for (pointer __end_position = __position + __n; __position != __end_position; ++__position, (void)++__first) {
-      __temp_value<value_type, _Allocator> __tmp(this->__alloc_, *__first);
+      __temp_value<value_type, _Allocator> __tmp(this->__layout_.__alloc(), *__first);
       *__position = std::move(__tmp.get());
     }
   }
 @@ -680,10 +690,7 @@ private:
     // current implementation, there is no connection between a bounded iterator and its associated container, so we
     // don't have a way to update existing valid iterators when the container is resized and thus have to go with
     // a laxer approach.
-    return std::__make_bounded_iter(
+    return std::__make_bounded_iter(__p, __layout_.__begin_ptr(), __layout_.__capacity_ptr());
-        std::__wrap_iter<pointer>(__p),
-        std::__wrap_iter<pointer>(this->__begin_),
-        std::__wrap_iter<pointer>(this->__cap_));
 #else
     return iterator(__p);
 #endif // _LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR
 @@ -692,19 +699,12 @@ private:
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI const_iterator __make_iter(const_pointer __p) const _NOEXCEPT {
 #ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR
     // Bound the iterator according to the capacity, rather than the size.
-    return std::__make_bounded_iter(
+    return std::__make_bounded_iter(__p, __layout_.__begin_ptr(), __layout_.__capacity_ptr());
-        std::__wrap_iter<const_pointer>(__p),
-        std::__wrap_iter<const_pointer>(this->__begin_),
-        std::__wrap_iter<const_pointer>(this->__cap_));
 #else
     return const_iterator(__p);
 #endif // _LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR
   }
-  _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
-  __swap_out_circular_buffer(__split_buffer<value_type, allocator_type>& __v);
-  _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI pointer
-  __swap_out_circular_buffer(__split_buffer<value_type, allocator_type>& __v, pointer __p);
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
   __move_range(pointer __from_s, pointer __from_e, pointer __to);
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __move_assign(vector& __c, true_type)
 @@ -751,14 +751,14 @@ private:
   struct _ConstructTransaction {
     _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI explicit _ConstructTransaction(vector& __v, size_type __n)
-        : __v_(__v), __pos_(__v.__end_), __new_end_(__v.__end_ + __n) {
+        : __v_(__v), __pos_(__v.__layout_.__end_ptr()), __new_end_(__pos_ + __n) {
       __v_.__annotate_increase(__n);
     }
     _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI ~_ConstructTransaction() {
-      __v_.__end_ = __pos_;
+      __v_.__layout_.__set_bound_using_pointer(__pos_);
       if (__pos_ != __new_end_) {
-        __v_.__annotate_shrink(__new_end_ - __v_.__begin_);
+        __v_.__annotate_shrink(__new_end_ - __v_.__layout_.__begin_ptr());
       }
     }
 @@ -771,10 +771,10 @@ private:
   };
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __base_destruct_at_end(pointer __new_last) _NOEXCEPT {
-    pointer __soon_to_be_end = this->__end_;
+    pointer __soon_to_be_end = __layout_.__end_ptr();
     while (__new_last != __soon_to_be_end)
-      __alloc_traits::destroy(this->__alloc_, std::__to_address(--__soon_to_be_end));
+      __alloc_traits::destroy(this->__layout_.__alloc(), std::__to_address(--__soon_to_be_end));
-    this->__end_ = __new_last;
+    __layout_.__set_bound_using_pointer(__new_last);
   }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc(const vector& __c) {
 @@ -792,56 +792,38 @@ private:
   [[__noreturn__]] _LIBCPP_HIDE_FROM_ABI static void __throw_out_of_range() { std::__throw_out_of_range("vector"); }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc(const vector& __c, true_type) {
-    if (this->__alloc_ != __c.__alloc_) {
+    if (this->__layout_.__alloc() != __c.__layout_.__alloc()) {
       clear();
       __annotate_delete();
-      __alloc_traits::deallocate(this->__alloc_, this->__begin_, capacity());
+      __alloc_traits::deallocate(this->__layout_.__alloc(), this->__layout_.__begin_ptr(), capacity());
-      this->__begin_ = this->__end_ = this->__cap_ = nullptr;
+      __layout_.__reset_without_allocator();
     }
-    this->__alloc_ = __c.__alloc_;
+    this->__layout_.__alloc() = __c.__layout_.__alloc();
   }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __copy_assign_alloc(const vector&, false_type) {}
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __move_assign_alloc(vector& __c, true_type)
       _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) {
-    this->__alloc_ = std::move(__c.__alloc_);
+    this->__layout_.__alloc() = std::move(__c.__layout_.__alloc());
   }
   _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __move_assign_alloc(vector&, false_type) _NOEXCEPT {}
   template <class _Ptr = pointer, __enable_if_t<is_pointer<_Ptr>::value, int> = 0>
-  static _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_CFI pointer
+  static _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_CFI _Ptr
   __add_alignment_assumption(_Ptr __p) _NOEXCEPT {
     if (!__libcpp_is_constant_evaluated()) {
-      return static_cast<pointer>(__builtin_assume_aligned(__p, _LIBCPP_ALIGNOF(decltype(*__p))));
+      return static_cast<_Ptr>(__builtin_assume_aligned(__p, _LIBCPP_ALIGNOF(decltype(*__p))));
     }
     return __p;
   }
   template <class _Ptr = pointer, __enable_if_t<!is_pointer<_Ptr>::value, int> = 0>
-  static _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_CFI pointer
+  static _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_CFI _Ptr
   __add_alignment_assumption(_Ptr __p) _NOEXCEPT {
     return __p;
   }
-  _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void __swap_layouts(__split_buffer<_Tp, allocator_type>& __sb) {
-    auto __vector_begin    = __begin_;
-    auto __vector_sentinel = __end_;
-    auto __vector_cap      = __cap_;
-    auto __sb_begin    = __sb.begin();
-    auto __sb_sentinel = __sb.__raw_sentinel();
-    auto __sb_cap      = __sb.__raw_capacity();
-    // TODO: replace with __set_valid_range and __set_capacity when vector supports it.
-    __begin_ = __sb_begin;
-    __end_   = __sb_sentinel;
-    __cap_   = __sb_cap;
-    __sb.__set_valid_range(__vector_begin, __vector_sentinel);
-    __sb.__set_capacity(__vector_cap);
-  }
 };
 #if _LIBCPP_STD_VER >= 17
 @@ -865,60 +847,13 @@ template <ranges::input_range _Range,
 vector(from_range_t, _Range&&, _Alloc = _Alloc()) -> vector<ranges::range_value_t<_Range>, _Alloc>;
 #endif
-// __swap_out_circular_buffer relocates the objects in [__begin_, __end_) into the front of __v and swaps the buffers of
-// *this and __v. It is assumed that __v provides space for exactly (__end_ - __begin_) objects in the front. This
-// function has a strong exception guarantee.
-template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_SINCE_CXX20 void
-vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type>& __v) {
-  __annotate_delete();
-  auto __new_begin = __v.begin() - size();
-  std::__uninitialized_allocator_relocate(
-      this->__alloc_, std::__to_address(__begin_), std::__to_address(__end_), std::__to_address(__new_begin));
-  __v.__set_valid_range(__new_begin, __v.end());
-  __end_       = __begin_; // All the objects have been destroyed by relocating them.
-  __swap_layouts(__v);
-  __v.__set_data(__v.begin());
-  __annotate_new(size());
-}
-// __swap_out_circular_buffer relocates the objects in [__begin_, __p) into the front of __v, the objects in
-// [__p, __end_) into the back of __v and swaps the buffers of *this and __v. It is assumed that __v provides space for
-// exactly (__p - __begin_) objects in the front and space for at least (__end_ - __p) objects in the back. This
-// function has a strong exception guarantee if __begin_ == __p || __end_ == __p.
-template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::pointer
-vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type>& __v, pointer __p) {
-  __annotate_delete();
-  pointer __ret = __v.begin();
-  // Relocate [__p, __end_) first to avoid having a hole in [__begin_, __end_)
-  // in case something in [__begin_, __p) throws.
-  std::__uninitialized_allocator_relocate(
-      this->__alloc_, std::__to_address(__p), std::__to_address(__end_), std::__to_address(__v.end()));
-  auto __relocated_so_far = __end_ - __p;
-  __v.__set_sentinel(__v.end() + __relocated_so_far);
-  __end_           = __p; // The objects in [__p, __end_) have been destroyed by relocating them.
-  auto __new_begin = __v.begin() - (__p - __begin_);
-  std::__uninitialized_allocator_relocate(
-      this->__alloc_, std::__to_address(__begin_), std::__to_address(__p), std::__to_address(__new_begin));
-  __v.__set_valid_range(__new_begin, __v.end());
-  __end_ = __begin_; // All the objects have been destroyed by relocating them.
-  __swap_layouts(__v);
-  __v.__set_data(__v.begin());
-  __annotate_new(size());
-  return __ret;
-}
 template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__vdeallocate() _NOEXCEPT {
-  if (this->__begin_ != nullptr) {
+  if (this->__layout_.__begin_ptr() != nullptr) {
     clear();
     __annotate_delete();
-    __alloc_traits::deallocate(this->__alloc_, this->__begin_, capacity());
+    __alloc_traits::deallocate(this->__layout_.__alloc(), this->__layout_.__begin_ptr(), capacity());
-    this->__begin_ = this->__end_ = this->__cap_ = nullptr;
+    __layout_.__reset_without_allocator();
   }
 }
 @@ -935,7 +870,7 @@ vector<_Tp, _Allocator>::__recommend(size_type __new_size) const {
   return std::max<size_type>(2 * __cap, __new_size);
 }
-//  Default constructs __n objects starting at __end_
+//  Default constructs __n objects starting at __layout_.__end_ptr()
 //  throws if construction throws
 //  Precondition:  __n > 0
 //  Precondition:  size() + __n <= capacity()
 @@ -945,11 +880,11 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__construct_at_end(s
   _ConstructTransaction __tx(*this, __n);
   const_pointer __new_end = __tx.__new_end_;
   for (pointer __pos = __tx.__pos_; __pos != __new_end; __tx.__pos_ = ++__pos) {
-    __alloc_traits::construct(this->__alloc_, std::__to_address(__pos));
+    __alloc_traits::construct(this->__layout_.__alloc(), std::__to_address(__pos));
   }
 }
-//  Copy constructs __n objects starting at __end_ from __x
+//  Copy constructs __n objects starting at __layout_.__end_ptr() from __x
 //  throws if construction throws
 //  Precondition:  __n > 0
 //  Precondition:  size() + __n <= capacity()
 @@ -961,7 +896,7 @@ vector<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)
   _ConstructTransaction __tx(*this, __n);
   const_pointer __new_end = __tx.__new_end_;
   for (pointer __pos = __tx.__pos_; __pos != __new_end; __tx.__pos_ = ++__pos) {
-    __alloc_traits::construct(this->__alloc_, std::__to_address(__pos), __x);
+    __alloc_traits::construct(this->__layout_.__alloc(), std::__to_address(__pos), __x);
   }
 }
 @@ -970,7 +905,8 @@ template <class _InputIterator, class _Sentinel>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 void
 vector<_Tp, _Allocator>::__construct_at_end(_InputIterator __first, _Sentinel __last, size_type __n) {
   _ConstructTransaction __tx(*this, __n);
-  __tx.__pos_ = std::__uninitialized_allocator_copy(this->__alloc_, std::move(__first), std::move(__last), __tx.__pos_);
+  __tx.__pos_ = std::__uninitialized_allocator_copy(
+      this->__layout_.__alloc(), std::move(__first), std::move(__last), __tx.__pos_);
 }
 template <class _Tp, class _Allocator>
 @@ -980,22 +916,15 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 inline _LIBCPP_HIDE_FROM_ABI vector<_Tp, _Allocato
 #else
     _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
 #endif
-    : __alloc_(std::move(__x.__alloc_)) {
+    : __layout_(std::move(__x.__layout_)) {
-  this->__begin_ = __x.__begin_;
-  this->__end_   = __x.__end_;
-  this->__cap_   = __x.__cap_;
-  __x.__begin_ = __x.__end_ = __x.__cap_ = nullptr;
 }
 template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 inline _LIBCPP_HIDE_FROM_ABI
 vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_type>& __a)
-    : __alloc_(__a) {
+    : __layout_(__a) {
-  if (__a == __x.__alloc_) {
+  if (__a == __x.__layout_.__alloc()) {
-    this->__begin_ = __x.__begin_;
+    __layout_.__move_assign_without_allocator(__x.__layout_);
-    this->__end_   = __x.__end_;
-    this->__cap_   = __x.__cap_;
-    __x.__begin_ = __x.__end_ = __x.__cap_ = nullptr;
   } else {
     typedef move_iterator<iterator> _Ip;
     __init_with_size(_Ip(__x.begin()), _Ip(__x.end()), __x.size());
 @@ -1005,7 +934,7 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t<allocator_
 template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__move_assign(vector& __c, false_type)
     _NOEXCEPT_(__alloc_traits::is_always_equal::value) {
-  if (this->__alloc_ != __c.__alloc_) {
+  if (this->__layout_.__alloc() != __c.__layout_.__alloc()) {
     typedef move_iterator<iterator> _Ip;
     assign(_Ip(__c.begin()), _Ip(__c.end()));
   } else
 @@ -1017,10 +946,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::__move_assign(vector
     _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) {
   __vdeallocate();
   __move_assign_alloc(__c); // this can throw
-  this->__begin_ = __c.__begin_;
+  __layout_.__move_assign_without_allocator(__c.__layout_);
-  this->__end_   = __c.__end_;
-  this->__cap_   = __c.__cap_;
-  __c.__begin_ = __c.__end_ = __c.__cap_ = nullptr;
 }
 template <class _Tp, class _Allocator>
 @@ -1028,7 +954,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 inline _LIBCPP_HIDE_FROM_ABI vector<_Tp, _Allocato
 vector<_Tp, _Allocator>::operator=(const vector& __x) {
   if (this != std::addressof(__x)) {
     __copy_assign_alloc(__x);
-    assign(__x.__begin_, __x.__end_);
+    assign(__x.__layout_.__begin_ptr(), __x.__layout_.__end_ptr());
   }
   return *this;
 }
 @@ -1037,10 +963,11 @@ template <class _Tp, class _Allocator>
 template <class _Iterator, class _Sentinel>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
 vector<_Tp, _Allocator>::__assign_with_sentinel(_Iterator __first, _Sentinel __last) {
-  pointer __cur = __begin_;
+  pointer __cur = __layout_.__begin_ptr();
-  for (; __first != __last && __cur != __end_; ++__first, (void)++__cur)
+  pointer __end = __layout_.__end_ptr();
+  for (; __first != __last && __cur != __end; ++__first, (void)++__cur)
     *__cur = *__first;
-  if (__cur != __end_) {
+  if (__cur != __end) {
     __destruct_at_end(__cur);
   } else {
     for (; __first != __last; ++__first)
 @@ -1054,11 +981,12 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI void
 vector<_Tp, _Allocator>::__assign_with_size(_Iterator __first, _Sentinel __last, difference_type __n) {
   size_type __new_size = static_cast<size_type>(__n);
   if (__new_size <= capacity()) {
-    if (__new_size > size()) {
+    auto const __size = size();
-      auto __mid = std::__copy_n<_AlgPolicy>(std::move(__first), size(), this->__begin_).first;
+    if (__new_size > __size) {
-      __construct_at_end(std::move(__mid), std::move(__last), __new_size - size());
+      auto __mid = std::__copy_n<_AlgPolicy>(std::move(__first), __size, this->__layout_.__begin_ptr()).__in_;
+      __construct_at_end(std::move(__mid), std::move(__last), __new_size - __size);
     } else {
-      pointer __m = std::__copy(std::move(__first), __last, this->__begin_).second;
+      pointer __m = std::__copy(std::move(__first), __last, this->__layout_.__begin_ptr()).__out_;
       this->__destruct_at_end(__m);
     }
   } else {
 @@ -1072,11 +1000,11 @@ template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::assign(size_type __n, const_reference __u) {
   if (__n <= capacity()) {
     size_type __s = size();
-    std::fill_n(this->__begin_, std::min(__n, __s), __u);
+    std::fill_n(this->__layout_.__begin_ptr(), std::min(__n, __s), __u);
     if (__n > __s)
       __construct_at_end(__n - __s, __u);
     else
-      this->__destruct_at_end(this->__begin_ + __n);
+      this->__destruct_at_end(this->__layout_.__begin_ptr() + __n);
   } else {
     __vdeallocate();
     __vallocate(__recommend(static_cast<size_type>(__n)));
 @@ -1089,8 +1017,8 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::reserve(size_type __
   if (__n > capacity()) {
     if (__n > max_size())
       this->__throw_length_error();
-    __split_buffer<value_type, allocator_type> __v(__n, size(), this->__alloc_);
+    _SplitBuffer __v(__n, size(), this->__layout_.__alloc());
-    __swap_out_circular_buffer(__v);
+    __layout_.__relocate(__v);
   }
 }
 @@ -1100,12 +1028,12 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::shrink_to_fit() _NOE
 #if _LIBCPP_HAS_EXCEPTIONS
     try {
 #endif // _LIBCPP_HAS_EXCEPTIONS
-      __split_buffer<value_type, allocator_type> __v(size(), size(), this->__alloc_);
+      _SplitBuffer __v(size(), size(), this->__layout_.__alloc());
       // The Standard mandates shrink_to_fit() does not increase the capacity.
       // With equal capacity keep the existing buffer. This avoids extra work
       // due to swapping the elements.
       if (__v.capacity() < capacity())
-        __swap_out_circular_buffer(__v);
+        __layout_.__relocate(__v);
 #if _LIBCPP_HAS_EXCEPTIONS
     } catch (...) {
     }
 @@ -1117,13 +1045,13 @@ template <class _Tp, class _Allocator>
 template <class... _Args>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::pointer
 vector<_Tp, _Allocator>::__emplace_back_slow_path(_Args&&... __args) {
-  __split_buffer<value_type, allocator_type> __v(__recommend(size() + 1), size(), this->__alloc_);
+  _SplitBuffer __v(__recommend(size() + 1), size(), this->__layout_.__alloc());
   //    __v.emplace_back(std::forward<_Args>(__args)...);
   pointer __end = __v.end();
-  __alloc_traits::construct(this->__alloc_, std::__to_address(__end), std::forward<_Args>(__args)...);
+  __alloc_traits::construct(this->__layout_.__alloc(), std::__to_address(__end), std::forward<_Args>(__args)...);
   __v.__set_sentinel(++__end);
-  __swap_out_circular_buffer(__v);
+  __layout_.__relocate(__v);
-  return this->__end_;
+  return __end;
 }
 // This makes the compiler inline `__else()` if `__cond` is known to be false. Currently LLVM doesn't do that without
 @@ -1144,27 +1072,22 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void __if_likely_else(bool _
   }
 }
-template <class _Tp, class _Allocator>
+template <class _Tp, class _Alloc>
 template <class... _Args>
-_LIBCPP_CONSTEXPR_SINCE_CXX20 inline
+_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI typename vector<_Tp, _Alloc>::__emplace_back_result_t
-#if _LIBCPP_STD_VER >= 17
+vector<_Tp, _Alloc>::emplace_back(_Args&&... __args) {
-    typename vector<_Tp, _Allocator>::reference
+  pointer __end = __layout_.__end_ptr();
-#else
-    void
-#endif
-    vector<_Tp, _Allocator>::emplace_back(_Args&&... __args) {
-  pointer __end = this->__end_;
   std::__if_likely_else(
-      __end < this->__cap_,
+      size() != capacity(),
       [&] {
         __emplace_back_assume_capacity(std::forward<_Args>(__args)...);
         ++__end;
       },
       [&] { __end = __emplace_back_slow_path(std::forward<_Args>(__args)...); });
-  this->__end_ = __end;
+  __layout_.__set_bound_using_pointer(__end);
 #if _LIBCPP_STD_VER >= 17
-  return *(__end - 1);
+  return back();
 #endif
 }
 @@ -1174,8 +1097,8 @@ vector<_Tp, _Allocator>::erase(const_iterator __position) {
   _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(
       __position != end(), "vector::erase(iterator) called with a non-dereferenceable iterator");
   difference_type __ps = __position - cbegin();
-  pointer __p          = this->__begin_ + __ps;
+  pointer __p          = this->__layout_.__begin_ptr() + __ps;
-  this->__destruct_at_end(std::move(__p + 1, this->__end_, __p));
+  this->__destruct_at_end(std::move(__p + 1, __layout_.__end_ptr(), __p));
   return __make_iter(__p);
 }
 @@ -1183,9 +1106,9 @@ template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator
 vector<_Tp, _Allocator>::erase(const_iterator __first, const_iterator __last) {
   _LIBCPP_ASSERT_VALID_INPUT_RANGE(__first <= __last, "vector::erase(first, last) called with invalid range");
-  pointer __p = this->__begin_ + (__first - begin());
+  pointer __p = this->__layout_.__begin_ptr() + (__first - begin());
   if (__first != __last) {
-    this->__destruct_at_end(std::move(__p + (__last - __first), this->__end_, __p));
+    this->__destruct_at_end(std::move(__p + (__last - __first), __layout_.__end_ptr(), __p));
   }
   return __make_iter(__p);
 }
 @@ -1193,13 +1116,13 @@ vector<_Tp, _Allocator>::erase(const_iterator __first, const_iterator __last) {
 template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 void
 vector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointer __to) {
-  pointer __old_last  = this->__end_;
+  pointer __old_last  = __layout_.__end_ptr();
   difference_type __n = __old_last - __to;
   {
     pointer __i = __from_s + __n;
     _ConstructTransaction __tx(*this, __from_e - __i);
     for (pointer __pos = __tx.__pos_; __i < __from_e; ++__i, (void)++__pos, __tx.__pos_ = __pos) {
-      __alloc_traits::construct(this->__alloc_, std::__to_address(__pos), std::move(*__i));
+      __alloc_traits::construct(this->__layout_.__alloc(), std::__to_address(__pos), std::move(*__i));
     }
   }
   std::move_backward(__from_s, __from_s + __n, __old_last);
 @@ -1208,21 +1131,22 @@ vector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointe
 template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator
 vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x) {
-  pointer __p = this->__begin_ + (__position - begin());
+  pointer __p = this->__layout_.__begin_ptr() + (__position - begin());
-  if (this->__end_ < this->__cap_) {
+  if (size() != capacity()) {
-    if (__p == this->__end_) {
+    pointer __end = __layout_.__end_ptr();
+    if (__p == __end) {
       __emplace_back_assume_capacity(__x);
     } else {
-      __move_range(__p, this->__end_, __p + 1);
+      __move_range(__p, __end, __p + 1);
       const_pointer __xr = pointer_traits<const_pointer>::pointer_to(__x);
-      if (std::__is_pointer_in_range(std::__to_address(__p), std::__to_address(__end_), std::addressof(__x)))
+      if (std::__is_pointer_in_range(std::__to_address(__p), std::__to_address(__end), std::addressof(__x)))
         ++__xr;
       *__p = *__xr;
     }
   } else {
-    __split_buffer<value_type, allocator_type> __v(__recommend(size() + 1), __p - this->__begin_, this->__alloc_);
+    _SplitBuffer __v(__recommend(size() + 1), __p - this->__layout_.__begin_ptr(), this->__layout_.__alloc());
     __v.emplace_back(__x);
-    __p = __swap_out_circular_buffer(__v, __p);
+    __p = __layout_.__relocate_with_pivot(__v, __p);
   }
   return __make_iter(__p);
 }
 @@ -1230,18 +1154,19 @@ vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x)
 template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator
 vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x) {
-  pointer __p = this->__begin_ + (__position - begin());
+  pointer __p = this->__layout_.__begin_ptr() + (__position - begin());
-  if (this->__end_ < this->__cap_) {
+  if (size() != capacity()) {
-    if (__p == this->__end_) {
+    pointer __end = __layout_.__end_ptr();
+    if (__p == __end) {
       __emplace_back_assume_capacity(std::move(__x));
     } else {
-      __move_range(__p, this->__end_, __p + 1);
+      __move_range(__p, __end, __p + 1);
       *__p = std::move(__x);
     }
   } else {
-    __split_buffer<value_type, allocator_type> __v(__recommend(size() + 1), __p - this->__begin_, this->__alloc_);
+    _SplitBuffer __v(__recommend(size() + 1), __p - this->__layout_.__begin_ptr(), this->__layout_.__alloc());
     __v.emplace_back(std::move(__x));
-    __p = __swap_out_circular_buffer(__v, __p);
+    __p = __layout_.__relocate_with_pivot(__v, __p);
   }
   return __make_iter(__p);
 }
 @@ -1250,19 +1175,20 @@ template <class _Tp, class _Allocator>
 template <class... _Args>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator
 vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args) {
-  pointer __p = this->__begin_ + (__position - begin());
+  pointer __p = this->__layout_.__begin_ptr() + (__position - begin());
-  if (this->__end_ < this->__cap_) {
+  if (size() != capacity()) {
-    if (__p == this->__end_) {
+    pointer __end = __layout_.__end_ptr();
+    if (__p == __end) {
       __emplace_back_assume_capacity(std::forward<_Args>(__args)...);
     } else {
-      __temp_value<value_type, _Allocator> __tmp(this->__alloc_, std::forward<_Args>(__args)...);
+      __temp_value<value_type, _Allocator> __tmp(this->__layout_.__alloc(), std::forward<_Args>(__args)...);
-      __move_range(__p, this->__end_, __p + 1);
+      __move_range(__p, __end, __p + 1);
       *__p = std::move(__tmp.get());
     }
   } else {
-    __split_buffer<value_type, allocator_type> __v(__recommend(size() + 1), __p - this->__begin_, this->__alloc_);
+    _SplitBuffer __v(__recommend(size() + 1), __p - this->__layout_.__begin_ptr(), this->__layout_.__alloc());
     __v.emplace_back(std::forward<_Args>(__args)...);
-    __p = __swap_out_circular_buffer(__v, __p);
+    __p = __layout_.__relocate_with_pivot(__v, __p);
   }
   return __make_iter(__p);
 }
 @@ -1270,27 +1196,28 @@ vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args) {
 template <class _Tp, class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 typename vector<_Tp, _Allocator>::iterator
 vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_reference __x) {
-  pointer __p = this->__begin_ + (__position - begin());
+  pointer __p = this->__layout_.__begin_ptr() + (__position - begin());
   if (__n > 0) {
-    if (__n <= static_cast<size_type>(this->__cap_ - this->__end_)) {
+    if (__n <= __layout_.__remaining_capacity()) {
       size_type __old_n  = __n;
-      pointer __old_last = this->__end_;
+      pointer __end      = __layout_.__end_ptr();
-      if (__n > static_cast<size_type>(this->__end_ - __p)) {
+      pointer __old_last = __end;
-        size_type __cx = __n - (this->__end_ - __p);
+      if (__n > static_cast<size_type>(__end - __p)) {
+        size_type __cx = __n - (__end - __p);
         __construct_at_end(__cx, __x);
         __n -= __cx;
       }
       if (__n > 0) {
         __move_range(__p, __old_last, __p + __old_n);
         const_pointer __xr = pointer_traits<const_pointer>::pointer_to(__x);
-        if (std::__is_pointer_in_range(std::__to_address(__p), std::__to_address(__end_), std::addressof(__x)))
+        if (std::__is_pointer_in_range(std::__to_address(__p), std::__to_address(__end), std::addressof(__x)))
           __xr += __old_n;
         std::fill_n(__p, __n, *__xr);
       }
     } else {
-      __split_buffer<value_type, allocator_type> __v(__recommend(size() + __n), __p - this->__begin_, this->__alloc_);
+      _SplitBuffer __v(__recommend(size() + __n), __p - this->__layout_.__begin_ptr(), this->__layout_.__alloc());
       __v.__construct_at_end(__n, __x);
-      __p = __swap_out_circular_buffer(__v, __p);
+      __p = __layout_.__relocate_with_pivot(__v, __p);
     }
   }
   return __make_iter(__p);
 @@ -1301,30 +1228,38 @@ template <class _InputIterator, class _Sentinel>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI typename vector<_Tp, _Allocator>::iterator
 vector<_Tp, _Allocator>::__insert_with_sentinel(const_iterator __position, _InputIterator __first, _Sentinel __last) {
   difference_type __off = __position - begin();
-  pointer __p           = this->__begin_ + __off;
+  pointer __p           = this->__layout_.__begin_ptr() + __off;
-  pointer __old_last    = this->__end_;
+  pointer __old_last    = __layout_.__end_ptr();
-  for (; this->__end_ != this->__cap_ && __first != __last; ++__first)
+  for (; size() != capacity() && __first != __last; ++__first)
     __emplace_back_assume_capacity(*__first);
   if (__first == __last)
-    (void)std::rotate(__p, __old_last, this->__end_);
+    (void)std::rotate(__p, __old_last, __layout_.__end_ptr());
   else {
-    __split_buffer<value_type, allocator_type> __v(__alloc_);
+    _SplitBuffer __v(__layout_.__alloc());
-    auto __guard = std::__make_exception_guard(
+    pointer __end = __layout_.__end_ptr();
-        _AllocatorDestroyRangeReverse<allocator_type, pointer>(__alloc_, __old_last, this->__end_));
+    auto __guard  = std::__make_exception_guard(
+        _AllocatorDestroyRangeReverse<allocator_type, pointer>(__layout_.__alloc(), __old_last, __end));
     __v.__construct_at_end_with_sentinel(std::move(__first), std::move(__last));
-    __split_buffer<value_type, allocator_type> __merged(
+    _SplitBuffer __merged(
-        __recommend(size() + __v.size()), __off, __alloc_); // has `__off` positions available at the front
+        __recommend(size() + __v.size()), __off, __layout_.__alloc()); // has `__off` positions available at the front
     std::__uninitialized_allocator_relocate(
-        __alloc_, std::__to_address(__old_last), std::__to_address(this->__end_), std::__to_address(__merged.end()));
+        __layout_.__alloc(),
-    __guard.__complete(); // Release the guard once objects in [__old_last_, __end_) have been successfully relocated.
+        std::__to_address(__old_last),
-    __merged.__set_sentinel(__merged.end() + (this->__end_ - __old_last));
+        std::__to_address(__layout_.__end_ptr()),
-    this->__end_ = __old_last;
+        std::__to_address(__merged.end()));
+    __guard.__complete(); // Release the guard once objects in [__old_last_, __layout_.__end_ptr()) have been
+                          // successfully relocated.
+    __merged.__set_sentinel(__merged.end() + (__layout_.__end_ptr() - __old_last));
+    __layout_.__set_bound_using_pointer(__old_last);
     std::__uninitialized_allocator_relocate(
-        __alloc_, std::__to_address(__v.begin()), std::__to_address(__v.end()), std::__to_address(__merged.end()));
+        __layout_.__alloc(),
+        std::__to_address(__v.begin()),
+        std::__to_address(__v.end()),
+        std::__to_address(__merged.end()));
     __merged.__set_sentinel(__merged.size() + __v.size());
     __v.__set_sentinel(__v.begin());
-    __p        = __swap_out_circular_buffer(__merged, __p);
+    __p = __layout_.__relocate_with_pivot(__merged, __p);
   }
   return __make_iter(__p);
 }
 @@ -1334,16 +1269,17 @@ template <class _AlgPolicy, class _Iterator, class _Sentinel>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI typename vector<_Tp, _Allocator>::iterator
 vector<_Tp, _Allocator>::__insert_with_size(
     const_iterator __position, _Iterator __first, _Sentinel __last, difference_type __n) {
-  pointer __p = this->__begin_ + (__position - begin());
+  pointer __p = this->__layout_.__begin_ptr() + (__position - begin());
   if (__n > 0) {
-    if (__n <= this->__cap_ - this->__end_) {
+    if (__n <= static_cast<difference_type>(__layout_.__remaining_capacity())) {
-      pointer __old_last   = this->__end_;
+      pointer __end        = __layout_.__end_ptr();
-      difference_type __dx = this->__end_ - __p;
+      pointer __old_last   = __end;
+      difference_type __dx = __end - __p;
       if (__n > __dx) {
 #if _LIBCPP_STD_VER >= 23
         if constexpr (!forward_iterator<_Iterator>) {
           __construct_at_end(std::move(__first), std::move(__last), __n);
-          std::rotate(__p, __old_last, this->__end_);
+          std::rotate(__p, __old_last, __end);
         } else
 #endif
         {
 @@ -1359,9 +1295,9 @@ vector<_Tp, _Allocator>::__insert_with_size(
         __insert_assign_n_unchecked<_AlgPolicy>(std::move(__first), __n, __p);
       }
     } else {
-      __split_buffer<value_type, allocator_type> __v(__recommend(size() + __n), __p - this->__begin_, this->__alloc_);
+      _SplitBuffer __v(__recommend(size() + __n), __p - this->__layout_.__begin_ptr(), this->__layout_.__alloc());
       __v.__construct_at_end_with_size(std::move(__first), __n);
-      __p = __swap_out_circular_buffer(__v, __p);
+      __p = __layout_.__relocate_with_pivot(__v, __p);
     }
   }
   return __make_iter(__p);
 @@ -1374,12 +1310,12 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::resize(size_type __n
     if (__new_size <= capacity()) {
       __construct_at_end(__new_size - __current_size);
     } else {
-      __split_buffer<value_type, allocator_type> __v(__recommend(__new_size), __current_size, __alloc_);
+      _SplitBuffer __v(__recommend(__new_size), __current_size, __layout_.__alloc());
       __v.__construct_at_end(__new_size - __current_size);
-      __swap_out_circular_buffer(__v);
+      __layout_.__relocate(__v);
     }
   } else if (__current_size > __new_size) {
-    this->__destruct_at_end(this->__begin_ + __new_size);
+    this->__destruct_at_end(this->__layout_.__begin_ptr() + __new_size);
   }
 }
 @@ -1390,12 +1326,12 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::resize(size_type __n
     if (__new_size <= capacity())
       __construct_at_end(__new_size - __current_size, __x);
     else {
-      __split_buffer<value_type, allocator_type> __v(__recommend(__new_size), __current_size, __alloc_);
+      _SplitBuffer __v(__recommend(__new_size), __current_size, __layout_.__alloc());
       __v.__construct_at_end(__new_size - __current_size, __x);
-      __swap_out_circular_buffer(__v);
+      __layout_.__relocate(__v);
     }
   } else if (__current_size > __new_size) {
-    this->__destruct_at_end(this->__begin_ + __new_size);
+    this->__destruct_at_end(this->__layout_.__begin_ptr() + __new_size);
   }
 }
 @@ -1408,29 +1344,10 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<_Tp, _Allocator>::swap(vector& __x)
 #endif
 {
   _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
-      __alloc_traits::propagate_on_container_swap::value || this->__alloc_ == __x.__alloc_,
+      __alloc_traits::propagate_on_container_swap::value || __layout_.__alloc() == __x.__layout_.__alloc(),
       "vector::swap: Either propagate_on_container_swap must be true"
       " or the allocators must compare equal");
-  std::swap(this->__begin_, __x.__begin_);
+  __layout_.__swap(__x.__layout_);
-  std::swap(this->__end_, __x.__end_);
-  std::swap(this->__cap_, __x.__cap_);
-  std::__swap_allocator(this->__alloc_, __x.__alloc_);
-}
-template <class _Tp, class _Allocator>
-_LIBCPP_CONSTEXPR_SINCE_CXX20 bool vector<_Tp, _Allocator>::__invariants() const {
-  if (this->__begin_ == nullptr) {
-    if (this->__end_ != nullptr || this->__cap_ != nullptr)
-      return false;
-  } else {
-    if (this->__begin_ > this->__end_)
-      return false;
-    if (this->__begin_ == this->__cap_)
-      return false;
-    if (this->__end_ > this->__cap_)
-      return false;
-  }
-  return true;
 }
 #if _LIBCPP_STD_VER >= 20

lib/libcxx/include/__vector/vector_bool.h+10-20

 @@ -45,6 +45,7 @@
 #include <__type_traits/is_nothrow_constructible.h>
 #include <__type_traits/type_identity.h>
 #include <__utility/exception_guard.h>
+#include <__utility/exchange.h>
 #include <__utility/forward.h>
 #include <__utility/move.h>
 #include <__utility/swap.h>
 @@ -151,9 +152,7 @@ public:
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 ~vector() { __destroy_vector (*this)(); }
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit vector(size_type __n);
-#if _LIBCPP_STD_VER >= 14
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit vector(size_type __n, const allocator_type& __a);
-#endif
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector(size_type __n, const value_type& __v);
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
   vector(size_type __n, const value_type& __v, const allocator_type& __a);
 @@ -604,7 +603,6 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 vector<bool, _Allocator>::vector(size_type __n)
   }
 }
-#if _LIBCPP_STD_VER >= 14
 template <class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 vector<bool, _Allocator>::vector(size_type __n, const allocator_type& __a)
     : __begin_(nullptr), __size_(0), __cap_(0), __alloc_(static_cast<__storage_allocator>(__a)) {
 @@ -614,7 +612,6 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 vector<bool, _Allocator>::vector(size_type __n, co
     __size_ = __n;
   }
 }
-#endif
 template <class _Allocator>
 _LIBCPP_CONSTEXPR_SINCE_CXX20 vector<bool, _Allocator>::vector(size_type __n, const value_type& __x)
 @@ -740,13 +737,10 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 vector<bool, _Allocat
 #else
     _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
 #endif
-    : __begin_(__v.__begin_),
+    : __begin_(std::__exchange(__v.__begin_, nullptr)),
-      __size_(__v.__size_),
+      __size_(std::__exchange(__v.__size_, 0)),
-      __cap_(__v.__cap_),
+      __cap_(std::__exchange(__v.__cap_, 0)),
       __alloc_(std::move(__v.__alloc_)) {
-  __v.__begin_ = nullptr;
-  __v.__size_  = 0;
-  __v.__cap_   = 0;
 }
 template <class _Allocator>
 @@ -754,11 +748,9 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20
 vector<bool, _Allocator>::vector(vector&& __v, const __type_identity_t<allocator_type>& __a)
     : __begin_(nullptr), __size_(0), __cap_(0), __alloc_(__a) {
   if (__a == allocator_type(__v.__alloc_)) {
-    this->__begin_ = __v.__begin_;
+    __begin_ = std::__exchange(__v.__begin_, nullptr);
-    this->__size_  = __v.__size_;
+    __size_  = std::__exchange(__v.__size_, 0);
-    this->__cap_   = __v.__cap_;
+    __cap_   = std::__exchange(__v.__cap_, 0);
-    __v.__begin_   = nullptr;
-    __v.__cap_ = __v.__size_ = 0;
   } else if (__v.size() > 0) {
     __vallocate(__v.size());
     __size_ = __v.__size_;
 @@ -787,11 +779,9 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void vector<bool, _Allocator>::__move_assign(vecto
     _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) {
   __vdeallocate();
   __move_assign_alloc(__c);
-  this->__begin_ = __c.__begin_;
+  __begin_ = std::__exchange(__c.__begin_, nullptr);
-  this->__size_  = __c.__size_;
+  __size_  = std::__exchange(__c.__size_, 0);
-  this->__cap_   = __c.__cap_;
+  __cap_   = std::__exchange(__c.__cap_, 0);
-  __c.__begin_   = nullptr;
-  __c.__cap_ = __c.__size_ = 0;
 }
 template <class _Allocator>

lib/libcxx/include/__verbose_abort+2

 @@ -20,8 +20,10 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 // This function should never be called directly from the code -- it should only be called through
 // the _LIBCPP_VERBOSE_ABORT macro.
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 [[__noreturn__]] _LIBCPP_AVAILABILITY_VERBOSE_ABORT _LIBCPP_OVERRIDABLE_FUNC_VIS _LIBCPP_ATTRIBUTE_FORMAT(
     __printf__, 1, 2) void __libcpp_verbose_abort(const char* __format, ...) _NOEXCEPT;
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 // _LIBCPP_VERBOSE_ABORT(format, args...)
 //

lib/libcxx/include/__verbose_trap+1-12

...	@@ -16,21 +16,10 @@	...	@@ -16,21 +16,10 @@
16	# pragma GCC system_header	16	# pragma GCC system_header
17	#endif	17	#endif
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD
20
21	#if __has_builtin(__builtin_verbose_trap)	19	#if __has_builtin(__builtin_verbose_trap)
22	// AppleClang shipped a slightly different version of __builtin_verbose_trap from the upstream	20	# define _LIBCPP_VERBOSE_TRAP(message) __builtin_verbose_trap("libc++", message)
23	// version before upstream Clang actually got the builtin.
24	// TODO: Remove once AppleClang supports the two-arguments version of the builtin.
25	# if defined(_LIBCPP_APPLE_CLANG_VER) && _LIBCPP_APPLE_CLANG_VER < 1700
26	# define _LIBCPP_VERBOSE_TRAP(message) __builtin_verbose_trap(message)
27	# else
28	# define _LIBCPP_VERBOSE_TRAP(message) __builtin_verbose_trap("libc++", message)
29	# endif
30	#else	21	#else
31	# define _LIBCPP_VERBOSE_TRAP(message) ((void)message, __builtin_trap())	22	# define _LIBCPP_VERBOSE_TRAP(message) ((void)message, __builtin_trap())
32	#endif	23	#endif
33		24
34	_LIBCPP_END_NAMESPACE_STD
35
36	#endif // _LIBCPP___VERBOSE_TRAP	25	#endif // _LIBCPP___VERBOSE_TRAP

lib/libcxx/include/algorithm+57-2

...	@@ -883,6 +883,13 @@ namespace ranges {	...	@@ -883,6 +883,13 @@ namespace ranges {
883	uniform_random_bit_generator<remove_reference_t<Gen>>	883	uniform_random_bit_generator<remove_reference_t<Gen>>
884	O sample(R&& r, O out, range_difference_t<R> n, Gen&& g); // since C++20	884	O sample(R&& r, O out, range_difference_t<R> n, Gen&& g); // since C++20
885		885
		886	template<permutable I, sentinel_for<I> S>
		887	constexpr subrange<I> ranges::shift_left(I first, S last, iter_difference_t<I> n); // since C++23
		888
		889	template<forward_range R>
		890	requires permutable<iterator_t<R>>
		891	constexpr borrowed_subrange_t<R> ranges::shift_left(R&& r, range_difference_t<R> n) // since C++23
		892
886	template<random_access_iterator I, sentinel_for<I> S, class Gen>	893	template<random_access_iterator I, sentinel_for<I> S, class Gen>
887	requires permutable<I> &&	894	requires permutable<I> &&
888	uniform_random_bit_generator<remove_reference_t<Gen>>	895	uniform_random_bit_generator<remove_reference_t<Gen>>
...	@@ -944,6 +951,33 @@ namespace ranges {	...	@@ -944,6 +951,33 @@ namespace ranges {
944	template<input_range R, class T, indirectly-binary-left-foldable<T, iterator_t<R>> F>	951	template<input_range R, class T, indirectly-binary-left-foldable<T, iterator_t<R>> F>
945	constexpr auto fold_left(R&& r, T init, F f); // since C++23	952	constexpr auto fold_left(R&& r, T init, F f); // since C++23
946		953
		954	template<input_iterator I, sentinel_for<I> S,
		955	indirectly-binary-left-foldable<iter_value_t<I>, I> F>
		956	requires constructible_from<iter_value_t<I>, iter_reference_t<I>>
		957	constexpr auto ranges::fold_left_first(I first, S last, F f); // since C++23
		958
		959	template<input_range R, indirectly-binary-left-foldable<range_value_t<R>, iterator_t<R>> F>
		960	requires constructible_from<range_value_t<R>, range_reference_t<R>>
		961	constexpr auto ranges::fold_left_first(R&& r, F f); // since C++23
		962
		963	template<bidirectional_iterator I, sentinel_for<I> S, class T = iter_value_t<I>,
		964	indirectly-binary-right-foldable<T, I> F>
		965	constexpr auto ranges::fold_right(I first, S last, T init, F f); // since C++23
		966
		967	template<bidirectional_range R, class T = range_value_t<R>,
		968	indirectly-binary-right-foldable<T, iterator_t<R>> F>
		969	constexpr auto ranges::fold_right(R&& r, T init, F f); // since C++23
		970
		971	template<bidirectional_iterator I, sentinel_for<I> S,
		972	indirectly-binary-right-foldable<iter_value_t<I>, I> F>
		973	requires constructible_from<iter_value_t<I>, iter_reference_t<I>>
		974	constexpr auto ranges::fold_right_last(I first, S last, F f); // since C++23
		975
		976	template<bidirectional_range R,
		977	indirectly-binary-right-foldable<range_value_t<R>, iterator_t<R>> F>
		978	requires constructible_from<range_value_t<R>, range_reference_t<R>>
		979	constexpr auto ranges::fold_right_last(R&& r, F f); // since C++23
		980
947	template<class I, class T>	981	template<class I, class T>
948	using fold_left_with_iter_result = in_value_result<I, T>; // since C++23	982	using fold_left_with_iter_result = in_value_result<I, T>; // since C++23
949		983
...	@@ -954,6 +988,18 @@ namespace ranges {	...	@@ -954,6 +988,18 @@ namespace ranges {
954	template<input_range R, class T, indirectly-binary-left-foldable<T, iterator_t<R>> F>	988	template<input_range R, class T, indirectly-binary-left-foldable<T, iterator_t<R>> F>
955	constexpr see below fold_left_with_iter(R&& r, T init, F f); // since C++23	989	constexpr see below fold_left_with_iter(R&& r, T init, F f); // since C++23
956		990
		991	template<class I, class T>
		992	using fold_left_first_with_iter_result = in_value_result<I, T>; // since C++23
		993
		994	template<input_iterator I, sentinel_for<I> S,
		995	indirectly-binary-left-foldable<iter_value_t<I>, I> F>
		996	requires constructible_from<iter_value_t<I>, iter_reference_t<I>>
		997	constexpr see below ranges::fold_left_first_with_iter(I first, S last, F f); // since C++23
		998
		999	template<input_range R, indirectly-binary-left-foldable<range_value_t<R>, iterator_t<R>> F>
		1000	requires constructible_from<range_value_t<R>, range_reference_t<R>>
		1001	constexpr see below ranges::fold_left_first_with_iter(R&& r, F f); // since C++23
		1002
957	template<forward_iterator I1, sentinel_for<I1> S1, forward_iterator I2, sentinel_for<I2> S2,	1003	template<forward_iterator I1, sentinel_for<I1> S1, forward_iterator I2, sentinel_for<I2> S2,
958	class Pred = ranges::equal_to, class Proj1 = identity, class Proj2 = identity>	1004	class Pred = ranges::equal_to, class Proj1 = identity, class Proj2 = identity>
959	requires indirectly_comparable<I1, I2, Pred, Proj1, Proj2>	1005	requires indirectly_comparable<I1, I2, Pred, Proj1, Proj2>
...	@@ -1489,6 +1535,13 @@ template<class ForwardIterator>	...	@@ -1489,6 +1535,13 @@ template<class ForwardIterator>
1489	shift_right(ForwardIterator first, ForwardIterator last,	1535	shift_right(ForwardIterator first, ForwardIterator last,
1490	typename iterator_traits<ForwardIterator>::difference_type n); // C++20	1536	typename iterator_traits<ForwardIterator>::difference_type n); // C++20
1491		1537
		1538	template<permutable I, sentinel_for<I> S>
		1539	constexpr subrange<I> ranges::shift_right(I first, S last, iter_difference_t<I> n); // since C++23
		1540
		1541	template<forward_range R>
		1542	requires permutable<iterator_t<R>>
		1543	constexpr borrowed_subrange_t<R> ranges::shift_right(R&& r, range_difference_t<R> n) // since C++23
		1544
1492	template <class InputIterator, class Predicate>	1545	template <class InputIterator, class Predicate>
1493	constexpr bool // constexpr since C++20	1546	constexpr bool // constexpr since C++20
1494	is_partitioned(InputIterator first, InputIterator last, Predicate pred);	1547	is_partitioned(InputIterator first, InputIterator last, Predicate pred);
...	@@ -2035,6 +2088,8 @@ template <class BidirectionalIterator, class Compare>	...	@@ -2035,6 +2088,8 @@ template <class BidirectionalIterator, class Compare>
2035	# include <__algorithm/ranges_ends_with.h>	2088	# include <__algorithm/ranges_ends_with.h>
2036	# include <__algorithm/ranges_find_last.h>	2089	# include <__algorithm/ranges_find_last.h>
2037	# include <__algorithm/ranges_fold.h>	2090	# include <__algorithm/ranges_fold.h>
		2091	# include <__algorithm/ranges_shift_left.h>
		2092	# include <__algorithm/ranges_shift_right.h>
2038	# include <__algorithm/ranges_starts_with.h>	2093	# include <__algorithm/ranges_starts_with.h>
2039	# endif // _LIBCPP_STD_VER >= 23	2094	# endif // _LIBCPP_STD_VER >= 23
2040		2095
...	@@ -2049,11 +2104,11 @@ template <class BidirectionalIterator, class Compare>	...	@@ -2049,11 +2104,11 @@ template <class BidirectionalIterator, class Compare>
2049	# pragma GCC system_header	2104	# pragma GCC system_header
2050	# endif	2105	# endif
2051		2106
2052	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER == 14	2107	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER == 14
2053	# include <execution>	2108	# include <execution>
2054	# endif	2109	# endif
2055		2110
2056	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	2111	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
2057	# include <atomic>	2112	# include <atomic>
2058	# include <bit>	2113	# include <bit>
2059	# include <concepts>	2114	# include <concepts>

lib/libcxx/include/any+11-9

 @@ -120,16 +120,20 @@ _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
 _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 class _LIBCPP_EXPORTED_FROM_ABI bad_any_cast : public bad_cast {
 public:
   const char* what() const _NOEXCEPT override;
 };
-_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
-_LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
+_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 [[noreturn]] inline _LIBCPP_HIDE_FROM_ABI void __throw_bad_any_cast() {
 #    if _LIBCPP_HAS_EXCEPTIONS
   throw bad_any_cast();
 @@ -522,8 +526,6 @@ template <class _ValueType>
 template <class _ValueType>
 [[nodiscard]] inline _LIBCPP_HIDE_FROM_ABI add_pointer_t<add_const_t<_ValueType>> any_cast(any const* __any) noexcept {
-  static_assert(!is_void_v<_ValueType>, "_ValueType may not be void.");
-  static_assert(!is_reference_v<_ValueType>, "_ValueType may not be a reference.");
   return std::any_cast<_ValueType>(const_cast<any*>(__any));
 }
 @@ -550,17 +552,17 @@ template <class _ValueType>
   return nullptr;
 }
-#  endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#  endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 17
 #    include <chrono>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <atomic>
 #    include <concepts>
 #    include <cstdlib>
 @@ -572,7 +574,7 @@ _LIBCPP_POP_MACROS
 #    include <variant>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 23
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
 #    include <cstring>
 #    include <limits>
 #  endif

lib/libcxx/include/array+1-1

...	@@ -594,7 +594,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -594,7 +594,7 @@ _LIBCPP_END_NAMESPACE_STD
594		594
595	_LIBCPP_POP_MACROS	595	_LIBCPP_POP_MACROS
596		596
597	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	597	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
598	# include <algorithm>	598	# include <algorithm>
599	# include <concepts>	599	# include <concepts>
600	# include <cstdlib>	600	# include <cstdlib>

lib/libcxx/include/atomic+1-5

 @@ -626,11 +626,7 @@ template <class T>
 #    pragma GCC system_header
 #  endif
-#  if !_LIBCPP_HAS_ATOMIC_HEADER
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
-#    error <atomic> is not implemented
-#  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
 #    include <cmath>
 #    include <compare>
 #    include <cstddef>

lib/libcxx/include/barrier+3-1

...	@@ -95,6 +95,7 @@ using __barrier_phase_t _LIBCPP_NODEBUG = uint8_t;	...	@@ -95,6 +95,7 @@ using __barrier_phase_t _LIBCPP_NODEBUG = uint8_t;
95		95
96	class __barrier_algorithm_base;	96	class __barrier_algorithm_base;
97		97
		98	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
98	[[__gnu__::__returns_nonnull__, __gnu__::__malloc__]]	99	[[__gnu__::__returns_nonnull__, __gnu__::__malloc__]]
99	_LIBCPP_EXPORTED_FROM_ABI __barrier_algorithm_base* __construct_barrier_algorithm_base(ptrdiff_t& __expected);	100	_LIBCPP_EXPORTED_FROM_ABI __barrier_algorithm_base* __construct_barrier_algorithm_base(ptrdiff_t& __expected);
100		101
...	@@ -104,6 +105,7 @@ __arrive_barrier_algorithm_base([[__gnu__::__nonnull__]] _LIBCPP_NOESCAPE __barr	...	@@ -104,6 +105,7 @@ __arrive_barrier_algorithm_base([[__gnu__::__nonnull__]] _LIBCPP_NOESCAPE __barr
104		105
105	_LIBCPP_EXPORTED_FROM_ABI void __destroy_barrier_algorithm_base(	106	_LIBCPP_EXPORTED_FROM_ABI void __destroy_barrier_algorithm_base(
106	[[__gnu__::__nonnull__]] _LIBCPP_NOESCAPE __barrier_algorithm_base* __barrier) noexcept;	107	[[__gnu__::__nonnull__]] _LIBCPP_NOESCAPE __barrier_algorithm_base* __barrier) noexcept;
		108	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
107		109
108	template <class _CompletionF>	110	template <class _CompletionF>
109	class __barrier_base {	111	class __barrier_base {
...	@@ -190,7 +192,7 @@ _LIBCPP_POP_MACROS	...	@@ -190,7 +192,7 @@ _LIBCPP_POP_MACROS
190		192
191	# endif // _LIBCPP_HAS_THREADS	193	# endif // _LIBCPP_HAS_THREADS
192		194
193	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	195	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
194	# include <atomic>	196	# include <atomic>
195	# include <concepts>	197	# include <concepts>
196	# include <iterator>	198	# include <iterator>

lib/libcxx/include/bit+1-1

...	@@ -90,7 +90,7 @@ namespace std {	...	@@ -90,7 +90,7 @@ namespace std {
90	# pragma GCC system_header	90	# pragma GCC system_header
91	# endif	91	# endif
92		92
93	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	93	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
94	# include <cstdlib>	94	# include <cstdlib>
95	# include <iosfwd>	95	# include <iosfwd>
96	# include <limits>	96	# include <limits>

lib/libcxx/include/bitset+1-1

...	@@ -971,7 +971,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -971,7 +971,7 @@ _LIBCPP_END_NAMESPACE_STD
971		971
972	_LIBCPP_POP_MACROS	972	_LIBCPP_POP_MACROS
973		973
974	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	974	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
975	# include <concepts>	975	# include <concepts>
976	# include <cstdlib>	976	# include <cstdlib>
977	# include <optional>	977	# include <optional>

lib/libcxx/include/cctype+5-63

...	@@ -39,13 +39,11 @@ int toupper(int c);	...	@@ -39,13 +39,11 @@ int toupper(int c);
39	#else	39	#else
40	# include <__config>	40	# include <__config>
41		41
42	# include <ctype.h>	42	# if __has_include(<ctype.h>)
43		43	# include <ctype.h>
44	# ifndef _LIBCPP_CTYPE_H	44	# ifdef _LIBCPP_CTYPE_H
45	# error <cctype> tried including <ctype.h> but didn't find libc++'s <ctype.h> header. \	45	# error "If libc++ starts defining <ctype.h>, the __has_include check should move to libc++'s <ctype.h>"
46	This usually means that your header search paths are not configured properly. \	46	# endif
47	The header search paths should contain the C++ Standard Library headers before \
48	any C Standard Library.
49	# endif	47	# endif
50		48
51	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	49	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
...	@@ -54,62 +52,6 @@ int toupper(int c);	...	@@ -54,62 +52,6 @@ int toupper(int c);
54		52
55	_LIBCPP_BEGIN_NAMESPACE_STD	53	_LIBCPP_BEGIN_NAMESPACE_STD
56		54
57	# ifdef isalnum
58	# undef isalnum
59	# endif
60
61	# ifdef isalpha
62	# undef isalpha
63	# endif
64
65	# ifdef isblank
66	# undef isblank
67	# endif
68
69	# ifdef iscntrl
70	# undef iscntrl
71	# endif
72
73	# ifdef isdigit
74	# undef isdigit
75	# endif
76
77	# ifdef isgraph
78	# undef isgraph
79	# endif
80
81	# ifdef islower
82	# undef islower
83	# endif
84
85	# ifdef isprint
86	# undef isprint
87	# endif
88
89	# ifdef ispunct
90	# undef ispunct
91	# endif
92
93	# ifdef isspace
94	# undef isspace
95	# endif
96
97	# ifdef isupper
98	# undef isupper
99	# endif
100
101	# ifdef isxdigit
102	# undef isxdigit
103	# endif
104
105	# ifdef tolower
106	# undef tolower
107	# endif
108
109	# ifdef toupper
110	# undef toupper
111	# endif
112
113	using ::isalnum _LIBCPP_USING_IF_EXISTS;	55	using ::isalnum _LIBCPP_USING_IF_EXISTS;
114	using ::isalpha _LIBCPP_USING_IF_EXISTS;	56	using ::isalpha _LIBCPP_USING_IF_EXISTS;
115	using ::isblank _LIBCPP_USING_IF_EXISTS;	57	using ::isblank _LIBCPP_USING_IF_EXISTS;

lib/libcxx/include/cfenv+5-8

...	@@ -57,14 +57,11 @@ int feupdateenv(const fenv_t* envp);	...	@@ -57,14 +57,11 @@ int feupdateenv(const fenv_t* envp);
57	#else	57	#else
58	# include <__config>	58	# include <__config>
59		59
60	# include <fenv.h>	60	# if __has_include(<fenv.h>)
61		61	# include <fenv.h>
62	# ifndef _LIBCPP_FENV_H	62	# ifdef _LIBCPP_FENV_H
63	# error <cfenv> tried including <fenv.h> but didn't find libc++'s <fenv.h> header. \	63	# error "If libc++ starts defining <fenv.h>, the __has_include check should move to libc++'s <fenv.h>"
64	This usually means that your header search paths are not configured properly. \	64	# endif
65	The header search paths should contain the C++ Standard Library headers before \
66	any C Standard Library, and you are probably using compiler flags that make that \
67	not be the case.
68	# endif	65	# endif
69		66
70	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	67	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

lib/libcxx/include/cfloat+6-8

...	@@ -74,14 +74,12 @@ Macros:	...	@@ -74,14 +74,12 @@ Macros:
74	#else	74	#else
75	# include <__config>	75	# include <__config>
76		76
77	# include <float.h>	77	// <float.h> is not provided by libc++
78		78	# if __has_include(<float.h>)
79	# ifndef _LIBCPP_FLOAT_H	79	# include <float.h>
80	# error <cfloat> tried including <float.h> but didn't find libc++'s <float.h> header. \	80	# ifdef _LIBCPP_FLOAT_H
81	This usually means that your header search paths are not configured properly. \	81	# error "If libc++ starts defining <float.h>, the __has_include check should move to libc++'s <float.h>"
82	The header search paths should contain the C++ Standard Library headers before \	82	# endif
83	any C Standard Library, and you are probably using compiler flags that make that \
84	not be the case.
85	# endif	83	# endif
86		84
87	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	85	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

lib/libcxx/include/charconv+1-5

 @@ -100,11 +100,7 @@ namespace std {
 #    pragma GCC system_header
 #  endif
-_LIBCPP_BEGIN_NAMESPACE_STD
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
-_LIBCPP_END_NAMESPACE_STD
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
 #    include <cmath>
 #    include <concepts>
 #    include <cstddef>

lib/libcxx/include/chrono+4-3

 @@ -46,6 +46,7 @@ public:
 template <class Rep, class Period = ratio<1>>
 class duration
 {
+    static_assert(__is_unqualified_v<Rep>, "A duration representation cannot be qualified");
     static_assert(!__is_duration<Rep>::value, "A duration representation can not be a duration");
     static_assert(__is_ratio<Period>::value, "Second template parameter of duration must be a std::ratio");
     static_assert(Period::num > 0, "duration period must be positive");
 @@ -1148,13 +1149,13 @@ namespace std {
 #    pragma GCC system_header
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 17
 #    include <cstdint>
 #    include <stdexcept>
 #    include <string_view>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <bit>
 #    include <concepts>
 #    include <cstring>
 @@ -1164,7 +1165,7 @@ namespace std {
 #    include <vector>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER == 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER == 20
 #    include <charconv>
 #    if _LIBCPP_HAS_LOCALIZATION
 #      include <locale>

lib/libcxx/include/cinttypes+5-8

...	@@ -244,14 +244,11 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int	...	@@ -244,14 +244,11 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int
244	// [cinttypes.syn]	244	// [cinttypes.syn]
245	# include <cstdint>	245	# include <cstdint>
246		246
247	# include <inttypes.h>	247	# if __has_include(<inttypes.h>)
248		248	# include <inttypes.h>
249	# ifndef _LIBCPP_INTTYPES_H	249	# ifdef _LIBCPP_INTTYPES_H
250	# error <cinttypes> tried including <inttypes.h> but didn't find libc++'s <inttypes.h> header. \	250	# error "If libc++ starts defining <inttypes.h>, the __has_include check should move to libc++'s <float.h>"
251	This usually means that your header search paths are not configured properly. \	251	# endif
252	The header search paths should contain the C++ Standard Library headers before \
253	any C Standard Library, and you are probably using compiler flags that make that \
254	not be the case.
255	# endif	252	# endif
256		253
257	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	254	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

lib/libcxx/include/cmath+1-1

...	@@ -612,7 +612,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -612,7 +612,7 @@ _LIBCPP_END_NAMESPACE_STD
612		612
613	_LIBCPP_POP_MACROS	613	_LIBCPP_POP_MACROS
614		614
615	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	615	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
616	# include <type_traits>	616	# include <type_traits>
617	# endif	617	# endif
618	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	618	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/codecvt+3-1

 @@ -71,6 +71,7 @@ class codecvt_utf8_utf16
 #    if _LIBCPP_STD_VER < 26 || defined(_LIBCPP_BUILDING_LIBRARY) || defined(_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT)
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 enum _LIBCPP_DEPRECATED_IN_CXX17 codecvt_mode { consume_header = 4, generate_header = 2, little_endian = 1 };
 @@ -579,13 +580,14 @@ public:
 };
 _LIBCPP_SUPPRESS_DEPRECATED_POP
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 #    endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_BUILDING_LIBRARY) || defined(_LIBCPP_ENABLE_CXX26_REMOVED_CODECVT)
 #  endif // _LIBCPP_HAS_LOCALIZATION
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <atomic>
 #    include <concepts>
 #    include <cstddef>

lib/libcxx/include/compare+1-1

...	@@ -167,7 +167,7 @@ namespace std {	...	@@ -167,7 +167,7 @@ namespace std {
167	# pragma GCC system_header	167	# pragma GCC system_header
168	# endif	168	# endif
169		169
170	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	170	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
171	# include <cmath>	171	# include <cmath>
172	# include <cstddef>	172	# include <cstddef>
173	# include <type_traits>	173	# include <type_traits>

lib/libcxx/include/complex+1-1

...	@@ -1484,7 +1484,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -1484,7 +1484,7 @@ _LIBCPP_END_NAMESPACE_STD
1484		1484
1485	_LIBCPP_POP_MACROS	1485	_LIBCPP_POP_MACROS
1486		1486
1487	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	1487	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
1488	# include <iosfwd>	1488	# include <iosfwd>
1489	# include <stdexcept>	1489	# include <stdexcept>
1490	# include <type_traits>	1490	# include <type_traits>

lib/libcxx/include/concepts+1-1

...	@@ -161,7 +161,7 @@ namespace std {	...	@@ -161,7 +161,7 @@ namespace std {
161		161
162	# include <version>	162	# include <version>
163		163
164	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	164	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
165	# include <cstddef>	165	# include <cstddef>
166	# include <type_traits>	166	# include <type_traits>
167	# endif	167	# endif

lib/libcxx/include/condition_variable+6-1

 @@ -146,6 +146,7 @@ _LIBCPP_PUSH_MACROS
 #  if _LIBCPP_HAS_THREADS
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 template <class _Lock>
 struct __unlock_guard {
 @@ -342,14 +343,18 @@ bool condition_variable_any::wait_for(
 _LIBCPP_EXPORTED_FROM_ABI void notify_all_at_thread_exit(condition_variable&, unique_lock<mutex>);
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_HAS_THREADS
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
 #    include <atomic>
+#  endif
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <concepts>
 #    include <cstdint>
 #    include <cstdlib>

lib/libcxx/include/coroutine+1-1

...	@@ -61,7 +61,7 @@ struct suspend_always;	...	@@ -61,7 +61,7 @@ struct suspend_always;
61	# pragma GCC system_header	61	# pragma GCC system_header
62	# endif	62	# endif
63		63
64	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	64	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
65	# include <cstddef>	65	# include <cstddef>
66	# include <iosfwd>	66	# include <iosfwd>
67	# include <limits>	67	# include <limits>

lib/libcxx/include/ctype.h deleted-65

...	@@ -1,65 +0,0 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_CTYPE_H
11	#define _LIBCPP_CTYPE_H
12
13	/*
14	ctype.h synopsis
15
16	int isalnum(int c);
17	int isalpha(int c);
18	int isblank(int c); // C99
19	int iscntrl(int c);
20	int isdigit(int c);
21	int isgraph(int c);
22	int islower(int c);
23	int isprint(int c);
24	int ispunct(int c);
25	int isspace(int c);
26	int isupper(int c);
27	int isxdigit(int c);
28	int tolower(int c);
29	int toupper(int c);
30	*/
31
32	#if defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
33	# include <__cxx03/__config>
34	#else
35	# include <__config>
36	#endif
37
38	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
39	# pragma GCC system_header
40	#endif
41
42	#if __has_include_next(<ctype.h>)
43	# include_next <ctype.h>
44	#endif
45
46	#ifdef __cplusplus
47
48	# undef isalnum
49	# undef isalpha
50	# undef isblank
51	# undef iscntrl
52	# undef isdigit
53	# undef isgraph
54	# undef islower
55	# undef isprint
56	# undef ispunct
57	# undef isspace
58	# undef isupper
59	# undef isxdigit
60	# undef tolower
61	# undef toupper
62
63	#endif
64
65	#endif // _LIBCPP_CTYPE_H

lib/libcxx/include/cuchar+4-4

 @@ -56,10 +56,10 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps);
 #    pragma GCC system_header
 #  endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if !defined(_LIBCPP_CXX03_LANG)
+_LIBCPP_BEGIN_NAMESPACE_STD
 using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
 #    if _LIBCPP_HAS_C8RTOMB_MBRTOC8
 @@ -71,10 +71,10 @@ using ::c16rtomb _LIBCPP_USING_IF_EXISTS;
 using ::mbrtoc32 _LIBCPP_USING_IF_EXISTS;
 using ::c32rtomb _LIBCPP_USING_IF_EXISTS;
-#  endif // _LIBCPP_CXX03_LANG
 _LIBCPP_END_NAMESPACE_STD
+#  endif // _LIBCPP_CXX03_LANG
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 #endif // _LIBCPP_CUCHAR

lib/libcxx/include/cwchar+1-1

...	@@ -258,7 +258,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp* __constexpr_wmemchr(_Tp	...	@@ -258,7 +258,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp* __constexpr_wmemchr(_Tp
258		258
259	_LIBCPP_END_NAMESPACE_STD	259	_LIBCPP_END_NAMESPACE_STD
260		260
261	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	261	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
262	# include <cstddef>	262	# include <cstddef>
263	# endif	263	# endif
264	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	264	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/deque+45-31

 @@ -40,7 +40,7 @@ public:
     deque() noexcept(is_nothrow_default_constructible<allocator_type>::value);
     explicit deque(const allocator_type& a);
     explicit deque(size_type n);
-    explicit deque(size_type n, const allocator_type& a); // C++14
+    explicit deque(size_type n, const allocator_type& a);
     deque(size_type n, const value_type& v);
     deque(size_type n, const value_type& v, const allocator_type& a);
     template <class InputIterator>
 @@ -263,10 +263,17 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
+#  ifndef _LIBCPP_ABI_USE_SMALL_DEQUE_BLOCK_SIZE
 template <class _ValueType, class _DiffType>
 struct __deque_block_size {
   static const _DiffType value = sizeof(_ValueType) < 256 ? 4096 / sizeof(_ValueType) : 16;
 };
+#  else
+template <class _ValueType, class _DiffType>
+struct __deque_block_size {
+  static const _DiffType value = sizeof(_ValueType) < 128 ? 512 / sizeof(_ValueType) : 4;
+};
+#  endif
 template <class _ValueType,
           class _Pointer,
 @@ -283,7 +290,18 @@ template <class _ValueType,
 #  endif
           >
 class __deque_iterator {
-  typedef _MapPointer __map_iterator;
+  using __map_iterator _LIBCPP_NODEBUG = __rebind_pointer_t<_Pointer, const __rebind_pointer_t<_Pointer, _ValueType> >;
+// TODO(LLVM 25): Remove this check
+#  ifndef _LIBCPP_ABI_DEQUE_ITERATORS
+  static_assert(
+      sizeof(__map_iterator) == sizeof(_MapPointer) && _LIBCPP_ALIGNOF(__map_iterator) == _LIBCPP_ALIGNOF(_MapPointer),
+      "It looks like you are using fancy pointers such that FancyPtr<const FancyPtr<const value_type>> is not "
+      "layout-compatible with FancyPtr<FancyPtr<value_type>> or FancyPtr<const FancyPtr<value_type>>. "
+      "This means that your ABI is being broken between LLVM 22 and LLVM 23 if deque::iterator or "
+      "deque::const_iterator is used. If you don't care about your ABI being broken, define the "
+      "_LIBCPP_ABI_DEQUE_ITERATORS macro to silence this diagnostic.");
+#  endif
 public:
   typedef _Pointer pointer;
 @@ -459,7 +477,7 @@ private:
       __deque_iterator<_ValueType, _Pointer, _Reference, _MapPointer, _DiffType, _BlockSize>;
 public:
-  using __segment_iterator _LIBCPP_NODEBUG = _MapPointer;
+  using __segment_iterator _LIBCPP_NODEBUG = typename _Iterator::__map_iterator;
   using __local_iterator _LIBCPP_NODEBUG   = _Pointer;
   static _LIBCPP_HIDE_FROM_ABI __segment_iterator __segment(_Iterator __iter) { return __iter.__m_iter_; }
 @@ -626,9 +644,7 @@ public:
   }
   explicit _LIBCPP_HIDE_FROM_ABI deque(size_type __n);
-#  if _LIBCPP_STD_VER >= 14
   explicit _LIBCPP_HIDE_FROM_ABI deque(size_type __n, const _Allocator& __a);
-#  endif
   _LIBCPP_HIDE_FROM_ABI deque(size_type __n, const value_type& __v);
   template <__enable_if_t<__is_allocator_v<_Allocator>, int> = 0>
 @@ -725,24 +741,24 @@ public:
   // iterators:
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT {
-    __map_pointer __mp = __map_.begin() + __start_ / __block_size;
+    auto __mp = __map_.begin() + __start_ / __block_size;
     return iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
   }
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT {
-    __map_const_pointer __mp = static_cast<__map_const_pointer>(__map_.begin() + __start_ / __block_size);
+    auto __mp = __map_.begin() + __start_ / __block_size;
     return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
   }
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator end() _NOEXCEPT {
-    size_type __p      = size() + __start_;
+    size_type __p = size() + __start_;
-    __map_pointer __mp = __map_.begin() + __p / __block_size;
+    auto __mp     = __map_.begin() + __p / __block_size;
     return iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
   }
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT {
-    size_type __p            = size() + __start_;
+    size_type __p = size() + __start_;
-    __map_const_pointer __mp = static_cast<__map_const_pointer>(__map_.begin() + __p / __block_size);
+    auto __mp     = __map_.begin() + __p / __block_size;
     return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
   }
 @@ -953,7 +969,7 @@ private:
     (void)__end;
     (void)__annotation_type;
     (void)__place;
-#  if __has_feature(address_sanitizer)
+#  if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
     // __beg - index of the first item to annotate
     // __end - index behind the last item to annotate (so last item + 1)
     // __annotation_type - __asan_unposion or __asan_poison
 @@ -1046,23 +1062,23 @@ private:
       std::__annotate_double_ended_contiguous_container<_Allocator>(
           __mem_beg, __mem_end, __old_beg, __old_end, __new_beg, __new_end);
     }
-#  endif // __has_feature(address_sanitizer)
+#  endif // _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
   }
   _LIBCPP_HIDE_FROM_ABI void __annotate_new(size_type __current_size) const _NOEXCEPT {
     (void)__current_size;
-#  if __has_feature(address_sanitizer)
+#  if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
     if (__current_size == 0)
       __annotate_from_to(0, __map_.size() * __block_size, __asan_poison, __asan_back_moved);
     else {
       __annotate_from_to(0, __start_, __asan_poison, __asan_front_moved);
       __annotate_from_to(__start_ + __current_size, __map_.size() * __block_size, __asan_poison, __asan_back_moved);
     }
-#  endif // __has_feature(address_sanitizer)
+#  endif // _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
   }
   _LIBCPP_HIDE_FROM_ABI void __annotate_delete() const _NOEXCEPT {
-#  if __has_feature(address_sanitizer)
+#  if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
     if (empty()) {
       for (size_t __i = 0; __i < __map_.size(); ++__i) {
         __annotate_whole_block(__i, __asan_unposion);
 @@ -1071,19 +1087,19 @@ private:
       __annotate_from_to(0, __start_, __asan_unposion, __asan_front_moved);
       __annotate_from_to(__start_ + size(), __map_.size() * __block_size, __asan_unposion, __asan_back_moved);
     }
-#  endif // __has_feature(address_sanitizer)
+#  endif // _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
   }
   _LIBCPP_HIDE_FROM_ABI void __annotate_increase_front(size_type __n) const _NOEXCEPT {
     (void)__n;
-#  if __has_feature(address_sanitizer)
+#  if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
     __annotate_from_to(__start_ - __n, __start_, __asan_unposion, __asan_front_moved);
 #  endif
   }
   _LIBCPP_HIDE_FROM_ABI void __annotate_increase_back(size_type __n) const _NOEXCEPT {
     (void)__n;
-#  if __has_feature(address_sanitizer)
+#  if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
     __annotate_from_to(__start_ + size(), __start_ + size() + __n, __asan_unposion, __asan_back_moved);
 #  endif
   }
 @@ -1091,7 +1107,7 @@ private:
   _LIBCPP_HIDE_FROM_ABI void __annotate_shrink_front(size_type __old_size, size_type __old_start) const _NOEXCEPT {
     (void)__old_size;
     (void)__old_start;
-#  if __has_feature(address_sanitizer)
+#  if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
     __annotate_from_to(__old_start, __old_start + (__old_size - size()), __asan_poison, __asan_front_moved);
 #  endif
   }
 @@ -1099,7 +1115,7 @@ private:
   _LIBCPP_HIDE_FROM_ABI void __annotate_shrink_back(size_type __old_size, size_type __old_start) const _NOEXCEPT {
     (void)__old_size;
     (void)__old_start;
-#  if __has_feature(address_sanitizer)
+#  if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
     __annotate_from_to(__old_start + size(), __old_start + __old_size, __asan_poison, __asan_back_moved);
 #  endif
   }
 @@ -1112,7 +1128,7 @@ private:
   __annotate_whole_block(size_t __block_index, __asan_annotation_type __annotation_type) const _NOEXCEPT {
     (void)__block_index;
     (void)__annotation_type;
-#  if __has_feature(address_sanitizer)
+#  if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
     __map_const_iterator __block_it = __map_.begin() + __block_index;
     const void* __block_start       = std::__to_address(*__block_it);
     const void* __block_end         = std::__to_address(*__block_it + __block_size);
 @@ -1125,7 +1141,7 @@ private:
     }
 #  endif
   }
-#  if __has_feature(address_sanitizer)
+#  if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
 public:
   _LIBCPP_HIDE_FROM_ABI bool __verify_asan_annotations() const _NOEXCEPT {
 @@ -1187,7 +1203,7 @@ public:
   }
 private:
-#  endif // __has_feature(address_sanitizer)
+#  endif // _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS
   _LIBCPP_HIDE_FROM_ABI bool __maybe_remove_front_spare(bool __keep_one = true) {
     if (__front_spare_blocks() >= 2 || (!__keep_one && __front_spare_blocks())) {
       __annotate_whole_block(0, __asan_unposion);
 @@ -1305,7 +1321,6 @@ deque<_Tp, _Allocator>::deque(size_type __n) : __start_(0), __size_(0) {
     __append(__n);
 }
-#  if _LIBCPP_STD_VER >= 14
 template <class _Tp, class _Allocator>
 deque<_Tp, _Allocator>::deque(size_type __n, const _Allocator& __a)
     : __map_(__pointer_allocator(__a)), __start_(0), __size_(0), __alloc_(__a) {
 @@ -1313,7 +1328,6 @@ deque<_Tp, _Allocator>::deque(size_type __n, const _Allocator& __a)
   if (__n > 0)
     __append(__n);
 }
-#  endif
 template <class _Tp, class _Allocator>
 deque<_Tp, _Allocator>::deque(size_type __n, const value_type& __v) : __start_(0), __size_(0) {
 @@ -2220,7 +2234,7 @@ deque<_Tp, _Allocator>::__move_and_check(iterator __f, iterator __l, iterator __
       __fe = __fb + __bs;
     }
     if (__fb <= __vt && __vt < __fe)
-      __vt = (const_iterator(static_cast<__map_const_pointer>(__f.__m_iter_), __vt) -= __f - __r).__ptr_;
+      __vt = (const_iterator(__f.__m_iter_, __vt) -= __f - __r).__ptr_;
     __r = std::move(__fb, __fe, __r);
     __n -= __bs;
     __f += __bs;
 @@ -2247,7 +2261,7 @@ deque<_Tp, _Allocator>::__move_backward_and_check(iterator __f, iterator __l, it
       __lb = __le - __bs;
     }
     if (__lb <= __vt && __vt < __le)
-      __vt = (const_iterator(static_cast<__map_const_pointer>(__l.__m_iter_), __vt) += __r - __l - 1).__ptr_;
+      __vt = (const_iterator(__l.__m_iter_, __vt) += __r - __l - 1).__ptr_;
     __r = std::move_backward(__lb, __le, __r);
     __n -= __bs;
     __l -= __bs - 1;
 @@ -2273,7 +2287,7 @@ void deque<_Tp, _Allocator>::__move_construct_and_check(iterator __f, iterator _
       __fe = __fb + __bs;
     }
     if (__fb <= __vt && __vt < __fe)
-      __vt = (const_iterator(static_cast<__map_const_pointer>(__f.__m_iter_), __vt) += __r - __f).__ptr_;
+      __vt = (const_iterator(__f.__m_iter_, __vt) += __r - __f).__ptr_;
     for (; __fb != __fe; ++__fb, ++__r, ++__size())
       __alloc_traits::construct(__a, std::addressof(*__r), std::move(*__fb));
     __n -= __bs;
 @@ -2305,7 +2319,7 @@ void deque<_Tp, _Allocator>::__move_construct_backward_and_check(
       __lb = __le - __bs;
     }
     if (__lb <= __vt && __vt < __le)
-      __vt = (const_iterator(static_cast<__map_const_pointer>(__l.__m_iter_), __vt) -= __l - __r + 1).__ptr_;
+      __vt = (const_iterator(__l.__m_iter_, __vt) -= __l - __r + 1).__ptr_;
     while (__le != __lb) {
       __alloc_traits::construct(__a, std::addressof(*--__r), std::move(*--__le));
       --__start_;
 @@ -2532,7 +2546,7 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <algorithm>
 #    include <atomic>
 #    include <concepts>

lib/libcxx/include/exception+2-2

...	@@ -91,13 +91,13 @@ template <class E> void rethrow_if_nested(const E& e);	...	@@ -91,13 +91,13 @@ template <class E> void rethrow_if_nested(const E& e);
91	# pragma GCC system_header	91	# pragma GCC system_header
92	# endif	92	# endif
93		93
94	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	94	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
95	# include <cstddef>	95	# include <cstddef>
96	# include <new>	96	# include <new>
97	# include <type_traits>	97	# include <type_traits>
98	# endif	98	# endif
99		99
100	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 23	100	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
101	# include <cstdlib>	101	# include <cstdlib>
102	# endif	102	# endif
103	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	103	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/execution+1-1

...	@@ -155,7 +155,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -155,7 +155,7 @@ _LIBCPP_END_NAMESPACE_STD
155		155
156	# endif // _LIBCPP_HAS_EXPERIMENTAL_PSTL && _LIBCPP_STD_VER >= 17	156	# endif // _LIBCPP_HAS_EXPERIMENTAL_PSTL && _LIBCPP_STD_VER >= 17
157		157
158	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	158	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
159	# include <cstddef>	159	# include <cstddef>
160	# endif	160	# endif
161	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	161	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/experimental/iterator+2-2

...	@@ -124,14 +124,14 @@ _LIBCPP_END_NAMESPACE_LFTS	...	@@ -124,14 +124,14 @@ _LIBCPP_END_NAMESPACE_LFTS
124		124
125	_LIBCPP_POP_MACROS	125	_LIBCPP_POP_MACROS
126		126
127	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	127	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
128	# include <cstddef>	128	# include <cstddef>
129	# include <iosfwd>	129	# include <iosfwd>
130	# include <optional>	130	# include <optional>
131	# include <type_traits>	131	# include <type_traits>
132	# endif	132	# endif
133		133
134	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 23	134	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
135	# include <locale>	135	# include <locale>
136	# endif	136	# endif
137		137

lib/libcxx/include/experimental/memory+5-7

 @@ -70,10 +70,10 @@ public:
 #  ifdef _LIBCPP_ENABLE_EXPERIMENTAL
-_LIBCPP_BEGIN_NAMESPACE_LFTS_V2
 #    if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_LFTS_V2
 template <class _Wp>
 class observer_ptr {
 public:
 @@ -175,28 +175,26 @@ _LIBCPP_HIDE_FROM_ABI bool operator>=(observer_ptr<_W1> __a, observer_ptr<_W2> _
   return !(__a < __b);
 }
-#    endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_LFTS_V2
 _LIBCPP_BEGIN_NAMESPACE_STD
 // hash
-#    if _LIBCPP_STD_VER >= 17
 template <class _Tp>
 struct hash<experimental::observer_ptr<_Tp>> {
   _LIBCPP_HIDE_FROM_ABI size_t operator()(const experimental::observer_ptr<_Tp>& __ptr) const noexcept {
     return hash<_Tp*>()(__ptr.get());
   }
 };
-#    endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#    endif // _LIBCPP_STD_VER >= 17
 #  endif // _LIBCPP_ENABLE_EXPERIMENTAL
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <cstddef>
 #    include <limits>
 #  endif

lib/libcxx/include/experimental/propagate_const+1-1

...	@@ -488,7 +488,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -488,7 +488,7 @@ _LIBCPP_END_NAMESPACE_STD
488		488
489	_LIBCPP_POP_MACROS	489	_LIBCPP_POP_MACROS
490		490
491	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	491	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
492	# include <cstddef>	492	# include <cstddef>
493	# include <type_traits>	493	# include <type_traits>
494	# endif	494	# endif

lib/libcxx/include/experimental/simd+1-1

...	@@ -88,7 +88,7 @@ inline namespace parallelism_v2 {	...	@@ -88,7 +88,7 @@ inline namespace parallelism_v2 {
88	# include <experimental/__simd/traits.h>	88	# include <experimental/__simd/traits.h>
89	# include <experimental/__simd/vec_ext.h>	89	# include <experimental/__simd/vec_ext.h>
90		90
91	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	91	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
92	# include <cstddef>	92	# include <cstddef>
93	# endif	93	# endif
94	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	94	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/experimental/type_traits+1-1

...	@@ -151,7 +151,7 @@ constexpr bool is_detected_convertible_v = is_detected_convertible<_To, _Op, _Ar	...	@@ -151,7 +151,7 @@ constexpr bool is_detected_convertible_v = is_detected_convertible<_To, _Op, _Ar
151		151
152	_LIBCPP_END_NAMESPACE_LFTS	152	_LIBCPP_END_NAMESPACE_LFTS
153		153
154	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	154	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
155	# include <cstddef>	155	# include <cstddef>
156	# endif	156	# endif
157		157

lib/libcxx/include/experimental/utility+1-1

...	@@ -46,7 +46,7 @@ struct erased_type {};	...	@@ -46,7 +46,7 @@ struct erased_type {};
46		46
47	_LIBCPP_END_NAMESPACE_LFTS	47	_LIBCPP_END_NAMESPACE_LFTS
48		48
49	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	49	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
50	# include <cstddef>	50	# include <cstddef>
51	# endif	51	# endif
52	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	52	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/ext/hash_map+1-1

...	@@ -825,7 +825,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const hash_multimap<_Key, _Tp, _Has	...	@@ -825,7 +825,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const hash_multimap<_Key, _Tp, _Has
825		825
826	} // namespace __gnu_cxx	826	} // namespace __gnu_cxx
827		827
828	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	828	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
829	# include <concepts>	829	# include <concepts>
830	# include <iterator>	830	# include <iterator>
831	# include <type_traits>	831	# include <type_traits>

lib/libcxx/include/ext/hash_set+1-1

...	@@ -572,7 +572,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const hash_multiset<_Value, _Hash,	...	@@ -572,7 +572,7 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const hash_multiset<_Value, _Hash,
572		572
573	} // namespace __gnu_cxx	573	} // namespace __gnu_cxx
574		574
575	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	575	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
576	# include <concepts>	576	# include <concepts>
577	# include <iterator>	577	# include <iterator>
578	# include <type_traits>	578	# include <type_traits>

lib/libcxx/include/fenv.h deleted-118

...	@@ -1,118 +0,0 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_FENV_H
11	#define _LIBCPP_FENV_H
12
13	/*
14	fenv.h synopsis
15
16	This entire header is C99 / C++0X
17
18	Macros:
19
20	FE_DIVBYZERO
21	FE_INEXACT
22	FE_INVALID
23	FE_OVERFLOW
24	FE_UNDERFLOW
25	FE_ALL_EXCEPT
26	FE_DOWNWARD
27	FE_TONEAREST
28	FE_TOWARDZERO
29	FE_UPWARD
30	FE_DFL_ENV
31
32	Types:
33
34	fenv_t
35	fexcept_t
36
37	int feclearexcept(int excepts);
38	int fegetexceptflag(fexcept_t* flagp, int excepts);
39	int feraiseexcept(int excepts);
40	int fesetexceptflag(const fexcept_t* flagp, int excepts);
41	int fetestexcept(int excepts);
42	int fegetround();
43	int fesetround(int round);
44	int fegetenv(fenv_t* envp);
45	int feholdexcept(fenv_t* envp);
46	int fesetenv(const fenv_t* envp);
47	int feupdateenv(const fenv_t* envp);
48
49
50	*/
51
52	#if defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
53	# include <__cxx03/__config>
54	#else
55	# include <__config>
56	#endif
57
58	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
59	# pragma GCC system_header
60	#endif
61
62	#if __has_include_next(<fenv.h>)
63	# include_next <fenv.h>
64	#endif
65
66	#ifdef __cplusplus
67
68	extern "C++" {
69
70	# ifdef feclearexcept
71	# undef feclearexcept
72	# endif
73
74	# ifdef fegetexceptflag
75	# undef fegetexceptflag
76	# endif
77
78	# ifdef feraiseexcept
79	# undef feraiseexcept
80	# endif
81
82	# ifdef fesetexceptflag
83	# undef fesetexceptflag
84	# endif
85
86	# ifdef fetestexcept
87	# undef fetestexcept
88	# endif
89
90	# ifdef fegetround
91	# undef fegetround
92	# endif
93
94	# ifdef fesetround
95	# undef fesetround
96	# endif
97
98	# ifdef fegetenv
99	# undef fegetenv
100	# endif
101
102	# ifdef feholdexcept
103	# undef feholdexcept
104	# endif
105
106	# ifdef fesetenv
107	# undef fesetenv
108	# endif
109
110	# ifdef feupdateenv
111	# undef feupdateenv
112	# endif
113
114	} // extern "C++"
115
116	#endif // defined(__cplusplus)
117
118	#endif // _LIBCPP_FENV_H

lib/libcxx/include/filesystem+1-1

...	@@ -568,7 +568,7 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct	...	@@ -568,7 +568,7 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct
568	# pragma GCC system_header	568	# pragma GCC system_header
569	# endif	569	# endif
570		570
571	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	571	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
572	# include <concepts>	572	# include <concepts>
573	# include <cstdlib>	573	# include <cstdlib>
574	# include <cstring>	574	# include <cstring>

lib/libcxx/include/float.h deleted-99

...	@@ -1,99 +0,0 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_FLOAT_H
11	#define _LIBCPP_FLOAT_H
12
13	/*
14	float.h synopsis
15
16	Macros:
17
18	FLT_ROUNDS
19	FLT_EVAL_METHOD // C99
20	FLT_RADIX
21
22	FLT_MANT_DIG
23	DBL_MANT_DIG
24	LDBL_MANT_DIG
25
26	FLT_HAS_SUBNORM // C11
27	DBL_HAS_SUBNORM // C11
28	LDBL_HAS_SUBNORM // C11
29
30	DECIMAL_DIG // C99
31	FLT_DECIMAL_DIG // C11
32	DBL_DECIMAL_DIG // C11
33	LDBL_DECIMAL_DIG // C11
34
35	FLT_DIG
36	DBL_DIG
37	LDBL_DIG
38
39	FLT_MIN_EXP
40	DBL_MIN_EXP
41	LDBL_MIN_EXP
42
43	FLT_MIN_10_EXP
44	DBL_MIN_10_EXP
45	LDBL_MIN_10_EXP
46
47	FLT_MAX_EXP
48	DBL_MAX_EXP
49	LDBL_MAX_EXP
50
51	FLT_MAX_10_EXP
52	DBL_MAX_10_EXP
53	LDBL_MAX_10_EXP
54
55	FLT_MAX
56	DBL_MAX
57	LDBL_MAX
58
59	FLT_EPSILON
60	DBL_EPSILON
61	LDBL_EPSILON
62
63	FLT_MIN
64	DBL_MIN
65	LDBL_MIN
66
67	FLT_TRUE_MIN // C11
68	DBL_TRUE_MIN // C11
69	LDBL_TRUE_MIN // C11
70
71	*/
72
73	#if defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
74	# include <__cxx03/__config>
75	#else
76	# include <__config>
77	#endif
78
79	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
80	# pragma GCC system_header
81	#endif
82
83	#if __has_include_next(<float.h>)
84	# include_next <float.h>
85	#endif
86
87	#ifdef __cplusplus
88
89	# ifndef FLT_EVAL_METHOD
90	# define FLT_EVAL_METHOD __FLT_EVAL_METHOD__
91	# endif
92
93	# ifndef DECIMAL_DIG
94	# define DECIMAL_DIG __DECIMAL_DIG__
95	# endif
96
97	#endif // __cplusplus
98
99	#endif // _LIBCPP_FLOAT_H

lib/libcxx/include/format+13-10

 @@ -31,7 +31,7 @@ namespace std {
     public:
       template<class T> consteval basic_format_string(const T& s);
-      basic_format_string(runtime-format-string<charT> s) noexcept : str(s.str) {}   // since C++26
+      basic_format_string(dynamic-format-string<charT> s) noexcept : str(s.str) {}   // since C++26
       constexpr basic_string_view<charT> get() const noexcept { return str; }
     };
 @@ -42,21 +42,21 @@ namespace std {
     using wformat_string =                                      // since C++23, exposition only before C++23
       basic_format_string<wchar_t, type_identity_t<Args>...>;
-  template<class charT> struct runtime-format-string {          // since C++26, exposition-only
+  template<class charT> struct dynamic-format-string {          // since C++26, exposition-only
   private:
     basic_string_view<charT> str;                               // exposition-only
   public:
-    runtime-format-string(basic_string_view<charT> s) noexcept : str(s) {}
+    dynamic-format-string(basic_string_view<charT> s) noexcept : str(s) {}
-    runtime-format-string(const runtime-format-string&) = delete;
+    dynamic-format-string(const dynamic-format-string&) = delete;
-    runtime-format-string& operator=(const runtime-format-string&) = delete;
+    dynamic-format-string& operator=(const dynamic-format-string&) = delete;
   };
-  runtime-format-string<char> runtime_format(string_view fmt) noexcept {
+  dynamic-format-string<char> dynamic_format(string_view fmt) noexcept {
     return fmt;
   }
-  runtime-format-string<wchar_t> runtime_format(wstring_view fmt) noexcept {
+  dynamic-format-string<wchar_t> dynamic_format(wstring_view fmt) noexcept {
     return fmt;
   }
 @@ -213,7 +213,7 @@ namespace std {
 #    include <__format/format_string.h>
 #    include <__format/format_to_n_result.h>
 #    include <__format/formatter.h>
-#    include <__format/formatter_bool.h>
+#    include <__format/formatter_bool_impl.h>
 #    include <__format/formatter_char.h>
 #    include <__format/formatter_floating_point.h>
 #    include <__format/formatter_integer.h>
 @@ -233,12 +233,15 @@ namespace std {
 #    pragma GCC system_header
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
+#    include <cmath>
+#  endif
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <array>
 #    include <cctype>
 #    include <cerrno>
 #    include <clocale>
-#    include <cmath>
 #    include <cstddef>
 #    include <cstdint>
 #    include <cstdlib>

lib/libcxx/include/forward_list+4-8

...	@@ -37,7 +37,7 @@ public:	...	@@ -37,7 +37,7 @@ public:
37	noexcept(is_nothrow_default_constructible<allocator_type>::value);	37	noexcept(is_nothrow_default_constructible<allocator_type>::value);
38	explicit forward_list(const allocator_type& a);	38	explicit forward_list(const allocator_type& a);
39	explicit forward_list(size_type n);	39	explicit forward_list(size_type n);
40	explicit forward_list(size_type n, const allocator_type& a); // C++14	40	explicit forward_list(size_type n, const allocator_type& a);
41	forward_list(size_type n, const value_type& v);	41	forward_list(size_type n, const value_type& v);
42	forward_list(size_type n, const value_type& v, const allocator_type& a);	42	forward_list(size_type n, const value_type& v, const allocator_type& a);
43	template <class InputIterator>	43	template <class InputIterator>
...	@@ -234,6 +234,7 @@ template <class T, class Allocator, class Predicate>	...	@@ -234,6 +234,7 @@ template <class T, class Allocator, class Predicate>
234	# include <__type_traits/remove_cv.h>	234	# include <__type_traits/remove_cv.h>
235	# include <__type_traits/type_identity.h>	235	# include <__type_traits/type_identity.h>
236	# include <__utility/exception_guard.h>	236	# include <__utility/exception_guard.h>
		237	# include <__utility/exchange.h>
237	# include <__utility/forward.h>	238	# include <__utility/forward.h>
238	# include <__utility/move.h>	239	# include <__utility/move.h>
239	# include <__utility/swap.h>	240	# include <__utility/swap.h>
...	@@ -663,9 +664,7 @@ public:	...	@@ -663,9 +664,7 @@ public:
663	_NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value) {} // = default;	664	_NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value) {} // = default;
664	_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit forward_list(const allocator_type& __a);	665	_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit forward_list(const allocator_type& __a);
665	_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit forward_list(size_type __n);	666	_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit forward_list(size_type __n);
666	# if _LIBCPP_STD_VER >= 14
667	_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit forward_list(size_type __n, const allocator_type& __a);	667	_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit forward_list(size_type __n, const allocator_type& __a);
668	# endif
669	_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI forward_list(size_type __n, const value_type& __v);	668	_LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI forward_list(size_type __n, const value_type& __v);
670		669
671	template <__enable_if_t<__is_allocator_v<_Alloc>, int> = 0>	670	template <__enable_if_t<__is_allocator_v<_Alloc>, int> = 0>
...	@@ -940,7 +939,6 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type	...	@@ -940,7 +939,6 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type
940	}	939	}
941	}	940	}
942		941
943	# if _LIBCPP_STD_VER >= 14
944	template <class _Tp, class _Alloc>	942	template <class _Tp, class _Alloc>
945	_LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type __n, const allocator_type& __base_alloc)	943	_LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type __n, const allocator_type& __base_alloc)
946	: __base(__base_alloc) {	944	: __base(__base_alloc) {
...	@@ -951,7 +949,6 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type	...	@@ -951,7 +949,6 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type
951	}	949	}
952	}	950	}
953	}	951	}
954	# endif
955		952
956	template <class _Tp, class _Alloc>	953	template <class _Tp, class _Alloc>
957	_LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type __n, const value_type& __v) {	954	_LIBCPP_CONSTEXPR_SINCE_CXX26 forward_list<_Tp, _Alloc>::forward_list(size_type __n, const value_type& __v) {
...	@@ -1022,8 +1019,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 void forward_list<_Tp, _Alloc>::__move_assign(forw	...	@@ -1022,8 +1019,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 void forward_list<_Tp, _Alloc>::__move_assign(forw
1022	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) {	1019	_NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value) {
1023	clear();	1020	clear();
1024	__base::__move_assign_alloc(__x);	1021	__base::__move_assign_alloc(__x);
1025	__base::__before_begin()->__next_ = __x.__before_begin()->__next_;	1022	__base::__before_begin()->__next_ = std::__exchange(__x.__before_begin()->__next_, nullptr);
1026	__x.__before_begin()->__next_ = nullptr;
1027	}	1023	}
1028		1024
1029	template <class _Tp, class _Alloc>	1025	template <class _Tp, class _Alloc>
...	@@ -1603,7 +1599,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -1603,7 +1599,7 @@ _LIBCPP_END_NAMESPACE_STD
1603		1599
1604	_LIBCPP_POP_MACROS	1600	_LIBCPP_POP_MACROS
1605		1601
1606	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	1602	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
1607	# include <algorithm>	1603	# include <algorithm>
1608	# include <atomic>	1604	# include <atomic>
1609	# include <concepts>	1605	# include <concepts>

lib/libcxx/include/fstream+90-31

...	@@ -220,6 +220,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -220,6 +220,7 @@ _LIBCPP_PUSH_MACROS
220	# include <__undef_macros>	220	# include <__undef_macros>
221		221
222	_LIBCPP_BEGIN_NAMESPACE_STD	222	_LIBCPP_BEGIN_NAMESPACE_STD
		223	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
223		224
224	# if _LIBCPP_STD_VER >= 23 && defined(_LIBCPP_WIN32API)	225	# if _LIBCPP_STD_VER >= 23 && defined(_LIBCPP_WIN32API)
225	_LIBCPP_EXPORTED_FROM_ABI void* __filebuf_windows_native_handle(FILE* __file) noexcept;	226	_LIBCPP_EXPORTED_FROM_ABI void* __filebuf_windows_native_handle(FILE* __file) noexcept;
...	@@ -308,6 +309,34 @@ protected:	...	@@ -308,6 +309,34 @@ protected:
308	return basic_streambuf<_CharT, _Traits>::xsputn(__str, __len);	309	return basic_streambuf<_CharT, _Traits>::xsputn(__str, __len);
309	}	310	}
310		311
		312	_LIBCPP_HIDE_FROM_ABI_VIRTUAL streamsize xsgetn(char_type* __str, streamsize __len) override {
		313	if (__file_ && __always_noconv_) {
		314	char_type __1buf;
		315	__read_guard __guard(__1buf, *this);
		316	const streamsize __n = std::min(this->egptr() - this->gptr(), __len);
		317	if (__n != 0) {
		318	traits_type::copy(__str, this->gptr(), __n);
		319	this->__gbump_ptrdiff(__n);
		320	}
		321	const streamsize __remainder = __len - __n;
		322	const streamsize __buffer_space = this->egptr() - this->eback();
		323
		324	if (__remainder >= __buffer_space) {
		325	auto __res = std::fread(__str + __n, sizeof(char_type), __remainder, __file_) + __n;
		326
		327	// Copy the buffer-sized tail into the buffer so that `unget`ting works correctly
		328	auto __buf_size = std::min<size_t>(__res, this->egptr() - this->eback());
		329	traits_type::copy(this->eback(), __str + __res - __buf_size, __buf_size);
		330	this->setg(this->eback(), this->eback() + __buf_size, this->eback() + __buf_size);
		331
		332	return __res;
		333	} else if (__remainder > 0)
		334	return basic_streambuf<_CharT, _Traits>::xsgetn(__str + __n, __remainder) + __n;
		335	return __n;
		336	}
		337	return basic_streambuf<_CharT, _Traits>::xsgetn(__str, __len);
		338	}
		339
311	private:	340	private:
312	char* __extbuf_;	341	char* __extbuf_;
313	const char* __extbufnext_;	342	const char* __extbufnext_;
...	@@ -364,6 +393,40 @@ private:	...	@@ -364,6 +393,40 @@ private:
364	bool __always_noconv_;	393	bool __always_noconv_;
365		394
366	bool __read_mode();	395	bool __read_mode();
		396
		397	struct [[__nodiscard__]] __read_guard {
		398	basic_filebuf& __self_;
		399	size_t __unget_size_;
		400	char_type& __1buf_;
		401
		402	_LIBCPP_HIDE_FROM_ABI __read_guard(char_type& __1buf, basic_filebuf& __self) : __self_(__self), __1buf_(__1buf) {
		403	if (__self.__cm_ & ios_base::in) {
		404	__unget_size_ = std::min<size_t>((__self.egptr() - __self.eback()) / 2, 4);
		405	} else {
		406	__self.setp(nullptr, nullptr);
		407	if (__self.__always_noconv_) {
		408	__self.setg(reinterpret_cast<char_type*>(__self.__extbuf_),
		409	reinterpret_cast<char_type*>(__self.__extbuf_) + __self.__ebs_,
		410	reinterpret_cast<char_type*>(__self.__extbuf_) + __self.__ebs_);
		411	} else {
		412	__self.setg(__self.__intbuf_, __self.__intbuf_ + __self.__ibs_, __self.__intbuf_ + __self.__ibs_);
		413	}
		414	__self.__cm_ = ios_base::in;
		415	__unget_size_ = 0;
		416	}
		417
		418	if (__self.gptr() == nullptr)
		419	__self.setg(std::addressof(__1buf_), std::addressof(__1buf_) + 1, std::addressof(__1buf_) + 1);
		420	}
		421
		422	_LIBCPP_HIDE_FROM_ABI size_t __unget_size() { return __unget_size_; }
		423
		424	_LIBCPP_HIDE_FROM_ABI ~__read_guard() {
		425	if (__self_.eback() == std::addressof(__1buf_))
		426	__self_.setg(nullptr, nullptr, nullptr);
		427	}
		428	};
		429
367	void __write_mode();	430	void __write_mode();
368		431
369	_LIBCPP_HIDE_FROM_ABI static int __fseek(FILE* __file, pos_type __offset, int __whence);	432	_LIBCPP_HIDE_FROM_ABI static int __fseek(FILE* __file, pos_type __offset, int __whence);
...	@@ -400,14 +463,12 @@ private:	...	@@ -400,14 +463,12 @@ private:
400	// If the file is already open, switch to unbuffered mode. Otherwise, record	463	// If the file is already open, switch to unbuffered mode. Otherwise, record
401	// the request to use unbuffered mode so that we use that mode when we	464	// the request to use unbuffered mode so that we use that mode when we
402	// eventually open the file.	465	// eventually open the file.
403	_LIBCPP_HIDE_FROM_ABI void __request_unbuffered_mode(char_type* __s, streamsize __n) {	466	_LIBCPP_HIDE_FROM_ABI void __request_unbuffered_mode() {
404	if (__cm_ == __no_io_operations && __s == nullptr && __n == 0) {	467	if (__file_) {
405	if (__file_) {	468	std::setbuf(__file_, nullptr);
406	std::setbuf(__file_, nullptr);	469	__cm_ = 0;
407	__cm_ = 0;	470	} else {
408	} else {	471	__cm_ = __no_io_operations \| __use_unbuffered_io;
409	__cm_ = __no_io_operations \| __use_unbuffered_io;
410	}
411	}	472	}
412	}	473	}
413		474
...	@@ -601,6 +662,17 @@ inline bool basic_filebuf<_CharT, _Traits>::is_open() const {	...	@@ -601,6 +662,17 @@ inline bool basic_filebuf<_CharT, _Traits>::is_open() const {
601	return __file_ != nullptr;	662	return __file_ != nullptr;
602	}	663	}
603		664
		665	// Configures the fopen close-on-exec mode character, if any. This string will
		666	// be appended to any mode string used by fstream for fopen/fdopen.
		667	//
		668	// Not all platforms support this, but it helps avoid fd-leaks on platforms that
		669	// do.
		670	# if defined(__BIONIC__)
		671	# define _LIBCPP_FOPEN_CLOEXEC_MODE "e"
		672	# else
		673	# define _LIBCPP_FOPEN_CLOEXEC_MODE
		674	# endif
		675
604	template <class _CharT, class _Traits>	676	template <class _CharT, class _Traits>
605	const char* basic_filebuf<_CharT, _Traits>::__make_mdstring(ios_base::openmode __mode) _NOEXCEPT {	677	const char* basic_filebuf<_CharT, _Traits>::__make_mdstring(ios_base::openmode __mode) _NOEXCEPT {
606	switch (__mode & ~ios_base::ate) {	678	switch (__mode & ~ios_base::ate) {
...	@@ -773,11 +845,11 @@ template <class _CharT, class _Traits>	...	@@ -773,11 +845,11 @@ template <class _CharT, class _Traits>
773	typename basic_filebuf<_CharT, _Traits>::int_type basic_filebuf<_CharT, _Traits>::underflow() {	845	typename basic_filebuf<_CharT, _Traits>::int_type basic_filebuf<_CharT, _Traits>::underflow() {
774	if (__file_ == nullptr)	846	if (__file_ == nullptr)
775	return traits_type::eof();	847	return traits_type::eof();
776	bool __initial = __read_mode();	848
777	char_type __1buf;	849	char_type __1buf;
778	if (this->gptr() == nullptr)	850	__read_guard __guard(__1buf, *this);
779	this->setg(std::addressof(__1buf), std::addressof(__1buf) + 1, std::addressof(__1buf) + 1);	851
780	const size_t __unget_sz = __initial ? 0 : std::min<size_t>((this->egptr() - this->eback()) / 2, 4);	852	const size_t __unget_sz = __guard.__unget_size();
781	int_type __c = traits_type::eof();	853	int_type __c = traits_type::eof();
782	if (this->gptr() == this->egptr()) {	854	if (this->gptr() == this->egptr()) {
783	std::memmove(this->eback(), this->egptr() - __unget_sz, __unget_sz * sizeof(char_type));	855	std::memmove(this->eback(), this->egptr() - __unget_sz, __unget_sz * sizeof(char_type));
...	@@ -820,8 +892,6 @@ typename basic_filebuf<_CharT, _Traits>::int_type basic_filebuf<_CharT, _Traits>	...	@@ -820,8 +892,6 @@ typename basic_filebuf<_CharT, _Traits>::int_type basic_filebuf<_CharT, _Traits>
820	}	892	}
821	} else	893	} else
822	__c = traits_type::to_int_type(*this->gptr());	894	__c = traits_type::to_int_type(*this->gptr());
823	if (this->eback() == std::addressof(__1buf))
824	this->setg(nullptr, nullptr, nullptr);
825	return __c;	895	return __c;
826	}	896	}
827		897
...	@@ -920,7 +990,9 @@ template <class _CharT, class _Traits>	...	@@ -920,7 +990,9 @@ template <class _CharT, class _Traits>
920	basic_streambuf<_CharT, _Traits>* basic_filebuf<_CharT, _Traits>::setbuf(char_type* __s, streamsize __n) {	990	basic_streambuf<_CharT, _Traits>* basic_filebuf<_CharT, _Traits>::setbuf(char_type* __s, streamsize __n) {
921	this->setg(nullptr, nullptr, nullptr);	991	this->setg(nullptr, nullptr, nullptr);
922	this->setp(nullptr, nullptr);	992	this->setp(nullptr, nullptr);
923	__request_unbuffered_mode(__s, __n);	993	// Calling setbuf(nullptr, 0) before any i/o operation switches the stream to unbuffered mode
		994	if (__cm_ == __no_io_operations && __s == nullptr && __n == 0)
		995	__request_unbuffered_mode();
924	if (__owns_eb_)	996	if (__owns_eb_)
925	delete[] __extbuf_;	997	delete[] __extbuf_;
926	if (__owns_ib_)	998	if (__owns_ib_)
...	@@ -1110,20 +1182,6 @@ void basic_filebuf<_CharT, _Traits>::imbue(const locale& __loc) {	...	@@ -1110,20 +1182,6 @@ void basic_filebuf<_CharT, _Traits>::imbue(const locale& __loc) {
1110	}	1182	}
1111	}	1183	}
1112		1184
1113	template <class _CharT, class _Traits>
1114	bool basic_filebuf<_CharT, _Traits>::__read_mode() {
1115	if (!(__cm_ & ios_base::in)) {
1116	this->setp(nullptr, nullptr);
1117	if (__always_noconv_)
1118	this->setg((char_type)__extbuf_, (char_type)__extbuf_ + __ebs_, (char_type*)__extbuf_ + __ebs_);
1119	else
1120	this->setg(__intbuf_, __intbuf_ + __ibs_, __intbuf_ + __ibs_);
1121	__cm_ = ios_base::in;
1122	return true;
1123	}
1124	return false;
1125	}
1126
1127	template <class _CharT, class _Traits>	1185	template <class _CharT, class _Traits>
1128	void basic_filebuf<_CharT, _Traits>::__write_mode() {	1186	void basic_filebuf<_CharT, _Traits>::__write_mode() {
1129	if (!(__cm_ & ios_base::out)) {	1187	if (!(__cm_ & ios_base::out)) {
...	@@ -1616,13 +1674,14 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ofstream<char>;	...	@@ -1616,13 +1674,14 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ofstream<char>;
1616	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_filebuf<char>;	1674	extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_filebuf<char>;
1617	# endif	1675	# endif
1618		1676
		1677	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
1619	_LIBCPP_END_NAMESPACE_STD	1678	_LIBCPP_END_NAMESPACE_STD
1620		1679
1621	_LIBCPP_POP_MACROS	1680	_LIBCPP_POP_MACROS
1622		1681
1623	# endif // _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION	1682	# endif // _LIBCPP_HAS_FILESYSTEM && _LIBCPP_HAS_LOCALIZATION
1624		1683
1625	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	1684	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
1626	# include <atomic>	1685	# include <atomic>
1627	# include <concepts>	1686	# include <concepts>
1628	# include <cstdlib>	1687	# include <cstdlib>
...	@@ -1634,7 +1693,7 @@ _LIBCPP_POP_MACROS	...	@@ -1634,7 +1693,7 @@ _LIBCPP_POP_MACROS
1634	# include <type_traits>	1693	# include <type_traits>
1635	# endif	1694	# endif
1636		1695
1637	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 23	1696	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
1638	# include <filesystem>	1697	# include <filesystem>
1639	# endif	1698	# endif
1640	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	1699	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/functional+7-5

 @@ -221,6 +221,8 @@ template <auto f>
 // [func.bind.partial], function templates bind_front and bind_back
 template<class F, class... Args>
   constexpr unspecified bind_front(F&&, Args&&...); // C++20
+template<auto f, class... Args>
+  constexpr unspecified bind_front(Args&&...);      // C++26
 template<class F, class... Args>
   constexpr unspecified bind_back(F&&, Args&&...);  // C++23
 @@ -540,7 +542,7 @@ POLICY:  For non-variadic implementations, the number of arguments is limited
 #  include <__functional/binder1st.h>
 #  include <__functional/binder2nd.h>
 #  include <__functional/hash.h>
-#  include <__functional/mem_fn.h> // TODO: deprecate
+#  include <__functional/mem_fn.h>
 #  include <__functional/mem_fun_ref.h>
 #  include <__functional/operations.h>
 #  include <__functional/pointer_to_binary_function.h>
 @@ -575,18 +577,18 @@ POLICY:  For non-variadic implementations, the number of arguments is limited
 #    pragma GCC system_header
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && defined(_LIBCPP_CXX03_LANG)
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && defined(_LIBCPP_CXX03_LANG)
 #    include <limits>
 #    include <new>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 14
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 14
 #    include <array>
 #    include <initializer_list>
 #    include <unordered_map>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <atomic>
 #    include <concepts>
 #    include <cstdlib>
 @@ -601,7 +603,7 @@ POLICY:  For non-variadic implementations, the number of arguments is limited
 #    include <vector>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER == 23
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER == 23
 #    include <__vector/vector.h>
 #  endif
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/future+23-10

 @@ -379,7 +379,6 @@ template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
 #    include <__memory/allocator_arg_t.h>
 #    include <__memory/allocator_destructor.h>
 #    include <__memory/allocator_traits.h>
-#    include <__memory/compressed_pair.h>
 #    include <__memory/pointer_traits.h>
 #    include <__memory/shared_count.h>
 #    include <__memory/unique_ptr.h>
 @@ -420,6 +419,7 @@ _LIBCPP_PUSH_MACROS
 #    include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 // enum class future_errc
 _LIBCPP_DECLARE_STRONG_ENUM(future_errc){
 @@ -435,7 +435,12 @@ struct is_error_code_enum<future_errc::__lx> : public true_type {};
 #    endif
 // enum class launch
-_LIBCPP_DECLARE_STRONG_ENUM(launch){async = 1, deferred = 2, any = async | deferred};
+_LIBCPP_DECLARE_STRONG_ENUM(launch){
+    async                                                     = 1,
+    deferred                                                  = 2,
+    any _LIBCPP_DEPRECATED_("std::launch::any is a deprecated extension. "
+                            "Use std::launch::async | std::launch::deferred instead. "
+                            "It will be removed in LLVM 25.") = async | deferred};
 _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(launch)
 #    ifndef _LIBCPP_CXX03_LANG
 @@ -1407,8 +1412,10 @@ template <class _FD, class _Alloc, class _FB>
 class __packaged_task_func;
 template <class _Fp, class _Alloc, class _Rp, class... _ArgTypes>
-class __packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)> : public __packaged_task_base<_Rp(_ArgTypes...)> {
+class _LIBCPP_HIDE_STRUCT_FROM_ABI
-  _LIBCPP_COMPRESSED_PAIR(_Fp, __func_, _Alloc, __alloc_);
+    __packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)> : public __packaged_task_base<_Rp(_ArgTypes...)> {
+  _LIBCPP_NO_UNIQUE_ADDRESS _Fp __func_;
+  _LIBCPP_NO_UNIQUE_ADDRESS _Alloc __alloc_;
 public:
   _LIBCPP_HIDE_FROM_ABI explicit __packaged_task_func(const _Fp& __f) : __func_(__f) {}
 @@ -1429,8 +1436,8 @@ void __packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__move_to(
 template <class _Fp, class _Alloc, class _Rp, class... _ArgTypes>
 void __packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy() {
-  __func_.~_Fp();
   __alloc_.~_Alloc();
+  __func_.~_Fp();
 }
 template <class _Fp, class _Alloc, class _Rp, class... _ArgTypes>
 @@ -1439,8 +1446,8 @@ void __packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy_deallocate()
   typedef allocator_traits<_Ap> _ATraits;
   typedef pointer_traits<typename _ATraits::pointer> _PTraits;
   _Ap __a(__alloc_);
-  __func_.~_Fp();
   __alloc_.~_Alloc();
+  __func_.~_Fp();
   __a.deallocate(_PTraits::pointer_to(*this), 1);
 }
 @@ -1744,7 +1751,7 @@ public:
 template <class _Rp, class... _Args>
 packaged_task(_Rp (*)(_Args...)) -> packaged_task<_Rp(_Args...)>;
-template <class _Fp, class _Stripped = typename __strip_signature<decltype(&_Fp::operator())>::type>
+template <class _Fp, class _Stripped = __strip_signature_t<decltype(&_Fp::operator())>>
 packaged_task(_Fp) -> packaged_task<_Stripped>;
 #    endif
 @@ -1876,7 +1883,7 @@ async(launch __policy, _Fp&& __f, _Args&&... __args) {
 template <class _Fp, class... _Args>
 [[__nodiscard__]] inline _LIBCPP_HIDE_FROM_ABI future<__invoke_result_t<__decay_t<_Fp>, __decay_t<_Args>...> >
 async(_Fp&& __f, _Args&&... __args) {
-  return std::async(launch::any, std::forward<_Fp>(__f), std::forward<_Args>(__args)...);
+  return std::async(launch::async | launch::deferred, std::forward<_Fp>(__f), std::forward<_Args>(__args)...);
 }
 #    endif // C++03
 @@ -2052,17 +2059,18 @@ inline shared_future<_Rp&> future<_Rp&>::share() _NOEXCEPT {
 inline shared_future<void> future<void>::share() _NOEXCEPT { return shared_future<void>(std::move(*this)); }
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #  endif // _LIBCPP_HAS_THREADS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 17
 #    include <chrono>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <atomic>
 #    include <cstdlib>
 #    include <exception>
 @@ -2070,6 +2078,11 @@ _LIBCPP_POP_MACROS
 #    include <system_error>
 #    include <thread>
 #  endif
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
+#    include <sstream>
+#  endif
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 #endif // _LIBCPP_FUTURE

lib/libcxx/include/initializer_list+5-5

 @@ -53,11 +53,11 @@ template<class E> const E* end(initializer_list<E> il) noexcept; // constexpr in
 #    pragma GCC system_header
 #  endif
+#  ifndef _LIBCPP_CXX03_LANG
 namespace std // purposefully not versioned
 {
-#  ifndef _LIBCPP_CXX03_LANG
 template <class _Ep>
 class _LIBCPP_NO_SPECIALIZATIONS initializer_list {
   const _Ep* __begin_;
 @@ -101,11 +101,11 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const _Ep* end(initia
   return __il.end();
 }
-#  endif // !defined(_LIBCPP_CXX03_LANG)
 } // namespace std
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  endif // _LIBCPP_CXX03_LANG
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <cstddef>
 #  endif
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/inttypes.h deleted-268

...	@@ -1,268 +0,0 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_INTTYPES_H
11	// AIX system headers need inttypes.h to be re-enterable while _STD_TYPES_T
12	// is defined until an inclusion of it without _STD_TYPES_T occurs, in which
13	// case the header guard macro is defined.
14	#if !defined(_AIX) \|\| !defined(_STD_TYPES_T)
15	# define _LIBCPP_INTTYPES_H
16	#endif // _STD_TYPES_T
17
18	/*
19	inttypes.h synopsis
20
21	This entire header is C99 / C++0X
22
23	#include <stdint.h> // <cinttypes> includes <cstdint>
24
25	Macros:
26
27	PRId8
28	PRId16
29	PRId32
30	PRId64
31
32	PRIdLEAST8
33	PRIdLEAST16
34	PRIdLEAST32
35	PRIdLEAST64
36
37	PRIdFAST8
38	PRIdFAST16
39	PRIdFAST32
40	PRIdFAST64
41
42	PRIdMAX
43	PRIdPTR
44
45	PRIi8
46	PRIi16
47	PRIi32
48	PRIi64
49
50	PRIiLEAST8
51	PRIiLEAST16
52	PRIiLEAST32
53	PRIiLEAST64
54
55	PRIiFAST8
56	PRIiFAST16
57	PRIiFAST32
58	PRIiFAST64
59
60	PRIiMAX
61	PRIiPTR
62
63	PRIo8
64	PRIo16
65	PRIo32
66	PRIo64
67
68	PRIoLEAST8
69	PRIoLEAST16
70	PRIoLEAST32
71	PRIoLEAST64
72
73	PRIoFAST8
74	PRIoFAST16
75	PRIoFAST32
76	PRIoFAST64
77
78	PRIoMAX
79	PRIoPTR
80
81	PRIu8
82	PRIu16
83	PRIu32
84	PRIu64
85
86	PRIuLEAST8
87	PRIuLEAST16
88	PRIuLEAST32
89	PRIuLEAST64
90
91	PRIuFAST8
92	PRIuFAST16
93	PRIuFAST32
94	PRIuFAST64
95
96	PRIuMAX
97	PRIuPTR
98
99	PRIx8
100	PRIx16
101	PRIx32
102	PRIx64
103
104	PRIxLEAST8
105	PRIxLEAST16
106	PRIxLEAST32
107	PRIxLEAST64
108
109	PRIxFAST8
110	PRIxFAST16
111	PRIxFAST32
112	PRIxFAST64
113
114	PRIxMAX
115	PRIxPTR
116
117	PRIX8
118	PRIX16
119	PRIX32
120	PRIX64
121
122	PRIXLEAST8
123	PRIXLEAST16
124	PRIXLEAST32
125	PRIXLEAST64
126
127	PRIXFAST8
128	PRIXFAST16
129	PRIXFAST32
130	PRIXFAST64
131
132	PRIXMAX
133	PRIXPTR
134
135	SCNd8
136	SCNd16
137	SCNd32
138	SCNd64
139
140	SCNdLEAST8
141	SCNdLEAST16
142	SCNdLEAST32
143	SCNdLEAST64
144
145	SCNdFAST8
146	SCNdFAST16
147	SCNdFAST32
148	SCNdFAST64
149
150	SCNdMAX
151	SCNdPTR
152
153	SCNi8
154	SCNi16
155	SCNi32
156	SCNi64
157
158	SCNiLEAST8
159	SCNiLEAST16
160	SCNiLEAST32
161	SCNiLEAST64
162
163	SCNiFAST8
164	SCNiFAST16
165	SCNiFAST32
166	SCNiFAST64
167
168	SCNiMAX
169	SCNiPTR
170
171	SCNo8
172	SCNo16
173	SCNo32
174	SCNo64
175
176	SCNoLEAST8
177	SCNoLEAST16
178	SCNoLEAST32
179	SCNoLEAST64
180
181	SCNoFAST8
182	SCNoFAST16
183	SCNoFAST32
184	SCNoFAST64
185
186	SCNoMAX
187	SCNoPTR
188
189	SCNu8
190	SCNu16
191	SCNu32
192	SCNu64
193
194	SCNuLEAST8
195	SCNuLEAST16
196	SCNuLEAST32
197	SCNuLEAST64
198
199	SCNuFAST8
200	SCNuFAST16
201	SCNuFAST32
202	SCNuFAST64
203
204	SCNuMAX
205	SCNuPTR
206
207	SCNx8
208	SCNx16
209	SCNx32
210	SCNx64
211
212	SCNxLEAST8
213	SCNxLEAST16
214	SCNxLEAST32
215	SCNxLEAST64
216
217	SCNxFAST8
218	SCNxFAST16
219	SCNxFAST32
220	SCNxFAST64
221
222	SCNxMAX
223	SCNxPTR
224
225	Types:
226
227	imaxdiv_t
228
229	intmax_t imaxabs(intmax_t j);
230	imaxdiv_t imaxdiv(intmax_t numer, intmax_t denom);
231	intmax_t strtoimax(const char* restrict nptr, char** restrict endptr, int base);
232	uintmax_t strtoumax(const char* restrict nptr, char** restrict endptr, int base);
233	intmax_t wcstoimax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
234	uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
235
236	*/
237
238	#if defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
239	# include <__cxx03/__config>
240	#else
241	# include <__config>
242	#endif
243
244	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
245	# pragma GCC system_header
246	#endif
247
248	/* C99 stdlib (e.g. glibc < 2.18) does not provide format macros needed
249	for C++11 unless __STDC_FORMAT_MACROS is defined
250	*/
251	#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS)
252	# define __STDC_FORMAT_MACROS
253	#endif
254
255	#if __has_include_next(<inttypes.h>)
256	# include_next <inttypes.h>
257	#endif
258
259	#ifdef __cplusplus
260
261	# include <stdint.h>
262
263	# undef imaxabs
264	# undef imaxdiv
265
266	#endif // __cplusplus
267
268	#endif // _LIBCPP_INTTYPES_H

lib/libcxx/include/iomanip+4-18

 @@ -413,6 +413,8 @@ inline _LIBCPP_HIDE_FROM_ABI __iom_t10<_CharT> put_time(const tm* __tm, const _C
   return __iom_t10<_CharT>(__tm, __fmt);
 }
+#    if _LIBCPP_STD_VER >= 14
 template <class _CharT, class _Traits>
 _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>& __quoted_output(
     basic_ostream<_CharT, _Traits>& __os,
 @@ -502,22 +504,6 @@ struct _LIBCPP_HIDDEN __quoted_proxy {
   }
 };
-template <class _CharT, class _Traits, class _Allocator>
-_LIBCPP_HIDE_FROM_ABI __quoted_output_proxy<_CharT, _Traits>
-__quoted(const basic_string<_CharT, _Traits, _Allocator>& __s,
-         _CharT __delim  = _CharT('"'),
-         _CharT __escape = _CharT('\\')) {
-  return __quoted_output_proxy<_CharT, _Traits>(__s.data(), __s.data() + __s.size(), __delim, __escape);
-}
-template <class _CharT, class _Traits, class _Allocator>
-_LIBCPP_HIDE_FROM_ABI __quoted_proxy<_CharT, _Traits, _Allocator>
-__quoted(basic_string<_CharT, _Traits, _Allocator>& __s, _CharT __delim = _CharT('"'), _CharT __escape = _CharT('\\')) {
-  return __quoted_proxy<_CharT, _Traits, _Allocator>(__s, __delim, __escape);
-}
-#    if _LIBCPP_STD_VER >= 14
 template <class _CharT>
 _LIBCPP_HIDE_FROM_ABI auto quoted(const _CharT* __s, _CharT __delim = _CharT('"'), _CharT __escape = _CharT('\\')) {
   const _CharT* __end = __s;
 @@ -552,7 +538,7 @@ _LIBCPP_END_NAMESPACE_STD
 #  endif // _LIBCPP_HAS_LOCALIZATION
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <array>
 #    include <bitset>
 #    include <deque>
 @@ -567,7 +553,7 @@ _LIBCPP_END_NAMESPACE_STD
 #    include <vector>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 23
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
 #    include <locale>
 #  endif

lib/libcxx/include/ios+18-15

 @@ -235,10 +235,6 @@ storage-class-specifier const error_category& iostream_category() noexcept;
 #    include <__verbose_abort>
 #    include <version>
-#    if _LIBCPP_HAS_ATOMIC_HEADER
-#      include <__atomic/atomic.h> // for __xindex_
-#    endif
 #    if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #      pragma GCC system_header
 #    endif
 @@ -247,6 +243,7 @@ _LIBCPP_PUSH_MACROS
 #    include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 typedef ptrdiff_t streamsize;
 @@ -361,7 +358,7 @@ public:
   }
 protected:
-  _LIBCPP_HIDE_FROM_ABI ios_base() : __loc_(nullptr) {
+  _LIBCPP_HIDE_FROM_ABI ios_base() : __loc_(__private_constructor_tag(), nullptr) {
     // Purposefully does no initialization
     //
     // Except for the locale, this is a sentinel to avoid destroying
 @@ -386,25 +383,25 @@ protected:
   _LIBCPP_HIDE_FROM_ABI void set_rdbuf(void* __sb) { __rdbuf_ = __sb; }
 private:
-  // All data members must be scalars
   fmtflags __fmtflags_;
   streamsize __precision_;
   streamsize __width_;
   iostate __rdstate_;
   iostate __exceptions_;
   void* __rdbuf_;
-  void* __loc_;
+#    ifndef _LIBCPP_CXX03_LANG
+  union {
+    locale __loc_;
+  };
+#    else
+  // We only care about the union above to implement the destructor correctly, which we do in C++26 anyways. No need to
+  // handle C++03 shenanigans.
+  locale __loc_;
+#    endif
   event_callback* __fn_;
   int* __index_;
   size_t __event_size_;
   size_t __event_cap_;
-// TODO(EricWF): Enable this for both Clang and GCC. Currently it is only
-// enabled with clang.
-#    if _LIBCPP_HAS_C_ATOMIC_IMP && _LIBCPP_HAS_THREADS
-  static atomic<int> __xindex_;
-#    else
-  static int __xindex_;
-#    endif
   long* __iarray_;
   size_t __iarray_size_;
   size_t __iarray_cap_;
 @@ -871,13 +868,19 @@ _LIBCPP_HIDE_FROM_ABI inline ios_base& defaultfloat(ios_base& __str) {
   return __str;
 }
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #  endif // _LIBCPP_HAS_LOCALIZATION
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
+#    include <ctime>
+#    include <ratio>
+#  endif
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <atomic>
 #    include <concepts>
 #    include <cstddef>

lib/libcxx/include/istream+4-2

 @@ -190,6 +190,7 @@ _LIBCPP_PUSH_MACROS
 #    include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 template <class _CharT, class _Traits>
 class basic_istream : virtual public basic_ios<_CharT, _Traits> {
 @@ -1405,20 +1406,21 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_istream<wchar_t>;
 #    endif
 extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_iostream<char>;
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #  endif // _LIBCPP_HAS_LOCALIZATION
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <concepts>
 #    include <iosfwd>
 #    include <ostream>
 #    include <type_traits>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 23
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
 #    include <locale>
 #  endif

lib/libcxx/include/iterator+2-2

...	@@ -751,11 +751,11 @@ template <class E> constexpr const E* data(initializer_list<E> il) noexcept;	...	@@ -751,11 +751,11 @@ template <class E> constexpr const E* data(initializer_list<E> il) noexcept;
751	# pragma GCC system_header	751	# pragma GCC system_header
752	# endif	752	# endif
753		753
754	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17	754	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 17
755	# include <variant>	755	# include <variant>
756	# endif	756	# endif
757		757
758	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	758	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
759	# include <cstddef>	759	# include <cstddef>
760	# include <cstdlib>	760	# include <cstdlib>
761	# include <exception>	761	# include <exception>

lib/libcxx/include/latch+1-1

...	@@ -128,7 +128,7 @@ _LIBCPP_POP_MACROS	...	@@ -128,7 +128,7 @@ _LIBCPP_POP_MACROS
128		128
129	# endif // _LIBCPP_HAS_THREADS	129	# endif // _LIBCPP_HAS_THREADS
130		130
131	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	131	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
132	# include <atomic>	132	# include <atomic>
133	# include <cstddef>	133	# include <cstddef>
134	# endif	134	# endif

lib/libcxx/include/limits+12-4

 @@ -108,6 +108,7 @@ template<> class numeric_limits<cv long double>;
 #  include <__config>
 #  include <__type_traits/is_arithmetic.h>
 #  include <__type_traits/is_same.h>
+#  include <__type_traits/make_unsigned.h>
 #  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #    pragma GCC system_header
 @@ -184,9 +185,16 @@ protected:
   static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-  static _LIBCPP_CONSTEXPR const bool is_signed   = type(-1) < type(0);
+  static _LIBCPP_CONSTEXPR const bool is_signed = type(-1) < type(0);
-  static _LIBCPP_CONSTEXPR const int digits       = static_cast<int>(sizeof(type) * __CHAR_BIT__ - is_signed);
+  // Number of value bits in type. Works for any integer type, including
-  static _LIBCPP_CONSTEXPR const int digits10     = digits * 3 / 10;
+  // _BitInt(N), whose sizeof(type) * CHAR_BIT may include padding.
+  static _LIBCPP_CONSTEXPR const int digits =
+      __builtin_popcountg(static_cast<__make_unsigned_t<type> >(~__make_unsigned_t<type>(0))) - is_signed;
+  // digits10 = floor(digits * log10(2)). 1936274/6432163 is a continued-fraction
+  // convergent of log10(2) and matches floor(digits * log10(2)) exactly for every
+  // digits in [1, 8388608], i.e. up to __BITINT_MAXWIDTH__ on x86.
+  // TODO: switch to __builtin_log10 once it becomes constexpr.
+  static _LIBCPP_CONSTEXPR const int digits10     = static_cast<int>((digits * 1936274LL) / 6432163);
   static _LIBCPP_CONSTEXPR const int max_digits10 = 0;
   static _LIBCPP_CONSTEXPR const type __min       = is_signed ? _Tp(_Tp(1) << digits) : 0;
   static _LIBCPP_CONSTEXPR const type __max       = is_signed ? type(type(~0) ^ __min) : type(~0);
 @@ -520,7 +528,7 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <type_traits>
 #  endif
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/list+6-6

 @@ -39,7 +39,7 @@ public:
         noexcept(is_nothrow_default_constructible<allocator_type>::value);
     explicit list(const allocator_type& a);
     explicit list(size_type n);
-    explicit list(size_type n, const allocator_type& a); // C++14
+    explicit list(size_type n, const allocator_type& a);
     list(size_type n, const value_type& value);
     list(size_type n, const value_type& value, const allocator_type& a);
     template <class Iter>
 @@ -708,9 +708,7 @@ public:
       _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value) {}
   _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit list(const allocator_type& __a) : __base(__a) {}
   _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit list(size_type __n);
-#  if _LIBCPP_STD_VER >= 14
   _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI explicit list(size_type __n, const allocator_type& __a);
-#  endif
   _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI list(size_type __n, const value_type& __x);
   template <__enable_if_t<__is_allocator_v<_Alloc>, int> = 0>
   _LIBCPP_CONSTEXPR_SINCE_CXX26 _LIBCPP_HIDE_FROM_ABI
 @@ -1066,13 +1064,15 @@ _LIBCPP_CONSTEXPR_SINCE_CXX26 list<_Tp, _Alloc>::list(size_type __n) {
 #  endif
 }
-#  if _LIBCPP_STD_VER >= 14
 template <class _Tp, class _Alloc>
 _LIBCPP_CONSTEXPR_SINCE_CXX26 list<_Tp, _Alloc>::list(size_type __n, const allocator_type& __a) : __base(__a) {
   for (; __n > 0; --__n)
+#  ifndef _LIBCPP_CXX03_LANG
     emplace_back();
-}
+#  else
+    push_back(value_type());
 #  endif
+}
 template <class _Tp, class _Alloc>
 _LIBCPP_CONSTEXPR_SINCE_CXX26 list<_Tp, _Alloc>::list(size_type __n, const value_type& __x) {
 @@ -1815,7 +1815,7 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <algorithm>
 #    include <atomic>
 #    include <concepts>

lib/libcxx/include/locale+1-1

...	@@ -210,7 +210,7 @@ template <class charT> class messages_byname;	...	@@ -210,7 +210,7 @@ template <class charT> class messages_byname;
210		210
211	# endif // _LIBCPP_HAS_LOCALIZATION	211	# endif // _LIBCPP_HAS_LOCALIZATION
212		212
213	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	213	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
214	# include <atomic>	214	# include <atomic>
215	# include <concepts>	215	# include <concepts>
216	# include <cstdarg>	216	# include <cstdarg>

lib/libcxx/include/map+565-397

...	@@ -57,177 +57,175 @@ public:	...	@@ -57,177 +57,175 @@ public:
57	};	57	};
58		58
59	// construct/copy/destroy:	59	// construct/copy/destroy:
60	map()	60	constexpr map()
61	noexcept(	61	noexcept(
62	is_nothrow_default_constructible<allocator_type>::value &&	62	is_nothrow_default_constructible<allocator_type>::value &&
63	is_nothrow_default_constructible<key_compare>::value &&	63	is_nothrow_default_constructible<key_compare>::value &&
64	is_nothrow_copy_constructible<key_compare>::value);	64	is_nothrow_copy_constructible<key_compare>::value);
65	explicit map(const key_compare& comp);	65	constexpr explicit map(const key_compare& comp);
66	map(const key_compare& comp, const allocator_type& a);	66	constexpr map(const key_compare& comp, const allocator_type& a);
67	template <class InputIterator>	67	template <class InputIterator>
68	map(InputIterator first, InputIterator last,	68	constexpr map(InputIterator first, InputIterator last,
69	const key_compare& comp = key_compare());	69	const key_compare& comp = key_compare());
70	template <class InputIterator>	70	template <class InputIterator>
71	map(InputIterator first, InputIterator last,	71	constexpr map(InputIterator first, InputIterator last,
72	const key_compare& comp, const allocator_type& a);	72	const key_compare& comp, const allocator_type& a);
73	template<container-compatible-range<value_type> R>	73	template<container-compatible-range<value_type> R>
74	map(from_range_t, R&& rg, const Compare& comp = Compare(), const Allocator& = Allocator()); // C++23	74	constexpr map(from_range_t, R&& rg, const Compare& comp = Compare(), const Allocator& = Allocator()); // C++23
75	map(const map& m);	75	constexpr map(const map& m);
76	map(map&& m)	76	constexpr map(map&& m)
77	noexcept(	77	noexcept(
78	is_nothrow_move_constructible<allocator_type>::value &&	78	is_nothrow_move_constructible<allocator_type>::value &&
79	is_nothrow_move_constructible<key_compare>::value);	79	is_nothrow_move_constructible<key_compare>::value);
80	explicit map(const allocator_type& a);	80	constexpr explicit map(const allocator_type& a);
81	map(const map& m, const allocator_type& a);	81	constexpr map(const map& m, const allocator_type& a);
82	map(map&& m, const allocator_type& a);	82	constexpr map(map&& m, const allocator_type& a);
83	map(initializer_list<value_type> il, const key_compare& comp = key_compare());	83	constexpr map(initializer_list<value_type> il, const key_compare& comp = key_compare());
84	map(initializer_list<value_type> il, const key_compare& comp, const allocator_type& a);	84	constexpr map(initializer_list<value_type> il, const key_compare& comp, const allocator_type& a);
85	template <class InputIterator>	85	template <class InputIterator>
86	map(InputIterator first, InputIterator last, const allocator_type& a)	86	constexpr map(InputIterator first, InputIterator last, const allocator_type& a)
87	: map(first, last, Compare(), a) {} // C++14	87	: map(first, last, Compare(), a) {}
88	template<container-compatible-range<value_type> R>	88	template<container-compatible-range<value_type> R>
89	map(from_range_t, R&& rg, const Allocator& a))	89	constexpr map(from_range_t, R&& rg, const Allocator& a))
90	: map(from_range, std::forward<R>(rg), Compare(), a) { } // C++23	90	: map(from_range, std::forward<R>(rg), Compare(), a) { } // C++23
91	map(initializer_list<value_type> il, const allocator_type& a)	91	constexpr map(initializer_list<value_type> il, const allocator_type& a)
92	: map(il, Compare(), a) {} // C++14	92	: map(il, Compare(), a) {}
93	~map();	93	constexpr ~map();
94		94
95	map& operator=(const map& m);	95	constexpr map& operator=(const map& m);
96	map& operator=(map&& m)	96	constexpr map& operator=(map&& m)
97	noexcept(	97	noexcept(
98	allocator_type::propagate_on_container_move_assignment::value &&	98	allocator_type::propagate_on_container_move_assignment::value &&
99	is_nothrow_move_assignable<allocator_type>::value &&	99	is_nothrow_move_assignable<allocator_type>::value &&
100	is_nothrow_move_assignable<key_compare>::value);	100	is_nothrow_move_assignable<key_compare>::value);
101	map& operator=(initializer_list<value_type> il);	101	constexpr map& operator=(initializer_list<value_type> il);
102		102
103	// iterators:	103	// iterators:
104	iterator begin() noexcept;	104	constexpr iterator begin() noexcept;
105	const_iterator begin() const noexcept;	105	constexpr const_iterator begin() const noexcept;
106	iterator end() noexcept;	106	constexpr iterator end() noexcept;
107	const_iterator end() const noexcept;	107	constexpr const_iterator end() const noexcept;
108		108
109	reverse_iterator rbegin() noexcept;	109	constexpr reverse_iterator rbegin() noexcept;
110	const_reverse_iterator rbegin() const noexcept;	110	constexpr const_reverse_iterator rbegin() const noexcept;
111	reverse_iterator rend() noexcept;	111	constexpr reverse_iterator rend() noexcept;
112	const_reverse_iterator rend() const noexcept;	112	constexpr const_reverse_iterator rend() const noexcept;
113		113
114	const_iterator cbegin() const noexcept;	114	constexpr const_iterator cbegin() const noexcept;
115	const_iterator cend() const noexcept;	115	constexpr const_iterator cend() const noexcept;
116	const_reverse_iterator crbegin() const noexcept;	116	constexpr const_reverse_iterator crbegin() const noexcept;
117	const_reverse_iterator crend() const noexcept;	117	constexpr const_reverse_iterator crend() const noexcept;
118		118
119	// capacity:	119	// capacity:
120	bool empty() const noexcept;	120	constexpr bool empty() const noexcept;
121	size_type size() const noexcept;	121	constexpr size_type size() const noexcept;
122	size_type max_size() const noexcept;	122	constexpr size_type max_size() const noexcept;
123		123
124	// element access:	124	// element access:
125	mapped_type& operator[](const key_type& k);	125	constexpr mapped_type& operator[](const key_type& k);
126	mapped_type& operator[](key_type&& k);	126	constexpr mapped_type& operator[](key_type&& k);
127		127
128	mapped_type& at(const key_type& k);	128	constexpr mapped_type& at(const key_type& k);
129	const mapped_type& at(const key_type& k) const;	129	constexpr const mapped_type& at(const key_type& k) const;
130		130
131	// modifiers:	131	// modifiers:
132	template <class... Args>	132	template <class... Args>
133	pair<iterator, bool> emplace(Args&&... args);	133	constexpr pair<iterator, bool> emplace(Args&&... args);
134	template <class... Args>	134	template <class... Args>
135	iterator emplace_hint(const_iterator position, Args&&... args);	135	constexpr iterator emplace_hint(const_iterator position, Args&&... args);
136	pair<iterator, bool> insert(const value_type& v);	136	constexpr pair<iterator, bool> insert(const value_type& v);
137	pair<iterator, bool> insert( value_type&& v); // C++17	137	constexpr pair<iterator, bool> insert( value_type&& v); // C++17
138	template <class P>	138	template <class P> constexpr pair<iterator, bool> insert(P&& p);
139	pair<iterator, bool> insert(P&& p);	139	constexpr iterator insert(const_iterator position, const value_type& v);
140	iterator insert(const_iterator position, const value_type& v);	140	constexpr iterator insert(const_iterator position, value_type&& v); // C++17
141	iterator insert(const_iterator position, value_type&& v); // C++17	141	template <class P> constexpr iterator insert(const_iterator position, P&& p);
142	template <class P>	142	template <class InputIterator> constexpr void insert(InputIterator first, InputIterator last);
143	iterator insert(const_iterator position, P&& p);	143
144	template <class InputIterator>
145	void insert(InputIterator first, InputIterator last);
146	template<container-compatible-range<value_type> R>	144	template<container-compatible-range<value_type> R>
147	void insert_range(R&& rg); // C++23	145	constexpr void insert_range(R&& rg); // C++23
148	void insert(initializer_list<value_type> il);	146	constexpr void insert(initializer_list<value_type> il);
149		147
150	node_type extract(const_iterator position); // C++17	148	constexpr node_type extract(const_iterator position); // C++17
151	node_type extract(const key_type& x); // C++17	149	constexpr node_type extract(const key_type& x); // C++17
152	insert_return_type insert(node_type&& nh); // C++17	150	constexpr insert_return_type insert(node_type&& nh); // C++17
153	iterator insert(const_iterator hint, node_type&& nh); // C++17	151	constexpr iterator insert(const_iterator hint, node_type&& nh); // C++17
154		152
155	template <class... Args>	153	template <class... Args>
156	pair<iterator, bool> try_emplace(const key_type& k, Args&&... args); // C++17	154	constexpr pair<iterator, bool> try_emplace(const key_type& k, Args&&... args); // C++17
157	template <class... Args>	155	template <class... Args>
158	pair<iterator, bool> try_emplace(key_type&& k, Args&&... args); // C++17	156	constexpr pair<iterator, bool> try_emplace(key_type&& k, Args&&... args); // C++17
159	template <class... Args>	157	template <class... Args>
160	iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args); // C++17	158	constexpr iterator try_emplace(const_iterator hint, const key_type& k, Args&&... args); // C++17
161	template <class... Args>	159	template <class... Args>
162	iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args); // C++17	160	constexpr iterator try_emplace(const_iterator hint, key_type&& k, Args&&... args); // C++17
163	template <class M>	161	template <class M>
164	pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj); // C++17	162	constexpr pair<iterator, bool> insert_or_assign(const key_type& k, M&& obj); // C++17
165	template <class M>	163	template <class M>
166	pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj); // C++17	164	constexpr pair<iterator, bool> insert_or_assign(key_type&& k, M&& obj); // C++17
167	template <class M>	165	template <class M>
168	iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj); // C++17	166	constexpr iterator insert_or_assign(const_iterator hint, const key_type& k, M&& obj); // C++17
169	template <class M>	167	template <class M>
170	iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj); // C++17	168	constexpr iterator insert_or_assign(const_iterator hint, key_type&& k, M&& obj); // C++17
171		169
172	iterator erase(const_iterator position);	170	constexpr iterator erase(const_iterator position);
173	iterator erase(iterator position); // C++14	171	constexpr iterator erase(iterator position); // C++14
174	size_type erase(const key_type& k);	172	constexpr size_type erase(const key_type& k);
175	iterator erase(const_iterator first, const_iterator last);	173	constexpr iterator erase(const_iterator first, const_iterator last);
176	void clear() noexcept;	174	constexpr void clear() noexcept;
177		175
178	template<class C2>	176	template<class C2>
179	void merge(map<Key, T, C2, Allocator>& source); // C++17	177	constexpr void merge(map<Key, T, C2, Allocator>& source); // C++17
180	template<class C2>	178	template<class C2>
181	void merge(map<Key, T, C2, Allocator>&& source); // C++17	179	constexpr void merge(map<Key, T, C2, Allocator>&& source); // C++17
182	template<class C2>	180	template<class C2>
183	void merge(multimap<Key, T, C2, Allocator>& source); // C++17	181	constexpr void merge(multimap<Key, T, C2, Allocator>& source); // C++17
184	template<class C2>	182	template<class C2>
185	void merge(multimap<Key, T, C2, Allocator>&& source); // C++17	183	constexpr void merge(multimap<Key, T, C2, Allocator>&& source); // C++17
186		184
187	void swap(map& m)	185	constexpr void swap(map& m)
188	noexcept(allocator_traits<allocator_type>::is_always_equal::value &&	186	noexcept(allocator_traits<allocator_type>::is_always_equal::value &&
189	is_nothrow_swappable<key_compare>::value); // C++17	187	is_nothrow_swappable<key_compare>::value); // C++17
190		188
191	// observers:	189	// observers:
192	allocator_type get_allocator() const noexcept;	190	constexpr allocator_type get_allocator() const noexcept;
193	key_compare key_comp() const;	191	constexpr key_compare key_comp() const;
194	value_compare value_comp() const;	192	constexpr value_compare value_comp() const;
195		193
196	// map operations:	194	// map operations:
197	iterator find(const key_type& k);	195	constexpr iterator find(const key_type& k);
198	const_iterator find(const key_type& k) const;	196	constexpr const_iterator find(const key_type& k) const;
199	template<typename K>	197	template<typename K>
200	iterator find(const K& x); // C++14	198	constexpr iterator find(const K& x); // C++14
201	template<typename K>	199	template<typename K>
202	const_iterator find(const K& x) const; // C++14	200	constexpr const_iterator find(const K& x) const; // C++14
203		201
204	template<typename K>	202	template<typename K>
205	size_type count(const K& x) const; // C++14	203	constexpr size_type count(const K& x) const; // C++14
206	size_type count(const key_type& k) const;	204	constexpr size_type count(const key_type& k) const;
207		205
208	bool contains(const key_type& x) const; // C++20	206	constexpr bool contains(const key_type& x) const; // C++20
209	template<class K> bool contains(const K& x) const; // C++20	207	template<class K> constexpr bool contains(const K& x) const; // C++20
210		208
211	iterator lower_bound(const key_type& k);	209	constexpr iterator lower_bound(const key_type& k);
212	const_iterator lower_bound(const key_type& k) const;	210	constexpr const_iterator lower_bound(const key_type& k) const;
213	template<typename K>	211	template<typename K>
214	iterator lower_bound(const K& x); // C++14	212	constexpr iterator lower_bound(const K& x); // C++14
215	template<typename K>	213	template<typename K>
216	const_iterator lower_bound(const K& x) const; // C++14	214	constexpr const_iterator lower_bound(const K& x) const; // C++14
217		215
218	iterator upper_bound(const key_type& k);	216	constexpr iterator upper_bound(const key_type& k);
219	const_iterator upper_bound(const key_type& k) const;	217	constexpr const_iterator upper_bound(const key_type& k) const;
220	template<typename K>	218	template<typename K>
221	iterator upper_bound(const K& x); // C++14	219	constexpr iterator upper_bound(const K& x); // C++14
222	template<typename K>	220	template<typename K>
223	const_iterator upper_bound(const K& x) const; // C++14	221	constexpr const_iterator upper_bound(const K& x) const; // C++14
224		222
225	pair<iterator,iterator> equal_range(const key_type& k);	223	constexpr pair<iterator,iterator> equal_range(const key_type& k);
226	pair<const_iterator,const_iterator> equal_range(const key_type& k) const;	224	constexpr pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
227	template<typename K>	225	template<typename K>
228	pair<iterator,iterator> equal_range(const K& x); // C++14	226	constexpr pair<iterator,iterator> equal_range(const K& x); // C++14
229	template<typename K>	227	template<typename K>
230	pair<const_iterator,const_iterator> equal_range(const K& x) const; // C++14	228	constexpr pair<const_iterator,const_iterator> equal_range(const K& x) const; // C++14
231	};	229	};
232		230
233	template <class InputIterator,	231	template <class InputIterator,
...	@@ -370,12 +368,12 @@ public:	...	@@ -370,12 +368,12 @@ public:
370	const allocator_type& a);	368	const allocator_type& a);
371	template <class InputIterator>	369	template <class InputIterator>
372	multimap(InputIterator first, InputIterator last, const allocator_type& a)	370	multimap(InputIterator first, InputIterator last, const allocator_type& a)
373	: multimap(first, last, Compare(), a) {} // C++14	371	: multimap(first, last, Compare(), a) {}
374	template<container-compatible-range<value_type> R>	372	template<container-compatible-range<value_type> R>
375	multimap(from_range_t, R&& rg, const Allocator& a))	373	multimap(from_range_t, R&& rg, const Allocator& a))
376	: multimap(from_range, std::forward<R>(rg), Compare(), a) { } // C++23	374	: multimap(from_range, std::forward<R>(rg), Compare(), a) { } // C++23
377	multimap(initializer_list<value_type> il, const allocator_type& a)	375	multimap(initializer_list<value_type> il, const allocator_type& a)
378	: multimap(il, Compare(), a) {} // C++14	376	: multimap(il, Compare(), a) {}
379	~multimap();	377	~multimap();
380		378
381	multimap& operator=(const multimap& m);	379	multimap& operator=(const multimap& m);
...	@@ -411,7 +409,7 @@ public:	...	@@ -411,7 +409,7 @@ public:
411	template <class... Args>	409	template <class... Args>
412	iterator emplace(Args&&... args);	410	iterator emplace(Args&&... args);
413	template <class... Args>	411	template <class... Args>
414	iterator emplace_hint(const_iterator position, Args&&... args);	412	iterator emplace_hint(const_iterator position, Args&&... args);
415	iterator insert(const value_type& v);	413	iterator insert(const value_type& v);
416	iterator insert( value_type&& v); // C++17	414	iterator insert( value_type&& v); // C++17
417	template <class P>	415	template <class P>
...	@@ -641,28 +639,37 @@ class __map_value_compare {	...	@@ -641,28 +639,37 @@ class __map_value_compare {
641	_LIBCPP_COMPRESSED_ELEMENT(_Compare, __comp_);	639	_LIBCPP_COMPRESSED_ELEMENT(_Compare, __comp_);
642		640
643	public:	641	public:
644	_LIBCPP_HIDE_FROM_ABI __map_value_compare() _NOEXCEPT_(is_nothrow_default_constructible<_Compare>::value)	642	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_value_compare()
		643	_NOEXCEPT_(is_nothrow_default_constructible<_Compare>::value)
645	: __comp_() {}	644	: __comp_() {}
646	_LIBCPP_HIDE_FROM_ABI __map_value_compare(_Compare __c) _NOEXCEPT_(is_nothrow_copy_constructible<_Compare>::value)	645	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_value_compare(_Compare __c)
		646	_NOEXCEPT_(is_nothrow_copy_constructible<_Compare>::value)
647	: __comp_(__c) {}	647	: __comp_(__c) {}
648	_LIBCPP_HIDE_FROM_ABI const _Compare& key_comp() const _NOEXCEPT { return __comp_; }	648	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const _Compare& key_comp() const _NOEXCEPT { return __comp_; }
649		649
650	_LIBCPP_HIDE_FROM_ABI bool operator()(const _CP& __x, const _CP& __y) const { return __comp_(__x.first, __y.first); }	650	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool operator()(const _CP& __x, const _CP& __y) const {
651	_LIBCPP_HIDE_FROM_ABI bool operator()(const _CP& __x, const _Key& __y) const { return __comp_(__x.first, __y); }	651	return __comp_(__x.first, __y.first);
652	_LIBCPP_HIDE_FROM_ABI bool operator()(const _Key& __x, const _CP& __y) const { return __comp_(__x, __y.first); }	652	}
653	_LIBCPP_HIDE_FROM_ABI void swap(__map_value_compare& __y) _NOEXCEPT_(__is_nothrow_swappable_v<_Compare>) {	653	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool operator()(const _CP& __x, const _Key& __y) const {
		654	return __comp_(__x.first, __y);
		655	}
		656	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool operator()(const _Key& __x, const _CP& __y) const {
		657	return __comp_(__x, __y.first);
		658	}
		659	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void swap(__map_value_compare& __y)
		660	_NOEXCEPT_(__is_nothrow_swappable_v<_Compare>) {
654	using std::swap;	661	using std::swap;
655	swap(__comp_, __y.__comp_);	662	swap(__comp_, __y.__comp_);
656	}	663	}
657		664
658	# if _LIBCPP_STD_VER >= 14	665	# if _LIBCPP_STD_VER >= 14
659	template <typename _K2>	666	template <typename _K2>
660	_LIBCPP_HIDE_FROM_ABI bool operator()(const _K2& __x, const _CP& __y) const {	667	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool operator()(const _K2& __x, const _CP& __y) const {
661	return __comp_(__x, __y.first);	668	return __comp_(__x, __y.first);
662	}	669	}
663		670
664	template <typename _K2>	671	template <typename _K2>
665	_LIBCPP_HIDE_FROM_ABI bool operator()(const _CP& __x, const _K2& __y) const {	672	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool operator()(const _CP& __x, const _K2& __y) const {
666	return __comp_(__x.first, __y);	673	return __comp_(__x.first, __y);
667	}	674	}
668	# endif	675	# endif
...	@@ -678,11 +685,11 @@ template <class _MapValueT, class _Key, class _Compare>	...	@@ -678,11 +685,11 @@ template <class _MapValueT, class _Key, class _Compare>
678	struct __lazy_synth_three_way_comparator<__map_value_compare<_Key, _MapValueT, _Compare>, _MapValueT, _MapValueT> {	685	struct __lazy_synth_three_way_comparator<__map_value_compare<_Key, _MapValueT, _Compare>, _MapValueT, _MapValueT> {
679	__lazy_synth_three_way_comparator<_Compare, _Key, _Key> __comp_;	686	__lazy_synth_three_way_comparator<_Compare, _Key, _Key> __comp_;
680		687
681	__lazy_synth_three_way_comparator(	688	_LIBCPP_CONSTEXPR_SINCE_CXX26 __lazy_synth_three_way_comparator(
682	_LIBCPP_CTOR_LIFETIMEBOUND const __map_value_compare<_Key, _MapValueT, _Compare>& __comp)	689	_LIBCPP_CTOR_LIFETIMEBOUND const __map_value_compare<_Key, _MapValueT, _Compare>& __comp)
683	: __comp_(__comp.key_comp()) {}	690	: __comp_(__comp.key_comp()) {}
684		691
685	_LIBCPP_HIDE_FROM_ABI auto	692	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 auto
686	operator()(_LIBCPP_LIFETIMEBOUND const _MapValueT& __lhs, _LIBCPP_LIFETIMEBOUND const _MapValueT& __rhs) const {	693	operator()(_LIBCPP_LIFETIMEBOUND const _MapValueT& __lhs, _LIBCPP_LIFETIMEBOUND const _MapValueT& __rhs) const {
687	return __comp_(__lhs.first, __rhs.first);	694	return __comp_(__lhs.first, __rhs.first);
688	}	695	}
...	@@ -692,11 +699,11 @@ template <class _MapValueT, class _Key, class _TransparentKey, class _Compare>	...	@@ -692,11 +699,11 @@ template <class _MapValueT, class _Key, class _TransparentKey, class _Compare>
692	struct __lazy_synth_three_way_comparator<__map_value_compare<_Key, _MapValueT, _Compare>, _TransparentKey, _MapValueT> {	699	struct __lazy_synth_three_way_comparator<__map_value_compare<_Key, _MapValueT, _Compare>, _TransparentKey, _MapValueT> {
693	__lazy_synth_three_way_comparator<_Compare, _TransparentKey, _Key> __comp_;	700	__lazy_synth_three_way_comparator<_Compare, _TransparentKey, _Key> __comp_;
694		701
695	__lazy_synth_three_way_comparator(	702	_LIBCPP_CONSTEXPR_SINCE_CXX26 __lazy_synth_three_way_comparator(
696	_LIBCPP_CTOR_LIFETIMEBOUND const __map_value_compare<_Key, _MapValueT, _Compare>& __comp)	703	_LIBCPP_CTOR_LIFETIMEBOUND const __map_value_compare<_Key, _MapValueT, _Compare>& __comp)
697	: __comp_(__comp.key_comp()) {}	704	: __comp_(__comp.key_comp()) {}
698		705
699	_LIBCPP_HIDE_FROM_ABI auto	706	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 auto
700	operator()(_LIBCPP_LIFETIMEBOUND const _TransparentKey& __lhs, _LIBCPP_LIFETIMEBOUND const _MapValueT& __rhs) const {	707	operator()(_LIBCPP_LIFETIMEBOUND const _TransparentKey& __lhs, _LIBCPP_LIFETIMEBOUND const _MapValueT& __rhs) const {
701	return __comp_(__lhs, __rhs.first);	708	return __comp_(__lhs, __rhs.first);
702	}	709	}
...	@@ -718,7 +725,7 @@ struct __lazy_synth_three_way_comparator<__map_value_compare<_Key, _MapValueT, _	...	@@ -718,7 +725,7 @@ struct __lazy_synth_three_way_comparator<__map_value_compare<_Key, _MapValueT, _
718	# endif // _LIBCPP_STD_VER >= 14	725	# endif // _LIBCPP_STD_VER >= 14
719		726
720	template <class _Key, class _CP, class _Compare>	727	template <class _Key, class _CP, class _Compare>
721	inline _LIBCPP_HIDE_FROM_ABI void	728	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
722	swap(__map_value_compare<_Key, _CP, _Compare>& __x, __map_value_compare<_Key, _CP, _Compare>& __y)	729	swap(__map_value_compare<_Key, _CP, _Compare>& __x, __map_value_compare<_Key, _CP, _Compare>& __y)
723	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {	730	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {
724	__x.swap(__y);	731	__x.swap(__y);
...	@@ -779,37 +786,41 @@ public:	...	@@ -779,37 +786,41 @@ public:
779	using reference = value_type&;	786	using reference = value_type&;
780	using pointer = typename _TreeIterator::pointer;	787	using pointer = typename _TreeIterator::pointer;
781		788
782	_LIBCPP_HIDE_FROM_ABI __map_iterator() _NOEXCEPT {}	789	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_iterator() _NOEXCEPT {}
783		790
784	_LIBCPP_HIDE_FROM_ABI __map_iterator(_TreeIterator __i) _NOEXCEPT : __i_(__i) {}	791	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_iterator(_TreeIterator __i) _NOEXCEPT : __i_(__i) {}
785		792
786	_LIBCPP_HIDE_FROM_ABI reference operator() const { return __i_; }	793	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reference operator() const { return __i_; }
787	_LIBCPP_HIDE_FROM_ABI pointer operator->() const { return pointer_traits<pointer>::pointer_to(*__i_); }	794	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pointer operator->() const {
		795	return pointer_traits<pointer>::pointer_to(*__i_);
		796	}
788		797
789	_LIBCPP_HIDE_FROM_ABI __map_iterator& operator++() {	798	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_iterator& operator++() {
790	++__i_;	799	++__i_;
791	return *this;	800	return *this;
792	}	801	}
793	_LIBCPP_HIDE_FROM_ABI __map_iterator operator++(int) {	802	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_iterator operator++(int) {
794	__map_iterator __t(*this);	803	__map_iterator __t(*this);
795	++(*this);	804	++(*this);
796	return __t;	805	return __t;
797	}	806	}
798		807
799	_LIBCPP_HIDE_FROM_ABI __map_iterator& operator--() {	808	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_iterator& operator--() {
800	--__i_;	809	--__i_;
801	return *this;	810	return *this;
802	}	811	}
803	_LIBCPP_HIDE_FROM_ABI __map_iterator operator--(int) {	812	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_iterator operator--(int) {
804	__map_iterator __t(*this);	813	__map_iterator __t(*this);
805	--(*this);	814	--(*this);
806	return __t;	815	return __t;
807	}	816	}
808		817
809	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const __map_iterator& __x, const __map_iterator& __y) {	818	friend _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
		819	operator==(const __map_iterator& __x, const __map_iterator& __y) {
810	return __x.__i_ == __y.__i_;	820	return __x.__i_ == __y.__i_;
811	}	821	}
812	friend _LIBCPP_HIDE_FROM_ABI bool operator!=(const __map_iterator& __x, const __map_iterator& __y) {	822	friend _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
		823	operator!=(const __map_iterator& __x, const __map_iterator& __y) {
813	return __x.__i_ != __y.__i_;	824	return __x.__i_ != __y.__i_;
814	}	825	}
815		826
...	@@ -834,7 +845,8 @@ struct __specialized_algorithm<_Alg, __iterator_pair<__map_iterator<_TreeIterato	...	@@ -834,7 +845,8 @@ struct __specialized_algorithm<_Alg, __iterator_pair<__map_iterator<_TreeIterato
834	using __iterator _LIBCPP_NODEBUG = __map_iterator<_TreeIterator>;	845	using __iterator _LIBCPP_NODEBUG = __map_iterator<_TreeIterator>;
835		846
836	template <class... _Args>	847	template <class... _Args>
837	_LIBCPP_HIDE_FROM_ABI static void operator()(__iterator __first, __iterator __last, _Args&&... __args) {	848	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static void
		849	operator()(__iterator __first, __iterator __last, _Args&&... __args) {
838	__base()(__first.__i_, __last.__i_, std::forward<_Args>(__args)...);	850	__base()(__first.__i_, __last.__i_, std::forward<_Args>(__args)...);
839	}	851	}
840	};	852	};
...	@@ -851,39 +863,43 @@ public:	...	@@ -851,39 +863,43 @@ public:
851	using reference = const value_type&;	863	using reference = const value_type&;
852	using pointer = typename _TreeIterator::pointer;	864	using pointer = typename _TreeIterator::pointer;
853		865
854	_LIBCPP_HIDE_FROM_ABI __map_const_iterator() _NOEXCEPT {}	866	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_const_iterator() _NOEXCEPT {}
855		867
856	_LIBCPP_HIDE_FROM_ABI __map_const_iterator(_TreeIterator __i) _NOEXCEPT : __i_(__i) {}	868	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_const_iterator(_TreeIterator __i) _NOEXCEPT : __i_(__i) {}
857	_LIBCPP_HIDE_FROM_ABI	869	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
858	__map_const_iterator(__map_iterator< typename _TreeIterator::__non_const_iterator> __i) _NOEXCEPT : __i_(__i.__i_) {}	870	__map_const_iterator(__map_iterator< typename _TreeIterator::__non_const_iterator> __i) _NOEXCEPT : __i_(__i.__i_) {}
859		871
860	_LIBCPP_HIDE_FROM_ABI reference operator() const { return __i_; }	872	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reference operator() const { return __i_; }
861	_LIBCPP_HIDE_FROM_ABI pointer operator->() const { return pointer_traits<pointer>::pointer_to(*__i_); }	873	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pointer operator->() const {
		874	return pointer_traits<pointer>::pointer_to(*__i_);
		875	}
862		876
863	_LIBCPP_HIDE_FROM_ABI __map_const_iterator& operator++() {	877	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_const_iterator& operator++() {
864	++__i_;	878	++__i_;
865	return *this;	879	return *this;
866	}	880	}
867	_LIBCPP_HIDE_FROM_ABI __map_const_iterator operator++(int) {	881	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_const_iterator operator++(int) {
868	__map_const_iterator __t(*this);	882	__map_const_iterator __t(*this);
869	++(*this);	883	++(*this);
870	return __t;	884	return __t;
871	}	885	}
872		886
873	_LIBCPP_HIDE_FROM_ABI __map_const_iterator& operator--() {	887	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_const_iterator& operator--() {
874	--__i_;	888	--__i_;
875	return *this;	889	return *this;
876	}	890	}
877	_LIBCPP_HIDE_FROM_ABI __map_const_iterator operator--(int) {	891	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __map_const_iterator operator--(int) {
878	__map_const_iterator __t(*this);	892	__map_const_iterator __t(*this);
879	--(*this);	893	--(*this);
880	return __t;	894	return __t;
881	}	895	}
882		896
883	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const __map_const_iterator& __x, const __map_const_iterator& __y) {	897	friend _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
		898	operator==(const __map_const_iterator& __x, const __map_const_iterator& __y) {
884	return __x.__i_ == __y.__i_;	899	return __x.__i_ == __y.__i_;
885	}	900	}
886	friend _LIBCPP_HIDE_FROM_ABI bool operator!=(const __map_const_iterator& __x, const __map_const_iterator& __y) {	901	friend _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
		902	operator!=(const __map_const_iterator& __x, const __map_const_iterator& __y) {
887	return __x.__i_ != __y.__i_;	903	return __x.__i_ != __y.__i_;
888	}	904	}
889		905
...	@@ -910,7 +926,8 @@ struct __specialized_algorithm<	...	@@ -910,7 +926,8 @@ struct __specialized_algorithm<
910	using __iterator _LIBCPP_NODEBUG = __map_const_iterator<_TreeIterator>;	926	using __iterator _LIBCPP_NODEBUG = __map_const_iterator<_TreeIterator>;
911		927
912	template <class... _Args>	928	template <class... _Args>
913	_LIBCPP_HIDE_FROM_ABI static void operator()(__iterator __first, __iterator __last, _Args&&... __args) {	929	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static void
		930	operator()(__iterator __first, __iterator __last, _Args&&... __args) {
914	__base()(__first.__i_, __last.__i_, std::forward<_Args>(__args)...);	931	__base()(__first.__i_, __last.__i_, std::forward<_Args>(__args)...);
915	}	932	}
916	};	933	};
...	@@ -940,10 +957,11 @@ public:	...	@@ -940,10 +957,11 @@ public:
940	protected:	957	protected:
941	key_compare comp;	958	key_compare comp;
942		959
943	_LIBCPP_HIDE_FROM_ABI value_compare(key_compare __c) : comp(__c) {}	960	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 value_compare(key_compare __c) : comp(__c) {}
944		961
945	public:	962	public:
946	_LIBCPP_HIDE_FROM_ABI bool operator()(const value_type& __x, const value_type& __y) const {	963	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
		964	operator()(const value_type& __x, const value_type& __y) const {
947	return comp(__x.first, __y.first);	965	return comp(__x.first, __y.first);
948	}	966	}
949	};	967	};
...	@@ -979,26 +997,27 @@ public:	...	@@ -979,26 +997,27 @@ public:
979	template <class _Key2, class _Value2, class _Comp2, class _Alloc2>	997	template <class _Key2, class _Value2, class _Comp2, class _Alloc2>
980	friend class multimap;	998	friend class multimap;
981		999
982	_LIBCPP_HIDE_FROM_ABI map() _NOEXCEPT_(	1000	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map() _NOEXCEPT_(
983	is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_default_constructible<key_compare>::value&&	1001	is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_default_constructible<key_compare>::value&&
984	is_nothrow_copy_constructible<key_compare>::value)	1002	is_nothrow_copy_constructible<key_compare>::value)
985	: __tree_(__vc(key_compare())) {}	1003	: __tree_(__vc(key_compare())) {}
986		1004
987	_LIBCPP_HIDE_FROM_ABI explicit map(const key_compare& __comp) _NOEXCEPT_(	1005	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit map(const key_compare& __comp) _NOEXCEPT_(
988	is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_copy_constructible<key_compare>::value)	1006	is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_copy_constructible<key_compare>::value)
989	: __tree_(__vc(__comp)) {}	1007	: __tree_(__vc(__comp)) {}
990		1008
991	_LIBCPP_HIDE_FROM_ABI explicit map(const key_compare& __comp, const allocator_type& __a)	1009	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit map(const key_compare& __comp, const allocator_type& __a)
992	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {}	1010	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {}
993		1011
994	template <class _InputIterator>	1012	template <class _InputIterator>
995	_LIBCPP_HIDE_FROM_ABI map(_InputIterator __f, _InputIterator __l, const key_compare& __comp = key_compare())	1013	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
		1014	map(_InputIterator __f, _InputIterator __l, const key_compare& __comp = key_compare())
996	: __tree_(__vc(__comp)) {	1015	: __tree_(__vc(__comp)) {
997	insert(__f, __l);	1016	insert(__f, __l);
998	}	1017	}
999		1018
1000	template <class _InputIterator>	1019	template <class _InputIterator>
1001	_LIBCPP_HIDE_FROM_ABI	1020	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
1002	map(_InputIterator __f, _InputIterator __l, const key_compare& __comp, const allocator_type& __a)	1021	map(_InputIterator __f, _InputIterator __l, const key_compare& __comp, const allocator_type& __a)
1003	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {	1022	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {
1004	insert(__f, __l);	1023	insert(__f, __l);
...	@@ -1006,7 +1025,7 @@ public:	...	@@ -1006,7 +1025,7 @@ public:
1006		1025
1007	# if _LIBCPP_STD_VER >= 23	1026	# if _LIBCPP_STD_VER >= 23
1008	template <_ContainerCompatibleRange<value_type> _Range>	1027	template <_ContainerCompatibleRange<value_type> _Range>
1009	_LIBCPP_HIDE_FROM_ABI	1028	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
1010	map(from_range_t,	1029	map(from_range_t,
1011	_Range&& __range,	1030	_Range&& __range,
1012	const key_compare& __comp = key_compare(),	1031	const key_compare& __comp = key_compare(),
...	@@ -1016,46 +1035,46 @@ public:	...	@@ -1016,46 +1035,46 @@ public:
1016	}	1035	}
1017	# endif	1036	# endif
1018		1037
1019	# if _LIBCPP_STD_VER >= 14
1020	template <class _InputIterator>	1038	template <class _InputIterator>
1021	_LIBCPP_HIDE_FROM_ABI map(_InputIterator __f, _InputIterator __l, const allocator_type& __a)	1039	_LIBCPP_HIDE_FROM_ABI
		1040	_LIBCPP_CONSTEXPR_SINCE_CXX26 map(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
1022	: map(__f, __l, key_compare(), __a) {}	1041	: map(__f, __l, key_compare(), __a) {}
1023	# endif
1024		1042
1025	# if _LIBCPP_STD_VER >= 23	1043	# if _LIBCPP_STD_VER >= 23
1026	template <_ContainerCompatibleRange<value_type> _Range>	1044	template <_ContainerCompatibleRange<value_type> _Range>
1027	_LIBCPP_HIDE_FROM_ABI map(from_range_t, _Range&& __range, const allocator_type& __a)	1045	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map(from_range_t, _Range&& __range, const allocator_type& __a)
1028	: map(from_range, std::forward<_Range>(__range), key_compare(), __a) {}	1046	: map(from_range, std::forward<_Range>(__range), key_compare(), __a) {}
1029	# endif	1047	# endif
1030		1048
1031	_LIBCPP_HIDE_FROM_ABI map(const map& __m) = default;	1049	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map(const map& __m) = default;
1032		1050
1033	_LIBCPP_HIDE_FROM_ABI map& operator=(const map& __m) = default;	1051	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map& operator=(const map& __m) = default;
1034		1052
1035	# ifndef _LIBCPP_CXX03_LANG	1053	# ifndef _LIBCPP_CXX03_LANG
1036		1054
1037	_LIBCPP_HIDE_FROM_ABI map(map&& __m) = default;	1055	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map(map&& __m) = default;
1038		1056
1039	_LIBCPP_HIDE_FROM_ABI map(map&& __m, const allocator_type& __a) : __tree_(std::move(__m.__tree_), __a) {}	1057	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map(map&& __m, const allocator_type& __a)
		1058	: __tree_(std::move(__m.__tree_), __a) {}
1040		1059
1041	_LIBCPP_HIDE_FROM_ABI map& operator=(map&& __m) = default;	1060	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map& operator=(map&& __m) = default;
1042		1061
1043	_LIBCPP_HIDE_FROM_ABI map(initializer_list<value_type> __il, const key_compare& __comp = key_compare())	1062	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
		1063	map(initializer_list<value_type> __il, const key_compare& __comp = key_compare())
1044	: __tree_(__vc(__comp)) {	1064	: __tree_(__vc(__comp)) {
1045	insert(__il.begin(), __il.end());	1065	insert(__il.begin(), __il.end());
1046	}	1066	}
1047		1067
1048	_LIBCPP_HIDE_FROM_ABI map(initializer_list<value_type> __il, const key_compare& __comp, const allocator_type& __a)	1068	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
		1069	map(initializer_list<value_type> __il, const key_compare& __comp, const allocator_type& __a)
1049	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {	1070	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {
1050	insert(__il.begin(), __il.end());	1071	insert(__il.begin(), __il.end());
1051	}	1072	}
1052		1073
1053	# if _LIBCPP_STD_VER >= 14	1074	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map(initializer_list<value_type> __il, const allocator_type& __a)
1054	_LIBCPP_HIDE_FROM_ABI map(initializer_list<value_type> __il, const allocator_type& __a)
1055	: map(__il, key_compare(), __a) {}	1075	: map(__il, key_compare(), __a) {}
1056	# endif
1057		1076
1058	_LIBCPP_HIDE_FROM_ABI map& operator=(initializer_list<value_type> __il) {	1077	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map& operator=(initializer_list<value_type> __il) {
1059	clear();	1078	clear();
1060	insert(__il.begin(), __il.end());	1079	insert(__il.begin(), __il.end());
1061	return *this;	1080	return *this;
...	@@ -1063,118 +1082,157 @@ public:	...	@@ -1063,118 +1082,157 @@ public:
1063		1082
1064	# endif // _LIBCPP_CXX03_LANG	1083	# endif // _LIBCPP_CXX03_LANG
1065		1084
1066	_LIBCPP_HIDE_FROM_ABI explicit map(const allocator_type& __a) : __tree_(typename __base::allocator_type(__a)) {}	1085	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit map(const allocator_type& __a)
		1086	: __tree_(typename __base::allocator_type(__a)) {}
1067		1087
1068	_LIBCPP_HIDE_FROM_ABI map(const map& __m, const allocator_type& __alloc) : __tree_(__m.__tree_, __alloc) {}	1088	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 map(const map& __m, const allocator_type& __alloc)
		1089	: __tree_(__m.__tree_, __alloc) {}
1069		1090
1070	_LIBCPP_HIDE_FROM_ABI ~map() { static_assert(sizeof(std::__diagnose_non_const_comparator<_Key, _Compare>()), ""); }	1091	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 ~map() {
		1092	static_assert(sizeof(std::__diagnose_non_const_comparator<_Key, _Compare>()), "");
		1093	}
1071		1094
1072	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT { return __tree_.begin(); }	1095	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator begin() _NOEXCEPT {
1073	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT { return __tree_.begin(); }	1096	return __tree_.begin();
1074	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator end() _NOEXCEPT { return __tree_.end(); }	1097	}
1075	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT { return __tree_.end(); }	1098	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator begin() const _NOEXCEPT {
		1099	return __tree_.begin();
		1100	}
		1101	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator end() _NOEXCEPT {
		1102	return __tree_.end();
		1103	}
		1104	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator end() const _NOEXCEPT {
		1105	return __tree_.end();
		1106	}
1076		1107
1077	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI reverse_iterator rbegin() _NOEXCEPT { return reverse_iterator(end()); }	1108	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reverse_iterator rbegin() _NOEXCEPT {
1078	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator rbegin() const _NOEXCEPT {	1109	return reverse_iterator(end());
		1110	}
		1111	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator
		1112	rbegin() const _NOEXCEPT {
1079	return const_reverse_iterator(end());	1113	return const_reverse_iterator(end());
1080	}	1114	}
1081	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI reverse_iterator rend() _NOEXCEPT { return reverse_iterator(begin()); }	1115	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reverse_iterator rend() _NOEXCEPT {
1082	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator rend() const _NOEXCEPT {	1116	return reverse_iterator(begin());
		1117	}
		1118	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator rend() const _NOEXCEPT {
1083	return const_reverse_iterator(begin());	1119	return const_reverse_iterator(begin());
1084	}	1120	}
1085		1121
1086	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator cbegin() const _NOEXCEPT { return begin(); }	1122	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator cbegin() const _NOEXCEPT {
1087	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator cend() const _NOEXCEPT { return end(); }	1123	return begin();
1088	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator crbegin() const _NOEXCEPT { return rbegin(); }	1124	}
1089	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator crend() const _NOEXCEPT { return rend(); }	1125	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator cend() const _NOEXCEPT {
		1126	return end();
		1127	}
		1128	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator
		1129	crbegin() const _NOEXCEPT {
		1130	return rbegin();
		1131	}
		1132	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator crend() const _NOEXCEPT {
		1133	return rend();
		1134	}
1090		1135
1091	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool empty() const _NOEXCEPT { return __tree_.size() == 0; }	1136	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool empty() const _NOEXCEPT {
1092	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type size() const _NOEXCEPT { return __tree_.size(); }	1137	return __tree_.size() == 0;
1093	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type max_size() const _NOEXCEPT { return __tree_.max_size(); }	1138	}
		1139	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type size() const _NOEXCEPT {
		1140	return __tree_.size();
		1141	}
		1142	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type max_size() const _NOEXCEPT {
		1143	return __tree_.max_size();
		1144	}
1094		1145
1095	_LIBCPP_HIDE_FROM_ABI mapped_type& operator[](const key_type& __k);	1146	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 mapped_type& operator[](const key_type& __k);
1096	# ifndef _LIBCPP_CXX03_LANG	1147	# ifndef _LIBCPP_CXX03_LANG
1097	_LIBCPP_HIDE_FROM_ABI mapped_type& operator[](key_type&& __k);	1148	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 mapped_type& operator[](key_type&& __k);
1098	# endif	1149	# endif
1099		1150
1100	template <class _Arg,	1151	template <class _Arg,
1101	__enable_if_t<__is_transparently_comparable_v<_Compare, key_type, __remove_cvref_t<_Arg> >, int> = 0>	1152	__enable_if_t<__is_transparently_comparable_v<_Compare, key_type, __remove_cvref_t<_Arg> >, int> = 0>
1102	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI mapped_type& at(_Arg&& __arg) {	1153	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 mapped_type& at(_Arg&& __arg) {
1103	auto [_, __child] = __tree_.__find_equal(__arg);	1154	auto [__dummy, __child] = __tree_.__find_equal(__arg);
1104	if (__child == nullptr)	1155	if (__child == nullptr)
1105	std::__throw_out_of_range("map::at: key not found");	1156	std::__throw_out_of_range("map::at: key not found");
1106	return static_cast<__node_pointer>(__child)->__get_value().second;	1157	return std::__static_fancy_pointer_cast<__node_pointer>(__child)->__get_value().second;
1107	}	1158	}
1108		1159
1109	template <class _Arg,	1160	template <class _Arg,
1110	__enable_if_t<__is_transparently_comparable_v<_Compare, key_type, __remove_cvref_t<_Arg> >, int> = 0>	1161	__enable_if_t<__is_transparently_comparable_v<_Compare, key_type, __remove_cvref_t<_Arg> >, int> = 0>
1111	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const mapped_type& at(_Arg&& __arg) const {	1162	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const mapped_type& at(_Arg&& __arg) const {
1112	auto [_, __child] = __tree_.__find_equal(__arg);	1163	auto [__dummy, __child] = __tree_.__find_equal(__arg);
1113	if (__child == nullptr)	1164	if (__child == nullptr)
1114	std::__throw_out_of_range("map::at: key not found");	1165	std::__throw_out_of_range("map::at: key not found");
1115	return static_cast<__node_pointer>(__child)->__get_value().second;	1166	return std::__static_fancy_pointer_cast<__node_pointer>(__child)->__get_value().second;
1116	}	1167	}
1117		1168
1118	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI mapped_type& at(const key_type& __k);	1169	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 mapped_type& at(const key_type& __k);
1119	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const mapped_type& at(const key_type& __k) const;	1170	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const mapped_type&
		1171	at(const key_type& __k) const;
1120		1172
1121	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const _NOEXCEPT {	1173	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 allocator_type get_allocator() const _NOEXCEPT {
1122	return allocator_type(__tree_.__alloc());	1174	return allocator_type(__tree_.__alloc());
1123	}	1175	}
1124	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI key_compare key_comp() const { return __tree_.value_comp().key_comp(); }	1176	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 key_compare key_comp() const {
1125	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI value_compare value_comp() const {	1177	return __tree_.value_comp().key_comp();
		1178	}
		1179	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 value_compare value_comp() const {
1126	return value_compare(__tree_.value_comp().key_comp());	1180	return value_compare(__tree_.value_comp().key_comp());
1127	}	1181	}
1128		1182
1129	# ifndef _LIBCPP_CXX03_LANG	1183	# ifndef _LIBCPP_CXX03_LANG
1130	template <class... _Args>	1184	template <class... _Args>
1131	_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> emplace(_Args&&... __args) {	1185	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool> emplace(_Args&&... __args) {
1132	return __tree_.__emplace_unique(std::forward<_Args>(__args)...);	1186	return __tree_.__emplace_unique(std::forward<_Args>(__args)...);
1133	}	1187	}
1134		1188
1135	template <class... _Args>	1189	template <class... _Args>
1136	_LIBCPP_HIDE_FROM_ABI iterator emplace_hint(const_iterator __p, _Args&&... __args) {	1190	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator emplace_hint(const_iterator __p, _Args&&... __args) {
1137	return __tree_.__emplace_hint_unique(__p.__i_, std::forward<_Args>(__args)...).first;	1191	return __tree_.__emplace_hint_unique(__p.__i_, std::forward<_Args>(__args)...).first;
1138	}	1192	}
1139		1193
1140	template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>	1194	template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>
1141	_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(_Pp&& __p) {	1195	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool> insert(_Pp&& __p) {
1142	return __tree_.__emplace_unique(std::forward<_Pp>(__p));	1196	return __tree_.__emplace_unique(std::forward<_Pp>(__p));
1143	}	1197	}
1144		1198
1145	template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>	1199	template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>
1146	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __pos, _Pp&& __p) {	1200	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __pos, _Pp&& __p) {
1147	return __tree_.__emplace_hint_unique(__pos.__i_, std::forward<_Pp>(__p)).first;	1201	return __tree_.__emplace_hint_unique(__pos.__i_, std::forward<_Pp>(__p)).first;
1148	}	1202	}
1149		1203
1150	# endif // _LIBCPP_CXX03_LANG	1204	# endif // _LIBCPP_CXX03_LANG
1151		1205
1152	_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(const value_type& __v) { return __tree_.__emplace_unique(__v); }	1206	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool> insert(const value_type& __v) {
		1207	return __tree_.__emplace_unique(__v);
		1208	}
1153		1209
1154	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, const value_type& __v) {	1210	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __p, const value_type& __v) {
1155	return __tree_.__emplace_hint_unique(__p.__i_, __v).first;	1211	return __tree_.__emplace_hint_unique(__p.__i_, __v).first;
1156	}	1212	}
1157		1213
1158	# ifndef _LIBCPP_CXX03_LANG	1214	# ifndef _LIBCPP_CXX03_LANG
1159	_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(value_type&& __v) {	1215	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool> insert(value_type&& __v) {
1160	return __tree_.__emplace_unique(std::move(__v));	1216	return __tree_.__emplace_unique(std::move(__v));
1161	}	1217	}
1162		1218
1163	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, value_type&& __v) {	1219	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __p, value_type&& __v) {
1164	return __tree_.__emplace_hint_unique(__p.__i_, std::move(__v)).first;	1220	return __tree_.__emplace_hint_unique(__p.__i_, std::move(__v)).first;
1165	}	1221	}
1166		1222
1167	_LIBCPP_HIDE_FROM_ABI void insert(initializer_list<value_type> __il) { insert(__il.begin(), __il.end()); }	1223	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert(initializer_list<value_type> __il) {
		1224	insert(__il.begin(), __il.end());
		1225	}
1168	# endif	1226	# endif
1169		1227
1170	template <class _InputIterator>	1228	template <class _InputIterator>
1171	_LIBCPP_HIDE_FROM_ABI void insert(_InputIterator __first, _InputIterator __last) {	1229	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert(_InputIterator __first, _InputIterator __last) {
1172	__tree_.__insert_range_unique(__first, __last);	1230	__tree_.__insert_range_unique(__first, __last);
1173	}	1231	}
1174		1232
1175	# if _LIBCPP_STD_VER >= 23	1233	# if _LIBCPP_STD_VER >= 23
1176	template <_ContainerCompatibleRange<value_type> _Range>	1234	template <_ContainerCompatibleRange<value_type> _Range>
1177	_LIBCPP_HIDE_FROM_ABI void insert_range(_Range&& __range) {	1235	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert_range(_Range&& __range) {
1178	__tree_.__insert_range_unique(ranges::begin(__range), ranges::end(__range));	1236	__tree_.__insert_range_unique(ranges::begin(__range), ranges::end(__range));
1179	}	1237	}
1180	# endif	1238	# endif
...	@@ -1182,13 +1240,15 @@ public:	...	@@ -1182,13 +1240,15 @@ public:
1182	# if _LIBCPP_STD_VER >= 17	1240	# if _LIBCPP_STD_VER >= 17
1183		1241
1184	template <class... _Args>	1242	template <class... _Args>
1185	_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> try_emplace(const key_type& __k, _Args&&... __args) {	1243	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool>
		1244	try_emplace(const key_type& __k, _Args&&... __args) {
1186	return __tree_.__emplace_unique(	1245	return __tree_.__emplace_unique(
1187	std::piecewise_construct, std::forward_as_tuple(__k), std::forward_as_tuple(std::forward<_Args>(__args)...));	1246	std::piecewise_construct, std::forward_as_tuple(__k), std::forward_as_tuple(std::forward<_Args>(__args)...));
1188	}	1247	}
1189		1248
1190	template <class... _Args>	1249	template <class... _Args>
1191	_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> try_emplace(key_type&& __k, _Args&&... __args) {	1250	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool>
		1251	try_emplace(key_type&& __k, _Args&&... __args) {
1192	return __tree_.__emplace_unique(	1252	return __tree_.__emplace_unique(
1193	std::piecewise_construct,	1253	std::piecewise_construct,
1194	std::forward_as_tuple(std::move(__k)),	1254	std::forward_as_tuple(std::move(__k)),
...	@@ -1196,7 +1256,8 @@ public:	...	@@ -1196,7 +1256,8 @@ public:
1196	}	1256	}
1197		1257
1198	template <class... _Args>	1258	template <class... _Args>
1199	_LIBCPP_HIDE_FROM_ABI iterator try_emplace(const_iterator __h, const key_type& __k, _Args&&... __args) {	1259	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
		1260	try_emplace(const_iterator __h, const key_type& __k, _Args&&... __args) {
1200	return __tree_	1261	return __tree_
1201	.__emplace_hint_unique(	1262	.__emplace_hint_unique(
1202	__h.__i_,	1263	__h.__i_,
...	@@ -1207,7 +1268,8 @@ public:	...	@@ -1207,7 +1268,8 @@ public:
1207	}	1268	}
1208		1269
1209	template <class... _Args>	1270	template <class... _Args>
1210	_LIBCPP_HIDE_FROM_ABI iterator try_emplace(const_iterator __h, key_type&& __k, _Args&&... __args) {	1271	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
		1272	try_emplace(const_iterator __h, key_type&& __k, _Args&&... __args) {
1211	return __tree_	1273	return __tree_
1212	.__emplace_hint_unique(	1274	.__emplace_hint_unique(
1213	__h.__i_,	1275	__h.__i_,
...	@@ -1218,7 +1280,8 @@ public:	...	@@ -1218,7 +1280,8 @@ public:
1218	}	1280	}
1219		1281
1220	template <class _Vp>	1282	template <class _Vp>
1221	_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert_or_assign(const key_type& __k, _Vp&& __v) {	1283	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool>
		1284	insert_or_assign(const key_type& __k, _Vp&& __v) {
1222	auto __result = __tree_.__emplace_unique(__k, std::forward<_Vp>(__v));	1285	auto __result = __tree_.__emplace_unique(__k, std::forward<_Vp>(__v));
1223	auto& [__iter, __inserted] = __result;	1286	auto& [__iter, __inserted] = __result;
1224	if (!__inserted)	1287	if (!__inserted)
...	@@ -1227,7 +1290,7 @@ public:	...	@@ -1227,7 +1290,7 @@ public:
1227	}	1290	}
1228		1291
1229	template <class _Vp>	1292	template <class _Vp>
1230	_LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert_or_assign(key_type&& __k, _Vp&& __v) {	1293	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool> insert_or_assign(key_type&& __k, _Vp&& __v) {
1231	auto __result = __tree_.__emplace_unique(std::move(__k), std::forward<_Vp>(__v));	1294	auto __result = __tree_.__emplace_unique(std::move(__k), std::forward<_Vp>(__v));
1232	auto& [__iter, __inserted] = __result;	1295	auto& [__iter, __inserted] = __result;
1233	if (!__inserted)	1296	if (!__inserted)
...	@@ -1236,7 +1299,8 @@ public:	...	@@ -1236,7 +1299,8 @@ public:
1236	}	1299	}
1237		1300
1238	template <class _Vp>	1301	template <class _Vp>
1239	_LIBCPP_HIDE_FROM_ABI iterator insert_or_assign(const_iterator __h, const key_type& __k, _Vp&& __v) {	1302	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
		1303	insert_or_assign(const_iterator __h, const key_type& __k, _Vp&& __v) {
1240	auto [__r, __inserted] = __tree_.__emplace_hint_unique(__h.__i_, __k, std::forward<_Vp>(__v));	1304	auto [__r, __inserted] = __tree_.__emplace_hint_unique(__h.__i_, __k, std::forward<_Vp>(__v));
1241		1305
1242	if (!__inserted)	1306	if (!__inserted)
...	@@ -1246,7 +1310,8 @@ public:	...	@@ -1246,7 +1310,8 @@ public:
1246	}	1310	}
1247		1311
1248	template <class _Vp>	1312	template <class _Vp>
1249	_LIBCPP_HIDE_FROM_ABI iterator insert_or_assign(const_iterator __h, key_type&& __k, _Vp&& __v) {	1313	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator
		1314	insert_or_assign(const_iterator __h, key_type&& __k, _Vp&& __v) {
1250	auto [__r, __inserted] = __tree_.__emplace_hint_unique(__h.__i_, std::move(__k), std::forward<_Vp>(__v));	1315	auto [__r, __inserted] = __tree_.__emplace_hint_unique(__h.__i_, std::move(__k), std::forward<_Vp>(__v));
1251		1316
1252	if (!__inserted)	1317	if (!__inserted)
...	@@ -1257,101 +1322,118 @@ public:	...	@@ -1257,101 +1322,118 @@ public:
1257		1322
1258	# endif // _LIBCPP_STD_VER >= 17	1323	# endif // _LIBCPP_STD_VER >= 17
1259		1324
1260	_LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __p) { return __tree_.erase(__p.__i_); }	1325	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __p) {
1261	_LIBCPP_HIDE_FROM_ABI iterator erase(iterator __p) { return __tree_.erase(__p.__i_); }	1326	return __tree_.erase(__p.__i_);
1262	_LIBCPP_HIDE_FROM_ABI size_type erase(const key_type& __k) { return __tree_.__erase_unique(__k); }	1327	}
1263	_LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __f, const_iterator __l) {	1328	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(iterator __p) { return __tree_.erase(__p.__i_); }
		1329	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type erase(const key_type& __k) {
		1330	return __tree_.__erase_unique(__k);
		1331	}
		1332	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __f, const_iterator __l) {
1264	return __tree_.erase(__f.__i_, __l.__i_);	1333	return __tree_.erase(__f.__i_, __l.__i_);
1265	}	1334	}
1266	_LIBCPP_HIDE_FROM_ABI void clear() _NOEXCEPT { __tree_.clear(); }	1335	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void clear() _NOEXCEPT { __tree_.clear(); }
1267		1336
1268	# if _LIBCPP_STD_VER >= 17	1337	# if _LIBCPP_STD_VER >= 17
1269	_LIBCPP_HIDE_FROM_ABI insert_return_type insert(node_type&& __nh) {	1338	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 insert_return_type insert(node_type&& __nh) {
1270	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() \|\| __nh.get_allocator() == get_allocator(),	1339	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() \|\| __nh.get_allocator() == get_allocator(),
1271	"node_type with incompatible allocator passed to map::insert()");	1340	"node_type with incompatible allocator passed to map::insert()");
1272	return __tree_.template __node_handle_insert_unique< node_type, insert_return_type>(std::move(__nh));	1341	return __tree_.template __node_handle_insert_unique< node_type, insert_return_type>(std::move(__nh));
1273	}	1342	}
1274	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __hint, node_type&& __nh) {	1343	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __hint, node_type&& __nh) {
1275	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() \|\| __nh.get_allocator() == get_allocator(),	1344	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() \|\| __nh.get_allocator() == get_allocator(),
1276	"node_type with incompatible allocator passed to map::insert()");	1345	"node_type with incompatible allocator passed to map::insert()");
1277	return __tree_.template __node_handle_insert_unique<node_type>(__hint.__i_, std::move(__nh));	1346	return __tree_.template __node_handle_insert_unique<node_type>(__hint.__i_, std::move(__nh));
1278	}	1347	}
1279	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI node_type extract(key_type const& __key) {	1348	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 node_type extract(key_type const& __key) {
1280	return __tree_.template __node_handle_extract<node_type>(__key);	1349	return __tree_.template __node_handle_extract<node_type>(__key);
1281	}	1350	}
1282	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI node_type extract(const_iterator __it) {	1351	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 node_type extract(const_iterator __it) {
1283	return __tree_.template __node_handle_extract<node_type>(__it.__i_);	1352	return __tree_.template __node_handle_extract<node_type>(__it.__i_);
1284	}	1353	}
1285	template <class _Compare2>	1354	template <class _Compare2>
1286	_LIBCPP_HIDE_FROM_ABI void merge(map<key_type, mapped_type, _Compare2, allocator_type>& __source) {	1355	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
		1356	merge(map<key_type, mapped_type, _Compare2, allocator_type>& __source) {
1287	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(	1357	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
1288	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");	1358	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
1289	__tree_.__node_handle_merge_unique(__source.__tree_);	1359	__tree_.__node_handle_merge_unique(__source.__tree_);
1290	}	1360	}
1291	template <class _Compare2>	1361	template <class _Compare2>
1292	_LIBCPP_HIDE_FROM_ABI void merge(map<key_type, mapped_type, _Compare2, allocator_type>&& __source) {	1362	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
		1363	merge(map<key_type, mapped_type, _Compare2, allocator_type>&& __source) {
1293	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(	1364	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
1294	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");	1365	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
1295	__tree_.__node_handle_merge_unique(__source.__tree_);	1366	__tree_.__node_handle_merge_unique(__source.__tree_);
1296	}	1367	}
1297	template <class _Compare2>	1368	template <class _Compare2>
1298	_LIBCPP_HIDE_FROM_ABI void merge(multimap<key_type, mapped_type, _Compare2, allocator_type>& __source) {	1369	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
		1370	merge(multimap<key_type, mapped_type, _Compare2, allocator_type>& __source) {
1299	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(	1371	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
1300	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");	1372	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
1301	__tree_.__node_handle_merge_unique(__source.__tree_);	1373	__tree_.__node_handle_merge_unique(__source.__tree_);
1302	}	1374	}
1303	template <class _Compare2>	1375	template <class _Compare2>
1304	_LIBCPP_HIDE_FROM_ABI void merge(multimap<key_type, mapped_type, _Compare2, allocator_type>&& __source) {	1376	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
		1377	merge(multimap<key_type, mapped_type, _Compare2, allocator_type>&& __source) {
1305	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(	1378	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
1306	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");	1379	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
1307	__tree_.__node_handle_merge_unique(__source.__tree_);	1380	__tree_.__node_handle_merge_unique(__source.__tree_);
1308	}	1381	}
1309	# endif	1382	# endif
1310		1383
1311	_LIBCPP_HIDE_FROM_ABI void swap(map& __m) _NOEXCEPT_(__is_nothrow_swappable_v<__base>) { __tree_.swap(__m.__tree_); }	1384	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void swap(map& __m) _NOEXCEPT_(__is_nothrow_swappable_v<__base>) {
		1385	__tree_.swap(__m.__tree_);
		1386	}
1312		1387
1313	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const key_type& __k) { return __tree_.find(__k); }	1388	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator find(const key_type& __k) {
1314	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const key_type& __k) const { return __tree_.find(__k); }	1389	return __tree_.find(__k);
		1390	}
		1391	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator find(const key_type& __k) const {
		1392	return __tree_.find(__k);
		1393	}
1315	# if _LIBCPP_STD_VER >= 14	1394	# if _LIBCPP_STD_VER >= 14
1316	template <typename _K2,	1395	template <typename _K2,
1317	enable_if_t<__is_transparent_v<_Compare, _K2> \|\| __is_transparently_comparable_v<_Compare, key_type, _K2>,	1396	class _Comp = _Compare,
1318	int> = 0>	1397	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
1319	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const _K2& __k) {	1398	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator find(const _K2& __k) {
1320	return __tree_.find(__k);	1399	return __tree_.find(__k);
1321	}	1400	}
1322	template <typename _K2,	1401	template <typename _K2,
1323	enable_if_t<__is_transparent_v<_Compare, _K2> \|\| __is_transparently_comparable_v<_Compare, key_type, _K2>,	1402	class _Comp = _Compare,
1324	int> = 0>	1403	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
1325	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const _K2& __k) const {	1404	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator find(const _K2& __k) const {
1326	return __tree_.find(__k);	1405	return __tree_.find(__k);
1327	}	1406	}
1328	# endif	1407	# endif
1329		1408
1330	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const key_type& __k) const {	1409	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type count(const key_type& __k) const {
1331	return __tree_.__count_unique(__k);	1410	return __tree_.__count_unique(__k);
1332	}	1411	}
1333	# if _LIBCPP_STD_VER >= 14	1412	# if _LIBCPP_STD_VER >= 14
1334	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	1413	template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
1335	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const _K2& __k) const {	1414	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type count(const _K2& __k) const {
1336	return __tree_.__count_multi(__k);	1415	return __tree_.__count_multi(__k);
1337	}	1416	}
1338	# endif	1417	# endif
1339		1418
1340	# if _LIBCPP_STD_VER >= 20	1419	# if _LIBCPP_STD_VER >= 20
1341	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const key_type& __k) const { return find(__k) != end(); }	1420	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool contains(const key_type& __k) const {
		1421	return find(__k) != end();
		1422	}
1342	template <typename _K2,	1423	template <typename _K2,
1343	enable_if_t<__is_transparent_v<_Compare, _K2> \|\| __is_transparently_comparable_v<_Compare, key_type, _K2>,	1424	class _Comp = _Compare,
1344	int> = 0>	1425	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
1345	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const _K2& __k) const {	1426	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool contains(const _K2& __k) const {
1346	return find(__k) != end();	1427	return find(__k) != end();
1347	}	1428	}
1348	# endif // _LIBCPP_STD_VER >= 20	1429	# endif // _LIBCPP_STD_VER >= 20
1349		1430
1350	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator lower_bound(const key_type& __k) {	1431	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator lower_bound(const key_type& __k) {
1351	return __tree_.__lower_bound_unique(__k);	1432	return __tree_.__lower_bound_unique(__k);
1352	}	1433	}
1353		1434
1354	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator lower_bound(const key_type& __k) const {	1435	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
		1436	lower_bound(const key_type& __k) const {
1355	return __tree_.__lower_bound_unique(__k);	1437	return __tree_.__lower_bound_unique(__k);
1356	}	1438	}
1357		1439
...	@@ -1359,56 +1441,63 @@ public:	...	@@ -1359,56 +1441,63 @@ public:
1359	// match multiple elements.	1441	// match multiple elements.
1360	# if _LIBCPP_STD_VER >= 14	1442	# if _LIBCPP_STD_VER >= 14
1361	template <typename _K2,	1443	template <typename _K2,
1362	enable_if_t<__is_transparent_v<_Compare, _K2> \|\| __is_transparently_comparable_v<_Compare, key_type, _K2>,	1444	class _Comp = _Compare,
1363	int> = 0>	1445	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
1364	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator lower_bound(const _K2& __k) {	1446	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator lower_bound(const _K2& __k) {
1365	return __tree_.__lower_bound_multi(__k);	1447	return __tree_.__lower_bound_multi(__k);
1366	}	1448	}
1367		1449
1368	template <typename _K2,	1450	template <typename _K2,
1369	enable_if_t<__is_transparent_v<_Compare, _K2> \|\| __is_transparently_comparable_v<_Compare, key_type, _K2>,	1451	class _Comp = _Compare,
1370	int> = 0>	1452	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
1371	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator lower_bound(const _K2& __k) const {	1453	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
		1454	lower_bound(const _K2& __k) const {
1372	return __tree_.__lower_bound_multi(__k);	1455	return __tree_.__lower_bound_multi(__k);
1373	}	1456	}
1374	# endif	1457	# endif
1375		1458
1376	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator upper_bound(const key_type& __k) {	1459	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator upper_bound(const key_type& __k) {
1377	return __tree_.__upper_bound_unique(__k);	1460	return __tree_.__upper_bound_unique(__k);
1378	}	1461	}
1379		1462
1380	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator upper_bound(const key_type& __k) const {	1463	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
		1464	upper_bound(const key_type& __k) const {
1381	return __tree_.__upper_bound_unique(__k);	1465	return __tree_.__upper_bound_unique(__k);
1382	}	1466	}
1383		1467
1384	# if _LIBCPP_STD_VER >= 14	1468	# if _LIBCPP_STD_VER >= 14
1385	template <typename _K2,	1469	template <typename _K2,
1386	enable_if_t<__is_transparent_v<_Compare, _K2> \|\| __is_transparently_comparable_v<_Compare, key_type, _K2>,	1470	class _Comp = _Compare,
1387	int> = 0>	1471	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
1388	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator upper_bound(const _K2& __k) {	1472	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator upper_bound(const _K2& __k) {
1389	return __tree_.__upper_bound_multi(__k);	1473	return __tree_.__upper_bound_multi(__k);
1390	}	1474	}
1391	template <typename _K2,	1475	template <typename _K2,
1392	enable_if_t<__is_transparent_v<_Compare, _K2> \|\| __is_transparently_comparable_v<_Compare, key_type, _K2>,	1476	class _Comp = _Compare,
1393	int> = 0>	1477	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
1394	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator upper_bound(const _K2& __k) const {	1478	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
		1479	upper_bound(const _K2& __k) const {
1395	return __tree_.__upper_bound_multi(__k);	1480	return __tree_.__upper_bound_multi(__k);
1396	}	1481	}
1397	# endif	1482	# endif
1398		1483
1399	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const key_type& __k) {	1484	[[__nodiscard__]]
		1485	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> equal_range(const key_type& __k) {
1400	return __tree_.__equal_range_unique(__k);	1486	return __tree_.__equal_range_unique(__k);
1401	}	1487	}
1402	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const key_type& __k) const {	1488	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
		1489	equal_range(const key_type& __k) const {
1403	return __tree_.__equal_range_unique(__k);	1490	return __tree_.__equal_range_unique(__k);
1404	}	1491	}
1405	# if _LIBCPP_STD_VER >= 14	1492	# if _LIBCPP_STD_VER >= 14
1406	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	1493	template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
1407	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const _K2& __k) {	1494	[[__nodiscard__]]
		1495	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> equal_range(const _K2& __k) {
1408	return __tree_.__equal_range_multi(__k);	1496	return __tree_.__equal_range_multi(__k);
1409	}	1497	}
1410	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	1498	template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
1411	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const _K2& __k) const {	1499	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
		1500	equal_range(const _K2& __k) const {
1412	return __tree_.__equal_range_multi(__k);	1501	return __tree_.__equal_range_multi(__k);
1413	}	1502	}
1414	# endif	1503	# endif
...	@@ -1487,8 +1576,8 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<map<_Key,	...	@@ -1487,8 +1576,8 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<map<_Key,
1487	static const bool __has_algorithm = true;	1576	static const bool __has_algorithm = true;
1488		1577
1489	template <class _Map, class _Func, class _Proj>	1578	template <class _Map, class _Func, class _Proj>
1490	_LIBCPP_HIDE_FROM_ABI static auto operator()(_Map&& __map, _Func __func, _Proj __proj) {	1579	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static auto operator()(_Map&& __map, _Func __func, _Proj __proj) {
1491	auto [_, __func2] = __specialized_algorithm<_Algorithm::__for_each, __single_range<typename __map::__base>>()(	1580	auto [__dummy, __func2] = __specialized_algorithm<_Algorithm::__for_each, __single_range<typename __map::__base>>()(
1492	__map.__tree_, std::move(__func), std::move(__proj));	1581	__map.__tree_, std::move(__func), std::move(__proj));
1493	return std::make_pair(__map.end(), std::move(__func2));	1582	return std::make_pair(__map.end(), std::move(__func2));
1494	}	1583	}
...	@@ -1497,13 +1586,13 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<map<_Key,	...	@@ -1497,13 +1586,13 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<map<_Key,
1497		1586
1498	# ifndef _LIBCPP_CXX03_LANG	1587	# ifndef _LIBCPP_CXX03_LANG
1499	template <class _Key, class _Tp, class _Compare, class _Allocator>	1588	template <class _Key, class _Tp, class _Compare, class _Allocator>
1500	_Tp& map<_Key, _Tp, _Compare, _Allocator>::operator[](const key_type& __k) {	1589	_LIBCPP_CONSTEXPR_SINCE_CXX26 _Tp& map<_Key, _Tp, _Compare, _Allocator>::operator[](const key_type& __k) {
1501	return __tree_.__emplace_unique(std::piecewise_construct, std::forward_as_tuple(__k), std::forward_as_tuple())	1590	return __tree_.__emplace_unique(std::piecewise_construct, std::forward_as_tuple(__k), std::forward_as_tuple())
1502	.first->second;	1591	.first->second;
1503	}	1592	}
1504		1593
1505	template <class _Key, class _Tp, class _Compare, class _Allocator>	1594	template <class _Key, class _Tp, class _Compare, class _Allocator>
1506	_Tp& map<_Key, _Tp, _Compare, _Allocator>::operator[](key_type&& __k) {	1595	_LIBCPP_CONSTEXPR_SINCE_CXX26 _Tp& map<_Key, _Tp, _Compare, _Allocator>::operator[](key_type&& __k) {
1507	return __tree_	1596	return __tree_
1508	.__emplace_unique(std::piecewise_construct, std::forward_as_tuple(std::move(__k)), std::forward_as_tuple())	1597	.__emplace_unique(std::piecewise_construct, std::forward_as_tuple(std::move(__k)), std::forward_as_tuple())
1509	.first->second;	1598	.first->second;
...	@@ -1538,23 +1627,23 @@ _Tp& map<_Key, _Tp, _Compare, _Allocator>::operator[](const key_type& __k) {	...	@@ -1538,23 +1627,23 @@ _Tp& map<_Key, _Tp, _Compare, _Allocator>::operator[](const key_type& __k) {
1538	# endif // _LIBCPP_CXX03_LANG	1627	# endif // _LIBCPP_CXX03_LANG
1539		1628
1540	template <class _Key, class _Tp, class _Compare, class _Allocator>	1629	template <class _Key, class _Tp, class _Compare, class _Allocator>
1541	_Tp& map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k) {	1630	_LIBCPP_CONSTEXPR_SINCE_CXX26 _Tp& map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k) {
1542	auto [_, __child] = __tree_.__find_equal(__k);	1631	auto [__dummy, __child] = __tree_.__find_equal(__k);
1543	if (__child == nullptr)	1632	if (__child == nullptr)
1544	std::__throw_out_of_range("map::at: key not found");	1633	std::__throw_out_of_range("map::at: key not found");
1545	return static_cast<__node_pointer>(__child)->__get_value().second;	1634	return std::__static_fancy_pointer_cast<__node_pointer>(__child)->__get_value().second;
1546	}	1635	}
1547		1636
1548	template <class _Key, class _Tp, class _Compare, class _Allocator>	1637	template <class _Key, class _Tp, class _Compare, class _Allocator>
1549	const _Tp& map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k) const {	1638	_LIBCPP_CONSTEXPR_SINCE_CXX26 const _Tp& map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k) const {
1550	auto [_, __child] = __tree_.__find_equal(__k);	1639	auto [__dummy, __child] = __tree_.__find_equal(__k);
1551	if (__child == nullptr)	1640	if (__child == nullptr)
1552	std::__throw_out_of_range("map::at: key not found");	1641	std::__throw_out_of_range("map::at: key not found");
1553	return static_cast<__node_pointer>(__child)->__get_value().second;	1642	return std::__static_fancy_pointer_cast<__node_pointer>(__child)->__get_value().second;
1554	}	1643	}
1555		1644
1556	template <class _Key, class _Tp, class _Compare, class _Allocator>	1645	template <class _Key, class _Tp, class _Compare, class _Allocator>
1557	inline _LIBCPP_HIDE_FROM_ABI bool	1646	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
1558	operator==(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {	1647	operator==(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {
1559	return __x.size() == __y.size() && std::equal(__x.begin(), __x.end(), __y.begin());	1648	return __x.size() == __y.size() && std::equal(__x.begin(), __x.end(), __y.begin());
1560	}	1649	}
...	@@ -1562,31 +1651,31 @@ operator==(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp,	...	@@ -1562,31 +1651,31 @@ operator==(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp,
1562	# if _LIBCPP_STD_VER <= 17	1651	# if _LIBCPP_STD_VER <= 17
1563		1652
1564	template <class _Key, class _Tp, class _Compare, class _Allocator>	1653	template <class _Key, class _Tp, class _Compare, class _Allocator>
1565	inline _LIBCPP_HIDE_FROM_ABI bool	1654	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
1566	operator<(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {	1655	operator<(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {
1567	return std::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());	1656	return std::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
1568	}	1657	}
1569		1658
1570	template <class _Key, class _Tp, class _Compare, class _Allocator>	1659	template <class _Key, class _Tp, class _Compare, class _Allocator>
1571	inline _LIBCPP_HIDE_FROM_ABI bool	1660	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
1572	operator!=(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {	1661	operator!=(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {
1573	return !(__x == __y);	1662	return !(__x == __y);
1574	}	1663	}
1575		1664
1576	template <class _Key, class _Tp, class _Compare, class _Allocator>	1665	template <class _Key, class _Tp, class _Compare, class _Allocator>
1577	inline _LIBCPP_HIDE_FROM_ABI bool	1666	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
1578	operator>(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {	1667	operator>(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {
1579	return __y < __x;	1668	return __y < __x;
1580	}	1669	}
1581		1670
1582	template <class _Key, class _Tp, class _Compare, class _Allocator>	1671	template <class _Key, class _Tp, class _Compare, class _Allocator>
1583	inline _LIBCPP_HIDE_FROM_ABI bool	1672	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
1584	operator>=(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {	1673	operator>=(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {
1585	return !(__x < __y);	1674	return !(__x < __y);
1586	}	1675	}
1587		1676
1588	template <class _Key, class _Tp, class _Compare, class _Allocator>	1677	template <class _Key, class _Tp, class _Compare, class _Allocator>
1589	inline _LIBCPP_HIDE_FROM_ABI bool	1678	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
1590	operator<=(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {	1679	operator<=(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {
1591	return !(__y < __x);	1680	return !(__y < __x);
1592	}	1681	}
...	@@ -1594,7 +1683,7 @@ operator<=(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp,	...	@@ -1594,7 +1683,7 @@ operator<=(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp,
1594	# else // #if _LIBCPP_STD_VER <= 17	1683	# else // #if _LIBCPP_STD_VER <= 17
1595		1684
1596	template <class _Key, class _Tp, class _Compare, class _Allocator>	1685	template <class _Key, class _Tp, class _Compare, class _Allocator>
1597	_LIBCPP_HIDE_FROM_ABI __synth_three_way_result<pair<const _Key, _Tp>>	1686	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __synth_three_way_result<pair<const _Key, _Tp>>
1598	operator<=>(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {	1687	operator<=>(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp, _Compare, _Allocator>& __y) {
1599	return std::lexicographical_compare_three_way(__x.begin(), __x.end(), __y.begin(), __y.end(), std::__synth_three_way);	1688	return std::lexicographical_compare_three_way(__x.begin(), __x.end(), __y.begin(), __y.end(), std::__synth_three_way);
1600	}	1689	}
...	@@ -1602,7 +1691,7 @@ operator<=>(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp	...	@@ -1602,7 +1691,7 @@ operator<=>(const map<_Key, _Tp, _Compare, _Allocator>& __x, const map<_Key, _Tp
1602	# endif // #if _LIBCPP_STD_VER <= 17	1691	# endif // #if _LIBCPP_STD_VER <= 17
1603		1692
1604	template <class _Key, class _Tp, class _Compare, class _Allocator>	1693	template <class _Key, class _Tp, class _Compare, class _Allocator>
1605	inline _LIBCPP_HIDE_FROM_ABI void	1694	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
1606	swap(map<_Key, _Tp, _Compare, _Allocator>& __x, map<_Key, _Tp, _Compare, _Allocator>& __y)	1695	swap(map<_Key, _Tp, _Compare, _Allocator>& __x, map<_Key, _Tp, _Compare, _Allocator>& __y)
1607	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {	1696	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {
1608	__x.swap(__y);	1697	__x.swap(__y);
...	@@ -1610,7 +1699,7 @@ swap(map<_Key, _Tp, _Compare, _Allocator>& __x, map<_Key, _Tp, _Compare, _Alloca	...	@@ -1610,7 +1699,7 @@ swap(map<_Key, _Tp, _Compare, _Allocator>& __x, map<_Key, _Tp, _Compare, _Alloca
1610		1699
1611	# if _LIBCPP_STD_VER >= 20	1700	# if _LIBCPP_STD_VER >= 20
1612	template <class _Key, class _Tp, class _Compare, class _Allocator, class _Predicate>	1701	template <class _Key, class _Tp, class _Compare, class _Allocator, class _Predicate>
1613	inline _LIBCPP_HIDE_FROM_ABI typename map<_Key, _Tp, _Compare, _Allocator>::size_type	1702	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 typename map<_Key, _Tp, _Compare, _Allocator>::size_type
1614	erase_if(map<_Key, _Tp, _Compare, _Allocator>& __c, _Predicate __pred) {	1703	erase_if(map<_Key, _Tp, _Compare, _Allocator>& __c, _Predicate __pred) {
1615	return std::__libcpp_erase_if_container(__c, __pred);	1704	return std::__libcpp_erase_if_container(__c, __pred);
1616	}	1705	}
...	@@ -1648,10 +1737,11 @@ public:	...	@@ -1648,10 +1737,11 @@ public:
1648	protected:	1737	protected:
1649	key_compare comp;	1738	key_compare comp;
1650		1739
1651	_LIBCPP_HIDE_FROM_ABI value_compare(key_compare __c) : comp(__c) {}	1740	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 value_compare(key_compare __c) : comp(__c) {}
1652		1741
1653	public:	1742	public:
1654	_LIBCPP_HIDE_FROM_ABI bool operator()(const value_type& __x, const value_type& __y) const {	1743	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
		1744	operator()(const value_type& __x, const value_type& __y) const {
1655	return comp(__x.first, __y.first);	1745	return comp(__x.first, __y.first);
1656	}	1746	}
1657	};	1747	};
...	@@ -1684,26 +1774,28 @@ public:	...	@@ -1684,26 +1774,28 @@ public:
1684	template <class _Key2, class _Value2, class _Comp2, class _Alloc2>	1774	template <class _Key2, class _Value2, class _Comp2, class _Alloc2>
1685	friend class multimap;	1775	friend class multimap;
1686		1776
1687	_LIBCPP_HIDE_FROM_ABI multimap() _NOEXCEPT_(	1777	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multimap() _NOEXCEPT_(
1688	is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_default_constructible<key_compare>::value&&	1778	is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_default_constructible<key_compare>::value&&
1689	is_nothrow_copy_constructible<key_compare>::value)	1779	is_nothrow_copy_constructible<key_compare>::value)
1690	: __tree_(__vc(key_compare())) {}	1780	: __tree_(__vc(key_compare())) {}
1691		1781
1692	_LIBCPP_HIDE_FROM_ABI explicit multimap(const key_compare& __comp) _NOEXCEPT_(	1782	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit multimap(const key_compare& __comp) _NOEXCEPT_(
1693	is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_copy_constructible<key_compare>::value)	1783	is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_copy_constructible<key_compare>::value)
1694	: __tree_(__vc(__comp)) {}	1784	: __tree_(__vc(__comp)) {}
1695		1785
1696	_LIBCPP_HIDE_FROM_ABI explicit multimap(const key_compare& __comp, const allocator_type& __a)	1786	_LIBCPP_HIDE_FROM_ABI
		1787	_LIBCPP_CONSTEXPR_SINCE_CXX26 explicit multimap(const key_compare& __comp, const allocator_type& __a)
1697	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {}	1788	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {}
1698		1789
1699	template <class _InputIterator>	1790	template <class _InputIterator>
1700	_LIBCPP_HIDE_FROM_ABI multimap(_InputIterator __f, _InputIterator __l, const key_compare& __comp = key_compare())	1791	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
		1792	multimap(_InputIterator __f, _InputIterator __l, const key_compare& __comp = key_compare())
1701	: __tree_(__vc(__comp)) {	1793	: __tree_(__vc(__comp)) {
1702	insert(__f, __l);	1794	insert(__f, __l);
1703	}	1795	}
1704		1796
1705	template <class _InputIterator>	1797	template <class _InputIterator>
1706	_LIBCPP_HIDE_FROM_ABI	1798	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
1707	multimap(_InputIterator __f, _InputIterator __l, const key_compare& __comp, const allocator_type& __a)	1799	multimap(_InputIterator __f, _InputIterator __l, const key_compare& __comp, const allocator_type& __a)
1708	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {	1800	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {
1709	insert(__f, __l);	1801	insert(__f, __l);
...	@@ -1711,7 +1803,7 @@ public:	...	@@ -1711,7 +1803,7 @@ public:
1711		1803
1712	# if _LIBCPP_STD_VER >= 23	1804	# if _LIBCPP_STD_VER >= 23
1713	template <_ContainerCompatibleRange<value_type> _Range>	1805	template <_ContainerCompatibleRange<value_type> _Range>
1714	_LIBCPP_HIDE_FROM_ABI	1806	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
1715	multimap(from_range_t,	1807	multimap(from_range_t,
1716	_Range&& __range,	1808	_Range&& __range,
1717	const key_compare& __comp = key_compare(),	1809	const key_compare& __comp = key_compare(),
...	@@ -1721,47 +1813,48 @@ public:	...	@@ -1721,47 +1813,48 @@ public:
1721	}	1813	}
1722	# endif	1814	# endif
1723		1815
1724	# if _LIBCPP_STD_VER >= 14
1725	template <class _InputIterator>	1816	template <class _InputIterator>
1726	_LIBCPP_HIDE_FROM_ABI multimap(_InputIterator __f, _InputIterator __l, const allocator_type& __a)	1817	_LIBCPP_HIDE_FROM_ABI
		1818	_LIBCPP_CONSTEXPR_SINCE_CXX26 multimap(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
1727	: multimap(__f, __l, key_compare(), __a) {}	1819	: multimap(__f, __l, key_compare(), __a) {}
1728	# endif
1729		1820
1730	# if _LIBCPP_STD_VER >= 23	1821	# if _LIBCPP_STD_VER >= 23
1731	template <_ContainerCompatibleRange<value_type> _Range>	1822	template <_ContainerCompatibleRange<value_type> _Range>
1732	_LIBCPP_HIDE_FROM_ABI multimap(from_range_t, _Range&& __range, const allocator_type& __a)	1823	_LIBCPP_HIDE_FROM_ABI
		1824	_LIBCPP_CONSTEXPR_SINCE_CXX26 multimap(from_range_t, _Range&& __range, const allocator_type& __a)
1733	: multimap(from_range, std::forward<_Range>(__range), key_compare(), __a) {}	1825	: multimap(from_range, std::forward<_Range>(__range), key_compare(), __a) {}
1734	# endif	1826	# endif
1735		1827
1736	_LIBCPP_HIDE_FROM_ABI multimap(const multimap& __m) = default;	1828	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multimap(const multimap& __m) = default;
1737		1829
1738	_LIBCPP_HIDE_FROM_ABI multimap& operator=(const multimap& __m) = default;	1830	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multimap& operator=(const multimap& __m) = default;
1739		1831
1740	# ifndef _LIBCPP_CXX03_LANG	1832	# ifndef _LIBCPP_CXX03_LANG
1741		1833
1742	_LIBCPP_HIDE_FROM_ABI multimap(multimap&& __m) = default;	1834	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multimap(multimap&& __m) = default;
1743		1835
1744	_LIBCPP_HIDE_FROM_ABI multimap(multimap&& __m, const allocator_type& __a) : __tree_(std::move(__m.__tree_), __a) {}	1836	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multimap(multimap&& __m, const allocator_type& __a)
		1837	: __tree_(std::move(__m.__tree_), __a) {}
1745		1838
1746	_LIBCPP_HIDE_FROM_ABI multimap& operator=(multimap&& __m) = default;	1839	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multimap& operator=(multimap&& __m) = default;
1747		1840
1748	_LIBCPP_HIDE_FROM_ABI multimap(initializer_list<value_type> __il, const key_compare& __comp = key_compare())	1841	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
		1842	multimap(initializer_list<value_type> __il, const key_compare& __comp = key_compare())
1749	: __tree_(__vc(__comp)) {	1843	: __tree_(__vc(__comp)) {
1750	insert(__il.begin(), __il.end());	1844	insert(__il.begin(), __il.end());
1751	}	1845	}
1752		1846
1753	_LIBCPP_HIDE_FROM_ABI	1847	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
1754	multimap(initializer_list<value_type> __il, const key_compare& __comp, const allocator_type& __a)	1848	multimap(initializer_list<value_type> __il, const key_compare& __comp, const allocator_type& __a)
1755	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {	1849	: __tree_(__vc(__comp), typename __base::allocator_type(__a)) {
1756	insert(__il.begin(), __il.end());	1850	insert(__il.begin(), __il.end());
1757	}	1851	}
1758		1852
1759	# if _LIBCPP_STD_VER >= 14	1853	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
1760	_LIBCPP_HIDE_FROM_ABI multimap(initializer_list<value_type> __il, const allocator_type& __a)	1854	multimap(initializer_list<value_type> __il, const allocator_type& __a)
1761	: multimap(__il, key_compare(), __a) {}	1855	: multimap(__il, key_compare(), __a) {}
1762	# endif
1763		1856
1764	_LIBCPP_HIDE_FROM_ABI multimap& operator=(initializer_list<value_type> __il) {	1857	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multimap& operator=(initializer_list<value_type> __il) {
1765	clear();	1858	clear();
1766	insert(__il.begin(), __il.end());	1859	insert(__il.begin(), __il.end());
1767	return *this;	1860	return *this;
...	@@ -1769,234 +1862,309 @@ public:	...	@@ -1769,234 +1862,309 @@ public:
1769		1862
1770	# endif // _LIBCPP_CXX03_LANG	1863	# endif // _LIBCPP_CXX03_LANG
1771		1864
1772	_LIBCPP_HIDE_FROM_ABI explicit multimap(const allocator_type& __a) : __tree_(typename __base::allocator_type(__a)) {}	1865	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit multimap(const allocator_type& __a)
		1866	: __tree_(typename __base::allocator_type(__a)) {}
1773		1867
1774	_LIBCPP_HIDE_FROM_ABI multimap(const multimap& __m, const allocator_type& __a) : __tree_(__m.__tree_, __a) {}	1868	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multimap(const multimap& __m, const allocator_type& __a)
		1869	: __tree_(__m.__tree_, __a) {}
1775		1870
1776	_LIBCPP_HIDE_FROM_ABI ~multimap() {	1871	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 ~multimap() {
1777	static_assert(sizeof(std::__diagnose_non_const_comparator<_Key, _Compare>()), "");	1872	static_assert(sizeof(std::__diagnose_non_const_comparator<_Key, _Compare>()), "");
1778	}	1873	}
1779		1874
1780	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT { return __tree_.begin(); }	1875	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator begin() _NOEXCEPT {
1781	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT { return __tree_.begin(); }	1876	return __tree_.begin();
1782	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator end() _NOEXCEPT { return __tree_.end(); }	1877	}
1783	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT { return __tree_.end(); }	1878	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator begin() const _NOEXCEPT {
		1879	return __tree_.begin();
		1880	}
		1881	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator end() _NOEXCEPT {
		1882	return __tree_.end();
		1883	}
		1884	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator end() const _NOEXCEPT {
		1885	return __tree_.end();
		1886	}
1784		1887
1785	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI reverse_iterator rbegin() _NOEXCEPT { return reverse_iterator(end()); }	1888	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reverse_iterator rbegin() _NOEXCEPT {
1786	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator rbegin() const _NOEXCEPT {	1889	return reverse_iterator(end());
		1890	}
		1891	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator
		1892	rbegin() const _NOEXCEPT {
1787	return const_reverse_iterator(end());	1893	return const_reverse_iterator(end());
1788	}	1894	}
1789	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI reverse_iterator rend() _NOEXCEPT { return reverse_iterator(begin()); }	1895	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reverse_iterator rend() _NOEXCEPT {
1790	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator rend() const _NOEXCEPT {	1896	return reverse_iterator(begin());
		1897	}
		1898	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator rend() const _NOEXCEPT {
1791	return const_reverse_iterator(begin());	1899	return const_reverse_iterator(begin());
1792	}	1900	}
1793		1901
1794	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator cbegin() const _NOEXCEPT { return begin(); }	1902	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator cbegin() const _NOEXCEPT {
1795	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator cend() const _NOEXCEPT { return end(); }	1903	return begin();
1796	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator crbegin() const _NOEXCEPT { return rbegin(); }	1904	}
1797	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator crend() const _NOEXCEPT { return rend(); }	1905	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator cend() const _NOEXCEPT {
		1906	return end();
		1907	}
		1908	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator
		1909	crbegin() const _NOEXCEPT {
		1910	return rbegin();
		1911	}
		1912	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator crend() const _NOEXCEPT {
		1913	return rend();
		1914	}
1798		1915
1799	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool empty() const _NOEXCEPT { return __tree_.size() == 0; }	1916	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool empty() const _NOEXCEPT {
1800	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type size() const _NOEXCEPT { return __tree_.size(); }	1917	return __tree_.size() == 0;
1801	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type max_size() const _NOEXCEPT { return __tree_.max_size(); }	1918	}
		1919	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type size() const _NOEXCEPT {
		1920	return __tree_.size();
		1921	}
		1922	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type max_size() const _NOEXCEPT {
		1923	return __tree_.max_size();
		1924	}
1802		1925
1803	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const _NOEXCEPT {	1926	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 allocator_type get_allocator() const _NOEXCEPT {
1804	return allocator_type(__tree_.__alloc());	1927	return allocator_type(__tree_.__alloc());
1805	}	1928	}
1806	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI key_compare key_comp() const { return __tree_.value_comp().key_comp(); }	1929	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 key_compare key_comp() const {
1807	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI value_compare value_comp() const {	1930	return __tree_.value_comp().key_comp();
		1931	}
		1932	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 value_compare value_comp() const {
1808	return value_compare(__tree_.value_comp().key_comp());	1933	return value_compare(__tree_.value_comp().key_comp());
1809	}	1934	}
1810		1935
1811	# ifndef _LIBCPP_CXX03_LANG	1936	# ifndef _LIBCPP_CXX03_LANG
1812		1937
1813	template <class... _Args>	1938	template <class... _Args>
1814	_LIBCPP_HIDE_FROM_ABI iterator emplace(_Args&&... __args) {	1939	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator emplace(_Args&&... __args) {
1815	return __tree_.__emplace_multi(std::forward<_Args>(__args)...);	1940	return __tree_.__emplace_multi(std::forward<_Args>(__args)...);
1816	}	1941	}
1817		1942
1818	template <class... _Args>	1943	template <class... _Args>
1819	_LIBCPP_HIDE_FROM_ABI iterator emplace_hint(const_iterator __p, _Args&&... __args) {	1944	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator emplace_hint(const_iterator __p, _Args&&... __args) {
1820	return __tree_.__emplace_hint_multi(__p.__i_, std::forward<_Args>(__args)...);	1945	return __tree_.__emplace_hint_multi(__p.__i_, std::forward<_Args>(__args)...);
1821	}	1946	}
1822		1947
1823	template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>	1948	template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>
1824	_LIBCPP_HIDE_FROM_ABI iterator insert(_Pp&& __p) {	1949	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(_Pp&& __p) {
1825	return __tree_.__emplace_multi(std::forward<_Pp>(__p));	1950	return __tree_.__emplace_multi(std::forward<_Pp>(__p));
1826	}	1951	}
1827		1952
1828	template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>	1953	template <class _Pp, __enable_if_t<is_constructible<value_type, _Pp>::value, int> = 0>
1829	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __pos, _Pp&& __p) {	1954	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __pos, _Pp&& __p) {
1830	return __tree_.__emplace_hint_multi(__pos.__i_, std::forward<_Pp>(__p));	1955	return __tree_.__emplace_hint_multi(__pos.__i_, std::forward<_Pp>(__p));
1831	}	1956	}
1832		1957
1833	_LIBCPP_HIDE_FROM_ABI iterator insert(value_type&& __v) { return __tree_.__emplace_multi(std::move(__v)); }	1958	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(value_type&& __v) {
		1959	return __tree_.__emplace_multi(std::move(__v));
		1960	}
1834		1961
1835	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, value_type&& __v) {	1962	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __p, value_type&& __v) {
1836	return __tree_.__emplace_hint_multi(__p.__i_, std::move(__v));	1963	return __tree_.__emplace_hint_multi(__p.__i_, std::move(__v));
1837	}	1964	}
1838		1965
1839	_LIBCPP_HIDE_FROM_ABI void insert(initializer_list<value_type> __il) { insert(__il.begin(), __il.end()); }	1966	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert(initializer_list<value_type> __il) {
		1967	insert(__il.begin(), __il.end());
		1968	}
1840		1969
1841	# endif // _LIBCPP_CXX03_LANG	1970	# endif // _LIBCPP_CXX03_LANG
1842		1971
1843	_LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __v) { return __tree_.__emplace_multi(__v); }	1972	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const value_type& __v) {
		1973	return __tree_.__emplace_multi(__v);
		1974	}
1844		1975
1845	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, const value_type& __v) {	1976	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __p, const value_type& __v) {
1846	return __tree_.__emplace_hint_multi(__p.__i_, __v);	1977	return __tree_.__emplace_hint_multi(__p.__i_, __v);
1847	}	1978	}
1848		1979
1849	template <class _InputIterator>	1980	template <class _InputIterator>
1850	_LIBCPP_HIDE_FROM_ABI void insert(_InputIterator __f, _InputIterator __l) {	1981	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert(_InputIterator __f, _InputIterator __l) {
1851	__tree_.__insert_range_multi(__f, __l);	1982	__tree_.__insert_range_multi(__f, __l);
1852	}	1983	}
1853		1984
1854	# if _LIBCPP_STD_VER >= 23	1985	# if _LIBCPP_STD_VER >= 23
1855	template <_ContainerCompatibleRange<value_type> _Range>	1986	template <_ContainerCompatibleRange<value_type> _Range>
1856	_LIBCPP_HIDE_FROM_ABI void insert_range(_Range&& __range) {	1987	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert_range(_Range&& __range) {
1857	__tree_.__insert_range_multi(ranges::begin(__range), ranges::end(__range));	1988	__tree_.__insert_range_multi(ranges::begin(__range), ranges::end(__range));
1858	}	1989	}
1859	# endif	1990	# endif
1860		1991
1861	_LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __p) { return __tree_.erase(__p.__i_); }	1992	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __p) {
1862	_LIBCPP_HIDE_FROM_ABI iterator erase(iterator __p) { return __tree_.erase(__p.__i_); }	1993	return __tree_.erase(__p.__i_);
1863	_LIBCPP_HIDE_FROM_ABI size_type erase(const key_type& __k) { return __tree_.__erase_multi(__k); }	1994	}
1864	_LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __f, const_iterator __l) {	1995	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(iterator __p) { return __tree_.erase(__p.__i_); }
		1996	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type erase(const key_type& __k) {
		1997	return __tree_.__erase_multi(__k);
		1998	}
		1999	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __f, const_iterator __l) {
1865	return __tree_.erase(__f.__i_, __l.__i_);	2000	return __tree_.erase(__f.__i_, __l.__i_);
1866	}	2001	}
1867		2002
1868	# if _LIBCPP_STD_VER >= 17	2003	# if _LIBCPP_STD_VER >= 17
1869	_LIBCPP_HIDE_FROM_ABI iterator insert(node_type&& __nh) {	2004	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(node_type&& __nh) {
1870	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() \|\| __nh.get_allocator() == get_allocator(),	2005	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() \|\| __nh.get_allocator() == get_allocator(),
1871	"node_type with incompatible allocator passed to multimap::insert()");	2006	"node_type with incompatible allocator passed to multimap::insert()");
1872	return __tree_.template __node_handle_insert_multi<node_type>(std::move(__nh));	2007	return __tree_.template __node_handle_insert_multi<node_type>(std::move(__nh));
1873	}	2008	}
1874	_LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __hint, node_type&& __nh) {	2009	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __hint, node_type&& __nh) {
1875	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() \|\| __nh.get_allocator() == get_allocator(),	2010	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() \|\| __nh.get_allocator() == get_allocator(),
1876	"node_type with incompatible allocator passed to multimap::insert()");	2011	"node_type with incompatible allocator passed to multimap::insert()");
1877	return __tree_.template __node_handle_insert_multi<node_type>(__hint.__i_, std::move(__nh));	2012	return __tree_.template __node_handle_insert_multi<node_type>(__hint.__i_, std::move(__nh));
1878	}	2013	}
1879	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI node_type extract(key_type const& __key) {	2014	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 node_type extract(key_type const& __key) {
1880	return __tree_.template __node_handle_extract<node_type>(__key);	2015	return __tree_.template __node_handle_extract<node_type>(__key);
1881	}	2016	}
1882	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI node_type extract(const_iterator __it) {	2017	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 node_type extract(const_iterator __it) {
1883	return __tree_.template __node_handle_extract<node_type>(__it.__i_);	2018	return __tree_.template __node_handle_extract<node_type>(__it.__i_);
1884	}	2019	}
1885	template <class _Compare2>	2020	template <class _Compare2>
1886	_LIBCPP_HIDE_FROM_ABI void merge(multimap<key_type, mapped_type, _Compare2, allocator_type>& __source) {	2021	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
		2022	merge(multimap<key_type, mapped_type, _Compare2, allocator_type>& __source) {
1887	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(	2023	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
1888	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");	2024	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
1889	return __tree_.__node_handle_merge_multi(__source.__tree_);	2025	return __tree_.__node_handle_merge_multi(__source.__tree_);
1890	}	2026	}
1891	template <class _Compare2>	2027	template <class _Compare2>
1892	_LIBCPP_HIDE_FROM_ABI void merge(multimap<key_type, mapped_type, _Compare2, allocator_type>&& __source) {	2028	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
		2029	merge(multimap<key_type, mapped_type, _Compare2, allocator_type>&& __source) {
1893	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(	2030	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
1894	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");	2031	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
1895	return __tree_.__node_handle_merge_multi(__source.__tree_);	2032	return __tree_.__node_handle_merge_multi(__source.__tree_);
1896	}	2033	}
1897	template <class _Compare2>	2034	template <class _Compare2>
1898	_LIBCPP_HIDE_FROM_ABI void merge(map<key_type, mapped_type, _Compare2, allocator_type>& __source) {	2035	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
		2036	merge(map<key_type, mapped_type, _Compare2, allocator_type>& __source) {
1899	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(	2037	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
1900	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");	2038	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
1901	return __tree_.__node_handle_merge_multi(__source.__tree_);	2039	return __tree_.__node_handle_merge_multi(__source.__tree_);
1902	}	2040	}
1903	template <class _Compare2>	2041	template <class _Compare2>
1904	_LIBCPP_HIDE_FROM_ABI void merge(map<key_type, mapped_type, _Compare2, allocator_type>&& __source) {	2042	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
		2043	merge(map<key_type, mapped_type, _Compare2, allocator_type>&& __source) {
1905	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(	2044	_LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
1906	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");	2045	__source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
1907	return __tree_.__node_handle_merge_multi(__source.__tree_);	2046	return __tree_.__node_handle_merge_multi(__source.__tree_);
1908	}	2047	}
1909	# endif	2048	# endif
1910		2049
1911	_LIBCPP_HIDE_FROM_ABI void clear() _NOEXCEPT { __tree_.clear(); }	2050	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void clear() _NOEXCEPT { __tree_.clear(); }
1912		2051
1913	_LIBCPP_HIDE_FROM_ABI void swap(multimap& __m) _NOEXCEPT_(__is_nothrow_swappable_v<__base>) {	2052	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void swap(multimap& __m)
		2053	_NOEXCEPT_(__is_nothrow_swappable_v<__base>) {
1914	__tree_.swap(__m.__tree_);	2054	__tree_.swap(__m.__tree_);
1915	}	2055	}
1916		2056
1917	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const key_type& __k) { return __tree_.find(__k); }	2057	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator find(const key_type& __k) {
1918	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const key_type& __k) const { return __tree_.find(__k); }	2058	return __tree_.find(__k);
		2059	}
		2060	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator find(const key_type& __k) const {
		2061	return __tree_.find(__k);
		2062	}
1919	# if _LIBCPP_STD_VER >= 14	2063	# if _LIBCPP_STD_VER >= 14
1920	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2064	template <typename _K2,
1921	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const _K2& __k) {	2065	class _Comp = _Compare,
		2066	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
		2067	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator find(const _K2& __k) {
1922	return __tree_.find(__k);	2068	return __tree_.find(__k);
1923	}	2069	}
1924	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2070	template <typename _K2,
1925	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const _K2& __k) const {	2071	class _Comp = _Compare,
		2072	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
		2073	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator find(const _K2& __k) const {
1926	return __tree_.find(__k);	2074	return __tree_.find(__k);
1927	}	2075	}
1928	# endif	2076	# endif
1929		2077
1930	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const key_type& __k) const {	2078	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type count(const key_type& __k) const {
1931	return __tree_.__count_multi(__k);	2079	return __tree_.__count_multi(__k);
1932	}	2080	}
1933	# if _LIBCPP_STD_VER >= 14	2081	# if _LIBCPP_STD_VER >= 14
1934	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2082	template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
1935	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const _K2& __k) const {	2083	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type count(const _K2& __k) const {
1936	return __tree_.__count_multi(__k);	2084	return __tree_.__count_multi(__k);
1937	}	2085	}
1938	# endif	2086	# endif
1939		2087
1940	# if _LIBCPP_STD_VER >= 20	2088	# if _LIBCPP_STD_VER >= 20
1941	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const key_type& __k) const { return find(__k) != end(); }	2089	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool contains(const key_type& __k) const {
1942	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2090	return find(__k) != end();
1943	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const _K2& __k) const {	2091	}
		2092	template <typename _K2,
		2093	class _Comp = _Compare,
		2094	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
		2095	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool contains(const _K2& __k) const {
1944	return find(__k) != end();	2096	return find(__k) != end();
1945	}	2097	}
1946	# endif // _LIBCPP_STD_VER >= 20	2098	# endif // _LIBCPP_STD_VER >= 20
1947		2099
1948	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator lower_bound(const key_type& __k) {	2100	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator lower_bound(const key_type& __k) {
1949	return __tree_.__lower_bound_multi(__k);	2101	return __tree_.__lower_bound_multi(__k);
1950	}	2102	}
1951		2103
1952	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator lower_bound(const key_type& __k) const {	2104	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
		2105	lower_bound(const key_type& __k) const {
1953	return __tree_.__lower_bound_multi(__k);	2106	return __tree_.__lower_bound_multi(__k);
1954	}	2107	}
1955		2108
1956	# if _LIBCPP_STD_VER >= 14	2109	# if _LIBCPP_STD_VER >= 14
1957	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2110	template <typename _K2,
1958	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator lower_bound(const _K2& __k) {	2111	class _Comp = _Compare,
		2112	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
		2113	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator lower_bound(const _K2& __k) {
1959	return __tree_.__lower_bound_multi(__k);	2114	return __tree_.__lower_bound_multi(__k);
1960	}	2115	}
1961		2116
1962	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2117	template <typename _K2,
1963	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator lower_bound(const _K2& __k) const {	2118	class _Comp = _Compare,
		2119	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
		2120	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
		2121	lower_bound(const _K2& __k) const {
1964	return __tree_.__lower_bound_multi(__k);	2122	return __tree_.__lower_bound_multi(__k);
1965	}	2123	}
1966	# endif	2124	# endif
1967		2125
1968	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator upper_bound(const key_type& __k) {	2126	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator upper_bound(const key_type& __k) {
1969	return __tree_.__upper_bound_multi(__k);	2127	return __tree_.__upper_bound_multi(__k);
1970	}	2128	}
1971		2129
1972	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator upper_bound(const key_type& __k) const {	2130	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
		2131	upper_bound(const key_type& __k) const {
1973	return __tree_.__upper_bound_multi(__k);	2132	return __tree_.__upper_bound_multi(__k);
1974	}	2133	}
1975		2134
1976	# if _LIBCPP_STD_VER >= 14	2135	# if _LIBCPP_STD_VER >= 14
1977	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2136	template <typename _K2,
1978	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator upper_bound(const _K2& __k) {	2137	class _Comp = _Compare,
		2138	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
		2139	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator upper_bound(const _K2& __k) {
1979	return __tree_.__upper_bound_multi(__k);	2140	return __tree_.__upper_bound_multi(__k);
1980	}	2141	}
1981	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2142	template <typename _K2,
1982	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator upper_bound(const _K2& __k) const {	2143	class _Comp = _Compare,
		2144	enable_if_t<__is_transparent_v<_Comp> \|\| __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
		2145	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
		2146	upper_bound(const _K2& __k) const {
1983	return __tree_.__upper_bound_multi(__k);	2147	return __tree_.__upper_bound_multi(__k);
1984	}	2148	}
1985	# endif	2149	# endif
1986		2150
1987	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const key_type& __k) {	2151	[[__nodiscard__]]
		2152	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> equal_range(const key_type& __k) {
1988	return __tree_.__equal_range_multi(__k);	2153	return __tree_.__equal_range_multi(__k);
1989	}	2154	}
1990	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const key_type& __k) const {	2155	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
		2156	equal_range(const key_type& __k) const {
1991	return __tree_.__equal_range_multi(__k);	2157	return __tree_.__equal_range_multi(__k);
1992	}	2158	}
1993	# if _LIBCPP_STD_VER >= 14	2159	# if _LIBCPP_STD_VER >= 14
1994	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2160	template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
1995	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const _K2& __k) {	2161	[[__nodiscard__]]
		2162	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> equal_range(const _K2& __k) {
1996	return __tree_.__equal_range_multi(__k);	2163	return __tree_.__equal_range_multi(__k);
1997	}	2164	}
1998	template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>	2165	template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
1999	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const _K2& __k) const {	2166	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
		2167	equal_range(const _K2& __k) const {
2000	return __tree_.__equal_range_multi(__k);	2168	return __tree_.__equal_range_multi(__k);
2001	}	2169	}
2002	# endif	2170	# endif
...	@@ -2070,8 +2238,8 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<multimap<_	...	@@ -2070,8 +2238,8 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<multimap<_
2070	static const bool __has_algorithm = true;	2238	static const bool __has_algorithm = true;
2071		2239
2072	template <class _Map, class _Func, class _Proj>	2240	template <class _Map, class _Func, class _Proj>
2073	_LIBCPP_HIDE_FROM_ABI static auto operator()(_Map&& __map, _Func __func, _Proj __proj) {	2241	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static auto operator()(_Map&& __map, _Func __func, _Proj __proj) {
2074	auto [_, __func2] = __specialized_algorithm<_Algorithm::__for_each, __single_range<typename __map::__base>>()(	2242	auto [__dummy, __func2] = __specialized_algorithm<_Algorithm::__for_each, __single_range<typename __map::__base>>()(
2075	__map.__tree_, std::move(__func), std::move(__proj));	2243	__map.__tree_, std::move(__func), std::move(__proj));
2076	return std::make_pair(__map.end(), std::move(__func2));	2244	return std::make_pair(__map.end(), std::move(__func2));
2077	}	2245	}
...	@@ -2079,7 +2247,7 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<multimap<_	...	@@ -2079,7 +2247,7 @@ struct __specialized_algorithm<_Algorithm::__for_each, __single_range<multimap<_
2079	# endif	2247	# endif
2080		2248
2081	template <class _Key, class _Tp, class _Compare, class _Allocator>	2249	template <class _Key, class _Tp, class _Compare, class _Allocator>
2082	inline _LIBCPP_HIDE_FROM_ABI bool	2250	inline _LIBCPP_HIDE_FROM_ABI bool _LIBCPP_CONSTEXPR_SINCE_CXX26
2083	operator==(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {	2251	operator==(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {
2084	return __x.size() == __y.size() && std::equal(__x.begin(), __x.end(), __y.begin());	2252	return __x.size() == __y.size() && std::equal(__x.begin(), __x.end(), __y.begin());
2085	}	2253	}
...	@@ -2087,31 +2255,31 @@ operator==(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<	...	@@ -2087,31 +2255,31 @@ operator==(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<
2087	# if _LIBCPP_STD_VER <= 17	2255	# if _LIBCPP_STD_VER <= 17
2088		2256
2089	template <class _Key, class _Tp, class _Compare, class _Allocator>	2257	template <class _Key, class _Tp, class _Compare, class _Allocator>
2090	inline _LIBCPP_HIDE_FROM_ABI bool	2258	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
2091	operator<(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {	2259	operator<(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {
2092	return std::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());	2260	return std::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
2093	}	2261	}
2094		2262
2095	template <class _Key, class _Tp, class _Compare, class _Allocator>	2263	template <class _Key, class _Tp, class _Compare, class _Allocator>
2096	inline _LIBCPP_HIDE_FROM_ABI bool	2264	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
2097	operator!=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {	2265	operator!=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {
2098	return !(__x == __y);	2266	return !(__x == __y);
2099	}	2267	}
2100		2268
2101	template <class _Key, class _Tp, class _Compare, class _Allocator>	2269	template <class _Key, class _Tp, class _Compare, class _Allocator>
2102	inline _LIBCPP_HIDE_FROM_ABI bool	2270	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
2103	operator>(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {	2271	operator>(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {
2104	return __y < __x;	2272	return __y < __x;
2105	}	2273	}
2106		2274
2107	template <class _Key, class _Tp, class _Compare, class _Allocator>	2275	template <class _Key, class _Tp, class _Compare, class _Allocator>
2108	inline _LIBCPP_HIDE_FROM_ABI bool	2276	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
2109	operator>=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {	2277	operator>=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {
2110	return !(__x < __y);	2278	return !(__x < __y);
2111	}	2279	}
2112		2280
2113	template <class _Key, class _Tp, class _Compare, class _Allocator>	2281	template <class _Key, class _Tp, class _Compare, class _Allocator>
2114	inline _LIBCPP_HIDE_FROM_ABI bool	2282	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
2115	operator<=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {	2283	operator<=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {
2116	return !(__y < __x);	2284	return !(__y < __x);
2117	}	2285	}
...	@@ -2119,7 +2287,7 @@ operator<=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<	...	@@ -2119,7 +2287,7 @@ operator<=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x, const multimap<
2119	# else // #if _LIBCPP_STD_VER <= 17	2287	# else // #if _LIBCPP_STD_VER <= 17
2120		2288
2121	template <class _Key, class _Tp, class _Compare, class _Allocator>	2289	template <class _Key, class _Tp, class _Compare, class _Allocator>
2122	_LIBCPP_HIDE_FROM_ABI __synth_three_way_result<pair<const _Key, _Tp>>	2290	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __synth_three_way_result<pair<const _Key, _Tp>>
2123	operator<=>(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,	2291	operator<=>(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
2124	const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {	2292	const multimap<_Key, _Tp, _Compare, _Allocator>& __y) {
2125	return std::lexicographical_compare_three_way(__x.begin(), __x.end(), __y.begin(), __y.end(), __synth_three_way);	2293	return std::lexicographical_compare_three_way(__x.begin(), __x.end(), __y.begin(), __y.end(), __synth_three_way);
...	@@ -2128,7 +2296,7 @@ operator<=>(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,	...	@@ -2128,7 +2296,7 @@ operator<=>(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
2128	# endif // #if _LIBCPP_STD_VER <= 17	2296	# endif // #if _LIBCPP_STD_VER <= 17
2129		2297
2130	template <class _Key, class _Tp, class _Compare, class _Allocator>	2298	template <class _Key, class _Tp, class _Compare, class _Allocator>
2131	inline _LIBCPP_HIDE_FROM_ABI void	2299	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
2132	swap(multimap<_Key, _Tp, _Compare, _Allocator>& __x, multimap<_Key, _Tp, _Compare, _Allocator>& __y)	2300	swap(multimap<_Key, _Tp, _Compare, _Allocator>& __x, multimap<_Key, _Tp, _Compare, _Allocator>& __y)
2133	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {	2301	_NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {
2134	__x.swap(__y);	2302	__x.swap(__y);
...	@@ -2136,7 +2304,7 @@ swap(multimap<_Key, _Tp, _Compare, _Allocator>& __x, multimap<_Key, _Tp, _Compar	...	@@ -2136,7 +2304,7 @@ swap(multimap<_Key, _Tp, _Compare, _Allocator>& __x, multimap<_Key, _Tp, _Compar
2136		2304
2137	# if _LIBCPP_STD_VER >= 20	2305	# if _LIBCPP_STD_VER >= 20
2138	template <class _Key, class _Tp, class _Compare, class _Allocator, class _Predicate>	2306	template <class _Key, class _Tp, class _Compare, class _Allocator, class _Predicate>
2139	inline _LIBCPP_HIDE_FROM_ABI typename multimap<_Key, _Tp, _Compare, _Allocator>::size_type	2307	inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 typename multimap<_Key, _Tp, _Compare, _Allocator>::size_type
2140	erase_if(multimap<_Key, _Tp, _Compare, _Allocator>& __c, _Predicate __pred) {	2308	erase_if(multimap<_Key, _Tp, _Compare, _Allocator>& __c, _Predicate __pred) {
2141	return std::__libcpp_erase_if_container(__c, __pred);	2309	return std::__libcpp_erase_if_container(__c, __pred);
2142	}	2310	}
...	@@ -2170,7 +2338,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -2170,7 +2338,7 @@ _LIBCPP_END_NAMESPACE_STD
2170		2338
2171	_LIBCPP_POP_MACROS	2339	_LIBCPP_POP_MACROS
2172		2340
2173	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	2341	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
2174	# include <concepts>	2342	# include <concepts>
2175	# include <cstdlib>	2343	# include <cstdlib>
2176	# include <functional>	2344	# include <functional>

lib/libcxx/include/mdspan+46-46

 @@ -46,15 +46,15 @@ namespace std {
 // extents synopsis
 namespace std {
-  template<class _IndexType, size_t... _Extents>
+  template<class IndexType, size_t... Extents>
   class extents {
   public:
-    using index_type = _IndexType;
+    using index_type = IndexType;
     using size_type = make_unsigned_t<index_type>;
     using rank_type = size_t;
     // [mdspan.extents.obs], observers of the multidimensional index space
-    static constexpr rank_type rank() noexcept { return sizeof...(_Extents); }
+    static constexpr rank_type rank() noexcept { return sizeof...(Extents); }
     static constexpr rank_type rank_dynamic() noexcept { return dynamic-index(rank()); }
     static constexpr size_t static_extent(rank_type) noexcept;
     constexpr index_type extent(rank_type) const noexcept;
 @@ -62,20 +62,20 @@ namespace std {
     // [mdspan.extents.cons], constructors
     constexpr extents() noexcept = default;
-    template<class _OtherIndexType, size_t... _OtherExtents>
+    template<class OtherIndexType, size_t... OtherExtents>
       constexpr explicit(see below)
-        extents(const extents<_OtherIndexType, _OtherExtents...>&) noexcept;
+        extents(const extents<OtherIndexType, OtherExtents...>&) noexcept;
-    template<class... _OtherIndexTypes>
+    template<class... OtherIndexTypes>
-      constexpr explicit extents(_OtherIndexTypes...) noexcept;
+      constexpr explicit extents(OtherIndexTypes...) noexcept;
-    template<class _OtherIndexType, size_t N>
+    template<class OtherIndexType, size_t N>
       constexpr explicit(N != rank_dynamic())
-        extents(span<_OtherIndexType, N>) noexcept;
+        extents(span<OtherIndexType, N>) noexcept;
-    template<class _OtherIndexType, size_t N>
+    template<class OtherIndexType, size_t N>
       constexpr explicit(N != rank_dynamic())
-        extents(const array<_OtherIndexType, N>&) noexcept;
+        extents(const array<OtherIndexType, N>&) noexcept;
     // [mdspan.extents.cmp], comparison operators
-    template<class _OtherIndexType, size_t... _OtherExtents>
+    template<class OtherIndexType, size_t... OtherExtents>
       friend constexpr bool operator==(const extents&,
                                        const extents<_OtherIndexType, _OtherExtents...>&) noexcept;
 @@ -97,12 +97,12 @@ namespace std {
   class layout_left::mapping {
   public:
     using extents_type = Extents;
-    using index_type = typename extents_type::index_type;
+    using index_type = extents_type::index_type;
-    using size_type = typename extents_type::size_type;
+    using size_type = extents_type::size_type;
-    using rank_type = typename extents_type::rank_type;
+    using rank_type = extents_type::rank_type;
     using layout_type = layout_left;
-    // [mdspan.layout.right.cons], constructors
+    // [mdspan.layout.left.cons], constructors
     constexpr mapping() noexcept = default;
     constexpr mapping(const mapping&) noexcept = default;
     constexpr mapping(const extents_type&) noexcept;
 @@ -118,7 +118,7 @@ namespace std {
     constexpr mapping& operator=(const mapping&) noexcept = default;
-    // [mdspan.layout.right.obs], observers
+    // [mdspan.layout.left.obs], observers
     constexpr const extents_type& extents() const noexcept { return extents_; }
     constexpr index_type required_span_size() const noexcept;
 @@ -151,9 +151,9 @@ namespace std {
   class layout_right::mapping {
   public:
     using extents_type = Extents;
-    using index_type = typename extents_type::index_type;
+    using index_type = extents_type::index_type;
-    using size_type = typename extents_type::size_type;
+    using size_type = extents_type::size_type;
-    using rank_type = typename extents_type::rank_type;
+    using rank_type = extents_type::rank_type;
     using layout_type = layout_right;
     // [mdspan.layout.right.cons], constructors
 @@ -205,9 +205,9 @@ namespace std {
   class layout_stride::mapping {
   public:
     using extents_type = Extents;
-    using index_type = typename extents_type::index_type;
+    using index_type = extents_type::index_type;
-    using size_type = typename extents_type::size_type;
+    using size_type = extents_type::size_type;
-    using rank_type = typename extents_type::rank_type;
+    using rank_type = extents_type::rank_type;
     using layout_type = layout_stride;
   private:
 @@ -237,7 +237,7 @@ namespace std {
       constexpr index_type operator()(Indices...) const noexcept;
     static constexpr bool is_always_unique() noexcept { return true; }
-    static constexpr bool is_always_exhaustive() noexcept { return false; }
+    static constexpr bool is_always_exhaustive() noexcept;
     static constexpr bool is_always_strided() noexcept { return true; }
     static constexpr bool is_unique() noexcept { return true; }
 @@ -286,22 +286,19 @@ namespace std {
     static constexpr size_t byte_alignment = ByteAlignment;
     constexpr aligned_accessor() noexcept = default;
     template<class OtherElementType, size_t OtherByteAlignment>
       constexpr aligned_accessor(
         aligned_accessor<OtherElementType, OtherByteAlignment>) noexcept;
     template<class OtherElementType>
-      explicit constexpr aligned_accessor(
+      constexpr explicit aligned_accessor(default_accessor<OtherElementType>) noexcept;
-        default_accessor<OtherElementType>) noexcept;
     template<class OtherElementType>
-    constexpr operator default_accessor<OtherElementType>() const noexcept;
+      constexpr operator default_accessor<OtherElementType>() const noexcept;
     constexpr reference access(data_handle_type p, size_t i) const noexcept;
-    constexpr typename offset_policy::data_handle_type
+    constexpr typename offset_policy::data_handle_type offset(
-      offset(data_handle_type p, size_t i) const noexcept;
+      data_handle_type p, size_t i) const noexcept;
   };
 }
 @@ -315,14 +312,14 @@ namespace std {
     using extents_type = Extents;
     using layout_type = LayoutPolicy;
     using accessor_type = AccessorPolicy;
-    using mapping_type = typename layout_type::template mapping<extents_type>;
+    using mapping_type = layout_type::template mapping<extents_type>;
     using element_type = ElementType;
     using value_type = remove_cv_t<element_type>;
-    using index_type = typename extents_type::index_type;
+    using index_type = extents_type::index_type;
-    using size_type = typename extents_type::size_type;
+    using size_type = extents_type::size_type;
-    using rank_type = typename extents_type::rank_type;
+    using rank_type = extents_type::rank_type;
-    using data_handle_type = typename accessor_type::data_handle_type;
+    using data_handle_type = accessor_type::data_handle_type;
-    using reference = typename accessor_type::reference;
+    using reference = accessor_type::reference;
     static constexpr rank_type rank() noexcept { return extents_type::rank(); }
     static constexpr rank_type rank_dynamic() noexcept { return extents_type::rank_dynamic(); }
 @@ -364,8 +361,15 @@ namespace std {
     template<class OtherIndexType>
       constexpr reference operator[](const array<OtherIndexType, rank()>& indices) const;
+    template<class... OtherIndexTypes>
+      constexpr reference at(OtherIndexTypes... indices) const;
+    template<class OtherIndexType>
+      constexpr reference at(span<OtherIndexType, rank()> indices) const;
+    template<class OtherIndexType>
+      constexpr reference at(const array<OtherIndexType, rank()>& indices) const;
     constexpr size_type size() const noexcept;
-    [[nodiscard]] constexpr bool empty() const noexcept;
+    constexpr bool empty() const noexcept;
     friend constexpr void swap(mdspan& x, mdspan& y) noexcept;
 @@ -398,23 +402,19 @@ namespace std {
   };
   template<class CArray>
-    requires(is_array_v<CArray> && rank_v<CArray> == 1)
+    requires (is_array_v<CArray> && rank_v<CArray> == 1)
     mdspan(CArray&)
       -> mdspan<remove_all_extents_t<CArray>, extents<size_t, extent_v<CArray, 0>>>;
   template<class Pointer>
-    requires(is_pointer_v<remove_reference_t<Pointer>>)
+    requires (is_pointer_v<remove_reference_t<Pointer>>)
     mdspan(Pointer&&)
       -> mdspan<remove_pointer_t<remove_reference_t<Pointer>>, extents<size_t>>;
   template<class ElementType, class... Integrals>
     requires((is_convertible_v<Integrals, size_t> && ...) && sizeof...(Integrals) > 0)
     explicit mdspan(ElementType*, Integrals...)
-      -> mdspan<ElementType, dextents<size_t, sizeof...(Integrals)>>;            // until C++26
+      -> mdspan<ElementType, extents<size_t, maybe-static-ext<Integrals>...>>;
-  template<class ElementType, class... Integrals>
-    requires((is_convertible_v<Integrals, size_t> && ...) && sizeof...(Integrals) > 0)
-    explicit mdspan(ElementType*, Integrals...)
-      -> mdspan<ElementType, extents<size_t, maybe-static-ext<Integrals>...>>;  // since C++26
   template<class ElementType, class OtherIndexType, size_t N>
     mdspan(ElementType*, span<OtherIndexType, N>)
 @@ -434,7 +434,7 @@ namespace std {
                 typename MappingType::layout_type>;
   template<class MappingType, class AccessorType>
-    mdspan(const typename AccessorType::data_handle_type&, const MappingType&,
+    mdspan(typename AccessorType::data_handle_type, const MappingType&,
            const AccessorType&)
       -> mdspan<typename AccessorType::element_type, typename MappingType::extents_type,
                 typename MappingType::layout_type, AccessorType>;

lib/libcxx/include/memory+1-1

...	@@ -987,7 +987,7 @@ template<class Pointer = void, class Smart, class... Args>	...	@@ -987,7 +987,7 @@ template<class Pointer = void, class Smart, class... Args>
987	# pragma GCC system_header	987	# pragma GCC system_header
988	# endif	988	# endif
989		989
990	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	990	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
991	# include <atomic>	991	# include <atomic>
992	# include <concepts>	992	# include <concepts>
993	# include <cstddef>	993	# include <cstddef>

lib/libcxx/include/memory_resource+2-2

...	@@ -69,11 +69,11 @@ namespace std::pmr {	...	@@ -69,11 +69,11 @@ namespace std::pmr {
69	# pragma GCC system_header	69	# pragma GCC system_header
70	# endif	70	# endif
71		71
72	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER >= 17 && _LIBCPP_STD_VER <= 20	72	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER >= 17 && _LIBCPP_STD_VER <= 20
73	# include <mutex>	73	# include <mutex>
74	# endif	74	# endif
75		75
76	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	76	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
77	# include <stdexcept>	77	# include <stdexcept>
78	# endif	78	# endif
79	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	79	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/mutex+20-11

 @@ -214,10 +214,11 @@ template<class Callable, class ...Args>
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_HAS_THREADS
+_LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 class _LIBCPP_EXPORTED_FROM_ABI recursive_mutex {
   __libcpp_recursive_mutex_t __m_;
 @@ -457,7 +458,7 @@ public:
     __m_.lock();
   }
-  _LIBCPP_RELEASE_CAPABILITY _LIBCPP_HIDE_FROM_ABI ~scoped_lock() { __m_.unlock(); }
+  _LIBCPP_RELEASE_CAPABILITY() _LIBCPP_HIDE_FROM_ABI ~scoped_lock() { __m_.unlock(); }
   [[nodiscard]]
   _LIBCPP_HIDE_FROM_ABI explicit scoped_lock(adopt_lock_t, mutex_type& __m) _LIBCPP_REQUIRES_CAPABILITY(__m)
 @@ -468,25 +469,31 @@ public:
 };
 template <class... _MArgs>
-class scoped_lock {
+class _LIBCPP_SCOPED_LOCKABLE scoped_lock {
   static_assert(sizeof...(_MArgs) > 1, "At least 2 lock types required");
   typedef tuple<_MArgs&...> _MutexTuple;
 public:
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI explicit scoped_lock(_MArgs&... __margs) : __t_(__margs...) {
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI explicit scoped_lock(_MArgs&... __margs) _LIBCPP_ACQUIRE_CAPABILITY(__margs...)
+      : __t_(__margs...) {
     std::lock(__margs...);
   }
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI scoped_lock(adopt_lock_t, _MArgs&... __margs) : __t_(__margs...) {}
+  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI scoped_lock(adopt_lock_t, _MArgs&... __margs)
+      _LIBCPP_REQUIRES_CAPABILITY(__margs...)
+      : __t_(__margs...) {}
-  _LIBCPP_HIDE_FROM_ABI ~scoped_lock() { __unlock_unpack(make_index_sequence<sizeof...(_MArgs)>(), __t_); }
+  _LIBCPP_RELEASE_CAPABILITY() _LIBCPP_HIDE_FROM_ABI ~scoped_lock() {
+    __unlock_unpack(make_index_sequence<sizeof...(_MArgs)>(), __t_);
+  }
   scoped_lock(scoped_lock const&)            = delete;
   scoped_lock& operator=(scoped_lock const&) = delete;
 private:
   template <size_t... _Indx>
-  _LIBCPP_HIDE_FROM_ABI static void __unlock_unpack(index_sequence<_Indx...>, _MutexTuple& __mt) {
+  _LIBCPP_HIDE_FROM_ABI static void __unlock_unpack(index_sequence<_Indx...>, _MutexTuple& __mt)
+      _LIBCPP_RELEASE_CAPABILITY(std::get<_Indx>(__mt)...) {
     (std::get<_Indx>(__mt).unlock(), ...);
   }
 @@ -495,17 +502,19 @@ private:
 _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(scoped_lock);
 #    endif // _LIBCPP_STD_VER >= 17
-#  endif   // _LIBCPP_HAS_THREADS
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
+#  endif // _LIBCPP_HAS_THREADS
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 23
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
 #    include <typeinfo>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <atomic>
 #    include <concepts>
 #    include <cstdlib>

lib/libcxx/include/new+3-3

...	@@ -81,8 +81,8 @@ void operator delete[](void* ptr, std::align_val_t alignment,	...	@@ -81,8 +81,8 @@ void operator delete[](void* ptr, std::align_val_t alignment,
81		81
82	void* operator new (std::size_t size, void* ptr) noexcept; // nodiscard in C++20, constexpr since C++26	82	void* operator new (std::size_t size, void* ptr) noexcept; // nodiscard in C++20, constexpr since C++26
83	void* operator new[](std::size_t size, void* ptr) noexcept; // nodiscard in C++20, constexpr since C++26	83	void* operator new[](std::size_t size, void* ptr) noexcept; // nodiscard in C++20, constexpr since C++26
84	void operator delete (void* ptr, void*) noexcept;	84	void operator delete (void* ptr, void*) noexcept; // constexpr since C++26
85	void operator delete[](void* ptr, void*) noexcept;	85	void operator delete[](void* ptr, void*) noexcept; // constexpr since C++26
86		86
87	*/	87	*/
88		88
...	@@ -114,7 +114,7 @@ void operator delete[](void* ptr, void*) noexcept;	...	@@ -114,7 +114,7 @@ void operator delete[](void* ptr, void*) noexcept;
114	# pragma GCC system_header	114	# pragma GCC system_header
115	# endif	115	# endif
116		116
117	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	117	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
118	# include <cstddef>	118	# include <cstddef>
119	# include <cstdlib>	119	# include <cstdlib>
120	# include <type_traits>	120	# include <type_traits>

lib/libcxx/include/numbers+1-1

...	@@ -159,7 +159,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -159,7 +159,7 @@ _LIBCPP_END_NAMESPACE_STD
159		159
160	# endif // _LIBCPP_STD_VER >= 20	160	# endif // _LIBCPP_STD_VER >= 20
161		161
162	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	162	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
163	# include <concepts>	163	# include <concepts>
164	# include <cstddef>	164	# include <cstddef>
165	# include <type_traits>	165	# include <type_traits>

lib/libcxx/include/numeric+7-7

...	@@ -142,15 +142,15 @@ template<class T>	...	@@ -142,15 +142,15 @@ template<class T>
142		142
143	// [numeric.sat], saturation arithmetic	143	// [numeric.sat], saturation arithmetic
144	template<class T>	144	template<class T>
145	constexpr T add_sat(T x, T y) noexcept; // freestanding, Since C++26	145	constexpr T saturating_add(T x, T y) noexcept; // freestanding, Since C++26
146	template<class T>	146	template<class T>
147	constexpr T sub_sat(T x, T y) noexcept; // freestanding, Since C++26	147	constexpr T saturating_sub(T x, T y) noexcept; // freestanding, Since C++26
148	template<class T>	148	template<class T>
149	constexpr T mul_sat(T x, T y) noexcept; // freestanding, Since C++26	149	constexpr T saturating_mul(T x, T y) noexcept; // freestanding, Since C++26
150	template<class T>	150	template<class T>
151	constexpr T div_sat(T x, T y) noexcept; // freestanding, Since C++26	151	constexpr T saturating_div(T x, T y) noexcept; // freestanding, Since C++26
152	template<class T, class U>	152	template<class T, class U>
153	constexpr T saturate_cast(U x) noexcept; // freestanding, Since C++26	153	constexpr T saturating_cast(U x) noexcept; // freestanding, Since C++26
154		154
155	} // std	155	} // std
156		156
...	@@ -190,12 +190,12 @@ constexpr T saturate_cast(U x) noexcept; // freestanding, Sin	...	@@ -190,12 +190,12 @@ constexpr T saturate_cast(U x) noexcept; // freestanding, Sin
190	# pragma GCC system_header	190	# pragma GCC system_header
191	# endif	191	# endif
192		192
193	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 14	193	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 14
194	# include <initializer_list>	194	# include <initializer_list>
195	# include <limits>	195	# include <limits>
196	# endif	196	# endif
197		197
198	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	198	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
199	# include <climits>	199	# include <climits>
200	# include <cmath>	200	# include <cmath>
201	# include <concepts>	201	# include <concepts>

lib/libcxx/include/optional+341-383

...	@@ -264,15 +264,14 @@ namespace std {	...	@@ -264,15 +264,14 @@ namespace std {
264	# include <__compare/three_way_comparable.h>	264	# include <__compare/three_way_comparable.h>
265	# include <__concepts/invocable.h>	265	# include <__concepts/invocable.h>
266	# include <__config>	266	# include <__config>
267	# include <__cstddef/ptrdiff_t.h>
268	# include <__exception/exception.h>	267	# include <__exception/exception.h>
269	# include <__format/range_format.h>
270	# include <__functional/hash.h>	268	# include <__functional/hash.h>
271	# include <__functional/invoke.h>	269	# include <__functional/invoke.h>
272	# include <__functional/unary_function.h>	270	# include <__functional/unary_function.h>
		271	# include <__fwd/format.h>
273	# include <__fwd/functional.h>	272	# include <__fwd/functional.h>
274	# include <__iterator/bounded_iter.h>	273	# include <__iterator/bounded_iter.h>
275	# include <__iterator/wrap_iter.h>	274	# include <__iterator/capacity_aware_iterator.h>
276	# include <__memory/addressof.h>	275	# include <__memory/addressof.h>
277	# include <__memory/construct_at.h>	276	# include <__memory/construct_at.h>
278	# include <__ranges/enable_borrowed_range.h>	277	# include <__ranges/enable_borrowed_range.h>
...	@@ -493,6 +492,61 @@ struct __optional_storage_base : __optional_destruct_base<_Tp> {	...	@@ -493,6 +492,61 @@ struct __optional_storage_base : __optional_destruct_base<_Tp> {
493	}	492	}
494	}	493	}
495	}	494	}
		495
		496	// [optional.observe]
		497	_LIBCPP_HIDE_FROM_ABI constexpr add_pointer_t<_Tp const> operator->() const noexcept {
		498	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator-> called on a disengaged value");
		499	return std::addressof(this->__get());
		500	}
		501
		502	_LIBCPP_HIDE_FROM_ABI constexpr add_pointer_t<_Tp> operator->() noexcept {
		503	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator-> called on a disengaged value");
		504	return std::addressof(this->__get());
		505	}
		506
		507	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _Tp& operator*() const& noexcept {
		508	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");
		509	return this->__get();
		510	}
		511
		512	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp& operator*() & noexcept {
		513	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");
		514	return this->__get();
		515	}
		516
		517	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp&& operator*() && noexcept {
		518	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");
		519	return std::move(this->__get());
		520	}
		521
		522	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _Tp&& operator*() const&& noexcept {
		523	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");
		524	return std::move(this->__get());
		525	}
		526
		527	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp const& value() const& {
		528	if (!this->has_value())
		529	std::__throw_bad_optional_access();
		530	return this->__get();
		531	}
		532
		533	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp& value() & {
		534	if (!this->has_value())
		535	std::__throw_bad_optional_access();
		536	return this->__get();
		537	}
		538
		539	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp&& value() && {
		540	if (!this->has_value())
		541	std::__throw_bad_optional_access();
		542	return std::move(this->__get());
		543	}
		544
		545	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp const&& value() const&& {
		546	if (!this->has_value())
		547	std::__throw_bad_optional_access();
		548	return std::move(this->__get());
		549	}
496	};	550	};
497		551
498	template <class _Tp>	552	template <class _Tp>
...	@@ -504,7 +558,7 @@ struct __optional_storage_base<_Tp, true> {	...	@@ -504,7 +558,7 @@ struct __optional_storage_base<_Tp, true> {
504	_LIBCPP_HIDE_FROM_ABI constexpr __optional_storage_base() noexcept : __value_(nullptr) {}	558	_LIBCPP_HIDE_FROM_ABI constexpr __optional_storage_base() noexcept : __value_(nullptr) {}
505		559
506	template <class _Up>	560	template <class _Up>
507	_LIBCPP_HIDE_FROM_ABI constexpr void __convert_init_ref_val(_Up&& __val) noexcept {	561	_LIBCPP_HIDE_FROM_ABI constexpr void __convert_init_ref_val(_Up&& __val) {
508	_Tp& __r(std::forward<_Up>(__val));	562	_Tp& __r(std::forward<_Up>(__val));
509	__value_ = std::addressof(__r);	563	__value_ = std::addressof(__r);
510	}	564	}
...	@@ -517,6 +571,14 @@ struct __optional_storage_base<_Tp, true> {	...	@@ -517,6 +571,14 @@ struct __optional_storage_base<_Tp, true> {
517	__convert_init_ref_val(std::forward<_UArg>(__uarg));	571	__convert_init_ref_val(std::forward<_UArg>(__uarg));
518	}	572	}
519		573
		574	# if _LIBCPP_STD_VER >= 23
		575	template <class _Fp, class... _Args>
		576	constexpr __optional_storage_base(__optional_construct_from_invoke_tag, _Fp&& __f, _Args&&... __args) {
		577	__convert_init_ref_val(std::forward<invoke_result_t<_Fp, _Args...>>(
		578	std::invoke(std::forward<_Fp>(__f), std::forward<_Args>(__args)...)));
		579	}
		580	# endif
		581
520	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void reset() noexcept { __value_ = nullptr; }	582	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void reset() noexcept { __value_ = nullptr; }
521		583
522	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool has_value() const noexcept { return __value_ != nullptr; }	584	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool has_value() const noexcept { return __value_ != nullptr; }
...	@@ -525,7 +587,6 @@ struct __optional_storage_base<_Tp, true> {	...	@@ -525,7 +587,6 @@ struct __optional_storage_base<_Tp, true> {
525		587
526	template <class _UArg>	588	template <class _UArg>
527	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __construct(_UArg&& __val) {	589	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __construct(_UArg&& __val) {
528	_LIBCPP_ASSERT_INTERNAL(!has_value(), "__construct called for engaged __optional_storage");
529	static_assert(!__reference_constructs_from_temporary_v<_Tp, _UArg>,	590	static_assert(!__reference_constructs_from_temporary_v<_Tp, _UArg>,
530	"Attempted to construct a reference element in tuple from a "	591	"Attempted to construct a reference element in tuple from a "
531	"possible temporary");	592	"possible temporary");
...	@@ -554,9 +615,26 @@ struct __optional_storage_base<_Tp, true> {	...	@@ -554,9 +615,26 @@ struct __optional_storage_base<_Tp, true> {
554	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __swap(__optional_storage_base& __rhs) noexcept {	615	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __swap(__optional_storage_base& __rhs) noexcept {
555	std::swap(__value_, __rhs.__value_);	616	std::swap(__value_, __rhs.__value_);
556	}	617	}
		618
		619	// [optional.ref.observe]
		620	_LIBCPP_HIDE_FROM_ABI constexpr add_pointer_t<_Tp> operator->() const noexcept {
		621	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator-> called on a disengaged value");
		622	return std::addressof(this->__get());
		623	}
		624
		625	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp& operator*() const noexcept {
		626	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");
		627	return this->__get();
		628	}
		629
		630	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp& value() const {
		631	if (!this->has_value())
		632	std::__throw_bad_optional_access();
		633	return this->__get();
		634	}
557	};	635	};
558		636
559	template <class _Tp, bool = is_trivially_copy_constructible_v<_Tp> \|\| is_lvalue_reference_v<_Tp>>	637	template <class _Tp, bool = is_trivially_copy_constructible_v<_Tp>>
560	struct __optional_copy_base : __optional_storage_base<_Tp> {	638	struct __optional_copy_base : __optional_storage_base<_Tp> {
561	using __optional_storage_base<_Tp>::__optional_storage_base;	639	using __optional_storage_base<_Tp>::__optional_storage_base;
562	};	640	};
...	@@ -576,7 +654,7 @@ struct __optional_copy_base<_Tp, false> : __optional_storage_base<_Tp> {	...	@@ -576,7 +654,7 @@ struct __optional_copy_base<_Tp, false> : __optional_storage_base<_Tp> {
576	_LIBCPP_HIDE_FROM_ABI __optional_copy_base& operator=(__optional_copy_base&&) = default;	654	_LIBCPP_HIDE_FROM_ABI __optional_copy_base& operator=(__optional_copy_base&&) = default;
577	};	655	};
578		656
579	template <class _Tp, bool = is_trivially_move_constructible_v<_Tp> \|\| is_lvalue_reference_v<_Tp>>	657	template <class _Tp, bool = is_trivially_move_constructible_v<_Tp>>
580	struct __optional_move_base : __optional_copy_base<_Tp> {	658	struct __optional_move_base : __optional_copy_base<_Tp> {
581	using __optional_copy_base<_Tp>::__optional_copy_base;	659	using __optional_copy_base<_Tp>::__optional_copy_base;
582	};	660	};
...	@@ -600,8 +678,7 @@ struct __optional_move_base<_Tp, false> : __optional_copy_base<_Tp> {	...	@@ -600,8 +678,7 @@ struct __optional_move_base<_Tp, false> : __optional_copy_base<_Tp> {
600		678
601	template <class _Tp,	679	template <class _Tp,
602	bool = (is_trivially_destructible_v<_Tp> && is_trivially_copy_constructible_v<_Tp> &&	680	bool = (is_trivially_destructible_v<_Tp> && is_trivially_copy_constructible_v<_Tp> &&
603	is_trivially_copy_assignable_v<_Tp>) \|\|	681	is_trivially_copy_assignable_v<_Tp>)>
604	is_lvalue_reference_v<_Tp>>
605	struct __optional_copy_assign_base : __optional_move_base<_Tp> {	682	struct __optional_copy_assign_base : __optional_move_base<_Tp> {
606	using __optional_move_base<_Tp>::__optional_move_base;	683	using __optional_move_base<_Tp>::__optional_move_base;
607	};	684	};
...	@@ -625,8 +702,7 @@ struct __optional_copy_assign_base<_Tp, false> : __optional_move_base<_Tp> {	...	@@ -625,8 +702,7 @@ struct __optional_copy_assign_base<_Tp, false> : __optional_move_base<_Tp> {
625		702
626	template <class _Tp,	703	template <class _Tp,
627	bool = (is_trivially_destructible_v<_Tp> && is_trivially_move_constructible_v<_Tp> &&	704	bool = (is_trivially_destructible_v<_Tp> && is_trivially_move_constructible_v<_Tp> &&
628	is_trivially_move_assignable_v<_Tp>) \|\|	705	is_trivially_move_assignable_v<_Tp>)>
629	is_lvalue_reference_v<_Tp>>
630	struct __optional_move_assign_base : __optional_copy_assign_base<_Tp> {	706	struct __optional_move_assign_base : __optional_copy_assign_base<_Tp> {
631	using __optional_copy_assign_base<_Tp>::__optional_copy_assign_base;	707	using __optional_copy_assign_base<_Tp>::__optional_copy_assign_base;
632	};	708	};
...	@@ -655,8 +731,8 @@ using __optional_sfinae_ctor_base_t _LIBCPP_NODEBUG =	...	@@ -655,8 +731,8 @@ using __optional_sfinae_ctor_base_t _LIBCPP_NODEBUG =
655		731
656	template <class _Tp>	732	template <class _Tp>
657	using __optional_sfinae_assign_base_t _LIBCPP_NODEBUG =	733	using __optional_sfinae_assign_base_t _LIBCPP_NODEBUG =
658	__sfinae_assign_base< (is_copy_constructible_v<_Tp> && is_copy_assignable_v<_Tp>) \|\| is_lvalue_reference_v<_Tp>,	734	__sfinae_assign_base< (is_copy_constructible_v<_Tp> && is_copy_assignable_v<_Tp>),
659	(is_move_constructible_v<_Tp> && is_move_assignable_v<_Tp>) \|\| is_lvalue_reference_v<_Tp>>;	735	(is_move_constructible_v<_Tp> && is_move_assignable_v<_Tp>)>;
660		736
661	template <class _Tp>	737	template <class _Tp>
662	class optional;	738	class optional;
...	@@ -685,126 +761,115 @@ struct __is_std_optional : false_type {};	...	@@ -685,126 +761,115 @@ struct __is_std_optional : false_type {};
685	template <class _Tp>	761	template <class _Tp>
686	struct __is_std_optional<optional<_Tp>> : true_type {};	762	struct __is_std_optional<optional<_Tp>> : true_type {};
687		763
688	template <class _Tp, class... _Args>	764	# if _LIBCPP_STD_VER < 26
689	inline constexpr bool __is_constructible_for_optional_v = is_constructible_v<_Tp, _Args...>;	765	template <class _Tp>
690		766	inline constexpr bool __is_valid_optional_contained_type = is_object_v<_Tp>;
691	template <class _Tp, class... _Args>	767	# else
692	struct __is_constructible_for_optional : bool_constant<__is_constructible_for_optional_v<_Tp, _Args...>> {};	768	template <class _Tp>
		769	inline constexpr bool __is_valid_optional_contained_type = is_object_v<_Tp> \|\| is_lvalue_reference_v<_Tp>;
		770	# endif
693		771
694	template <class _Tp, class _Up, class... _Args>	772	template <class _Tp>
695	inline constexpr bool __is_constructible_for_optional_initializer_list_v =	773	struct __optional_iterator_base : __optional_move_assign_base<_Tp> {
696	is_constructible_v<_Tp, initializer_list<_Up>&, _Args...>;	774	using __optional_move_assign_base<_Tp>::__optional_move_assign_base;
		775	};
697		776
698	# if _LIBCPP_STD_VER >= 26	777	# if _LIBCPP_STD_VER >= 26
699	template <class _Tp, class... _Args>	778	template <class _Tp>
700	inline constexpr bool __is_constructible_for_optional_v<_Tp&, _Args...> = false;	779	struct __optional_iterator_base<_Tp&> : __optional_storage_base<_Tp&> {
701	template <class _Tp, class _Arg>	780	using __optional_storage_base<_Tp&>::__optional_storage_base;
702	inline constexpr bool __is_constructible_for_optional_v<_Tp&, _Arg> =	781	};
703	is_constructible_v<_Tp&, _Arg> && !reference_constructs_from_temporary_v<_Tp&, _Arg>;
704
705	template <class _Tp, class _Up, class... _Args>
706	inline constexpr bool __is_constructible_for_optional_initializer_list_v<_Tp&, _Up, _Args...> = false;
707	# endif
708		782
709	template <class _Tp, class = void>	783	# if _LIBCPP_HAS_EXPERIMENTAL_OPTIONAL_ITERATOR
710	struct __optional_iterator {};
711
712	# if _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPERIMENTAL_OPTIONAL_ITERATOR
713		784
714	template <class _Tp>	785	template <class _Tp>
715	struct __optional_iterator<_Tp, enable_if_t<is_object_v<_Tp>>> {	786	requires is_object_v<_Tp>
		787	struct __optional_iterator_base<_Tp> : __optional_move_assign_base<_Tp> {
716	private:	788	private:
717	using __pointer _LIBCPP_NODEBUG = add_pointer_t<_Tp>;	789	using __pointer _LIBCPP_NODEBUG = add_pointer_t<_Tp>;
718	using __const_pointer _LIBCPP_NODEBUG = add_pointer_t<const _Tp>;	790	using __const_pointer _LIBCPP_NODEBUG = add_pointer_t<const _Tp>;
719		791
720	public:	792	public:
721	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL	793	using __optional_move_assign_base<_Tp>::__optional_move_assign_base;
722	using iterator = __bounded_iter<__wrap_iter<__pointer>>;	794
723	using const_iterator = __bounded_iter<__wrap_iter<__const_pointer>>;	795	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL
724	# else	796	using iterator = __bounded_iter<__pointer>;
725	using iterator = __wrap_iter<__pointer>;	797	using const_iterator = __bounded_iter<__const_pointer>;
726	using const_iterator = __wrap_iter<__const_pointer>;	798	# else
727	# endif	799	using iterator = __capacity_aware_iterator<__pointer, optional<_Tp>, 1>;
		800	using const_iterator = __capacity_aware_iterator<__const_pointer, optional<_Tp>, 1>;
		801	# endif
728		802
729	// [optional.iterators], iterator support	803	// [optional.iterators], iterator support
730	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator begin() noexcept {	804	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator begin() noexcept {
731	auto& __derived_self = static_cast<optional<_Tp>&>(*this);	805	auto* __ptr = std::addressof(this->__get());
732	auto* __ptr = std::addressof(__derived_self.__get());
733		806
734	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL	807	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL
735	return std::__make_bounded_iter(	808	return std::__make_bounded_iter(__ptr, __ptr, __ptr + (this->has_value() ? 1 : 0));
736	__wrap_iter<__pointer>(__ptr),	809	# else
737	__wrap_iter<__pointer>(__ptr),	810	return std::__make_capacity_aware_iterator<__pointer, optional<_Tp>, 1>(__ptr);
738	__wrap_iter<__pointer>(__ptr) + (__derived_self.has_value() ? 1 : 0));	811	# endif
739	# else
740	return iterator(__ptr);
741	# endif
742	}	812	}
743		813
744	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const_iterator begin() const noexcept {	814	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const_iterator begin() const noexcept {
745	auto& __derived_self = static_cast<const optional<_Tp>&>(*this);	815	auto* __ptr = std::addressof(this->__get());
746	auto* __ptr = std::addressof(__derived_self.__get());
747		816
748	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL	817	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL
749	return std::__make_bounded_iter(	818	return std::__make_bounded_iter(__ptr, __ptr, __ptr + (this->has_value() ? 1 : 0));
750	__wrap_iter<__const_pointer>(__ptr),	819	# else
751	__wrap_iter<__const_pointer>(__ptr),	820	return std::__make_capacity_aware_iterator<__const_pointer, optional<_Tp>, 1>(__ptr);
752	__wrap_iter<__const_pointer>(__ptr) + (__derived_self.has_value() ? 1 : 0));	821	# endif
753	# else
754	return const_iterator(__ptr);
755	# endif
756	}	822	}
757		823
758	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator end() noexcept {	824	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iterator end() noexcept {
759	return begin() + (static_cast<optional<_Tp>&>(*this).has_value() ? 1 : 0);	825	return begin() + (this->has_value() ? 1 : 0);
760	}	826	}
761	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const_iterator end() const noexcept {	827	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const_iterator end() const noexcept {
762	return begin() + (static_cast<const optional<_Tp>&>(*this).has_value() ? 1 : 0);	828	return begin() + (this->has_value() ? 1 : 0);
763	}	829	}
764	};	830	};
765		831
766	template <class _Tp>	832	template <class _Tp>
767	struct __optional_iterator<_Tp&, enable_if_t<is_object_v<_Tp> && !__is_unbounded_array_v<_Tp> >> {	833	requires(is_object_v<_Tp> && !__is_unbounded_array_v<_Tp>)
		834	struct __optional_iterator_base<_Tp&> : __optional_storage_base<_Tp&> {
768	private:	835	private:
769	using __pointer _LIBCPP_NODEBUG = add_pointer_t<_Tp>;	836	using __pointer _LIBCPP_NODEBUG = add_pointer_t<_Tp>;
770		837
771	public:	838	public:
772	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL	839	using __optional_storage_base<_Tp&>::__optional_storage_base;
773	using iterator = __bounded_iter<__wrap_iter<__pointer>>;	840
774	# else	841	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL
775	using iterator = __wrap_iter<__pointer>;	842	using iterator = __bounded_iter<__pointer>;
776	# endif	843	# else
		844	using iterator = __capacity_aware_iterator<__pointer, optional<_Tp&>, 1>;
		845	# endif
777		846
778	// [optional.ref.iterators], iterator support	847	// [optional.ref.iterators], iterator support
779		848
780	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const noexcept {	849	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const noexcept {
781	auto& __derived_self = static_cast<const optional<_Tp&>&>(*this);	850	auto* __ptr = this->has_value() ? std::addressof(this->__get()) : nullptr;
782	auto* __ptr = __derived_self.has_value() ? std::addressof(__derived_self.__get()) : nullptr;
783		851
784	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL	852	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_OPTIONAL
785	return std::__make_bounded_iter(	853	return std::__make_bounded_iter(__ptr, __ptr, __ptr + (this->has_value() ? 1 : 0));
786	__wrap_iter<__pointer>(__ptr),	854	# else
787	__wrap_iter<__pointer>(__ptr),	855	return std::__make_capacity_aware_iterator<__pointer, optional<_Tp&>, 1>(__ptr);
788	__wrap_iter<__pointer>(__ptr) + (__derived_self.has_value() ? 1 : 0));	856	# endif
789	# else
790	return iterator(__ptr);
791	# endif
792	}	857	}
793		858
794	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const noexcept {	859	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const noexcept {
795	return begin() + (static_cast<const optional<_Tp&>&>(*this).has_value() ? 1 : 0);	860	return begin() + (this->has_value() ? 1 : 0);
796	}	861	}
797	};	862	};
798		863
799	# endif // _LIBCPP_STD_VER >= 26 && _LIBCPP_HAS_EXPERIMENTAL_OPTIONAL_ITERATOR	864	# endif // _LIBCPP_HAS_EXPERIMENTAL_OPTIONAL_ITERATOR
		865	# endif // _LIBCPP_STD_VER >= 26
800		866
801	template <class _Tp>	867	template <class _Tp>
802	class _LIBCPP_DECLSPEC_EMPTY_BASES optional	868	class _LIBCPP_DECLSPEC_EMPTY_BASES optional
803	: private __optional_move_assign_base<_Tp>,	869	: public __optional_iterator_base<_Tp>,
804	private __optional_sfinae_ctor_base_t<_Tp>,	870	private __optional_sfinae_ctor_base_t<_Tp>,
805	private __optional_sfinae_assign_base_t<_Tp>,	871	private __optional_sfinae_assign_base_t<_Tp> {
806	public __optional_iterator<_Tp> {	872	using __base _LIBCPP_NODEBUG = __optional_iterator_base<_Tp>;
807	using __base _LIBCPP_NODEBUG = __optional_move_assign_base<_Tp>;
808		873
809	public:	874	public:
810	using value_type = __libcpp_remove_reference_t<_Tp>;	875	using value_type = __libcpp_remove_reference_t<_Tp>;
...	@@ -813,9 +878,8 @@ public:	...	@@ -813,9 +878,8 @@ public:
813	conditional_t<__libcpp_is_trivially_relocatable<_Tp>::value, optional, void>;	878	conditional_t<__libcpp_is_trivially_relocatable<_Tp>::value, optional, void>;
814		879
815	private:	880	private:
816	static_assert(!is_same_v<__remove_cvref_t<_Tp>, in_place_t>,	881	static_assert(!is_same_v<remove_cv_t<_Tp>, in_place_t>, "instantiation of optional with in_place_t is ill-formed");
817	"instantiation of optional with in_place_t is ill-formed");	882	static_assert(!is_same_v<remove_cv_t<_Tp>, nullopt_t>, "instantiation of optional with nullopt_t is ill-formed");
818	static_assert(!is_same_v<__remove_cvref_t<_Tp>, nullopt_t>, "instantiation of optional with nullopt_t is ill-formed");
819	# if _LIBCPP_STD_VER >= 26	883	# if _LIBCPP_STD_VER >= 26
820	static_assert(!is_rvalue_reference_v<_Tp>, "instantiation of optional with an rvalue reference type is ill-formed");	884	static_assert(!is_rvalue_reference_v<_Tp>, "instantiation of optional with an rvalue reference type is ill-formed");
821	# else	885	# else
...	@@ -824,16 +888,6 @@ private:	...	@@ -824,16 +888,6 @@ private:
824	static_assert(is_destructible_v<_Tp>, "instantiation of optional with a non-destructible type is ill-formed");	888	static_assert(is_destructible_v<_Tp>, "instantiation of optional with a non-destructible type is ill-formed");
825	static_assert(!is_array_v<_Tp>, "instantiation of optional with an array type is ill-formed");	889	static_assert(!is_array_v<_Tp>, "instantiation of optional with an array type is ill-formed");
826		890
827	# if _LIBCPP_STD_VER >= 26
828	template <class _Up>
829	constexpr static bool __libcpp_opt_ref_ctor_deleted =
830	is_lvalue_reference_v<_Tp> && reference_constructs_from_temporary_v<_Tp, _Up>;
831
832	template <class _Up>
833	constexpr static bool __ref_ctor_enabled =
834	is_lvalue_reference_v<_Tp> && !reference_constructs_from_temporary_v<_Tp, _Up>;
835	# endif
836
837	// LWG2756: conditionally explicit conversion from _Up	891	// LWG2756: conditionally explicit conversion from _Up
838	struct _CheckOptionalArgsConstructor {	892	struct _CheckOptionalArgsConstructor {
839	template <class _Up>	893	template <class _Up>
...	@@ -905,131 +959,48 @@ public:	...	@@ -905,131 +959,48 @@ public:
905	_LIBCPP_HIDE_FROM_ABI constexpr optional(optional&&) = default;	959	_LIBCPP_HIDE_FROM_ABI constexpr optional(optional&&) = default;
906	_LIBCPP_HIDE_FROM_ABI constexpr optional(nullopt_t) noexcept {}	960	_LIBCPP_HIDE_FROM_ABI constexpr optional(nullopt_t) noexcept {}
907		961
908	template <	962	template <class _InPlaceT,
909	class _InPlaceT,	963	class... _Args,
910	class... _Args,	964	enable_if_t<_And<_IsSame<_InPlaceT, in_place_t>, is_constructible<_Tp, _Args...>>::value, int> = 0>
911	enable_if_t<_And<_IsSame<_InPlaceT, in_place_t>, __is_constructible_for_optional<_Tp, _Args...>>::value, int> = 0>
912	_LIBCPP_HIDE_FROM_ABI constexpr explicit optional(_InPlaceT, _Args&&... __args)	965	_LIBCPP_HIDE_FROM_ABI constexpr explicit optional(_InPlaceT, _Args&&... __args)
913	: __base(in_place, std::forward<_Args>(__args)...) {}	966	: __base(in_place, std::forward<_Args>(__args)...) {}
914		967
915	template <class _Up,	968	template <class _Up, class... _Args, enable_if_t<is_constructible_v<_Tp, initializer_list<_Up>&, _Args...>, int> = 0>
916	class... _Args,
917	enable_if_t<__is_constructible_for_optional_initializer_list_v<_Tp, _Up, _Args...>, int> = 0>
918	_LIBCPP_HIDE_FROM_ABI constexpr explicit optional(in_place_t, initializer_list<_Up> __il, _Args&&... __args)	969	_LIBCPP_HIDE_FROM_ABI constexpr explicit optional(in_place_t, initializer_list<_Up> __il, _Args&&... __args)
919	: __base(in_place, __il, std::forward<_Args>(__args)...) {}	970	: __base(in_place, __il, std::forward<_Args>(__args)...) {}
920		971
921	template <class _Up = _Tp, enable_if_t<_CheckOptionalArgsCtor<_Up>::template __enable_implicit<_Up>(), int> = 0>	972	template <class _Up = _Tp, enable_if_t<_CheckOptionalArgsCtor<_Up>::template __enable_implicit<_Up>(), int> = 0>
922	_LIBCPP_HIDE_FROM_ABI constexpr optional(_Up&& __v)	973	_LIBCPP_HIDE_FROM_ABI constexpr optional(_Up&& __v) noexcept(is_nothrow_constructible_v<_Tp, _Up>) // strengthened
923	# if _LIBCPP_STD_VER >= 26	974	: __base(in_place, std::forward<_Up>(__v)) {}
924	noexcept(is_lvalue_reference_v<_Tp> && is_nothrow_constructible_v<_Tp&, _Up>)
925	# endif
926	: __base(in_place, std::forward<_Up>(__v)) {
927	}
928		975
929	template <class _Up = remove_cv_t<_Tp>,	976	template <class _Up = remove_cv_t<_Tp>,
930	enable_if_t<_CheckOptionalArgsCtor<_Up>::template __enable_explicit<_Up>(), int> = 0>	977	enable_if_t<_CheckOptionalArgsCtor<_Up>::template __enable_explicit<_Up>(), int> = 0>
931	_LIBCPP_HIDE_FROM_ABI constexpr explicit optional(_Up&& __v)	978	_LIBCPP_HIDE_FROM_ABI constexpr explicit optional(_Up&& __v) noexcept(
932	# if _LIBCPP_STD_VER >= 26	979	is_nothrow_constructible_v<_Tp, _Up>) // strengthened
933	noexcept(is_lvalue_reference_v<_Tp> && is_nothrow_constructible_v<_Tp&, _Up>)	980	: __base(in_place, std::forward<_Up>(__v)) {}
934	# endif
935	: __base(in_place, std::forward<_Up>(__v)) {
936	}
937		981
938	// LWG2756: conditionally explicit conversion from const optional<_Up>&	982	// LWG2756: conditionally explicit conversion from const optional<_Up>&
939	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_implicit<_Up>(), int> = 0>	983	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_implicit<_Up>(), int> = 0>
940	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 optional(const optional<_Up>& __v)	984	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 optional(const optional<_Up>& __v) {
941	# if _LIBCPP_STD_VER >= 26
942	noexcept(is_lvalue_reference_v<_Tp> && is_nothrow_constructible_v<_Tp&, const _Up&>)
943	# endif
944	{
945	this->__construct_from(__v);	985	this->__construct_from(__v);
946	}	986	}
		987
947	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_explicit<_Up>(), int> = 0>	988	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_explicit<_Up>(), int> = 0>
948	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit optional(const optional<_Up>& __v)	989	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit optional(const optional<_Up>& __v) {
949	# if _LIBCPP_STD_VER >= 26
950	noexcept(is_lvalue_reference_v<_Tp> && is_nothrow_constructible_v<_Tp&, const _Up&>)
951	# endif
952	{
953	this->__construct_from(__v);	990	this->__construct_from(__v);
954	}	991	}
955		992
956	// LWG2756: conditionally explicit conversion from optional<_Up>&&	993	// LWG2756: conditionally explicit conversion from optional<_Up>&&
957	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up&&>::template __enable_implicit<_Up>(), int> = 0>	994	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up&&>::template __enable_implicit<_Up>(), int> = 0>
958	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 optional(optional<_Up>&& __v)	995	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 optional(optional<_Up>&& __v) {
959	# if _LIBCPP_STD_VER >= 26
960	noexcept(is_lvalue_reference_v<_Tp> && is_nothrow_constructible_v<_Tp&, _Up>)
961	# endif
962	{
963	this->__construct_from(std::move(__v));
964	}
965	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up&&>::template __enable_explicit<_Up>(), int> = 0>
966	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit optional(optional<_Up>&& __v)
967	# if _LIBCPP_STD_VER >= 26
968	noexcept(is_lvalue_reference_v<_Tp> && is_nothrow_constructible_v<_Tp&, _Up>)
969	# endif
970	{
971	this->__construct_from(std::move(__v));	996	this->__construct_from(std::move(__v));
972	}	997	}
973		998
974	// deleted optional<T&> constructors and additional optional<T&> constructors
975	# if _LIBCPP_STD_VER >= 26
976	// optional(U&&)
977	template <class _Up = _Tp, enable_if_t<_CheckOptionalArgsCtor<_Up>::template __enable_implicit<_Up>(), int> = 0>
978	requires __libcpp_opt_ref_ctor_deleted<_Up>
979	optional(_Up&&) = delete;
980
981	template <class _Up = remove_cv_t<_Tp>,
982	enable_if_t<_CheckOptionalArgsCtor<_Up>::template __enable_explicit<_Up>(), int> = 0>
983	requires __libcpp_opt_ref_ctor_deleted<_Up>
984	explicit optional(_Up&&) = delete;
985
986	// optional(optional<U>& rhs)
987	template <class _Up>
988	requires __ref_ctor_enabled<_Up&> && (!is_same_v<remove_cvref_t<_Tp>, optional<_Up>>) && (!is_same_v<_Tp&, _Up>) &&
989	is_constructible_v<_Tp&, _Up&>
990	_LIBCPP_HIDE_FROM_ABI constexpr explicit(!is_convertible_v<_Up&, _Tp&>)
991	optional(optional<_Up>& __rhs) noexcept(is_nothrow_constructible_v<_Tp&, _Up&>) {
992	this->__construct_from(__rhs);
993	}
994
995	template <class _Up>
996	requires __libcpp_opt_ref_ctor_deleted<_Up&> && (!is_same_v<remove_cvref_t<_Tp>, optional<_Up>>) &&
997	(!is_same_v<_Tp&, _Up>) && is_constructible_v<_Tp&, _Up&>
998	constexpr explicit optional(optional<_Up>& __rhs) noexcept = delete;
999
1000	// optional(const optional<U>&)
1001	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_implicit<_Up>(), int> = 0>
1002	requires __libcpp_opt_ref_ctor_deleted<const _Up&>
1003	optional(const optional<_Up>&) = delete;
1004
1005	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up const&>::template __enable_explicit<_Up>(), int> = 0>
1006	requires __libcpp_opt_ref_ctor_deleted<const _Up&>
1007	explicit optional(const optional<_Up>&) = delete;
1008
1009	// optional(optional<U>&&)
1010	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up&&>::template __enable_implicit<_Up>(), int> = 0>
1011	requires __libcpp_opt_ref_ctor_deleted<_Up>
1012	optional(optional<_Up>&&) = delete;
1013
1014	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up&&>::template __enable_explicit<_Up>(), int> = 0>	999	template <class _Up, enable_if_t<_CheckOptionalLikeCtor<_Up, _Up&&>::template __enable_explicit<_Up>(), int> = 0>
1015	requires __libcpp_opt_ref_ctor_deleted<_Up>	1000	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit optional(optional<_Up>&& __v) {
1016	explicit optional(optional<_Up>&&) = delete;
1017
1018	// optional(const optional<U>&&)
1019	template <class _Up>
1020	requires __ref_ctor_enabled<const _Up> && (!is_same_v<remove_cvref_t<_Tp>, optional<_Up>>) &&
1021	(!is_same_v<_Tp&, _Up>) && is_constructible_v<_Tp&, const _Up>
1022	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(!is_convertible_v<const _Up, _Tp&>)
1023	optional(const optional<_Up>&& __v) noexcept(is_nothrow_constructible_v<_Tp&, const _Up>) {
1024	this->__construct_from(std::move(__v));	1001	this->__construct_from(std::move(__v));
1025	}	1002	}
1026		1003
1027	template <class _Up>
1028	requires __libcpp_opt_ref_ctor_deleted<const _Up> && (!is_same_v<remove_cvref_t<_Tp>, optional<_Up>>) &&
1029	(!is_same_v<_Tp&, _Up>) && is_constructible_v<_Tp&, const _Up>
1030	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 optional(const optional<_Up>&& __v) noexcept = delete;
1031	# endif
1032
1033	# if _LIBCPP_STD_VER >= 23	1004	# if _LIBCPP_STD_VER >= 23
1034	template <class _Tag,	1005	template <class _Tag,
1035	class _Fp,	1006	class _Fp,
...	@@ -1052,8 +1023,7 @@ public:	...	@@ -1052,8 +1023,7 @@ public:
1052	enable_if_t<_And<_IsNotSame<__remove_cvref_t<_Up>, optional>,	1023	enable_if_t<_And<_IsNotSame<__remove_cvref_t<_Up>, optional>,
1053	_Or<_IsNotSame<__remove_cvref_t<_Up>, _Tp>, _Not<is_scalar<_Tp>>>,	1024	_Or<_IsNotSame<__remove_cvref_t<_Up>, _Tp>, _Not<is_scalar<_Tp>>>,
1054	is_constructible<_Tp, _Up>,	1025	is_constructible<_Tp, _Up>,
1055	is_assignable<_Tp&, _Up>,	1026	is_assignable<_Tp&, _Up>>::value,
1056	is_object<_Tp>>::value,
1057	int> = 0>	1027	int> = 0>
1058	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 optional& operator=(_Up&& __v) {	1028	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 optional& operator=(_Up&& __v) {
1059	if (this->has_value())	1029	if (this->has_value())
...	@@ -1077,138 +1047,35 @@ public:	...	@@ -1077,138 +1047,35 @@ public:
1077	return *this;	1047	return *this;
1078	}	1048	}
1079		1049
1080	template <class... _Args, enable_if_t<__is_constructible_for_optional_v<_Tp, _Args...>, int> = 0>	1050	template <class... _Args, enable_if_t<is_constructible_v<_Tp, _Args...>, int> = 0>
1081	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp& emplace(_Args&&... __args)	1051	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp& emplace(_Args&&... __args) {
1082	# if _LIBCPP_STD_VER >= 26
1083	noexcept(is_lvalue_reference_v<_Tp> && is_nothrow_constructible_v<_Tp, _Args...>)
1084	# endif
1085	{
1086	reset();	1052	reset();
1087	this->__construct(std::forward<_Args>(__args)...);	1053	this->__construct(std::forward<_Args>(__args)...);
1088	return this->__get();	1054	return this->__get();
1089	}	1055	}
1090		1056
1091	template <class _Up,	1057	template <class _Up, class... _Args, enable_if_t<is_constructible_v<_Tp, initializer_list<_Up>&, _Args...>, int> = 0>
1092	class... _Args,
1093	enable_if_t<__is_constructible_for_optional_initializer_list_v<_Tp, _Up, _Args...>, int> = 0>
1094	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp& emplace(initializer_list<_Up> __il, _Args&&... __args) {	1058	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Tp& emplace(initializer_list<_Up> __il, _Args&&... __args) {
1095	reset();	1059	reset();
1096	this->__construct(__il, std::forward<_Args>(__args)...);	1060	this->__construct(__il, std::forward<_Args>(__args)...);
1097	return this->__get();	1061	return this->__get();
1098	}	1062	}
1099		1063
1100	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(optional& __opt) noexcept(	1064	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void
1101	(is_nothrow_move_constructible_v<_Tp> && is_nothrow_swappable_v<_Tp>)	1065	swap(optional& __opt) noexcept((is_nothrow_move_constructible_v<_Tp> && is_nothrow_swappable_v<_Tp>)) {
1102	# if _LIBCPP_STD_VER >= 26
1103	\|\| is_lvalue_reference_v<_Tp>
1104	# endif
1105	) {
1106	this->__swap(__opt);	1066	this->__swap(__opt);
1107	}	1067	}
1108		1068
1109	_LIBCPP_HIDE_FROM_ABI constexpr add_pointer_t<_Tp const> operator->() const noexcept	1069	using __base::operator*;
1110	# if _LIBCPP_STD_VER >= 26	1070	using __base::operator->;
1111	requires(is_object_v<_Tp>)
1112	# endif
1113	{
1114	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator-> called on a disengaged value");
1115	return std::addressof(this->__get());
1116	}
1117
1118	_LIBCPP_HIDE_FROM_ABI constexpr add_pointer_t<_Tp> operator->() noexcept
1119	# if _LIBCPP_STD_VER >= 26
1120	requires(is_object_v<_Tp>)
1121	# endif
1122	{
1123	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator-> called on a disengaged value");
1124	return std::addressof(this->__get());
1125	}
1126
1127	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _Tp& operator*() const& noexcept
1128	# if _LIBCPP_STD_VER >= 26
1129	requires(is_object_v<_Tp>)
1130	# endif
1131	{
1132	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");
1133	return this->__get();
1134	}
1135
1136	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp& operator*() & noexcept
1137	# if _LIBCPP_STD_VER >= 26
1138	requires(is_object_v<_Tp>)
1139	# endif
1140	{
1141	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");
1142	return this->__get();
1143	}
1144
1145	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp&& operator*() && noexcept
1146	# if _LIBCPP_STD_VER >= 26
1147	requires(is_object_v<_Tp>)
1148	# endif
1149	{
1150	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");
1151	return std::move(this->__get());
1152	}
1153
1154	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _Tp&& operator*() const&& noexcept
1155	# if _LIBCPP_STD_VER >= 26
1156	requires(is_object_v<_Tp>)
1157	# endif
1158	{
1159	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");
1160	return std::move(this->__get());
1161	}
1162		1071
1163	_LIBCPP_HIDE_FROM_ABI constexpr explicit operator bool() const noexcept { return has_value(); }	1072	_LIBCPP_HIDE_FROM_ABI constexpr explicit operator bool() const noexcept { return has_value(); }
1164		1073
1165	using __base::__get;	1074	using __base::__get;
1166	using __base::has_value;	1075	using __base::has_value;
1167		1076	using __base::value;
1168	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp const& value() const&
1169	# if _LIBCPP_STD_VER >= 26
1170	requires(is_object_v<_Tp>)
1171	# endif
1172	{
1173	if (!this->has_value())
1174	std::__throw_bad_optional_access();
1175	return this->__get();
1176	}
1177
1178	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp& value() &
1179	# if _LIBCPP_STD_VER >= 26
1180	requires(is_object_v<_Tp>)
1181	# endif
1182	{
1183	if (!this->has_value())
1184	std::__throw_bad_optional_access();
1185	return this->__get();
1186	}
1187
1188	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp&& value() &&
1189	# if _LIBCPP_STD_VER >= 26
1190	requires(is_object_v<_Tp>)
1191	# endif
1192	{
1193	if (!this->has_value())
1194	std::__throw_bad_optional_access();
1195	return std::move(this->__get());
1196	}
1197
1198	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp const&& value() const&&
1199	# if _LIBCPP_STD_VER >= 26
1200	requires(is_object_v<_Tp>)
1201	# endif
1202	{
1203	if (!this->has_value())
1204	std::__throw_bad_optional_access();
1205	return std::move(this->__get());
1206	}
1207		1077
1208	template <class _Up = remove_cv_t<_Tp>>	1078	template <class _Up = remove_cv_t<_Tp>>
1209	# if _LIBCPP_STD_VER >= 26
1210	requires(is_object_v<_Tp>)
1211	# endif
1212	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp value_or(_Up&& __v) const& {	1079	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp value_or(_Up&& __v) const& {
1213	static_assert(is_copy_constructible_v<_Tp>, "optional<T>::value_or: T must be copy constructible");	1080	static_assert(is_copy_constructible_v<_Tp>, "optional<T>::value_or: T must be copy constructible");
1214	static_assert(is_convertible_v<_Up, _Tp>, "optional<T>::value_or: U must be convertible to T");	1081	static_assert(is_convertible_v<_Up, _Tp>, "optional<T>::value_or: U must be convertible to T");
...	@@ -1216,9 +1083,6 @@ public:	...	@@ -1216,9 +1083,6 @@ public:
1216	}	1083	}
1217		1084
1218	template <class _Up = remove_cv_t<_Tp>>	1085	template <class _Up = remove_cv_t<_Tp>>
1219	# if _LIBCPP_STD_VER >= 26
1220	requires(is_object_v<_Tp>)
1221	# endif
1222	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp value_or(_Up&& __v) && {	1086	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp value_or(_Up&& __v) && {
1223	static_assert(is_move_constructible_v<_Tp>, "optional<T>::value_or: T must be move constructible");	1087	static_assert(is_move_constructible_v<_Tp>, "optional<T>::value_or: T must be move constructible");
1224	static_assert(is_convertible_v<_Up, _Tp>, "optional<T>::value_or: U must be convertible to T");	1088	static_assert(is_convertible_v<_Up, _Tp>, "optional<T>::value_or: U must be convertible to T");
...	@@ -1227,9 +1091,6 @@ public:	...	@@ -1227,9 +1091,6 @@ public:
1227		1091
1228	# if _LIBCPP_STD_VER >= 23	1092	# if _LIBCPP_STD_VER >= 23
1229	template <class _Func>	1093	template <class _Func>
1230	# if _LIBCPP_STD_VER >= 26
1231	requires(is_object_v<_Tp>)
1232	# endif
1233	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto and_then(_Func&& __f) & {	1094	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto and_then(_Func&& __f) & {
1234	using _Up = invoke_result_t<_Func, _Tp&>;	1095	using _Up = invoke_result_t<_Func, _Tp&>;
1235	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,	1096	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,
...	@@ -1240,9 +1101,6 @@ public:	...	@@ -1240,9 +1101,6 @@ public:
1240	}	1101	}
1241		1102
1242	template <class _Func>	1103	template <class _Func>
1243	# if _LIBCPP_STD_VER >= 26
1244	requires(is_object_v<_Tp>)
1245	# endif
1246	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto and_then(_Func&& __f) const& {	1104	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto and_then(_Func&& __f) const& {
1247	using _Up = invoke_result_t<_Func, const _Tp&>;	1105	using _Up = invoke_result_t<_Func, const _Tp&>;
1248	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,	1106	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,
...	@@ -1253,9 +1111,6 @@ public:	...	@@ -1253,9 +1111,6 @@ public:
1253	}	1111	}
1254		1112
1255	template <class _Func>	1113	template <class _Func>
1256	# if _LIBCPP_STD_VER >= 26
1257	requires(is_object_v<_Tp>)
1258	# endif
1259	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto and_then(_Func&& __f) && {	1114	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto and_then(_Func&& __f) && {
1260	using _Up = invoke_result_t<_Func, _Tp&&>;	1115	using _Up = invoke_result_t<_Func, _Tp&&>;
1261	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,	1116	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,
...	@@ -1266,9 +1121,6 @@ public:	...	@@ -1266,9 +1121,6 @@ public:
1266	}	1121	}
1267		1122
1268	template <class _Func>	1123	template <class _Func>
1269	# if _LIBCPP_STD_VER >= 26
1270	requires(is_object_v<_Tp>)
1271	# endif
1272	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto and_then(_Func&& __f) const&& {	1124	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto and_then(_Func&& __f) const&& {
1273	using _Up = invoke_result_t<_Func, const _Tp&&>;	1125	using _Up = invoke_result_t<_Func, const _Tp&&>;
1274	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,	1126	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,
...	@@ -1279,60 +1131,52 @@ public:	...	@@ -1279,60 +1131,52 @@ public:
1279	}	1131	}
1280		1132
1281	template <class _Func>	1133	template <class _Func>
1282	# if _LIBCPP_STD_VER >= 26
1283	requires(is_object_v<_Tp>)
1284	# endif
1285	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto transform(_Func&& __f) & {	1134	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto transform(_Func&& __f) & {
1286	using _Up = remove_cv_t<invoke_result_t<_Func, _Tp&>>;	1135	using _Up = remove_cv_t<invoke_result_t<_Func, _Tp&>>;
1287	static_assert(!is_array_v<_Up>, "Result of f(value()) should not be an Array");	1136	static_assert(!is_array_v<_Up>, "Result of f(value()) should not be an Array");
1288	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(value()) should not be std::in_place_t");	1137	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(value()) should not be std::in_place_t");
1289	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(value()) should not be std::nullopt_t");	1138	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(value()) should not be std::nullopt_t");
1290	static_assert(is_object_v<_Up>, "Result of f(value()) should be an object type");	1139	static_assert(
		1140	__is_valid_optional_contained_type<_Up>, "Result of f(value()) should be a valid contained type for optional");
1291	if (*this)	1141	if (*this)
1292	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), value());	1142	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), value());
1293	return optional<_Up>();	1143	return optional<_Up>();
1294	}	1144	}
1295		1145
1296	template <class _Func>	1146	template <class _Func>
1297	# if _LIBCPP_STD_VER >= 26
1298	requires(is_object_v<_Tp>)
1299	# endif
1300	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto transform(_Func&& __f) const& {	1147	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto transform(_Func&& __f) const& {
1301	using _Up = remove_cv_t<invoke_result_t<_Func, const _Tp&>>;	1148	using _Up = remove_cv_t<invoke_result_t<_Func, const _Tp&>>;
1302	static_assert(!is_array_v<_Up>, "Result of f(value()) should not be an Array");	1149	static_assert(!is_array_v<_Up>, "Result of f(value()) should not be an Array");
1303	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(value()) should not be std::in_place_t");	1150	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(value()) should not be std::in_place_t");
1304	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(value()) should not be std::nullopt_t");	1151	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(value()) should not be std::nullopt_t");
1305	static_assert(is_object_v<_Up>, "Result of f(value()) should be an object type");	1152	static_assert(
		1153	__is_valid_optional_contained_type<_Up>, "Result of f(value()) should be a valid contained type for optional");
1306	if (*this)	1154	if (*this)
1307	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), value());	1155	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), value());
1308	return optional<_Up>();	1156	return optional<_Up>();
1309	}	1157	}
1310		1158
1311	template <class _Func>	1159	template <class _Func>
1312	# if _LIBCPP_STD_VER >= 26
1313	requires(is_object_v<_Tp>)
1314	# endif
1315	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto transform(_Func&& __f) && {	1160	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto transform(_Func&& __f) && {
1316	using _Up = remove_cv_t<invoke_result_t<_Func, _Tp&&>>;	1161	using _Up = remove_cv_t<invoke_result_t<_Func, _Tp&&>>;
1317	static_assert(!is_array_v<_Up>, "Result of f(std::move(value())) should not be an Array");	1162	static_assert(!is_array_v<_Up>, "Result of f(std::move(value())) should not be an Array");
1318	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(std::move(value())) should not be std::in_place_t");	1163	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(std::move(value())) should not be std::in_place_t");
1319	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(std::move(value())) should not be std::nullopt_t");	1164	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(std::move(value())) should not be std::nullopt_t");
1320	static_assert(is_object_v<_Up>, "Result of f(std::move(value())) should be an object type");	1165	static_assert(
		1166	__is_valid_optional_contained_type<_Up>, "Result of f(value()) should be a valid contained type for optional");
1321	if (*this)	1167	if (*this)
1322	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), std::move(value()));	1168	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), std::move(value()));
1323	return optional<_Up>();	1169	return optional<_Up>();
1324	}	1170	}
1325		1171
1326	template <class _Func>	1172	template <class _Func>
1327	# if _LIBCPP_STD_VER >= 26
1328	requires(is_object_v<_Tp>)
1329	# endif
1330	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto transform(_Func&& __f) const&& {	1173	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto transform(_Func&& __f) const&& {
1331	using _Up = remove_cv_t<invoke_result_t<_Func, const _Tp&&>>;	1174	using _Up = remove_cv_t<invoke_result_t<_Func, const _Tp&&>>;
1332	static_assert(!is_array_v<_Up>, "Result of f(std::move(value())) should not be an Array");	1175	static_assert(!is_array_v<_Up>, "Result of f(std::move(value())) should not be an Array");
1333	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(std::move(value())) should not be std::in_place_t");	1176	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(std::move(value())) should not be std::in_place_t");
1334	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(std::move(value())) should not be std::nullopt_t");	1177	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(std::move(value())) should not be std::nullopt_t");
1335	static_assert(is_object_v<_Up>, "Result of f(std::move(value())) should be an object type");	1178	static_assert(
		1179	__is_valid_optional_contained_type<_Up>, "Result of f(value()) should be a valid contained type for optional");
1336	if (*this)	1180	if (*this)
1337	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), std::move(value()));	1181	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), std::move(value()));
1338	return optional<_Up>();	1182	return optional<_Up>();
...	@@ -1341,9 +1185,6 @@ public:	...	@@ -1341,9 +1185,6 @@ public:
1341	template <invocable _Func>	1185	template <invocable _Func>
1342	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr optional or_else(_Func&& __f) const&	1186	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr optional or_else(_Func&& __f) const&
1343	requires is_copy_constructible_v<_Tp>	1187	requires is_copy_constructible_v<_Tp>
1344	# if _LIBCPP_STD_VER >= 26
1345	&& (is_object_v<_Tp>)
1346	# endif
1347	{	1188	{
1348	static_assert(is_same_v<remove_cvref_t<invoke_result_t<_Func>>, optional>,	1189	static_assert(is_same_v<remove_cvref_t<invoke_result_t<_Func>>, optional>,
1349	"Result of f() should be the same type as this optional");	1190	"Result of f() should be the same type as this optional");
...	@@ -1355,9 +1196,6 @@ public:	...	@@ -1355,9 +1196,6 @@ public:
1355	template <invocable _Func>	1196	template <invocable _Func>
1356	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr optional or_else(_Func&& __f) &&	1197	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr optional or_else(_Func&& __f) &&
1357	requires is_move_constructible_v<_Tp>	1198	requires is_move_constructible_v<_Tp>
1358	# if _LIBCPP_STD_VER >= 26
1359	&& (is_object_v<_Tp>)
1360	# endif
1361	{	1199	{
1362	static_assert(is_same_v<remove_cvref_t<invoke_result_t<_Func>>, optional>,	1200	static_assert(is_same_v<remove_cvref_t<invoke_result_t<_Func>>, optional>,
1363	"Result of f() should be the same type as this optional");	1201	"Result of f() should be the same type as this optional");
...	@@ -1368,46 +1206,137 @@ public:	...	@@ -1368,46 +1206,137 @@ public:
1368	# endif // _LIBCPP_STD_VER >= 23	1206	# endif // _LIBCPP_STD_VER >= 23
1369		1207
1370	using __base::reset;	1208	using __base::reset;
		1209	};
1371		1210
1372	// optional<T&> overloads
1373	# if _LIBCPP_STD_VER >= 26	1211	# if _LIBCPP_STD_VER >= 26
		1212	template <class _Tp>
		1213	class optional<_Tp&> : public __optional_iterator_base<_Tp&> {
		1214	using __base _LIBCPP_NODEBUG = __optional_iterator_base<_Tp&>;
1374		1215
1375	_LIBCPP_HIDE_FROM_ABI constexpr add_pointer_t<_Tp> operator->() const noexcept	1216	template <class _Up, class _QualUp>
1376	requires(is_lvalue_reference_v<_Tp>)	1217	static constexpr bool __check_optionalU_ctor =
1377	{	1218	!is_same_v<remove_cv_t<_Tp>, optional<_Up>> && !is_same_v<_Tp&, _Up> && is_constructible_v<_Tp&, _QualUp>;
1378	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator-> called on a disengaged value");	1219	static_assert(!is_same_v<remove_cv_t<_Tp>, in_place_t>, "instantiation of optional with in_place_t is ill-formed");
1379	return std::addressof(this->__get());	1220	static_assert(!is_same_v<remove_cv_t<_Tp>, nullopt_t>, "instantiation of optional with nullopt_t is ill-formed");
		1221
		1222	public:
		1223	using value_type = _Tp;
		1224
		1225	constexpr optional() noexcept = default;
		1226	constexpr optional(nullopt_t) noexcept {}
		1227	constexpr optional(const optional&) noexcept = default;
		1228
		1229	template <class _Arg>
		1230	requires(is_constructible_v<_Tp&, _Arg> && !reference_constructs_from_temporary_v<_Tp&, _Arg>)
		1231	constexpr explicit optional(in_place_t, _Arg&& __arg) : __base(in_place, std::forward<_Arg>(__arg)) {}
		1232
		1233	template <class _Up>
		1234	requires(!is_same_v<remove_cvref_t<_Up>, optional> && !is_same_v<remove_cvref_t<_Up>, in_place_t> &&
		1235	is_constructible_v<_Tp&, _Up> && !reference_constructs_from_temporary_v<_Tp&, _Up>)
		1236	constexpr explicit(!is_convertible_v<_Up, _Tp&>) optional(_Up&& __v) noexcept(is_nothrow_constructible_v<_Tp&, _Up>)
		1237	: __base(in_place, std::forward<_Up>(__v)) {}
		1238
		1239	template <class _Up>
		1240	requires(__check_optionalU_ctor<_Up, _Up&> && !reference_constructs_from_temporary_v<_Tp&, _Up&>)
		1241	constexpr explicit(!is_convertible_v<_Up&, _Tp&>)
		1242	optional(optional<_Up>& __rhs) noexcept(is_nothrow_constructible_v<_Tp&, _Up&>) {
		1243	this->__construct_from(__rhs);
1380	}	1244	}
1381		1245
1382	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp& operator*() const noexcept	1246	template <class _Up>
1383	requires(is_lvalue_reference_v<_Tp>)	1247	requires(__check_optionalU_ctor<_Up, const _Up&> && !reference_constructs_from_temporary_v<_Tp&, const _Up&>)
1384	{	1248	constexpr explicit(!is_convertible_v<const _Up&, _Tp&>)
1385	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(this->has_value(), "optional operator* called on a disengaged value");	1249	optional(const optional<_Up>& __rhs) noexcept(is_nothrow_constructible_v<_Tp&, const _Up&>) {
1386	return this->__get();	1250	this->__construct_from(__rhs);
1387	}	1251	}
1388		1252
1389	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp& value() const	1253	template <class _Up>
1390	requires(is_lvalue_reference_v<_Tp>)	1254	requires(__check_optionalU_ctor<_Up, _Up> && !reference_constructs_from_temporary_v<_Tp&, _Up>)
1391	{	1255	constexpr explicit(!is_convertible_v<_Up, _Tp&>)
1392	if (!this->has_value())	1256	optional(optional<_Up>&& __rhs) noexcept(is_nothrow_constructible_v<_Tp&, _Up>) {
1393	std::__throw_bad_optional_access();	1257	this->__construct_from(std::move(__rhs));
		1258	}
		1259
		1260	template <class _Up>
		1261	requires(__check_optionalU_ctor<_Up, const _Up> && !reference_constructs_from_temporary_v<_Tp&, const _Up>)
		1262	constexpr explicit(!is_convertible_v<const _Up, _Tp&>)
		1263	optional(const optional<_Up>&& __rhs) noexcept(is_nothrow_constructible_v<_Tp&, const _Up>) {
		1264	this->__construct_from(std::move(__rhs));
		1265	}
		1266
		1267	template <class _Tag, class _Fp, class... _Args>
		1268	requires(is_same_v<_Tag, __optional_construct_from_invoke_tag>)
		1269	_LIBCPP_HIDE_FROM_ABI constexpr explicit optional(_Tag, _Fp&& __f, _Args&&... __args)
		1270	: __base(__optional_construct_from_invoke_tag{}, std::forward<_Fp>(__f), std::forward<_Args>(__args)...) {}
		1271
		1272	// deleted overloads
		1273
		1274	template <class _Up>
		1275	requires(!is_same_v<remove_cvref_t<_Up>, optional> && !is_same_v<remove_cvref_t<_Up>, in_place_t> &&
		1276	is_constructible_v<_Tp&, _Up> && reference_constructs_from_temporary_v<_Tp&, _Up>)
		1277	constexpr explicit(!is_convertible_v<_Up, _Tp&>)
		1278	optional(_Up&& __v) noexcept(is_nothrow_constructible_v<_Tp&, _Up>) = delete;
		1279
		1280	template <class _Up>
		1281	requires(__check_optionalU_ctor<_Up, _Up&> && reference_constructs_from_temporary_v<_Tp&, _Up&>)
		1282	constexpr explicit(!is_convertible_v<_Up&, _Tp&>)
		1283	optional(optional<_Up>& __rhs) noexcept(is_nothrow_constructible_v<_Tp&, _Up&>) = delete;
		1284
		1285	template <class _Up>
		1286	requires(__check_optionalU_ctor<_Up, const _Up&> && reference_constructs_from_temporary_v<_Tp&, const _Up&>)
		1287	constexpr explicit(!is_convertible_v<const _Up&, _Tp&>)
		1288	optional(const optional<_Up>& __rhs) noexcept(is_nothrow_constructible_v<_Tp&, const _Up&>) = delete;
		1289
		1290	template <class _Up>
		1291	requires(__check_optionalU_ctor<_Up, _Up> && reference_constructs_from_temporary_v<_Tp&, _Up>)
		1292	constexpr explicit(!is_convertible_v<_Up, _Tp&>)
		1293	optional(optional<_Up>&& __rhs) noexcept(is_nothrow_constructible_v<_Tp&, _Up>) = delete;
		1294
		1295	template <class _Up>
		1296	requires(__check_optionalU_ctor<_Up, const _Up> && reference_constructs_from_temporary_v<_Tp&, const _Up>)
		1297	constexpr explicit(!is_convertible_v<const _Up, _Tp&>)
		1298	optional(const optional<_Up>&& __rhs) noexcept(is_nothrow_constructible_v<_Tp&, const _Up>) = delete;
		1299
		1300	constexpr ~optional() = default;
		1301
		1302	using __base::__get;
		1303
		1304	_LIBCPP_HIDE_FROM_ABI constexpr optional& operator=(nullopt_t) noexcept {
		1305	reset();
		1306	return *this;
		1307	}
		1308
		1309	constexpr optional& operator=(const optional&) noexcept = default;
		1310
		1311	template <class _Up>
		1312	requires(is_constructible_v<_Tp&, _Up> && !reference_constructs_from_temporary_v<_Tp&, _Up>)
		1313	constexpr _Tp& emplace(_Up&& __u) noexcept(is_nothrow_constructible_v<_Tp&, _Up>) {
		1314	this->__construct(std::forward<_Up>(__u));
		1315
1394	return this->__get();	1316	return this->__get();
1395	}	1317	}
1396		1318
1397	template <class _Up = remove_cvref_t<_Tp>>	1319	constexpr void swap(optional& __rhs) noexcept { this->__swap(__rhs); }
1398	requires(is_lvalue_reference_v<_Tp> && is_object_v<__libcpp_remove_reference_t<_Tp>> &&	1320
1399	!is_array_v<__libcpp_remove_reference_t<_Tp>>)	1321	using __base::operator->;
1400	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decay_t<_Tp> value_or(_Up&& __v) const {	1322	using __base::operator*;
1401	static_assert(	1323
1402	is_constructible_v<remove_cvref_t<_Tp>, _Tp&>, "optional<T&>::value_or: remove_cv_t<T> must be constructible");	1324	constexpr explicit operator bool() const noexcept { return has_value(); }
1403	static_assert(	1325
1404	is_convertible_v<_Up, remove_cvref_t<_Tp>>, "optional<T&>::value_or: U must be convertible to remove_cv_t<T>");	1326	using __base::has_value;
1405	return this->has_value() ? this->__get() : static_cast<remove_cvref_t<_Tp>>(std::forward<_Up>(__v));	1327	using __base::value;
		1328
		1329	template <class _Up = remove_cv_t<_Tp>>
		1330	requires(!is_array_v<_Tp> && is_object_v<_Tp>)
		1331	[[nodiscard]] constexpr decay_t<_Tp> value_or(_Up&& __v) const {
		1332	using _XTp = remove_cv_t<_Tp>;
		1333	static_assert(is_constructible_v<_XTp, _Tp&>, "optional<T&>::value_or: remove_cv_t<T> must be constructible");
		1334	static_assert(is_convertible_v<_Up, _XTp>, "optional<T&>::value_or: U must be convertible to remove_cv_t<T>");
		1335	return this->has_value() ? this->__get() : static_cast<_XTp>(std::forward<_Up>(__v));
1406	}	1336	}
1407		1337
1408	template <class _Func>	1338	template <class _Func>
1409	requires(is_lvalue_reference_v<_Tp>)	1339	[[nodiscard]] constexpr auto and_then(_Func&& __f) const {
1410	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto and_then(_Func&& __f) const {
1411	using _Up = invoke_result_t<_Func, _Tp&>;	1340	using _Up = invoke_result_t<_Func, _Tp&>;
1412	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,	1341	static_assert(__is_std_optional<remove_cvref_t<_Up>>::value,
1413	"Result of f(value()) must be a specialization of std::optional");	1342	"Result of f(value()) must be a specialization of std::optional");
...	@@ -1417,30 +1346,31 @@ public:	...	@@ -1417,30 +1346,31 @@ public:
1417	}	1346	}
1418		1347
1419	template <class _Func>	1348	template <class _Func>
1420	requires(is_lvalue_reference_v<_Tp>)	1349	[[nodiscard]] constexpr optional<remove_cv_t<invoke_result_t<_Func, _Tp&>>> transform(_Func&& __f) const {
1421	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr optional<remove_cv_t<invoke_result_t<_Func, _Tp&>>>	1350	using _Up = remove_cv_t<invoke_result_t<_Func, _Tp&>>;
1422	transform(_Func&& __f) const {
1423	using _Up = remove_cvref_t<invoke_result_t<_Func, _Tp&>>;
1424	static_assert(!is_array_v<_Up>, "Result of f(value()) should not be an Array");	1351	static_assert(!is_array_v<_Up>, "Result of f(value()) should not be an Array");
1425	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(value()) should not be std::in_place_t");	1352	static_assert(!is_same_v<_Up, in_place_t>, "Result of f(value()) should not be std::in_place_t");
1426	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(value()) should not be std::nullopt_t");	1353	static_assert(!is_same_v<_Up, nullopt_t>, "Result of f(value()) should not be std::nullopt_t");
1427	static_assert(is_object_v<_Up>, "Result of f(value()) should be an object type");	1354	static_assert(
		1355	__is_valid_optional_contained_type<_Up>, "Result of f(value()) should be a valid contained type for optional");
		1356
1428	if (*this)	1357	if (*this)
1429	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), value());	1358	return optional<_Up>(__optional_construct_from_invoke_tag{}, std::forward<_Func>(__f), value());
1430	return optional<_Up>();	1359	return optional<_Up>();
1431	}	1360	}
1432		1361
1433	template <invocable _Func>	1362	template <invocable _Func>
1434	requires(is_lvalue_reference_v<_Tp>)	1363	[[nodiscard]] constexpr optional or_else(_Func&& __f) const {
1435	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr optional or_else(_Func&& __f) const {
1436	static_assert(is_same_v<remove_cvref_t<invoke_result_t<_Func>>, optional>,	1364	static_assert(is_same_v<remove_cvref_t<invoke_result_t<_Func>>, optional>,
1437	"Result of f() should be the same type as this optional");	1365	"Result of f() should be the same type as this optional");
1438	if (*this)	1366	if (*this)
1439	return *this;	1367	return *this;
1440	return std::forward<_Func>(__f)();	1368	return std::forward<_Func>(__f)();
1441	}	1369	}
1442	# endif	1370
		1371	using __base::reset;
1443	};	1372	};
		1373	# endif
1444		1374
1445	template <class _Tp>	1375	template <class _Tp>
1446	optional(_Tp) -> optional<_Tp>;	1376	optional(_Tp) -> optional<_Tp>;
...	@@ -1749,7 +1679,13 @@ operator<=>(const optional<_Tp>& __x, const _Up& __v) {	...	@@ -1749,7 +1679,13 @@ operator<=>(const optional<_Tp>& __x, const _Up& __v) {
1749		1679
1750	# endif // _LIBCPP_STD_VER >= 20	1680	# endif // _LIBCPP_STD_VER >= 20
1751		1681
1752	template <class _Tp, enable_if_t< is_move_constructible_v<_Tp> && is_swappable_v<_Tp>, int> = 0>	1682	template <class _Tp,
		1683	enable_if_t<(is_move_constructible_v<_Tp> && is_swappable_v<_Tp>)
		1684	# if _LIBCPP_STD_VER >= 26
		1685	\|\| is_reference_v<_Tp>
		1686	# endif
		1687	,
		1688	int> = 0>
1753	inline _LIBCPP_HIDE_FROM_ABI	1689	inline _LIBCPP_HIDE_FROM_ABI
1754	_LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(optional<_Tp>& __x, optional<_Tp>& __y) noexcept(noexcept(__x.swap(__y))) {	1690	_LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(optional<_Tp>& __x, optional<_Tp>& __y) noexcept(noexcept(__x.swap(__y))) {
1755	__x.swap(__y);	1691	__x.swap(__y);
...	@@ -1759,6 +1695,28 @@ struct __make_optional_barrier_tag {	...	@@ -1759,6 +1695,28 @@ struct __make_optional_barrier_tag {
1759	explicit __make_optional_barrier_tag() = default;	1695	explicit __make_optional_barrier_tag() = default;
1760	};	1696	};
1761		1697
		1698	template <class _Tp, class... _Args>
		1699	inline constexpr bool __is_constructible_for_optional_v = is_constructible_v<_Tp, _Args...>;
		1700
		1701	template <class _Tp, class... _Args>
		1702	struct __is_constructible_for_optional : bool_constant<__is_constructible_for_optional_v<_Tp, _Args...>> {};
		1703
		1704	template <class _Tp, class _Up, class... _Args>
		1705	inline constexpr bool __is_constructible_for_optional_initializer_list_v =
		1706	is_constructible_v<_Tp, initializer_list<_Up>&, _Args...>;
		1707
		1708	# if _LIBCPP_STD_VER >= 26
		1709	template <class _Tp, class... _Args>
		1710	inline constexpr bool __is_constructible_for_optional_v<_Tp&, _Args...> = false;
		1711
		1712	template <class _Tp, class _Arg>
		1713	inline constexpr bool __is_constructible_for_optional_v<_Tp&, _Arg> =
		1714	is_constructible_v<_Tp&, _Arg> && !reference_constructs_from_temporary_v<_Tp&, _Arg>;
		1715
		1716	template <class _Tp, class _Up, class... _Args>
		1717	inline constexpr bool __is_constructible_for_optional_initializer_list_v<_Tp&, _Up, _Args...> = false;
		1718	# endif
		1719
1762	template <	1720	template <
1763	# if _LIBCPP_STD_VER >= 26	1721	# if _LIBCPP_STD_VER >= 26
1764	__make_optional_barrier_tag = __make_optional_barrier_tag{},	1722	__make_optional_barrier_tag = __make_optional_barrier_tag{},
...	@@ -1801,7 +1759,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -1801,7 +1759,7 @@ _LIBCPP_END_NAMESPACE_STD
1801		1759
1802	_LIBCPP_POP_MACROS	1760	_LIBCPP_POP_MACROS
1803		1761
1804	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	1762	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
1805	# include <atomic>	1763	# include <atomic>
1806	# include <climits>	1764	# include <climits>
1807	# include <concepts>	1765	# include <concepts>

lib/libcxx/include/ostream+2-2

...	@@ -193,7 +193,7 @@ void vprint_nonunicode(ostream& os, string_view fmt, format_args args);	...	@@ -193,7 +193,7 @@ void vprint_nonunicode(ostream& os, string_view fmt, format_args args);
193		193
194	# endif // _LIBCPP_HAS_LOCALIZATION	194	# endif // _LIBCPP_HAS_LOCALIZATION
195		195
196	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	196	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
197	# include <atomic>	197	# include <atomic>
198	# include <concepts>	198	# include <concepts>
199	# include <cstdio>	199	# include <cstdio>
...	@@ -206,7 +206,7 @@ void vprint_nonunicode(ostream& os, string_view fmt, format_args args);	...	@@ -206,7 +206,7 @@ void vprint_nonunicode(ostream& os, string_view fmt, format_args args);
206	# include <type_traits>	206	# include <type_traits>
207	# endif	207	# endif
208		208
209	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 23	209	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
210	# include <locale>	210	# include <locale>
211	# endif	211	# endif
212		212

lib/libcxx/include/print+56-80

...	@@ -52,12 +52,15 @@ namespace std {	...	@@ -52,12 +52,15 @@ namespace std {
52	# pragma GCC system_header	52	# pragma GCC system_header
53	# endif	53	# endif
54		54
		55	# if _LIBCPP_STD_VER >= 23
		56
55	_LIBCPP_BEGIN_NAMESPACE_STD	57	_LIBCPP_BEGIN_NAMESPACE_STD
56		58
57	# ifdef _LIBCPP_WIN32API	59	# ifdef _LIBCPP_WIN32API
		60	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
58	_LIBCPP_EXPORTED_FROM_ABI bool __is_windows_terminal(FILE* __stream);	61	_LIBCPP_EXPORTED_FROM_ABI bool __is_windows_terminal(FILE* __stream);
59		62
60	# if _LIBCPP_HAS_WIDE_CHARACTERS	63	# if _LIBCPP_HAS_WIDE_CHARACTERS
61	// A wrapper for WriteConsoleW which is used to write to the Windows	64	// A wrapper for WriteConsoleW which is used to write to the Windows
62	// console. This function is in the dylib to avoid pulling in windows.h	65	// console. This function is in the dylib to avoid pulling in windows.h
63	// in the library headers. The function itself uses some private parts	66	// in the library headers. The function itself uses some private parts
...	@@ -68,12 +71,9 @@ _LIBCPP_EXPORTED_FROM_ABI bool __is_windows_terminal(FILE* __stream);	...	@@ -68,12 +71,9 @@ _LIBCPP_EXPORTED_FROM_ABI bool __is_windows_terminal(FILE* __stream);
68	//	71	//
69	// Note the function is only implemented on the Windows platform.	72	// Note the function is only implemented on the Windows platform.
70	_LIBCPP_EXPORTED_FROM_ABI void __write_to_windows_console(FILE* __stream, wstring_view __view);	73	_LIBCPP_EXPORTED_FROM_ABI void __write_to_windows_console(FILE* __stream, wstring_view __view);
71	# endif // _LIBCPP_HAS_WIDE_CHARACTERS	74	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
72	# elif __has_include(<unistd.h>)	75	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
73	_LIBCPP_EXPORTED_FROM_ABI bool __is_posix_terminal(FILE* __stream);	76	# endif // _LIBCPP_WIN32API
74	# endif // _LIBCPP_WIN32API
75
76	# if _LIBCPP_STD_VER >= 23
77		77
78	# if _LIBCPP_HAS_UNICODE	78	# if _LIBCPP_HAS_UNICODE
79	// This is the code to transcode UTF-8 to UTF-16. This is used on	79	// This is the code to transcode UTF-8 to UTF-16. This is used on
...	@@ -197,36 +197,30 @@ inline constexpr bool __use_unicode_execution_charset = _MSVC_EXECUTION_CHARACTE	...	@@ -197,36 +197,30 @@ inline constexpr bool __use_unicode_execution_charset = _MSVC_EXECUTION_CHARACTE
197	inline constexpr bool __use_unicode_execution_charset = true;	197	inline constexpr bool __use_unicode_execution_charset = true;
198	# endif	198	# endif
199		199
		200	# ifdef _LIBCPP_WIN32API
200	_LIBCPP_HIDE_FROM_ABI inline bool __is_terminal([[maybe_unused]] FILE* __stream) {	201	_LIBCPP_HIDE_FROM_ABI inline bool __is_terminal([[maybe_unused]] FILE* __stream) {
201	// The macro _LIBCPP_TESTING_PRINT_IS_TERMINAL is used to change	202	// The macro _LIBCPP_TESTING_PRINT_IS_TERMINAL is used to change
202	// the behavior in the test. This is not part of the public API.	203	// the behavior in the test. This is not part of the public API.
203	# ifdef _LIBCPP_TESTING_PRINT_IS_TERMINAL	204	# ifdef _LIBCPP_TESTING_PRINT_IS_TERMINAL
204	return _LIBCPP_TESTING_PRINT_IS_TERMINAL(__stream);	205	return _LIBCPP_TESTING_PRINT_IS_TERMINAL(__stream);
205	# elif _LIBCPP_AVAILABILITY_HAS_PRINT == 0 \|\| !_LIBCPP_HAS_TERMINAL	206	# else
206	return false;
207	# elif defined(_LIBCPP_WIN32API)
208	return std::__is_windows_terminal(__stream);	207	return std::__is_windows_terminal(__stream);
209	# elif __has_include(<unistd.h>)	208	# endif
210	return std::__is_posix_terminal(__stream);	209	}
211	# else	210	# endif // _LIBCPP_WIN32API
212	# error "Provide a way to determine whether a FILE* is a terminal"	211
213	# endif	212	[[noreturn]] _LIBCPP_HIDE_FROM_ABI inline void __handle_output_error(FILE* __stream) {
		213	if (std::feof(__stream))
		214	std::__throw_system_error(EIO, "EOF while writing the formatted output");
		215	std::__throw_system_error(std::ferror(__stream), "failed to write formatted output");
214	}	216	}
215		217
216	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).	218	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
217	_LIBCPP_HIDE_FROM_ABI inline void	219	_LIBCPP_HIDE_FROM_ABI inline void __output_nonunicode(FILE* __stream, string_view __text) {
218	__vprint_nonunicode(FILE* __stream, string_view __fmt, format_args __args, bool __write_nl) {
219	_LIBCPP_ASSERT_NON_NULL(__stream, "__stream must be a valid pointer to an output C stream");	220	_LIBCPP_ASSERT_NON_NULL(__stream, "__stream must be a valid pointer to an output C stream");
220	string __str = std::vformat(__fmt, __args);	221	size_t __size = std::fwrite(__text.data(), 1, __text.size(), __stream);
221	if (__write_nl)	222	if (__size < __text.size())
222	__str.push_back('\n');	223	__print::__handle_output_error(__stream);
223
224	size_t __size = fwrite(__str.data(), 1, __str.size(), __stream);
225	if (__size < __str.size()) {
226	if (std::feof(__stream))
227	std::__throw_system_error(EIO, "EOF while writing the formatted output");
228	std::__throw_system_error(std::ferror(__stream), "failed to write formatted output");
229	}
230	}	224	}
231		225
232	# if _LIBCPP_HAS_UNICODE	226	# if _LIBCPP_HAS_UNICODE
...	@@ -236,27 +230,10 @@ __vprint_nonunicode(FILE* __stream, string_view __fmt, format_args __args, bool	...	@@ -236,27 +230,10 @@ __vprint_nonunicode(FILE* __stream, string_view __fmt, format_args __args, bool
236	// terminal when the output is redirected. Typically during testing the	230	// terminal when the output is redirected. Typically during testing the
237	// output is redirected to be able to capture it. This makes it hard to	231	// output is redirected to be able to capture it. This makes it hard to
238	// test this code path.	232	// test this code path.
239	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
240	_LIBCPP_HIDE_FROM_ABI inline void
241	__vprint_unicode_posix(FILE* __stream, string_view __fmt, format_args __args, bool __write_nl, bool __is_terminal) {
242	// TODO PRINT Should flush errors throw too?
243	if (__is_terminal)
244	std::fflush(__stream);
245
246	__print::__vprint_nonunicode(__stream, __fmt, __args, __write_nl);
247	}
248		233
249	# if _LIBCPP_HAS_WIDE_CHARACTERS	234	# if _LIBCPP_HAS_WIDE_CHARACTERS
250	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).	235	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
251	_LIBCPP_HIDE_FROM_ABI inline void	236	_LIBCPP_HIDE_FROM_ABI inline void __output_unicode_windows([[maybe_unused]] FILE* __stream, string_view __text) {
252	__vprint_unicode_windows(FILE* __stream, string_view __fmt, format_args __args, bool __write_nl, bool __is_terminal) {
253	if (!__is_terminal)
254	return __print::__vprint_nonunicode(__stream, __fmt, __args, __write_nl);
255
256	// TODO PRINT Should flush errors throw too?
257	std::fflush(__stream);
258
259	string __str = std::vformat(__fmt, __args);
260	// UTF-16 uses the same number or less code units than UTF-8.	237	// UTF-16 uses the same number or less code units than UTF-8.
261	// However the size of the code unit is 16 bits instead of 8 bits.	238	// However the size of the code unit is 16 bits instead of 8 bits.
262	//	239	//
...	@@ -266,11 +243,8 @@ __vprint_unicode_windows(FILE* __stream, string_view __fmt, format_args __args,	...	@@ -266,11 +243,8 @@ __vprint_unicode_windows(FILE* __stream, string_view __fmt, format_args __args,
266	// the final size might be larger when the estimate is wrong.	243	// the final size might be larger when the estimate is wrong.
267	//	244	//
268	// TODO PRINT profile and improve the speed of this code.	245	// TODO PRINT profile and improve the speed of this code.
269	__format::__retarget_buffer<wchar_t> __buffer{__str.size()};	246	__format::__retarget_buffer<wchar_t> __buffer{__text.size()};
270	__unicode::__transcode(__str.begin(), __str.end(), __buffer.__make_output_iterator());	247	__unicode::__transcode(__text.begin(), __text.end(), __buffer.__make_output_iterator());
271	if (__write_nl)
272	__buffer.push_back(L'\n');
273
274	[[maybe_unused]] wstring_view __view = __buffer.__view();	248	[[maybe_unused]] wstring_view __view = __buffer.__view();
275		249
276	// The macro _LIBCPP_TESTING_PRINT_WRITE_TO_WINDOWS_CONSOLE_FUNCTION is used to change	250	// The macro _LIBCPP_TESTING_PRINT_WRITE_TO_WINDOWS_CONSOLE_FUNCTION is used to change
...	@@ -287,11 +261,7 @@ __vprint_unicode_windows(FILE* __stream, string_view __fmt, format_args __args,	...	@@ -287,11 +261,7 @@ __vprint_unicode_windows(FILE* __stream, string_view __fmt, format_args __args,
287	# endif // _LIBCPP_HAS_WIDE_CHARACTERS	261	# endif // _LIBCPP_HAS_WIDE_CHARACTERS
288		262
289	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).	263	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
290	_LIBCPP_HIDE_FROM_ABI inline void	264	_LIBCPP_HIDE_FROM_ABI inline void __output_unicode([[maybe_unused]] FILE* __stream, string_view __text) {
291	__vprint_unicode([[maybe_unused]] FILE* __stream,
292	[[maybe_unused]] string_view __fmt,
293	[[maybe_unused]] format_args __args,
294	[[maybe_unused]] bool __write_nl) {
295	_LIBCPP_ASSERT_NON_NULL(__stream, "__stream must be a valid pointer to an output C stream");	265	_LIBCPP_ASSERT_NON_NULL(__stream, "__stream must be a valid pointer to an output C stream");
296		266
297	// [print.fun]	267	// [print.fun]
...	@@ -302,9 +272,6 @@ __vprint_unicode([[maybe_unused]] FILE* __stream,	...	@@ -302,9 +272,6 @@ __vprint_unicode([[maybe_unused]] FILE* __stream,
302	// Otherwise writes out to stream unchanged. If the native	272	// Otherwise writes out to stream unchanged. If the native
303	// Unicode API is used, the function flushes stream before	273	// Unicode API is used, the function flushes stream before
304	// writing out.	274	// writing out.
305	// 8 - Throws: Any exception thrown by the call to vformat
306	// ([format.err.report]). system_error if writing to the terminal
307	// or stream fails. May throw bad_alloc.
308	// 9 - Recommended practice: If invoking the native Unicode API	275	// 9 - Recommended practice: If invoking the native Unicode API
309	// requires transcoding, implementations should substitute	276	// requires transcoding, implementations should substitute
310	// invalid code units with U+FFFD replacement character per the	277	// invalid code units with U+FFFD replacement character per the
...	@@ -316,9 +283,15 @@ __vprint_unicode([[maybe_unused]] FILE* __stream,	...	@@ -316,9 +283,15 @@ __vprint_unicode([[maybe_unused]] FILE* __stream,
316	// Windows there is a different API. This API requires transcoding.	283	// Windows there is a different API. This API requires transcoding.
317		284
318	# ifndef _LIBCPP_WIN32API	285	# ifndef _LIBCPP_WIN32API
319	__print::__vprint_unicode_posix(__stream, __fmt, __args, __write_nl, __print::__is_terminal(__stream));	286	__print::__output_nonunicode(__stream, __text);
320	# elif _LIBCPP_HAS_WIDE_CHARACTERS	287	# elif _LIBCPP_HAS_WIDE_CHARACTERS
321	__print::__vprint_unicode_windows(__stream, __fmt, __args, __write_nl, __print::__is_terminal(__stream));	288	if (__print::__is_terminal(__stream)) {
		289	// TODO PRINT Should flush errors throw too?
		290	std::fflush(__stream);
		291	__print::__output_unicode_windows(__stream, __text);
		292	} else {
		293	__print::__output_nonunicode(__stream, __text);
		294	}
322	# else	295	# else
323	# error "Windows builds with wchar_t disabled are not supported."	296	# error "Windows builds with wchar_t disabled are not supported."
324	# endif	297	# endif
...	@@ -329,51 +302,54 @@ __vprint_unicode([[maybe_unused]] FILE* __stream,	...	@@ -329,51 +302,54 @@ __vprint_unicode([[maybe_unused]] FILE* __stream,
329	} // namespace __print	302	} // namespace __print
330		303
331	template <class... _Args>	304	template <class... _Args>
332	_LIBCPP_HIDE_FROM_ABI void	305	_LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE void
333	print(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream, format_string<_Args...> __fmt, _Args&&... __args) {	306	print(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream, format_string<_Args...> __fmt, _Args&&... __args) {
		307	auto __result = std::vformat(__fmt.get(), std::make_format_args(__args...));
334	# if _LIBCPP_HAS_UNICODE	308	# if _LIBCPP_HAS_UNICODE
335	if constexpr (__print::__use_unicode_execution_charset)	309	if constexpr (__print::__use_unicode_execution_charset)
336	__print::__vprint_unicode(__stream, __fmt.get(), std::make_format_args(__args...), false);	310	__print::__output_unicode(__stream, __result);
337	else	311	else
338	__print::__vprint_nonunicode(__stream, __fmt.get(), std::make_format_args(__args...), false);	312	__print::__output_nonunicode(__stream, __result);
339	# else // _LIBCPP_HAS_UNICODE	313	# else // _LIBCPP_HAS_UNICODE
340	__print::__vprint_nonunicode(__stream, __fmt.get(), std::make_format_args(__args...), false);	314	__print::__output_nonunicode(__stream, __result);
341	# endif // _LIBCPP_HAS_UNICODE	315	# endif // _LIBCPP_HAS_UNICODE
342	}	316	}
343		317
344	template <class... _Args>	318	template <class... _Args>
345	_LIBCPP_HIDE_FROM_ABI void print(format_string<_Args...> __fmt, _Args&&... __args) {	319	_LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE void print(format_string<_Args...> __fmt, _Args&&... __args) {
346	std::print(stdout, __fmt, std::forward<_Args>(__args)...);	320	std::print(stdout, __fmt, std::forward<_Args>(__args)...);
347	}	321	}
348		322
349	template <class... _Args>	323	template <class... _Args>
350	_LIBCPP_HIDE_FROM_ABI void	324	_LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE void
351	println(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream, format_string<_Args...> __fmt, _Args&&... __args) {	325	println(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream, format_string<_Args...> __fmt, _Args&&... __args) {
		326	auto __result = std::vformat(__fmt.get(), std::make_format_args(__args...));
		327	__result.push_back('\n');
352	# if _LIBCPP_HAS_UNICODE	328	# if _LIBCPP_HAS_UNICODE
353	// Note the wording in the Standard is inefficient. The output of	329	// Note the wording in the Standard is inefficient. The output of
354	// std::format is a std::string which is then copied. This solution	330	// std::format is a std::string which is then copied. This solution
355	// just appends a newline at the end of the output.	331	// just appends a newline at the end of the output.
356	if constexpr (__print::__use_unicode_execution_charset)	332	if constexpr (__print::__use_unicode_execution_charset)
357	__print::__vprint_unicode(__stream, __fmt.get(), std::make_format_args(__args...), true);	333	__print::__output_unicode(__stream, __result);
358	else	334	else
359	__print::__vprint_nonunicode(__stream, __fmt.get(), std::make_format_args(__args...), true);	335	__print::__output_nonunicode(__stream, __result);
360	# else // _LIBCPP_HAS_UNICODE	336	# else // _LIBCPP_HAS_UNICODE
361	__print::__vprint_nonunicode(__stream, __fmt.get(), std::make_format_args(__args...), true);	337	__print::__output_nonunicode(__stream, __result);
362	# endif // _LIBCPP_HAS_UNICODE	338	# endif // _LIBCPP_HAS_UNICODE
363	}	339	}
364		340
365	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).	341	template <class _Void = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
366	_LIBCPP_HIDE_FROM_ABI inline void println(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream) {	342	_LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE inline void println(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream) {
367	std::print(__stream, "\n");	343	std::print(__stream, (_Void(), "\n"));
368	}	344	}
369		345
370	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).	346	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
371	_LIBCPP_HIDE_FROM_ABI inline void println() {	347	_LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE inline void println() {
372	println(stdout);	348	println(stdout);
373	}	349	}
374		350
375	template <class... _Args>	351	template <class... _Args>
376	_LIBCPP_HIDE_FROM_ABI void println(format_string<_Args...> __fmt, _Args&&... __args) {	352	_LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE void println(format_string<_Args...> __fmt, _Args&&... __args) {
377	std::println(stdout, __fmt, std::forward<_Args>(__args)...);	353	std::println(stdout, __fmt, std::forward<_Args>(__args)...);
378	}	354	}
379		355
...	@@ -381,7 +357,7 @@ _LIBCPP_HIDE_FROM_ABI void println(format_string<_Args...> __fmt, _Args&&... __a	...	@@ -381,7 +357,7 @@ _LIBCPP_HIDE_FROM_ABI void println(format_string<_Args...> __fmt, _Args&&... __a
381	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).	357	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
382	_LIBCPP_HIDE_FROM_ABI inline void	358	_LIBCPP_HIDE_FROM_ABI inline void
383	vprint_unicode(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream, string_view __fmt, format_args __args) {	359	vprint_unicode(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream, string_view __fmt, format_args __args) {
384	__print::__vprint_unicode(__stream, __fmt, __args, false);	360	__print::__output_unicode(__stream, std::vformat(__fmt, __args));
385	}	361	}
386		362
387	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).	363	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
...	@@ -394,7 +370,7 @@ _LIBCPP_HIDE_FROM_ABI inline void vprint_unicode(string_view __fmt, format_args	...	@@ -394,7 +370,7 @@ _LIBCPP_HIDE_FROM_ABI inline void vprint_unicode(string_view __fmt, format_args
394	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).	370	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
395	_LIBCPP_HIDE_FROM_ABI inline void	371	_LIBCPP_HIDE_FROM_ABI inline void
396	vprint_nonunicode(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream, string_view __fmt, format_args __args) {	372	vprint_nonunicode(FILE* _LIBCPP_DIAGNOSE_NULLPTR __stream, string_view __fmt, format_args __args) {
397	__print::__vprint_nonunicode(__stream, __fmt, __args, false);	373	__print::__output_nonunicode(__stream, std::vformat(__fmt, __args));
398	}	374	}
399		375
400	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).	376	template <class = void> // TODO PRINT template or availability markup fires too eagerly (http://llvm.org/PR61563).
...	@@ -402,10 +378,10 @@ _LIBCPP_HIDE_FROM_ABI inline void vprint_nonunicode(string_view __fmt, format_ar	...	@@ -402,10 +378,10 @@ _LIBCPP_HIDE_FROM_ABI inline void vprint_nonunicode(string_view __fmt, format_ar
402	std::vprint_nonunicode(stdout, __fmt, __args);	378	std::vprint_nonunicode(stdout, __fmt, __args);
403	}	379	}
404		380
405	# endif // _LIBCPP_STD_VER >= 23
406
407	_LIBCPP_END_NAMESPACE_STD	381	_LIBCPP_END_NAMESPACE_STD
408		382
		383	# endif // _LIBCPP_STD_VER >= 23
		384
409	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	385	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
410		386
411	#endif // _LIBCPP_PRINT	387	#endif // _LIBCPP_PRINT

lib/libcxx/include/queue+1-1

...	@@ -970,7 +970,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -970,7 +970,7 @@ _LIBCPP_END_NAMESPACE_STD
970		970
971	_LIBCPP_POP_MACROS	971	_LIBCPP_POP_MACROS
972		972
973	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	973	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
974	# include <concepts>	974	# include <concepts>
975	# include <cstdlib>	975	# include <cstdlib>
976	# include <functional>	976	# include <functional>

lib/libcxx/include/random+1-1

...	@@ -1726,7 +1726,7 @@ class piecewise_linear_distribution	...	@@ -1726,7 +1726,7 @@ class piecewise_linear_distribution
1726	# pragma GCC system_header	1726	# pragma GCC system_header
1727	# endif	1727	# endif
1728		1728
1729	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	1729	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
1730	# include <algorithm>	1730	# include <algorithm>
1731	# include <climits>	1731	# include <climits>
1732	# include <cmath>	1732	# include <cmath>

lib/libcxx/include/ranges+39-1

...	@@ -201,6 +201,16 @@ namespace std::ranges {	...	@@ -201,6 +201,16 @@ namespace std::ranges {
201	inline constexpr unspecified filter = unspecified;	201	inline constexpr unspecified filter = unspecified;
202	}	202	}
203		203
		204	// [range.concat], concat view
		205	template <input_range... Views>
		206	requires (view<Views> && ...) && (sizeof...(Views) > 0) &&
		207	concatable<Views...>
		208	class concat_view;
		209
		210	namespace views {
		211	inline constexpr unspecified concat = unspecified;
		212	}
		213
204	// [range.drop], drop view	214	// [range.drop], drop view
205	template<view V>	215	template<view V>
206	class drop_view;	216	class drop_view;
...	@@ -337,6 +347,17 @@ namespace std::ranges {	...	@@ -337,6 +347,17 @@ namespace std::ranges {
337		347
338	namespace views { template<class T> inline constexpr unspecified istream = unspecified; }	348	namespace views { template<class T> inline constexpr unspecified istream = unspecified; }
339		349
		350	// [range.enumerate], enumerate view
		351	template<view View>
		352	requires see below
		353	class enumerate_view; // since C++23
		354
		355	template<class View>
		356	constexpr bool enable_borrowed_range<enumerate_view<View>> = // since C++23
		357	enable_borrowed_range<View>;
		358
		359	namespace views { inline constexpr unspecified enumerate = unspecified; } // since C++23
		360
340	// [range.zip], zip view	361	// [range.zip], zip view
341	template<input_range... Views>	362	template<input_range... Views>
342	requires (view<Views> && ...) && (sizeof...(Views) > 0)	363	requires (view<Views> && ...) && (sizeof...(Views) > 0)
...	@@ -396,6 +417,17 @@ namespace std::ranges {	...	@@ -396,6 +417,17 @@ namespace std::ranges {
396	class chunk_by_view; // C++23	417	class chunk_by_view; // C++23
397		418
398	namespace views { inline constexpr unspecified chunk_by = unspecified; } // C++23	419	namespace views { inline constexpr unspecified chunk_by = unspecified; } // C++23
		420
		421	// [range.stride.view], stride view
		422	template<input_range V>
		423	requires view<V>
		424	class stride_view; // C++23
		425
		426	template<class V>
		427	constexpr bool enable_borrowed_range<stride_view<V>> =
		428	enable_borrowed_range<V>; // C++23
		429
		430	namespace views { inline constexpr unspecified stride = unspecified; } // C++23
399	}	431	}
400		432
401	namespace std {	433	namespace std {
...	@@ -482,14 +514,20 @@ namespace std {	...	@@ -482,14 +514,20 @@ namespace std {
482	# include <__ranges/adjacent_view.h>	514	# include <__ranges/adjacent_view.h>
483	# include <__ranges/as_rvalue_view.h>	515	# include <__ranges/as_rvalue_view.h>
484	# include <__ranges/chunk_by_view.h>	516	# include <__ranges/chunk_by_view.h>
		517	# include <__ranges/enumerate_view.h>
485	# include <__ranges/from_range.h>	518	# include <__ranges/from_range.h>
486	# include <__ranges/join_with_view.h>	519	# include <__ranges/join_with_view.h>
487	# include <__ranges/repeat_view.h>	520	# include <__ranges/repeat_view.h>
		521	# include <__ranges/stride_view.h>
488	# include <__ranges/to.h>	522	# include <__ranges/to.h>
489	# include <__ranges/zip_transform_view.h>	523	# include <__ranges/zip_transform_view.h>
490	# include <__ranges/zip_view.h>	524	# include <__ranges/zip_view.h>
491	# endif	525	# endif
492		526
		527	# if _LIBCPP_STD_VER >= 26
		528	# include <__ranges/concat_view.h>
		529	# endif
		530
493	# include <version>	531	# include <version>
494		532
495	// standard-mandated includes	533	// standard-mandated includes
...	@@ -507,7 +545,7 @@ namespace std {	...	@@ -507,7 +545,7 @@ namespace std {
507	# pragma GCC system_header	545	# pragma GCC system_header
508	# endif	546	# endif
509		547
510	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	548	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
511	# include <cstdlib>	549	# include <cstdlib>
512	# include <iosfwd>	550	# include <iosfwd>
513	# include <type_traits>	551	# include <type_traits>

lib/libcxx/include/ratio+1-1

...	@@ -491,7 +491,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -491,7 +491,7 @@ _LIBCPP_END_NAMESPACE_STD
491		491
492	_LIBCPP_POP_MACROS	492	_LIBCPP_POP_MACROS
493		493
494	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	494	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
495	# include <type_traits>	495	# include <type_traits>
496	# endif	496	# endif
497	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)	497	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/regex+5-2

...	@@ -817,6 +817,7 @@ typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;	...	@@ -817,6 +817,7 @@ typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
817	# include <__iterator/wrap_iter.h>	817	# include <__iterator/wrap_iter.h>
818	# include <__locale>	818	# include <__locale>
819	# include <__memory/addressof.h>	819	# include <__memory/addressof.h>
		820	# include <__memory/pointer_traits.h>
820	# include <__memory/shared_ptr.h>	821	# include <__memory/shared_ptr.h>
821	# include <__memory_resource/polymorphic_allocator.h>	822	# include <__memory_resource/polymorphic_allocator.h>
822	# include <__type_traits/is_swappable.h>	823	# include <__type_traits/is_swappable.h>
...	@@ -840,6 +841,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -840,6 +841,7 @@ _LIBCPP_PUSH_MACROS
840	# define _LIBCPP_REGEX_COMPLEXITY_FACTOR 4096	841	# define _LIBCPP_REGEX_COMPLEXITY_FACTOR 4096
841		842
842	_LIBCPP_BEGIN_NAMESPACE_STD	843	_LIBCPP_BEGIN_NAMESPACE_STD
		844	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
843		845
844	namespace regex_constants {	846	namespace regex_constants {
845		847
...	@@ -5167,7 +5169,7 @@ regex_search(__wrap_iter<_Iter> __first,	...	@@ -5167,7 +5169,7 @@ regex_search(__wrap_iter<_Iter> __first,
5167	const basic_regex<_CharT, _Traits>& __e,	5169	const basic_regex<_CharT, _Traits>& __e,
5168	regex_constants::match_flag_type __flags = regex_constants::match_default) {	5170	regex_constants::match_flag_type __flags = regex_constants::match_default) {
5169	match_results<const _CharT*> __mc;	5171	match_results<const _CharT*> __mc;
5170	bool __r = __e.__search(__first.base(), __last.base(), __mc, __flags);	5172	bool __r = __e.__search(std::__to_address(__first), std::__to_address(__last), __mc, __flags);
5171	__m.__assign(__first, __last, __mc, __flags & regex_constants::__no_update_pos);	5173	__m.__assign(__first, __last, __mc, __flags & regex_constants::__no_update_pos);
5172	return __r;	5174	return __r;
5173	}	5175	}
...	@@ -5807,6 +5809,7 @@ regex_replace(const _CharT* __s,	...	@@ -5807,6 +5809,7 @@ regex_replace(const _CharT* __s,
5807	return __r;	5809	return __r;
5808	}	5810	}
5809		5811
		5812	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
5810	_LIBCPP_END_NAMESPACE_STD	5813	_LIBCPP_END_NAMESPACE_STD
5811		5814
5812	# if _LIBCPP_STD_VER >= 17	5815	# if _LIBCPP_STD_VER >= 17
...	@@ -5831,7 +5834,7 @@ _LIBCPP_POP_MACROS	...	@@ -5831,7 +5834,7 @@ _LIBCPP_POP_MACROS
5831		5834
5832	# endif // _LIBCPP_HAS_LOCALIZATION	5835	# endif // _LIBCPP_HAS_LOCALIZATION
5833		5836
5834	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	5837	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
5835	# include <atomic>	5838	# include <atomic>
5836	# include <concepts>	5839	# include <concepts>
5837	# include <cstdlib>	5840	# include <cstdlib>

lib/libcxx/include/scoped_allocator+5-5

 @@ -135,10 +135,10 @@ template <class OuterA1, class OuterA2, class... InnerAllocs>
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if !defined(_LIBCPP_CXX03_LANG)
+_LIBCPP_BEGIN_NAMESPACE_STD
 // scoped_allocator_adaptor
 template <class... _Allocs>
 @@ -558,13 +558,13 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const scoped_allocator_adaptor<_Out
 #    endif // _LIBCPP_STD_VER <= 17
-#  endif // !defined(_LIBCPP_CXX03_LANG)
 _LIBCPP_END_NAMESPACE_STD
+#  endif // !defined(_LIBCPP_CXX03_LANG)
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <atomic>
 #    include <climits>
 #    include <concepts>

lib/libcxx/include/semaphore+1-1

...	@@ -180,7 +180,7 @@ _LIBCPP_POP_MACROS	...	@@ -180,7 +180,7 @@ _LIBCPP_POP_MACROS
180		180
181	# endif // _LIBCPP_HAS_THREADS	181	# endif // _LIBCPP_HAS_THREADS
182		182
183	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	183	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
184	# include <atomic>	184	# include <atomic>
185	# include <cstddef>	185	# include <cstddef>
186	# endif	186	# endif

lib/libcxx/include/set+373-214

 @@ -71,12 +71,12 @@ public:
         const allocator_type& a);
     template <class InputIterator>
         set(InputIterator first, InputIterator last, const allocator_type& a)
-            : set(first, last, Compare(), a) {}  // C++14
+            : set(first, last, Compare(), a) {}
     template<container-compatible-range<value_type> R>
       set(from_range_t, R&& rg, const Allocator& a))
         : set(from_range, std::forward<R>(rg), Compare(), a) { } // C++23
     set(initializer_list<value_type> il, const allocator_type& a)
-        : set(il, Compare(), a) {}  // C++14
+        : set(il, Compare(), a) {}
     ~set();
     set& operator=(const set& s);
 @@ -316,12 +316,12 @@ public:
              const allocator_type& a);
     template <class InputIterator>
         multiset(InputIterator first, InputIterator last, const allocator_type& a)
-            : set(first, last, Compare(), a) {}  // C++14
+            : set(first, last, Compare(), a) {}
     template<container-compatible-range<value_type> R>
       multiset(from_range_t, R&& rg, const Allocator& a))
         : multiset(from_range, std::forward<R>(rg), Compare(), a) { } // C++23
     multiset(initializer_list<value_type> il, const allocator_type& a)
-        : set(il, Compare(), a) {}  // C++14
+        : set(il, Compare(), a) {}
     ~multiset();
     multiset& operator=(const multiset& s);
 @@ -615,24 +615,27 @@ public:
   template <class _Key2, class _Compare2, class _Alloc2>
   friend class multiset;
-  _LIBCPP_HIDE_FROM_ABI set() _NOEXCEPT_(
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set() _NOEXCEPT_(
       is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_default_constructible<key_compare>::value&&
           is_nothrow_copy_constructible<key_compare>::value)
       : __tree_(value_compare()) {}
-  _LIBCPP_HIDE_FROM_ABI explicit set(const value_compare& __comp) _NOEXCEPT_(
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit set(const value_compare& __comp) _NOEXCEPT_(
       is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_copy_constructible<key_compare>::value)
       : __tree_(__comp) {}
-  _LIBCPP_HIDE_FROM_ABI explicit set(const value_compare& __comp, const allocator_type& __a) : __tree_(__comp, __a) {}
+  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit set(const value_compare& __comp, const allocator_type& __a)
+      : __tree_(__comp, __a) {}
   template <class _InputIterator>
-  _LIBCPP_HIDE_FROM_ABI set(_InputIterator __f, _InputIterator __l, const value_compare& __comp = value_compare())
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  set(_InputIterator __f, _InputIterator __l, const value_compare& __comp = value_compare())
       : __tree_(__comp) {
     insert(__f, __l);
   }
   template <class _InputIterator>
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
   set(_InputIterator __f, _InputIterator __l, const value_compare& __comp, const allocator_type& __a)
       : __tree_(__comp, __a) {
     insert(__f, __l);
 @@ -640,7 +643,7 @@ public:
 #  if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<value_type> _Range>
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
   set(from_range_t,
       _Range&& __range,
       const key_compare& __comp = key_compare(),
 @@ -650,263 +653,340 @@ public:
   }
 #  endif
-#  if _LIBCPP_STD_VER >= 14
   template <class _InputIterator>
-  _LIBCPP_HIDE_FROM_ABI set(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
+  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX26 set(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
       : set(__f, __l, key_compare(), __a) {}
-#  endif
 #  if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<value_type> _Range>
-  _LIBCPP_HIDE_FROM_ABI set(from_range_t, _Range&& __range, const allocator_type& __a)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set(from_range_t, _Range&& __range, const allocator_type& __a)
       : set(from_range, std::forward<_Range>(__range), key_compare(), __a) {}
 #  endif
-  _LIBCPP_HIDE_FROM_ABI set(const set& __s) = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set(const set& __s) = default;
-  _LIBCPP_HIDE_FROM_ABI set& operator=(const set& __s) = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set& operator=(const set& __s) = default;
 #  ifndef _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI set(set&& __s) = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set(set&& __s) = default;
 #  endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI explicit set(const allocator_type& __a) : __tree_(__a) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit set(const allocator_type& __a) : __tree_(__a) {}
-  _LIBCPP_HIDE_FROM_ABI set(const set& __s, const allocator_type& __alloc) : __tree_(__s.__tree_, __alloc) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set(const set& __s, const allocator_type& __alloc)
+      : __tree_(__s.__tree_, __alloc) {}
 #  ifndef _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI set(set&& __s, const allocator_type& __alloc) : __tree_(std::move(__s.__tree_), __alloc) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set(set&& __s, const allocator_type& __alloc)
+      : __tree_(std::move(__s.__tree_), __alloc) {}
-  _LIBCPP_HIDE_FROM_ABI set(initializer_list<value_type> __il, const value_compare& __comp = value_compare())
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  set(initializer_list<value_type> __il, const value_compare& __comp = value_compare())
       : __tree_(__comp) {
     insert(__il.begin(), __il.end());
   }
-  _LIBCPP_HIDE_FROM_ABI set(initializer_list<value_type> __il, const value_compare& __comp, const allocator_type& __a)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  set(initializer_list<value_type> __il, const value_compare& __comp, const allocator_type& __a)
       : __tree_(__comp, __a) {
     insert(__il.begin(), __il.end());
   }
-#    if _LIBCPP_STD_VER >= 14
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set(initializer_list<value_type> __il, const allocator_type& __a)
-  _LIBCPP_HIDE_FROM_ABI set(initializer_list<value_type> __il, const allocator_type& __a)
       : set(__il, key_compare(), __a) {}
-#    endif
-  _LIBCPP_HIDE_FROM_ABI set& operator=(initializer_list<value_type> __il) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set& operator=(initializer_list<value_type> __il) {
     clear();
     insert(__il.begin(), __il.end());
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI set& operator=(set&& __s) = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 set& operator=(set&& __s) = default;
 #  endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI ~set() { static_assert(sizeof(std::__diagnose_non_const_comparator<_Key, _Compare>()), ""); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 ~set() {
+    static_assert(sizeof(std::__diagnose_non_const_comparator<_Key, _Compare>()), "");
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT { return __tree_.begin(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator begin() _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT { return __tree_.begin(); }
+    return __tree_.begin();
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator end() _NOEXCEPT { return __tree_.end(); }
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT { return __tree_.end(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator begin() const _NOEXCEPT {
+    return __tree_.begin();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator end() _NOEXCEPT {
+    return __tree_.end();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator end() const _NOEXCEPT {
+    return __tree_.end();
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI reverse_iterator rbegin() _NOEXCEPT { return reverse_iterator(end()); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reverse_iterator rbegin() _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator rbegin() const _NOEXCEPT {
+    return reverse_iterator(end());
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator
+  rbegin() const _NOEXCEPT {
     return const_reverse_iterator(end());
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI reverse_iterator rend() _NOEXCEPT { return reverse_iterator(begin()); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reverse_iterator rend() _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator rend() const _NOEXCEPT {
+    return reverse_iterator(begin());
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator rend() const _NOEXCEPT {
     return const_reverse_iterator(begin());
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator cbegin() const _NOEXCEPT { return begin(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator cbegin() const _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator cend() const _NOEXCEPT { return end(); }
+    return begin();
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator crbegin() const _NOEXCEPT { return rbegin(); }
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator crend() const _NOEXCEPT { return rend(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator cend() const _NOEXCEPT {
+    return end();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator
+  crbegin() const _NOEXCEPT {
+    return rbegin();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator crend() const _NOEXCEPT {
+    return rend();
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool empty() const _NOEXCEPT { return __tree_.size() == 0; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool empty() const _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type size() const _NOEXCEPT { return __tree_.size(); }
+    return __tree_.size() == 0;
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type max_size() const _NOEXCEPT { return __tree_.max_size(); }
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type size() const _NOEXCEPT {
+    return __tree_.size();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type max_size() const _NOEXCEPT {
+    return __tree_.max_size();
+  }
   // modifiers:
 #  ifndef _LIBCPP_CXX03_LANG
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI pair<iterator, bool> emplace(_Args&&... __args) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool> emplace(_Args&&... __args) {
     return __tree_.__emplace_unique(std::forward<_Args>(__args)...);
   }
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI iterator emplace_hint(const_iterator __p, _Args&&... __args) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator emplace_hint(const_iterator __p, _Args&&... __args) {
     return __tree_.__emplace_hint_unique(__p, std::forward<_Args>(__args)...).first;
   }
 #  endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(const value_type& __v) { return __tree_.__emplace_unique(__v); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool> insert(const value_type& __v) {
-  _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, const value_type& __v) {
+    return __tree_.__emplace_unique(__v);
+  }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __p, const value_type& __v) {
     return __tree_.__emplace_hint_unique(__p, __v).first;
   }
   template <class _InputIterator>
-  _LIBCPP_HIDE_FROM_ABI void insert(_InputIterator __first, _InputIterator __last) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert(_InputIterator __first, _InputIterator __last) {
     __tree_.__insert_range_unique(__first, __last);
   }
 #  if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<value_type> _Range>
-  _LIBCPP_HIDE_FROM_ABI void insert_range(_Range&& __range) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert_range(_Range&& __range) {
     __tree_.__insert_range_unique(ranges::begin(__range), ranges::end(__range));
   }
 #  endif
 #  ifndef _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI pair<iterator, bool> insert(value_type&& __v) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, bool> insert(value_type&& __v) {
     return __tree_.__emplace_unique(std::move(__v));
   }
-  _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, value_type&& __v) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __p, value_type&& __v) {
     return __tree_.__emplace_hint_unique(__p, std::move(__v)).first;
   }
-  _LIBCPP_HIDE_FROM_ABI void insert(initializer_list<value_type> __il) { insert(__il.begin(), __il.end()); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert(initializer_list<value_type> __il) {
+    insert(__il.begin(), __il.end());
+  }
 #  endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __p) { return __tree_.erase(__p); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __p) { return __tree_.erase(__p); }
-  _LIBCPP_HIDE_FROM_ABI size_type erase(const key_type& __k) { return __tree_.__erase_unique(__k); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type erase(const key_type& __k) {
-  _LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __f, const_iterator __l) { return __tree_.erase(__f, __l); }
+    return __tree_.__erase_unique(__k);
-  _LIBCPP_HIDE_FROM_ABI void clear() _NOEXCEPT { __tree_.clear(); }
+  }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __f, const_iterator __l) {
+    return __tree_.erase(__f, __l);
+  }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void clear() _NOEXCEPT { __tree_.clear(); }
 #  if _LIBCPP_STD_VER >= 17
-  _LIBCPP_HIDE_FROM_ABI insert_return_type insert(node_type&& __nh) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 insert_return_type insert(node_type&& __nh) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() || __nh.get_allocator() == get_allocator(),
                                         "node_type with incompatible allocator passed to set::insert()");
     return __tree_.template __node_handle_insert_unique< node_type, insert_return_type>(std::move(__nh));
   }
-  _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __hint, node_type&& __nh) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __hint, node_type&& __nh) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() || __nh.get_allocator() == get_allocator(),
                                         "node_type with incompatible allocator passed to set::insert()");
     return __tree_.template __node_handle_insert_unique<node_type>(__hint, std::move(__nh));
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI node_type extract(key_type const& __key) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 node_type extract(key_type const& __key) {
     return __tree_.template __node_handle_extract<node_type>(__key);
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI node_type extract(const_iterator __it) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 node_type extract(const_iterator __it) {
     return __tree_.template __node_handle_extract<node_type>(__it);
   }
   template <class _Compare2>
-  _LIBCPP_HIDE_FROM_ABI void merge(set<key_type, _Compare2, allocator_type>& __source) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void merge(set<key_type, _Compare2, allocator_type>& __source) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
         __source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
     __tree_.__node_handle_merge_unique(__source.__tree_);
   }
   template <class _Compare2>
-  _LIBCPP_HIDE_FROM_ABI void merge(set<key_type, _Compare2, allocator_type>&& __source) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void merge(set<key_type, _Compare2, allocator_type>&& __source) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
         __source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
     __tree_.__node_handle_merge_unique(__source.__tree_);
   }
   template <class _Compare2>
-  _LIBCPP_HIDE_FROM_ABI void merge(multiset<key_type, _Compare2, allocator_type>& __source) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+  merge(multiset<key_type, _Compare2, allocator_type>& __source) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
         __source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
     __tree_.__node_handle_merge_unique(__source.__tree_);
   }
   template <class _Compare2>
-  _LIBCPP_HIDE_FROM_ABI void merge(multiset<key_type, _Compare2, allocator_type>&& __source) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+  merge(multiset<key_type, _Compare2, allocator_type>&& __source) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
         __source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
     __tree_.__node_handle_merge_unique(__source.__tree_);
   }
 #  endif
-  _LIBCPP_HIDE_FROM_ABI void swap(set& __s) _NOEXCEPT_(__is_nothrow_swappable_v<__base>) { __tree_.swap(__s.__tree_); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void swap(set& __s) _NOEXCEPT_(__is_nothrow_swappable_v<__base>) {
+    __tree_.swap(__s.__tree_);
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const _NOEXCEPT { return __tree_.__alloc(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 allocator_type get_allocator() const _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI key_compare key_comp() const { return __tree_.value_comp(); }
+    return __tree_.__alloc();
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI value_compare value_comp() const { return __tree_.value_comp(); }
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 key_compare key_comp() const {
+    return __tree_.value_comp();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 value_compare value_comp() const {
+    return __tree_.value_comp();
+  }
   // set operations:
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const key_type& __k) { return __tree_.find(__k); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator find(const key_type& __k) {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const key_type& __k) const { return __tree_.find(__k); }
+    return __tree_.find(__k);
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator find(const key_type& __k) const {
+    return __tree_.find(__k);
+  }
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const _K2& __k) {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator find(const _K2& __k) {
     return __tree_.find(__k);
   }
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const _K2& __k) const {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator find(const _K2& __k) const {
     return __tree_.find(__k);
   }
 #  endif
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const key_type& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type count(const key_type& __k) const {
     return __tree_.__count_unique(__k);
   }
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const _K2& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type count(const _K2& __k) const {
     return __tree_.__count_multi(__k);
   }
 #  endif
 #  if _LIBCPP_STD_VER >= 20
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const key_type& __k) const { return find(__k) != end(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool contains(const key_type& __k) const {
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+    return find(__k) != end();
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const _K2& __k) const {
+  }
+  template <typename _K2,
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool contains(const _K2& __k) const {
     return find(__k) != end();
   }
 #  endif // _LIBCPP_STD_VER >= 20
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator lower_bound(const key_type& __k) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator lower_bound(const key_type& __k) {
     return __tree_.__lower_bound_unique(__k);
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator lower_bound(const key_type& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
+  lower_bound(const key_type& __k) const {
     return __tree_.__lower_bound_unique(__k);
   }
   // The transparent versions of the lookup functions use the _multi version, since a non-element key is allowed to
   // match multiple elements.
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator lower_bound(const _K2& __k) {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator lower_bound(const _K2& __k) {
     return __tree_.__lower_bound_multi(__k);
   }
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator lower_bound(const _K2& __k) const {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
+  lower_bound(const _K2& __k) const {
     return __tree_.__lower_bound_multi(__k);
   }
 #  endif
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator upper_bound(const key_type& __k) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator upper_bound(const key_type& __k) {
     return __tree_.__upper_bound_unique(__k);
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator upper_bound(const key_type& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
+  upper_bound(const key_type& __k) const {
     return __tree_.__upper_bound_unique(__k);
   }
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator upper_bound(const _K2& __k) {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator upper_bound(const _K2& __k) {
     return __tree_.__upper_bound_multi(__k);
   }
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator upper_bound(const _K2& __k) const {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
+  upper_bound(const _K2& __k) const {
     return __tree_.__upper_bound_multi(__k);
   }
 #  endif
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const key_type& __k) {
+  [[__nodiscard__]]
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> equal_range(const key_type& __k) {
     return __tree_.__equal_range_unique(__k);
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const key_type& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
+  equal_range(const key_type& __k) const {
     return __tree_.__equal_range_unique(__k);
   }
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const _K2& __k) {
+  [[__nodiscard__]]
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> equal_range(const _K2& __k) {
     return __tree_.__equal_range_multi(__k);
   }
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const _K2& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
+  equal_range(const _K2& __k) const {
     return __tree_.__equal_range_multi(__k);
   }
 #  endif
 @@ -969,7 +1049,7 @@ struct __specialized_algorithm<_Alg, __single_range<set<_Key, _Compare, _Allocat
   // set's begin() and end() are identical with and without const qualification
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI static auto operator()(const __set& __set, _Args&&... __args) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static auto operator()(const __set& __set, _Args&&... __args) {
     return __specialized_algorithm<_Alg, __single_range<typename __set::__base>>()(
         __set.__tree_, std::forward<_Args>(__args)...);
   }
 @@ -977,7 +1057,7 @@ struct __specialized_algorithm<_Alg, __single_range<set<_Key, _Compare, _Allocat
 #  endif
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator==(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare, _Allocator>& __y) {
   return __x.size() == __y.size() && std::equal(__x.begin(), __x.end(), __y.begin());
 }
 @@ -985,31 +1065,31 @@ operator==(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare,
 #  if _LIBCPP_STD_VER <= 17
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator<(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare, _Allocator>& __y) {
   return std::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
 }
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator!=(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare, _Allocator>& __y) {
   return !(__x == __y);
 }
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator>(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare, _Allocator>& __y) {
   return __y < __x;
 }
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator>=(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare, _Allocator>& __y) {
   return !(__x < __y);
 }
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator<=(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare, _Allocator>& __y) {
   return !(__y < __x);
 }
 @@ -1017,7 +1097,7 @@ operator<=(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare,
 #  else // _LIBCPP_STD_VER <= 17
 template <class _Key, class _Compare, class _Allocator>
-_LIBCPP_HIDE_FROM_ABI __synth_three_way_result<_Key>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __synth_three_way_result<_Key>
 operator<=>(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare, _Allocator>& __y) {
   return std::lexicographical_compare_three_way(__x.begin(), __x.end(), __y.begin(), __y.end(), std::__synth_three_way);
 }
 @@ -1026,14 +1106,14 @@ operator<=>(const set<_Key, _Compare, _Allocator>& __x, const set<_Key, _Compare
 // specialized algorithms:
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI void swap(set<_Key, _Compare, _Allocator>& __x, set<_Key, _Compare, _Allocator>& __y)
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {
+swap(set<_Key, _Compare, _Allocator>& __x, set<_Key, _Compare, _Allocator>& __y) _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {
   __x.swap(__y);
 }
 #  if _LIBCPP_STD_VER >= 20
 template <class _Key, class _Compare, class _Allocator, class _Predicate>
-inline _LIBCPP_HIDE_FROM_ABI typename set<_Key, _Compare, _Allocator>::size_type
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 typename set<_Key, _Compare, _Allocator>::size_type
 erase_if(set<_Key, _Compare, _Allocator>& __c, _Predicate __pred) {
   return std::__libcpp_erase_if_container(__c, __pred);
 }
 @@ -1092,31 +1172,32 @@ public:
   friend class multiset;
   // construct/copy/destroy:
-  _LIBCPP_HIDE_FROM_ABI multiset() _NOEXCEPT_(
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multiset() _NOEXCEPT_(
       is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_default_constructible<key_compare>::value&&
           is_nothrow_copy_constructible<key_compare>::value)
       : __tree_(value_compare()) {}
-  _LIBCPP_HIDE_FROM_ABI explicit multiset(const value_compare& __comp) _NOEXCEPT_(
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit multiset(const value_compare& __comp) _NOEXCEPT_(
       is_nothrow_default_constructible<allocator_type>::value&& is_nothrow_copy_constructible<key_compare>::value)
       : __tree_(__comp) {}
-  _LIBCPP_HIDE_FROM_ABI explicit multiset(const value_compare& __comp, const allocator_type& __a)
+  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit multiset(const value_compare& __comp, const allocator_type& __a)
       : __tree_(__comp, __a) {}
   template <class _InputIterator>
-  _LIBCPP_HIDE_FROM_ABI multiset(_InputIterator __f, _InputIterator __l, const value_compare& __comp = value_compare())
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  multiset(_InputIterator __f, _InputIterator __l, const value_compare& __comp = value_compare())
       : __tree_(__comp) {
     insert(__f, __l);
   }
-#  if _LIBCPP_STD_VER >= 14
   template <class _InputIterator>
-  _LIBCPP_HIDE_FROM_ABI multiset(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  multiset(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
       : multiset(__f, __l, key_compare(), __a) {}
-#  endif
   template <class _InputIterator>
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
   multiset(_InputIterator __f, _InputIterator __l, const value_compare& __comp, const allocator_type& __a)
       : __tree_(__comp, __a) {
     insert(__f, __l);
 @@ -1124,7 +1205,7 @@ public:
 #  if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<value_type> _Range>
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
   multiset(from_range_t,
            _Range&& __range,
            const key_compare& __comp = key_compare(),
 @@ -1134,254 +1215,332 @@ public:
   }
   template <_ContainerCompatibleRange<value_type> _Range>
-  _LIBCPP_HIDE_FROM_ABI multiset(from_range_t, _Range&& __range, const allocator_type& __a)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  multiset(from_range_t, _Range&& __range, const allocator_type& __a)
       : multiset(from_range, std::forward<_Range>(__range), key_compare(), __a) {}
 #  endif
-  _LIBCPP_HIDE_FROM_ABI multiset(const multiset& __s) = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multiset(const multiset& __s) = default;
-  _LIBCPP_HIDE_FROM_ABI multiset& operator=(const multiset& __s) = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multiset& operator=(const multiset& __s) = default;
 #  ifndef _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI multiset(multiset&& __s) = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multiset(multiset&& __s) = default;
-  _LIBCPP_HIDE_FROM_ABI multiset(multiset&& __s, const allocator_type& __a) : __tree_(std::move(__s.__tree_), __a) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multiset(multiset&& __s, const allocator_type& __a)
+      : __tree_(std::move(__s.__tree_), __a) {}
 #  endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI explicit multiset(const allocator_type& __a) : __tree_(__a) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 explicit multiset(const allocator_type& __a) : __tree_(__a) {}
-  _LIBCPP_HIDE_FROM_ABI multiset(const multiset& __s, const allocator_type& __a) : __tree_(__s.__tree_, __a) {}
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multiset(const multiset& __s, const allocator_type& __a)
+      : __tree_(__s.__tree_, __a) {}
 #  ifndef _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI multiset(initializer_list<value_type> __il, const value_compare& __comp = value_compare())
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
+  multiset(initializer_list<value_type> __il, const value_compare& __comp = value_compare())
       : __tree_(__comp) {
     insert(__il.begin(), __il.end());
   }
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
   multiset(initializer_list<value_type> __il, const value_compare& __comp, const allocator_type& __a)
       : __tree_(__comp, __a) {
     insert(__il.begin(), __il.end());
   }
-#    if _LIBCPP_STD_VER >= 14
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26
-  _LIBCPP_HIDE_FROM_ABI multiset(initializer_list<value_type> __il, const allocator_type& __a)
+  multiset(initializer_list<value_type> __il, const allocator_type& __a)
       : multiset(__il, key_compare(), __a) {}
-#    endif
-  _LIBCPP_HIDE_FROM_ABI multiset& operator=(initializer_list<value_type> __il) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multiset& operator=(initializer_list<value_type> __il) {
     clear();
     insert(__il.begin(), __il.end());
     return *this;
   }
-  _LIBCPP_HIDE_FROM_ABI multiset& operator=(multiset&& __s) = default;
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 multiset& operator=(multiset&& __s) = default;
 #  endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI ~multiset() {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 ~multiset() {
     static_assert(sizeof(std::__diagnose_non_const_comparator<_Key, _Compare>()), "");
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator begin() _NOEXCEPT { return __tree_.begin(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator begin() _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator begin() const _NOEXCEPT { return __tree_.begin(); }
+    return __tree_.begin();
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator end() _NOEXCEPT { return __tree_.end(); }
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator end() const _NOEXCEPT { return __tree_.end(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator begin() const _NOEXCEPT {
+    return __tree_.begin();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator end() _NOEXCEPT {
+    return __tree_.end();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator end() const _NOEXCEPT {
+    return __tree_.end();
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI reverse_iterator rbegin() _NOEXCEPT { return reverse_iterator(end()); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reverse_iterator rbegin() _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator rbegin() const _NOEXCEPT {
+    return reverse_iterator(end());
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator
+  rbegin() const _NOEXCEPT {
     return const_reverse_iterator(end());
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI reverse_iterator rend() _NOEXCEPT { return reverse_iterator(begin()); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 reverse_iterator rend() _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator rend() const _NOEXCEPT {
+    return reverse_iterator(begin());
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator rend() const _NOEXCEPT {
     return const_reverse_iterator(begin());
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator cbegin() const _NOEXCEPT { return begin(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator cbegin() const _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator cend() const _NOEXCEPT { return end(); }
+    return begin();
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator crbegin() const _NOEXCEPT { return rbegin(); }
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_reverse_iterator crend() const _NOEXCEPT { return rend(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator cend() const _NOEXCEPT {
+    return end();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator
+  crbegin() const _NOEXCEPT {
+    return rbegin();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_reverse_iterator crend() const _NOEXCEPT {
+    return rend();
+  }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool empty() const _NOEXCEPT { return __tree_.size() == 0; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool empty() const _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type size() const _NOEXCEPT { return __tree_.size(); }
+    return __tree_.size() == 0;
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type max_size() const _NOEXCEPT { return __tree_.max_size(); }
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type size() const _NOEXCEPT {
+    return __tree_.size();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type max_size() const _NOEXCEPT {
+    return __tree_.max_size();
+  }
   // modifiers:
 #  ifndef _LIBCPP_CXX03_LANG
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI iterator emplace(_Args&&... __args) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator emplace(_Args&&... __args) {
     return __tree_.__emplace_multi(std::forward<_Args>(__args)...);
   }
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI iterator emplace_hint(const_iterator __p, _Args&&... __args) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator emplace_hint(const_iterator __p, _Args&&... __args) {
     return __tree_.__emplace_hint_multi(__p, std::forward<_Args>(__args)...);
   }
 #  endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI iterator insert(const value_type& __v) { return __tree_.__emplace_multi(__v); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const value_type& __v) {
-  _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, const value_type& __v) {
+    return __tree_.__emplace_multi(__v);
+  }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __p, const value_type& __v) {
     return __tree_.__emplace_hint_multi(__p, __v);
   }
   template <class _InputIterator>
-  _LIBCPP_HIDE_FROM_ABI void insert(_InputIterator __first, _InputIterator __last) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert(_InputIterator __first, _InputIterator __last) {
     __tree_.__insert_range_multi(__first, __last);
   }
 #  if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<value_type> _Range>
-  _LIBCPP_HIDE_FROM_ABI void insert_range(_Range&& __range) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert_range(_Range&& __range) {
     __tree_.__insert_range_multi(ranges::begin(__range), ranges::end(__range));
   }
 #  endif
 #  ifndef _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI iterator insert(value_type&& __v) { return __tree_.__emplace_multi(std::move(__v)); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(value_type&& __v) {
+    return __tree_.__emplace_multi(std::move(__v));
+  }
-  _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __p, value_type&& __v) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __p, value_type&& __v) {
     return __tree_.__emplace_hint_multi(__p, std::move(__v));
   }
-  _LIBCPP_HIDE_FROM_ABI void insert(initializer_list<value_type> __il) { insert(__il.begin(), __il.end()); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void insert(initializer_list<value_type> __il) {
+    insert(__il.begin(), __il.end());
+  }
 #  endif // _LIBCPP_CXX03_LANG
-  _LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __p) { return __tree_.erase(__p); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __p) { return __tree_.erase(__p); }
-  _LIBCPP_HIDE_FROM_ABI size_type erase(const key_type& __k) { return __tree_.__erase_multi(__k); }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type erase(const key_type& __k) {
-  _LIBCPP_HIDE_FROM_ABI iterator erase(const_iterator __f, const_iterator __l) { return __tree_.erase(__f, __l); }
+    return __tree_.__erase_multi(__k);
-  _LIBCPP_HIDE_FROM_ABI void clear() _NOEXCEPT { __tree_.clear(); }
+  }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator erase(const_iterator __f, const_iterator __l) {
+    return __tree_.erase(__f, __l);
+  }
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void clear() _NOEXCEPT { __tree_.clear(); }
 #  if _LIBCPP_STD_VER >= 17
-  _LIBCPP_HIDE_FROM_ABI iterator insert(node_type&& __nh) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(node_type&& __nh) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() || __nh.get_allocator() == get_allocator(),
                                         "node_type with incompatible allocator passed to multiset::insert()");
     return __tree_.template __node_handle_insert_multi<node_type>(std::move(__nh));
   }
-  _LIBCPP_HIDE_FROM_ABI iterator insert(const_iterator __hint, node_type&& __nh) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator insert(const_iterator __hint, node_type&& __nh) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(__nh.empty() || __nh.get_allocator() == get_allocator(),
                                         "node_type with incompatible allocator passed to multiset::insert()");
     return __tree_.template __node_handle_insert_multi<node_type>(__hint, std::move(__nh));
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI node_type extract(key_type const& __key) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 node_type extract(key_type const& __key) {
     return __tree_.template __node_handle_extract<node_type>(__key);
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI node_type extract(const_iterator __it) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 node_type extract(const_iterator __it) {
     return __tree_.template __node_handle_extract<node_type>(__it);
   }
   template <class _Compare2>
-  _LIBCPP_HIDE_FROM_ABI void merge(multiset<key_type, _Compare2, allocator_type>& __source) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+  merge(multiset<key_type, _Compare2, allocator_type>& __source) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
         __source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
     __tree_.__node_handle_merge_multi(__source.__tree_);
   }
   template <class _Compare2>
-  _LIBCPP_HIDE_FROM_ABI void merge(multiset<key_type, _Compare2, allocator_type>&& __source) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
+  merge(multiset<key_type, _Compare2, allocator_type>&& __source) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
         __source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
     __tree_.__node_handle_merge_multi(__source.__tree_);
   }
   template <class _Compare2>
-  _LIBCPP_HIDE_FROM_ABI void merge(set<key_type, _Compare2, allocator_type>& __source) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void merge(set<key_type, _Compare2, allocator_type>& __source) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
         __source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
     __tree_.__node_handle_merge_multi(__source.__tree_);
   }
   template <class _Compare2>
-  _LIBCPP_HIDE_FROM_ABI void merge(set<key_type, _Compare2, allocator_type>&& __source) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void merge(set<key_type, _Compare2, allocator_type>&& __source) {
     _LIBCPP_ASSERT_COMPATIBLE_ALLOCATOR(
         __source.get_allocator() == get_allocator(), "merging container with incompatible allocator");
     __tree_.__node_handle_merge_multi(__source.__tree_);
   }
 #  endif
-  _LIBCPP_HIDE_FROM_ABI void swap(multiset& __s) _NOEXCEPT_(__is_nothrow_swappable_v<__base>) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void swap(multiset& __s)
+      _NOEXCEPT_(__is_nothrow_swappable_v<__base>) {
     __tree_.swap(__s.__tree_);
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI allocator_type get_allocator() const _NOEXCEPT { return __tree_.__alloc(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 allocator_type get_allocator() const _NOEXCEPT {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI key_compare key_comp() const { return __tree_.value_comp(); }
+    return __tree_.__alloc();
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI value_compare value_comp() const { return __tree_.value_comp(); }
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 key_compare key_comp() const {
+    return __tree_.value_comp();
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 value_compare value_comp() const {
+    return __tree_.value_comp();
+  }
   // set operations:
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const key_type& __k) { return __tree_.find(__k); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator find(const key_type& __k) {
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const key_type& __k) const { return __tree_.find(__k); }
+    return __tree_.find(__k);
+  }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator find(const key_type& __k) const {
+    return __tree_.find(__k);
+  }
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const _K2& __k) {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator find(const _K2& __k) {
     return __tree_.find(__k);
   }
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const _K2& __k) const {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator find(const _K2& __k) const {
     return __tree_.find(__k);
   }
 #  endif
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const key_type& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type count(const key_type& __k) const {
     return __tree_.__count_multi(__k);
   }
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const _K2& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 size_type count(const _K2& __k) const {
     return __tree_.__count_multi(__k);
   }
 #  endif
 #  if _LIBCPP_STD_VER >= 20
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const key_type& __k) const { return find(__k) != end(); }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool contains(const key_type& __k) const {
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+    return find(__k) != end();
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const _K2& __k) const {
+  }
+  template <typename _K2,
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool contains(const _K2& __k) const {
     return find(__k) != end();
   }
 #  endif // _LIBCPP_STD_VER >= 20
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator lower_bound(const key_type& __k) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator lower_bound(const key_type& __k) {
     return __tree_.__lower_bound_multi(__k);
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator lower_bound(const key_type& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
+  lower_bound(const key_type& __k) const {
     return __tree_.__lower_bound_multi(__k);
   }
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator lower_bound(const _K2& __k) {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator lower_bound(const _K2& __k) {
     return __tree_.__lower_bound_multi(__k);
   }
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator lower_bound(const _K2& __k) const {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
+  lower_bound(const _K2& __k) const {
     return __tree_.__lower_bound_multi(__k);
   }
 #  endif
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator upper_bound(const key_type& __k) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator upper_bound(const key_type& __k) {
     return __tree_.__upper_bound_multi(__k);
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator upper_bound(const key_type& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
+  upper_bound(const key_type& __k) const {
     return __tree_.__upper_bound_multi(__k);
   }
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator upper_bound(const _K2& __k) {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 iterator upper_bound(const _K2& __k) {
     return __tree_.__upper_bound_multi(__k);
   }
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2,
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator upper_bound(const _K2& __k) const {
+            class _Comp = _Compare,
+            enable_if_t<__is_transparent_v<_Comp> || __is_transparently_comparable_v<_Comp, key_type, _K2>, int> = 0>
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 const_iterator
+  upper_bound(const _K2& __k) const {
     return __tree_.__upper_bound_multi(__k);
   }
 #  endif
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const key_type& __k) {
+  [[__nodiscard__]]
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> equal_range(const key_type& __k) {
     return __tree_.__equal_range_multi(__k);
   }
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const key_type& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
+  equal_range(const key_type& __k) const {
     return __tree_.__equal_range_multi(__k);
   }
 #  if _LIBCPP_STD_VER >= 14
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const _K2& __k) {
+  [[__nodiscard__]]
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<iterator, iterator> equal_range(const _K2& __k) {
     return __tree_.__equal_range_multi(__k);
   }
-  template <typename _K2, enable_if_t<__is_transparent_v<_Compare, _K2>, int> = 0>
+  template <typename _K2, class _Comp = _Compare, enable_if_t<__is_transparent_v<_Comp>, int> = 0>
-  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const _K2& __k) const {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 pair<const_iterator, const_iterator>
+  equal_range(const _K2& __k) const {
     return __tree_.__equal_range_multi(__k);
   }
 #  endif
 @@ -1445,7 +1604,7 @@ struct __specialized_algorithm<_Alg, __single_range<multiset<_Key, _Compare, _Al
   // set's begin() and end() are identical with and without const qualification
   template <class... _Args>
-  _LIBCPP_HIDE_FROM_ABI static auto operator()(const __set& __set, _Args&&... __args) {
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 static auto operator()(const __set& __set, _Args&&... __args) {
     return __specialized_algorithm<_Alg, __single_range<typename __set::__base>>()(
         __set.__tree_, std::forward<_Args>(__args)...);
   }
 @@ -1453,7 +1612,7 @@ struct __specialized_algorithm<_Alg, __single_range<multiset<_Key, _Compare, _Al
 #  endif
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator==(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key, _Compare, _Allocator>& __y) {
   return __x.size() == __y.size() && std::equal(__x.begin(), __x.end(), __y.begin());
 }
 @@ -1461,31 +1620,31 @@ operator==(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key,
 #  if _LIBCPP_STD_VER <= 17
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator<(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key, _Compare, _Allocator>& __y) {
   return std::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
 }
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator!=(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key, _Compare, _Allocator>& __y) {
   return !(__x == __y);
 }
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator>(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key, _Compare, _Allocator>& __y) {
   return __y < __x;
 }
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator>=(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key, _Compare, _Allocator>& __y) {
   return !(__x < __y);
 }
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI bool
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 bool
 operator<=(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key, _Compare, _Allocator>& __y) {
   return !(__y < __x);
 }
 @@ -1493,7 +1652,7 @@ operator<=(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key,
 #  else // _LIBCPP_STD_VER <= 17
 template <class _Key, class _Compare, class _Allocator>
-_LIBCPP_HIDE_FROM_ABI __synth_three_way_result<_Key>
+_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 __synth_three_way_result<_Key>
 operator<=>(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key, _Compare, _Allocator>& __y) {
   return std::lexicographical_compare_three_way(__x.begin(), __x.end(), __y.begin(), __y.end(), __synth_three_way);
 }
 @@ -1501,7 +1660,7 @@ operator<=>(const multiset<_Key, _Compare, _Allocator>& __x, const multiset<_Key
 #  endif // _LIBCPP_STD_VER <= 17
 template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_HIDE_FROM_ABI void
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 void
 swap(multiset<_Key, _Compare, _Allocator>& __x, multiset<_Key, _Compare, _Allocator>& __y)
     _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y))) {
   __x.swap(__y);
 @@ -1509,7 +1668,7 @@ swap(multiset<_Key, _Compare, _Allocator>& __x, multiset<_Key, _Compare, _Alloca
 #  if _LIBCPP_STD_VER >= 20
 template <class _Key, class _Compare, class _Allocator, class _Predicate>
-inline _LIBCPP_HIDE_FROM_ABI typename multiset<_Key, _Compare, _Allocator>::size_type
+inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX26 typename multiset<_Key, _Compare, _Allocator>::size_type
 erase_if(multiset<_Key, _Compare, _Allocator>& __c, _Predicate __pred) {
   return std::__libcpp_erase_if_container(__c, __pred);
 }
 @@ -1541,7 +1700,7 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <concepts>
 #    include <cstdlib>
 #    include <functional>

lib/libcxx/include/shared_mutex+34-24

 @@ -153,6 +153,7 @@ _LIBCPP_PUSH_MACROS
 #      endif
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 struct _LIBCPP_EXPORTED_FROM_ABI __shared_mutex_base {
   mutex __mut_;
 @@ -196,12 +197,14 @@ public:
   // Exclusive ownership
   _LIBCPP_ACQUIRE_CAPABILITY() _LIBCPP_HIDE_FROM_ABI void lock() { return __base_.lock(); }
-  _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool try_lock() { return __base_.try_lock(); }
+  [[nodiscard]] _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool try_lock() {
-  _LIBCPP_RELEASE_CAPABILITY _LIBCPP_HIDE_FROM_ABI void unlock() { return __base_.unlock(); }
+    return __base_.try_lock();
+  }
+  _LIBCPP_RELEASE_CAPABILITY() _LIBCPP_HIDE_FROM_ABI void unlock() { return __base_.unlock(); }
   // Shared ownership
   _LIBCPP_ACQUIRE_SHARED_CAPABILITY _LIBCPP_HIDE_FROM_ABI void lock_shared() { return __base_.lock_shared(); }
-  _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool try_lock_shared() {
+  [[nodiscard]] _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool try_lock_shared() {
     return __base_.try_lock_shared();
   }
   _LIBCPP_RELEASE_SHARED_CAPABILITY _LIBCPP_HIDE_FROM_ABI void unlock_shared() { return __base_.unlock_shared(); }
 @@ -223,15 +226,15 @@ public:
   // Exclusive ownership
   void lock() _LIBCPP_ACQUIRE_CAPABILITY();
-  _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) bool try_lock();
+  [[__nodiscard__]] _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) bool try_lock();
   template <class _Rep, class _Period>
-  _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool
+  [[__nodiscard__]] _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool
   try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time) {
     return try_lock_until(chrono::steady_clock::now() + __rel_time);
   }
   template <class _Clock, class _Duration>
-  _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool
+  [[__nodiscard__]] _LIBCPP_TRY_ACQUIRE_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool
   try_lock_until(const chrono::time_point<_Clock, _Duration>& __abs_time) {
     unique_lock<mutex> __lk(__base_.__mut_);
     if (__base_.__state_ & __base_.__write_entered_) {
 @@ -259,19 +262,19 @@ public:
     return true;
   }
-  _LIBCPP_RELEASE_CAPABILITY void unlock();
+  _LIBCPP_RELEASE_CAPABILITY() void unlock();
   // Shared ownership
   _LIBCPP_ACQUIRE_SHARED_CAPABILITY void lock_shared();
-  _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(true) bool try_lock_shared();
+  [[__nodiscard__]] _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(true) bool try_lock_shared();
   template <class _Rep, class _Period>
-  _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool
+  [[__nodiscard__]] _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool
   try_lock_shared_for(const chrono::duration<_Rep, _Period>& __rel_time) {
     return try_lock_shared_until(chrono::steady_clock::now() + __rel_time);
   }
   template <class _Clock, class _Duration>
-  _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool
+  [[__nodiscard__]] _LIBCPP_TRY_ACQUIRE_SHARED_CAPABILITY(true) _LIBCPP_HIDE_FROM_ABI bool
   try_lock_shared_until(const chrono::time_point<_Clock, _Duration>& __abs_time) {
     unique_lock<mutex> __lk(__base_.__mut_);
     if ((__base_.__state_ & __base_.__write_entered_) ||
 @@ -304,27 +307,31 @@ private:
   bool __owns_;
 public:
-  _LIBCPP_HIDE_FROM_ABI shared_lock() _NOEXCEPT : __m_(nullptr), __owns_(false) {}
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI shared_lock() _NOEXCEPT : __m_(nullptr), __owns_(false) {}
-  _LIBCPP_HIDE_FROM_ABI explicit shared_lock(mutex_type& __m) : __m_(std::addressof(__m)), __owns_(true) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI explicit shared_lock(mutex_type& __m)
+      : __m_(std::addressof(__m)), __owns_(true) {
     __m_->lock_shared();
   }
-  _LIBCPP_HIDE_FROM_ABI shared_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI shared_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT
       : __m_(std::addressof(__m)),
         __owns_(false) {}
-  _LIBCPP_HIDE_FROM_ABI shared_lock(mutex_type& __m, try_to_lock_t)
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI shared_lock(mutex_type& __m, try_to_lock_t)
       : __m_(std::addressof(__m)), __owns_(__m.try_lock_shared()) {}
-  _LIBCPP_HIDE_FROM_ABI shared_lock(mutex_type& __m, adopt_lock_t) : __m_(std::addressof(__m)), __owns_(true) {}
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI shared_lock(mutex_type& __m, adopt_lock_t)
+      : __m_(std::addressof(__m)), __owns_(true) {}
   template <class _Clock, class _Duration>
-  _LIBCPP_HIDE_FROM_ABI shared_lock(mutex_type& __m, const chrono::time_point<_Clock, _Duration>& __abs_time)
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI
+  shared_lock(mutex_type& __m, const chrono::time_point<_Clock, _Duration>& __abs_time)
       : __m_(std::addressof(__m)), __owns_(__m.try_lock_shared_until(__abs_time)) {}
   template <class _Rep, class _Period>
-  _LIBCPP_HIDE_FROM_ABI shared_lock(mutex_type& __m, const chrono::duration<_Rep, _Period>& __rel_time)
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI
+  shared_lock(mutex_type& __m, const chrono::duration<_Rep, _Period>& __rel_time)
       : __m_(std::addressof(__m)), __owns_(__m.try_lock_shared_for(__rel_time)) {}
   _LIBCPP_HIDE_FROM_ABI ~shared_lock() {
 @@ -335,7 +342,9 @@ public:
   shared_lock(shared_lock const&)            = delete;
   shared_lock& operator=(shared_lock const&) = delete;
-  _LIBCPP_HIDE_FROM_ABI shared_lock(shared_lock&& __u) _NOEXCEPT : __m_(__u.__m_), __owns_(__u.__owns_) {
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI shared_lock(shared_lock&& __u) _NOEXCEPT
+      : __m_(__u.__m_),
+        __owns_(__u.__owns_) {
     __u.__m_    = nullptr;
     __u.__owns_ = false;
   }
 @@ -347,11 +356,11 @@ public:
   }
   _LIBCPP_HIDE_FROM_ABI void lock();
-  _LIBCPP_HIDE_FROM_ABI bool try_lock();
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool try_lock();
   template <class _Rep, class _Period>
-  _LIBCPP_HIDE_FROM_ABI bool try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time);
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time);
   template <class _Clock, class _Duration>
-  _LIBCPP_HIDE_FROM_ABI bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __abs_time);
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __abs_time);
   _LIBCPP_HIDE_FROM_ABI void unlock();
   // Setters
 @@ -368,11 +377,11 @@ public:
   }
   // Getters
-  _LIBCPP_HIDE_FROM_ABI bool owns_lock() const _NOEXCEPT { return __owns_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool owns_lock() const _NOEXCEPT { return __owns_; }
   _LIBCPP_HIDE_FROM_ABI explicit operator bool() const _NOEXCEPT { return __owns_; }
-  _LIBCPP_HIDE_FROM_ABI mutex_type* mutex() const _NOEXCEPT { return __m_; }
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI mutex_type* mutex() const _NOEXCEPT { return __m_; }
 };
 _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(shared_lock);
 @@ -431,6 +440,7 @@ inline _LIBCPP_HIDE_FROM_ABI void swap(shared_lock<_Mutex>& __x, shared_lock<_Mu
   __x.swap(__y);
 }
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 #    endif // _LIBCPP_STD_VER >= 14
 @@ -439,7 +449,7 @@ _LIBCPP_POP_MACROS
 #  endif // _LIBCPP_HAS_THREADS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <optional>
 #    include <system_error>
 #  endif

lib/libcxx/include/source_location+4-4

 @@ -36,10 +36,10 @@ namespace std {
 #    pragma GCC system_header
 #  endif
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 class source_location {
   // The names source_location::__impl, _M_file_name, _M_function_name, _M_line, and _M_column
   // are hard-coded in the compiler and must not be changed here.
 @@ -81,10 +81,10 @@ public:
   }
 };
-#  endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#  endif // _LIBCPP_STD_VER >= 20
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 #endif // _LIBCPP_SOURCE_LOCATION

lib/libcxx/include/span+15-36

 @@ -19,16 +19,16 @@ namespace std {
 inline constexpr size_t dynamic_extent = numeric_limits<size_t>::max();
 template<class T>
-  concept integral-constant-like =                           // exposition only, since C++26
+  concept integral-constant-like =                           // exposition only
-    is_integral_v<decltype(T::value)> &&
+    is_integral_v<remove_cvref_t<decltype(T::value)>> &&
-    !is_same_v<bool, remove_const_t<decltype(T::value)>> &&
+    !is_same_v<bool, remove_cvref_t<decltype(T::value)>> &&
     convertible_to<T, decltype(T::value)> &&
     equality_comparable_with<T, decltype(T::value)> &&
     bool_constant<T() == T::value>::value &&
     bool_constant<static_cast<decltype(T::value)>(T()) == T::value>::value;
 template<class T>
-  constexpr size_t maybe-static-ext = dynamic_extent;        // exposition only, since C++26
+  constexpr size_t maybe-static-ext = dynamic_extent;        // exposition only
 template<integral-constant-like T>
   constexpr size_t maybe-static-ext<T> = {T::value};
 @@ -82,7 +82,6 @@ public:
         constexpr span(const array<value_type, N>& arr) noexcept;
     template<class R>
       constexpr explicit(Extent != dynamic_extent) span(R&& r);
-    constexpr explicit(extent != dynamic_extent) span(std::initializer_list<value_type> il); // Since C++26
     constexpr span(const span& other) noexcept = default;
     template <class OtherElementType, size_t OtherExtent>
         constexpr explicit(Extent != dynamic_extent) span(const span<OtherElementType, OtherExtent>& s) noexcept;
 @@ -124,9 +123,7 @@ private:
 };
 template<class It, class EndOrSize>
-    span(It, EndOrSize) -> span<remove_reference_t<iter_reference_t<_It>>>;                             // until C++26
+    span(It, EndOrSize) -> span<remove_reference_t<iter_reference_t<It>>, maybe-static-ext<EndOrSize>>;
-template<class It, class EndOrSize>
-    span(It, EndOrSize) -> span<remove_reference_t<iter_reference_t<It>>, maybe-static-ext<EndOrSize>>; // since C++26
 template<class T, size_t N>
     span(T (&)[N]) -> span<T, N>;
 @@ -153,6 +150,7 @@ template<class R>
 #  include <__config>
 #  include <__cstddef/byte.h>
 #  include <__cstddef/ptrdiff_t.h>
+#  include <__cstddef/size_t.h>
 #  include <__fwd/array.h>
 #  include <__fwd/span.h>
 #  include <__iterator/bounded_iter.h>
 @@ -172,13 +170,13 @@ template<class R>
 #  include <__type_traits/is_convertible.h>
 #  include <__type_traits/is_integral.h>
 #  include <__type_traits/is_same.h>
+#  include <__type_traits/is_volatile.h>
 #  include <__type_traits/remove_const.h>
 #  include <__type_traits/remove_cv.h>
 #  include <__type_traits/remove_cvref.h>
 #  include <__type_traits/remove_reference.h>
 #  include <__type_traits/type_identity.h>
 #  include <__utility/forward.h>
-#  include <initializer_list>
 #  include <stdexcept>
 #  include <version>
 @@ -198,10 +196,10 @@ template<class R>
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <class _Tp>
 struct __is_std_span : false_type {};
 @@ -254,15 +252,6 @@ public:
     requires(_Sz == 0)
   _LIBCPP_HIDE_FROM_ABI constexpr span() noexcept : __data_{nullptr} {}
-#    if _LIBCPP_STD_VER >= 26
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit span(std::initializer_list<value_type> __il)
-    requires is_const_v<element_type>
-      : __data_{__il.begin()} {
-    _LIBCPP_ASSERT_VALID_INPUT_RANGE(
-        _Extent == __il.size(), "Size mismatch in span's constructor _Extent != __il.size().");
-  }
-#    endif
   constexpr span(const span&) noexcept            = default;
   constexpr span& operator=(const span&) noexcept = default;
 @@ -443,12 +432,6 @@ public:
   // [span.cons], span constructors, copy, assignment, and destructor
   _LIBCPP_HIDE_FROM_ABI constexpr span() noexcept : __data_{nullptr}, __size_{0} {}
-#    if _LIBCPP_STD_VER >= 26
-  _LIBCPP_HIDE_FROM_ABI constexpr span(std::initializer_list<value_type> __il)
-    requires is_const_v<element_type>
-      : __data_{__il.begin()}, __size_{__il.size()} {}
-#    endif
   constexpr span(const span&) noexcept            = default;
   constexpr span& operator=(const span&) noexcept = default;
 @@ -601,20 +584,20 @@ inline constexpr bool ranges::enable_view<span<_ElementType, _Extent>> = true;
 //  as_bytes & as_writable_bytes
 template <class _Tp, size_t _Extent>
+  requires(!is_volatile_v<_Tp>)
 [[nodiscard]] _LIBCPP_HIDE_FROM_ABI auto as_bytes(span<_Tp, _Extent> __s) noexcept {
   return __s.__as_bytes();
 }
 template <class _Tp, size_t _Extent>
-  requires(!is_const_v<_Tp>)
+  requires(!is_const_v<_Tp> && !is_volatile_v<_Tp>)
 [[nodiscard]] _LIBCPP_HIDE_FROM_ABI auto as_writable_bytes(span<_Tp, _Extent> __s) noexcept {
   return __s.__as_writable_bytes();
 }
-#    if _LIBCPP_STD_VER >= 26
 template <class _Tp>
 concept __integral_constant_like =
-    is_integral_v<decltype(_Tp::value)> && !is_same_v<bool, remove_const_t<decltype(_Tp::value)>> &&
+    is_integral_v<remove_cvref_t<decltype(_Tp::value)>> && !is_same_v<bool, remove_cvref_t<decltype(_Tp::value)>> &&
     convertible_to<_Tp, decltype(_Tp::value)> && equality_comparable_with<_Tp, decltype(_Tp::value)> &&
     bool_constant<_Tp() == _Tp::value>::value &&
     bool_constant<static_cast<decltype(_Tp::value)>(_Tp()) == _Tp::value>::value;
 @@ -627,10 +610,6 @@ inline constexpr size_t __maybe_static_ext<_Tp> = {_Tp::value};
 template <contiguous_iterator _It, class _EndOrSize>
 span(_It, _EndOrSize) -> span<remove_reference_t<iter_reference_t<_It>>, __maybe_static_ext<_EndOrSize>>;
-#    else
-template <contiguous_iterator _It, class _EndOrSize>
-span(_It, _EndOrSize) -> span<remove_reference_t<iter_reference_t<_It>>>;
-#    endif
 template <class _Tp, size_t _Sz>
 span(_Tp (&)[_Sz]) -> span<_Tp, _Sz>;
 @@ -644,13 +623,13 @@ span(const array<_Tp, _Sz>&) -> span<const _Tp, _Sz>;
 template <ranges::contiguous_range _Range>
 span(_Range&&) -> span<remove_reference_t<ranges::range_reference_t<_Range>>>;
-#  endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_END_NAMESPACE_STD
+#  endif // _LIBCPP_STD_VER >= 20
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <array>
 #    include <concepts>
 #    include <functional>

lib/libcxx/include/sstream+3-1

 @@ -338,6 +338,7 @@ _LIBCPP_PUSH_MACROS
 #    include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 // Class template basic_stringbuf [stringbuf]
 @@ -1288,13 +1289,14 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_ostringstream<char>
 extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_istringstream<char>;
 #    endif
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #  endif // _LIBCPP_HAS_LOCALIZATION
-#  if _LIBCPP_STD_VER <= 20 && !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES)
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <ostream>
 #    include <type_traits>
 #  endif

lib/libcxx/include/stack+1-1

...	@@ -377,7 +377,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -377,7 +377,7 @@ _LIBCPP_END_NAMESPACE_STD
377		377
378	_LIBCPP_POP_MACROS	378	_LIBCPP_POP_MACROS
379		379
380	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	380	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
381	# include <concepts>	381	# include <concepts>
382	# include <functional>	382	# include <functional>
383	# include <type_traits>	383	# include <type_traits>

lib/libcxx/include/stdatomic.h+1-1

...	@@ -231,7 +231,7 @@ using std::atomic_store_explicit _LIBCPP_USING_IF_EXISTS;	...	@@ -231,7 +231,7 @@ using std::atomic_store_explicit _LIBCPP_USING_IF_EXISTS;
231	using std::atomic_signal_fence _LIBCPP_USING_IF_EXISTS;	231	using std::atomic_signal_fence _LIBCPP_USING_IF_EXISTS;
232	using std::atomic_thread_fence _LIBCPP_USING_IF_EXISTS;	232	using std::atomic_thread_fence _LIBCPP_USING_IF_EXISTS;
233		233
234	# elif defined(_LIBCPP_COMPILER_CLANG_BASED)	234	# elif !defined(__cplusplus) \|\| defined(_LIBCPP_COMPILER_CLANG_BASED)
235		235
236	// Before C++23, we include the next <stdatomic.h> on the path to avoid hijacking	236	// Before C++23, we include the next <stdatomic.h> on the path to avoid hijacking
237	// the header. We do this because Clang has historically shipped a <stdatomic.h>	237	// the header. We do this because Clang has historically shipped a <stdatomic.h>

lib/libcxx/include/stdbool.h deleted-44

...	@@ -1,44 +0,0 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_STDBOOL_H
11	#define _LIBCPP_STDBOOL_H
12
13	/*
14	stdbool.h synopsis
15
16	Macros:
17
18	__bool_true_false_are_defined
19
20	*/
21
22	#if defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
23	# include <__cxx03/stdbool.h>
24	#else
25	# include <__config>
26
27	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
28	# pragma GCC system_header
29	# endif
30
31	# if __has_include_next(<stdbool.h>)
32	# include_next <stdbool.h>
33	# endif
34
35	# ifdef __cplusplus
36	# undef bool
37	# undef true
38	# undef false
39	# undef __bool_true_false_are_defined
40	# define __bool_true_false_are_defined 1
41	# endif
42	#endif // defined(__cplusplus) && __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
43
44	#endif // _LIBCPP_STDBOOL_H

lib/libcxx/include/stdexcept+3-1

...	@@ -212,7 +212,9 @@ public:	...	@@ -212,7 +212,9 @@ public:
212	_LIBCPP_BEGIN_NAMESPACE_STD	212	_LIBCPP_BEGIN_NAMESPACE_STD
213		213
214	// in the dylib	214	// in the dylib
		215	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
215	[[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void __throw_runtime_error(const char*);	216	[[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void __throw_runtime_error(const char*);
		217	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
216		218
217	[[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_logic_error(const char* __msg) {	219	[[__noreturn__]] inline _LIBCPP_HIDE_FROM_ABI void __throw_logic_error(const char* __msg) {
218	# if _LIBCPP_HAS_EXCEPTIONS	220	# if _LIBCPP_HAS_EXCEPTIONS
...	@@ -280,7 +282,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -280,7 +282,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
280		282
281	_LIBCPP_END_NAMESPACE_STD	283	_LIBCPP_END_NAMESPACE_STD
282		284
283	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	285	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
284	# include <cstddef>	286	# include <cstddef>
285	# include <cstdlib>	287	# include <cstdlib>
286	# include <exception>	288	# include <exception>

lib/libcxx/include/stop_token+5-1

 @@ -52,7 +52,11 @@ namespace std {
 #  endif // _LIBCPP_HAS_THREADS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
+#    include <atomic>
+#  endif
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <cstddef>
 #    include <iosfwd>
 #  endif

lib/libcxx/include/streambuf+4-2

 @@ -117,8 +117,8 @@ protected:
 #    include <__assert>
 #    include <__fwd/streambuf.h>
 #    include <__locale>
+#    include <__memory/valid_range.h>
 #    include <__type_traits/is_same.h>
-#    include <__utility/is_valid_range.h>
 #    include <__utility/scope_guard.h>
 #    include <climits>
 #    include <ios>
 @@ -133,6 +133,7 @@ _LIBCPP_PUSH_MACROS
 #    include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 template <class _CharT, class _Traits>
 class basic_streambuf {
 @@ -430,13 +431,14 @@ extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_streambuf<char>;
 extern template class _LIBCPP_EXTERN_TEMPLATE_TYPE_VIS basic_streambuf<wchar_t>;
 #    endif
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 #  endif // _LIBCPP_HAS_LOCALIZATION
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <cstdint>
 #    include <optional>
 #  endif

lib/libcxx/include/string+164-224

...	@@ -201,6 +201,7 @@ public:	...	@@ -201,6 +201,7 @@ public:
201	basic_string& append(const T& t, size_type pos, size_type n=npos); // C++17, constexpr since C++20	201	basic_string& append(const T& t, size_type pos, size_type n=npos); // C++17, constexpr since C++20
202	basic_string& append(const value_type* s, size_type n); // constexpr since C++20	202	basic_string& append(const value_type* s, size_type n); // constexpr since C++20
203	basic_string& append(const value_type* s); // constexpr since C++20	203	basic_string& append(const value_type* s); // constexpr since C++20
		204	basic_string& append(const value_type* s, size_type pos, size_type n); // constexpr since C++20
204	basic_string& append(size_type n, value_type c); // constexpr since C++20	205	basic_string& append(size_type n, value_type c); // constexpr since C++20
205	template<class InputIterator>	206	template<class InputIterator>
206	basic_string& append(InputIterator first, InputIterator last); // constexpr since C++20	207	basic_string& append(InputIterator first, InputIterator last); // constexpr since C++20
...	@@ -224,6 +225,7 @@ public:	...	@@ -224,6 +225,7 @@ public:
224	basic_string& assign(const T& t, size_type pos, size_type n=npos); // C++17, constexpr since C++20	225	basic_string& assign(const T& t, size_type pos, size_type n=npos); // C++17, constexpr since C++20
225	basic_string& assign(const value_type* s, size_type n); // constexpr since C++20	226	basic_string& assign(const value_type* s, size_type n); // constexpr since C++20
226	basic_string& assign(const value_type* s); // constexpr since C++20	227	basic_string& assign(const value_type* s); // constexpr since C++20
		228	basic_string& assign(const value_type* s, size_type pos, size_type n); // constexpr since C++20
227	basic_string& assign(size_type n, value_type c); // constexpr since C++20	229	basic_string& assign(size_type n, value_type c); // constexpr since C++20
228	template<class InputIterator>	230	template<class InputIterator>
229	basic_string& assign(InputIterator first, InputIterator last); // constexpr since C++20	231	basic_string& assign(InputIterator first, InputIterator last); // constexpr since C++20
...	@@ -597,6 +599,7 @@ basic_string<char32_t> operator""s( const char32_t *str, size_t len );	...	@@ -597,6 +599,7 @@ basic_string<char32_t> operator""s( const char32_t *str, size_t len );
597	# include <__algorithm/remove_if.h>	599	# include <__algorithm/remove_if.h>
598	# include <__assert>	600	# include <__assert>
599	# include <__config>	601	# include <__config>
		602	# include <__cstddef/size_t.h>
600	# include <__debug_utils/sanitizers.h>	603	# include <__debug_utils/sanitizers.h>
601	# include <__format/enable_insertable.h>	604	# include <__format/enable_insertable.h>
602	# include <__functional/hash.h>	605	# include <__functional/hash.h>
...	@@ -625,9 +628,11 @@ basic_string<char32_t> operator""s( const char32_t *str, size_t len );	...	@@ -625,9 +628,11 @@ basic_string<char32_t> operator""s( const char32_t *str, size_t len );
625	# include <__string/char_traits.h>	628	# include <__string/char_traits.h>
626	# include <__string/extern_template_lists.h>	629	# include <__string/extern_template_lists.h>
627	# include <__type_traits/conditional.h>	630	# include <__type_traits/conditional.h>
		631	# include <__type_traits/desugars_to.h>
628	# include <__type_traits/enable_if.h>	632	# include <__type_traits/enable_if.h>
629	# include <__type_traits/is_allocator.h>	633	# include <__type_traits/is_allocator.h>
630	# include <__type_traits/is_array.h>	634	# include <__type_traits/is_array.h>
		635	# include <__type_traits/is_constant_evaluated.h>
631	# include <__type_traits/is_convertible.h>	636	# include <__type_traits/is_convertible.h>
632	# include <__type_traits/is_generic_transparent_comparator.h>	637	# include <__type_traits/is_generic_transparent_comparator.h>
633	# include <__type_traits/is_nothrow_assignable.h>	638	# include <__type_traits/is_nothrow_assignable.h>
...	@@ -637,9 +642,11 @@ basic_string<char32_t> operator""s( const char32_t *str, size_t len );	...	@@ -637,9 +642,11 @@ basic_string<char32_t> operator""s( const char32_t *str, size_t len );
637	# include <__type_traits/is_trivially_constructible.h>	642	# include <__type_traits/is_trivially_constructible.h>
638	# include <__type_traits/is_trivially_copyable.h>	643	# include <__type_traits/is_trivially_copyable.h>
639	# include <__type_traits/is_trivially_relocatable.h>	644	# include <__type_traits/is_trivially_relocatable.h>
		645	# include <__type_traits/remove_cv.h>
640	# include <__type_traits/remove_cvref.h>	646	# include <__type_traits/remove_cvref.h>
641	# include <__utility/default_three_way_comparator.h>	647	# include <__utility/default_three_way_comparator.h>
642	# include <__utility/exception_guard.h>	648	# include <__utility/exception_guard.h>
		649	# include <__utility/exchange.h>
643	# include <__utility/forward.h>	650	# include <__utility/forward.h>
644	# include <__utility/is_pointer_in_range.h>	651	# include <__utility/is_pointer_in_range.h>
645	# include <__utility/move.h>	652	# include <__utility/move.h>
...	@@ -678,18 +685,18 @@ basic_string<char32_t> operator""s( const char32_t *str, size_t len );	...	@@ -678,18 +685,18 @@ basic_string<char32_t> operator""s( const char32_t *str, size_t len );
678	_LIBCPP_PUSH_MACROS	685	_LIBCPP_PUSH_MACROS
679	# include <__undef_macros>	686	# include <__undef_macros>
680		687
681	# if __has_feature(address_sanitizer) && _LIBCPP_INSTRUMENTED_WITH_ASAN	688	// Since std::string is partially instantiated in the built library, we require that the library
682	# define _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS __attribute__((__no_sanitize__("address")))	689	// has been built with ASAN support in order to enable the container checks in std::string.
683	// This macro disables AddressSanitizer (ASan) instrumentation for a specific function,	690	// Within the <string> implementation, use `_LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS_FOR_STRING`
684	// allowing memory accesses that would normally trigger ASan errors to proceed without crashing.	691	// to determine whether ASAN container checks should be provided.
685	// This is useful for accessing parts of objects memory, which should not be accessed,	692	# if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS && _LIBCPP_INSTRUMENTED_WITH_ASAN
686	// such as unused bytes in short strings, that should never be accessed	693	# define _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS_FOR_STRING 1
687	// by other parts of the program.
688	# else	694	# else
689	# define _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS	695	# define _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS_FOR_STRING 0
690	# endif	696	# endif
691		697
692	_LIBCPP_BEGIN_NAMESPACE_STD	698	_LIBCPP_BEGIN_NAMESPACE_STD
		699	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
693		700
694	// basic_string	701	// basic_string
695		702
...	@@ -749,44 +756,10 @@ public:	...	@@ -749,44 +756,10 @@ public:
749	//	756	//
750	// This string implementation doesn't contain any references into itself. It only contains a bit that says whether	757	// This string implementation doesn't contain any references into itself. It only contains a bit that says whether
751	// it is in small or large string mode, so the entire structure is trivially relocatable if its members are.	758	// it is in small or large string mode, so the entire structure is trivially relocatable if its members are.
752	# if __has_feature(address_sanitizer) && _LIBCPP_INSTRUMENTED_WITH_ASAN
753	// When compiling with AddressSanitizer (ASan), basic_string cannot be trivially
754	// relocatable. Because the object's memory might be poisoned when its content
755	// is kept inside objects memory (short string optimization), instead of in allocated
756	// external memory. In such cases, the destructor is responsible for unpoisoning
757	// the memory to avoid triggering false positives.
758	// Therefore it's crucial to ensure the destructor is called.
759	using __trivially_relocatable _LIBCPP_NODEBUG = void;
760	# else
761	using __trivially_relocatable _LIBCPP_NODEBUG = __conditional_t<	759	using __trivially_relocatable _LIBCPP_NODEBUG = __conditional_t<
762	__libcpp_is_trivially_relocatable<allocator_type>::value && __libcpp_is_trivially_relocatable<pointer>::value,	760	__libcpp_is_trivially_relocatable<allocator_type>::value && __libcpp_is_trivially_relocatable<pointer>::value,
763	basic_string,	761	basic_string,
764	void>;	762	void>;
765	# endif
766
767	# if __has_feature(address_sanitizer) && _LIBCPP_INSTRUMENTED_WITH_ASAN
768	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pointer __asan_volatile_wrapper(pointer const& __ptr) const {
769	if (__libcpp_is_constant_evaluated())
770	return __ptr;
771
772	pointer volatile __copy_ptr = __ptr;
773
774	return const_cast<pointer&>(__copy_ptr);
775	}
776
777	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_pointer
778	__asan_volatile_wrapper(const_pointer const& __ptr) const {
779	if (__libcpp_is_constant_evaluated())
780	return __ptr;
781
782	const_pointer volatile __copy_ptr = __ptr;
783
784	return const_cast<const_pointer&>(__copy_ptr);
785	}
786	# define _LIBCPP_ASAN_VOLATILE_WRAPPER(PTR) __asan_volatile_wrapper(PTR)
787	# else
788	# define _LIBCPP_ASAN_VOLATILE_WRAPPER(PTR) PTR
789	# endif
790		763
791	static_assert(!is_array<value_type>::value, "Character type of basic_string must not be an array");	764	static_assert(!is_array<value_type>::value, "Character type of basic_string must not be an array");
792	static_assert(is_standard_layout<value_type>::value, "Character type of basic_string must be standard-layout");	765	static_assert(is_standard_layout<value_type>::value, "Character type of basic_string must be standard-layout");
...	@@ -803,8 +776,8 @@ public:	...	@@ -803,8 +776,8 @@ public:
803	// Users might provide custom allocators, and prior to C++20 we have no existing way to detect whether the allocator's	776	// Users might provide custom allocators, and prior to C++20 we have no existing way to detect whether the allocator's
804	// pointer type is contiguous (though it has to be by the Standard). Using the wrapper type ensures the iterator is	777	// pointer type is contiguous (though it has to be by the Standard). Using the wrapper type ensures the iterator is
805	// considered contiguous.	778	// considered contiguous.
806	using iterator = __bounded_iter<__wrap_iter<pointer> >;	779	using iterator = __bounded_iter<pointer>;
807	using const_iterator = __bounded_iter<__wrap_iter<const_pointer> >;	780	using const_iterator = __bounded_iter<const_pointer>;
808	# else	781	# else
809	using iterator = __wrap_iter<pointer>;	782	using iterator = __wrap_iter<pointer>;
810	using const_iterator = __wrap_iter<const_pointer>;	783	using const_iterator = __wrap_iter<const_pointer>;
...	@@ -949,10 +922,7 @@ private:	...	@@ -949,10 +922,7 @@ private:
949	// regardless of whether reallocation occurs. This allows us to check for out-of-bounds accesses using logical size,	922	// regardless of whether reallocation occurs. This allows us to check for out-of-bounds accesses using logical size,
950	// a stricter check, since correct code can never rely on being able to access newly-added elements via an existing	923	// a stricter check, since correct code can never rely on being able to access newly-added elements via an existing
951	// iterator.	924	// iterator.
952	return std::__make_bounded_iter(	925	return std::__make_bounded_iter(__p, __get_pointer(), __get_pointer() + size());
953	std::__wrap_iter<pointer>(__p),
954	std::__wrap_iter<pointer>(__get_pointer()),
955	std::__wrap_iter<pointer>(__get_pointer() + size()));
956	# else	926	# else
957	return iterator(__p);	927	return iterator(__p);
958	# endif // _LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING	928	# endif // _LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING
...	@@ -961,10 +931,7 @@ private:	...	@@ -961,10 +931,7 @@ private:
961	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_iterator __make_const_iterator(const_pointer __p) const {	931	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_iterator __make_const_iterator(const_pointer __p) const {
962	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING	932	# ifdef _LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING
963	// Bound the iterator according to the size (and not the capacity, unlike vector).	933	// Bound the iterator according to the size (and not the capacity, unlike vector).
964	return std::__make_bounded_iter(	934	return std::__make_bounded_iter(__p, __get_pointer(), __get_pointer() + size());
965	std::__wrap_iter<const_pointer>(__p),
966	std::__wrap_iter<const_pointer>(__get_pointer()),
967	std::__wrap_iter<const_pointer>(__get_pointer() + size()));
968	# else	935	# else
969	return const_iterator(__p);	936	return const_iterator(__p);
970	# endif // _LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING	937	# endif // _LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING
...	@@ -975,12 +942,7 @@ public:	...	@@ -975,12 +942,7 @@ public:
975		942
976	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string()	943	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string()
977	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)	944	_NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
978	# if _LIBCPP_STD_VER >= 20 // TODO(LLVM 23): Remove this condition; this is a workaround for https://llvm.org/PR154567	945	: __rep_() {
979	: __rep_(__short())
980	# else
981	: __rep_()
982	# endif
983	{
984	__annotate_new(0);	946	__annotate_new(0);
985	}	947	}
986		948
...	@@ -990,16 +952,11 @@ public:	...	@@ -990,16 +952,11 @@ public:
990	# else	952	# else
991	_NOEXCEPT	953	_NOEXCEPT
992	# endif	954	# endif
993	# if _LIBCPP_STD_VER >= 20 // TODO(LLVM 23): Remove this condition; this is a workaround for https://llvm.org/PR154567	955	: __rep_(), __alloc_(__a) {
994	: __rep_(__short()),
995	# else
996	: __rep_(),
997	# endif
998	__alloc_(__a) {
999	__annotate_new(0);	956	__annotate_new(0);
1000	}	957	}
1001		958
1002	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS basic_string(const basic_string& __str)	959	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const basic_string& __str)
1003	: __alloc_(__alloc_traits::select_on_container_copy_construction(__str.__alloc_)) {	960	: __alloc_(__alloc_traits::select_on_container_copy_construction(__str.__alloc_)) {
1004	if (!__str.__is_long()) {	961	if (!__str.__is_long()) {
1005	__rep_ = __str.__rep_;	962	__rep_ = __str.__rep_;
...	@@ -1008,9 +965,7 @@ public:	...	@@ -1008,9 +965,7 @@ public:
1008	__init_copy_ctor_external(std::__to_address(__str.__get_long_pointer()), __str.__get_long_size());	965	__init_copy_ctor_external(std::__to_address(__str.__get_long_pointer()), __str.__get_long_size());
1009	}	966	}
1010		967
1011	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS	968	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const basic_string& __str, const allocator_type& __a) : __alloc_(__a) {
1012	basic_string(const basic_string& __str, const allocator_type& __a)
1013	: __alloc_(__a) {
1014	if (!__str.__is_long()) {	969	if (!__str.__is_long()) {
1015	__rep_ = __str.__rep_;	970	__rep_ = __str.__rep_;
1016	__annotate_new(__get_short_size());	971	__annotate_new(__get_short_size());
...	@@ -1025,15 +980,7 @@ public:	...	@@ -1025,15 +980,7 @@ public:
1025	# else	980	# else
1026	_NOEXCEPT	981	_NOEXCEPT
1027	# endif	982	# endif
1028	// Turning off ASan instrumentation for variable initialization with _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS	983	: __rep_(std::move(__str.__rep_)), __alloc_(std::move(__str.__alloc_)) {
1029	// does not work consistently during initialization of __r_, so we instead unpoison __str's memory manually first.
1030	// __str's memory needs to be unpoisoned only in the case where it's a short string.
1031	: __rep_([](basic_string& __s) -> decltype(__s.__rep_)&& {
1032	if (!__s.__is_long())
1033	__s.__annotate_delete();
1034	return std::move(__s.__rep_);
1035	}(__str)),
1036	__alloc_(std::move(__str.__alloc_)) {
1037	__str.__rep_ = __rep();	984	__str.__rep_ = __rep();
1038	__str.__annotate_new(0);	985	__str.__annotate_new(0);
1039	if (!__is_long())	986	if (!__is_long())
...	@@ -1058,15 +1005,9 @@ public:	...	@@ -1058,15 +1005,9 @@ public:
1058	}	1005	}
1059	# endif // _LIBCPP_CXX03_LANG	1006	# endif // _LIBCPP_CXX03_LANG
1060		1007
1061	template <__enable_if_t<__is_allocator_v<_Allocator>, int> = 0>
1062	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* _LIBCPP_DIAGNOSE_NULLPTR __s) {
1063	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "basic_string(const char*) detected nullptr");
1064	__init(__s, traits_type::length(__s));
1065	}
1066
1067	template <__enable_if_t<__is_allocator_v<_Allocator>, int> = 0>	1008	template <__enable_if_t<__is_allocator_v<_Allocator>, int> = 0>
1068	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20	1009	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1069	basic_string(const _CharT* _LIBCPP_DIAGNOSE_NULLPTR __s, const _Allocator& __a)	1010	basic_string(const _CharT* _LIBCPP_DIAGNOSE_NULLPTR __s, const _Allocator& __a = _Allocator())
1070	: __alloc_(__a) {	1011	: __alloc_(__a) {
1071	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "basic_string(const char*, allocator) detected nullptr");	1012	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "basic_string(const char*, allocator) detected nullptr");
1072	__init(__s, traits_type::length(__s));	1013	__init(__s, traits_type::length(__s));
...	@@ -1076,22 +1017,14 @@ public:	...	@@ -1076,22 +1017,14 @@ public:
1076	basic_string(nullptr_t) = delete;	1017	basic_string(nullptr_t) = delete;
1077	# endif	1018	# endif
1078		1019
1079	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s, size_type __n)	1020	_LIBCPP_HIDE_FROM_ABI
1080	_LIBCPP_DIAGNOSE_NULLPTR_IF(__n != 0 && __s == nullptr, " if n is not zero") {	1021	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(const _CharT* __s, size_type __n, const _Allocator& __a = _Allocator())
1081	_LIBCPP_ASSERT_NON_NULL(__n == 0 \|\| __s != nullptr, "basic_string(const char*, n) detected nullptr");
1082	__init(__s, __n);
1083	}
1084
1085	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1086	basic_string(const _CharT* __s, size_type __n, const _Allocator& __a)
1087	_LIBCPP_DIAGNOSE_NULLPTR_IF(__n != 0 && __s == nullptr, " if n is not zero")	1022	_LIBCPP_DIAGNOSE_NULLPTR_IF(__n != 0 && __s == nullptr, " if n is not zero")
1088	: __alloc_(__a) {	1023	: __alloc_(__a) {
1089	_LIBCPP_ASSERT_NON_NULL(__n == 0 \|\| __s != nullptr, "basic_string(const char*, n, allocator) detected nullptr");	1024	_LIBCPP_ASSERT_NON_NULL(__n == 0 \|\| __s != nullptr, "basic_string(const char*, n, allocator) detected nullptr");
1090	__init(__s, __n);	1025	__init(__s, __n);
1091	}	1026	}
1092		1027
1093	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(size_type __n, _CharT __c) { __init(__n, __c); }
1094
1095	# if _LIBCPP_STD_VER >= 23	1028	# if _LIBCPP_STD_VER >= 23
1096	_LIBCPP_HIDE_FROM_ABI constexpr basic_string(	1029	_LIBCPP_HIDE_FROM_ABI constexpr basic_string(
1097	basic_string&& __str, size_type __pos, const _Allocator& __alloc = _Allocator())	1030	basic_string&& __str, size_type __pos, const _Allocator& __alloc = _Allocator())
...	@@ -1114,7 +1047,8 @@ public:	...	@@ -1114,7 +1047,8 @@ public:
1114	# endif	1047	# endif
1115		1048
1116	template <__enable_if_t<__is_allocator_v<_Allocator>, int> = 0>	1049	template <__enable_if_t<__is_allocator_v<_Allocator>, int> = 0>
1117	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(size_type __n, _CharT __c, const _Allocator& __a)	1050	_LIBCPP_HIDE_FROM_ABI
		1051	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(size_type __n, _CharT __c, const _Allocator& __a = _Allocator())
1118	: __alloc_(__a) {	1052	: __alloc_(__a) {
1119	__init(__n, __c);	1053	__init(__n, __c);
1120	}	1054	}
...	@@ -1153,29 +1087,16 @@ public:	...	@@ -1153,29 +1087,16 @@ public:
1153	__enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp> &&	1087	__enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp> &&
1154	!is_same<__remove_cvref_t<_Tp>, basic_string>::value,	1088	!is_same<__remove_cvref_t<_Tp>, basic_string>::value,
1155	int> = 0>	1089	int> = 0>
1156	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit basic_string(const _Tp& __t) {	1090	_LIBCPP_HIDE_FROM_ABI
1157	__self_view __sv = __t;	1091	_LIBCPP_CONSTEXPR_SINCE_CXX20 explicit basic_string(const _Tp& __t, const allocator_type& __a = allocator_type())
1158	__init(__sv.data(), __sv.size());
1159	}
1160
1161	template <class _Tp,
1162	__enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp> &&
1163	!is_same<__remove_cvref_t<_Tp>, basic_string>::value,
1164	int> = 0>
1165	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit basic_string(const _Tp& __t, const allocator_type& __a)
1166	: __alloc_(__a) {	1092	: __alloc_(__a) {
1167	__self_view __sv = __t;	1093	__self_view __sv = __t;
1168	__init(__sv.data(), __sv.size());	1094	__init(__sv.data(), __sv.size());
1169	}	1095	}
1170		1096
1171	template <class _InputIterator, __enable_if_t<__has_input_iterator_category<_InputIterator>::value, int> = 0>
1172	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(_InputIterator __first, _InputIterator __last) {
1173	__init(__first, __last);
1174	}
1175
1176	template <class _InputIterator, __enable_if_t<__has_input_iterator_category<_InputIterator>::value, int> = 0>	1097	template <class _InputIterator, __enable_if_t<__has_input_iterator_category<_InputIterator>::value, int> = 0>
1177	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20	1098	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20
1178	basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a)	1099	basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a = allocator_type())
1179	: __alloc_(__a) {	1100	: __alloc_(__a) {
1180	__init(__first, __last);	1101	__init(__first, __last);
1181	}	1102	}
...	@@ -1194,11 +1115,8 @@ public:	...	@@ -1194,11 +1115,8 @@ public:
1194	# endif	1115	# endif
1195		1116
1196	# ifndef _LIBCPP_CXX03_LANG	1117	# ifndef _LIBCPP_CXX03_LANG
1197	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(initializer_list<_CharT> __il) {	1118	_LIBCPP_HIDE_FROM_ABI
1198	__init(__il.begin(), __il.end());	1119	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(initializer_list<_CharT> __il, const _Allocator& __a = _Allocator())
1199	}
1200
1201	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string(initializer_list<_CharT> __il, const _Allocator& __a)
1202	: __alloc_(__a) {	1120	: __alloc_(__a) {
1203	__init(__il.begin(), __il.end());	1121	__init(__il.begin(), __il.end());
1204	}	1122	}
...	@@ -1213,8 +1131,7 @@ public:	...	@@ -1213,8 +1131,7 @@ public:
1213	return __self_view(typename __self_view::__assume_valid(), data(), size());	1131	return __self_view(typename __self_view::__assume_valid(), data(), size());
1214	}	1132	}
1215		1133
1216	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS basic_string&	1134	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& operator=(const basic_string& __str);
1217	operator=(const basic_string& __str);
1218		1135
1219	template <class _Tp,	1136	template <class _Tp,
1220	__enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp> &&	1137	__enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp> &&
...	@@ -1427,6 +1344,8 @@ public:	...	@@ -1427,6 +1344,8 @@ public:
1427	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(const value_type* __s, size_type __n)	1344	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(const value_type* __s, size_type __n)
1428	_LIBCPP_DIAGNOSE_NULLPTR_IF(__n != 0 && __s == nullptr, " if n is not zero");	1345	_LIBCPP_DIAGNOSE_NULLPTR_IF(__n != 0 && __s == nullptr, " if n is not zero");
1429	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s);	1346	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s);
		1347	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(const value_type* __s, size_type __pos, size_type __n)
		1348	_LIBCPP_DIAGNOSE_NULLPTR_IF(__n != 0 && __s == nullptr, " if n is not zero");
1430	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(size_type __n, value_type __c);	1349	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& append(size_type __n, value_type __c);
1431		1350
1432	template <class _InputIterator, __enable_if_t<__has_exactly_input_iterator_category<_InputIterator>::value, int> = 0>	1351	template <class _InputIterator, __enable_if_t<__has_exactly_input_iterator_category<_InputIterator>::value, int> = 0>
...	@@ -1450,7 +1369,7 @@ public:	...	@@ -1450,7 +1369,7 @@ public:
1450	if (__cap - __sz < __n)	1369	if (__cap - __sz < __n)
1451	__grow_by_without_replace(__cap, __sz + __n - __cap, __sz, __sz, 0);	1370	__grow_by_without_replace(__cap, __sz + __n - __cap, __sz, __sz, 0);
1452	__annotate_increase(__n);	1371	__annotate_increase(__n);
1453	auto __end = __copy_non_overlapping_range(__first, __last, std::__to_address(__get_pointer() + __sz));	1372	auto __end = __copy_non_overlapping_range(__first, __last, __data() + __sz);
1454	traits_type::assign(*__end, value_type());	1373	traits_type::assign(*__end, value_type());
1455	__set_size(__sz + __n);	1374	__set_size(__sz + __n);
1456	return *this;	1375	return *this;
...	@@ -1510,8 +1429,7 @@ public:	...	@@ -1510,8 +1429,7 @@ public:
1510	size_type __old_sz = __str.size();	1429	size_type __old_sz = __str.size();
1511	if (!__str.__is_long())	1430	if (!__str.__is_long())
1512	__str.__annotate_delete();	1431	__str.__annotate_delete();
1513	__rep_ = __str.__rep_;	1432	__rep_ = std::__exchange(__str.__rep_, __rep());
1514	__str.__rep_ = __rep();
1515	__str.__annotate_new(0);	1433	__str.__annotate_new(0);
1516		1434
1517	_Traits::move(data(), data() + __pos, __len);	1435	_Traits::move(data(), data() + __pos, __len);
...	@@ -1554,6 +1472,8 @@ public:	...	@@ -1554,6 +1472,8 @@ public:
1554	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(const value_type* __s, size_type __n)	1472	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(const value_type* __s, size_type __n)
1555	_LIBCPP_DIAGNOSE_NULLPTR_IF(__n != 0 && __s == nullptr, " if n is not zero");	1473	_LIBCPP_DIAGNOSE_NULLPTR_IF(__n != 0 && __s == nullptr, " if n is not zero");
1556	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s);	1474	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s);
		1475	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(const value_type* __s, size_type __pos, size_type __n)
		1476	_LIBCPP_DIAGNOSE_NULLPTR_IF(__n != 0 && __s == nullptr, " if n is not zero");
1557	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(size_type __n, value_type __c);	1477	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string& assign(size_type __n, value_type __c);
1558		1478
1559	template <class _InputIterator, __enable_if_t<__has_exactly_input_iterator_category<_InputIterator>::value, int> = 0>	1479	template <class _InputIterator, __enable_if_t<__has_exactly_input_iterator_category<_InputIterator>::value, int> = 0>
...	@@ -1807,6 +1727,13 @@ public:	...	@@ -1807,6 +1727,13 @@ public:
1807	}	1727	}
1808	# endif	1728	# endif
1809		1729
		1730	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const value_type* __data() const _NOEXCEPT {
		1731	return std::__to_address(__get_pointer());
		1732	}
		1733	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 value_type* __data() _NOEXCEPT {
		1734	return std::__to_address(__get_pointer());
		1735	}
		1736
1810	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 allocator_type get_allocator() const _NOEXCEPT {	1737	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 allocator_type get_allocator() const _NOEXCEPT {
1811	return __alloc_;	1738	return __alloc_;
1812	}	1739	}
...	@@ -1815,14 +1742,14 @@ public:	...	@@ -1815,14 +1742,14 @@ public:
1815		1742
1816	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1743	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1817	find(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT {	1744	find(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT {
1818	return std::__str_find<value_type, size_type, traits_type, npos>(data(), size(), __str.data(), __pos, __str.size());	1745	return find(__str.data(), __pos, __str.size());
1819	}	1746	}
1820		1747
1821	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>	1748	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>
1822	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1749	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1823	find(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT {	1750	find(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT {
1824	__self_view __sv = __t;	1751	__self_view __sv = __t;
1825	return std::__str_find<value_type, size_type, traits_type, npos>(data(), size(), __sv.data(), __pos, __sv.size());	1752	return find(__sv.data(), __pos, __sv.size());
1826	}	1753	}
1827		1754
1828	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1755	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -1835,8 +1762,7 @@ public:	...	@@ -1835,8 +1762,7 @@ public:
1835	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1762	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1836	find(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = 0) const _NOEXCEPT {	1763	find(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = 0) const _NOEXCEPT {
1837	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find(): received nullptr");	1764	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find(): received nullptr");
1838	return std::__str_find<value_type, size_type, traits_type, npos>(	1765	return find(__s, __pos, traits_type::length(__s));
1839	data(), size(), __s, __pos, traits_type::length(__s));
1840	}	1766	}
1841		1767
1842	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type find(value_type __c, size_type __pos = 0) const _NOEXCEPT {	1768	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type find(value_type __c, size_type __pos = 0) const _NOEXCEPT {
...	@@ -1847,15 +1773,14 @@ public:	...	@@ -1847,15 +1773,14 @@ public:
1847		1773
1848	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1774	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1849	rfind(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT {	1775	rfind(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT {
1850	return std::__str_rfind<value_type, size_type, traits_type, npos>(	1776	return rfind(__str.data(), __pos, __str.size());
1851	data(), size(), __str.data(), __pos, __str.size());
1852	}	1777	}
1853		1778
1854	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>	1779	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>
1855	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1780	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1856	rfind(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT {	1781	rfind(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT {
1857	__self_view __sv = __t;	1782	__self_view __sv = __t;
1858	return std::__str_rfind<value_type, size_type, traits_type, npos>(data(), size(), __sv.data(), __pos, __sv.size());	1783	return rfind(__sv.data(), __pos, __sv.size());
1859	}	1784	}
1860		1785
1861	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1786	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -1868,8 +1793,7 @@ public:	...	@@ -1868,8 +1793,7 @@ public:
1868	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1793	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1869	rfind(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = npos) const _NOEXCEPT {	1794	rfind(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = npos) const _NOEXCEPT {
1870	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::rfind(): received nullptr");	1795	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::rfind(): received nullptr");
1871	return std::__str_rfind<value_type, size_type, traits_type, npos>(	1796	return rfind(__s, __pos, traits_type::length(__s));
1872	data(), size(), __s, __pos, traits_type::length(__s));
1873	}	1797	}
1874		1798
1875	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1799	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -1881,16 +1805,14 @@ public:	...	@@ -1881,16 +1805,14 @@ public:
1881		1805
1882	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1806	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1883	find_first_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT {	1807	find_first_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT {
1884	return std::__str_find_first_of<value_type, size_type, traits_type, npos>(	1808	return find_first_of(__str.data(), __pos, __str.size());
1885	data(), size(), __str.data(), __pos, __str.size());
1886	}	1809	}
1887		1810
1888	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>	1811	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>
1889	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1812	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1890	find_first_of(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT {	1813	find_first_of(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT {
1891	__self_view __sv = __t;	1814	__self_view __sv = __t;
1892	return std::__str_find_first_of<value_type, size_type, traits_type, npos>(	1815	return find_first_of(__sv.data(), __pos, __sv.size());
1893	data(), size(), __sv.data(), __pos, __sv.size());
1894	}	1816	}
1895		1817
1896	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1818	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -1903,8 +1825,7 @@ public:	...	@@ -1903,8 +1825,7 @@ public:
1903	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1825	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1904	find_first_of(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = 0) const _NOEXCEPT {	1826	find_first_of(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = 0) const _NOEXCEPT {
1905	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find_first_of(): received nullptr");	1827	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find_first_of(): received nullptr");
1906	return std::__str_find_first_of<value_type, size_type, traits_type, npos>(	1828	return find_first_of(__s, __pos, traits_type::length(__s));
1907	data(), size(), __s, __pos, traits_type::length(__s));
1908	}	1829	}
1909		1830
1910	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1831	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -1916,16 +1837,14 @@ public:	...	@@ -1916,16 +1837,14 @@ public:
1916		1837
1917	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1838	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1918	find_last_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT {	1839	find_last_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT {
1919	return std::__str_find_last_of<value_type, size_type, traits_type, npos>(	1840	return find_last_of(__str.data(), __pos, __str.size());
1920	data(), size(), __str.data(), __pos, __str.size());
1921	}	1841	}
1922		1842
1923	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>	1843	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>
1924	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1844	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1925	find_last_of(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT {	1845	find_last_of(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT {
1926	__self_view __sv = __t;	1846	__self_view __sv = __t;
1927	return std::__str_find_last_of<value_type, size_type, traits_type, npos>(	1847	return find_last_of(__sv.data(), __pos, __sv.size());
1928	data(), size(), __sv.data(), __pos, __sv.size());
1929	}	1848	}
1930		1849
1931	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1850	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -1938,8 +1857,7 @@ public:	...	@@ -1938,8 +1857,7 @@ public:
1938	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1857	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1939	find_last_of(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = npos) const _NOEXCEPT {	1858	find_last_of(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = npos) const _NOEXCEPT {
1940	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find_last_of(): received nullptr");	1859	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find_last_of(): received nullptr");
1941	return std::__str_find_last_of<value_type, size_type, traits_type, npos>(	1860	return find_last_of(__s, __pos, traits_type::length(__s));
1942	data(), size(), __s, __pos, traits_type::length(__s));
1943	}	1861	}
1944		1862
1945	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1863	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -1951,16 +1869,14 @@ public:	...	@@ -1951,16 +1869,14 @@ public:
1951		1869
1952	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1870	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1953	find_first_not_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT {	1871	find_first_not_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT {
1954	return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>(	1872	return find_first_not_of(__str.data(), __pos, __str.size());
1955	data(), size(), __str.data(), __pos, __str.size());
1956	}	1873	}
1957		1874
1958	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>	1875	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>
1959	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1876	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1960	find_first_not_of(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT {	1877	find_first_not_of(const _Tp& __t, size_type __pos = 0) const _NOEXCEPT {
1961	__self_view __sv = __t;	1878	__self_view __sv = __t;
1962	return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>(	1879	return find_first_not_of(__sv.data(), __pos, __sv.size());
1963	data(), size(), __sv.data(), __pos, __sv.size());
1964	}	1880	}
1965		1881
1966	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1882	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -1973,8 +1889,7 @@ public:	...	@@ -1973,8 +1889,7 @@ public:
1973	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1889	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1974	find_first_not_of(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = 0) const _NOEXCEPT {	1890	find_first_not_of(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = 0) const _NOEXCEPT {
1975	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find_first_not_of(): received nullptr");	1891	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find_first_not_of(): received nullptr");
1976	return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>(	1892	return find_first_not_of(__s, __pos, traits_type::length(__s));
1977	data(), size(), __s, __pos, traits_type::length(__s));
1978	}	1893	}
1979		1894
1980	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1895	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -1986,16 +1901,14 @@ public:	...	@@ -1986,16 +1901,14 @@ public:
1986		1901
1987	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1902	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1988	find_last_not_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT {	1903	find_last_not_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT {
1989	return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>(	1904	return find_last_not_of(__str.data(), __pos, __str.size());
1990	data(), size(), __str.data(), __pos, __str.size());
1991	}	1905	}
1992		1906
1993	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>	1907	template <class _Tp, __enable_if_t<__can_be_converted_to_string_view_v<_CharT, _Traits, _Tp>, int> = 0>
1994	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1908	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
1995	find_last_not_of(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT {	1909	find_last_not_of(const _Tp& __t, size_type __pos = npos) const _NOEXCEPT {
1996	__self_view __sv = __t;	1910	__self_view __sv = __t;
1997	return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>(	1911	return find_last_not_of(__sv.data(), __pos, __sv.size());
1998	data(), size(), __sv.data(), __pos, __sv.size());
1999	}	1912	}
2000		1913
2001	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1914	[[__nodiscard__]] _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -2008,8 +1921,7 @@ public:	...	@@ -2008,8 +1921,7 @@ public:
2008	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1921	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
2009	find_last_not_of(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = npos) const _NOEXCEPT {	1922	find_last_not_of(const value_type* _LIBCPP_DIAGNOSE_NULLPTR __s, size_type __pos = npos) const _NOEXCEPT {
2010	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find_last_not_of(): received nullptr");	1923	_LIBCPP_ASSERT_NON_NULL(__s != nullptr, "string::find_last_not_of(): received nullptr");
2011	return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>(	1924	return find_last_not_of(__s, __pos, traits_type::length(__s));
2012	data(), size(), __s, __pos, traits_type::length(__s));
2013	}	1925	}
2014		1926
2015	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type	1927	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type
...	@@ -2134,8 +2046,7 @@ public:	...	@@ -2134,8 +2046,7 @@ public:
2134	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool __invariants() const;	2046	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool __invariants() const;
2135		2047
2136	private:	2048	private:
2137	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS bool	2049	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 bool __is_long() const _NOEXCEPT {
2138	__is_long() const _NOEXCEPT {
2139	if (__libcpp_is_constant_evaluated() && __builtin_constant_p(__rep_.__l.__is_long_)) {	2050	if (__libcpp_is_constant_evaluated() && __builtin_constant_p(__rep_.__l.__is_long_)) {
2140	return __rep_.__l.__is_long_;	2051	return __rep_.__l.__is_long_;
2141	}	2052	}
...	@@ -2180,7 +2091,7 @@ private:	...	@@ -2180,7 +2091,7 @@ private:
2180	value_type* __p;	2091	value_type* __p;
2181	if (__cap - __sz >= __n) {	2092	if (__cap - __sz >= __n) {
2182	__annotate_increase(__n);	2093	__annotate_increase(__n);
2183	__p = std::__to_address(__get_pointer());	2094	__p = __data();
2184	size_type __n_move = __sz - __ip;	2095	size_type __n_move = __sz - __ip;
2185	if (__n_move != 0)	2096	if (__n_move != 0)
2186	traits_type::move(__p + __ip + __n, __p + __ip, __n_move);	2097	traits_type::move(__p + __ip + __n, __p + __ip, __n_move);
...	@@ -2203,15 +2114,13 @@ private:	...	@@ -2203,15 +2114,13 @@ private:
2203	// internal buffer accessors	2114	// internal buffer accessors
2204	// -------------------------	2115	// -------------------------
2205		2116
2206	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS void	2117	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __set_short_size(size_type __s) _NOEXCEPT {
2207	__set_short_size(size_type __s) _NOEXCEPT {
2208	_LIBCPP_ASSERT_INTERNAL(__s < __min_cap, "__s should never be greater than or equal to the short string capacity");	2118	_LIBCPP_ASSERT_INTERNAL(__s < __min_cap, "__s should never be greater than or equal to the short string capacity");
2209	__rep_.__s.__size_ = __s;	2119	__rep_.__s.__size_ = __s;
2210	__rep_.__s.__is_long_ = false;	2120	__rep_.__s.__is_long_ = false;
2211	}	2121	}
2212		2122
2213	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS size_type	2123	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type __get_short_size() const _NOEXCEPT {
2214	__get_short_size() const _NOEXCEPT {
2215	_LIBCPP_ASSERT_INTERNAL(!__rep_.__s.__is_long_, "String has to be short when trying to get the short size");	2124	_LIBCPP_ASSERT_INTERNAL(!__rep_.__s.__is_long_, "String has to be short when trying to get the short size");
2216	return __rep_.__s.__size_;	2125	return __rep_.__s.__size_;
2217	}	2126	}
...	@@ -2239,22 +2148,20 @@ private:	...	@@ -2239,22 +2148,20 @@ private:
2239		2148
2240	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pointer __get_long_pointer() _NOEXCEPT {	2149	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pointer __get_long_pointer() _NOEXCEPT {
2241	_LIBCPP_ASSERT_INTERNAL(__rep_.__l.__is_long_, "String has to be long when trying to get the long pointer");	2150	_LIBCPP_ASSERT_INTERNAL(__rep_.__l.__is_long_, "String has to be long when trying to get the long pointer");
2242	return _LIBCPP_ASAN_VOLATILE_WRAPPER(__rep_.__l.__data_);	2151	return __rep_.__l.__data_;
2243	}	2152	}
2244		2153
2245	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_pointer __get_long_pointer() const _NOEXCEPT {	2154	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_pointer __get_long_pointer() const _NOEXCEPT {
2246	_LIBCPP_ASSERT_INTERNAL(__rep_.__l.__is_long_, "String has to be long when trying to get the long pointer");	2155	_LIBCPP_ASSERT_INTERNAL(__rep_.__l.__is_long_, "String has to be long when trying to get the long pointer");
2247	return _LIBCPP_ASAN_VOLATILE_WRAPPER(__rep_.__l.__data_);	2156	return __rep_.__l.__data_;
2248	}	2157	}
2249		2158
2250	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS pointer	2159	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pointer __get_short_pointer() _NOEXCEPT {
2251	__get_short_pointer() _NOEXCEPT {	2160	return pointer_traits<pointer>::pointer_to(__rep_.__s.__data_[0]);
2252	return _LIBCPP_ASAN_VOLATILE_WRAPPER(pointer_traits<pointer>::pointer_to(__rep_.__s.__data_[0]));
2253	}	2161	}
2254		2162
2255	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS const_pointer	2163	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 const_pointer __get_short_pointer() const _NOEXCEPT {
2256	__get_short_pointer() const _NOEXCEPT {	2164	return pointer_traits<const_pointer>::pointer_to(__rep_.__s.__data_[0]);
2257	return _LIBCPP_ASAN_VOLATILE_WRAPPER(pointer_traits<const_pointer>::pointer_to(__rep_.__s.__data_[0]));
2258	}	2165	}
2259		2166
2260	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pointer __get_pointer() _NOEXCEPT {	2167	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pointer __get_pointer() _NOEXCEPT {
...	@@ -2272,17 +2179,24 @@ private:	...	@@ -2272,17 +2179,24 @@ private:
2272		2179
2273	// Allocate a buffer of __capacity size with __alloc and return it	2180	// Allocate a buffer of __capacity size with __alloc and return it
2274	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX20 __long	2181	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX20 __long
2275	__allocate_long_buffer(_Allocator& __alloc, size_type __capacity) {	2182	__allocate_long_buffer(_Allocator& __alloc, size_type __size, size_type __min_capacity) {
2276	_LIBCPP_ASSERT_INTERNAL(!__fits_in_sso(__capacity),	2183	_LIBCPP_ASSERT_INTERNAL(
		2184	__size <= __min_capacity, "Trying to allocate a long buffer with a smaller capacity than size");
		2185	_LIBCPP_ASSERT_INTERNAL(!__fits_in_sso(__min_capacity),
2277	"Trying to allocate long buffer for a capacity what would fit into the small buffer");	2186	"Trying to allocate long buffer for a capacity what would fit into the small buffer");
2278	auto __buffer = std::__allocate_at_least(__alloc, __align_allocation_size(__capacity));	2187	auto __buffer = std::__allocate_at_least(__alloc, __align_allocation_size(__min_capacity));
2279		2188
2280	if (__libcpp_is_constant_evaluated()) {	2189	if (__libcpp_is_constant_evaluated()) {
2281	for (size_type __i = 0; __i != __buffer.count; ++__i)	2190	for (size_type __i = 0; __i != __buffer.count; ++__i)
2282	std::__construct_at(std::addressof(__buffer.ptr[__i]));	2191	std::__construct_at(std::addressof(__buffer.ptr[__i]));
2283	}	2192	}
2284		2193
2285	return __long(__buffer, __capacity);	2194	return __long(__buffer, __size);
		2195	}
		2196
		2197	_LIBCPP_HIDE_FROM_ABI static _LIBCPP_CONSTEXPR_SINCE_CXX20 __long
		2198	__allocate_long_buffer(_Allocator& __alloc, size_type __size) {
		2199	return __allocate_long_buffer(__alloc, __size, __size);
2286	}	2200	}
2287		2201
2288	// Replace the current buffer with __new_rep. Deallocate the old long buffer if it exists.	2202	// Replace the current buffer with __new_rep. Deallocate the old long buffer if it exists.
...	@@ -2321,13 +2235,9 @@ private:	...	@@ -2321,13 +2235,9 @@ private:
2321	__annotate_contiguous_container(const void* __old_mid, const void* __new_mid) const {	2235	__annotate_contiguous_container(const void* __old_mid, const void* __new_mid) const {
2322	(void)__old_mid;	2236	(void)__old_mid;
2323	(void)__new_mid;	2237	(void)__new_mid;
2324	# if _LIBCPP_INSTRUMENTED_WITH_ASAN	2238	# if _LIBCPP_ENABLE_ASAN_CONTAINER_CHECKS_FOR_STRING
2325	# if defined(__APPLE__)	2239	if (__is_long())
2326	// TODO: remove after addressing issue #96099 (https://llvm.org/PR96099)	2240	std::__annotate_contiguous_container<_Allocator>(data(), data() + capacity() + 1, __old_mid, __new_mid);
2327	if (!__is_long())
2328	return;
2329	# endif
2330	std::__annotate_contiguous_container<_Allocator>(data(), data() + capacity() + 1, __old_mid, __new_mid);
2331	# endif	2241	# endif
2332	}	2242	}
2333		2243
...	@@ -2366,7 +2276,17 @@ private:	...	@@ -2366,7 +2276,17 @@ private:
2366	static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type __align_it(size_type __s) _NOEXCEPT {	2276	static _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 size_type __align_it(size_type __s) _NOEXCEPT {
2367	return (__s + (__a - 1)) & ~(__a - 1);	2277	return (__s + (__a - 1)) & ~(__a - 1);
2368	}	2278	}
2369	enum { __alignment = 8 };	2279
		2280	// GCC currently doesn't define __STDCPP_DEFAULT_NEW_ALIGNMENT__ unconditionally
		2281	// See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=123872
		2282	# ifdef __STDCPP_DEFAULT_NEW_ALIGNMENT__
		2283	static inline const size_t
		2284	__alignment = __is_std_allocator_v<allocator_type> && __STDCPP_DEFAULT_NEW_ALIGNMENT__ > sizeof(void*)
		2285	? __STDCPP_DEFAULT_NEW_ALIGNMENT__
		2286	: sizeof(void*);
		2287	# else
		2288	static inline const size_t __alignment = sizeof(void*);
		2289	# endif
2370		2290
2371	// This makes sure that we're using a capacity with some extra alignment, since allocators almost always over-align	2291	// This makes sure that we're using a capacity with some extra alignment, since allocators almost always over-align
2372	// the allocations anyways, improving memory usage. More importantly, this ensures that the lowest bit is never set	2292	// the allocations anyways, improving memory usage. More importantly, this ensures that the lowest bit is never set
...	@@ -2458,7 +2378,7 @@ private:	...	@@ -2458,7 +2378,7 @@ private:
2458		2378
2459	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __erase_to_end(size_type __pos) {	2379	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __erase_to_end(size_type __pos) {
2460	_LIBCPP_ASSERT_INTERNAL(__pos <= capacity(), "Trying to erase at position outside the strings capacity!");	2380	_LIBCPP_ASSERT_INTERNAL(__pos <= capacity(), "Trying to erase at position outside the strings capacity!");
2461	__null_terminate_at(std::__to_address(__get_pointer()), __pos);	2381	__null_terminate_at(__data(), __pos);
2462	}	2382	}
2463		2383
2464	// __erase_external_with_move is invoked for erase() invocations where	2384	// __erase_external_with_move is invoked for erase() invocations where
...	@@ -2494,8 +2414,7 @@ private:	...	@@ -2494,8 +2414,7 @@ private:
2494	# ifndef _LIBCPP_CXX03_LANG	2414	# ifndef _LIBCPP_CXX03_LANG
2495	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void	2415	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void
2496	__move_assign(basic_string& __str, false_type) noexcept(__alloc_traits::is_always_equal::value);	2416	__move_assign(basic_string& __str, false_type) noexcept(__alloc_traits::is_always_equal::value);
2497	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS void	2417	_LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void __move_assign(basic_string& __str, true_type)
2498	__move_assign(basic_string& __str, true_type)
2499	# if _LIBCPP_STD_VER >= 17	2418	# if _LIBCPP_STD_VER >= 17
2500	noexcept;	2419	noexcept;
2501	# else	2420	# else
...	@@ -2610,19 +2529,29 @@ struct __default_three_way_comparator<basic_string<_CharT, _Traits, _Alloc>, bas	...	@@ -2610,19 +2529,29 @@ struct __default_three_way_comparator<basic_string<_CharT, _Traits, _Alloc>, bas
2610	};	2529	};
2611	# endif	2530	# endif
2612		2531
2613	template <class _Comparator, class _CharT, class _Traits, class _Alloc>	2532	template <class _Comparator, class _CharT2, class _CharT, class _Traits, class _Alloc>
2614	inline const bool __is_transparently_comparable_v<_Comparator,	2533	inline const bool __is_transparently_comparable_v<_Comparator, basic_string<_CharT, _Traits, _Alloc>, _CharT2*> =
2615	basic_string<_CharT, _Traits, _Alloc>,	2534	is_same<_CharT, __remove_cv_t<_CharT2> >::value &&
2616	const _CharT*,	2535	(__desugars_to_v<__less_tag,
2617	__enable_if_t<__is_generic_transparent_comparator_v<_Comparator> > > =	2536	_Comparator,
2618	true;	2537	basic_string<_CharT, _Traits, _Alloc>,
		2538	basic_string<_CharT, _Traits, _Alloc> > \|\|
		2539	__desugars_to_v<__greater_tag,
		2540	_Comparator,
		2541	basic_string<_CharT, _Traits, _Alloc>,
		2542	basic_string<_CharT, _Traits, _Alloc> >);
		2543
		2544	template <class _Comparator, class _CharT2, class _CharT, class _Traits, class _Alloc>
		2545	inline const bool __is_transparently_comparable_v<_Comparator, _CharT2*, basic_string<_CharT, _Traits, _Alloc> > =
		2546	__is_transparently_comparable_v<_Comparator, basic_string<_CharT, _Traits, _Alloc>, _CharT2*>;
2619		2547
2620	template <class _Comparator, class _CharT, class _Traits, class _Alloc, size_t _Np>	2548	template <class _Comparator, class _CharT, class _Traits, class _Alloc, size_t _Np>
2621	inline const bool __is_transparently_comparable_v<_Comparator,	2549	inline const bool __is_transparently_comparable_v<_Comparator, basic_string<_CharT, _Traits, _Alloc>, _CharT[_Np]> =
2622	basic_string<_CharT, _Traits, _Alloc>,	2550	__is_transparently_comparable_v<_Comparator, basic_string<_CharT, _Traits, _Alloc>, const _CharT*>;
2623	_CharT[_Np],	2551
2624	__enable_if_t<__is_generic_transparent_comparator_v<_Comparator> > > =	2552	template <class _Comparator, class _CharT, class _Traits, class _Alloc, size_t _Np>
2625	true;	2553	inline const bool __is_transparently_comparable_v<_Comparator, _CharT[_Np], basic_string<_CharT, _Traits, _Alloc> > =
		2554	__is_transparently_comparable_v<_Comparator, basic_string<_CharT, _Traits, _Alloc>, const _CharT*>;
2626		2555
2627	# if _LIBCPP_STD_VER >= 17	2556	# if _LIBCPP_STD_VER >= 17
2628	template <class _InputIterator,	2557	template <class _InputIterator,
...	@@ -2728,19 +2657,18 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void basic_string<_CharT, _Traits, _Allocator>::__	...	@@ -2728,19 +2657,18 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void basic_string<_CharT, _Traits, _Allocator>::__
2728	size_type __n_del,	2657	size_type __n_del,
2729	size_type __n_add,	2658	size_type __n_add,
2730	const value_type* __p_new_stuff) {	2659	const value_type* __p_new_stuff) {
2731	__long __buffer = __allocate_long_buffer(__alloc_, __get_amortized_growth_capacity(__old_cap + __delta_cap));	2660	__long __buffer = __allocate_long_buffer(__alloc_, 0, __get_amortized_growth_capacity(__old_cap + __delta_cap));
2732	pointer __old_p = __get_pointer();	2661	value_type* __old_p = __data();
2733	__annotate_delete();	2662	__annotate_delete();
2734	auto __guard = std::__make_scope_guard(__annotate_new_size(*this));	2663	auto __guard = std::__make_scope_guard(__annotate_new_size(*this));
2735	if (__n_copy != 0)	2664	if (__n_copy != 0)
2736	traits_type::copy(std::__to_address(__buffer.__data_), std::__to_address(__old_p), __n_copy);	2665	traits_type::copy(std::__to_address(__buffer.__data_), __old_p, __n_copy);
2737	if (__n_add != 0)	2666	if (__n_add != 0)
2738	traits_type::copy(std::__to_address(__buffer.__data_) + __n_copy, __p_new_stuff, __n_add);	2667	traits_type::copy(std::__to_address(__buffer.__data_) + __n_copy, __p_new_stuff, __n_add);
2739	size_type __sec_cp_sz = __old_sz - __n_del - __n_copy;	2668	size_type __sec_cp_sz = __old_sz - __n_del - __n_copy;
2740	if (__sec_cp_sz != 0)	2669	if (__sec_cp_sz != 0)
2741	traits_type::copy(std::__to_address(__buffer.__data_) + __n_copy + __n_add,	2670	traits_type::copy(
2742	std::__to_address(__old_p) + __n_copy + __n_del,	2671	std::__to_address(__buffer.__data_) + __n_copy + __n_add, __old_p + __n_copy + __n_del, __sec_cp_sz);
2743	__sec_cp_sz);
2744	__buffer.__size_ = __n_copy + __n_add + __sec_cp_sz;	2672	__buffer.__size_ = __n_copy + __n_add + __sec_cp_sz;
2745	traits_type::assign(__buffer.__data_[__buffer.__size_], value_type());	2673	traits_type::assign(__buffer.__data_[__buffer.__size_], value_type());
2746	__reset_internal_buffer(__buffer);	2674	__reset_internal_buffer(__buffer);
...	@@ -2761,16 +2689,14 @@ _LIBCPP_DEPRECATED_("use __grow_by_without_replace") basic_string<_CharT, _Trait	...	@@ -2761,16 +2689,14 @@ _LIBCPP_DEPRECATED_("use __grow_by_without_replace") basic_string<_CharT, _Trait
2761	size_type __n_copy,	2689	size_type __n_copy,
2762	size_type __n_del,	2690	size_type __n_del,
2763	size_type __n_add) {	2691	size_type __n_add) {
2764	__long __buffer = __allocate_long_buffer(__alloc_, __get_amortized_growth_capacity(__old_cap + __delta_cap));	2692	__long __buffer = __allocate_long_buffer(__alloc_, 0, __get_amortized_growth_capacity(__old_cap + __delta_cap));
2765	pointer __old_p = __get_pointer();	2693	value_type* __old_p = __data();
2766	if (__n_copy != 0)	2694	if (__n_copy != 0)
2767	traits_type::copy(std::__to_address(__buffer.__data_), std::__to_address(__old_p), __n_copy);	2695	traits_type::copy(std::__to_address(__buffer.__data_), __old_p, __n_copy);
2768	size_type __sec_cp_sz = __old_sz - __n_del - __n_copy;	2696	size_type __sec_cp_sz = __old_sz - __n_del - __n_copy;
2769	if (__sec_cp_sz != 0)	2697	if (__sec_cp_sz != 0)
2770	traits_type::copy(std::__to_address(__buffer.__data_) + __n_copy + __n_add,	2698	traits_type::copy(
2771	std::__to_address(__old_p) + __n_copy + __n_del,	2699	std::__to_address(__buffer.__data_) + __n_copy + __n_add, __old_p + __n_copy + __n_del, __sec_cp_sz);
2772	__sec_cp_sz);
2773
2774	// This is -1 to make sure the caller sets the size properly, since old versions of this function didn't set the size	2700	// This is -1 to make sure the caller sets the size properly, since old versions of this function didn't set the size
2775	// at all.	2701	// at all.
2776	__buffer.__size_ = -1;	2702	__buffer.__size_ = -1;
...	@@ -2831,7 +2757,7 @@ basic_string<_CharT, _Traits, _Allocator>::__assign_external(const value_type* _	...	@@ -2831,7 +2757,7 @@ basic_string<_CharT, _Traits, _Allocator>::__assign_external(const value_type* _
2831	if (__cap >= __n) {	2757	if (__cap >= __n) {
2832	if (__n > __size)	2758	if (__n > __size)
2833	__annotate_increase(__n - __size);	2759	__annotate_increase(__n - __size);
2834	value_type* __p = std::__to_address(__get_pointer());	2760	value_type* __p = __data();
2835	traits_type::move(__p, __s, __n);	2761	traits_type::move(__p, __s, __n);
2836	return __null_terminate_at(__p, __n);	2762	return __null_terminate_at(__p, __n);
2837	} else {	2763	} else {
...	@@ -2847,6 +2773,13 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s, size_ty	...	@@ -2847,6 +2773,13 @@ basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s, size_ty
2847	return (__builtin_constant_p(__n) && __fits_in_sso(__n)) ? __assign_short(__s, __n) : __assign_external(__s, __n);	2773	return (__builtin_constant_p(__n) && __fits_in_sso(__n)) ? __assign_short(__s, __n) : __assign_external(__s, __n);
2848	}	2774	}
2849		2775
		2776	template <class _CharT, class _Traits, class _Allocator>
		2777	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string<_CharT, _Traits, _Allocator>&
		2778	basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s, size_type __pos, size_type __n) {
		2779	_LIBCPP_ASSERT_NON_NULL(__n == 0 \|\| __s != nullptr, "string::assign received nullptr");
		2780	return assign(__self_view(__s).substr(__pos, __n));
		2781	}
		2782
2850	template <class _CharT, class _Traits, class _Allocator>	2783	template <class _CharT, class _Traits, class _Allocator>
2851	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string<_CharT, _Traits, _Allocator>&	2784	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string<_CharT, _Traits, _Allocator>&
2852	basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c) {	2785	basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c) {
...	@@ -2857,7 +2790,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c)	...	@@ -2857,7 +2790,7 @@ basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c)
2857	__annotate_increase(__n);	2790	__annotate_increase(__n);
2858	} else if (__n > __old_size)	2791	} else if (__n > __old_size)
2859	__annotate_increase(__n - __old_size);	2792	__annotate_increase(__n - __old_size);
2860	value_type* __p = std::__to_address(__get_pointer());	2793	value_type* __p = __data();
2861	traits_type::assign(__p, __n, __c);	2794	traits_type::assign(__p, __n, __c);
2862	return __null_terminate_at(__p, __n);	2795	return __null_terminate_at(__p, __n);
2863	}	2796	}
...	@@ -2884,7 +2817,7 @@ basic_string<_CharT, _Traits, _Allocator>::operator=(value_type __c) {	...	@@ -2884,7 +2817,7 @@ basic_string<_CharT, _Traits, _Allocator>::operator=(value_type __c) {
2884	}	2817	}
2885		2818
2886	template <class _CharT, class _Traits, class _Allocator>	2819	template <class _CharT, class _Traits, class _Allocator>
2887	_LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS basic_string<_CharT, _Traits, _Allocator>&	2820	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string<_CharT, _Traits, _Allocator>&
2888	basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str) {	2821	basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str) {
2889	if (this == std::addressof(__str))	2822	if (this == std::addressof(__str))
2890	return *this;	2823	return *this;
...	@@ -2916,7 +2849,7 @@ inline _LIBCPP_CONSTEXPR_SINCE_CXX20 void basic_string<_CharT, _Traits, _Allocat	...	@@ -2916,7 +2849,7 @@ inline _LIBCPP_CONSTEXPR_SINCE_CXX20 void basic_string<_CharT, _Traits, _Allocat
2916	}	2849	}
2917		2850
2918	template <class _CharT, class _Traits, class _Allocator>	2851	template <class _CharT, class _Traits, class _Allocator>
2919	inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_STRING_INTERNAL_MEMORY_ACCESS void	2852	inline _LIBCPP_CONSTEXPR_SINCE_CXX20 void
2920	basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, true_type)	2853	basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, true_type)
2921	# if _LIBCPP_STD_VER >= 17	2854	# if _LIBCPP_STD_VER >= 17
2922	noexcept	2855	noexcept
...	@@ -3042,7 +2975,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s, size_ty	...	@@ -3042,7 +2975,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s, size_ty
3042	return *this;	2975	return *this;
3043		2976
3044	__annotate_increase(__n);	2977	__annotate_increase(__n);
3045	value_type* __p = std::__to_address(__get_pointer());	2978	value_type* __p = __data();
3046	traits_type::copy(__p + __sz, __s, __n);	2979	traits_type::copy(__p + __sz, __s, __n);
3047	__sz += __n;	2980	__sz += __n;
3048	__set_size(__sz);	2981	__set_size(__sz);
...	@@ -3061,7 +2994,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(size_type __n, value_type __c)	...	@@ -3061,7 +2994,7 @@ basic_string<_CharT, _Traits, _Allocator>::append(size_type __n, value_type __c)
3061	if (__cap - __sz < __n)	2994	if (__cap - __sz < __n)
3062	__grow_by_without_replace(__cap, __sz + __n - __cap, __sz, __sz, 0);	2995	__grow_by_without_replace(__cap, __sz + __n - __cap, __sz, __sz, 0);
3063	__annotate_increase(__n);	2996	__annotate_increase(__n);
3064	pointer __p = __get_pointer();	2997	value_type* __p = __data();
3065	traits_type::assign(std::__to_address(__p) + __sz, __n, __c);	2998	traits_type::assign(std::__to_address(__p) + __sz, __n, __c);
3066	__sz += __n;	2999	__sz += __n;
3067	__set_size(__sz);	3000	__set_size(__sz);
...	@@ -3114,6 +3047,13 @@ basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s) {	...	@@ -3114,6 +3047,13 @@ basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s) {
3114	return append(__s, traits_type::length(__s));	3047	return append(__s, traits_type::length(__s));
3115	}	3048	}
3116		3049
		3050	template <class _CharT, class _Traits, class _Allocator>
		3051	_LIBCPP_CONSTEXPR_SINCE_CXX20 basic_string<_CharT, _Traits, _Allocator>&
		3052	basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s, size_type __pos, size_type __n) {
		3053	_LIBCPP_ASSERT_NON_NULL(__n == 0 \|\| __s != nullptr, "string::append received nullptr");
		3054	return append(__self_view(__s).substr(__pos, __n));
		3055	}
		3056
3117	// insert	3057	// insert
3118		3058
3119	template <class _CharT, class _Traits, class _Allocator>	3059	template <class _CharT, class _Traits, class _Allocator>
...	@@ -3134,7 +3074,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_t	...	@@ -3134,7 +3074,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_t
3134	return *this;	3074	return *this;
3135		3075
3136	__annotate_increase(__n);	3076	__annotate_increase(__n);
3137	value_type* __p = std::__to_address(__get_pointer());	3077	value_type* __p = __data();
3138	size_type __n_move = __sz - __pos;	3078	size_type __n_move = __sz - __pos;
3139	if (__n_move != 0) {	3079	if (__n_move != 0) {
3140	if (std::__is_pointer_in_range(__p + __pos, __p + __sz, __s))	3080	if (std::__is_pointer_in_range(__p + __pos, __p + __sz, __s))
...	@@ -3162,7 +3102,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, size_type __n	...	@@ -3162,7 +3102,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, size_type __n
3162	value_type* __p;	3102	value_type* __p;
3163	if (__cap - __sz >= __n) {	3103	if (__cap - __sz >= __n) {
3164	__annotate_increase(__n);	3104	__annotate_increase(__n);
3165	__p = std::__to_address(__get_pointer());	3105	__p = __data();
3166	size_type __n_move = __sz - __pos;	3106	size_type __n_move = __sz - __pos;
3167	if (__n_move != 0)	3107	if (__n_move != 0)
3168	traits_type::move(__p + __pos + __n, __p + __pos, __n_move);	3108	traits_type::move(__p + __pos + __n, __p + __pos, __n_move);
...	@@ -3223,7 +3163,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, value_ty	...	@@ -3223,7 +3163,7 @@ basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, value_ty
3223	__p = std::__to_address(__get_long_pointer());	3163	__p = std::__to_address(__get_long_pointer());
3224	} else {	3164	} else {
3225	__annotate_increase(1);	3165	__annotate_increase(1);
3226	__p = std::__to_address(__get_pointer());	3166	__p = __data();
3227	size_type __n_move = __sz - __ip;	3167	size_type __n_move = __sz - __ip;
3228	if (__n_move != 0)	3168	if (__n_move != 0)
3229	traits_type::move(__p + __ip + 1, __p + __ip, __n_move);	3169	traits_type::move(__p + __ip + 1, __p + __ip, __n_move);
...	@@ -3252,7 +3192,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(	...	@@ -3252,7 +3192,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(
3252	return *this;	3192	return *this;
3253	}	3193	}
3254		3194
3255	value_type* __p = std::__to_address(__get_pointer());	3195	value_type* __p = __data();
3256	if (__n1 != __n2) {	3196	if (__n1 != __n2) {
3257	if (__n2 > __n1)	3197	if (__n2 > __n1)
3258	__annotate_increase(__n2 - __n1);	3198	__annotate_increase(__n2 - __n1);
...	@@ -3291,7 +3231,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __	...	@@ -3291,7 +3231,7 @@ basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __
3291	size_type __cap = capacity();	3231	size_type __cap = capacity();
3292	value_type* __p;	3232	value_type* __p;
3293	if (__cap - __sz + __n1 >= __n2) {	3233	if (__cap - __sz + __n1 >= __n2) {
3294	__p = std::__to_address(__get_pointer());	3234	__p = __data();
3295	if (__n1 != __n2) {	3235	if (__n1 != __n2) {
3296	if (__n2 > __n1)	3236	if (__n2 > __n1)
3297	__annotate_increase(__n2 - __n1);	3237	__annotate_increase(__n2 - __n1);
...	@@ -3335,7 +3275,7 @@ basic_string<_CharT, _Traits, _Allocator>::__erase_external_with_move(size_type	...	@@ -3335,7 +3275,7 @@ basic_string<_CharT, _Traits, _Allocator>::__erase_external_with_move(size_type
3335	return;	3275	return;
3336		3276
3337	size_type __sz = size();	3277	size_type __sz = size();
3338	value_type* __p = std::__to_address(__get_pointer());	3278	value_type* __p = __data();
3339	__n = std::min(__n, __sz - __pos);	3279	__n = std::min(__n, __sz - __pos);
3340	size_type __n_move = __sz - __pos - __n;	3280	size_type __n_move = __sz - __pos - __n;
3341	if (__n_move != 0)	3281	if (__n_move != 0)
...	@@ -3419,8 +3359,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void basic_string<_CharT, _Traits, _Allocator>::re	...	@@ -3419,8 +3359,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void basic_string<_CharT, _Traits, _Allocator>::re
3419	return;	3359	return;
3420		3360
3421	__annotation_guard __g(*this);	3361	__annotation_guard __g(*this);
3422	__long __buffer = __allocate_long_buffer(__alloc_, __requested_capacity);	3362	__long __buffer = __allocate_long_buffer(__alloc_, size(), __requested_capacity);
3423	__buffer.__size_ = size();
3424	traits_type::copy(std::__to_address(__buffer.__data_), data(), __buffer.__size_ + 1);	3363	traits_type::copy(std::__to_address(__buffer.__data_), data(), __buffer.__size_ + 1);
3425	__reset_internal_buffer(__buffer);	3364	__reset_internal_buffer(__buffer);
3426	}	3365	}
...	@@ -3717,7 +3656,7 @@ __concatenate_strings(const _Allocator& __alloc,	...	@@ -3717,7 +3656,7 @@ __concatenate_strings(const _Allocator& __alloc,
3717	_String __r(__uninitialized_size_tag(),	3656	_String __r(__uninitialized_size_tag(),
3718	__str1.size() + __str2.size(),	3657	__str1.size() + __str2.size(),
3719	_String::__alloc_traits::select_on_container_copy_construction(__alloc));	3658	_String::__alloc_traits::select_on_container_copy_construction(__alloc));
3720	auto __ptr = std::__to_address(__r.__get_pointer());	3659	auto __ptr = __r.__data();
3721	_Traits::copy(__ptr, __str1.data(), __str1.size());	3660	_Traits::copy(__ptr, __str1.data(), __str1.size());
3722	_Traits::copy(__ptr + __str1.size(), __str2.data(), __str2.size());	3661	_Traits::copy(__ptr + __str1.size(), __str2.data(), __str2.size());
3723	_Traits::assign(__ptr[__str1.size() + __str2.size()], _CharT());	3662	_Traits::assign(__ptr[__str1.size() + __str2.size()], _CharT());
...	@@ -4019,11 +3958,12 @@ inline constexpr bool __format::__enable_insertable<std::basic_string<wchar_t>>	...	@@ -4019,11 +3958,12 @@ inline constexpr bool __format::__enable_insertable<std::basic_string<wchar_t>>
4019		3958
4020	# endif	3959	# endif
4021		3960
		3961	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
4022	_LIBCPP_END_NAMESPACE_STD	3962	_LIBCPP_END_NAMESPACE_STD
4023		3963
4024	_LIBCPP_POP_MACROS	3964	_LIBCPP_POP_MACROS
4025		3965
4026	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	3966	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
4027	# include <algorithm>	3967	# include <algorithm>
4028	# include <concepts>	3968	# include <concepts>
4029	# include <cstdlib>	3969	# include <cstdlib>

lib/libcxx/include/string.h+2

...	@@ -64,6 +64,8 @@ size_t strlen(const char* s);	...	@@ -64,6 +64,8 @@ size_t strlen(const char* s);
64	# include_next <string.h>	64	# include_next <string.h>
65	# endif	65	# endif
66		66
		67	# include <stddef.h>
		68
67	// MSVCRT, GNU libc and its derivates may already have the correct prototype in	69	// MSVCRT, GNU libc and its derivates may already have the correct prototype in
68	// <string.h>. This macro can be defined by users if their C library provides	70	// <string.h>. This macro can be defined by users if their C library provides
69	// the right signature.	71	// the right signature.

lib/libcxx/include/string_view+1-1

...	@@ -971,7 +971,7 @@ _LIBCPP_END_NAMESPACE_STD	...	@@ -971,7 +971,7 @@ _LIBCPP_END_NAMESPACE_STD
971		971
972	_LIBCPP_POP_MACROS	972	_LIBCPP_POP_MACROS
973		973
974	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	974	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
975	# include <algorithm>	975	# include <algorithm>
976	# include <concepts>	976	# include <concepts>
977	# include <cstdlib>	977	# include <cstdlib>

lib/libcxx/include/strstream+2

...	@@ -151,6 +151,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -151,6 +151,7 @@ _LIBCPP_PUSH_MACROS
151	# include <__undef_macros>	151	# include <__undef_macros>
152		152
153	_LIBCPP_BEGIN_NAMESPACE_STD	153	_LIBCPP_BEGIN_NAMESPACE_STD
		154	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
154		155
155	class _LIBCPP_DEPRECATED _LIBCPP_EXPORTED_FROM_ABI strstreambuf : public streambuf {	156	class _LIBCPP_DEPRECATED _LIBCPP_EXPORTED_FROM_ABI strstreambuf : public streambuf {
156	public:	157	public:
...	@@ -349,6 +350,7 @@ private:	...	@@ -349,6 +350,7 @@ private:
349	strstreambuf __sb_; // exposition only	350	strstreambuf __sb_; // exposition only
350	};	351	};
351		352
		353	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
352	_LIBCPP_END_NAMESPACE_STD	354	_LIBCPP_END_NAMESPACE_STD
353		355
354	_LIBCPP_POP_MACROS	356	_LIBCPP_POP_MACROS

lib/libcxx/include/syncstream+6-5

 @@ -147,10 +147,10 @@ namespace std {
 _LIBCPP_PUSH_MACROS
 #    include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #    if _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_EXPERIMENTAL_SYNCSTREAM
+_LIBCPP_BEGIN_NAMESPACE_STD
 // [syncstream.syncbuf.overview]/1
 //   Class template basic_syncbuf stores character data written to it,
 //   known as the associated output, into internal buffers allocated
 @@ -196,7 +196,8 @@ public:
   // calling __inc_reference.
   //
   // pre: __ptr is in __lut_
-  [[nodiscard]] _LIBCPP_HIDE_FROM_ABI lock_guard<mutex> __get_lock([[maybe_unused]] void* __ptr) noexcept {
+  _LIBCPP_NO_THREAD_SAFETY_ANALYSIS [[nodiscard]] _LIBCPP_HIDE_FROM_ABI lock_guard<mutex>
+  __get_lock([[maybe_unused]] void* __ptr) noexcept {
     shared_lock __lock{__mutex_};
     return lock_guard{__get_it(__ptr)->second.__mutex};
   }
 @@ -511,10 +512,10 @@ using std::osyncstream;
 using std::wosyncstream;
 #      endif
-#    endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_EXPERIMENTAL_SYNCSTREAM
 _LIBCPP_END_NAMESPACE_STD
+#    endif // _LIBCPP_STD_VER >= 20 && _LIBCPP_HAS_EXPERIMENTAL_SYNCSTREAM
 _LIBCPP_POP_MACROS
 #  endif // _LIBCPP_HAS_LOCALIZATION

lib/libcxx/include/system_error+1-1

...	@@ -164,7 +164,7 @@ template <> struct hash<std::error_condition>;	...	@@ -164,7 +164,7 @@ template <> struct hash<std::error_condition>;
164	# pragma GCC system_header	164	# pragma GCC system_header
165	# endif	165	# endif
166		166
167	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	167	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
168	# include <cstdint>	168	# include <cstdint>
169	# include <cstring>	169	# include <cstring>
170	# include <limits>	170	# include <limits>

lib/libcxx/include/text_encoding created+835

...	@@ -0,0 +1,835 @@
1	// -- C++ --
2	//===----------------------------------------------------------------------===//
3	//
4	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
5	// See https://llvm.org/LICENSE.txt for license information.
6	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef _LIBCPP_TEXT_ENCODING
11	#define _LIBCPP_TEXT_ENCODING
12
13	/* text_encoding synopsis
14	namespace std {
15
16	struct text_encoding;
17
18	// [text.encoding.hash], hash support
19	template<class T> struct hash;
20	template<> struct hash<text_encoding>;
21
22	struct text_encoding
23	{
24	static constexpr size_t max_name_length = 63;
25
26	// [text.encoding.id], enumeration text_encoding::id
27	enum class id : int_least32_t {
28	see below
29	};
30	using enum id;
31
32	constexpr text_encoding() = default;
33	constexpr explicit text_encoding(string_view enc) noexcept;
34	constexpr text_encoding(id i) noexcept;
35
36	constexpr id mib() const noexcept;
37	constexpr const char* name() const noexcept;
38
39	// [text.encoding.aliases], class text_encoding::aliases_view
40	// struct aliases_view;
41	constexpr aliases_view aliases() const noexcept;
42
43	friend constexpr bool operator==(const text_encoding& a,
44	const text_encoding& b) noexcept;
45	friend constexpr bool operator==(const text_encoding& encoding, id i) noexcept;
46
47	static consteval text_encoding literal() noexcept;
48	static text_encoding environment();
49	template<id i> static bool environment_is();
50
51	private:
52	id mib_ = id::unknown; // exposition only
53	char name_[max_name_length + 1] = {0}; // exposition only
54	static constexpr bool comp-name(string_view a, string_view b); // exposition only
55	};
56	}
57
58	*/
59
60	#if __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
61	# include <__cxx03/__config>
62	#else
63	# include <__config>
64
65	# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
66	# pragma GCC system_header
67	# endif
68
69	# if _LIBCPP_STD_VER >= 26
70
71	# include <__algorithm/count.h>
72	# include <__algorithm/find_if.h>
73	# include <__algorithm/lower_bound.h>
74	# include <__cstddef/ptrdiff_t.h>
75	# include <__functional/hash.h>
76	# include <__iterator/iterator_traits.h>
77	# include <__ranges/enable_borrowed_range.h>
78	# include <__ranges/view_interface.h>
79	# include <climits>
80	# include <cstdint>
81	# include <string_view>
82	# include <version>
83
84	_LIBCPP_BEGIN_NAMESPACE_STD
85	struct text_encoding;
86
87	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
88
89	_LIBCPP_AVAILABILITY_TEXT_ENCODING_ENVIRONMENT _LIBCPP_EXPORTED_FROM_ABI text_encoding
90	__get_locale_encoding(const char* __name);
91
92	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
93
94	struct text_encoding {
95	static_assert(CHAR_BIT == 8, "libc++ only supports platforms where CHAR_BIT == 8");
96	enum class id : int_least32_t {
97	other = 1,
98	unknown = 2,
99	ASCII = 3,
100	ISOLatin1 = 4,
101	ISOLatin2 = 5,
102	ISOLatin3 = 6,
103	ISOLatin4 = 7,
104	ISOLatinCyrillic = 8,
105	ISOLatinArabic = 9,
106	ISOLatinGreek = 10,
107	ISOLatinHebrew = 11,
108	ISOLatin5 = 12,
109	ISOLatin6 = 13,
110	ISOTextComm = 14,
111	HalfWidthKatakana = 15,
112	JISEncoding = 16,
113	ShiftJIS = 17,
114	EUCPkdFmtJapanese = 18,
115	EUCFixWidJapanese = 19,
116	ISO4UnitedKingdom = 20,
117	ISO11SwedishForNames = 21,
118	ISO15Italian = 22,
119	ISO17Spanish = 23,
120	ISO21German = 24,
121	ISO60DanishNorwegian = 25,
122	ISO69French = 26,
123	ISO10646UTF1 = 27,
124	ISO646basic1983 = 28,
125	INVARIANT = 29,
126	ISO2IntlRefVersion = 30,
127	NATSSEFI = 31,
128	NATSSEFIADD = 32, // NATS-DANO (33) and NATS-DANO-ADD (34) are omitted by the standard.
129	ISO10Swedish = 35,
130	KSC56011987 = 36,
131	ISO2022KR = 37,
132	EUCKR = 38,
133	ISO2022JP = 39,
134	ISO2022JP2 = 40,
135	ISO13JISC6220jp = 41,
136	ISO14JISC6220ro = 42,
137	ISO16Portuguese = 43,
138	ISO18Greek7Old = 44,
139	ISO19LatinGreek = 45,
140	ISO25French = 46,
141	ISO27LatinGreek1 = 47,
142	ISO5427Cyrillic = 48,
143	ISO42JISC62261978 = 49,
144	ISO47BSViewdata = 50,
145	ISO49INIS = 51,
146	ISO50INIS8 = 52,
147	ISO51INISCyrillic = 53,
148	ISO54271981 = 54,
149	ISO5428Greek = 55,
150	ISO57GB1988 = 56,
151	ISO58GB231280 = 57,
152	ISO61Norwegian2 = 58,
153	ISO70VideotexSupp1 = 59,
154	ISO84Portuguese2 = 60,
155	ISO85Spanish2 = 61,
156	ISO86Hungarian = 62,
157	ISO87JISX0208 = 63,
158	ISO88Greek7 = 64,
159	ISO89ASMO449 = 65,
160	ISO90 = 66,
161	ISO91JISC62291984a = 67,
162	ISO92JISC62991984b = 68,
163	ISO93JIS62291984badd = 69,
164	ISO94JIS62291984hand = 70,
165	ISO95JIS62291984handadd = 71,
166	ISO96JISC62291984kana = 72,
167	ISO2033 = 73,
168	ISO99NAPLPS = 74,
169	ISO102T617bit = 75,
170	ISO103T618bit = 76,
171	ISO111ECMACyrillic = 77,
172	ISO121Canadian1 = 78,
173	ISO122Canadian2 = 79,
174	ISO123CSAZ24341985gr = 80,
175	ISO88596E = 81,
176	ISO88596I = 82,
177	ISO128T101G2 = 83,
178	ISO88598E = 84,
179	ISO88598I = 85,
180	ISO139CSN369103 = 86,
181	ISO141JUSIB1002 = 87,
182	ISO143IECP271 = 88,
183	ISO146Serbian = 89,
184	ISO147Macedonian = 90,
185	ISO150 = 91,
186	ISO151Cuba = 92,
187	ISO6937Add = 93,
188	ISO153GOST1976874 = 94,
189	ISO8859Supp = 95,
190	ISO10367Box = 96,
191	ISO158Lap = 97,
192	ISO159JISX02121990 = 98,
193	ISO646Danish = 99,
194	USDK = 100,
195	DKUS = 101,
196	KSC5636 = 102,
197	Unicode11UTF7 = 103,
198	ISO2022CN = 104,
199	ISO2022CNEXT = 105,
200	UTF8 = 106,
201	ISO885913 = 109,
202	ISO885914 = 110,
203	ISO885915 = 111,
204	ISO885916 = 112,
205	GBK = 113,
206	GB18030 = 114,
207	OSDEBCDICDF0415 = 115,
208	OSDEBCDICDF03IRV = 116,
209	OSDEBCDICDF041 = 117,
210	ISO115481 = 118,
211	KZ1048 = 119,
212	UCS2 = 1000,
213	UCS4 = 1001,
214	UnicodeASCII = 1002,
215	UnicodeLatin1 = 1003,
216	UnicodeJapanese = 1004,
217	UnicodeIBM1261 = 1005,
218	UnicodeIBM1268 = 1006,
219	UnicodeIBM1276 = 1007,
220	UnicodeIBM1264 = 1008,
221	UnicodeIBM1265 = 1009,
222	Unicode11 = 1010,
223	SCSU = 1011,
224	UTF7 = 1012,
225	UTF16BE = 1013,
226	UTF16LE = 1014,
227	UTF16 = 1015,
228	CESU8 = 1016,
229	UTF32 = 1017,
230	UTF32BE = 1018,
231	UTF32LE = 1019,
232	BOCU1 = 1020,
233	UTF7IMAP = 1021,
234	Windows30Latin1 = 2000,
235	Windows31Latin1 = 2001,
236	Windows31Latin2 = 2002,
237	Windows31Latin5 = 2003,
238	HPRoman8 = 2004,
239	AdobeStandardEncoding = 2005,
240	VenturaUS = 2006,
241	VenturaInternational = 2007,
242	DECMCS = 2008,
243	PC850Multilingual = 2009,
244	PC8DanishNorwegian = 2012,
245	PC862LatinHebrew = 2013,
246	PC8Turkish = 2014,
247	IBMSymbols = 2015,
248	IBMThai = 2016,
249	HPLegal = 2017,
250	HPPiFont = 2018,
251	HPMath8 = 2019,
252	HPPSMath = 2020,
253	HPDesktop = 2021,
254	VenturaMath = 2022,
255	MicrosoftPublishing = 2023,
256	Windows31J = 2024,
257	GB2312 = 2025,
258	Big5 = 2026,
259	Macintosh = 2027,
260	IBM037 = 2028,
261	IBM038 = 2029,
262	IBM273 = 2030,
263	IBM274 = 2031,
264	IBM275 = 2032,
265	IBM277 = 2033,
266	IBM278 = 2034,
267	IBM280 = 2035,
268	IBM281 = 2036,
269	IBM284 = 2037,
270	IBM285 = 2038,
271	IBM290 = 2039,
272	IBM297 = 2040,
273	IBM420 = 2041,
274	IBM423 = 2042,
275	IBM424 = 2043,
276	PC8CodePage437 = 2011,
277	IBM500 = 2044,
278	IBM851 = 2045,
279	PCp852 = 2010,
280	IBM855 = 2046,
281	IBM857 = 2047,
282	IBM860 = 2048,
283	IBM861 = 2049,
284	IBM863 = 2050,
285	IBM864 = 2051,
286	IBM865 = 2052,
287	IBM868 = 2053,
288	IBM869 = 2054,
289	IBM870 = 2055,
290	IBM871 = 2056,
291	IBM880 = 2057,
292	IBM891 = 2058,
293	IBM903 = 2059,
294	IBM904 = 2060,
295	IBM905 = 2061,
296	IBM918 = 2062,
297	IBM1026 = 2063,
298	IBMEBCDICATDE = 2064,
299	EBCDICATDEA = 2065,
300	EBCDICCAFR = 2066,
301	EBCDICDKNO = 2067,
302	EBCDICDKNOA = 2068,
303	EBCDICFISE = 2069,
304	EBCDICFISEA = 2070,
305	EBCDICFR = 2071,
306	EBCDICIT = 2072,
307	EBCDICPT = 2073,
308	EBCDICES = 2074,
309	EBCDICESA = 2075,
310	EBCDICESS = 2076,
311	EBCDICUK = 2077,
312	EBCDICUS = 2078,
313	Unknown8BiT = 2079,
314	Mnemonic = 2080,
315	Mnem = 2081,
316	VISCII = 2082,
317	VIQR = 2083,
318	KOI8R = 2084,
319	HZGB2312 = 2085,
320	IBM866 = 2086,
321	PC775Baltic = 2087,
322	KOI8U = 2088,
323	IBM00858 = 2089,
324	IBM00924 = 2090,
325	IBM01140 = 2091,
326	IBM01141 = 2092,
327	IBM01142 = 2093,
328	IBM01143 = 2094,
329	IBM01144 = 2095,
330	IBM01145 = 2096,
331	IBM01146 = 2097,
332	IBM01147 = 2098,
333	IBM01148 = 2099,
334	IBM01149 = 2100,
335	Big5HKSCS = 2101,
336	IBM1047 = 2102,
337	PTCP154 = 2103,
338	Amiga1251 = 2104,
339	KOI7switched = 2105,
340	BRF = 2106,
341	TSCII = 2107,
342	CP51932 = 2108,
343	windows874 = 2109,
344	windows1250 = 2250,
345	windows1251 = 2251,
346	windows1252 = 2252,
347	windows1253 = 2253,
348	windows1254 = 2254,
349	windows1255 = 2255,
350	windows1256 = 2256,
351	windows1257 = 2257,
352	windows1258 = 2258,
353	TIS620 = 2259,
354	CP50220 = 2260
355	};
356
357	private:
358	static constexpr int __nats_dano_ = 33;
359	static constexpr int __nats_dano_add_ = 34;
360
361	// A __te_data structure stores:
362	// Index into a table of offsets in the giant aliases string
363	// The MIB of that text encoding
364	// Number of aliases the current MIB holds
365	// We only need 6 bytes of information to store this information.
366
367	// The data is structured in three different locations:
368	// The mib table (array of __te_data)
369	// Aliases string
370	// Table of offsets into the aliases string
371
372	// All of the alias strings were transformed from an array of char* into one giant string split by '\0'.
373	// This allows us to reduce runtime memory footprint by not only removing the need to store ~884 pointers, it also
374	// significantly reduces the disk space taken by removing the need for relocation data for those pointers.
375	// We also know ahead of time that the total number of characters of all of these aliases combined can fit into 2
376	// bytes, so we can also save even more memory by using 2 byte offsets rather than a full pointer into the aliases
377	// string.
378
379	struct __te_data {
380	unsigned short __first_alias_index_;
381	unsigned short __mib_rep_;
382	unsigned char __num_aliases_;
383
384	friend constexpr bool operator<(const __te_data& __enc, id __i) noexcept {
385	return __enc.__mib_rep_ < static_cast<unsigned short>(__i);
386	}
387	};
388
389	static constexpr bool __comp_name(string_view __a, string_view __b) noexcept {
390	if (__a.empty() \|\| __b.empty()) {
391	return false;
392	}
393
394	// Map any non-alphanumeric character to 255, skip prefix 0s, else get tolower(__n).
395	auto __map_char = [](char __n, bool& __in_number) -> unsigned char {
396	if (__n == '0') {
397	return __in_number ? '0' : 255;
398	}
399	__in_number = __n >= '1' && __n <= '9';
400
401	if ((__n >= '1' && __n <= '9') \|\| (__n >= 'a' && __n <= 'z')) {
402	return __n;
403	}
404	if (__n >= 'A' && __n <= 'Z') {
405	return __n + ('a' - 'A'); // tolower
406	}
407
408	return 255;
409	};
410
411	auto __a_ptr = __a.begin(), __b_ptr = __b.begin();
412	bool __a_in_number = false, __b_in_number = false;
413
414	unsigned char __a_val = 255, __b_val = 255;
415	for (;; __a_ptr++, __b_ptr++) {
416	while (__a_ptr != __a.end() && (__a_val = __map_char(*__a_ptr, __a_in_number)) == 255)
417	__a_ptr++;
418	while (__b_ptr != __b.end() && (__b_val = __map_char(*__b_ptr, __b_in_number)) == 255)
419	__b_ptr++;
420
421	if (__a_ptr == __a.end())
422	return __b_ptr == __b.end();
423	if (__b_ptr == __b.end())
424	return false;
425	if (__a_val != __b_val)
426	return false;
427	}
428	return true;
429	}
430
431	static constexpr unsigned short __find_data_idx(string_view __a) noexcept {
432	_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(__a.size() <= max_name_length, "input string_view must have size <= 63");
433	_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(!__a.contains('\0'), "input string_view must not contain '\\0'");
434
435	auto __pred = [&__a](const __te_data& __entry) -> bool {
436	// Search aliases of text encoding for string
437	aliases_view __aliases(__entry);
438	return std::find_if(__aliases.begin(), __aliases.end(), [&__a](auto __alias) {
439	return __comp_name(__a, __alias);
440	}) != __aliases.end();
441	};
442
443	const __te_data* __found = std::find_if(__entries + 2, std::end(__entries), __pred);
444	if (__found == std::end(__entries)) {
445	return __other_idx_; // other
446	}
447
448	return __found - __entries;
449	}
450
451	static constexpr unsigned short __find_data_idx_by_id(id __i) noexcept {
452	_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(__i >= id::other, "invalid text_encoding::id passed");
453	_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(__i <= id::CP50220, "invalid text_encoding::id passed");
454	_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(int_least32_t(__i) != __nats_dano_, "Mib for NATS-DANO used");
455	_LIBCPP_ASSERT_ARGUMENT_WITHIN_DOMAIN(int_least32_t(__i) != __nats_dano_add_, "Mib for NATS-DANO-ADD used");
456	auto __found = std::lower_bound(std::begin(__entries), std::end(__entries), __i);
457
458	if (__found == std::end(__entries)) {
459	return __unknown_idx_; // unknown
460	}
461
462	return __found - __entries;
463	}
464
465	public:
466	using enum id;
467	static constexpr size_t max_name_length = 63;
468
469	// [text.encoding.aliases], class text_encoding::aliases_view
470	struct aliases_view : ranges::view_interface<aliases_view> {
471	struct __iterator {
472	using iterator_concept = random_access_iterator_tag;
473	using iterator_category = random_access_iterator_tag;
474	using value_type = const char*;
475	using reference = const char*;
476	using difference_type = int;
477
478	constexpr __iterator() noexcept = default;
479
480	[[nodiscard]] constexpr reference operator*() const noexcept {
481	return __get_alias_from_offset_table(__current_idx_);
482	}
483
484	[[nodiscard]] constexpr reference operator[](difference_type __n) const noexcept {
485	auto __it = *this;
486	return *(__it + __n);
487	}
488
489	[[nodiscard]] friend constexpr __iterator operator+(__iterator __it, difference_type __n) noexcept {
490	__it += __n;
491	return __it;
492	}
493
494	[[nodiscard]] friend constexpr __iterator operator+(difference_type __n, __iterator __it) noexcept {
495	__it += __n;
496	return __it;
497	}
498
499	[[nodiscard]] friend constexpr __iterator operator-(__iterator __it, difference_type __n) noexcept {
500	__it -= __n;
501	return __it;
502	}
503
504	[[nodiscard]] constexpr difference_type operator-(const __iterator& __other) const noexcept {
505	return __current_idx_ - __other.__current_idx_;
506	}
507
508	constexpr __iterator& operator++() noexcept {
509	__current_idx_++;
510	return *this;
511	}
512
513	constexpr __iterator operator++(int) noexcept {
514	auto __old = *this;
515	__current_idx_++;
516	return __old;
517	}
518
519	constexpr __iterator& operator--() noexcept {
520	__current_idx_--;
521	return *this;
522	}
523
524	constexpr __iterator operator--(int) noexcept {
525	auto __old = *this;
526	__current_idx_--;
527	return __old;
528	}
529
530	constexpr __iterator& operator+=(difference_type __n) noexcept {
531	__current_idx_ += __n;
532	return *this;
533	}
534
535	constexpr __iterator& operator-=(difference_type __n) noexcept { return (*this += -__n); }
536
537	friend constexpr auto operator<=>(const __iterator& __it, const __iterator& __it2) noexcept = default;
538
539	private:
540	friend struct aliases_view;
541
542	constexpr __iterator(unsigned short __enc_d) noexcept : __current_idx_(__enc_d) {}
543
544	unsigned short __current_idx_;
545	}; // __iterator
546
547	[[nodiscard]] constexpr __iterator begin() const noexcept { return __iterator(__first_idx_); }
548
549	[[nodiscard]] constexpr __iterator end() const noexcept { return __iterator(__last_idx_); }
550
551	private:
552	friend struct text_encoding;
553
554	constexpr aliases_view(const __te_data& __d)
555	: __first_idx_(__d.__first_alias_index_), __last_idx_(__d.__first_alias_index_ + __d.__num_aliases_) {}
556
557	unsigned short __first_idx_;
558	unsigned short __last_idx_;
559	}; // aliases_view
560
561	constexpr text_encoding() = default;
562
563	constexpr explicit text_encoding(string_view __enc) noexcept : __encoding_idx_(__find_data_idx(__enc)) {
564	__enc.copy(__name_, max_name_length, 0);
565	}
566
567	constexpr text_encoding(id __i) noexcept : __encoding_idx_(__find_data_idx_by_id(__i)) {
568	const char* __alias = __get_alias_from_offset_table(__get().__first_alias_index_);
569	if (__alias[0] != '\0') {
570	string_view(__alias).copy(__name_, max_name_length);
571	}
572	}
573
574	[[nodiscard]] constexpr id mib() const noexcept { return id(__get().__mib_rep_); }
575
576	[[nodiscard]] constexpr const char* name() const noexcept { return __name_; }
577
578	[[nodiscard]] constexpr aliases_view aliases() const noexcept { return aliases_view(__get()); }
579
580	friend constexpr bool operator==(const text_encoding& __a, const text_encoding& __b) noexcept {
581	return __a.mib() == id::other && __b.mib() == id::other
582	? __comp_name(__a.__name_, __b.__name_)
583	: __a.mib() == __b.mib();
584	}
585
586	friend constexpr bool operator==(const text_encoding& __encoding, id __i) noexcept { return __encoding.mib() == __i; }
587
588	[[nodiscard]] static consteval text_encoding literal() noexcept {
589	// TODO: Remove this branch once we have __GNUC_EXECUTION_CHARSET_NAME or __clang_literal_encoding__ unconditionally
590	# ifdef __GNUC_EXECUTION_CHARSET_NAME
591	return text_encoding(__GNUC_EXECUTION_CHARSET_NAME);
592	# elif defined(__clang_literal_encoding__)
593	return text_encoding(__clang_literal_encoding__);
594	# else
595	return text_encoding();
596	# endif
597	}
598
599	# if _LIBCPP_HAS_LOCALIZATION
600	[[nodiscard]] _LIBCPP_AVAILABILITY_TEXT_ENCODING_ENVIRONMENT static text_encoding environment() {
601	# if defined(_LIBCPP_WIN32API)
602	return __get_locale_encoding(nullptr);
603	# else
604	return __get_locale_encoding("");
605	# endif
606	}
607
608	template <id _Id>
609	[[nodiscard]] _LIBCPP_AVAILABILITY_TEXT_ENCODING_ENVIRONMENT static bool environment_is() {
610	// TODO: It may be worthwhile to implement an optimization for popular encodings, e.g. UTF-8,
611	// to allow checking the environment text encoding without needing to use the data tables.
612
613	# if defined(__ANDROID__)
614	return _Id == std::text_encoding::id::UTF8;
615	# else
616	return environment() == _Id;
617	# endif
618	}
619	# else
620	static text_encoding environment() = delete;
621
622	template <id>
623	static bool environment_is() = delete;
624	# endif
625
626	private:
627	constexpr const __te_data& __get() const { return __entries[__encoding_idx_]; }
628
629	static constexpr char const* __get_alias_from_offset_table(unsigned short __idx) {
630	return __aliases_string + __alias_offsets.__table[__idx];
631	}
632
633	static constexpr auto __other_idx_ = 0u;
634	static constexpr auto __unknown_idx_ = 1u;
635
636	char __name_[max_name_length + 1]{};
637	unsigned short __encoding_idx_{1u};
638
639	static constexpr __te_data __entries[] = {
640	{0, 1, 0}, {1, 2, 0}, {2, 3, 11}, {13, 4, 9}, {22, 5, 7}, {29, 6, 7}, {36, 7, 7},
641	{43, 8, 6}, {49, 9, 8}, {57, 10, 9}, {66, 11, 6}, {72, 12, 7}, {79, 13, 6}, {85, 14, 3},
642	{88, 15, 3}, {91, 16, 2}, {93, 17, 3}, {96, 18, 3}, {99, 19, 2}, {101, 20, 6}, {107, 21, 5},
643	{112, 22, 4}, {116, 23, 4}, {120, 24, 5}, {125, 25, 6}, {131, 26, 5}, {136, 27, 2}, {138, 28, 3},
644	{141, 29, 2}, {143, 30, 4}, {147, 31, 3}, {150, 32, 3}, {153, 35, 7}, {160, 36, 6}, {166, 37, 2},
645	{168, 38, 2}, {170, 39, 2}, {172, 40, 2}, {174, 41, 6}, {180, 42, 5}, {185, 43, 4}, {189, 44, 3},
646	{192, 45, 3}, {195, 46, 4}, {199, 47, 3}, {202, 48, 3}, {205, 49, 3}, {208, 50, 3}, {211, 51, 3},
647	{214, 52, 3}, {217, 53, 3}, {220, 54, 4}, {224, 55, 3}, {227, 56, 5}, {232, 57, 4}, {236, 58, 5},
648	{241, 59, 3}, {244, 60, 4}, {248, 61, 4}, {252, 62, 5}, {257, 63, 5}, {262, 64, 3}, {265, 65, 5},
649	{270, 66, 2}, {272, 67, 4}, {276, 68, 5}, {281, 69, 4}, {285, 70, 4}, {289, 71, 4}, {293, 72, 3},
650	{296, 73, 4}, {300, 74, 5}, {305, 75, 3}, {308, 76, 4}, {312, 77, 4}, {316, 78, 7}, {323, 79, 6},
651	{329, 80, 3}, {332, 81, 3}, {335, 82, 3}, {338, 83, 3}, {341, 84, 3}, {344, 85, 3}, {347, 86, 3},
652	{350, 87, 6}, {356, 88, 3}, {359, 89, 4}, {363, 90, 4}, {367, 91, 4}, {371, 92, 5}, {376, 93, 3},
653	{379, 94, 4}, {383, 95, 4}, {387, 96, 3}, {390, 97, 4}, {394, 98, 4}, {398, 99, 5}, {403, 100, 2},
654	{405, 101, 2}, {407, 102, 3}, {410, 103, 2}, {412, 104, 2}, {414, 105, 2}, {416, 106, 2}, {418, 109, 2},
655	{420, 110, 8}, {428, 111, 4}, {432, 112, 7}, {439, 113, 5}, {444, 114, 2}, {446, 115, 2}, {448, 116, 2},
656	{450, 117, 2}, {452, 118, 4}, {456, 119, 4}, {460, 1000, 2}, {462, 1001, 2}, {464, 1002, 2}, {466, 1003, 3},
657	{469, 1004, 2}, {471, 1005, 2}, {473, 1006, 2}, {475, 1007, 2}, {477, 1008, 2}, {479, 1009, 2}, {481, 1010, 2},
658	{483, 1011, 2}, {485, 1012, 2}, {487, 1013, 2}, {489, 1014, 2}, {491, 1015, 2}, {493, 1016, 3}, {496, 1017, 2},
659	{498, 1018, 2}, {500, 1019, 2}, {502, 1020, 3}, {505, 1021, 2}, {507, 2000, 2}, {509, 2001, 2}, {511, 2002, 2},
660	{513, 2003, 2}, {515, 2004, 4}, {519, 2005, 2}, {521, 2006, 2}, {523, 2007, 2}, {525, 2008, 3}, {528, 2009, 4},
661	{532, 2010, 4}, {536, 2011, 4}, {540, 2012, 2}, {542, 2013, 4}, {546, 2014, 2}, {548, 2015, 2}, {550, 2016, 2},
662	{552, 2017, 2}, {554, 2018, 2}, {556, 2019, 2}, {558, 2020, 2}, {560, 2021, 2}, {562, 2022, 2}, {564, 2023, 2},
663	{566, 2024, 2}, {568, 2025, 2}, {570, 2026, 2}, {572, 2027, 3}, {575, 2028, 7}, {582, 2029, 4}, {586, 2030, 3},
664	{589, 2031, 4}, {593, 2032, 4}, {597, 2033, 4}, {601, 2034, 5}, {606, 2035, 4}, {610, 2036, 4}, {614, 2037, 4},
665	{618, 2038, 4}, {622, 2039, 4}, {626, 2040, 4}, {630, 2041, 4}, {634, 2042, 4}, {638, 2043, 4}, {642, 2044, 5},
666	{647, 2045, 4}, {651, 2046, 4}, {655, 2047, 4}, {659, 2048, 4}, {663, 2049, 5}, {668, 2050, 4}, {672, 2051, 3},
667	{675, 2052, 4}, {679, 2053, 4}, {683, 2054, 5}, {688, 2055, 5}, {693, 2056, 4}, {697, 2057, 4}, {701, 2058, 3},
668	{704, 2059, 3}, {707, 2060, 4}, {711, 2061, 4}, {715, 2062, 4}, {719, 2063, 3}, {722, 2064, 2}, {724, 2065, 2},
669	{726, 2066, 2}, {728, 2067, 2}, {730, 2068, 2}, {732, 2069, 2}, {734, 2070, 2}, {736, 2071, 2}, {738, 2072, 2},
670	{740, 2073, 2}, {742, 2074, 2}, {744, 2075, 2}, {746, 2076, 2}, {748, 2077, 2}, {750, 2078, 2}, {752, 2079, 2},
671	{754, 2080, 2}, {756, 2081, 2}, {758, 2082, 2}, {760, 2083, 2}, {762, 2084, 2}, {764, 2085, 1}, {765, 2086, 4},
672	{769, 2087, 3}, {772, 2088, 2}, {774, 2089, 5}, {779, 2090, 5}, {784, 2091, 5}, {789, 2092, 5}, {794, 2093, 6},
673	{800, 2094, 6}, {806, 2095, 5}, {811, 2096, 5}, {816, 2097, 5}, {821, 2098, 5}, {826, 2099, 5}, {831, 2100, 5},
674	{836, 2101, 2}, {838, 2102, 3}, {841, 2103, 5}, {846, 2104, 5}, {851, 2105, 2}, {853, 2106, 2}, {855, 2107, 2},
675	{857, 2108, 2}, {859, 2109, 2}, {861, 2250, 2}, {863, 2251, 2}, {865, 2252, 2}, {867, 2253, 2}, {869, 2254, 2},
676	{871, 2255, 2}, {873, 2256, 2}, {875, 2257, 2}, {877, 2258, 2}, {879, 2259, 3}, {882, 2260, 2}};
677
678	static constexpr char __aliases_string[] =
679	"US-ASCII\0iso-ir-6\0ANSI_X3.4-1968\0ANSI_X3.4-1986\0ISO_646.irv:1991\0ISO646-"
680	"US\0us\0IBM367\0cp367\0csASCII\0ASCII\0ISO_8859-1:1987\0iso-ir-100\0ISO_8859-1\0ISO-8859-"
681	"1\0latin1\0l1\0IBM819\0CP819\0csISOLatin1\0ISO_8859-2:1987\0iso-ir-101\0ISO_8859-2\0ISO-8859-"
682	"2\0latin2\0l2\0csISOLatin2\0ISO_8859-3:1988\0iso-ir-109\0ISO_8859-3\0ISO-8859-3\0latin3\0l3\0csISOLatin3\0ISO_"
683	"8859-4:1988\0iso-ir-110\0ISO_8859-4\0ISO-8859-4\0latin4\0l4\0csISOLatin4\0ISO_8859-5:1988\0iso-ir-144\0ISO_8859-"
684	"5\0ISO-8859-5\0cyrillic\0csISOLatinCyrillic\0ISO_8859-6:1987\0iso-ir-127\0ISO_8859-6\0ISO-8859-6\0ECMA-"
685	"114\0ASMO-708\0arabic\0csISOLatinArabic\0ISO_8859-7:1987\0iso-ir-126\0ISO_8859-7\0ISO-8859-7\0ELOT_928\0ECMA-"
686	"118\0greek\0greek8\0csISOLatinGreek\0ISO_8859-8:1988\0iso-ir-138\0ISO_8859-8\0ISO-8859-"
687	"8\0hebrew\0csISOLatinHebrew\0ISO_8859-9:1989\0iso-ir-148\0ISO_8859-9\0ISO-8859-9\0latin5\0l5\0csISOLatin5\0ISO-"
688	"8859-10\0iso-ir-157\0l6\0ISO_8859-10:1992\0csISOLatin6\0latin6\0ISO_6937-2-add\0iso-ir-142\0csISOTextComm\0JIS_"
689	"X0201\0X0201\0csHalfWidthKatakana\0JIS_Encoding\0csJISEncoding\0Shift_JIS\0MS_Kanji\0csShiftJIS\0Extended_UNIX_"
690	"Code_Packed_Format_for_Japanese\0csEUCPkdFmtJapanese\0EUC-JP\0Extended_UNIX_Code_Fixed_Width_for_"
691	"Japanese\0csEUCFixWidJapanese\0BS_4730\0iso-ir-4\0ISO646-GB\0gb\0uk\0csISO4UnitedKingdom\0SEN_850200_C\0iso-ir-"
692	"11\0ISO646-SE2\0se2\0csISO11SwedishForNames\0IT\0iso-ir-15\0ISO646-IT\0csISO15Italian\0ES\0iso-ir-17\0ISO646-"
693	"ES\0csISO17Spanish\0DIN_66003\0iso-ir-21\0de\0ISO646-DE\0csISO21German\0NS_4551-1\0iso-ir-60\0ISO646-"
694	"NO\0no\0csISO60DanishNorwegian\0csISO60Norwegian1\0NF_Z_62-010\0iso-ir-69\0ISO646-FR\0fr\0csISO69French\0ISO-"
695	"10646-UTF-1\0csISO10646UTF1\0ISO_646.basic:1983\0ref\0csISO646basic1983\0INVARIANT\0csINVARIANT\0ISO_646.irv:"
696	"1983\0iso-ir-2\0irv\0csISO2IntlRefVersion\0NATS-SEFI\0iso-ir-8-1\0csNATSSEFI\0NATS-SEFI-ADD\0iso-ir-8-"
697	"2\0csNATSSEFIADD\0SEN_850200_B\0iso-ir-10\0FI\0ISO646-FI\0ISO646-SE\0se\0csISO10Swedish\0KS_C_5601-1987\0iso-ir-"
698	"149\0KS_C_5601-1989\0KSC_5601\0korean\0csKSC56011987\0ISO-2022-KR\0csISO2022KR\0EUC-KR\0csEUCKR\0ISO-2022-"
699	"JP\0csISO2022JP\0ISO-2022-JP-2\0csISO2022JP2\0JIS_C6220-1969-jp\0JIS_C6220-1969\0iso-ir-13\0katakana\0x0201-"
700	"7\0csISO13JISC6220jp\0JIS_C6220-1969-ro\0iso-ir-14\0jp\0ISO646-JP\0csISO14JISC6220ro\0PT\0iso-ir-16\0ISO646-"
701	"PT\0csISO16Portuguese\0greek7-old\0iso-ir-18\0csISO18Greek7Old\0latin-greek\0iso-ir-19\0csISO19LatinGreek\0NF_Z_"
702	"62-010_(1973)\0iso-ir-25\0ISO646-FR1\0csISO25French\0Latin-greek-1\0iso-ir-27\0csISO27LatinGreek1\0ISO_"
703	"5427\0iso-ir-37\0csISO5427Cyrillic\0JIS_C6226-1978\0iso-ir-42\0csISO42JISC62261978\0BS_viewdata\0iso-ir-"
704	"47\0csISO47BSViewdata\0INIS\0iso-ir-49\0csISO49INIS\0INIS-8\0iso-ir-50\0csISO50INIS8\0INIS-cyrillic\0iso-ir-"
705	"51\0csISO51INISCyrillic\0ISO_5427:1981\0iso-ir-54\0ISO5427Cyrillic1981\0csISO54271981\0ISO_5428:1980\0iso-ir-"
706	"55\0csISO5428Greek\0GB_1988-80\0iso-ir-57\0cn\0ISO646-CN\0csISO57GB1988\0GB_2312-80\0iso-ir-"
707	"58\0chinese\0csISO58GB231280\0NS_4551-2\0ISO646-NO2\0iso-ir-61\0no2\0csISO61Norwegian2\0videotex-suppl\0iso-ir-"
708	"70\0csISO70VideotexSupp1\0PT2\0iso-ir-84\0ISO646-PT2\0csISO84Portuguese2\0ES2\0iso-ir-85\0ISO646-"
709	"ES2\0csISO85Spanish2\0MSZ_7795.3\0iso-ir-86\0ISO646-HU\0hu\0csISO86Hungarian\0JIS_C6226-1983\0iso-ir-"
710	"87\0x0208\0JIS_X0208-1983\0csISO87JISX0208\0greek7\0iso-ir-88\0csISO88Greek7\0ASMO_449\0ISO_9036\0arabic7\0iso-"
711	"ir-89\0csISO89ASMO449\0iso-ir-90\0csISO90\0JIS_C6229-1984-a\0iso-ir-91\0jp-ocr-a\0csISO91JISC62291984a\0JIS_"
712	"C6229-1984-b\0iso-ir-92\0ISO646-JP-OCR-B\0jp-ocr-b\0csISO92JISC62991984b\0JIS_C6229-1984-b-add\0iso-ir-93\0jp-"
713	"ocr-b-add\0csISO93JIS62291984badd\0JIS_C6229-1984-hand\0iso-ir-94\0jp-ocr-hand\0csISO94JIS62291984hand\0JIS_"
714	"C6229-1984-hand-add\0iso-ir-95\0jp-ocr-hand-add\0csISO95JIS62291984handadd\0JIS_C6229-1984-kana\0iso-ir-"
715	"96\0csISO96JISC62291984kana\0ISO_2033-1983\0iso-ir-98\0e13b\0csISO2033\0ANSI_X3.110-1983\0iso-ir-99\0CSA_T500-"
716	"1983\0NAPLPS\0csISO99NAPLPS\0T.61-7bit\0iso-ir-102\0csISO102T617bit\0T.61-8bit\0T.61\0iso-ir-"
717	"103\0csISO103T618bit\0ECMA-cyrillic\0iso-ir-111\0KOI8-E\0csISO111ECMACyrillic\0CSA_Z243.4-1985-1\0iso-ir-"
718	"121\0ISO646-CA\0csa7-1\0csa71\0ca\0csISO121Canadian1\0CSA_Z243.4-1985-2\0iso-ir-122\0ISO646-CA2\0csa7-"
719	"2\0csa72\0csISO122Canadian2\0CSA_Z243.4-1985-gr\0iso-ir-123\0csISO123CSAZ24341985gr\0ISO_8859-6-"
720	"E\0csISO88596E\0ISO-8859-6-E\0ISO_8859-6-I\0csISO88596I\0ISO-8859-6-I\0T.101-G2\0iso-ir-"
721	"128\0csISO128T101G2\0ISO_8859-8-E\0csISO88598E\0ISO-8859-8-E\0ISO_8859-8-I\0csISO88598I\0ISO-8859-8-I\0CSN_"
722	"369103\0iso-ir-139\0csISO139CSN369103\0JUS_I.B1.002\0iso-ir-141\0ISO646-YU\0js\0yu\0csISO141JUSIB1002\0IEC_P27-"
723	"1\0iso-ir-143\0csISO143IECP271\0JUS_I.B1.003-serb\0iso-ir-146\0serbian\0csISO146Serbian\0JUS_I.B1.003-"
724	"mac\0macedonian\0iso-ir-147\0csISO147Macedonian\0greek-ccitt\0iso-ir-150\0csISO150\0csISO150GreekCCITT\0NC_NC00-"
725	"10:81\0cuba\0iso-ir-151\0ISO646-CU\0csISO151Cuba\0ISO_6937-2-25\0iso-ir-152\0csISO6937Add\0GOST_19768-74\0ST_"
726	"SEV_358-88\0iso-ir-153\0csISO153GOST1976874\0ISO_8859-supp\0iso-ir-154\0latin1-2-5\0csISO8859Supp\0ISO_10367-"
727	"box\0iso-ir-155\0csISO10367Box\0latin-lap\0lap\0iso-ir-158\0csISO158Lap\0JIS_X0212-1990\0x0212\0iso-ir-"
728	"159\0csISO159JISX02121990\0DS_2089\0DS2089\0ISO646-DK\0dk\0csISO646Danish\0us-dk\0csUSDK\0dk-"
729	"us\0csDKUS\0KSC5636\0ISO646-KR\0csKSC5636\0UNICODE-1-1-UTF-7\0csUnicode11UTF7\0ISO-2022-CN\0csISO2022CN\0ISO-"
730	"2022-CN-EXT\0csISO2022CNEXT\0UTF-8\0csUTF8\0ISO-8859-13\0csISO885913\0ISO-8859-14\0iso-ir-199\0ISO_8859-14:"
731	"1998\0ISO_8859-14\0latin8\0iso-celtic\0l8\0csISO885914\0ISO-8859-15\0ISO_8859-15\0Latin-9\0csISO885915\0ISO-"
732	"8859-16\0iso-ir-226\0ISO_8859-16:2001\0ISO_8859-16\0latin10\0l10\0csISO885916\0GBK\0CP936\0MS936\0windows-"
733	"936\0csGBK\0GB18030\0csGB18030\0OSD_EBCDIC_DF04_15\0csOSDEBCDICDF0415\0OSD_EBCDIC_DF03_"
734	"IRV\0csOSDEBCDICDF03IRV\0OSD_EBCDIC_DF04_1\0csOSDEBCDICDF041\0ISO-11548-1\0ISO_11548-1\0ISO_TR_11548-"
735	"1\0csISO115481\0KZ-1048\0STRK1048-2002\0RK1048\0csKZ1048\0ISO-10646-UCS-2\0csUnicode\0ISO-10646-UCS-"
736	"4\0csUCS4\0ISO-10646-UCS-Basic\0csUnicodeASCII\0ISO-10646-Unicode-Latin1\0csUnicodeLatin1\0ISO-10646\0ISO-10646-"
737	"J-1\0csUnicodeJapanese\0ISO-Unicode-IBM-1261\0csUnicodeIBM1261\0ISO-Unicode-IBM-1268\0csUnicodeIBM1268\0ISO-"
738	"Unicode-IBM-1276\0csUnicodeIBM1276\0ISO-Unicode-IBM-1264\0csUnicodeIBM1264\0ISO-Unicode-IBM-"
739	"1265\0csUnicodeIBM1265\0UNICODE-1-1\0csUnicode11\0SCSU\0csSCSU\0UTF-7\0csUTF7\0UTF-16BE\0csUTF16BE\0UTF-"
740	"16LE\0csUTF16LE\0UTF-16\0csUTF16\0CESU-8\0csCESU8\0csCESU-8\0UTF-32\0csUTF32\0UTF-32BE\0csUTF32BE\0UTF-"
741	"32LE\0csUTF32LE\0BOCU-1\0csBOCU1\0csBOCU-1\0UTF-7-IMAP\0csUTF7IMAP\0ISO-8859-1-Windows-3.0-Latin-"
742	"1\0csWindows30Latin1\0ISO-8859-1-Windows-3.1-Latin-1\0csWindows31Latin1\0ISO-8859-2-Windows-Latin-"
743	"2\0csWindows31Latin2\0ISO-8859-9-Windows-Latin-5\0csWindows31Latin5\0hp-roman8\0roman8\0r8\0csHPRoman8\0Adobe-"
744	"Standard-Encoding\0csAdobeStandardEncoding\0Ventura-US\0csVenturaUS\0Ventura-"
745	"International\0csVenturaInternational\0DEC-"
746	"MCS\0dec\0csDECMCS\0IBM850\0cp850\0850\0csPC850Multilingual\0IBM852\0cp852\0852\0csPCp852\0IBM437\0cp437\0"
747	"437\0csPC8CodePage437\0PC8-Danish-Norwegian\0csPC8DanishNorwegian\0IBM862\0cp862\0862\0csPC862LatinHebrew\0PC8-"
748	"Turkish\0csPC8Turkish\0IBM-Symbols\0csIBMSymbols\0IBM-Thai\0csIBMThai\0HP-Legal\0csHPLegal\0HP-Pi-"
749	"font\0csHPPiFont\0HP-Math8\0csHPMath8\0Adobe-Symbol-Encoding\0csHPPSMath\0HP-DeskTop\0csHPDesktop\0Ventura-"
750	"Math\0csVenturaMath\0Microsoft-Publishing\0csMicrosoftPublishing\0Windows-"
751	"31J\0csWindows31J\0GB2312\0csGB2312\0Big5\0csBig5\0macintosh\0mac\0csMacintosh\0IBM037\0cp037\0ebcdic-cp-"
752	"us\0ebcdic-cp-ca\0ebcdic-cp-wt\0ebcdic-cp-nl\0csIBM037\0IBM038\0EBCDIC-"
753	"INT\0cp038\0csIBM038\0IBM273\0CP273\0csIBM273\0IBM274\0EBCDIC-BE\0CP274\0csIBM274\0IBM275\0EBCDIC-"
754	"BR\0cp275\0csIBM275\0IBM277\0EBCDIC-CP-DK\0EBCDIC-CP-NO\0csIBM277\0IBM278\0CP278\0ebcdic-cp-fi\0ebcdic-cp-"
755	"se\0csIBM278\0IBM280\0CP280\0ebcdic-cp-it\0csIBM280\0IBM281\0EBCDIC-JP-"
756	"E\0cp281\0csIBM281\0IBM284\0CP284\0ebcdic-cp-es\0csIBM284\0IBM285\0CP285\0ebcdic-cp-"
757	"gb\0csIBM285\0IBM290\0cp290\0EBCDIC-JP-kana\0csIBM290\0IBM297\0cp297\0ebcdic-cp-"
758	"fr\0csIBM297\0IBM420\0cp420\0ebcdic-cp-ar1\0csIBM420\0IBM423\0cp423\0ebcdic-cp-"
759	"gr\0csIBM423\0IBM424\0cp424\0ebcdic-cp-he\0csIBM424\0IBM500\0CP500\0ebcdic-cp-be\0ebcdic-cp-"
760	"ch\0csIBM500\0IBM851\0cp851\0851\0csIBM851\0IBM855\0cp855\0855\0csIBM855\0IBM857\0cp857\0857\0csIBM857\0IBM860\0"
761	"cp860\0860\0csIBM860\0IBM861\0cp861\0861\0cp-"
762	"is\0csIBM861\0IBM863\0cp863\0863\0csIBM863\0IBM864\0cp864\0csIBM864\0IBM865\0cp865\0865\0csIBM865\0IBM868\0CP868"
763	"\0cp-ar\0csIBM868\0IBM869\0cp869\0869\0cp-gr\0csIBM869\0IBM870\0CP870\0ebcdic-cp-roece\0ebcdic-cp-"
764	"yu\0csIBM870\0IBM871\0CP871\0ebcdic-cp-is\0csIBM871\0IBM880\0cp880\0EBCDIC-"
765	"Cyrillic\0csIBM880\0IBM891\0cp891\0csIBM891\0IBM903\0cp903\0csIBM903\0IBM904\0cp904\0904\0csIBBM904\0IBM905\0CP9"
766	"05\0ebcdic-cp-tr\0csIBM905\0IBM918\0CP918\0ebcdic-cp-ar2\0csIBM918\0IBM1026\0CP1026\0csIBM1026\0EBCDIC-AT-"
767	"DE\0csIBMEBCDICATDE\0EBCDIC-AT-DE-A\0csEBCDICATDEA\0EBCDIC-CA-FR\0csEBCDICCAFR\0EBCDIC-DK-"
768	"NO\0csEBCDICDKNO\0EBCDIC-DK-NO-A\0csEBCDICDKNOA\0EBCDIC-FI-SE\0csEBCDICFISE\0EBCDIC-FI-SE-"
769	"A\0csEBCDICFISEA\0EBCDIC-FR\0csEBCDICFR\0EBCDIC-IT\0csEBCDICIT\0EBCDIC-PT\0csEBCDICPT\0EBCDIC-"
770	"ES\0csEBCDICES\0EBCDIC-ES-A\0csEBCDICESA\0EBCDIC-ES-S\0csEBCDICESS\0EBCDIC-UK\0csEBCDICUK\0EBCDIC-"
771	"US\0csEBCDICUS\0UNKNOWN-"
772	"8BIT\0csUnknown8BiT\0MNEMONIC\0csMnemonic\0MNEM\0csMnem\0VISCII\0csVISCII\0VIQR\0csVIQR\0KOI8-R\0csKOI8R\0HZ-GB-"
773	"2312\0IBM866\0cp866\0866\0csIBM866\0IBM775\0cp775\0csPC775Baltic\0KOI8-"
774	"U\0csKOI8U\0IBM00858\0CCSID00858\0CP00858\0PC-Multilingual-850+"
775	"euro\0csIBM00858\0IBM00924\0CCSID00924\0CP00924\0ebcdic-Latin9--"
776	"euro\0csIBM00924\0IBM01140\0CCSID01140\0CP01140\0ebcdic-us-37+"
777	"euro\0csIBM01140\0IBM01141\0CCSID01141\0CP01141\0ebcdic-de-273+"
778	"euro\0csIBM01141\0IBM01142\0CCSID01142\0CP01142\0ebcdic-dk-277+euro\0ebcdic-no-277+"
779	"euro\0csIBM01142\0IBM01143\0CCSID01143\0CP01143\0ebcdic-fi-278+euro\0ebcdic-se-278+"
780	"euro\0csIBM01143\0IBM01144\0CCSID01144\0CP01144\0ebcdic-it-280+"
781	"euro\0csIBM01144\0IBM01145\0CCSID01145\0CP01145\0ebcdic-es-284+"
782	"euro\0csIBM01145\0IBM01146\0CCSID01146\0CP01146\0ebcdic-gb-285+"
783	"euro\0csIBM01146\0IBM01147\0CCSID01147\0CP01147\0ebcdic-fr-297+"
784	"euro\0csIBM01147\0IBM01148\0CCSID01148\0CP01148\0ebcdic-international-500+"
785	"euro\0csIBM01148\0IBM01149\0CCSID01149\0CP01149\0ebcdic-is-871+euro\0csIBM01149\0Big5-"
786	"HKSCS\0csBig5HKSCS\0IBM1047\0IBM-1047\0csIBM1047\0PTCP154\0csPTCP154\0PT154\0CP154\0Cyrillic-Asian\0Amiga-"
787	"1251\0Ami1251\0Amiga1251\0Ami-1251\0csAmiga1251\0KOI7-"
788	"switched\0csKOI7switched\0BRF\0csBRF\0TSCII\0csTSCII\0CP51932\0csCP51932\0windows-874\0cswindows874\0windows-"
789	"1250\0cswindows1250\0windows-1251\0cswindows1251\0windows-1252\0cswindows1252\0windows-"
790	"1253\0cswindows1253\0windows-1254\0cswindows1254\0windows-1255\0cswindows1255\0windows-"
791	"1256\0cswindows1256\0windows-1257\0cswindows1257\0windows-1258\0cswindows1258\0TIS-620\0csTIS620\0ISO-8859-"
792	"11\0CP50220\0csCP50220\0";
793
794	struct __offset_table {
795	constexpr static unsigned long long __num_aliases =
796	std::count(__aliases_string, __aliases_string + sizeof(__aliases_string), '\0') + 1;
797	unsigned short __table[__num_aliases];
798	};
799
800	static constexpr __offset_table __alias_offsets = [] {
801	__offset_table __aliases{};
802	__aliases.__table[0] = sizeof(__aliases_string) - 1;
803	__aliases.__table[1] = sizeof(__aliases_string) - 1;
804	__aliases.__table[2] = 0;
805
806	unsigned long long __idx = 3;
807
808	for (unsigned short __pos = 0; __pos < sizeof(__aliases_string) - 1 && __idx < __offset_table::__num_aliases;
809	__pos++) {
810	if (__aliases_string[__pos] == '\0') {
811	__aliases.__table[__idx++] = __pos + 1;
812	}
813	}
814
815	return __aliases;
816	}();
817	};
818
819	template <>
820	struct hash<text_encoding> {
821	[[nodiscard]] static size_t operator()(const text_encoding& __enc) noexcept {
822	return std::hash<std::text_encoding::id>()(__enc.mib());
823	}
824	};
825
826	template <>
827	inline constexpr bool ranges::enable_borrowed_range<text_encoding::aliases_view> = true;
828
829	_LIBCPP_END_NAMESPACE_STD
830
831	# endif // _LIBCPP_STD_VER >= 26
832
833	#endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
834
835	#endif // _LIBCPP_TEXT_ENCODING

lib/libcxx/include/thread+13-7

 @@ -91,6 +91,11 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
 #else
 #  include <__config>
+// standard-mandated includes
+// [thread.syn]
+#  include <compare>
 #  if _LIBCPP_HAS_THREADS
 #    include <__thread/this_thread.h>
 @@ -106,28 +111,29 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
 #    include <version>
-// standard-mandated includes
-// [thread.syn]
-#    include <compare>
 #    if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #      pragma GCC system_header
 #    endif
 #  endif // _LIBCPP_HAS_THREADS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 17
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 17
 #    include <chrono>
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <cstring>
 #    include <functional>
 #    include <new>
 #    include <system_error>
 #    include <type_traits>
 #  endif
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
+#    include <atomic>
+#    include <sstream>
+#  endif
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 #endif // _LIBCPP_THREAD

lib/libcxx/include/tuple+53-65

 @@ -255,7 +255,6 @@ template <class... Types>
 #  include <__type_traits/is_same.h>
 #  include <__type_traits/is_swappable.h>
 #  include <__type_traits/is_trivially_relocatable.h>
-#  include <__type_traits/lazy.h>
 #  include <__type_traits/maybe_const.h>
 #  include <__type_traits/nat.h>
 #  include <__type_traits/negation.h>
 @@ -284,10 +283,10 @@ template <class... Types>
 _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
-_LIBCPP_BEGIN_NAMESPACE_STD
 #  ifndef _LIBCPP_CXX03_LANG
+_LIBCPP_BEGIN_NAMESPACE_STD
 template <size_t _Ip, class _Tp, class _Up>
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool __tuple_compare_equal(const _Tp& __x, const _Up& __y) {
   if constexpr (_Ip == 0)
 @@ -296,20 +295,6 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 bool __tuple_compare_equal(c
     return std::__tuple_compare_equal<_Ip - 1>(__x, __y) && std::get<_Ip - 1>(__x) == std::get<_Ip - 1>(__y);
 }
-#    if _LIBCPP_STD_VER >= 26
-template <class _Tp, class _Up, class _IndexSeq = make_index_sequence<tuple_size_v<_Tp>>>
-inline constexpr bool __can_tuple_compare_equal = false;
-// TODO(LLVM 23): Remove `tuple_size_v<_Tp> == tuple_size_v<_Up>` here once once LLVM-20 support ends
-// because the resolution of CWG2369 landed in LLVM-21.
-template <class _Tp, class _Up, size_t... _Is>
-  requires(tuple_size_v<_Tp> == tuple_size_v<_Up>)
-inline constexpr bool __can_tuple_compare_equal<_Tp, _Up, index_sequence<_Is...>> =
-    __all<requires(const tuple_element_t<_Is, _Tp>& __t, const tuple_element_t<_Is, _Up>& __u) {
-      { __t == __u } -> __boolean_testable;
-    }...>::value;
-#    endif // _LIBCPP_STD_VER >= 26
 #    if _LIBCPP_STD_VER >= 20
 template <class _Ret, class _Tp, class _Up, size_t... _Is>
 _LIBCPP_HIDE_FROM_ABI constexpr _Ret __tuple_compare_three_way(const _Tp& __x, const _Up& __y, index_sequence<_Is...>) {
 @@ -324,24 +309,16 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Ret __tuple_compare_three_way(const _Tp& __x, c
 template <class _Tp>
 concept __tuple_like_no_tuple = __tuple_like<_Tp> && !__is_tuple_v<_Tp>;
-template <class _Tp, class _Up, class _IndexSeq>
+template <__tuple_like _Tp, class _IndexSequence = make_index_sequence<tuple_size_v<_Tp>>>
-struct __tuple_common_comparison_category_impl {};
+struct __to_tuple;
-// TODO(LLVM 23): Remove `tuple_size_v<_Tp> == tuple_size_v<_Up>` here once once LLVM-20 support ends
+template <__tuple_like _Tp, size_t... _Index>
-// because the resolution of CWG2369 landed in LLVM-21.
+struct __to_tuple<_Tp, index_sequence<_Index...>> {
-template <class _Tp, class _Up, size_t... _Is>
+  using type _LIBCPP_NODEBUG = tuple<tuple_element_t<_Index, _Tp>...>;
-  requires(tuple_size_v<_Tp> == tuple_size_v<_Up>) && requires {
-    typename common_comparison_category_t<
-        __synth_three_way_result<tuple_element_t<_Is, _Tp>, tuple_element_t<_Is, _Up>>...>;
-  }
-struct __tuple_common_comparison_category_impl<_Tp, _Up, index_sequence<_Is...>> {
-  using type _LIBCPP_NODEBUG =
-      common_comparison_category_t<__synth_three_way_result<tuple_element_t<_Is, _Tp>, tuple_element_t<_Is, _Up>>...>;
 };
-template <__tuple_like _Tp, __tuple_like _Up>
+template <__tuple_like _Tp>
-using __tuple_common_comparison_category _LIBCPP_NODEBUG =
+using __to_tuple_t _LIBCPP_NODEBUG = typename __to_tuple<_Tp>::type;
-    __tuple_common_comparison_category_impl<_Tp, _Up, make_index_sequence<tuple_size_v<_Tp>>>::type;
 #    endif // _LIBCPP_STD_VER >= 23
 // __tuple_leaf
 @@ -602,30 +579,28 @@ public:
   template <template <class...> class _IsImpDefault                = __is_implicitly_default_constructible,
             template <class...> class _IsDefault                   = is_default_constructible,
             __enable_if_t< _And< _IsDefault<_Tp>... >::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit(_Not<_Lazy<_And, _IsImpDefault<_Tp>...> >::value)
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!_And<_IsImpDefault<_Tp>...>::value)
       tuple() noexcept(_And<is_nothrow_default_constructible<_Tp>...>::value) {}
   template <class _Alloc,
             template <class...> class _IsImpDefault                = __is_implicitly_default_constructible,
             template <class...> class _IsDefault                   = is_default_constructible,
             __enable_if_t< _And< _IsDefault<_Tp>... >::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(_Not<_Lazy<_And, _IsImpDefault<_Tp>...> >::value)
+  _LIBCPP_HIDE_FROM_ABI
-      tuple(allocator_arg_t, _Alloc const& __a)
+  _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(!_And<_IsImpDefault<_Tp>...>::value) tuple(allocator_arg_t, _Alloc const& __a)
       : __base_(allocator_arg_t(), __a, __value_init{}) {}
   // tuple(const T&...) constructors (including allocator_arg_t variants)
   template <template <class...> class _And = _And,
             __enable_if_t< _And< _BoolConstant<sizeof...(_Tp) >= 1>, is_copy_constructible<_Tp>... >::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(!_And<is_convertible<const _Tp&, _Tp>...>::value)
-  _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(_Not<_Lazy<_And, is_convertible<const _Tp&, _Tp>...> >::value)
       tuple(const _Tp&... __t) noexcept(_And<is_nothrow_copy_constructible<_Tp>...>::value)
       : __base_(__forward_args{}, __t...) {}
   template <class _Alloc,
             template <class...> class _And = _And,
             __enable_if_t< _And< _BoolConstant<sizeof...(_Tp) >= 1>, is_copy_constructible<_Tp>... >::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(!_And<is_convertible<const _Tp&, _Tp>...>::value)
-  _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(_Not<_Lazy<_And, is_convertible<const _Tp&, _Tp>...> >::value)
       tuple(allocator_arg_t, const _Alloc& __a, const _Tp&... __t)
       : __base_(allocator_arg_t(), __a, __forward_args{}, __t...) {}
 @@ -644,7 +619,7 @@ public:
   template <class... _Up,
             __enable_if_t< _And< _BoolConstant<sizeof...(_Up) == sizeof...(_Tp)>, _EnableUTypesCtor<_Up...> >::value,
                            int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(_Not<_Lazy<_And, is_convertible<_Up, _Tp>...> >::value)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(!_And<is_convertible<_Up, _Tp>...>::value)
       tuple(_Up&&... __u) noexcept(_And<is_nothrow_constructible<_Tp, _Up>...>::value)
       : __base_(__forward_args{}, std::forward<_Up>(__u)...) {}
 @@ -652,7 +627,7 @@ public:
             class... _Up,
             __enable_if_t< _And< _BoolConstant<sizeof...(_Up) == sizeof...(_Tp)>, _EnableUTypesCtor<_Up...> >::value,
                            int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(_Not<_Lazy<_And, is_convertible<_Up, _Tp>...> >::value)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(!_And<is_convertible<_Up, _Tp>...>::value)
       tuple(allocator_arg_t, const _Alloc& __a, _Up&&... __u)
       : __base_(allocator_arg_t(), __a, __forward_args{}, std::forward<_Up>(__u)...) {}
 @@ -690,26 +665,22 @@ public:
             _Not<is_same<_OtherTuple, const tuple&> >,
             _Not<is_same<_OtherTuple, tuple&&> >,
             is_constructible<_Tp, __copy_cvref_t<_OtherTuple, _Up> >...,
-            _Lazy<_Or,
+            _Or<_BoolConstant<sizeof...(_Tp) != 1>,
-                  _BoolConstant<sizeof...(_Tp) != 1>,
+                // _Tp and _Up are 1-element packs - the pack expansions look
-                  // _Tp and _Up are 1-element packs - the pack expansions look
+                // weird to avoid tripping up the type traits in degenerate cases
-                  // weird to avoid tripping up the type traits in degenerate cases
+                _And<_Not<is_same<_Tp, _Up> >...,
-                  _Lazy<_And,
+                     _Not<is_convertible<_OtherTuple, _Tp> >...,
-                        _Not<is_same<_Tp, _Up> >...,
+                     _Not<is_constructible<_Tp, _OtherTuple> >... > > > {};
-                        _Not<is_convertible<_OtherTuple, _Tp> >...,
-                        _Not<is_constructible<_Tp, _OtherTuple> >... > > > {};
   template <class... _Up, __enable_if_t< _And< _EnableCtorFromUTypesTuple<const tuple<_Up...>&> >::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(!_And<is_convertible<const _Up&, _Tp>...>::value)
-  _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(_Not<_Lazy<_And, is_convertible<const _Up&, _Tp>...> >::value)
       tuple(const tuple<_Up...>& __t) noexcept(_And<is_nothrow_constructible<_Tp, const _Up&>...>::value)
       : __base_(__from_tuple(), __t) {}
   template <class... _Up,
             class _Alloc,
             __enable_if_t< _And< _EnableCtorFromUTypesTuple<const tuple<_Up...>&> >::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(!_And<is_convertible<const _Up&, _Tp>...>::value)
-  _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(_Not<_Lazy<_And, is_convertible<const _Up&, _Tp>...> >::value)
       tuple(allocator_arg_t, const _Alloc& __a, const tuple<_Up...>& __t)
       : __base_(allocator_arg_t(), __a, __from_tuple(), __t) {}
 @@ -717,25 +688,25 @@ public:
   // tuple(tuple<U...>&) constructors (including allocator_arg_t variants)
   template <class... _Up, enable_if_t< _EnableCtorFromUTypesTuple<tuple<_Up...>&>::value>* = nullptr>
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!_Lazy<_And, is_convertible<_Up&, _Tp>...>::value) tuple(tuple<_Up...>& __t)
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!_And<is_convertible<_Up&, _Tp>...>::value) tuple(tuple<_Up...>& __t)
       : __base_(__from_tuple(), __t) {}
   template <class _Alloc, class... _Up, enable_if_t< _EnableCtorFromUTypesTuple<tuple<_Up...>&>::value>* = nullptr>
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!_Lazy<_And, is_convertible<_Up&, _Tp>...>::value)
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!_And<is_convertible<_Up&, _Tp>...>::value)
       tuple(allocator_arg_t, const _Alloc& __alloc, tuple<_Up...>& __t)
       : __base_(allocator_arg_t(), __alloc, __from_tuple(), __t) {}
 #    endif // _LIBCPP_STD_VER >= 23
   // tuple(tuple<U...>&&) constructors (including allocator_arg_t variants)
   template <class... _Up, __enable_if_t< _And< _EnableCtorFromUTypesTuple<tuple<_Up...>&&> >::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(_Not<_Lazy<_And, is_convertible<_Up, _Tp>...> >::value)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 explicit(!_And<is_convertible<_Up, _Tp>...>::value)
       tuple(tuple<_Up...>&& __t) noexcept(_And<is_nothrow_constructible<_Tp, _Up>...>::value)
       : __base_(__from_tuple(), std::move(__t)) {}
   template <class _Alloc,
             class... _Up,
             __enable_if_t< _And< _EnableCtorFromUTypesTuple<tuple<_Up...>&&> >::value, int> = 0>
-  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(_Not<_Lazy<_And, is_convertible<_Up, _Tp>...> >::value)
+  _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 explicit(!_And<is_convertible<_Up, _Tp>...>::value)
       tuple(allocator_arg_t, const _Alloc& __a, tuple<_Up...>&& __t)
       : __base_(allocator_arg_t(), __a, __from_tuple(), std::move(__t)) {}
 @@ -743,14 +714,14 @@ public:
   // tuple(const tuple<U...>&&) constructors (including allocator_arg_t variants)
   template <class... _Up, enable_if_t< _EnableCtorFromUTypesTuple<const tuple<_Up...>&&>::value>* = nullptr>
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!_Lazy<_And, is_convertible<const _Up&&, _Tp>...>::value)
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!_And<is_convertible<const _Up&&, _Tp>...>::value)
       tuple(const tuple<_Up...>&& __t)
       : __base_(__from_tuple(), std::move(__t)) {}
   template <class _Alloc,
             class... _Up,
             enable_if_t< _EnableCtorFromUTypesTuple<const tuple<_Up...>&&>::value>* = nullptr>
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!_Lazy<_And, is_convertible<const _Up&&, _Tp>...>::value)
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit(!_And<is_convertible<const _Up&&, _Tp>...>::value)
       tuple(allocator_arg_t, const _Alloc& __alloc, const tuple<_Up...>&& __t)
       : __base_(allocator_arg_t(), __alloc, __from_tuple(), std::move(__t)) {}
 #    endif // _LIBCPP_STD_VER >= 23
 @@ -1011,20 +982,37 @@ public:
     __base_.swap(__t.__base_);
   }
+  template <class _Tuple>
+  static constexpr bool __can_compare_equal = false;
+  template <class... _Up>
+  static constexpr bool __can_compare_equal<tuple<_Up...>> = __all<requires(const _Tp& __t, const _Up& __u) {
+    { __t == __u } -> __boolean_testable;
+  }...>::value;
   template <__tuple_like_no_tuple _UTuple>
 #      if _LIBCPP_STD_VER >= 26
-    requires __can_tuple_compare_equal<tuple, _UTuple> && (sizeof...(_Tp) == tuple_size_v<_UTuple>)
+    requires(sizeof...(_Tp) == tuple_size_v<_UTuple>) && __can_compare_equal<__to_tuple_t<_UTuple>>
 #      endif // _LIBCPP_STD_VER >= 26
   _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const tuple& __x, const _UTuple& __y) {
     static_assert(sizeof...(_Tp) == tuple_size_v<_UTuple>, "Can't compare tuple-like values of different sizes");
     return std::__tuple_compare_equal<sizeof...(_Tp)>(__x, __y);
   }
+  template <class _Tuple>
+  struct __common_comparison_category_with;
+  template <class... _Up>
+    requires requires { typename common_comparison_category_t<__synth_three_way_result<_Tp, _Up>...>; }
+  struct __common_comparison_category_with<tuple<_Up...>> {
+    using type _LIBCPP_NODEBUG = common_comparison_category_t<__synth_three_way_result<_Tp, _Up>...>;
+  };
   template <__tuple_like_no_tuple _UTuple>
     requires(sizeof...(_Tp) == tuple_size_v<_UTuple>)
-  _LIBCPP_HIDE_FROM_ABI friend constexpr __tuple_common_comparison_category<tuple, _UTuple>
+  _LIBCPP_HIDE_FROM_ABI friend constexpr typename __common_comparison_category_with<__to_tuple_t<_UTuple>>::type
   operator<=>(const tuple& __x, const _UTuple& __y) {
-    return std::__tuple_compare_three_way<__tuple_common_comparison_category<tuple, _UTuple>>(
+    return std::__tuple_compare_three_way<typename __common_comparison_category_with<__to_tuple_t<_UTuple>>::type>(
         __x, __y, index_sequence_for<_Tp...>{});
   }
 #    endif   // _LIBCPP_STD_VER >= 23
 @@ -1455,15 +1443,15 @@ template <class _Tp, class _Tuple, class = enable_if_t<__can_make_from_tuple<_Tp
 #  endif // _LIBCPP_STD_VER >= 17
-#endif // !defined(_LIBCPP_CXX03_LANG)
 _LIBCPP_END_NAMESPACE_STD
+#endif // !defined(_LIBCPP_CXX03_LANG)
 _LIBCPP_POP_MACROS
 // clang-format on
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <cstddef>
 #    include <exception>
 #    include <iosfwd>

lib/libcxx/include/typeindex+1-1

...	@@ -102,7 +102,7 @@ struct hash<type_index> : public __unary_function<type_index, size_t> {	...	@@ -102,7 +102,7 @@ struct hash<type_index> : public __unary_function<type_index, size_t> {
102		102
103	_LIBCPP_END_NAMESPACE_STD	103	_LIBCPP_END_NAMESPACE_STD
104		104
105	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	105	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
106	# include <cstddef>	106	# include <cstddef>
107	# include <iosfwd>	107	# include <iosfwd>
108	# include <new>	108	# include <new>

lib/libcxx/include/typeinfo+2-2

...	@@ -302,7 +302,7 @@ class _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_TYPE_INFO_VTABLE_POINTER_AUTH type_info	...	@@ -302,7 +302,7 @@ class _LIBCPP_EXPORTED_FROM_ABI _LIBCPP_TYPE_INFO_VTABLE_POINTER_AUTH type_info
302	protected:	302	protected:
303	typedef __type_info_implementations::__impl __impl;	303	typedef __type_info_implementations::__impl __impl;
304		304
305	__impl::__type_name_t __type_name;	305	_LIBCPP_DISABLE_POINTER_FIELD_PROTECTION __impl::__type_name_t __type_name;
306		306
307	_LIBCPP_HIDE_FROM_ABI explicit type_info(const char* __n) : __type_name(__impl::__string_to_type_name(__n)) {}	307	_LIBCPP_HIDE_FROM_ABI explicit type_info(const char* __n) : __type_name(__impl::__string_to_type_name(__n)) {}
308		308
...	@@ -389,7 +389,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -389,7 +389,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
389	}	389	}
390	_LIBCPP_END_NAMESPACE_STD	390	_LIBCPP_END_NAMESPACE_STD
391		391
392	# if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20	392	# if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
393	# include <cstddef>	393	# include <cstddef>
394	# include <cstdlib>	394	# include <cstdlib>
395	# include <type_traits>	395	# include <type_traits>

lib/libcxx/include/unordered_map+67-31

 @@ -77,16 +77,16 @@ public:
                   const hasher& hf = hasher(), const key_equal& eql = key_equal(),
                   const allocator_type& a = allocator_type());
     unordered_map(size_type n, const allocator_type& a)
-      : unordered_map(n, hasher(), key_equal(), a) {}  // C++14
+      : unordered_map(n, hasher(), key_equal(), a) {}
     unordered_map(size_type n, const hasher& hf, const allocator_type& a)
-      : unordered_map(n, hf, key_equal(), a) {}  // C++14
+      : unordered_map(n, hf, key_equal(), a) {}
     template <class InputIterator>
       unordered_map(InputIterator f, InputIterator l, size_type n, const allocator_type& a)
-      : unordered_map(f, l, n, hasher(), key_equal(), a) {}  // C++14
+      : unordered_map(f, l, n, hasher(), key_equal(), a) {}
     template <class InputIterator>
       unordered_map(InputIterator f, InputIterator l, size_type n, const hasher& hf,
         const allocator_type& a)
-      : unordered_map(f, l, n, hf, key_equal(), a) {}  // C++14
+      : unordered_map(f, l, n, hf, key_equal(), a) {}
     template<container-compatible-range<value_type> R>
       unordered_map(from_range_t, R&& rg, size_type n, const allocator_type& a)
         : unordered_map(from_range, std::forward<R>(rg), n, hasher(), key_equal(), a) { } // C++23
 @@ -94,10 +94,10 @@ public:
       unordered_map(from_range_t, R&& rg, size_type n, const hasher& hf, const allocator_type& a)
         : unordered_map(from_range, std::forward<R>(rg), n, hf, key_equal(), a) { }       // C++23
     unordered_map(initializer_list<value_type> il, size_type n, const allocator_type& a)
-      : unordered_map(il, n, hasher(), key_equal(), a) {}  // C++14
+      : unordered_map(il, n, hasher(), key_equal(), a) {}
     unordered_map(initializer_list<value_type> il, size_type n, const hasher& hf,
       const allocator_type& a)
-      : unordered_map(il, n, hf, key_equal(), a) {}  // C++14
+      : unordered_map(il, n, hf, key_equal(), a) {}
     ~unordered_map();
     unordered_map& operator=(const unordered_map&);
     unordered_map& operator=(unordered_map&&)
 @@ -363,16 +363,16 @@ public:
                   const hasher& hf = hasher(), const key_equal& eql = key_equal(),
                   const allocator_type& a = allocator_type());
     unordered_multimap(size_type n, const allocator_type& a)
-      : unordered_multimap(n, hasher(), key_equal(), a) {}  // C++14
+      : unordered_multimap(n, hasher(), key_equal(), a) {}
     unordered_multimap(size_type n, const hasher& hf, const allocator_type& a)
-      : unordered_multimap(n, hf, key_equal(), a) {}  // C++14
+      : unordered_multimap(n, hf, key_equal(), a) {}
     template <class InputIterator>
       unordered_multimap(InputIterator f, InputIterator l, size_type n, const allocator_type& a)
-      : unordered_multimap(f, l, n, hasher(), key_equal(), a) {}  // C++14
+      : unordered_multimap(f, l, n, hasher(), key_equal(), a) {}
     template <class InputIterator>
       unordered_multimap(InputIterator f, InputIterator l, size_type n, const hasher& hf,
         const allocator_type& a)
-      : unordered_multimap(f, l, n, hf, key_equal(), a) {}  // C++14
+      : unordered_multimap(f, l, n, hf, key_equal(), a) {}
     template<container-compatible-range<value_type> R>
       unordered_multimap(from_range_t, R&& rg, size_type n, const allocator_type& a)
         : unordered_multimap(from_range, std::forward<R>(rg), n, hasher(), key_equal(), a) { } // C++23
 @@ -380,10 +380,10 @@ public:
       unordered_multimap(from_range_t, R&& rg, size_type n, const hasher& hf, const allocator_type& a)
         : unordered_multimap(from_range, std::forward<R>(rg), n, hf, key_equal(), a) { }       // C++23
     unordered_multimap(initializer_list<value_type> il, size_type n, const allocator_type& a)
-      : unordered_multimap(il, n, hasher(), key_equal(), a) {}  // C++14
+      : unordered_multimap(il, n, hasher(), key_equal(), a) {}
     unordered_multimap(initializer_list<value_type> il, size_type n, const hasher& hf,
       const allocator_type& a)
-      : unordered_multimap(il, n, hf, key_equal(), a) {}  // C++14
+      : unordered_multimap(il, n, hf, key_equal(), a) {}
     ~unordered_multimap();
     unordered_multimap& operator=(const unordered_multimap&);
     unordered_multimap& operator=(unordered_multimap&&)
 @@ -993,7 +993,6 @@ public:
       const key_equal& __eql,
       const allocator_type& __a);
 #  endif // _LIBCPP_CXX03_LANG
-#  if _LIBCPP_STD_VER >= 14
   _LIBCPP_HIDE_FROM_ABI unordered_map(size_type __n, const allocator_type& __a)
       : unordered_map(__n, hasher(), key_equal(), __a) {}
   _LIBCPP_HIDE_FROM_ABI unordered_map(size_type __n, const hasher& __hf, const allocator_type& __a)
 @@ -1007,7 +1006,7 @@ public:
       _InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_map(__first, __last, __n, __hf, key_equal(), __a) {}
-#    if _LIBCPP_STD_VER >= 23
+#  if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<value_type> _Range>
   _LIBCPP_HIDE_FROM_ABI unordered_map(from_range_t, _Range&& __range, size_type __n, const allocator_type& __a)
       : unordered_map(from_range, std::forward<_Range>(__range), __n, hasher(), key_equal(), __a) {}
 @@ -1016,8 +1015,9 @@ public:
   _LIBCPP_HIDE_FROM_ABI
   unordered_map(from_range_t, _Range&& __range, size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_map(from_range, std::forward<_Range>(__range), __n, __hf, key_equal(), __a) {}
-#    endif
+#  endif
+#  ifndef _LIBCPP_CXX03_LANG
   _LIBCPP_HIDE_FROM_ABI unordered_map(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
       : unordered_map(__il, __n, hasher(), key_equal(), __a) {}
   _LIBCPP_HIDE_FROM_ABI
 @@ -1216,11 +1216,17 @@ public:
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const key_type& __k) { return __table_.find(__k); }
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const key_type& __k) const { return __table_.find(__k); }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI iterator find(const _K2& __k) {
     return __table_.find(__k);
   }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const _K2& __k) const {
     return __table_.find(__k);
   }
 @@ -1230,7 +1236,10 @@ public:
     return __table_.__count_unique(__k);
   }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI size_type count(const _K2& __k) const {
     return __table_.__count_unique(__k);
   }
 @@ -1239,7 +1248,10 @@ public:
 #  if _LIBCPP_STD_VER >= 20
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool contains(const key_type& __k) const { return find(__k) != end(); }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool contains(const _K2& __k) const {
     return find(__k) != end();
   }
 @@ -1252,11 +1264,17 @@ public:
     return __table_.__equal_range_unique(__k);
   }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const _K2& __k) {
     return __table_.__equal_range_unique(__k);
   }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const _K2& __k) const {
     return __table_.__equal_range_unique(__k);
   }
 @@ -1769,7 +1787,6 @@ public:
       const key_equal& __eql,
       const allocator_type& __a);
 #  endif // _LIBCPP_CXX03_LANG
-#  if _LIBCPP_STD_VER >= 14
   _LIBCPP_HIDE_FROM_ABI unordered_multimap(size_type __n, const allocator_type& __a)
       : unordered_multimap(__n, hasher(), key_equal(), __a) {}
   _LIBCPP_HIDE_FROM_ABI unordered_multimap(size_type __n, const hasher& __hf, const allocator_type& __a)
 @@ -1783,7 +1800,7 @@ public:
       _InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_multimap(__first, __last, __n, __hf, key_equal(), __a) {}
-#    if _LIBCPP_STD_VER >= 23
+#  if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<value_type> _Range>
   _LIBCPP_HIDE_FROM_ABI unordered_multimap(from_range_t, _Range&& __range, size_type __n, const allocator_type& __a)
       : unordered_multimap(from_range, std::forward<_Range>(__range), __n, hasher(), key_equal(), __a) {}
 @@ -1792,8 +1809,9 @@ public:
   _LIBCPP_HIDE_FROM_ABI
   unordered_multimap(from_range_t, _Range&& __range, size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_multimap(from_range, std::forward<_Range>(__range), __n, __hf, key_equal(), __a) {}
-#    endif
+#  endif
+#  ifndef _LIBCPP_CXX03_LANG
   _LIBCPP_HIDE_FROM_ABI unordered_multimap(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
       : unordered_multimap(__il, __n, hasher(), key_equal(), __a) {}
   _LIBCPP_HIDE_FROM_ABI
 @@ -1936,11 +1954,17 @@ public:
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const key_type& __k) { return __table_.find(__k); }
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const key_type& __k) const { return __table_.find(__k); }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const _K2& __k) {
     return __table_.find(__k);
   }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const _K2& __k) const {
     return __table_.find(__k);
   }
 @@ -1950,7 +1974,10 @@ public:
     return __table_.__count_multi(__k);
   }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const _K2& __k) const {
     return __table_.__count_multi(__k);
   }
 @@ -1959,7 +1986,10 @@ public:
 #  if _LIBCPP_STD_VER >= 20
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const key_type& __k) const { return find(__k) != end(); }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const _K2& __k) const {
     return find(__k) != end();
   }
 @@ -1972,11 +2002,17 @@ public:
     return __table_.__equal_range_multi(__k);
   }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const _K2& __k) {
     return __table_.__equal_range_multi(__k);
   }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const _K2& __k) const {
     return __table_.__equal_range_multi(__k);
   }
 @@ -2345,7 +2381,7 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <algorithm>
 #    include <bit>
 #    include <cmath>

lib/libcxx/include/unordered_set+61-37

 @@ -76,22 +76,22 @@ public:
     unordered_set(initializer_list<value_type>, size_type n = 0,
                   const hasher& hf = hasher(), const key_equal& eql = key_equal(),
                   const allocator_type& a = allocator_type());
-    unordered_set(size_type n, const allocator_type& a); // C++14
+    unordered_set(size_type n, const allocator_type& a);
-    unordered_set(size_type n, const hasher& hf, const allocator_type& a); // C++14
+    unordered_set(size_type n, const hasher& hf, const allocator_type& a);
     template <class InputIterator>
-      unordered_set(InputIterator f, InputIterator l, size_type n, const allocator_type& a); // C++14
+      unordered_set(InputIterator f, InputIterator l, size_type n, const allocator_type& a);
     template <class InputIterator>
       unordered_set(InputIterator f, InputIterator l, size_type n,
-                    const hasher& hf,  const allocator_type& a); // C++14
+                    const hasher& hf,  const allocator_type& a);
     template<container-compatible-range<value_type> R>
       unordered_set(from_range_t, R&& rg, size_type n, const allocator_type& a)
         : unordered_set(from_range, std::forward<R>(rg), n, hasher(), key_equal(), a) { } // C++23
     template<container-compatible-range<value_type> R>
       unordered_set(from_range_t, R&& rg, size_type n, const hasher& hf, const allocator_type& a)
         : unordered_set(from_range, std::forward<R>(rg), n, hf, key_equal(), a) { }       // C++23
-    unordered_set(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14
+    unordered_set(initializer_list<value_type> il, size_type n, const allocator_type& a);
     unordered_set(initializer_list<value_type> il, size_type n,
-                  const hasher& hf,  const allocator_type& a); // C++14
+                  const hasher& hf,  const allocator_type& a);
     ~unordered_set();
     unordered_set& operator=(const unordered_set&);
     unordered_set& operator=(unordered_set&&)
 @@ -324,22 +324,22 @@ public:
     unordered_multiset(initializer_list<value_type>, size_type n = /see below/,
                   const hasher& hf = hasher(), const key_equal& eql = key_equal(),
                   const allocator_type& a = allocator_type());
-    unordered_multiset(size_type n, const allocator_type& a); // C++14
+    unordered_multiset(size_type n, const allocator_type& a);
-    unordered_multiset(size_type n, const hasher& hf, const allocator_type& a); // C++14
+    unordered_multiset(size_type n, const hasher& hf, const allocator_type& a);
     template <class InputIterator>
-      unordered_multiset(InputIterator f, InputIterator l, size_type n, const allocator_type& a); // C++14
+      unordered_multiset(InputIterator f, InputIterator l, size_type n, const allocator_type& a);
     template <class InputIterator>
       unordered_multiset(InputIterator f, InputIterator l, size_type n,
-                         const hasher& hf, const allocator_type& a); // C++14
+                         const hasher& hf, const allocator_type& a);
     template<container-compatible-range<value_type> R>
       unordered_multiset(from_range_t, R&& rg, size_type n, const allocator_type& a)
         : unordered_multiset(from_range, std::forward<R>(rg), n, hasher(), key_equal(), a) { } // C++23
     template<container-compatible-range<value_type> R>
       unordered_multiset(from_range_t, R&& rg, size_type n, const hasher& hf, const allocator_type& a)
         : unordered_multiset(from_range, std::forward<R>(rg), n, hf, key_equal(), a) { }       // C++23
-    unordered_multiset(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14
+    unordered_multiset(initializer_list<value_type> il, size_type n, const allocator_type& a);
     unordered_multiset(initializer_list<value_type> il, size_type n,
-                       const hasher& hf,  const allocator_type& a); // C++14
+                       const hasher& hf,  const allocator_type& a);
     ~unordered_multiset();
     unordered_multiset& operator=(const unordered_multiset&);
     unordered_multiset& operator=(unordered_multiset&&)
 @@ -634,12 +634,10 @@ public:
   _LIBCPP_HIDE_FROM_ABI unordered_set() _NOEXCEPT_(is_nothrow_default_constructible<__table>::value) {}
   explicit _LIBCPP_HIDE_FROM_ABI
   unordered_set(size_type __n, const hasher& __hf = hasher(), const key_equal& __eql = key_equal());
-#  if _LIBCPP_STD_VER >= 14
   inline _LIBCPP_HIDE_FROM_ABI unordered_set(size_type __n, const allocator_type& __a)
       : unordered_set(__n, hasher(), key_equal(), __a) {}
   inline _LIBCPP_HIDE_FROM_ABI unordered_set(size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_set(__n, __hf, key_equal(), __a) {}
-#  endif
   _LIBCPP_HIDE_FROM_ABI
   unordered_set(size_type __n, const hasher& __hf, const key_equal& __eql, const allocator_type& __a);
   template <class _InputIterator>
 @@ -677,7 +675,6 @@ public:
   }
 #  endif
-#  if _LIBCPP_STD_VER >= 14
   template <class _InputIterator>
   inline _LIBCPP_HIDE_FROM_ABI
   unordered_set(_InputIterator __first, _InputIterator __last, size_type __n, const allocator_type& __a)
 @@ -686,7 +683,6 @@ public:
   _LIBCPP_HIDE_FROM_ABI unordered_set(
       _InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_set(__first, __last, __n, __hf, key_equal(), __a) {}
-#  endif
 #  if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<value_type> _Range>
 @@ -717,14 +713,12 @@ public:
       const hasher& __hf,
       const key_equal& __eql,
       const allocator_type& __a);
-#    if _LIBCPP_STD_VER >= 14
   inline _LIBCPP_HIDE_FROM_ABI
   unordered_set(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
       : unordered_set(__il, __n, hasher(), key_equal(), __a) {}
   inline _LIBCPP_HIDE_FROM_ABI
   unordered_set(initializer_list<value_type> __il, size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_set(__il, __n, __hf, key_equal(), __a) {}
-#    endif
 #  endif // _LIBCPP_CXX03_LANG
   _LIBCPP_HIDE_FROM_ABI ~unordered_set() {
     static_assert(sizeof(std::__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
 @@ -844,11 +838,17 @@ public:
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const key_type& __k) { return __table_.find(__k); }
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const key_type& __k) const { return __table_.find(__k); }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI iterator find(const _K2& __k) {
     return __table_.find(__k);
   }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const _K2& __k) const {
     return __table_.find(__k);
   }
 @@ -858,7 +858,10 @@ public:
     return __table_.__count_unique(__k);
   }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI size_type count(const _K2& __k) const {
     return __table_.__count_unique(__k);
   }
 @@ -867,7 +870,10 @@ public:
 #  if _LIBCPP_STD_VER >= 20
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool contains(const key_type& __k) const { return find(__k) != end(); }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI bool contains(const _K2& __k) const {
     return find(__k) != end();
   }
 @@ -880,11 +886,17 @@ public:
     return __table_.__equal_range_unique(__k);
   }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const _K2& __k) {
     return __table_.__equal_range_unique(__k);
   }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const _K2& __k) const {
     return __table_.__equal_range_unique(__k);
   }
 @@ -1232,12 +1244,10 @@ public:
   unordered_multiset(size_type __n, const hasher& __hf = hasher(), const key_equal& __eql = key_equal());
   _LIBCPP_HIDE_FROM_ABI
   unordered_multiset(size_type __n, const hasher& __hf, const key_equal& __eql, const allocator_type& __a);
-#  if _LIBCPP_STD_VER >= 14
   inline _LIBCPP_HIDE_FROM_ABI unordered_multiset(size_type __n, const allocator_type& __a)
       : unordered_multiset(__n, hasher(), key_equal(), __a) {}
   inline _LIBCPP_HIDE_FROM_ABI unordered_multiset(size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_multiset(__n, __hf, key_equal(), __a) {}
-#  endif
   template <class _InputIterator>
   _LIBCPP_HIDE_FROM_ABI unordered_multiset(_InputIterator __first, _InputIterator __last);
   template <class _InputIterator>
 @@ -1273,7 +1283,6 @@ public:
   }
 #  endif
-#  if _LIBCPP_STD_VER >= 14
   template <class _InputIterator>
   inline _LIBCPP_HIDE_FROM_ABI
   unordered_multiset(_InputIterator __first, _InputIterator __last, size_type __n, const allocator_type& __a)
 @@ -1282,7 +1291,6 @@ public:
   inline _LIBCPP_HIDE_FROM_ABI unordered_multiset(
       _InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_multiset(__first, __last, __n, __hf, key_equal(), __a) {}
-#  endif
 #  if _LIBCPP_STD_VER >= 23
   template <_ContainerCompatibleRange<value_type> _Range>
 @@ -1313,14 +1321,12 @@ public:
       const hasher& __hf,
       const key_equal& __eql,
       const allocator_type& __a);
-#    if _LIBCPP_STD_VER >= 14
   inline _LIBCPP_HIDE_FROM_ABI
   unordered_multiset(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
       : unordered_multiset(__il, __n, hasher(), key_equal(), __a) {}
   inline _LIBCPP_HIDE_FROM_ABI
   unordered_multiset(initializer_list<value_type> __il, size_type __n, const hasher& __hf, const allocator_type& __a)
       : unordered_multiset(__il, __n, __hf, key_equal(), __a) {}
-#    endif
 #  endif // _LIBCPP_CXX03_LANG
   _LIBCPP_HIDE_FROM_ABI ~unordered_multiset() {
     static_assert(sizeof(std::__diagnose_unordered_container_requirements<_Value, _Hash, _Pred>(0)), "");
 @@ -1443,11 +1449,17 @@ public:
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const key_type& __k) { return __table_.find(__k); }
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const key_type& __k) const { return __table_.find(__k); }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI iterator find(const _K2& __k) {
     return __table_.find(__k);
   }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI const_iterator find(const _K2& __k) const {
     return __table_.find(__k);
   }
 @@ -1457,7 +1469,10 @@ public:
     return __table_.__count_multi(__k);
   }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI size_type count(const _K2& __k) const {
     return __table_.__count_multi(__k);
   }
 @@ -1466,7 +1481,10 @@ public:
 #  if _LIBCPP_STD_VER >= 20
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const key_type& __k) const { return find(__k) != end(); }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI bool contains(const _K2& __k) const {
     return find(__k) != end();
   }
 @@ -1479,11 +1497,17 @@ public:
     return __table_.__equal_range_multi(__k);
   }
 #  if _LIBCPP_STD_VER >= 20
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<iterator, iterator> equal_range(const _K2& __k) {
     return __table_.__equal_range_multi(__k);
   }
-  template <class _K2, enable_if_t<__is_transparent_v<hasher, _K2> && __is_transparent_v<key_equal, _K2>>* = nullptr>
+  template <class _K2,
+            class _Hasher                                                          = hasher,
+            class _Comp                                                            = key_equal,
+            enable_if_t<__is_transparent_v<_Hasher> && __is_transparent_v<_Comp>>* = nullptr>
   [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI pair<const_iterator, const_iterator> equal_range(const _K2& __k) const {
     return __table_.__equal_range_multi(__k);
   }
 @@ -1812,7 +1836,7 @@ _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <cmath>
 #    include <concepts>
 #    include <cstdlib>

lib/libcxx/include/utility+16-5

 @@ -195,6 +195,19 @@ template<class T1, class T2>
 template<class T1, class T2>
     constexpr const T1&& get(const pair<T2, T1>&&) noexcept; // C++14
+// [const.wrap.class], class template constant_wrapper
+template<auto X, class = decltype(X)>
+  struct constant_wrapper;                                  // since C++26
+template<class T>
+  concept constexpr-param =                                 // exposition only, since C++26
+    requires { typename constant_wrapper<T::value>; };
+struct cw-operators;                                        // exposition only, since C++26
+template<auto X>
+  constexpr auto cw = constant_wrapper<X>{};                // since C++26
 // C++14
 template<class T, T... I>
 @@ -292,6 +305,7 @@ template <class T>
 #  endif
 #  if _LIBCPP_STD_VER >= 26
+#    include <__utility/constant_wrapper.h>
 #    include <__variant/monostate.h>
 #  endif
 @@ -315,14 +329,11 @@ template <class T>
 #    pragma GCC system_header
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
-#    include <limits>
-#  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
 #    include <cstddef>
 #    include <cstdlib>
 #    include <iosfwd>
+#    include <limits>
 #    include <type_traits>
 #  endif
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/valarray+3-1

 @@ -381,6 +381,7 @@ _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 template <class _Tp>
 class valarray;
 @@ -3300,11 +3301,12 @@ template <class _Tp>
   return __v.__end_;
 }
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <algorithm>
 #    include <concepts>
 #    include <cstdlib>

lib/libcxx/include/variant+39-19

 @@ -235,7 +235,6 @@ namespace std {
 #  include <__type_traits/conditional.h>
 #  include <__type_traits/conjunction.h>
 #  include <__type_traits/decay.h>
-#  include <__type_traits/dependent_type.h>
 #  include <__type_traits/enable_if.h>
 #  include <__type_traits/invoke.h>
 #  include <__type_traits/is_array.h>
 @@ -285,18 +284,33 @@ _LIBCPP_PUSH_MACROS
 #  include <__undef_macros>
 _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 class _LIBCPP_EXPORTED_FROM_ABI bad_variant_access : public exception {
 public:
   [[__nodiscard__]] const char* what() const _NOEXCEPT override;
 };
-_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
+class _LIBCPP_EXPORTED_FROM_ABI __bad_variant_access_with_msg : public bad_variant_access {
+public:
+  _LIBCPP_HIDE_FROM_ABI explicit __bad_variant_access_with_msg(const char* __msg) _NOEXCEPT : __msg_(__msg) {}
+#  if _LIBCPP_AVAILABILITY_HAS_BAD_VARIANT_ACCESS_WITH_MSG_KEY_FUNCTION
+  [[__nodiscard__]] const char* what() const _NOEXCEPT override;
+#  else
+  [[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI_VIRTUAL const char* what() const _NOEXCEPT override { return __msg_; }
+#  endif
-_LIBCPP_BEGIN_NAMESPACE_STD
+private:
+  const char* __msg_;
+};
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
+_LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #  if _LIBCPP_STD_VER >= 17
+_LIBCPP_BEGIN_NAMESPACE_STD
 // Light N-dimensional array of function pointers. Used in place of std::array to avoid
 // adding a dependency.
 template <class _Tp, size_t _Size>
 @@ -307,11 +321,11 @@ struct __farray {
   _LIBCPP_HIDE_FROM_ABI constexpr const _Tp& operator[](size_t __n) const noexcept { return __buf_[__n]; }
 };
-[[noreturn]] inline _LIBCPP_HIDE_FROM_ABI void __throw_bad_variant_access() {
+[[noreturn]] inline _LIBCPP_HIDE_FROM_ABI void __throw_bad_variant_access(const char* __msg) {
 #    if _LIBCPP_HAS_EXCEPTIONS
-  throw bad_variant_access();
+  throw __bad_variant_access_with_msg(__msg);
 #    else
-  _LIBCPP_VERBOSE_ABORT("bad_variant_access was thrown in -fno-exceptions mode");
+  _LIBCPP_VERBOSE_ABORT("bad_variant_access was thrown in -fno-exceptions mode: %s", __msg);
 #    endif
 }
 @@ -539,9 +553,12 @@ private:
     return __dispatcher<_Is...>::template __dispatch<_Fp, _Vs...>;
   }
+  template <class, class _Tp>
+  using __expander _LIBCPP_NODEBUG = _Tp;
   template <size_t _Ip, class _Fp, class... _Vs>
   _LIBCPP_HIDE_FROM_ABI static constexpr auto __make_fdiagonal_impl() {
-    return __make_dispatch<_Fp, _Vs...>(index_sequence<((void)__type_identity<_Vs>{}, _Ip)...>{});
+    return __make_dispatch<_Fp, _Vs...>(index_sequence<static_cast<__expander<_Vs, size_t>>(_Ip)...>{});
   }
   template <class _Fp, class... _Vs, size_t... _Is>
 @@ -614,7 +631,8 @@ private:
   template <class _Visitor>
   struct __value_visitor {
     template <class... _Alts>
-    _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator()(_Alts&&... __alts) const {
+    _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Alts&&... __alts) const
+        -> invoke_result_t<_Visitor&&, decltype((std::forward<_Alts>(__alts).__value))...> {
       __std_visit_exhaustive_visitor_check< _Visitor, decltype((std::forward<_Alts>(__alts).__value))...>();
       return std::__invoke(std::forward<_Visitor>(__visitor), std::forward<_Alts>(__alts).__value...);
     }
 @@ -1164,8 +1182,7 @@ public:
   using __trivially_relocatable _LIBCPP_NODEBUG =
       conditional_t<_And<__libcpp_is_trivially_relocatable<_Types>...>::value, variant, void>;
-  template <bool _Dummy                                                                               = true,
+  template <class _FirstType = __first_type, enable_if_t<is_default_constructible_v<_FirstType>, int> = 0>
-            enable_if_t<__dependent_type<is_default_constructible<__first_type>, _Dummy>::value, int> = 0>
   _LIBCPP_HIDE_FROM_ABI constexpr variant() noexcept(is_nothrow_default_constructible_v<__first_type>)
       : __impl_(in_place_index<0>) {}
 @@ -1280,10 +1297,10 @@ public:
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr size_t index() const noexcept { return __impl_.index(); }
-  template < bool _Dummy       = true,
+  template <
-             enable_if_t< __all<(__dependent_type<is_move_constructible<_Types>, _Dummy>::value &&
+      bool _Dummy      = true,
-                                 __dependent_type<is_swappable<_Types>, _Dummy>::value)...>::value,
+      enable_if_t<_And<_And<bool_constant<_Dummy>, is_move_constructible<_Types>, is_swappable<_Types>>...>::value,
-                          int> = 0>
+                  int> = 0>
   _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void swap(variant& __that) noexcept(
       __all<(is_nothrow_move_constructible_v<_Types> && is_nothrow_swappable_v<_Types>)...>::value) {
     __impl_.__swap(__that.__impl_);
 @@ -1329,7 +1346,9 @@ template <size_t _Ip, class _Vp>
 _LIBCPP_HIDE_FROM_ABI constexpr auto&& __generic_get(_Vp&& __v) {
   using __variant_detail::__access::__variant;
   if (!std::__holds_alternative<_Ip>(__v)) {
-    std::__throw_bad_variant_access();
+    if (__v.valueless_by_exception())
+      std::__throw_bad_variant_access("std::get: variant is valueless");
+    std::__throw_bad_variant_access("std::get: wrong alternative for variant");
   }
   return __variant::__get_alt<_Ip>(std::forward<_Vp>(__v)).__value;
 }
 @@ -1566,7 +1585,7 @@ template <class... _Vs>
 _LIBCPP_HIDE_FROM_ABI constexpr void __throw_if_valueless(_Vs&&... __vs) {
   const bool __valueless = (... || std::__as_variant(__vs).valueless_by_exception());
   if (__valueless) {
-    std::__throw_bad_variant_access();
+    std::__throw_bad_variant_access("std::visit: variant is valueless");
   }
 }
 @@ -1574,6 +1593,7 @@ template < class _Visitor, class... _Vs, typename>
 _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) visit(_Visitor&& __visitor, _Vs&&... __vs) {
   using __variant_detail::__visitation::__variant;
   std::__throw_if_valueless(std::forward<_Vs>(__vs)...);
+  // NOLINTNEXTLINE(bugprone-use-after-move) __throw_if_valueless doesn't actually forward the variants
   return __variant::__visit_value(std::forward<_Visitor>(__visitor), std::forward<_Vs>(__vs)...);
 }
 @@ -1635,13 +1655,13 @@ _LIBCPP_HIDE_FROM_ABI constexpr auto&& __unchecked_get(variant<_Types...>& __v)
   return std::__unchecked_get<__find_exactly_one_t<_Tp, _Types...>::value>(__v);
 }
-#  endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_END_NAMESPACE_STD
+#  endif // _LIBCPP_STD_VER >= 17
 _LIBCPP_POP_MACROS
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
 #    include <cstddef>
 #    include <exception>
 #    include <tuple>

lib/libcxx/include/vector+12-8

 @@ -39,7 +39,7 @@ public:
         noexcept(is_nothrow_default_constructible<allocator_type>::value);
     explicit vector(const allocator_type&);
     explicit vector(size_type n);
-    explicit vector(size_type n, const allocator_type&); // C++14
+    explicit vector(size_type n, const allocator_type&);
     vector(size_type n, const value_type& value, const allocator_type& = allocator_type());
     template <class InputIterator>
         vector(InputIterator first, InputIterator last, const allocator_type& = allocator_type());
 @@ -171,7 +171,7 @@ public:
     vector()
         noexcept(is_nothrow_default_constructible<allocator_type>::value);
     explicit vector(const allocator_type&) noexcept;
-    explicit vector(size_type n, const allocator_type& a = allocator_type()); // C++14
+    explicit vector(size_type n, const allocator_type& a = allocator_type());
     vector(size_type n, const value_type& value, const allocator_type& = allocator_type());
     template <class InputIterator>
         vector(InputIterator first, InputIterator last, const allocator_type& = allocator_type());
 @@ -348,16 +348,21 @@ template<class T, class charT> requires is-vector-bool-reference<T> // Since C++
 #    pragma GCC system_header
 #  endif
-#  if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 23
-#    include <algorithm>
 #    include <array>
-#    include <atomic>
-#    include <cctype>
 #    include <cerrno>
 #    include <clocale>
+#    include <cstddef>
+#    include <cstdlib>
+#    include <typeinfo>
+#  endif
+#  if defined(_LIBCPP_KEEP_TRANSITIVE_INCLUDES_LLVM23) && _LIBCPP_STD_VER <= 20
+#    include <algorithm>
+#    include <atomic>
+#    include <cctype>
 #    include <concepts>
 #    include <cstdint>
-#    include <cstdlib>
 #    include <iosfwd>
 #    if _LIBCPP_HAS_LOCALIZATION
 #      include <locale>
 @@ -367,7 +372,6 @@ template<class T, class charT> requires is-vector-bool-reference<T> // Since C++
 #    include <string_view>
 #    include <tuple>
 #    include <type_traits>
-#    include <typeinfo>
 #    include <utility>
 #  endif
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)

lib/libcxx/include/version+27-11

 @@ -37,7 +37,7 @@ __cpp_lib_atomic_float                                  201711L <atomic>
 __cpp_lib_atomic_is_always_lock_free                    201603L <atomic>
 __cpp_lib_atomic_lock_free_type_aliases                 201907L <atomic>
 __cpp_lib_atomic_min_max                                202403L <atomic>
-__cpp_lib_atomic_ref                                    202411L <atomic>
+__cpp_lib_atomic_ref                                    202603L <atomic>
                                                         201806L // C++20
 __cpp_lib_atomic_shared_ptr                             201711L <atomic>
 __cpp_lib_atomic_value_initialization                   201911L <atomic> <memory>
 @@ -64,6 +64,7 @@ __cpp_lib_common_reference                              202302L <type_traits>
 __cpp_lib_common_reference_wrapper                      202302L <functional>
 __cpp_lib_complex_udls                                  201309L <complex>
 __cpp_lib_concepts                                      202207L <concepts>
+__cpp_lib_constant_wrapper                              202606L <utility>
 __cpp_lib_constexpr_algorithms                          202306L <algorithm> <utility>
                                                         201806L // C++20
 __cpp_lib_constexpr_bitset                              202207L <bitset>
 @@ -77,11 +78,13 @@ __cpp_lib_constexpr_forward_list                        202502L <forward_list>
 __cpp_lib_constexpr_functional                          201907L <functional>
 __cpp_lib_constexpr_iterator                            201811L <iterator>
 __cpp_lib_constexpr_list                                202502L <list>
+__cpp_lib_constexpr_map                                 202502L <map>
 __cpp_lib_constexpr_memory                              202202L <memory>
                                                         201811L // C++20
 __cpp_lib_constexpr_new                                 202406L <new>
 __cpp_lib_constexpr_numeric                             201911L <numeric>
 __cpp_lib_constexpr_queue                               202502L <queue>
+__cpp_lib_constexpr_set                                 202502L <set>
 __cpp_lib_constexpr_string                              201907L <string>
 __cpp_lib_constexpr_string_view                         201811L <string_view>
 __cpp_lib_constexpr_tuple                               201811L <tuple>
 @@ -209,17 +212,21 @@ __cpp_lib_ranges_chunk                                  202202L <ranges>
 __cpp_lib_ranges_chunk_by                               202202L <ranges>
 __cpp_lib_ranges_concat                                 202403L <ranges>
 __cpp_lib_ranges_contains                               202207L <algorithm>
+__cpp_lib_ranges_enumerate                              202302L <ranges>
 __cpp_lib_ranges_find_last                              202207L <algorithm>
+__cpp_lib_ranges_fold                                   202207L <algorithm>
 __cpp_lib_ranges_indices                                202506L <ranges>
 __cpp_lib_ranges_iota                                   202202L <numeric>
 __cpp_lib_ranges_join_with                              202202L <ranges>
 __cpp_lib_ranges_repeat                                 202207L <ranges>
 __cpp_lib_ranges_slide                                  202202L <ranges>
 __cpp_lib_ranges_starts_ends_with                       202106L <algorithm>
+__cpp_lib_ranges_stride                                 202207L <ranges>
 __cpp_lib_ranges_to_container                           202202L <ranges>
 __cpp_lib_ranges_zip                                    202110L <ranges> <tuple> <utility>
 __cpp_lib_ratio                                         202306L <ratio>
-__cpp_lib_raw_memory_algorithms                         201606L <memory>
+__cpp_lib_raw_memory_algorithms                         202411L <memory>
+                                                        201606L // C++17
 __cpp_lib_rcu                                           202306L <rcu>
 __cpp_lib_reference_from_temporary                      202202L <type_traits>
 __cpp_lib_reference_wrapper                             202403L <functional>
 @@ -227,7 +234,7 @@ __cpp_lib_remove_cvref                                  201711L <type_traits>
 __cpp_lib_result_of_sfinae                              201210L <functional> <type_traits>
 __cpp_lib_robust_nonmodifying_seq_ops                   201304L <algorithm>
 __cpp_lib_sample                                        201603L <algorithm>
-__cpp_lib_saturation_arithmetic                         202311L <numeric>
+__cpp_lib_saturation_arithmetic                         202603L <numeric>
 __cpp_lib_scoped_lock                                   201703L <mutex>
 __cpp_lib_semaphore                                     201907L <semaphore>
 __cpp_lib_senders                                       202406L <execution>
 @@ -236,13 +243,13 @@ __cpp_lib_shared_ptr_arrays                             201707L <memory>
                                                         201611L // C++17
 __cpp_lib_shared_ptr_weak_type                          201606L <memory>
 __cpp_lib_shared_timed_mutex                            201402L <shared_mutex>
-__cpp_lib_shift                                         201806L <algorithm>
+__cpp_lib_shift                                         202202L <algorithm>
+                                                        201806L // C++20
 __cpp_lib_smart_ptr_for_overwrite                       202002L <memory>
 __cpp_lib_smart_ptr_owner_equality                      202306L <memory>
 __cpp_lib_source_location                               201907L <source_location>
 __cpp_lib_span                                          202002L <span>
 __cpp_lib_span_at                                       202311L <span>
-__cpp_lib_span_initializer_list                         202311L <span>
 __cpp_lib_spanstream                                    202106L <spanstream>
 __cpp_lib_ssize                                         201902L <iterator>
 __cpp_lib_sstream_from_string_view                      202306L <sstream>
 @@ -423,7 +430,7 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # define __cpp_lib_constexpr_utility                    201811L
 # define __cpp_lib_constexpr_vector                     201907L
 # define __cpp_lib_coroutine                            201902L
-# if _LIBCPP_STD_VER >= 20 && defined(__cpp_impl_destroying_delete) && __cpp_impl_destroying_delete >= 201806L
+# if defined(__cpp_impl_destroying_delete) && __cpp_impl_destroying_delete >= 201806L
 #   define __cpp_lib_destroying_delete                  201806L
 # endif
 # define __cpp_lib_endian                               201907L
 @@ -524,15 +531,20 @@ __cpp_lib_void_t                                        201411L <type_traits>
 // # define __cpp_lib_ranges_chunk                         202202L
 # define __cpp_lib_ranges_chunk_by                      202202L
 # define __cpp_lib_ranges_contains                      202207L
+# define __cpp_lib_ranges_enumerate                     202302L
 # define __cpp_lib_ranges_find_last                     202207L
+# define __cpp_lib_ranges_fold                          202207L
 # define __cpp_lib_ranges_iota                          202202L
 # define __cpp_lib_ranges_join_with                     202202L
 # define __cpp_lib_ranges_repeat                        202207L
 // # define __cpp_lib_ranges_slide                         202202L
 # define __cpp_lib_ranges_starts_ends_with              202106L
+# define __cpp_lib_ranges_stride                        202207L
 # define __cpp_lib_ranges_to_container                  202202L
 # define __cpp_lib_ranges_zip                           202110L
 // # define __cpp_lib_reference_from_temporary             202202L
+# undef  __cpp_lib_shift
+# define __cpp_lib_shift                                202202L
 // # define __cpp_lib_spanstream                           202106L
 // # define __cpp_lib_stacktrace                           202011L
 # define __cpp_lib_stdatomic_h                          202011L
 @@ -548,20 +560,23 @@ __cpp_lib_void_t                                        201411L <type_traits>
 // # define __cpp_lib_associative_heterogeneous_insertion  202306L
 // # define __cpp_lib_atomic_min_max                       202403L
 # undef  __cpp_lib_atomic_ref
-# define __cpp_lib_atomic_ref                           202411L
+# define __cpp_lib_atomic_ref                           202603L
 # undef  __cpp_lib_bind_front
 # define __cpp_lib_bind_front                           202306L
 # define __cpp_lib_bitset                               202306L
+# define __cpp_lib_constant_wrapper                     202606L
 # undef  __cpp_lib_constexpr_algorithms
 # define __cpp_lib_constexpr_algorithms                 202306L
 # define __cpp_lib_constexpr_flat_map                   202502L
 # define __cpp_lib_constexpr_flat_set                   202502L
 # define __cpp_lib_constexpr_forward_list               202502L
 # define __cpp_lib_constexpr_list                       202502L
+# define __cpp_lib_constexpr_map                        202502L
 # if !defined(_LIBCPP_ABI_VCRUNTIME)
 #   define __cpp_lib_constexpr_new                      202406L
 # endif
 # define __cpp_lib_constexpr_queue                      202502L
+# define __cpp_lib_constexpr_set                        202502L
 # define __cpp_lib_constrained_equality                 202411L
 // # define __cpp_lib_copyable_function                    202306L
 // # define __cpp_lib_debugging                            202311L
 @@ -604,22 +619,23 @@ __cpp_lib_void_t                                        201411L <type_traits>
 # undef  __cpp_lib_out_ptr
 # define __cpp_lib_out_ptr                              202311L
 // # define __cpp_lib_philox_engine                        202406L
-// # define __cpp_lib_ranges_concat                        202403L
+# define __cpp_lib_ranges_concat                        202403L
 # define __cpp_lib_ranges_indices                       202506L
 # define __cpp_lib_ratio                                202306L
+# undef  __cpp_lib_raw_memory_algorithms
+# define __cpp_lib_raw_memory_algorithms                202411L
 // # define __cpp_lib_rcu                                  202306L
 # define __cpp_lib_reference_wrapper                    202403L
-# define __cpp_lib_saturation_arithmetic                202311L
+# define __cpp_lib_saturation_arithmetic                202603L
 // # define __cpp_lib_senders                              202406L
 // # define __cpp_lib_smart_ptr_owner_equality             202306L
 # define __cpp_lib_span_at                              202311L
-# define __cpp_lib_span_initializer_list                202311L
 # define __cpp_lib_sstream_from_string_view             202306L
 # define __cpp_lib_string_subview                       202506L
 # undef  __cpp_lib_string_view
 # define __cpp_lib_string_view                          202403L
 // # define __cpp_lib_submdspan                            202306L
-// # define __cpp_lib_text_encoding                        202306L
+# define __cpp_lib_text_encoding                        202306L
 # undef  __cpp_lib_to_chars
 // # define __cpp_lib_to_chars                             202306L
 // # define __cpp_lib_to_string                            202306L

lib/libcxx/include/wchar.h+2

...	@@ -133,6 +133,8 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,	...	@@ -133,6 +133,8 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
133	# if defined(_CRT_CONST_CORRECT_OVERLOADS)	133	# if defined(_CRT_CONST_CORRECT_OVERLOADS)
134	# define _LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS 1	134	# define _LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS 1
135	# endif	135	# endif
		136	# elif _LIBCPP_LIBC_LLVM_LIBC
		137	# define _LIBCPP_WCHAR_H_HAS_CONST_OVERLOADS 1
136	# endif	138	# endif
137		139
138	# if _LIBCPP_HAS_WIDE_CHARACTERS	140	# if _LIBCPP_HAS_WIDE_CHARACTERS

lib/libcxx/libc/hdr/errno_macros.h+1-1

...	@@ -25,6 +25,6 @@	...	@@ -25,6 +25,6 @@
25		25
26	#include <errno.h>	26	#include <errno.h>
27		27
28	#endif // LLVM_LIBC_FULL_BUILD	28	#endif // LIBC_FULL_BUILD
29		29
30	#endif // LLVM_LIBC_HDR_ERRNO_MACROS_H	30	#endif // LLVM_LIBC_HDR_ERRNO_MACROS_H

lib/libcxx/libc/hdr/fenv_macros.h+1-1

...	@@ -56,6 +56,6 @@	...	@@ -56,6 +56,6 @@
56	#define FE_UPWARD 0x800	56	#define FE_UPWARD 0x800
57	#endif // FE_UPWARD	57	#endif // FE_UPWARD
58		58
59	#endif // LLVM_LIBC_FULL_BUILD	59	#endif // LIBC_FULL_BUILD
60		60
61	#endif // LLVM_LIBC_HDR_FENV_MACROS_H	61	#endif // LLVM_LIBC_HDR_FENV_MACROS_H

lib/libcxx/libc/hdr/float_macros.h+1-1

...	@@ -17,6 +17,6 @@	...	@@ -17,6 +17,6 @@
17		17
18	#include <float.h>	18	#include <float.h>
19		19
20	#endif // LLVM_LIBC_FULL_BUILD	20	#endif // LIBC_FULL_BUILD
21		21
22	#endif // LLVM_LIBC_HDR_FLOAT_MACROS_H	22	#endif // LLVM_LIBC_HDR_FLOAT_MACROS_H

lib/libcxx/libc/hdr/limits_macros.h+1-1

...	@@ -17,6 +17,6 @@	...	@@ -17,6 +17,6 @@
17		17
18	#include <limits.h>	18	#include <limits.h>
19		19
20	#endif // LLVM_LIBC_FULL_BUILD	20	#endif // LIBC_FULL_BUILD
21		21
22	#endif // LLVM_LIBC_HDR_LIMITS_MACROS_H	22	#endif // LLVM_LIBC_HDR_LIMITS_MACROS_H

lib/libcxx/libc/hdr/types/size_t.h created+23

...	@@ -0,0 +1,23 @@
1	//===-- Proxy for size_t --------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8	#ifndef LLVM_LIBC_HDR_TYPES_SIZE_T_H
9	#define LLVM_LIBC_HDR_TYPES_SIZE_T_H
10
11	#ifdef LIBC_FULL_BUILD
12
13	#include "include/llvm-libc-types/size_t.h"
14
15	#else
16
17	#define __need_size_t
18	#include <stddef.h>
19	#undef __need_size_t
20
21	#endif // LIBC_FULL_BUILD
22
23	#endif // LLVM_LIBC_HDR_TYPES_SIZE_T_H

lib/libcxx/libc/hdr/types/wchar_t.h+1-1

...	@@ -18,6 +18,6 @@	...	@@ -18,6 +18,6 @@
18		18
19	#include "hdr/wchar_overlay.h"	19	#include "hdr/wchar_overlay.h"
20		20
21	#endif // LLVM_LIBC_FULL_BUILD	21	#endif // LIBC_FULL_BUILD
22		22
23	#endif // LLVM_LIBC_HDR_TYPES_WCHAR_T_H	23	#endif // LLVM_LIBC_HDR_TYPES_WCHAR_T_H

lib/libcxx/libc/hdr/types/wint_t.h created+23

...	@@ -0,0 +1,23 @@
1	//===-- Definition of wint_t.h --------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//
8	//===----------------------------------------------------------------------===//
9
10	#ifndef LLVM_LIBC_HDR_TYPES_WINT_T_H
11	#define LLVM_LIBC_HDR_TYPES_WINT_T_H
12
13	#ifdef LIBC_FULL_BUILD
14
15	#include "include/llvm-libc-types/wint_t.h"
16
17	#else // overlay mode
18
19	#include "hdr/wchar_overlay.h"
20
21	#endif // LIBC_FULL_BUILD
22
23	#endif // LLVM_LIBC_HDR_TYPES_WINT_T_H

lib/libcxx/libc/include/llvm-libc-macros/cfloat128-macros.h+1-1

...	@@ -27,7 +27,7 @@	...	@@ -27,7 +27,7 @@
27	#define LIBC_TYPES_HAS_CFLOAT128	27	#define LIBC_TYPES_HAS_CFLOAT128
28	#endif	28	#endif
29	#elif defined(__GNUC__)	29	#elif defined(__GNUC__)
30	#if (defined(__STDC_IEC_60559_COMPLEX__) \|\| defined(__SIZEOF_FLOAT128__)) && \	30	#if (defined(__STDC_IEC_60559_COMPLEX__) && defined(__SIZEOF_FLOAT128__)) && \
31	(__GNUC__ >= 13 \|\| (!defined(__cplusplus)))	31	(__GNUC__ >= 13 \|\| (!defined(__cplusplus)))
32	#define LIBC_TYPES_HAS_CFLOAT128	32	#define LIBC_TYPES_HAS_CFLOAT128
33	#endif	33	#endif

lib/libcxx/libc/include/llvm-libc-macros/float-macros.h+6

...	@@ -9,6 +9,12 @@	...	@@ -9,6 +9,12 @@
9	#ifndef LLVM_LIBC_MACROS_FLOAT_MACROS_H	9	#ifndef LLVM_LIBC_MACROS_FLOAT_MACROS_H
10	#define LLVM_LIBC_MACROS_FLOAT_MACROS_H	10	#define LLVM_LIBC_MACROS_FLOAT_MACROS_H
11		11
		12	// __has_builtin is a Clang extension; GCC < 10 doesn't define it, which
		13	// turns a bare `#if __has_builtin(...)` into a preprocessor syntax error.
		14	#ifndef __has_builtin
		15	#define __has_builtin(x) 0
		16	#endif
		17
12	#ifndef FLT_RADIX	18	#ifndef FLT_RADIX
13	#define FLT_RADIX __FLT_RADIX__	19	#define FLT_RADIX __FLT_RADIX__
14	#endif // FLT_RADIX	20	#endif // FLT_RADIX

lib/libcxx/libc/include/llvm-libc-macros/float16-macros.h+2-1

...	@@ -12,7 +12,8 @@	...	@@ -12,7 +12,8 @@
12	#include "../llvm-libc-types/float128.h"	12	#include "../llvm-libc-types/float128.h"
13		13
14	#if defined(__FLT16_MANT_DIG__) && \	14	#if defined(__FLT16_MANT_DIG__) && \
15	(!defined(__GNUC__) \|\| __GNUC__ >= 13 \|\| defined(__clang__)) && \	15	(!defined(__GNUC__) \|\| __GNUC__ >= 13 \|\| \
		16	(defined(__clang__) && __clang_major__ >= 12)) && \
16	!defined(__arm__) && !defined(_M_ARM) && !defined(__riscv) && \	17	!defined(__arm__) && !defined(_M_ARM) && !defined(__riscv) && \
17	!defined(_WIN32)	18	!defined(_WIN32)
18	#define LIBC_TYPES_HAS_FLOAT16	19	#define LIBC_TYPES_HAS_FLOAT16

lib/libcxx/libc/include/llvm-libc-macros/stdfix-macros.h+1-1

...	@@ -9,7 +9,7 @@	...	@@ -9,7 +9,7 @@
9	#ifndef LLVM_LIBC_MACROS_STDFIX_MACROS_H	9	#ifndef LLVM_LIBC_MACROS_STDFIX_MACROS_H
10	#define LLVM_LIBC_MACROS_STDFIX_MACROS_H	10	#define LLVM_LIBC_MACROS_STDFIX_MACROS_H
11		11
12	#ifdef __FRACT_FBIT__	12	#if defined(__FRACT_FBIT__) && defined(__clang__)
13	// _Fract and _Accum types are available	13	// _Fract and _Accum types are available
14	#define LIBC_COMPILER_HAS_FIXED_POINT	14	#define LIBC_COMPILER_HAS_FIXED_POINT
15	#endif // __FRACT_FBIT__	15	#endif // __FRACT_FBIT__

lib/libcxx/libc/include/llvm-libc-types/size_t.h created+14

...	@@ -0,0 +1,14 @@
1	//===-- Definition of size_t types ----------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef LLVM_LIBC_TYPES_SIZE_T_H
10	#define LLVM_LIBC_TYPES_SIZE_T_H
11
12	typedef __SIZE_TYPE__ size_t;
13
14	#endif // LLVM_LIBC_TYPES_SIZE_T_H

lib/libcxx/libc/src/__support/CPP/bit.h+46-14

 @@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 // This is inspired by LLVM ADT/bit.h header.
-// Some functions are missing, we can add them as needed (popcount, byteswap).
+// Some functions are missing, we can add them as needed.
 #ifndef LLVM_LIBC_SRC___SUPPORT_CPP_BIT_H
 #define LLVM_LIBC_SRC___SUPPORT_CPP_BIT_H
 @@ -27,9 +27,14 @@ namespace cpp {
 #endif
 template <unsigned N>
-LIBC_INLINE static void inline_copy(const char *from, char *to) {
+LIBC_INLINE constexpr void inline_copy(const char *from, char *to) {
-#if __has_builtin(__builtin_memcpy_inline)
+#if __has_builtin(__builtin_memcpy_inline) &&                                  \
-  __builtin_memcpy_inline(to, from, N);
+    defined(LIBC_HAS_BUILTIN_IS_CONSTANT_EVALUATED)
+  if (cpp::is_constant_evaluated())
+    for (unsigned i = 0; i < N; ++i)
+      to[i] = from[i];
+  else
+    __builtin_memcpy_inline(to, from, N);
 #else
   for (unsigned i = 0; i < N; ++i)
     to[i] = from[i];
 @@ -39,15 +44,14 @@ LIBC_INLINE static void inline_copy(const char *from, char *to) {
 // This implementation of bit_cast requires trivially-constructible To, to avoid
 // UB in the implementation.
 template <typename To, typename From>
-LIBC_INLINE constexpr cpp::enable_if_t<
+LIBC_INLINE static constexpr cpp::enable_if_t<
     (sizeof(To) == sizeof(From)) &&
         cpp::is_trivially_constructible<To>::value &&
         cpp::is_trivially_copyable<To>::value &&
         cpp::is_trivially_copyable<From>::value,
     To>
 bit_cast(const From &from) {
-  MSAN_UNPOISON(&from, sizeof(From));
+#if LIBC_HAS_BUILTIN_BIT_CAST
-#if __has_builtin(__builtin_bit_cast) || defined(LIBC_COMPILER_IS_MSVC)
   return __builtin_bit_cast(To, from);
 #else
   To to{};
 @@ -60,14 +64,12 @@ bit_cast(const From &from) {
 // The following simple bit copy from a smaller type to maybe-larger type.
 template <typename To, typename From>
-LIBC_INLINE constexpr cpp::enable_if_t<
+LIBC_INLINE cpp::enable_if_t<(sizeof(To) >= sizeof(From)) &&
-    (sizeof(To) >= sizeof(From)) &&
+                                 cpp::is_trivially_constructible<To>::value &&
-        cpp::is_trivially_constructible<To>::value &&
+                                 cpp::is_trivially_copyable<To>::value &&
-        cpp::is_trivially_copyable<To>::value &&
+                                 cpp::is_trivially_copyable<From>::value,
-        cpp::is_trivially_copyable<From>::value,
+                             void>
-    void>
 bit_copy(const From &from, To &to) {
-  MSAN_UNPOISON(&from, sizeof(From));
   char *dst = reinterpret_cast<char *>(&to);
   const char *src = reinterpret_cast<const char *>(&from);
   inline_copy<sizeof(From)>(src, dst);
 @@ -330,6 +332,36 @@ ADD_SPECIALIZATION(unsigned long long, __builtin_popcountll)
 #endif // __builtin_popcountg
 #undef ADD_SPECIALIZATION
+/// Reverses the bytes in the given integer value.
+///
+/// All integral types are allowed, matching C++23 std::byteswap semantics.
+/// Signed types delegate to the unsigned path via static_cast.
+///
+/// The recursive decomposition generates optimal 'bswap' or 'rolw'
+/// instructions on Clang at -O2 without requiring compiler intrinsics.
+template <typename T>
+[[nodiscard]] LIBC_INLINE constexpr cpp::enable_if_t<cpp::is_integral_v<T>, T>
+byteswap(T value) {
+  static_assert(sizeof(T) <= 16, "byteswap: unsupported type size");
+  if constexpr (!cpp::is_unsigned_v<T>) {
+    using U = cpp::make_unsigned_t<T>;
+    return static_cast<T>(byteswap(static_cast<U>(value)));
+  } else if constexpr (sizeof(T) == 1) {
+    return value;
+  } else {
+    constexpr unsigned half_bits = sizeof(T) * 8 / 2;
+    using Half = cpp::conditional_t<
+        sizeof(T) == 2, uint8_t,
+        cpp::conditional_t<
+            sizeof(T) == 4, uint16_t,
+            cpp::conditional_t<sizeof(T) == 8, uint32_t, uint64_t>>>;
+    Half lo = static_cast<Half>(value);
+    Half hi = static_cast<Half>(value >> half_bits);
+    return static_cast<T>((static_cast<T>(byteswap(lo)) << half_bits) |
+                          static_cast<T>(byteswap(hi)));
+  }
+}
 } // namespace cpp
 } // namespace LIBC_NAMESPACE_DECL

lib/libcxx/libc/src/__support/CPP/iterator.h+29

...	@@ -9,6 +9,7 @@	...	@@ -9,6 +9,7 @@
9	#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_ITERATOR_H	9	#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_ITERATOR_H
10	#define LLVM_LIBC_SRC___SUPPORT_CPP_ITERATOR_H	10	#define LLVM_LIBC_SRC___SUPPORT_CPP_ITERATOR_H
11		11
		12	#include "hdr/types/size_t.h"
12	#include "src/__support/CPP/type_traits/enable_if.h"	13	#include "src/__support/CPP/type_traits/enable_if.h"
13	#include "src/__support/CPP/type_traits/is_convertible.h"	14	#include "src/__support/CPP/type_traits/is_convertible.h"
14	#include "src/__support/CPP/type_traits/is_same.h"	15	#include "src/__support/CPP/type_traits/is_same.h"
...	@@ -18,9 +19,13 @@	...	@@ -18,9 +19,13 @@
18	namespace LIBC_NAMESPACE_DECL {	19	namespace LIBC_NAMESPACE_DECL {
19	namespace cpp {	20	namespace cpp {
20		21
		22	struct input_iterator_tag {};
		23	struct random_access_iterator_tag : input_iterator_tag {};
		24
21	template <typename T> struct iterator_traits;	25	template <typename T> struct iterator_traits;
22	template <typename T> struct iterator_traits<T *> {	26	template <typename T> struct iterator_traits<T *> {
23	using reference = T &;	27	using reference = T &;
		28	using iterator_category = random_access_iterator_tag;
24	using value_type = T;	29	using value_type = T;
25	};	30	};
26		31
...	@@ -93,6 +98,30 @@ public:	...	@@ -93,6 +98,30 @@ public:
93	}	98	}
94	};	99	};
95		100
		101	namespace cpp_internal {
		102
		103	template <typename It>
		104	LIBC_INLINE constexpr size_t distance(It first, It last,
		105	random_access_iterator_tag) {
		106	return last - first;
		107	}
		108
		109	template <typename It>
		110	LIBC_INLINE constexpr auto distance(It first, It last, input_iterator_tag) {
		111	size_t n = 0;
		112	for (; first != last; ++first) {
		113	++n;
		114	}
		115	return n;
		116	}
		117
		118	} // namespace cpp_internal
		119
		120	template <typename It> LIBC_INLINE constexpr auto distance(It first, It last) {
		121	return cpp_internal::distance(
		122	first, last, typename iterator_traits<It>::iterator_category{});
		123	}
		124
96	} // namespace cpp	125	} // namespace cpp
97	} // namespace LIBC_NAMESPACE_DECL	126	} // namespace LIBC_NAMESPACE_DECL
98		127

lib/libcxx/libc/src/__support/CPP/limits.h+26-62

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	//===-- A self contained equivalent of std::limits --------------- C++ --===//	1	//===-- A self contained equivalent of <limits> ----------------- C++ --===//
2	//	2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.	3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.	4	// See https://llvm.org/LICENSE.txt for license information.
...	@@ -13,78 +13,42 @@	...	@@ -13,78 +13,42 @@
13	#include "src/__support/CPP/type_traits/is_integral.h"	13	#include "src/__support/CPP/type_traits/is_integral.h"
14	#include "src/__support/CPP/type_traits/is_signed.h"	14	#include "src/__support/CPP/type_traits/is_signed.h"
15	#include "src/__support/macros/attributes.h" // LIBC_INLINE	15	#include "src/__support/macros/attributes.h" // LIBC_INLINE
16	#include "src/__support/macros/config.h"
17	#include "src/__support/macros/properties/types.h" // LIBC_TYPES_HAS_INT128
18		16
19	namespace LIBC_NAMESPACE_DECL {	17	namespace LIBC_NAMESPACE_DECL {
20	namespace cpp {	18	namespace cpp {
21		19
22	namespace internal {	20	namespace internal {
23		21
24	template <typename T, T min_value, T max_value> struct integer_impl {	22	template <typename T, bool is_integral> struct numeric_limits_impl {};
25	static_assert(cpp::is_integral_v<T>);	23
26	LIBC_INLINE static constexpr T max() { return max_value; }	24	template <typename T> struct numeric_limits_impl<T, true> {
27	LIBC_INLINE static constexpr T min() { return min_value; }	25	LIBC_INLINE_VAR static constexpr bool is_signed = T(-1) < T(0);
		26
28	LIBC_INLINE_VAR static constexpr int digits =	27	LIBC_INLINE_VAR static constexpr int digits =
29	CHAR_BIT * sizeof(T) - cpp::is_signed_v<T>;	28	(CHAR_BIT * sizeof(T)) - is_signed;
		29
		30	LIBC_INLINE static constexpr T min() {
		31	if constexpr (is_signed) {
		32	return T(T(1) << digits);
		33	} else {
		34	return 0;
		35	}
		36	}
		37
		38	LIBC_INLINE static constexpr T max() {
		39	if constexpr (is_signed) {
		40	return T(T(~0) ^ min());
		41	} else {
		42	return T(~0);
		43	}
		44	}
30	};	45	};
31		46
32	} // namespace internal	47	} // namespace internal
33		48
34	template <class T> struct numeric_limits {};	49	template <typename T>
35		50	struct numeric_limits
36	// TODO: Add numeric_limits specializations as needed for new types.	51	: public internal::numeric_limits_impl<T, is_integral_v<T>> {};
37	template <>
38	struct numeric_limits<short>
39	: public internal::integer_impl<short, SHRT_MIN, SHRT_MAX> {};
40
41	template <>
42	struct numeric_limits<unsigned short>
43	: public internal::integer_impl<unsigned short, 0, USHRT_MAX> {};
44
45	template <>
46	struct numeric_limits<int>
47	: public internal::integer_impl<int, INT_MIN, INT_MAX> {};
48
49	template <>
50	struct numeric_limits<unsigned int>
51	: public internal::integer_impl<unsigned int, 0, UINT_MAX> {};
52
53	template <>
54	struct numeric_limits<long>
55	: public internal::integer_impl<long, LONG_MIN, LONG_MAX> {};
56
57	template <>
58	struct numeric_limits<unsigned long>
59	: public internal::integer_impl<unsigned long, 0, ULONG_MAX> {};
60
61	template <>
62	struct numeric_limits<long long>
63	: public internal::integer_impl<long long, LLONG_MIN, LLONG_MAX> {};
64
65	template <>
66	struct numeric_limits<unsigned long long>
67	: public internal::integer_impl<unsigned long long, 0, ULLONG_MAX> {};
68
69	template <>
70	struct numeric_limits<char>
71	: public internal::integer_impl<char, CHAR_MIN, CHAR_MAX> {};
72
73	template <>
74	struct numeric_limits<signed char>
75	: public internal::integer_impl<signed char, SCHAR_MIN, SCHAR_MAX> {};
76
77	template <>
78	struct numeric_limits<unsigned char>
79	: public internal::integer_impl<unsigned char, 0, UCHAR_MAX> {};
80
81	#ifdef LIBC_TYPES_HAS_INT128
82	// On platform where UInt128 resolves to __uint128_t, this specialization
83	// provides the limits of UInt128.
84	template <>
85	struct numeric_limits<__uint128_t>
86	: public internal::integer_impl<__uint128_t, 0, ~__uint128_t(0)> {};
87	#endif
88		52
89	} // namespace cpp	53	} // namespace cpp
90	} // namespace LIBC_NAMESPACE_DECL	54	} // namespace LIBC_NAMESPACE_DECL

lib/libcxx/libc/src/__support/CPP/string_view.h+79-62

...	@@ -18,46 +18,52 @@	...	@@ -18,46 +18,52 @@
18	namespace LIBC_NAMESPACE_DECL {	18	namespace LIBC_NAMESPACE_DECL {
19	namespace cpp {	19	namespace cpp {
20		20
21	// This is very simple alternate of the std::string_view class. There is no	21	template <typename CharT> class basic_string_view;
22	// bounds check performed in any of the methods. The callers are expected to	22
23	// do the checks before invoking the methods.	23	using string_view = basic_string_view<char>;
		24	using wstring_view = basic_string_view<wchar_t>;
		25
		26	// This is a very simple alternate of the std::basic_string_view class template.
		27	// There is no bounds check performed in any of the methods. The callers are
		28	// expected to do the checks before invoking the methods.
24	//	29	//
25	// This class will be extended as needed in future.	30	// This class will be extended as needed in future.
26	class string_view {	31	template <typename CharT> class basic_string_view {
27	private:	32	private:
28	const char *Data;	33	const CharT *Data;
29	size_t Len;	34	size_t Len;
30		35
31	LIBC_INLINE static size_t min(size_t A, size_t B) { return A <= B ? A : B; }	36	LIBC_INLINE static constexpr size_t min(size_t A, size_t B) {
		37	return A <= B ? A : B;
		38	}
32		39
33	LIBC_INLINE static int compareMemory(const char Lhs, const char Rhs,	40	LIBC_INLINE static constexpr int compareN(const CharT Lhs, const CharT Rhs,
34	size_t Length) {	41	size_t Length) {
35	for (size_t i = 0; i < Length; ++i)	42	for (size_t i = 0; i < Length; ++i)
36	if (int Diff = (int)Lhs[i] - (int)Rhs[i])	43	if (Lhs[i] != Rhs[i])
37	return Diff;	44	return Lhs[i] < Rhs[i] ? -1 : 1;
38	return 0;	45	return 0;
39	}	46	}
40		47
41	LIBC_INLINE static constexpr size_t length(const char *Str) {	48	LIBC_INLINE static constexpr size_t length(const CharT *Str) {
42	for (const char *End = Str;; ++End)	49	for (const CharT *End = Str;; ++End)
43	if (*End == '\0')	50	if (*End == CharT{0})
44	return static_cast<size_t>(End - Str);	51	return static_cast<size_t>(End - Str);
45	}	52	}
46		53
47	LIBC_INLINE bool equals(string_view Other) const {	54	LIBC_INLINE constexpr bool equals(basic_string_view Other) const {
48	return (Len == Other.Len &&	55	return (Len == Other.Len && compareN(Data, Other.Data, Other.Len) == 0);
49	compareMemory(Data, Other.Data, Other.Len) == 0);
50	}	56	}
51		57
52	public:	58	public:
53	using value_type = char;	59	using value_type = CharT;
54	using size_type = size_t;	60	using size_type = size_t;
55	using difference_type = ptrdiff_t;	61	using difference_type = ptrdiff_t;
56	using pointer = char *;	62	using pointer = CharT *;
57	using const_pointer = const char *;	63	using const_pointer = const CharT *;
58	using reference = char &;	64	using reference = CharT &;
59	using const_reference = const char &;	65	using const_reference = const CharT &;
60	using const_iterator = char *;	66	using const_iterator = CharT *;
61	using iterator = const_iterator;	67	using iterator = const_iterator;
62		68
63	// special value equal to the maximum value representable by the type	69	// special value equal to the maximum value representable by the type
...	@@ -65,124 +71,126 @@ public:	...	@@ -65,124 +71,126 @@ public:
65	LIBC_INLINE_VAR static constexpr size_t npos =	71	LIBC_INLINE_VAR static constexpr size_t npos =
66	cpp::numeric_limits<size_t>::max();	72	cpp::numeric_limits<size_t>::max();
67		73
68	LIBC_INLINE constexpr string_view() : Data(nullptr), Len(0) {}	74	LIBC_INLINE constexpr basic_string_view() : Data(nullptr), Len(0) {}
69		75
70	// Assumes Str is a null-terminated string. The length of the string does	76	// Assumes Str is a null-terminated string. The length of the string does
71	// not include the terminating null character.	77	// not include the terminating null character.
72	// Preconditions: [Str, Str + length(Str)) is a valid range.	78	// Preconditions: [Str, Str + length(Str)) is a valid range.
73	LIBC_INLINE constexpr string_view(const char *Str)	79	LIBC_INLINE constexpr basic_string_view(const CharT *Str)
74	: Data(Str), Len(length(Str)) {}	80	: Data(Str), Len(length(Str)) {}
75		81
76	// Preconditions: [Str, Str + N) is a valid range.	82	// Preconditions: [Str, Str + N) is a valid range.
77	LIBC_INLINE constexpr string_view(const char *Str, size_t N)	83	LIBC_INLINE constexpr basic_string_view(const CharT *Str, size_t N)
78	: Data(Str), Len(N) {}	84	: Data(Str), Len(N) {}
79		85
80	LIBC_INLINE constexpr const char *data() const { return Data; }	86	LIBC_INLINE constexpr const CharT *data() const { return Data; }
81		87
82	// Returns the size of the string_view.	88	// Returns the size of the basic_string_view.
83	LIBC_INLINE constexpr size_t size() const { return Len; }	89	LIBC_INLINE constexpr size_t size() const { return Len; }
84		90
85	// Returns whether the string_view is empty.	91	// Returns whether the basic_string_view is empty.
86	LIBC_INLINE constexpr bool empty() const { return Len == 0; }	92	LIBC_INLINE constexpr bool empty() const { return Len == 0; }
87		93
88	// Returns an iterator to the first character of the view.	94	// Returns an iterator to the first character of the view.
89	LIBC_INLINE const char *begin() const { return Data; }	95	LIBC_INLINE constexpr const CharT *begin() const { return Data; }
90		96
91	// Returns an iterator to the character following the last character of the	97	// Returns an iterator to the character following the last character of the
92	// view.	98	// view.
93	LIBC_INLINE const char *end() const { return Data + Len; }	99	LIBC_INLINE constexpr const CharT *end() const { return Data + Len; }
94		100
95	// Returns a const reference to the character at specified location pos.	101	// Returns a const reference to the character at specified location pos.
96	// No bounds checking is performed: the behavior is undefined if pos >=	102	// No bounds checking is performed: the behavior is undefined if pos >=
97	// size().	103	// size().
98	LIBC_INLINE constexpr const char &operator[](size_t Index) const {	104	LIBC_INLINE constexpr const CharT &operator[](size_t Index) const {
99	return Data[Index];	105	return Data[Index];
100	}	106	}
101		107
102	/// compare - Compare two strings; the result is -1, 0, or 1 if this string	108	/// compare - Compare two strings; the result is -1, 0, or 1 if this string
103	/// is lexicographically less than, equal to, or greater than the \p Other.	109	/// is lexicographically less than, equal to, or greater than the \p Other.
104	LIBC_INLINE int compare(string_view Other) const {	110	LIBC_INLINE constexpr int compare(basic_string_view Other) const {
105	// Check the prefix for a mismatch.	111	// Check the prefix for a mismatch.
106	if (int Res = compareMemory(Data, Other.Data, min(Len, Other.Len)))	112	if (int Res = compareN(Data, Other.Data, min(Len, Other.Len)))
107	return Res < 0 ? -1 : 1;	113	return Res;
108	// Otherwise the prefixes match, so we only need to check the lengths.	114	// Otherwise the prefixes match, so we only need to check the lengths.
109	if (Len == Other.Len)	115	if (Len == Other.Len)
110	return 0;	116	return 0;
111	return Len < Other.Len ? -1 : 1;	117	return Len < Other.Len ? -1 : 1;
112	}	118	}
113		119
114	LIBC_INLINE bool operator==(string_view Other) const { return equals(Other); }	120	LIBC_INLINE constexpr bool operator==(basic_string_view Other) const {
115	LIBC_INLINE bool operator!=(string_view Other) const {	121	return equals(Other);
		122	}
		123	LIBC_INLINE constexpr bool operator!=(basic_string_view Other) const {
116	return !(*this == Other);	124	return !(*this == Other);
117	}	125	}
118	LIBC_INLINE bool operator<(string_view Other) const {	126	LIBC_INLINE constexpr bool operator<(basic_string_view Other) const {
119	return compare(Other) == -1;	127	return compare(Other) == -1;
120	}	128	}
121	LIBC_INLINE bool operator<=(string_view Other) const {	129	LIBC_INLINE constexpr bool operator<=(basic_string_view Other) const {
122	return compare(Other) != 1;	130	return compare(Other) != 1;
123	}	131	}
124	LIBC_INLINE bool operator>(string_view Other) const {	132	LIBC_INLINE constexpr bool operator>(basic_string_view Other) const {
125	return compare(Other) == 1;	133	return compare(Other) == 1;
126	}	134	}
127	LIBC_INLINE bool operator>=(string_view Other) const {	135	LIBC_INLINE constexpr bool operator>=(basic_string_view Other) const {
128	return compare(Other) != -1;	136	return compare(Other) != -1;
129	}	137	}
130		138
131	// Moves the start of the view forward by n characters.	139	// Moves the start of the view forward by n characters.
132	// The behavior is undefined if n > size().	140	// The behavior is undefined if n > size().
133	LIBC_INLINE void remove_prefix(size_t N) {	141	LIBC_INLINE constexpr void remove_prefix(size_t N) {
134	Len -= N;	142	Len -= N;
135	Data += N;	143	Data += N;
136	}	144	}
137		145
138	// Moves the end of the view back by n characters.	146	// Moves the end of the view back by n characters.
139	// The behavior is undefined if n > size().	147	// The behavior is undefined if n > size().
140	LIBC_INLINE void remove_suffix(size_t N) { Len -= N; }	148	LIBC_INLINE constexpr void remove_suffix(size_t N) { Len -= N; }
141		149
142	// Check if this string starts with the given Prefix.	150	// Check if this string starts with the given Prefix.
143	LIBC_INLINE bool starts_with(string_view Prefix) const {	151	LIBC_INLINE constexpr bool starts_with(basic_string_view Prefix) const {
144	return Len >= Prefix.Len &&	152	return Len >= Prefix.Len && compareN(Data, Prefix.Data, Prefix.Len) == 0;
145	compareMemory(Data, Prefix.Data, Prefix.Len) == 0;
146	}	153	}
147		154
148	// Check if this string starts with the given Prefix.	155	// Check if this string starts with the given Prefix.
149	LIBC_INLINE bool starts_with(const char Prefix) const {	156	LIBC_INLINE constexpr bool starts_with(const CharT Prefix) const {
150	return !empty() && front() == Prefix;	157	return !empty() && front() == Prefix;
151	}	158	}
152		159
153	// Check if this string ends with the given Prefix.	160	// Check if this string ends with the given Prefix.
154	LIBC_INLINE bool ends_with(const char Suffix) const {	161	LIBC_INLINE constexpr bool ends_with(const CharT Suffix) const {
155	return !empty() && back() == Suffix;	162	return !empty() && back() == Suffix;
156	}	163	}
157		164
158	// Check if this string ends with the given Suffix.	165	// Check if this string ends with the given Suffix.
159	LIBC_INLINE bool ends_with(string_view Suffix) const {	166	LIBC_INLINE constexpr bool ends_with(basic_string_view Suffix) const {
160	return Len >= Suffix.Len &&	167	return Len >= Suffix.Len &&
161	compareMemory(end() - Suffix.Len, Suffix.Data, Suffix.Len) == 0;	168	compareN(end() - Suffix.Len, Suffix.Data, Suffix.Len) == 0;
162	}	169	}
163		170
164	// Return a reference to the substring from [Start, Start + N).	171	// Return a reference to the substring from [Start, Start + N).
165	//	172	//
166	// Start The index of the starting character in the substring; if the index is	173	// Start The index of the starting character in the substring; if the index
167	// npos or greater than the length of the string then the empty substring will	174	// is npos or greater than the length of the string then the empty substring
168	// be returned.	175	// will be returned.
169	//	176	//
170	// N The number of characters to included in the substring. If N exceeds the	177	// N The number of characters to included in the substring. If N exceeds the
171	// number of characters remaining in the string, the string suffix (starting	178	// number of characters remaining in the string, the string suffix (starting
172	// with Start) will be returned.	179	// with Start) will be returned.
173	LIBC_INLINE string_view substr(size_t Start, size_t N = npos) const {	180	LIBC_INLINE constexpr basic_string_view substr(size_t Start,
		181	size_t N = npos) const {
174	Start = min(Start, Len);	182	Start = min(Start, Len);
175	return string_view(Data + Start, min(N, Len - Start));	183	return basic_string_view(Data + Start, min(N, Len - Start));
176	}	184	}
177		185
178	// front - Get the first character in the string.	186	// front - Get the first character in the string.
179	LIBC_INLINE char front() const { return Data[0]; }	187	LIBC_INLINE constexpr CharT front() const { return Data[0]; }
180		188
181	// back - Get the last character in the string.	189	// back - Get the last character in the string.
182	LIBC_INLINE char back() const { return Data[Len - 1]; }	190	LIBC_INLINE constexpr CharT back() const { return Data[Len - 1]; }
183		191
184	// Finds the first occurence of c in this view, starting at position From.	192	// Finds the first occurence of c in this view, starting at position From.
185	LIBC_INLINE constexpr size_t find_first_of(const char c,	193	LIBC_INLINE constexpr size_t find_first_of(const CharT c,
186	size_t From = 0) const {	194	size_t From = 0) const {
187	for (size_t Pos = From; Pos < size(); ++Pos)	195	for (size_t Pos = From; Pos < size(); ++Pos)
188	if ((*this)[Pos] == c)	196	if ((*this)[Pos] == c)
...	@@ -191,7 +199,7 @@ public:	...	@@ -191,7 +199,7 @@ public:
191	}	199	}
192		200
193	// Finds the last occurence of c in this view, ending at position End.	201	// Finds the last occurence of c in this view, ending at position End.
194	LIBC_INLINE constexpr size_t find_last_of(const char c,	202	LIBC_INLINE constexpr size_t find_last_of(const CharT c,
195	size_t End = npos) const {	203	size_t End = npos) const {
196	End = End >= size() ? size() : End + 1;	204	End = End >= size() ? size() : End + 1;
197	for (; End > 0; --End)	205	for (; End > 0; --End)
...	@@ -200,9 +208,18 @@ public:	...	@@ -200,9 +208,18 @@ public:
200	return npos;	208	return npos;
201	}	209	}
202		210
203	// Finds the first character not equal to c in this view, starting at position	211	LIBC_INLINE constexpr size_t find_last_not_of(const char c,
204	// From.	212	size_t end = npos) const {
205	LIBC_INLINE constexpr size_t find_first_not_of(const char c,	213	end = end >= size() ? size() : end + 1;
		214	for (; end > 0; --end)
		215	if ((*this)[end - 1] != c)
		216	return end - 1;
		217	return npos;
		218	}
		219
		220	// Finds the first character not equal to c in this view, starting at
		221	// position From.
		222	LIBC_INLINE constexpr size_t find_first_not_of(const CharT c,
206	size_t From = 0) const {	223	size_t From = 0) const {
207	for (size_t Pos = From; Pos < size(); ++Pos)	224	for (size_t Pos = From; Pos < size(); ++Pos)
208	if ((*this)[Pos] != c)	225	if ((*this)[Pos] != c)
...	@@ -211,7 +228,7 @@ public:	...	@@ -211,7 +228,7 @@ public:
211	}	228	}
212		229
213	// Check if this view contains the given character.	230	// Check if this view contains the given character.
214	LIBC_INLINE constexpr bool contains(char c) const {	231	LIBC_INLINE constexpr bool contains(CharT c) const {
215	return find_first_of(c) != npos;	232	return find_first_of(c) != npos;
216	}	233	}
217	};	234	};

lib/libcxx/libc/src/__support/CPP/type_traits/is_assignable.h created+63

...	@@ -0,0 +1,63 @@
1	//===------------------------------------------------------------- C++ --===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8	//
9	// \file
10	// This file contains a free-standing implementation of is_assignable
11	// type trait.
12	//
13	//===----------------------------------------------------------------------===//
14
15	#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_ASSIGNABLE_H
16	#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_ASSIGNABLE_H
17
18	#include "src/__support/CPP/type_traits/bool_constant.h"
19	#include "src/__support/CPP/utility/declval.h"
20	#include "src/__support/macros/attributes.h"
21	#include "src/__support/macros/config.h"
22
23	namespace LIBC_NAMESPACE_DECL {
24	namespace cpp {
25
26	namespace is_assignable_detail {
27
28	#if LIBC_HAS_BUILTIN_IS_ASSIGNABLE
29
30	template <typename T, typename U>
31	struct is_assignable_impl : public bool_constant<__is_assignable(T, U)> {};
32
33	#else
34	// Fallback SFINAE implementation for GCC 7 and older toolchains
35
36	template <typename T, typename U> struct is_assignable_impl {
37	private:
38	template <typename T1, typename U1>
39	LIBC_INLINE static auto test(int)
40	-> decltype(declval<T1>() = declval<U1>(), bool_constant<true>());
41
42	template <typename, typename>
43	LIBC_INLINE static auto test(...) -> bool_constant<false>;
44
45	public:
46	using type = decltype(test<T, U>(0));
47	};
48
49	#endif // LIBC_HAS_BUILTIN_IS_ASSIGNABLE
50
51	} // namespace is_assignable_detail
52
53	// is_assignable
54	template <typename T, typename U>
55	struct is_assignable : public is_assignable_detail::is_assignable_impl<T, U> {};
56
57	template <typename T, typename U>
58	LIBC_INLINE_VAR constexpr bool is_assignable_v = is_assignable<T, U>::value;
59
60	} // namespace cpp
61	} // namespace LIBC_NAMESPACE_DECL
62
63	#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_ASSIGNABLE_H

lib/libcxx/libc/src/__support/CPP/type_traits/is_constant_evaluated.h+4

 @@ -15,7 +15,11 @@ namespace LIBC_NAMESPACE_DECL {
 namespace cpp {
 LIBC_INLINE constexpr bool is_constant_evaluated() {
+#if LIBC_HAS_BUILTIN_IS_CONSTANT_EVALUATED
   return __builtin_is_constant_evaluated();
+#else
+  return false;
+#endif
 }
 } // namespace cpp

lib/libcxx/libc/src/__support/CPP/type_traits/is_constructible.h created+65

...	@@ -0,0 +1,65 @@
1	//===------------------------------------------------------------- C++ --===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8	//
9	// \file
10	// This file contains a free-standing implementation of is_constructible
11	// type trait.
12	//
13	//===----------------------------------------------------------------------===//
14
15	#ifndef LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_CONSTRUCTIBLE_H
16	#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_CONSTRUCTIBLE_H
17
18	#include "src/__support/CPP/type_traits/bool_constant.h"
19	#include "src/__support/CPP/utility/declval.h"
20	#include "src/__support/macros/attributes.h"
21	#include "src/__support/macros/config.h"
22
23	namespace LIBC_NAMESPACE_DECL {
24	namespace cpp {
25
26	namespace is_contructible_detail {
27
28	#if LIBC_HAS_BUILTIN_IS_CONSTRUCTIBLE
29
30	template <typename T, typename... Args>
31	struct is_constructible_impl
32	: public bool_constant<__is_constructible(T, Args...)> {};
33
34	#else
35	// Fallback SFINAE implementation for GCC 7 and older toolchains
36
37	template <typename T, typename... Args> struct is_constructible_impl {
38	private:
39	template <typename T1, typename... Args1>
40	LIBC_INLINE static auto test(int)
41	-> decltype(T1(declval<Args1>()...), bool_constant<true>());
42
43	template <typename, typename...>
44	LIBC_INLINE static auto test(...) -> bool_constant<false>;
45
46	public:
47	using type = decltype(test<T, Args...>(0));
48	};
49
50	#endif // LIBC_HAS_BUILTIN_IS_CONSTRUCTIBLE
51
52	} // namespace is_contructible_detail
53
54	template <typename T, typename... Args>
55	struct is_constructible
56	: public is_contructible_detail::is_constructible_impl<T, Args...> {};
57
58	template <typename T, typename... Args>
59	LIBC_INLINE_VAR constexpr bool is_constructible_v =
60	is_constructible<T, Args...>::value;
61
62	} // namespace cpp
63	} // namespace LIBC_NAMESPACE_DECL
64
65	#endif // LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_CONSTRUCTIBLE_H

lib/libcxx/libc/src/__support/CPP/type_traits/is_copy_assignable.h+3-4

...	@@ -9,7 +9,7 @@	...	@@ -9,7 +9,7 @@
9	#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_COPY_ASSIGNABLE_H	9	#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_COPY_ASSIGNABLE_H
10		10
11	#include "src/__support/CPP/type_traits/add_lvalue_reference.h"	11	#include "src/__support/CPP/type_traits/add_lvalue_reference.h"
12	#include "src/__support/CPP/type_traits/integral_constant.h"	12	#include "src/__support/CPP/type_traits/is_assignable.h"
13	#include "src/__support/macros/config.h"	13	#include "src/__support/macros/config.h"
14		14
15	namespace LIBC_NAMESPACE_DECL {	15	namespace LIBC_NAMESPACE_DECL {
...	@@ -18,9 +18,8 @@ namespace cpp {	...	@@ -18,9 +18,8 @@ namespace cpp {
18	// is copy assignable	18	// is copy assignable
19	template <class T>	19	template <class T>
20	struct is_copy_assignable	20	struct is_copy_assignable
21	: public integral_constant<	21	: public cpp::is_assignable<cpp::add_lvalue_reference_t<T>,
22	bool, __is_assignable(cpp::add_lvalue_reference_t<T>,	22	cpp::add_lvalue_reference_t<const T>> {};
23	cpp::add_lvalue_reference_t<const T>)> {};
24		23
25	template <class T>	24	template <class T>
26	LIBC_INLINE_VAR constexpr bool is_copy_assignable_v =	25	LIBC_INLINE_VAR constexpr bool is_copy_assignable_v =

lib/libcxx/libc/src/__support/CPP/type_traits/is_copy_constructible.h+2-3

...	@@ -9,7 +9,7 @@	...	@@ -9,7 +9,7 @@
9	#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_COPY_CONSTRUCTIBLE_H	9	#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_COPY_CONSTRUCTIBLE_H
10		10
11	#include "src/__support/CPP/type_traits/add_lvalue_reference.h"	11	#include "src/__support/CPP/type_traits/add_lvalue_reference.h"
12	#include "src/__support/CPP/type_traits/integral_constant.h"	12	#include "src/__support/CPP/type_traits/is_constructible.h"
13	#include "src/__support/macros/config.h"	13	#include "src/__support/macros/config.h"
14		14
15	namespace LIBC_NAMESPACE_DECL {	15	namespace LIBC_NAMESPACE_DECL {
...	@@ -18,8 +18,7 @@ namespace cpp {	...	@@ -18,8 +18,7 @@ namespace cpp {
18	// is copy constructible	18	// is copy constructible
19	template <class T>	19	template <class T>
20	struct is_copy_constructible	20	struct is_copy_constructible
21	: public integral_constant<	21	: public cpp::is_constructible<T, cpp::add_lvalue_reference_t<const T>> {};
22	bool, __is_constructible(T, cpp::add_lvalue_reference_t<const T>)> {};
23		22
24	template <class T>	23	template <class T>
25	LIBC_INLINE_VAR constexpr bool is_copy_constructible_v =	24	LIBC_INLINE_VAR constexpr bool is_copy_constructible_v =

lib/libcxx/libc/src/__support/CPP/type_traits/is_integral.h+10-5

 @@ -26,13 +26,18 @@ private:
   }
 public:
-  LIBC_INLINE_VAR static constexpr bool value = __is_unqualified_any_of<
+  LIBC_INLINE_VAR static constexpr bool value =
-      T,
+      __is_unqualified_any_of<T,
 #ifdef LIBC_TYPES_HAS_INT128
-      __int128_t, __uint128_t,
+                              __int128_t, __uint128_t,
 #endif
-      char, signed char, unsigned char, short, unsigned short, int,
+#ifdef __cpp_char8_t
-      unsigned int, long, unsigned long, long long, unsigned long long, bool>();
+                              char8_t,
+#endif
+                              char16_t, char32_t, wchar_t, char, signed char,
+                              unsigned char, short, unsigned short, int,
+                              unsigned int, long, unsigned long, long long,
+                              unsigned long long, bool>();
 };
 template <typename T>
 LIBC_INLINE_VAR constexpr bool is_integral_v = is_integral<T>::value;

lib/libcxx/libc/src/__support/CPP/type_traits/is_move_assignable.h+3-4

...	@@ -10,7 +10,7 @@	...	@@ -10,7 +10,7 @@
10		10
11	#include "src/__support/CPP/type_traits/add_lvalue_reference.h"	11	#include "src/__support/CPP/type_traits/add_lvalue_reference.h"
12	#include "src/__support/CPP/type_traits/add_rvalue_reference.h"	12	#include "src/__support/CPP/type_traits/add_rvalue_reference.h"
13	#include "src/__support/CPP/type_traits/integral_constant.h"	13	#include "src/__support/CPP/type_traits/is_assignable.h"
14	#include "src/__support/macros/config.h"	14	#include "src/__support/macros/config.h"
15		15
16	namespace LIBC_NAMESPACE_DECL {	16	namespace LIBC_NAMESPACE_DECL {
...	@@ -19,9 +19,8 @@ namespace cpp {	...	@@ -19,9 +19,8 @@ namespace cpp {
19	// is move assignable	19	// is move assignable
20	template <class T>	20	template <class T>
21	struct is_move_assignable	21	struct is_move_assignable
22	: public integral_constant<bool, __is_assignable(	22	: public cpp::is_assignable<cpp::add_lvalue_reference_t<T>,
23	cpp::add_lvalue_reference_t<T>,	23	cpp::add_rvalue_reference_t<T>> {};
24	cpp::add_rvalue_reference_t<T>)> {};
25		24
26	template <class T>	25	template <class T>
27	LIBC_INLINE_VAR constexpr bool is_move_assignable_v =	26	LIBC_INLINE_VAR constexpr bool is_move_assignable_v =

lib/libcxx/libc/src/__support/CPP/type_traits/is_move_constructible.h+2-3

...	@@ -9,7 +9,7 @@	...	@@ -9,7 +9,7 @@
9	#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_MOVE_CONSTRUCTIBLE_H	9	#define LLVM_LIBC_SRC___SUPPORT_CPP_TYPE_TRAITS_IS_MOVE_CONSTRUCTIBLE_H
10		10
11	#include "src/__support/CPP/type_traits/add_rvalue_reference.h"	11	#include "src/__support/CPP/type_traits/add_rvalue_reference.h"
12	#include "src/__support/CPP/type_traits/integral_constant.h"	12	#include "src/__support/CPP/type_traits/is_constructible.h"
13	#include "src/__support/macros/config.h"	13	#include "src/__support/macros/config.h"
14		14
15	namespace LIBC_NAMESPACE_DECL {	15	namespace LIBC_NAMESPACE_DECL {
...	@@ -18,8 +18,7 @@ namespace cpp {	...	@@ -18,8 +18,7 @@ namespace cpp {
18	// is move constructible	18	// is move constructible
19	template <class T>	19	template <class T>
20	struct is_move_constructible	20	struct is_move_constructible
21	: public integral_constant<bool, __is_constructible(	21	: public cpp::is_constructible<T, cpp::add_rvalue_reference_t<T>> {};
22	T, cpp::add_rvalue_reference_t<T>)> {};
23		22
24	template <class T>	23	template <class T>
25	LIBC_INLINE_VAR constexpr bool is_move_constructible_v =	24	LIBC_INLINE_VAR constexpr bool is_move_constructible_v =

lib/libcxx/libc/src/__support/CPP/type_traits/is_unsigned.h+3-3

lib/libcxx/libc/src/__support/FPUtil/FPBits.h+16-13

 @@ -798,7 +798,9 @@ template <typename T> LIBC_INLINE static constexpr FPType get_fp_type() {
       return FPType::IEEE754_Binary64;
     else if constexpr (LDBL_MANT_DIG == 64)
       return FPType::X86_Binary80;
-    else if constexpr (LDBL_MANT_DIG == 113)
+    // TODO: properly treat double-double type.
+    // else if constexpr (LDBL_MANT_DIG == 113)
+    else
       return FPType::IEEE754_Binary128;
   }
 #if defined(LIBC_TYPES_HAS_FLOAT16)
 @@ -833,21 +835,22 @@ struct FPBits final : public internal::FPRepImpl<get_fp_type<T>(), FPBits<T>> {
   // Constructors.
   LIBC_INLINE constexpr FPBits() = default;
-  template <typename XType> LIBC_INLINE constexpr explicit FPBits(XType x) {
+  template <
-    using Unqual = typename cpp::remove_cv_t<XType>;
+      typename XType,
-    if constexpr (cpp::is_same_v<Unqual, T>) {
+      cpp::enable_if_t<cpp::is_same_v<cpp::remove_cv_t<XType>, T>, int> = 0>
-      UP::bits = cpp::bit_cast<StorageType>(x);
+  LIBC_INLINE LIBC_BIT_CAST_CONSTEXPR explicit FPBits(XType x) {
-    } else if constexpr (cpp::is_same_v<Unqual, StorageType>) {
+    UP::bits = cpp::bit_cast<StorageType>(x);
-      UP::bits = x;
-    } else {
-      // We don't want accidental type promotions/conversions, so we require
-      // exact type match.
-      static_assert(cpp::always_false<XType>);
-    }
   }
+  template <typename XType,
+            cpp::enable_if_t<
+                cpp::is_same_v<cpp::remove_cv_t<XType>, StorageType>, int> = 0>
+  LIBC_INLINE constexpr explicit FPBits(XType x) : UP(x) {}
   // Floating-point conversions.
-  LIBC_INLINE constexpr T get_val() const { return cpp::bit_cast<T>(UP::bits); }
+  LIBC_INLINE LIBC_BIT_CAST_CONSTEXPR T get_val() const {
+    return cpp::bit_cast<T>(UP::bits);
+  }
 };
 } // namespace fputil

lib/libcxx/libc/src/__support/FPUtil/rounding_mode.h+25-5

 @@ -24,8 +24,12 @@ namespace generic {
 //   1.0f + 2^-25 = 1.0f        for FE_TONEAREST, FE_DOWNWARD, FE_TOWARDZERO
 //                = 0x1.000002f for FE_UPWARD.
 LIBC_INLINE bool fenv_is_round_up() {
+#ifdef LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
+  return false;
+#else
   static volatile float x = 0x1.0p-25f;
   return (1.0f + x != 1.0f);
+#endif // LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
 }
 // Quick free-standing test whether fegetround() == FE_DOWNWARD.
 @@ -33,8 +37,12 @@ LIBC_INLINE bool fenv_is_round_up() {
 //   -1.0f - 2^-25 = -1.0f        for FE_TONEAREST, FE_UPWARD, FE_TOWARDZERO
 //                 = -0x1.000002f for FE_DOWNWARD.
 LIBC_INLINE bool fenv_is_round_down() {
+#ifdef LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
+  return false;
+#else
   static volatile float x = 0x1.0p-25f;
   return (-1.0f - x != -1.0f);
+#endif // LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
 }
 // Quick free-standing test whether fegetround() == FE_TONEAREST.
 @@ -44,9 +52,13 @@ LIBC_INLINE bool fenv_is_round_down() {
 //   1.5f - 2^-24 = 1.5f           for FE_TONEAREST, FE_UPWARD
 //                = 0x1.0ffffep-1f for FE_DOWNWARD, FE_TOWARDZERO
 LIBC_INLINE bool fenv_is_round_to_nearest() {
+#ifdef LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
+  return true;
+#else
   static volatile float x = 0x1.0p-24f;
   float y = 1.5f + x;
   return (y == 1.5f - x);
+#endif // LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
 }
 // Quick free-standing test whether fegetround() == FE_TOWARDZERO.
 @@ -60,13 +72,20 @@ LIBC_INLINE bool fenv_is_round_to_nearest() {
 //                                           = 2^-22 for FE_TONEAREST, FE_UPWARD
 //                                           = 0 for FE_DOWNWARD
 LIBC_INLINE bool fenv_is_round_to_zero() {
+#ifdef LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
+  return false;
+#else
   static volatile float x = 0x1.0p-24f;
   float y = x;
   return ((0x1.000002p0f + y) + (-1.0f - y) == 0x1.0p-23f);
+#endif // LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
 }
 // Quick free standing get rounding mode based on the above observations.
 LIBC_INLINE int quick_get_round() {
+#ifdef LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
+  return FE_TONEAREST;
+#else
   static volatile float x = 0x1.0p-24f;
   float y = x;
   float z = (0x1.000002p0f + y) + (-1.0f - y);
 @@ -76,11 +95,12 @@ LIBC_INLINE int quick_get_round() {
   if (z == 0x1.0p-23f)
     return FE_TOWARDZERO;
   return (2.0f + y == 2.0f) ? FE_TONEAREST : FE_UPWARD;
+#endif // LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
 }
 } // namespace generic
-LIBC_INLINE static constexpr bool fenv_is_round_up() {
+LIBC_INLINE LIBC_CONSTEXPR_DEFAULT bool fenv_is_round_up() {
   if (cpp::is_constant_evaluated()) {
     return false;
   } else {
 @@ -88,7 +108,7 @@ LIBC_INLINE static constexpr bool fenv_is_round_up() {
   }
 }
-LIBC_INLINE static constexpr bool fenv_is_round_down() {
+LIBC_INLINE LIBC_CONSTEXPR_DEFAULT bool fenv_is_round_down() {
   if (cpp::is_constant_evaluated()) {
     return false;
   } else {
 @@ -96,7 +116,7 @@ LIBC_INLINE static constexpr bool fenv_is_round_down() {
   }
 }
-LIBC_INLINE static constexpr bool fenv_is_round_to_nearest() {
+LIBC_INLINE LIBC_CONSTEXPR_DEFAULT bool fenv_is_round_to_nearest() {
   if (cpp::is_constant_evaluated()) {
     return true;
   } else {
 @@ -104,7 +124,7 @@ LIBC_INLINE static constexpr bool fenv_is_round_to_nearest() {
   }
 }
-LIBC_INLINE static constexpr bool fenv_is_round_to_zero() {
+LIBC_INLINE LIBC_CONSTEXPR_DEFAULT bool fenv_is_round_to_zero() {
   if (cpp::is_constant_evaluated()) {
     return false;
   } else {
 @@ -113,7 +133,7 @@ LIBC_INLINE static constexpr bool fenv_is_round_to_zero() {
 }
 // Quick free standing get rounding mode based on the above observations.
-LIBC_INLINE static constexpr int quick_get_round() {
+LIBC_INLINE LIBC_CONSTEXPR_DEFAULT int quick_get_round() {
   if (cpp::is_constant_evaluated()) {
     return FE_TONEAREST;
   } else {

lib/libcxx/libc/src/__support/big_int.h+35-49

 @@ -242,10 +242,9 @@ LIBC_INLINE constexpr void quick_mul_hi(cpp::array<word, N> &dst,
 template <typename word, size_t N>
 LIBC_INLINE constexpr bool is_negative(const cpp::array<word, N> &array) {
-  using signed_word = cpp::make_signed_t<word>;
+  constexpr size_t WORD_BITS = cpp::numeric_limits<word>::digits;
-  return cpp::bit_cast<signed_word>(array.back()) < 0;
+  return (array.back() >> (WORD_BITS - 1)) != 0;
 }
 // An enum for the shift function below.
 enum Direction { LEFT, RIGHT };
 @@ -257,9 +256,11 @@ LIBC_INLINE constexpr cpp::array<word, N> shift(cpp::array<word, N> array,
                                                 size_t offset) {
   static_assert(direction == LEFT || direction == RIGHT);
   constexpr size_t WORD_BITS = cpp::numeric_limits<word>::digits;
+#if LIBC_HAS_BUILTIN_BIT_CAST
 #ifdef LIBC_TYPES_HAS_INT128
   constexpr size_t TOTAL_BITS = N * WORD_BITS;
-  if constexpr (TOTAL_BITS == 128) {
+  if constexpr (TOTAL_BITS == 128 &&
+                __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) {
     using type = cpp::conditional_t<is_signed, __int128_t, __uint128_t>;
     auto tmp = cpp::bit_cast<type>(array);
     if constexpr (direction == LEFT)
 @@ -269,6 +270,8 @@ LIBC_INLINE constexpr cpp::array<word, N> shift(cpp::array<word, N> array,
     return cpp::bit_cast<cpp::array<word, N>>(tmp);
   }
 #endif
+#endif // LIBC_HAS_BUILTIN_BIT_CAST
   if (LIBC_UNLIKELY(offset == 0))
     return array;
   const bool is_neg = is_signed && is_negative(array);
 @@ -336,8 +339,8 @@ private:
                 "WordType must be unsigned integer.");
   struct Division {
-    BigInt quotient;
+    BigInt quotient{};
-    BigInt remainder;
+    BigInt remainder{};
   };
 public:
 @@ -355,7 +358,7 @@ public:
   LIBC_INLINE_VAR static constexpr size_t WORD_COUNT = Bits / WORD_SIZE;
-  cpp::array<WordType, WORD_COUNT> val{}; // zero initialized.
+  cpp::array<WordType, WORD_COUNT> val;
   LIBC_INLINE constexpr BigInt() = default;
 @@ -363,9 +366,10 @@ public:
   template <size_t OtherBits, bool OtherSigned, typename OtherWordType>
   LIBC_INLINE constexpr BigInt(
-      const BigInt<OtherBits, OtherSigned, OtherWordType> &other) {
+      const BigInt<OtherBits, OtherSigned, OtherWordType> &other)
+      : val{} {
     using BigIntOther = BigInt<OtherBits, OtherSigned, OtherWordType>;
-    const bool should_sign_extend = Signed && other.is_neg();
+    [[maybe_unused]] const bool should_sign_extend = Signed && other.is_neg();
     static_assert(!(Bits == OtherBits && WORD_SIZE != BigIntOther::WORD_SIZE) &&
                   "This is currently untested for casting between bigints with "
 @@ -453,20 +457,22 @@ public:
   }
   // Construct a BigInt from a C array.
-  template <size_t N> LIBC_INLINE constexpr BigInt(const WordType (&nums)[N]) {
+  template <size_t N>
+  LIBC_INLINE constexpr BigInt(const WordType (&nums)[N]) : val{} {
     static_assert(N == WORD_COUNT);
     for (size_t i = 0; i < WORD_COUNT; ++i)
       val[i] = nums[i];
   }
   LIBC_INLINE constexpr explicit BigInt(
-      const cpp::array<WordType, WORD_COUNT> &words) {
+      const cpp::array<WordType, WORD_COUNT> &words)
+      : val{} {
     val = words;
   }
   // Initialize the first word to |v| and the rest to 0.
   template <typename T, typename = cpp::enable_if_t<cpp::is_integral_v<T>>>
-  LIBC_INLINE constexpr BigInt(T v) {
+  LIBC_INLINE constexpr BigInt(T v) : val{} {
     constexpr size_t T_SIZE = sizeof(T) * CHAR_BIT;
     const bool is_neg = v < 0;
     for (size_t i = 0; i < WORD_COUNT; ++i) {
 @@ -488,7 +494,7 @@ public:
   LIBC_INLINE static constexpr BigInt one() { return BigInt(1); }
   LIBC_INLINE static constexpr BigInt all_ones() { return ~zero(); }
   LIBC_INLINE static constexpr BigInt min() {
-    BigInt out;
+    BigInt out{};
     if constexpr (SIGNED)
       out.set_msb();
     return out;
 @@ -601,7 +607,7 @@ public:
   template <size_t OtherBits>
   LIBC_INLINE constexpr auto
   ful_mul(const BigInt<OtherBits, Signed, WordType> &other) const {
-    BigInt<Bits + OtherBits, Signed, WordType> result;
+    BigInt<Bits + OtherBits, Signed, WordType> result{};
     multiword::multiply_with_carry(result.val, val, other.val);
     return result;
   }
 @@ -633,7 +639,7 @@ public:
   //    256      4        16          10            3
   //    512      8        64          36            7
   LIBC_INLINE constexpr BigInt quick_mul_hi(const BigInt &other) const {
-    BigInt result;
+    BigInt result{};
     multiword::quick_mul_hi(result.val, val, other.val);
     return result;
   }
 @@ -686,7 +692,7 @@ public:
   //   And finally we perform some extra alignment steps for the remaining bits.
   LIBC_INLINE constexpr cpp::optional<BigInt>
   div_uint_half_times_pow_2(multiword::half_width_t<WordType> x, size_t e) {
-    BigInt remainder;
+    BigInt remainder{};
     if (x == 0)
       return cpp::nullopt;
     if (e >= Bits) {
 @@ -694,7 +700,7 @@ public:
       *this = BigInt<Bits, false, WordType>();
       return remainder;
     }
-    BigInt quotient;
+    BigInt quotient{};
     WordType x_word = static_cast<WordType>(x);
     constexpr size_t LOG2_WORD_SIZE =
         static_cast<size_t>(cpp::bit_width(WORD_SIZE) - 1);
 @@ -846,13 +852,13 @@ public:
 #define DEFINE_BINOP(OP)                                                       \
   LIBC_INLINE friend constexpr BigInt operator OP(const BigInt &lhs,           \
                                                   const BigInt &rhs) {         \
-    BigInt result;                                                             \
+    BigInt result{};                                                           \
     for (size_t i = 0; i < WORD_COUNT; ++i)                                    \
       result[i] = lhs[i] OP rhs[i];                                            \
     return result;                                                             \
   }                                                                            \
-  LIBC_INLINE friend constexpr BigInt operator OP##=(BigInt &lhs,              \
+  LIBC_INLINE friend constexpr BigInt operator OP## =                          \
-                                                     const BigInt &rhs) {      \
+      (BigInt & lhs, const BigInt &rhs) {                                      \
     for (size_t i = 0; i < WORD_COUNT; ++i)                                    \
       lhs[i] OP## = rhs[i];                                                    \
     return lhs;                                                                \
 @@ -864,7 +870,7 @@ public:
 #undef DEFINE_BINOP
   LIBC_INLINE constexpr BigInt operator~() const {
-    BigInt result;
+    BigInt result{};
     for (size_t i = 0; i < WORD_COUNT; ++i)
       result[i] = static_cast<WordType>(~val[i]);
     return result;
 @@ -1004,7 +1010,7 @@ private:
   LIBC_INLINE constexpr static Division divide_unsigned(const BigInt &dividend,
                                                         const BigInt &divider) {
     BigInt remainder = dividend;
-    BigInt quotient;
+    BigInt quotient{};
     if (remainder >= divider) {
       BigInt subtractor = divider;
       int cur_bit = multiword::countl_zero(subtractor.val) -
 @@ -1181,31 +1187,6 @@ LIBC_INLINE_VAR constexpr bool is_unsigned_integral_or_big_int_v =
 namespace cpp {
-// Specialization of cpp::bit_cast ('bit.h') from T to BigInt.
-template <typename To, typename From>
-LIBC_INLINE constexpr cpp::enable_if_t<
-    (sizeof(To) == sizeof(From)) && cpp::is_trivially_copyable<To>::value &&
-        cpp::is_trivially_copyable<From>::value && is_big_int<To>::value,
-    To>
-bit_cast(const From &from) {
-  To out;
-  using Storage = decltype(out.val);
-  out.val = cpp::bit_cast<Storage>(from);
-  return out;
-}
-// Specialization of cpp::bit_cast ('bit.h') from BigInt to T.
-template <typename To, size_t Bits>
-LIBC_INLINE constexpr cpp::enable_if_t<
-    sizeof(To) == sizeof(UInt<Bits>) &&
-        cpp::is_trivially_constructible<To>::value &&
-        cpp::is_trivially_copyable<To>::value &&
-        cpp::is_trivially_copyable<UInt<Bits>>::value,
-    To>
-bit_cast(const UInt<Bits> &from) {
-  return cpp::bit_cast<To>(from.val);
-}
 // Specialization of cpp::popcount ('bit.h') for BigInt.
 template <typename T>
 [[nodiscard]] LIBC_INLINE constexpr cpp::enable_if_t<is_big_int_v<T>, int>
 @@ -1311,7 +1292,7 @@ mask_trailing_ones() {
     return T::all_ones();
   constexpr size_t QUOTIENT = count / T::WORD_SIZE;
   constexpr size_t REMAINDER = count % T::WORD_SIZE;
-  T out; // zero initialized
+  T out{};
   for (size_t i = 0; i <= QUOTIENT; ++i)
     out[i] = i < QUOTIENT
                  ? cpp::numeric_limits<typename T::word_type>::max()
 @@ -1327,7 +1308,7 @@ LIBC_INLINE constexpr cpp::enable_if_t<is_big_int_v<T>, T> mask_leading_ones() {
     return T::all_ones();
   constexpr size_t QUOTIENT = (T::BITS - count - 1U) / T::WORD_SIZE;
   constexpr size_t REMAINDER = count % T::WORD_SIZE;
-  T out; // zero initialized
+  T out{};
   for (size_t i = QUOTIENT; i < T::WORD_COUNT; ++i)
     out[i] = i > QUOTIENT
                  ? cpp::numeric_limits<typename T::word_type>::max()
 @@ -1386,6 +1367,11 @@ first_trailing_one(T value) {
   return value == 0 ? 0 : cpp::countr_zero(value) + 1;
 }
+static_assert(LIBC_NAMESPACE::cpp::is_trivially_constructible<
+              LIBC_NAMESPACE::BigInt<128, false>>::value);
+static_assert(LIBC_NAMESPACE::cpp::is_trivially_copyable<
+              LIBC_NAMESPACE::BigInt<128, false>>::value);
 } // namespace LIBC_NAMESPACE_DECL
 #endif // LLVM_LIBC_SRC___SUPPORT_BIG_INT_H

lib/libcxx/libc/src/__support/common.h+45-32

 @@ -22,6 +22,10 @@
 #define LLVM_LIBC_FUNCTION_ATTR
 #endif
+#ifndef LLVM_LIBC_VARIABLE_ATTR
+#define LLVM_LIBC_VARIABLE_ATTR
+#endif
 // clang-format off
 // Allow each function `func` to have extra attributes specified by defining:
 // `LLVM_LIBC_FUNCTION_ATTR_func` macro, which should always start with
 @@ -33,7 +37,9 @@
 // clang-format on
 #define LLVM_LIBC_EMPTY
+#define GET_NOTHING(...) 0
 #define GET_SECOND(first, second, ...) second
+#define GET_FIFTH(first, second, third, fourth, fifth, ...) fifth
 #define EXPAND_THEN_SECOND(name) GET_SECOND(name, LLVM_LIBC_EMPTY)
 #define LLVM_LIBC_ATTR(name) EXPAND_THEN_SECOND(LLVM_LIBC_FUNCTION_ATTR_##name)
 @@ -44,50 +50,57 @@
 // symbol.  Moreover, a C symbol `func` in macOS is mangled as `_func`.
 #if defined(LIBC_COPT_PUBLIC_PACKAGING) && !defined(LIBC_COMPILER_IS_MSVC)
 #ifndef __APPLE__
-#define LLVM_LIBC_FUNCTION_IMPL(type, name, arglist)                           \
+#define LLVM_LIBC_FUNCTION_IMPL_4(type, name, arglist, c_alias)                \
   LLVM_LIBC_ATTR(name)                                                         \
   LLVM_LIBC_FUNCTION_ATTR decltype(LIBC_NAMESPACE::name)                       \
-      __##name##_impl__ asm(#name);                                            \
+      __##name##_impl__ asm(c_alias);                                          \
-  decltype(LIBC_NAMESPACE::name) name [[gnu::alias(#name)]];                   \
+  decltype(LIBC_NAMESPACE::name) name [[gnu::alias(c_alias)]];                 \
   type __##name##_impl__ arglist
 #else // __APPLE__
-#define LLVM_LIBC_FUNCTION_IMPL(type, name, arglist)                           \
+#define LLVM_LIBC_FUNCTION_IMPL_4(type, name, arglist, c_alias)                \
   LLVM_LIBC_ATTR(name)                                                         \
-  LLVM_LIBC_FUNCTION_ATTR decltype(LIBC_NAMESPACE::name) name asm("_" #name);  \
+  LLVM_LIBC_FUNCTION_ATTR decltype(LIBC_NAMESPACE::name) name asm(             \
+      "_" c_alias);                                                            \
   type name arglist
 #endif // __APPLE__
 #else  // LIBC_COPT_PUBLIC_PACKAGING
-#define LLVM_LIBC_FUNCTION_IMPL(type, name, arglist) type name arglist
+#define LLVM_LIBC_FUNCTION_IMPL_4(type, name, arglist, c_alias)                \
+  type name arglist
 #endif // LIBC_COPT_PUBLIC_PACKAGING
-// This extra layer of macro allows `name` to be a macro to rename a function.
+#define LLVM_LIBC_FUNCTION_IMPL_3(type, name, arglist)                         \
-#define LLVM_LIBC_FUNCTION(type, name, arglist)                                \
+  LLVM_LIBC_FUNCTION_IMPL_4(type, name, arglist, #name)
-  LLVM_LIBC_FUNCTION_IMPL(type, name, arglist)
-namespace LIBC_NAMESPACE_DECL {
+// LLVM_LIBC_FUNCTION(type, name, arglist) is equivalent to
-namespace internal {
+// LLVM_LIBC_FUNCTION(type, name, arglist, #name)
-LIBC_INLINE constexpr bool same_string(char const *lhs, char const *rhs) {
+#define LLVM_LIBC_FUNCTION(...)                                                \
-  for (; *lhs || *rhs; ++lhs, ++rhs)
+  GET_FIFTH(__VA_ARGS__, LLVM_LIBC_FUNCTION_IMPL_4, LLVM_LIBC_FUNCTION_IMPL_3, \
-    if (*lhs != *rhs)
+            GET_NOTHING)(__VA_ARGS__)
-      return false;
-  return true;
-}
-} // namespace internal
-} // namespace LIBC_NAMESPACE_DECL
-#define __LIBC_MACRO_TO_STRING(str) #str
+// At the moment, [[gnu::alias()]] is not supported on MacOS, and it is needed
-#define LIBC_MACRO_TO_STRING(str) __LIBC_MACRO_TO_STRING(str)
+// to cleanly export and alias the C++ symbol `LIBC_NAMESPACE::func` with the C
+// symbol `func`.  So for public packaging on MacOS, we will only export the C
+// symbol.  Moreover, a C symbol `func` in macOS is mangled as `_func`.
+#if defined(LIBC_COPT_PUBLIC_PACKAGING) && !defined(LIBC_COMPILER_IS_MSVC)
+#ifndef __APPLE__
+#define LLVM_LIBC_VARIABLE_IMPL(type, name)                                    \
+  LLVM_LIBC_ATTR(name)                                                         \
+  extern LLVM_LIBC_VARIABLE_ATTR decltype(LIBC_NAMESPACE::name)                \
+      __##name##_impl__ asm(#name);                                            \
+  extern decltype(LIBC_NAMESPACE::name) name [[gnu::alias(#name)]];            \
+  type __##name##_impl__
+#else // __APPLE__
+#define LLVM_LIBC_VARIABLE_IMPL(type, name)                                    \
+  LLVM_LIBC_ATTR(name)                                                         \
+  extern LLVM_LIBC_VARIABLE_ATTR decltype(LIBC_NAMESPACE::name) name asm(      \
+      "_" #name);                                                              \
+  type name
+#endif // __APPLE__
+#else  // LIBC_COPT_PUBLIC_PACKAGING
+#define LLVM_LIBC_VARIABLE_IMPL(type, name) type name
+#endif // LIBC_COPT_PUBLIC_PACKAGING
-// LLVM_LIBC_IS_DEFINED checks whether a particular macro is defined.
+#define LLVM_LIBC_VARIABLE(type, name) LLVM_LIBC_VARIABLE_IMPL(type, name)
-// Usage: constexpr bool kUseAvx = LLVM_LIBC_IS_DEFINED(__AVX__);
-//
-// This works by comparing the stringified version of the macro with and without
-// evaluation. If FOO is not undefined both stringifications yield "FOO". If FOO
-// is defined, one stringification yields "FOO" while the other yields its
-// stringified value "1".
-#define LLVM_LIBC_IS_DEFINED(macro)                                            \
-  !LIBC_NAMESPACE::internal::same_string(                                      \
-      LLVM_LIBC_IS_DEFINED__EVAL_AND_STRINGIZE(macro), #macro)
-#define LLVM_LIBC_IS_DEFINED__EVAL_AND_STRINGIZE(s) #s
 #endif // LLVM_LIBC_SRC___SUPPORT_COMMON_H

lib/libcxx/libc/src/__support/ctype_utils.h+27-15

 @@ -37,7 +37,7 @@ namespace internal {
 // EBCDIC. Technically we could use some smaller ranges, but that's even harder
 // to read.
-LIBC_INLINE static constexpr bool islower(char ch) {
+LIBC_INLINE constexpr bool islower(char ch) {
   switch (ch) {
   case 'a':
   case 'b':
 @@ -71,7 +71,7 @@ LIBC_INLINE static constexpr bool islower(char ch) {
   }
 }
-LIBC_INLINE static constexpr bool isupper(char ch) {
+LIBC_INLINE constexpr bool isupper(char ch) {
   switch (ch) {
   case 'A':
   case 'B':
 @@ -105,7 +105,7 @@ LIBC_INLINE static constexpr bool isupper(char ch) {
   }
 }
-LIBC_INLINE static constexpr bool isdigit(char ch) {
+LIBC_INLINE constexpr bool isdigit(char ch) {
   switch (ch) {
   case '0':
   case '1':
 @@ -123,7 +123,7 @@ LIBC_INLINE static constexpr bool isdigit(char ch) {
   }
 }
-LIBC_INLINE static constexpr char tolower(char ch) {
+LIBC_INLINE constexpr char tolower(char ch) {
   switch (ch) {
   case 'A':
     return 'a';
 @@ -182,7 +182,7 @@ LIBC_INLINE static constexpr char tolower(char ch) {
   }
 }
-LIBC_INLINE static constexpr char toupper(char ch) {
+LIBC_INLINE constexpr char toupper(char ch) {
   switch (ch) {
   case 'a':
     return 'A';
 @@ -241,7 +241,7 @@ LIBC_INLINE static constexpr char toupper(char ch) {
   }
 }
-LIBC_INLINE static constexpr bool isalpha(char ch) {
+LIBC_INLINE constexpr bool isalpha(char ch) {
   switch (ch) {
   case 'a':
   case 'b':
 @@ -301,7 +301,7 @@ LIBC_INLINE static constexpr bool isalpha(char ch) {
   }
 }
-LIBC_INLINE static constexpr bool isalnum(char ch) {
+LIBC_INLINE constexpr bool isalnum(char ch) {
   switch (ch) {
   case 'a':
   case 'b':
 @@ -371,7 +371,8 @@ LIBC_INLINE static constexpr bool isalnum(char ch) {
   }
 }
-LIBC_INLINE static constexpr int b36_char_to_int(char ch) {
+#ifndef LIBC_COPT_CTYPE_SMALLER_ASCII
+LIBC_INLINE constexpr int b36_char_to_int(char ch) {
   switch (ch) {
   case '0':
     return 0;
 @@ -475,8 +476,21 @@ LIBC_INLINE static constexpr int b36_char_to_int(char ch) {
     return 0;
   }
 }
+#else  // LIBC_COPT_SMALL_ASCII_CTYPE
+// This version assumes ASCII for the tolower, but generates smaller code since
+// the switch version of this function ends up with a table. This should only be
+// used when the target is known to be ASCII.
+LIBC_INLINE constexpr int b36_char_to_int(char ch) {
+  if (ch >= '0' && ch <= '9')
+    return ch - '0';
+  char ch_unsafe_lower = ch | 32;
+  if (ch_unsafe_lower >= 'a' && ch_unsafe_lower <= 'z')
+    return ch_unsafe_lower - 'a' + 10;
+  return 0;
+}
+#endif // LIBC_COPT_SMALL_ASCII_CTYPE
-LIBC_INLINE static constexpr char int_to_b36_char(int num) {
+LIBC_INLINE constexpr char int_to_b36_char(int num) {
   // Can't actually use LIBC_ASSERT here because it depends on integer_to_string
   // which depends on this.
 @@ -559,7 +573,7 @@ LIBC_INLINE static constexpr char int_to_b36_char(int num) {
   }
 }
-LIBC_INLINE static constexpr bool isspace(char ch) {
+LIBC_INLINE constexpr bool isspace(char ch) {
   switch (ch) {
   case ' ':
   case '\t':
 @@ -574,14 +588,12 @@ LIBC_INLINE static constexpr bool isspace(char ch) {
 }
 // not yet encoding independent.
-LIBC_INLINE static constexpr bool isgraph(char ch) {
+LIBC_INLINE constexpr bool isgraph(char ch) { return 0x20 < ch && ch < 0x7f; }
-  return 0x20 < ch && ch < 0x7f;
-}
 // An overload which provides a way to compare input with specific character
 // values, when input can be of a regular or a wide character type.
-LIBC_INLINE static constexpr bool is_char_or_wchar(char ch, char c_value,
+LIBC_INLINE constexpr bool is_char_or_wchar(char ch, char c_value,
-                                                   [[maybe_unused]] wchar_t) {
+                                            [[maybe_unused]] wchar_t) {
   return (ch == c_value);
 }

lib/libcxx/libc/src/__support/high_precision_decimal.h+1-1

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	//===-- High Precision Decimal ----------------------------------- C++ --===//	1	//===-- High Precision Decimal ----------------------------------- C++ --===//
2	//	2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.	3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See httpss//llvm.org/LICENSE.txt for license information.	4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception	5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//	6	//
7	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//

lib/libcxx/libc/src/__support/libc_assert.h+4-11

 @@ -25,8 +25,9 @@
 #include "src/__support/OSUtil/exit.h"
 #include "src/__support/OSUtil/io.h"
 #include "src/__support/integer_to_string.h"
-#include "src/__support/macros/attributes.h"   // For LIBC_INLINE
+#include "src/__support/macros/attributes.h" // For LIBC_INLINE
 #include "src/__support/macros/config.h"
+#include "src/__support/macros/macro-utils.h"
 #include "src/__support/macros/optimization.h" // For LIBC_UNLIKELY
 namespace LIBC_NAMESPACE_DECL {
 @@ -65,19 +66,11 @@ LIBC_INLINE void report_assertion_failure(const char *assertion,
   } while (false)
 #else
-// Convert __LINE__ to a string using macros. The indirection is necessary
-// because otherwise it will turn "__LINE__" into a string, not its value. The
-// value is evaluated in the indirection step.
-#define __LIBC_MACRO_TO_STR(x) #x
-#define __LIBC_MACRO_TO_STR_INDIR(y) __LIBC_MACRO_TO_STR(y)
-#define __LIBC_LINE_STR__ __LIBC_MACRO_TO_STR_INDIR(__LINE__)
 #define LIBC_ASSERT(COND)                                                      \
   do {                                                                         \
     if (LIBC_UNLIKELY(!(COND))) {                                              \
-      LIBC_NAMESPACE::write_to_stderr(__FILE__ ":" __LIBC_LINE_STR__           \
+      LIBC_NAMESPACE::write_to_stderr(__FILE__ ":" LLVM_LIBC_STRINGIFY(        \
-                                               ": Assertion failed: '" #COND   \
+          __LINE__) ": Assertion failed: '" #COND "' in function: '");         \
-                                               "' in function: '");            \
       LIBC_NAMESPACE::write_to_stderr(__PRETTY_FUNCTION__);                    \
       LIBC_NAMESPACE::write_to_stderr("'\n");                                  \
       LIBC_NAMESPACE::internal::exit(0xFF);                                    \

lib/libcxx/libc/src/__support/macros/attributes.h+74

...	@@ -29,6 +29,80 @@	...	@@ -29,6 +29,80 @@
29	#define LIBC_INLINE_ASM __asm__ __volatile__	29	#define LIBC_INLINE_ASM __asm__ __volatile__
30	#define LIBC_UNUSED __attribute__((unused))	30	#define LIBC_UNUSED __attribute__((unused))
31		31
		32	#ifndef LIBC_HAS_BUILTIN_IS_CONSTANT_EVALUATED
		33	#if (defined(LIBC_COMPILER_IS_GCC) && (LIBC_COMPILER_GCC_VER >= 900)) \|\| \
		34	(defined(LIBC_COMPILER_IS_CLANG) && LIBC_COMPILER_CLANG_VER >= 900)
		35	#define LIBC_HAS_BUILTIN_IS_CONSTANT_EVALUATED 1
		36	#else
		37	#define LIBC_HAS_BUILTIN_IS_CONSTANT_EVALUATED \
		38	(__has_builtin(__builtin_is_constant_evaluated))
		39	#endif // (defined(LIBC_COMPILER_IS_GCC) && (LIBC_COMPILER_GCC_VER >= 900)) \|\|
		40	// (defined(LIBC_COMPILER_IS_CLANG) && LIBC_COMPILER_CLANG
		41	#endif // LIBC_HAS_BUILTIN_IS_CONSTANT_EVALUATED
		42
		43	#ifndef LIBC_HAS_BUILTIN_BIT_CAST
		44	#if __has_builtin(__builtin_bit_cast) \|\| defined(LIBC_COMPILER_IS_MSVC)
		45	#define LIBC_HAS_BUILTIN_BIT_CAST 1
		46	#else
		47	#define LIBC_HAS_BUILTIN_BIT_CAST 0
		48	#endif // has_builtin(__builtin_bit_cast)
		49	#endif // LIBC_HAS_BUILTIN_BIT_CAST
		50
		51	#if LIBC_HAS_BUILTIN_BIT_CAST
		52	#define LIBC_BIT_CAST_CONSTEXPR constexpr
		53	#define LIBC_BIT_CAST_CONSTEXPR_VAR constexpr
		54	#else
		55	#define LIBC_BIT_CAST_CONSTEXPR
		56	#define LIBC_BIT_CAST_CONSTEXPR_VAR const
		57	#endif // LIBC_HAS_BUILTIN_BIT_CAST
		58
		59	#ifndef LIBC_HAS_CONSTANT_EVALUATION
		60	#define LIBC_HAS_CONSTANT_EVALUATION \
		61	(LIBC_HAS_BUILTIN_IS_CONSTANT_EVALUATED && LIBC_HAS_BUILTIN_BIT_CAST)
		62	#endif // LIBC_HAS_CONSTANT_EVALUATION
		63
		64	#if LIBC_HAS_CONSTANT_EVALUATION
		65	#define LIBC_CONSTEXPR_DEFAULT constexpr
		66	#define LIBC_CONSTEXPR_VAR_DEFAULT constexpr
		67	#else
		68	#define LIBC_CONSTEXPR_DEFAULT
		69	#define LIBC_CONSTEXPR_VAR_DEFAULT const
		70	#endif // LIBC_HAS_CONSTANT_EVALUATION
		71
		72	// TODO: Remove the macro once Clang/LLVM bump their minimum compilers' version.
		73	// The reason for indirection is GCC is known to fail with constexpr qualified
		74	// functions that doesn't produce constant expression.
		75	// Also, there are some circular dependency in the generic functions without
		76	// __builtin_func for the following functions:
		77	// fputil::fma
		78	// fputil::sqrt
		79	#if LIBC_ENABLE_CONSTEXPR && LIBC_HAS_CONSTANT_EVALUATION
		80	#define LIBC_USE_CONSTEXPR
		81	#define LIBC_CONSTEXPR constexpr
		82	#define LIBC_CONSTEXPR_VAR constexpr
		83	#else
		84	#define LIBC_CONSTEXPR
		85	#define LIBC_CONSTEXPR_VAR const
		86	#endif // LIBC_USE_CONSTEXPR
		87
		88	#ifndef LIBC_HAS_BUILTIN_IS_ASSIGNABLE
		89	#if (__has_builtin(__is_assignable) \|\| \
		90	(defined(LIBC_COMPILER_IS_GCC) && (LIBC_COMPILER_GCC_VER >= 800)))
		91	#define LIBC_HAS_BUILTIN_IS_ASSIGNABLE 1
		92	#else
		93	#define LIBC_HAS_BUILTIN_IS_ASSIGNABLE 0
		94	#endif
		95	#endif // LIBC_HAS_BUILTIN_IS_ASSIGNABLE
		96
		97	#ifndef LIBC_HAS_BUILTIN_IS_CONSTRUCTIBLE
		98	#if (__has_builtin(__is_constructible) \|\| \
		99	(defined(LIBC_COMPILER_IS_GCC) && (LIBC_COMPILER_GCC_VER >= 800)))
		100	#define LIBC_HAS_BUILTIN_IS_CONSTRUCTIBLE 1
		101	#else
		102	#define LIBC_HAS_BUILTIN_IS_CONSTRUCTIBLE 0
		103	#endif
		104	#endif // LIBC_HAS_BUILTIN_IS_CONSTRUCTIBLE
		105
32	// Uses the platform specific specialization	106	// Uses the platform specific specialization
33	#define LIBC_THREAD_MODE_PLATFORM 0	107	#define LIBC_THREAD_MODE_PLATFORM 0
34		108

lib/libcxx/libc/src/__support/macros/config.h+14

...	@@ -48,6 +48,10 @@	...	@@ -48,6 +48,10 @@
48		48
49	#define __builtin_prefetch(X, Y, Z)	49	#define __builtin_prefetch(X, Y, Z)
50		50
		51	#define LIBC_HAS_BUILTIN_IS_CONSTANT_EVALUATED 1
		52	#define LIBC_HAS_BUILTIN_IS_ASSIGNABLE 1
		53	#define LIBC_HAS_BUILTIN_IS_CONSTRUCTIBLE 1
		54
51	#endif // LIBC_COMPILER_IS_MSVC	55	#endif // LIBC_COMPILER_IS_MSVC
52		56
53	#ifdef __clang__	57	#ifdef __clang__
...	@@ -66,4 +70,14 @@	...	@@ -66,4 +70,14 @@
66	#define LIBC_NAMESPACE_DECL LIBC_NAMESPACE	70	#define LIBC_NAMESPACE_DECL LIBC_NAMESPACE
67	#endif	71	#endif
68		72
		73	// IMPORTANT (USE WITH CAUTION): This macro is intended to be used at the top of
		74	// the file and set to 1. It alters the signatures of some functions to have
		75	// constexpr qualifier and forces the use of constexpr-compatible
		76	// implementation, which might be a completely different code path or
		77	// instructions. Some of these functions exploit platform-specific non-constexpr
		78	// implementations to achieve certain goals, thus it is disabled by default.
		79	#ifndef LIBC_ENABLE_CONSTEXPR
		80	#define LIBC_ENABLE_CONSTEXPR 0
		81	#endif
		82
69	#endif // LLVM_LIBC_SRC___SUPPORT_MACROS_CONFIG_H	83	#endif // LLVM_LIBC_SRC___SUPPORT_MACROS_CONFIG_H

lib/libcxx/libc/src/__support/macros/macro-utils.h created+16

...	@@ -0,0 +1,16 @@
1	//===-- Macros used by other macros ----------------------------- C++ --===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef LLVM_LIBC_SRC___SUPPORT_MACROS_MACRO_UTILS_H
10	#define LLVM_LIBC_SRC___SUPPORT_MACROS_MACRO_UTILS_H
11
12	// Stringify the argument after an extra pass of macro expansion.
13	#define LLVM_LIBC_STRINGIFY(x) LLVM_LIBC_STRINGIFY_IMPL(x)
14	#define LLVM_LIBC_STRINGIFY_IMPL(x) #x
15
16	#endif // LLVM_LIBC_SRC___SUPPORT_MACROS_MACRO_UTILS_H

lib/libcxx/libc/src/__support/macros/optimization.h+18-7

 @@ -32,8 +32,13 @@ LIBC_INLINE constexpr bool expects_bool_condition(T value, T expected) {
 #define LIBC_LOOP_NOUNROLL _Pragma("nounroll")
 #define LIBC_LOOP_UNROLL _Pragma("unroll")
 #elif defined(LIBC_COMPILER_IS_GCC)
+#if LIBC_COMPILER_GCC_VER >= 800
 #define LIBC_LOOP_NOUNROLL _Pragma("GCC unroll 0")
 #define LIBC_LOOP_UNROLL _Pragma("GCC unroll 2048")
+#else
+#define LIBC_LOOP_NOUNROLL
+#define LIBC_LOOP_UNROLL
+#endif
 #elif defined(LIBC_COMPILER_IS_MSVC)
 #define LIBC_LOOP_NOUNROLL
 #define LIBC_LOOP_UNROLL
 @@ -47,33 +52,39 @@ LIBC_INLINE constexpr bool expects_bool_condition(T value, T expected) {
 #define LIBC_MATH_SMALL_TABLES 0x02
 #define LIBC_MATH_NO_ERRNO 0x04
 #define LIBC_MATH_NO_EXCEPT 0x08
+#define LIBC_MATH_INTERMEDIATE_COMP_IN_FLOAT 0x10
+#define LIBC_MATH_ASSUME_ROUND_NEAREST_ONLY 0x20
 #define LIBC_MATH_FAST                                                         \
   (LIBC_MATH_SKIP_ACCURATE_PASS | LIBC_MATH_SMALL_TABLES |                     \
-   LIBC_MATH_NO_ERRNO | LIBC_MATH_NO_EXCEPT)
+   LIBC_MATH_NO_ERRNO | LIBC_MATH_NO_EXCEPT |                                  \
-#define LIBC_MATH_INTERMEDIATE_COMP_IN_FLOAT 0x10
+   LIBC_MATH_ASSUME_ROUND_NEAREST_ONLY)
 #ifndef LIBC_MATH
 #define LIBC_MATH 0
 #endif // LIBC_MATH
-#if (LIBC_MATH & LIBC_MATH_SKIP_ACCURATE_PASS)
+#if ((LIBC_MATH) & LIBC_MATH_SKIP_ACCURATE_PASS)
 #define LIBC_MATH_HAS_SKIP_ACCURATE_PASS
 #endif
-#if (LIBC_MATH & LIBC_MATH_SMALL_TABLES)
+#if ((LIBC_MATH) & LIBC_MATH_SMALL_TABLES)
 #define LIBC_MATH_HAS_SMALL_TABLES
 #endif
-#if (LIBC_MATH & LIBC_MATH_INTERMEDIATE_COMP_IN_FLOAT)
+#if ((LIBC_MATH) & LIBC_MATH_INTERMEDIATE_COMP_IN_FLOAT)
 #define LIBC_MATH_HAS_INTERMEDIATE_COMP_IN_FLOAT
 #endif
-#if (LIBC_MATH & LIBC_MATH_NO_ERRNO)
+#if ((LIBC_MATH) & LIBC_MATH_NO_ERRNO)
 #define LIBC_MATH_HAS_NO_ERRNO
 #endif
-#if (LIBC_MATH & LIBC_MATH_NO_EXCEPT)
+#if ((LIBC_MATH) & LIBC_MATH_NO_EXCEPT)
 #define LIBC_MATH_HAS_NO_EXCEPT
 #endif
+#if ((LIBC_MATH) & LIBC_MATH_ASSUME_ROUND_NEAREST_ONLY)
+#define LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
+#endif
 #endif // LLVM_LIBC_SRC___SUPPORT_MACROS_OPTIMIZATION_H

lib/libcxx/libc/src/__support/macros/properties/architectures.h+6-1

 @@ -13,11 +13,16 @@
 #define LIBC_TARGET_ARCH_IS_AMDGPU
 #endif
+#if defined(__SPIRV__)
+#define LIBC_TARGET_ARCH_IS_SPIRV
+#endif
 #if defined(__NVPTX__)
 #define LIBC_TARGET_ARCH_IS_NVPTX
 #endif
-#if defined(LIBC_TARGET_ARCH_IS_NVPTX) || defined(LIBC_TARGET_ARCH_IS_AMDGPU)
+#if defined(LIBC_TARGET_ARCH_IS_NVPTX) ||                                      \
+    defined(LIBC_TARGET_ARCH_IS_AMDGPU) || defined(LIBC_TARGET_ARCH_IS_SPIRV)
 #define LIBC_TARGET_ARCH_IS_GPU
 #endif

lib/libcxx/libc/src/__support/macros/properties/cpu_features.h+7-2

 @@ -56,6 +56,10 @@
 #define LIBC_TARGET_CPU_HAS_AVX512BW
 #endif
+#if defined(__AVX512F__) || defined(__AVX2__)
+#define LIBC_TARGET_CPU_HAS_GATHER
+#endif
 #if defined(__ARM_FP)
 #if (__ARM_FP & 0x2)
 #define LIBC_TARGET_CPU_HAS_ARM_FPU_HALF
 @@ -91,13 +95,14 @@
 #endif // LIBC_TARGET_CPU_HAS_RISCV_FPU_DOUBLE
 #endif // __riscv_flen
-#if defined(__NVPTX__) || defined(__AMDGPU__)
+#if defined(__NVPTX__) || defined(__AMDGPU__) || defined(__SPIRV__)
 #define LIBC_TARGET_CPU_HAS_FPU_FLOAT
 #define LIBC_TARGET_CPU_HAS_FPU_DOUBLE
 #endif
 #if defined(__ARM_FEATURE_FMA) || (defined(__AVX2__) && defined(__FMA__)) ||   \
-    defined(__NVPTX__) || defined(__AMDGPU__) || defined(__riscv_flen)
+    defined(__NVPTX__) || defined(__AMDGPU__) || defined(__riscv_flen) ||      \
+    defined(__SPIRV__)
 #define LIBC_TARGET_CPU_HAS_FMA
 // Provide a more fine-grained control of FMA instruction for ARM targets.
 #if defined(LIBC_TARGET_CPU_HAS_FPU_HALF)

lib/libcxx/libc/src/__support/macros/sanitizer.h+7-6

 @@ -26,24 +26,25 @@
 #ifdef LIBC_HAS_MEMORY_SANITIZER
 // Only perform MSAN unpoison in non-constexpr context.
 #include <sanitizer/msan_interface.h>
-#define MSAN_UNPOISON(addr, size)                                              \
+#define LIBC_MSAN_UNPOISON(addr, size)                                         \
   do {                                                                         \
     if (!__builtin_is_constant_evaluated())                                    \
       __msan_unpoison(addr, size);                                             \
   } while (0)
 #else
-#define MSAN_UNPOISON(ptr, size)
+#define LIBC_MSAN_UNPOISON(ptr, size)
 #endif
 #ifdef LIBC_HAS_ADDRESS_SANITIZER
 #include <sanitizer/asan_interface.h>
-#define ASAN_POISON_MEMORY_REGION(addr, size)                                  \
+#define LIBC_ASAN_POISON_MEMORY_REGION(addr, size)                             \
   __asan_poison_memory_region((addr), (size))
-#define ASAN_UNPOISON_MEMORY_REGION(addr, size)                                \
+#define LIBC_ASAN_UNPOISON_MEMORY_REGION(addr, size)                           \
   __asan_unpoison_memory_region((addr), (size))
 #else
-#define ASAN_POISON_MEMORY_REGION(addr, size) ((void)(addr), (void)(size))
+#define LIBC_ASAN_POISON_MEMORY_REGION(addr, size) ((void)(addr), (void)(size))
-#define ASAN_UNPOISON_MEMORY_REGION(addr, size) ((void)(addr), (void)(size))
+#define LIBC_ASAN_UNPOISON_MEMORY_REGION(addr, size)                           \
+  ((void)(addr), (void)(size))
 #endif
 #endif // LLVM_LIBC_SRC___SUPPORT_MACROS_SANITIZER_H

lib/libcxx/libc/src/__support/math_extras.h+15

...	@@ -80,6 +80,21 @@ template <typename T>	...	@@ -80,6 +80,21 @@ template <typename T>
80	#endif // __builtin_sub_overflow	80	#endif // __builtin_sub_overflow
81	}	81	}
82		82
		83	template <typename T>
		84	[[nodiscard]] LIBC_INLINE constexpr bool mul_overflow(T a, T b, T &res) {
		85	#if __has_builtin(__builtin_mul_overflow)
		86	return __builtin_mul_overflow(a, b, &res);
		87	#else
		88	T max = cpp::numeric_limits<T>::max();
		89	T min = cpp::numeric_limits<T>::min();
		90	bool overflow = (b > 0 && (a > max / b \|\| a < min / b)) \|\|
		91	(b < 0 && (a < max / b \|\| a > min / b));
		92	if (!overflow)
		93	res = a * b;
		94	return overflow;
		95	#endif
		96	}
		97
83	#define RETURN_IF(TYPE, BUILTIN) \	98	#define RETURN_IF(TYPE, BUILTIN) \
84	if constexpr (cpp::is_same_v<T, TYPE>) \	99	if constexpr (cpp::is_same_v<T, TYPE>) \
85	return BUILTIN(a, b, carry_in, &carry_out);	100	return BUILTIN(a, b, carry_in, &carry_out);

lib/libcxx/libc/src/__support/str_to_float.h+14-9

lib/libcxx/libc/src/__support/str_to_integer.h+21-2

 @@ -33,7 +33,7 @@ namespace internal {
 // Returns the idx to the first character in src that is not a whitespace
 // character (as determined by isspace())
 template <typename CharType>
-LIBC_INLINE size_t
+LIBC_INLINE constexpr size_t
 first_non_whitespace(const CharType *__restrict src,
                      size_t src_len = cpp::numeric_limits<size_t>::max()) {
   size_t src_cur = 0;
 @@ -65,6 +65,18 @@ LIBC_INLINE static bool is_hex_start(const CharType *__restrict src,
          b36_char_to_int(src[2]) < 16;
 }
+// checks if the next 3 characters of the string pointer are the start of a
+// binary number. Does not advance the string pointer.
+template <typename CharType>
+LIBC_INLINE static bool is_binary_start(const CharType *__restrict src,
+                                        size_t src_len) {
+  if (src_len < 3)
+    return false;
+  return is_char_or_wchar(src[0], '0', L'0') &&
+         is_char_or_wchar(tolower(src[1]), 'b', L'b') && isalnum(src[2]) &&
+         b36_char_to_int(src[2]) < 2;
+}
 // Takes the address of the string pointer and parses the base from the start of
 // it.
 template <typename CharType>
 @@ -75,6 +87,10 @@ LIBC_INLINE static int infer_base(const CharType *__restrict src,
   // with values 10 through 15 respectively." (C standard 6.4.4.1)
   if (is_hex_start(src, src_len))
     return 16;
+  // A binary number is defined as "the prefix 0b or 0B optionally followed
+  // by a sequence of letters and digits." (C standard 7.24.1.7)
+  if (is_binary_start(src, src_len))
+    return 2;
   // An octal number is defined as "the prefix 0 optionally followed by a
   // sequence of the digits 0 through 7 only" (C standard 6.4.4.1) and so any
   // number that starts with 0, including just 0, is an octal number.
 @@ -94,7 +110,7 @@ LIBC_INLINE static int infer_base(const CharType *__restrict src,
 // Takes a pointer to a string and the base to convert to. This function is used
 // as the backend for all of the string to int functions.
 template <typename T, typename CharType>
-LIBC_INLINE StrToNumResult<T>
+LIBC_INLINE constexpr StrToNumResult<T>
 strtointeger(const CharType *__restrict src, int base,
              const size_t src_len = cpp::numeric_limits<size_t>::max()) {
   using ResultType = make_integral_or_big_int_unsigned_t<T>;
 @@ -120,6 +136,9 @@ strtointeger(const CharType *__restrict src, int base,
   if (base == 16 && is_hex_start(src + src_cur, src_len - src_cur))
     src_cur = src_cur + 2;
+  if (base == 2 && is_binary_start(src + src_cur, src_len - src_cur))
+    src_cur = src_cur + 2;
   constexpr bool IS_UNSIGNED = cpp::is_unsigned_v<T>;
   ResultType constexpr NEGATIVE_MAX =
       !IS_UNSIGNED ? static_cast<ResultType>(cpp::numeric_limits<T>::max()) + 1

lib/libcxx/libc/src/__support/wctype/wctype_classification_utils.h created+66

...	@@ -0,0 +1,66 @@
1	//===-- Utils for wctype classification functions ---------------- C++ --===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8	// DO NOT EDIT MANUALLY.
9	// This file is generated by libc/utils/wctype_utils scripts.
10
11	#ifndef LLVM_LIBC_SRC___SUPPORT_WCTYPE_WCTYPE_CLASSIFICATION_UTILS_H
12	#define LLVM_LIBC_SRC___SUPPORT_WCTYPE_WCTYPE_CLASSIFICATION_UTILS_H
13
14	#include "hdr/stdint_proxy.h"
15	#include "hdr/types/wchar_t.h"
16	#include "src/__support/CPP/limits.h"
17	#include "src/__support/libc_assert.h"
18	#include "src/__support/macros/attributes.h"
19	#include "src/__support/macros/config.h"
20
21	namespace LIBC_NAMESPACE_DECL {
22
23	// Property flags for Unicode categories
24	enum PropertyFlag : uint8_t {
25	UPPER = 1 << 0,
26	LOWER = 1 << 1,
27	ALPHA = 1 << 2,
28	SPACE = 1 << 3,
29	PRINT = 1 << 4,
30	BLANK = 1 << 5,
31	CNTRL = 1 << 6,
32	PUNCT = 1 << 7,
33	};
34
35	static_assert(4352 <= cpp::numeric_limits<unsigned short>::max());
36	static_assert(39168 <= cpp::numeric_limits<unsigned short>::max());
37
38	LIBC_INLINE_VAR constexpr uint16_t LEVEL1_SIZE = 4352;
39	LIBC_INLINE_VAR constexpr uint16_t LEVEL2_SIZE = 39168;
40
41	// Level 1 table: indexed by (codepoint >> 8), stores level2 block offsets
42	extern const uint16_t LEVEL1[LEVEL1_SIZE];
43
44	// Level 2 table: blocks of 256 property flags
45	extern const uint8_t LEVEL2[LEVEL2_SIZE];
46
47	// Returns the Unicode property flag for a given wide character.
48	LIBC_INLINE uint8_t lookup_properties(const wchar_t wc) {
49	// Out of Unicode range
50	if (static_cast<uint32_t>(wc) > 0x10FFFF) {
51	return 0;
52	}
53
54	uint16_t l1_idx = static_cast<uint16_t>(wc >> 8);
55	LIBC_ASSERT(l1_idx < LEVEL1_SIZE);
56
57	uint16_t l2_offset = LEVEL1[l1_idx];
58	uint16_t l2_idx = l2_offset + (wc & 0xFF);
59	LIBC_ASSERT(l2_idx < LEVEL2_SIZE);
60
61	return LEVEL2[l2_idx];
62	}
63
64	} // namespace LIBC_NAMESPACE_DECL
65
66	#endif // LLVM_LIBC_SRC___SUPPORT_WCTYPE_WCTYPE_CLASSIFICATION_UTILS_H

lib/libcxx/libc/src/__support/wctype/wctype_conversion_utils.h created+34

...	@@ -0,0 +1,34 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8	///
9	/// \file
10	/// Interface for wctype conversion functions.
11	///
12	//===----------------------------------------------------------------------===//
13
14	#ifndef LLVM_LIBC_SRC___SUPPORT_WCTYPE_WCTYPE_CONVERSION_UTILS_H
15	#define LLVM_LIBC_SRC___SUPPORT_WCTYPE_WCTYPE_CONVERSION_UTILS_H
16
17	#include "hdr/types/wchar_t.h"
18	#include "hdr/types/wint_t.h"
19	#include "src/__support/macros/attributes.h"
20	#include "src/__support/macros/config.h"
21
22	namespace LIBC_NAMESPACE_DECL {
23	namespace wctype_internal {
24
25	// Helper functions for non-ASCII case conversions.
26	// These are implemented in wctype_conversion_utils.cpp using the generated
27	// maps.
28	wint_t tolower(wchar_t wch);
29	wint_t toupper(wchar_t wch);
30
31	} // namespace wctype_internal
32	} // namespace LIBC_NAMESPACE_DECL
33
34	#endif // LLVM_LIBC_SRC___SUPPORT_WCTYPE_WCTYPE_CONVERSION_UTILS_H

lib/libcxx/libc/src/__support/wctype_utils.h+351-137

...	@@ -13,6 +13,18 @@	...	@@ -13,6 +13,18 @@
13	#include "src/__support/macros/attributes.h" // LIBC_INLINE	13	#include "src/__support/macros/attributes.h" // LIBC_INLINE
14	#include "src/__support/macros/config.h"	14	#include "src/__support/macros/config.h"
15		15
		16	#define LIBC_WCTYPE_MODE_ASCII 0
		17	#define LIBC_WCTYPE_MODE_UTF8 1
		18
		19	#ifndef LIBC_CONF_WCTYPE_MODE
		20	#define LIBC_CONF_WCTYPE_MODE LIBC_WCTYPE_MODE_ASCII
		21	#endif
		22
		23	#if LIBC_CONF_WCTYPE_MODE == LIBC_WCTYPE_MODE_UTF8
		24	#include "src/__support/wctype/wctype_classification_utils.h"
		25	#include "src/__support/wctype/wctype_conversion_utils.h"
		26	#endif
		27
16	namespace LIBC_NAMESPACE_DECL {	28	namespace LIBC_NAMESPACE_DECL {
17	namespace internal {	29	namespace internal {
18		30
...	@@ -38,8 +50,8 @@ namespace internal {	...	@@ -38,8 +50,8 @@ namespace internal {
38	// This assumes the character ranges are contiguous, which they aren't in	50	// This assumes the character ranges are contiguous, which they aren't in
39	// EBCDIC. Technically we could use some smaller ranges, but that's even harder	51	// EBCDIC. Technically we could use some smaller ranges, but that's even harder
40	// to read.	52	// to read.
41		53	namespace ascii {
42	LIBC_INLINE static constexpr bool islower(wchar_t wch) {	54	LIBC_INLINE constexpr bool islower(wchar_t wch) {
43	switch (wch) {	55	switch (wch) {
44	case L'a':	56	case L'a':
45	case L'b':	57	case L'b':
...	@@ -73,7 +85,7 @@ LIBC_INLINE static constexpr bool islower(wchar_t wch) {	...	@@ -73,7 +85,7 @@ LIBC_INLINE static constexpr bool islower(wchar_t wch) {
73	}	85	}
74	}	86	}
75		87
76	LIBC_INLINE static constexpr bool isupper(wchar_t wch) {	88	LIBC_INLINE constexpr bool isupper(wchar_t wch) {
77	switch (wch) {	89	switch (wch) {
78	case L'A':	90	case L'A':
79	case L'B':	91	case L'B':
...	@@ -107,7 +119,7 @@ LIBC_INLINE static constexpr bool isupper(wchar_t wch) {	...	@@ -107,7 +119,7 @@ LIBC_INLINE static constexpr bool isupper(wchar_t wch) {
107	}	119	}
108	}	120	}
109		121
110	LIBC_INLINE static constexpr bool isdigit(wchar_t wch) {	122	LIBC_INLINE constexpr bool isdigit(wchar_t wch) {
111	switch (wch) {	123	switch (wch) {
112	case L'0':	124	case L'0':
113	case L'1':	125	case L'1':
...	@@ -125,125 +137,169 @@ LIBC_INLINE static constexpr bool isdigit(wchar_t wch) {	...	@@ -125,125 +137,169 @@ LIBC_INLINE static constexpr bool isdigit(wchar_t wch) {
125	}	137	}
126	}	138	}
127		139
128	LIBC_INLINE static constexpr wchar_t tolower(wchar_t wch) {	140	LIBC_INLINE constexpr bool isalpha(wchar_t wch) {
129	switch (wch) {	141	switch (wch) {
		142	case L'a':
		143	case L'b':
		144	case L'c':
		145	case L'd':
		146	case L'e':
		147	case L'f':
		148	case L'g':
		149	case L'h':
		150	case L'i':
		151	case L'j':
		152	case L'k':
		153	case L'l':
		154	case L'm':
		155	case L'n':
		156	case L'o':
		157	case L'p':
		158	case L'q':
		159	case L'r':
		160	case L's':
		161	case L't':
		162	case L'u':
		163	case L'v':
		164	case L'w':
		165	case L'x':
		166	case L'y':
		167	case L'z':
130	case L'A':	168	case L'A':
131	return L'a';
132	case L'B':	169	case L'B':
133	return L'b';
134	case L'C':	170	case L'C':
135	return L'c';
136	case L'D':	171	case L'D':
137	return L'd';
138	case L'E':	172	case L'E':
139	return L'e';
140	case L'F':	173	case L'F':
141	return L'f';
142	case L'G':	174	case L'G':
143	return L'g';
144	case L'H':	175	case L'H':
145	return L'h';
146	case L'I':	176	case L'I':
147	return L'i';
148	case L'J':	177	case L'J':
149	return L'j';
150	case L'K':	178	case L'K':
151	return L'k';
152	case L'L':	179	case L'L':
153	return L'l';
154	case L'M':	180	case L'M':
155	return L'm';
156	case L'N':	181	case L'N':
157	return L'n';
158	case L'O':	182	case L'O':
159	return L'o';
160	case L'P':	183	case L'P':
161	return L'p';
162	case L'Q':	184	case L'Q':
163	return L'q';
164	case L'R':	185	case L'R':
165	return L'r';
166	case L'S':	186	case L'S':
167	return L's';
168	case L'T':	187	case L'T':
169	return L't';
170	case L'U':	188	case L'U':
171	return L'u';
172	case L'V':	189	case L'V':
173	return L'v';
174	case L'W':	190	case L'W':
175	return L'w';
176	case L'X':	191	case L'X':
177	return L'x';
178	case L'Y':	192	case L'Y':
179	return L'y';
180	case L'Z':	193	case L'Z':
181	return L'z';	194	return true;
182	default:	195	default:
183	return wch;	196	return false;
184	}	197	}
185	}	198	}
186		199
187	LIBC_INLINE static constexpr wchar_t toupper(wchar_t wch) {	200	LIBC_INLINE constexpr bool isalnum(wchar_t wch) {
188	switch (wch) {	201	switch (wch) {
189	case L'a':	202	case L'a':
190	return L'A';
191	case L'b':	203	case L'b':
192	return L'B';
193	case L'c':	204	case L'c':
194	return L'C';
195	case L'd':	205	case L'd':
196	return L'D';
197	case L'e':	206	case L'e':
198	return L'E';
199	case L'f':	207	case L'f':
200	return L'F';
201	case L'g':	208	case L'g':
202	return L'G';
203	case L'h':	209	case L'h':
204	return L'H';
205	case L'i':	210	case L'i':
206	return L'I';
207	case L'j':	211	case L'j':
208	return L'J';
209	case L'k':	212	case L'k':
210	return L'K';
211	case L'l':	213	case L'l':
212	return L'L';
213	case L'm':	214	case L'm':
214	return L'M';
215	case L'n':	215	case L'n':
216	return L'N';
217	case L'o':	216	case L'o':
218	return L'O';
219	case L'p':	217	case L'p':
220	return L'P';
221	case L'q':	218	case L'q':
222	return L'Q';
223	case L'r':	219	case L'r':
224	return L'R';
225	case L's':	220	case L's':
226	return L'S';
227	case L't':	221	case L't':
228	return L'T';
229	case L'u':	222	case L'u':
230	return L'U';
231	case L'v':	223	case L'v':
232	return L'V';
233	case L'w':	224	case L'w':
234	return L'W';
235	case L'x':	225	case L'x':
236	return L'X';
237	case L'y':	226	case L'y':
238	return L'Y';
239	case L'z':	227	case L'z':
240	return L'Z';	228	case L'A':
		229	case L'B':
		230	case L'C':
		231	case L'D':
		232	case L'E':
		233	case L'F':
		234	case L'G':
		235	case L'H':
		236	case L'I':
		237	case L'J':
		238	case L'K':
		239	case L'L':
		240	case L'M':
		241	case L'N':
		242	case L'O':
		243	case L'P':
		244	case L'Q':
		245	case L'R':
		246	case L'S':
		247	case L'T':
		248	case L'U':
		249	case L'V':
		250	case L'W':
		251	case L'X':
		252	case L'Y':
		253	case L'Z':
		254	case L'0':
		255	case L'1':
		256	case L'2':
		257	case L'3':
		258	case L'4':
		259	case L'5':
		260	case L'6':
		261	case L'7':
		262	case L'8':
		263	case L'9':
		264	return true;
241	default:	265	default:
242	return wch;	266	return false;
		267	}
		268	}
		269
		270	LIBC_INLINE constexpr bool isspace(wchar_t wch) {
		271	switch (wch) {
		272	case L' ':
		273	case L'\t':
		274	case L'\n':
		275	case L'\v':
		276	case L'\f':
		277	case L'\r':
		278	return true;
		279	default:
		280	return false;
		281	}
		282	}
		283
		284	LIBC_INLINE constexpr bool isblank(wchar_t wch) {
		285	switch (wch) {
		286	case L' ':
		287	case L'\t':
		288	return true;
		289	default:
		290	return false;
243	}	291	}
244	}	292	}
245		293
246	LIBC_INLINE static constexpr bool isalpha(wchar_t wch) {	294	LIBC_INLINE constexpr bool isgraph(wchar_t wch) {
		295	return 0x20 < wch && wch < 0x7f;
		296	}
		297
		298	LIBC_INLINE constexpr bool isprint(wchar_t wch) {
		299	return (static_cast<unsigned>(wch) - ' ') < 95;
		300	}
		301
		302	LIBC_INLINE constexpr bool isxdigit(wchar_t wch) {
247	switch (wch) {	303	switch (wch) {
248	case L'a':	304	case L'a':
249	case L'b':	305	case L'b':
...	@@ -251,129 +307,301 @@ LIBC_INLINE static constexpr bool isalpha(wchar_t wch) {	...	@@ -251,129 +307,301 @@ LIBC_INLINE static constexpr bool isalpha(wchar_t wch) {
251	case L'd':	307	case L'd':
252	case L'e':	308	case L'e':
253	case L'f':	309	case L'f':
254	case L'g':
255	case L'h':
256	case L'i':
257	case L'j':
258	case L'k':
259	case L'l':
260	case L'm':
261	case L'n':
262	case L'o':
263	case L'p':
264	case L'q':
265	case L'r':
266	case L's':
267	case L't':
268	case L'u':
269	case L'v':
270	case L'w':
271	case L'x':
272	case L'y':
273	case L'z':
274	case L'A':	310	case L'A':
275	case L'B':	311	case L'B':
276	case L'C':	312	case L'C':
277	case L'D':	313	case L'D':
278	case L'E':	314	case L'E':
279	case L'F':	315	case L'F':
		316	case L'0':
		317	case L'1':
		318	case L'2':
		319	case L'3':
		320	case L'4':
		321	case L'5':
		322	case L'6':
		323	case L'7':
		324	case L'8':
		325	case L'9':
		326	return true;
		327	default:
		328	return false;
		329	}
		330	}
		331
		332	LIBC_INLINE constexpr bool iscntrl(wchar_t wch) {
		333	return (wch < 0x20 \|\| wch == 0x7f);
		334	}
		335
		336	LIBC_INLINE constexpr bool ispunct(wchar_t wch) {
		337	return !isalnum(wch) && isgraph(wch);
		338	}
		339
		340	LIBC_INLINE constexpr wchar_t tolower(wchar_t wch) {
		341	switch (wch) {
		342	case L'A':
		343	return L'a';
		344	case L'B':
		345	return L'b';
		346	case L'C':
		347	return L'c';
		348	case L'D':
		349	return L'd';
		350	case L'E':
		351	return L'e';
		352	case L'F':
		353	return L'f';
280	case L'G':	354	case L'G':
		355	return L'g';
281	case L'H':	356	case L'H':
		357	return L'h';
282	case L'I':	358	case L'I':
		359	return L'i';
283	case L'J':	360	case L'J':
		361	return L'j';
284	case L'K':	362	case L'K':
		363	return L'k';
285	case L'L':	364	case L'L':
		365	return L'l';
286	case L'M':	366	case L'M':
		367	return L'm';
287	case L'N':	368	case L'N':
		369	return L'n';
288	case L'O':	370	case L'O':
		371	return L'o';
289	case L'P':	372	case L'P':
		373	return L'p';
290	case L'Q':	374	case L'Q':
		375	return L'q';
291	case L'R':	376	case L'R':
		377	return L'r';
292	case L'S':	378	case L'S':
		379	return L's';
293	case L'T':	380	case L'T':
		381	return L't';
294	case L'U':	382	case L'U':
		383	return L'u';
295	case L'V':	384	case L'V':
		385	return L'v';
296	case L'W':	386	case L'W':
		387	return L'w';
297	case L'X':	388	case L'X':
		389	return L'x';
298	case L'Y':	390	case L'Y':
		391	return L'y';
299	case L'Z':	392	case L'Z':
300	return true;	393	return L'z';
301	default:	394	default:
302	return false;	395	return wch;
303	}	396	}
304	}	397	}
305		398
306	LIBC_INLINE static constexpr bool isalnum(wchar_t wch) {	399	LIBC_INLINE constexpr wchar_t toupper(wchar_t wch) {
307	switch (wch) {	400	switch (wch) {
308	case L'a':	401	case L'a':
		402	return L'A';
309	case L'b':	403	case L'b':
		404	return L'B';
310	case L'c':	405	case L'c':
		406	return L'C';
311	case L'd':	407	case L'd':
		408	return L'D';
312	case L'e':	409	case L'e':
		410	return L'E';
313	case L'f':	411	case L'f':
		412	return L'F';
314	case L'g':	413	case L'g':
		414	return L'G';
315	case L'h':	415	case L'h':
		416	return L'H';
316	case L'i':	417	case L'i':
		418	return L'I';
317	case L'j':	419	case L'j':
		420	return L'J';
318	case L'k':	421	case L'k':
		422	return L'K';
319	case L'l':	423	case L'l':
		424	return L'L';
320	case L'm':	425	case L'm':
		426	return L'M';
321	case L'n':	427	case L'n':
		428	return L'N';
322	case L'o':	429	case L'o':
		430	return L'O';
323	case L'p':	431	case L'p':
		432	return L'P';
324	case L'q':	433	case L'q':
		434	return L'Q';
325	case L'r':	435	case L'r':
		436	return L'R';
326	case L's':	437	case L's':
		438	return L'S';
327	case L't':	439	case L't':
		440	return L'T';
328	case L'u':	441	case L'u':
		442	return L'U';
329	case L'v':	443	case L'v':
		444	return L'V';
330	case L'w':	445	case L'w':
		446	return L'W';
331	case L'x':	447	case L'x':
		448	return L'X';
332	case L'y':	449	case L'y':
		450	return L'Y';
333	case L'z':	451	case L'z':
334	case L'A':	452	return L'Z';
335	case L'B':
336	case L'C':
337	case L'D':
338	case L'E':
339	case L'F':
340	case L'G':
341	case L'H':
342	case L'I':
343	case L'J':
344	case L'K':
345	case L'L':
346	case L'M':
347	case L'N':
348	case L'O':
349	case L'P':
350	case L'Q':
351	case L'R':
352	case L'S':
353	case L'T':
354	case L'U':
355	case L'V':
356	case L'W':
357	case L'X':
358	case L'Y':
359	case L'Z':
360	case L'0':
361	case L'1':
362	case L'2':
363	case L'3':
364	case L'4':
365	case L'5':
366	case L'6':
367	case L'7':
368	case L'8':
369	case L'9':
370	return true;
371	default:	453	default:
372	return false;	454	return wch;
		455	}
		456	}
		457
		458	} // namespace ascii
		459
		460	LIBC_INLINE constexpr bool islower(wchar_t wch) {
		461	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		462	return ascii::islower(wch);
		463	#else
		464	if (static_cast<uint32_t>(wch) < 128) {
		465	return ascii::islower(wch);
		466	}
		467	return lookup_properties(wch) & PropertyFlag::LOWER;
		468	#endif
		469	}
		470
		471	LIBC_INLINE constexpr bool isupper(wchar_t wch) {
		472	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		473	return ascii::isupper(wch);
		474	#else
		475	if (static_cast<uint32_t>(wch) < 128) {
		476	return ascii::isupper(wch);
		477	}
		478	return lookup_properties(wch) & PropertyFlag::UPPER;
		479	#endif
		480	}
		481
		482	LIBC_INLINE constexpr bool isdigit(wchar_t wch) {
		483	// In C.UT8, only ASCII digits are considered digits
		484	return ascii::isdigit(wch);
		485	}
		486
		487	LIBC_INLINE constexpr bool isalpha(wchar_t wch) {
		488	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		489	return ascii::isalpha(wch);
		490	#else
		491	if (static_cast<uint32_t>(wch) < 128) {
		492	return ascii::isalpha(wch);
		493	}
		494	return lookup_properties(wch) & PropertyFlag::ALPHA;
		495	#endif
		496	}
		497
		498	LIBC_INLINE constexpr bool isalnum(wchar_t wch) {
		499	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		500	return ascii::isalnum(wch);
		501	#else
		502	if (static_cast<uint32_t>(wch) < 128) {
		503	return ascii::isalnum(wch);
		504	}
		505	// Only need to check ALPHA, digit cases are covered by ASCII path
		506	return lookup_properties(wch) & PropertyFlag::ALPHA;
		507	#endif
		508	}
		509
		510	LIBC_INLINE constexpr bool isspace(wchar_t wch) {
		511	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		512	return ascii::isspace(wch);
		513	#else
		514	if (static_cast<uint32_t>(wch) < 128) {
		515	return ascii::isspace(wch);
		516	}
		517	return lookup_properties(wch) & PropertyFlag::SPACE;
		518	#endif
		519	}
		520
		521	LIBC_INLINE constexpr bool isblank(wchar_t wch) {
		522	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		523	return ascii::isblank(wch);
		524	#else
		525	if (static_cast<uint32_t>(wch) < 128) {
		526	return ascii::isblank(wch);
373	}	527	}
		528	return lookup_properties(wch) & PropertyFlag::BLANK;
		529	#endif
374	}	530	}
375		531
376	LIBC_INLINE static constexpr int b36_char_to_int(wchar_t wch) {	532	LIBC_INLINE constexpr bool isgraph(wchar_t wch) {
		533	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		534	return ascii::isgraph(wch);
		535	#else
		536	if (static_cast<uint32_t>(wch) < 128) {
		537	return ascii::isgraph(wch);
		538	}
		539	// print && !space
		540	return (lookup_properties(wch) &
		541	(PropertyFlag::PRINT \| PropertyFlag::SPACE)) == PropertyFlag::PRINT;
		542	#endif
		543	}
		544
		545	LIBC_INLINE constexpr bool isprint(wchar_t wch) {
		546	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		547	return ascii::isprint(wch);
		548	#else
		549	if (static_cast<uint32_t>(wch) < 128) {
		550	return ascii::isprint(wch);
		551	}
		552	return lookup_properties(wch) & PropertyFlag::PRINT;
		553	#endif
		554	}
		555	LIBC_INLINE constexpr bool isxdigit(wchar_t wch) {
		556	// Hexadecimal digits are the same in C.UTF8 as in ASCII
		557	return ascii::isxdigit(wch);
		558	}
		559
		560	LIBC_INLINE constexpr bool iscntrl(wchar_t wch) {
		561	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		562	return ascii::iscntrl(wch);
		563	#else
		564	if (static_cast<uint32_t>(wch) < 128) {
		565	return ascii::iscntrl(wch);
		566	}
		567	return lookup_properties(wch) & PropertyFlag::CNTRL;
		568	#endif
		569	}
		570
		571	LIBC_INLINE constexpr bool ispunct(wchar_t wch) {
		572	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		573	return ascii::ispunct(wch);
		574	#else
		575	if (static_cast<uint32_t>(wch) < 128) {
		576	return ascii::ispunct(wch);
		577	}
		578	return lookup_properties(wch) & PropertyFlag::PUNCT;
		579	#endif
		580	}
		581
		582	LIBC_INLINE constexpr wchar_t tolower(wchar_t wch) {
		583	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		584	return ascii::tolower(wch);
		585	#else
		586	if (static_cast<uint32_t>(wch) < 128) {
		587	return ascii::tolower(wch);
		588	}
		589	return static_cast<wchar_t>(wctype_internal::tolower(wch));
		590	#endif
		591	}
		592
		593	LIBC_INLINE constexpr wchar_t toupper(wchar_t wch) {
		594	#if LIBC_CONF_WCTYPE_MODE != LIBC_WCTYPE_MODE_UTF8
		595	return ascii::toupper(wch);
		596	#else
		597	if (static_cast<uint32_t>(wch) < 128) {
		598	return ascii::toupper(wch);
		599	}
		600	return static_cast<wchar_t>(wctype_internal::toupper(wch));
		601	#endif
		602	}
		603
		604	LIBC_INLINE constexpr int b36_char_to_int(wchar_t wch) {
377	switch (wch) {	605	switch (wch) {
378	case L'0':	606	case L'0':
379	return 0;	607	return 0;
...	@@ -561,20 +789,6 @@ LIBC_INLINE static constexpr wchar_t int_to_b36_wchar(int num) {	...	@@ -561,20 +789,6 @@ LIBC_INLINE static constexpr wchar_t int_to_b36_wchar(int num) {
561	}	789	}
562	}	790	}
563		791
564	LIBC_INLINE static constexpr bool isspace(wchar_t wch) {
565	switch (wch) {
566	case L' ':
567	case L'\t':
568	case L'\n':
569	case L'\v':
570	case L'\f':
571	case L'\r':
572	return true;
573	default:
574	return false;
575	}
576	}
577
578	// An overload which provides a way to compare input with specific character	792	// An overload which provides a way to compare input with specific character
579	// values, when input can be of a regular or a wide character type.	793	// values, when input can be of a regular or a wide character type.
580	LIBC_INLINE static constexpr bool	794	LIBC_INLINE static constexpr bool

lib/libcxx/src/algorithm.cpp+2

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#include <bit>	10	#include <bit>
11		11
12	_LIBCPP_BEGIN_NAMESPACE_STD	12	_LIBCPP_BEGIN_NAMESPACE_STD
		13	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
13		14
14	template <class Comp, class RandomAccessIterator>	15	template <class Comp, class RandomAccessIterator>
15	void __sort(RandomAccessIterator first, RandomAccessIterator last, Comp comp) {	16	void __sort(RandomAccessIterator first, RandomAccessIterator last, Comp comp) {
...	@@ -47,4 +48,5 @@ template void __sort<__less<double>&, double>(double, double*, __less<double>&	...	@@ -47,4 +48,5 @@ template void __sort<__less<double>&, double>(double, double*, __less<double>&
47	template void __sort<__less<long double>&, long double>(long double, long double*, __less<long double>&);	48	template void __sort<__less<long double>&, long double>(long double, long double*, __less<long double>&);
48	// clang-format on	49	// clang-format on
49		50
		51	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
50	_LIBCPP_END_NAMESPACE_STD	52	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/any.cpp+4-2

...	@@ -19,6 +19,7 @@ const char* bad_any_cast::what() const noexcept { return "bad any cast"; }	...	@@ -19,6 +19,7 @@ const char* bad_any_cast::what() const noexcept { return "bad any cast"; }
19	// Preserve std::experimental::any_bad_cast for ABI compatibility	19	// Preserve std::experimental::any_bad_cast for ABI compatibility
20	// Even though it no longer exists in a header file	20	// Even though it no longer exists in a header file
21	_LIBCPP_BEGIN_NAMESPACE_LFTS	21	_LIBCPP_BEGIN_NAMESPACE_LFTS
		22	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
22		23
23	class _LIBCPP_EXPORTED_FROM_ABI bad_any_cast : public bad_cast {	24	class _LIBCPP_EXPORTED_FROM_ABI bad_any_cast : public bad_cast {
24	public:	25	public:
...	@@ -27,6 +28,7 @@ public:	...	@@ -27,6 +28,7 @@ public:
27		28
28	const char* bad_any_cast::what() const noexcept { return "bad any cast"; }	29	const char* bad_any_cast::what() const noexcept { return "bad any cast"; }
29		30
30	#endif	31	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
31
32	_LIBCPP_END_NAMESPACE_LFTS	32	_LIBCPP_END_NAMESPACE_LFTS
		33
		34	#endif

lib/libcxx/src/atomic.cpp+163-58

...	@@ -17,7 +17,19 @@	...	@@ -17,7 +17,19 @@
17	#include <thread>	17	#include <thread>
18	#include <type_traits>	18	#include <type_traits>
19		19
20	#include "include/apple_availability.h"	20	// Determine whether to use the public os_sync API on Apple platforms based on the deployment target.
		21	// Otherwise we fall back to the private __ulock API.
		22	#if defined(__APPLE__)
		23	# if (defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \
		24	__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 140400) \|\| \
		25	(defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__) && \
		26	__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 170400) \|\| \
		27	(defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ >= 170400) \|\| \
		28	(defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__) && \
		29	__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ >= 100400)
		30	# define _LIBCPP_USE_OS_SYNC
		31	# endif
		32	#endif
21		33
22	#ifdef __linux__	34	#ifdef __linux__
23		35
...	@@ -51,6 +63,16 @@	...	@@ -51,6 +63,16 @@
51	# include <memory>	63	# include <memory>
52	# include <windows.h>	64	# include <windows.h>
53		65
		66	#elif defined(__APPLE__)
		67
		68	# if defined(_LIBCPP_USE_OS_SYNC)
		69	# include <os/os_sync_wait_on_address.h>
		70	# endif
		71
		72	#elif defined(__Fuchsia__)
		73
		74	# include <zircon/syscalls.h>
		75
54	#else // <- Add other operating systems here	76	#else // <- Add other operating systems here
55		77
56	// Baseline needs no new headers	78	// Baseline needs no new headers
...	@@ -63,6 +85,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -63,6 +85,7 @@ _LIBCPP_PUSH_MACROS
63	#include <__undef_macros>	85	#include <__undef_macros>
64		86
65	_LIBCPP_BEGIN_NAMESPACE_STD	87	_LIBCPP_BEGIN_NAMESPACE_STD
		88	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
66		89
67	struct NoTimeout {};	90	struct NoTimeout {};
68		91
...	@@ -90,20 +113,64 @@ static void __platform_wake_by_address(void const* __ptr, bool __notify_one) {	...	@@ -90,20 +113,64 @@ static void __platform_wake_by_address(void const* __ptr, bool __notify_one) {
90	_LIBCPP_FUTEX(__ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0);	113	_LIBCPP_FUTEX(__ptr, FUTEX_WAKE_PRIVATE, __notify_one ? 1 : INT_MAX, 0, 0, 0);
91	}	114	}
92		115
93	#elif defined(__APPLE__) && defined(_LIBCPP_USE_ULOCK)	116	#elif defined(__APPLE__)
		117
		118	# if defined(_LIBCPP_USE_OS_SYNC)
		119
		120	template <std::size_t _Size, class MaybeTimeout>
		121	static void __platform_wait_on_address(void const* __ptr, void const* __val, MaybeTimeout maybe_timeout_ns) {
		122	std::uint64_t __value = [__val]() -> std::uint64_t {
		123	if constexpr (_Size == 4) {
		124	std::uint32_t __result;
		125	std::memcpy(&__result, __val, _Size);
		126	return __result;
		127	} else if constexpr (_Size == 8) {
		128	std::uint64_t __result;
		129	std::memcpy(&__result, __val, _Size);
		130	return __result;
		131	} else {
		132	static_assert(false, "Can only wait on 8 bytes or 4 bytes value");
		133	}
		134	}();
		135
		136	if constexpr (is_same_v<MaybeTimeout, NoTimeout>) {
		137	os_sync_wait_on_address(const_cast<void*>(__ptr), __value, _Size, OS_SYNC_WAIT_ON_ADDRESS_NONE);
		138	} else {
		139	// os_sync_wait_on_address_with_timeout returns EINVAL on a 0-ns timeout, so clamp to 1ns
		140	// when an already-expired deadline produced a zero-duration timeout.
		141	uint64_t __timeout_ns = std::max<uint64_t>(maybe_timeout_ns, 1);
		142	os_sync_wait_on_address_with_timeout(
		143	const_cast<void*>(__ptr),
		144	__value,
		145	_Size,
		146	OS_SYNC_WAIT_ON_ADDRESS_NONE,
		147	OS_CLOCK_MACH_ABSOLUTE_TIME,
		148	__timeout_ns);
		149	}
		150	}
		151
		152	template <std::size_t _Size>
		153	static void __platform_wake_by_address(void const* __ptr, bool __notify_one) {
		154	static_assert(_Size == 8 \|\| _Size == 4, "Can only wake up on 8 bytes or 4 bytes value");
		155	if (__notify_one)
		156	os_sync_wake_by_address_any(const_cast<void*>(__ptr), _Size, OS_SYNC_WAKE_BY_ADDRESS_NONE);
		157	else
		158	os_sync_wake_by_address_all(const_cast<void*>(__ptr), _Size, OS_SYNC_WAKE_BY_ADDRESS_NONE);
		159	}
		160
		161	# else // !_LIBCPP_USE_OS_SYNC -- fall back to the private __ulock API
94		162
95	extern "C" int __ulock_wait(	163	extern "C" int __ulock_wait(
96	uint32_t operation, void* addr, uint64_t value, uint32_t timeout); /* timeout is specified in microseconds */	164	uint32_t operation, void* addr, uint64_t value, uint32_t timeout); /* timeout is specified in microseconds */
97	extern "C" int __ulock_wake(uint32_t operation, void* addr, uint64_t wake_value);	165	extern "C" int __ulock_wake(uint32_t operation, void* addr, uint64_t wake_value);
98		166
99	// https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/bsd/sys/ulock.h#L82	167	// https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/bsd/sys/ulock.h#L82
100	# define UL_COMPARE_AND_WAIT 1	168	# define UL_COMPARE_AND_WAIT 1
101	# define UL_COMPARE_AND_WAIT64 5	169	# define UL_COMPARE_AND_WAIT64 5
102	# define ULF_WAKE_ALL 0x00000100	170	# define ULF_WAKE_ALL 0x00000100
103		171
104	template <std::size_t _Size, class MaybeTimeout>	172	template <std::size_t _Size, class MaybeTimeout>
105	static void __platform_wait_on_address(void const* __ptr, void const* __val, MaybeTimeout maybe_timeout_ns) {	173	static void __platform_wait_on_address(void const* __ptr, void const* __val, MaybeTimeout maybe_timeout_ns) {
106	static_assert(_Size == 8 \|\| _Size == 4, "Can only wait on 8 bytes or 4 bytes value");
107	auto __timeout_us = [&] {	174	auto __timeout_us = [&] {
108	if constexpr (is_same_v<MaybeTimeout, NoTimeout>) {	175	if constexpr (is_same_v<MaybeTimeout, NoTimeout>) {
109	return uint32_t(0);	176	return uint32_t(0);
...	@@ -111,17 +178,23 @@ static void __platform_wait_on_address(void const* __ptr, void const* __val, May	...	@@ -111,17 +178,23 @@ static void __platform_wait_on_address(void const* __ptr, void const* __val, May
111	return std::max(static_cast<uint32_t>(maybe_timeout_ns / 1000), uint32_t(1));	178	return std::max(static_cast<uint32_t>(maybe_timeout_ns / 1000), uint32_t(1));
112	}	179	}
113	}();	180	}();
114	if constexpr (_Size == 4) {	181
115	alignas(uint32_t) char buffer[_Size];	182	std::uint64_t __value = [__val]() -> std::uint64_t {
116	std::memcpy(&buffer, const_cast<const void*>(__val), _Size);	183	if constexpr (_Size == 4) {
117	__ulock_wait(	184	std::uint32_t __result;
118	UL_COMPARE_AND_WAIT, const_cast<void>(__ptr), reinterpret_cast<uint32_t const*>(&buffer), __timeout_us);	185	std::memcpy(&__result, __val, _Size);
119	} else {	186	return __result;
120	alignas(uint64_t) char buffer[_Size];	187	} else if constexpr (_Size == 8) {
121	std::memcpy(&buffer, const_cast<const void*>(__val), _Size);	188	std::uint64_t __result;
122	__ulock_wait(	189	std::memcpy(&__result, __val, _Size);
123	UL_COMPARE_AND_WAIT64, const_cast<void>(__ptr), reinterpret_cast<uint64_t const*>(&buffer), __timeout_us);	190	return __result;
124	}	191	} else {
		192	static_assert(false, "Can only wait on 8 bytes or 4 bytes value");
		193	}
		194	}();
		195
		196	__ulock_wait(
		197	_Size == 4 ? UL_COMPARE_AND_WAIT : UL_COMPARE_AND_WAIT64, const_cast<void*>(__ptr), __value, __timeout_us);
125	}	198	}
126		199
127	template <std::size_t _Size>	200	template <std::size_t _Size>
...	@@ -134,6 +207,8 @@ static void __platform_wake_by_address(void const* __ptr, bool __notify_one) {	...	@@ -134,6 +207,8 @@ static void __platform_wake_by_address(void const* __ptr, bool __notify_one) {
134	__ulock_wake(UL_COMPARE_AND_WAIT64 \| (__notify_one ? 0 : ULF_WAKE_ALL), const_cast<void*>(__ptr), 0);	207	__ulock_wake(UL_COMPARE_AND_WAIT64 \| (__notify_one ? 0 : ULF_WAKE_ALL), const_cast<void*>(__ptr), 0);
135	}	208	}
136		209
		210	# endif // _LIBCPP_USE_OS_SYNC
		211
137	#elif defined(__FreeBSD__) && __SIZEOF_LONG__ == 8	212	#elif defined(__FreeBSD__) && __SIZEOF_LONG__ == 8
138	/*	213	/*
139	* Since __cxx_contention_t is int64_t even on 32bit FreeBSD	214	* Since __cxx_contention_t is int64_t even on 32bit FreeBSD
...	@@ -254,6 +329,37 @@ static void __platform_wake_by_address(void const* __ptr, bool __notify_one) {	...	@@ -254,6 +329,37 @@ static void __platform_wake_by_address(void const* __ptr, bool __notify_one) {
254	}	329	}
255	}	330	}
256		331
		332	#elif defined(__Fuchsia__)
		333
		334	template <std::size_t _Size>
		335	static inline zx_futex_t const* __get_zx_futex(void const* __ptr) {
		336	static_assert(_Size == sizeof(zx_futex_t), "Can only wait/wake on zx_futex_t-compatible value");
		337
		338	// Implicitly link against the vDSO system call ABI without requiring the
		339	// final link to specify -lzircon explicitly when statically linking libc++.
		340	# pragma comment(lib, "zircon")
		341
		342	return reinterpret_cast<zx_futex_t const*>(__ptr);
		343	}
		344
		345	template <std::size_t _Size, class MaybeTimeout>
		346	static void __platform_wait_on_address(void const* __ptr, void const* __val, MaybeTimeout maybe_timeout_ns) {
		347	zx_futex_t val;
		348	std::memcpy(&val, __val, _Size);
		349	zx_instant_mono_t deadline;
		350	if constexpr (is_same_v<MaybeTimeout, NoTimeout>) {
		351	deadline = ZX_TIME_INFINITE;
		352	} else {
		353	deadline = _zx_deadline_after(maybe_timeout_ns);
		354	}
		355	_zx_futex_wait(__get_zx_futex<_Size>(__ptr), val, ZX_HANDLE_INVALID, deadline);
		356	}
		357
		358	template <std::size_t _Size>
		359	static void __platform_wake_by_address(void const* __ptr, bool __notify_one) {
		360	_zx_futex_wake(__get_zx_futex<_Size>(__ptr), __notify_one ? 1 : UINT32_MAX);
		361	}
		362
257	#else // <- Add other operating systems here	363	#else // <- Add other operating systems here
258		364
259	// Baseline is just a timed backoff	365	// Baseline is just a timed backoff
...	@@ -308,45 +414,41 @@ static constexpr size_t __contention_table_size = (1 << 8); /* < there's no magi	...	@@ -308,45 +414,41 @@ static constexpr size_t __contention_table_size = (1 << 8); /* < there's no magi
308		414
309	static constexpr hash<void const*> __contention_hasher;	415	static constexpr hash<void const*> __contention_hasher;
310		416
311	// Waiter count table for all atomics with the correct size that use itself as the wait/notify address.	417	// Unified contention table shared by both the native path (atomics whose size matches the platform
312		418	// wait size and are waited on directly) and the global path (atomics with the wrong size, which use
313	struct alignas(	419	// the global table's atomic as the wait/notify address). The native path only reads/writes the native
314	std::hardware_constructive_interference_size) /* aim to avoid false sharing */ __contention_state_native {	420	// waiter count, and the global path uses the global waiter count and the platform state.
315	__cxx_atomic_contention_t __waiter_count;	421	//
316	constexpr __contention_state_native() : __waiter_count(0) {}	422	// We use a single table for both the native and non-native states to minimize the size impact, since
317	};	423	// we would have plenty of unused padding otherwise. This technically means that if both a native and
318		424	// a non-native atomic fall into the same bucket and are reading/writing waiter counts on the same
319	static __contention_state_native __contention_table_native[__contention_table_size];	425	// cache line, we would end up in a "false-sharing" situation. However, in practice, it would require
320		426	// both native and non-native atomics to be used concurrently, and to fall in the same bucket, which
321	static __cxx_atomic_contention_t* __get_native_waiter_count(void const* p) {	427	// is expected to be unlikely.
322	return &__contention_table_native[__contention_hasher(p) & (__contention_table_size - 1)].__waiter_count;	428	struct alignas(std::hardware_destructive_interference_size) /* aim to avoid false sharing */ __contention_state {
323	}	429	__cxx_atomic_contention_t __waiter_count_native;
324		430	__cxx_atomic_contention_t __waiter_count_global;
325	// Global contention table for all atomics with the wrong size that use the global table's atomic as wait/notify
326	// address.
327
328	struct alignas(
329	std::hardware_constructive_interference_size) /* aim to avoid false sharing */ __contention_state_global {
330	__cxx_atomic_contention_t __waiter_count;
331	__cxx_atomic_contention_t __platform_state;	431	__cxx_atomic_contention_t __platform_state;
332	constexpr __contention_state_global() : __waiter_count(0), __platform_state(0) {}	432	constexpr __contention_state() : __waiter_count_native(0), __waiter_count_global(0), __platform_state(0) {}
333	};	433	};
334		434
335	static __contention_state_global __contention_table_global[__contention_table_size];	435	static constinit __contention_state __contention_table[__contention_table_size];
336		436
337	static __contention_state_global* __get_global_contention_state(void const* p) {	437	static __contention_state* __get_contention_state(void const* p) {
338	return &__contention_table_global[__contention_hasher(p) & (__contention_table_size - 1)];	438	return &__contention_table[__contention_hasher(p) & (__contention_table_size - 1)];
339	}	439	}
340		440
341	/* When the incoming atomic is the wrong size for the platform wait size, need to	441	/* When the incoming atomic is the wrong size for the platform wait size, need to
342	launder the value sequence through an atomic from our table. */	442	launder the value sequence through an atomic from our table. */
343		443
344	static void __atomic_notify_global_table(void const* __location) {	444	static void __atomic_notify_global_table(void const* __location) {
345	auto const __entry = __get_global_contention_state(__location);	445	auto const __entry = __get_contention_state(__location);
346	// The value sequence laundering happens on the next line below.	446	// The value sequence laundering happens on the next line below.
347	__cxx_atomic_fetch_add(&__entry->__platform_state, __cxx_contention_t(1), memory_order_seq_cst);	447	__cxx_atomic_fetch_add(&__entry->__platform_state, __cxx_contention_t(1), memory_order_seq_cst);
348	__contention_notify<sizeof(__cxx_atomic_contention_t)>(	448	__contention_notify<sizeof(__cxx_atomic_contention_t)>(
349	&__entry->__waiter_count, &__entry->__platform_state, false /* when laundering, we can't handle notify_one */);	449	&__entry->__waiter_count_global,
		450	&__entry->__platform_state,
		451	false /* when laundering, we can't handle notify_one */);
350	}	452	}
351		453
352	// =============================	454	// =============================
...	@@ -355,22 +457,22 @@ static void __atomic_notify_global_table(void const* __location) {	...	@@ -355,22 +457,22 @@ static void __atomic_notify_global_table(void const* __location) {
355		457
356	// global	458	// global
357	_LIBCPP_EXPORTED_FROM_ABI __cxx_contention_t __atomic_monitor_global(void const* __location) noexcept {	459	_LIBCPP_EXPORTED_FROM_ABI __cxx_contention_t __atomic_monitor_global(void const* __location) noexcept {
358	auto const __entry = __get_global_contention_state(__location);	460	auto const __entry = __get_contention_state(__location);
359	return __cxx_atomic_load(&__entry->__platform_state, memory_order_acquire);	461	return __cxx_atomic_load(&__entry->__platform_state, memory_order_acquire);
360	}	462	}
361		463
362	_LIBCPP_EXPORTED_FROM_ABI void	464	_LIBCPP_EXPORTED_FROM_ABI void
363	__atomic_wait_global_table(void const* __location, __cxx_contention_t __old_value) noexcept {	465	__atomic_wait_global_table(void const* __location, __cxx_contention_t __old_value) noexcept {
364	auto const __entry = __get_global_contention_state(__location);	466	auto const __entry = __get_contention_state(__location);
365	__contention_wait<sizeof(__cxx_atomic_contention_t)>(	467	__contention_wait<sizeof(__cxx_atomic_contention_t)>(
366	&__entry->__waiter_count, &__entry->__platform_state, &__old_value, NoTimeout{});	468	&__entry->__waiter_count_global, &__entry->__platform_state, &__old_value, NoTimeout{});
367	}	469	}
368		470
369	_LIBCPP_EXPORTED_FROM_ABI void __atomic_wait_global_table_with_timeout(	471	_LIBCPP_EXPORTED_FROM_ABI void __atomic_wait_global_table_with_timeout(
370	void const* __location, __cxx_contention_t __old_value, uint64_t __timeout_ns) _NOEXCEPT {	472	void const* __location, __cxx_contention_t __old_value, uint64_t __timeout_ns) _NOEXCEPT {
371	auto const __entry = __get_global_contention_state(__location);	473	auto const __entry = __get_contention_state(__location);
372	__contention_wait<sizeof(__cxx_atomic_contention_t)>(	474	__contention_wait<sizeof(__cxx_atomic_contention_t)>(
373	&__entry->__waiter_count, &__entry->__platform_state, &__old_value, __timeout_ns);	475	&__entry->__waiter_count_global, &__entry->__platform_state, &__old_value, __timeout_ns);
374	}	476	}
375		477
376	_LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_one_global_table(void const* __location) noexcept {	478	_LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_one_global_table(void const* __location) noexcept {
...	@@ -385,23 +487,25 @@ _LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_all_global_table(void const* __lo	...	@@ -385,23 +487,25 @@ _LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_all_global_table(void const* __lo
385		487
386	template <std::size_t _Size>	488	template <std::size_t _Size>
387	_LIBCPP_EXPORTED_FROM_ABI void __atomic_wait_native(void const* __address, void const* __old_value) noexcept {	489	_LIBCPP_EXPORTED_FROM_ABI void __atomic_wait_native(void const* __address, void const* __old_value) noexcept {
388	__contention_wait<_Size>(__get_native_waiter_count(__address), __address, __old_value, NoTimeout{});	490	__contention_wait<_Size>(
		491	&__get_contention_state(__address)->__waiter_count_native, __address, __old_value, NoTimeout{});
389	}	492	}
390		493
391	template <std::size_t _Size>	494	template <std::size_t _Size>
392	_LIBCPP_EXPORTED_FROM_ABI void	495	_LIBCPP_EXPORTED_FROM_ABI void
393	__atomic_wait_native_with_timeout(void const* __address, void const* __old_value, uint64_t __timeout_ns) noexcept {	496	__atomic_wait_native_with_timeout(void const* __address, void const* __old_value, uint64_t __timeout_ns) noexcept {
394	__contention_wait<_Size>(__get_native_waiter_count(__address), __address, __old_value, __timeout_ns);	497	__contention_wait<_Size>(
		498	&__get_contention_state(__address)->__waiter_count_native, __address, __old_value, __timeout_ns);
395	}	499	}
396		500
397	template <std::size_t _Size>	501	template <std::size_t _Size>
398	_LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_one_native(void const* __location) noexcept {	502	_LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_one_native(void const* __location) noexcept {
399	__contention_notify<_Size>(__get_native_waiter_count(__location), __location, true);	503	__contention_notify<_Size>(&__get_contention_state(__location)->__waiter_count_native, __location, true);
400	}	504	}
401		505
402	template <std::size_t _Size>	506	template <std::size_t _Size>
403	_LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_all_native(void const* __location) noexcept {	507	_LIBCPP_EXPORTED_FROM_ABI void __atomic_notify_all_native(void const* __location) noexcept {
404	__contention_notify<_Size>(__get_native_waiter_count(__location), __location, false);	508	__contention_notify<_Size>(&__get_contention_state(__location)->__waiter_count_native, __location, false);
405	}	509	}
406		510
407	// ==================================================	511	// ==================================================
...	@@ -452,34 +556,34 @@ _LIBCPP_EXPORTED_FROM_ABI void __cxx_atomic_notify_all(void const volatile* __lo	...	@@ -452,34 +556,34 @@ _LIBCPP_EXPORTED_FROM_ABI void __cxx_atomic_notify_all(void const volatile* __lo
452	}	556	}
453		557
454	_LIBCPP_EXPORTED_FROM_ABI __cxx_contention_t __libcpp_atomic_monitor(void const volatile* __location) noexcept {	558	_LIBCPP_EXPORTED_FROM_ABI __cxx_contention_t __libcpp_atomic_monitor(void const volatile* __location) noexcept {
455	auto const __entry = __get_global_contention_state(const_cast<void const*>(__location));	559	auto const __entry = __get_contention_state(const_cast<void const*>(__location));
456	return __cxx_atomic_load(&__entry->__platform_state, memory_order_acquire);	560	return __cxx_atomic_load(&__entry->__platform_state, memory_order_acquire);
457	}	561	}
458		562
459	_LIBCPP_EXPORTED_FROM_ABI void	563	_LIBCPP_EXPORTED_FROM_ABI void
460	__libcpp_atomic_wait(void const volatile* __location, __cxx_contention_t __old_value) noexcept {	564	__libcpp_atomic_wait(void const volatile* __location, __cxx_contention_t __old_value) noexcept {
461	auto const __entry = __get_global_contention_state(const_cast<void const*>(__location));	565	auto const __entry = __get_contention_state(const_cast<void const*>(__location));
462	__contention_wait<sizeof(__cxx_atomic_contention_t)>(	566	__contention_wait<sizeof(__cxx_atomic_contention_t)>(
463	&__entry->__waiter_count, &__entry->__platform_state, &__old_value, NoTimeout{});	567	&__entry->__waiter_count_global, &__entry->__platform_state, &__old_value, NoTimeout{});
464	}	568	}
465		569
466	_LIBCPP_EXPORTED_FROM_ABI void __cxx_atomic_notify_one(__cxx_atomic_contention_t const volatile* __location) noexcept {	570	_LIBCPP_EXPORTED_FROM_ABI void __cxx_atomic_notify_one(__cxx_atomic_contention_t const volatile* __location) noexcept {
467	auto __location_cast = const_cast<const void>(static_cast<const volatile void>(__location));	571	auto __location_cast = const_cast<const void>(static_cast<const volatile void>(__location));
468	__contention_notify<sizeof(__cxx_atomic_contention_t)>(	572	__contention_notify<sizeof(__cxx_atomic_contention_t)>(
469	__get_native_waiter_count(__location_cast), __location_cast, true);	573	&__get_contention_state(__location_cast)->__waiter_count_native, __location_cast, true);
470	}	574	}
471		575
472	_LIBCPP_EXPORTED_FROM_ABI void __cxx_atomic_notify_all(__cxx_atomic_contention_t const volatile* __location) noexcept {	576	_LIBCPP_EXPORTED_FROM_ABI void __cxx_atomic_notify_all(__cxx_atomic_contention_t const volatile* __location) noexcept {
473	auto __location_cast = const_cast<const void>(static_cast<const volatile void>(__location));	577	auto __location_cast = const_cast<const void>(static_cast<const volatile void>(__location));
474	__contention_notify<sizeof(__cxx_atomic_contention_t)>(	578	__contention_notify<sizeof(__cxx_atomic_contention_t)>(
475	__get_native_waiter_count(__location_cast), __location_cast, false);	579	&__get_contention_state(__location_cast)->__waiter_count_native, __location_cast, false);
476	}	580	}
477		581
478	_LIBCPP_EXPORTED_FROM_ABI void	582	_LIBCPP_EXPORTED_FROM_ABI void
479	__libcpp_atomic_wait(__cxx_atomic_contention_t const volatile* __location, __cxx_contention_t __old_value) noexcept {	583	__libcpp_atomic_wait(__cxx_atomic_contention_t const volatile* __location, __cxx_contention_t __old_value) noexcept {
480	auto __location_cast = const_cast<const void>(static_cast<const volatile void>(__location));	584	auto __location_cast = const_cast<const void>(static_cast<const volatile void>(__location));
481	__contention_wait<sizeof(__cxx_atomic_contention_t)>(	585	__contention_wait<sizeof(__cxx_atomic_contention_t)>(
482	__get_native_waiter_count(__location_cast), __location_cast, &__old_value, NoTimeout{});	586	&__get_contention_state(__location_cast)->__waiter_count_native, __location_cast, &__old_value, NoTimeout{});
483	}	587	}
484		588
485	// this function is even unused in the old ABI	589	// this function is even unused in the old ABI
...	@@ -490,6 +594,7 @@ __libcpp_atomic_monitor(__cxx_atomic_contention_t const volatile* __location) no	...	@@ -490,6 +594,7 @@ __libcpp_atomic_monitor(__cxx_atomic_contention_t const volatile* __location) no
490		594
491	_LIBCPP_DIAGNOSTIC_POP	595	_LIBCPP_DIAGNOSTIC_POP
492		596
		597	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
493	_LIBCPP_END_NAMESPACE_STD	598	_LIBCPP_END_NAMESPACE_STD
494		599
495	_LIBCPP_POP_MACROS	600	_LIBCPP_POP_MACROS

lib/libcxx/src/barrier.cpp+2

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#include <thread>	10	#include <thread>
11		11
12	_LIBCPP_BEGIN_NAMESPACE_STD	12	_LIBCPP_BEGIN_NAMESPACE_STD
		13	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
13		14
14	class __barrier_algorithm_base {	15	class __barrier_algorithm_base {
15	public:	16	public:
...	@@ -69,4 +70,5 @@ __destroy_barrier_algorithm_base(_LIBCPP_NOESCAPE __barrier_algorithm_base* __ba	...	@@ -69,4 +70,5 @@ __destroy_barrier_algorithm_base(_LIBCPP_NOESCAPE __barrier_algorithm_base* __ba
69	delete __barrier;	70	delete __barrier;
70	}	71	}
71		72
		73	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
72	_LIBCPP_END_NAMESPACE_STD	74	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/call_once.cpp+2

...	@@ -17,6 +17,7 @@	...	@@ -17,6 +17,7 @@
17	#include "include/atomic_support.h"	17	#include "include/atomic_support.h"
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
		20	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
20		21
21	// If dispatch_once_f ever handles C++ exceptions, and if one can get to it	22	// If dispatch_once_f ever handles C++ exceptions, and if one can get to it
22	// without illegal macros (unexpected macros not beginning with _UpperCase or	23	// without illegal macros (unexpected macros not beginning with _UpperCase or
...	@@ -68,4 +69,5 @@ void __call_once(volatile once_flag::_State_type& flag, void* arg, void (*func)(	...	@@ -68,4 +69,5 @@ void __call_once(volatile once_flag::_State_type& flag, void* arg, void (*func)(
68	#endif // !_LIBCPP_HAS_THREADS	69	#endif // !_LIBCPP_HAS_THREADS
69	}	70	}
70		71
		72	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
71	_LIBCPP_END_NAMESPACE_STD	73	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/charconv.cpp+3

...	@@ -13,6 +13,7 @@	...	@@ -13,6 +13,7 @@
13	#include "include/to_chars_floating_point.h"	13	#include "include/to_chars_floating_point.h"
14		14
15	_LIBCPP_BEGIN_NAMESPACE_STD	15	_LIBCPP_BEGIN_NAMESPACE_STD
		16	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
16		17
17	#if _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 15	18	#if _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 15
18		19
...	@@ -89,4 +90,6 @@ template __from_chars_result<float> __from_chars_floating_point(	...	@@ -89,4 +90,6 @@ template __from_chars_result<float> __from_chars_floating_point(
89		90
90	template __from_chars_result<double> __from_chars_floating_point(	91	template __from_chars_result<double> __from_chars_floating_point(
91	_LIBCPP_NOESCAPE const char* __first, _LIBCPP_NOESCAPE const char* __last, chars_format __fmt);	92	_LIBCPP_NOESCAPE const char* __first, _LIBCPP_NOESCAPE const char* __last, chars_format __fmt);
		93
		94	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
92	_LIBCPP_END_NAMESPACE_STD	95	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/chrono.cpp+3-2

...	@@ -20,7 +20,6 @@	...	@@ -20,7 +20,6 @@
20	# include <__support/ibm/gettod_zos.h> // gettimeofdayMonotonic	20	# include <__support/ibm/gettod_zos.h> // gettimeofdayMonotonic
21	#endif	21	#endif
22		22
23	#include "include/apple_availability.h"
24	#include <time.h> // clock_gettime and CLOCK_{MONOTONIC,REALTIME,MONOTONIC_RAW}	23	#include <time.h> // clock_gettime and CLOCK_{MONOTONIC,REALTIME,MONOTONIC_RAW}
25		24
26	#if __has_include(<unistd.h>)	25	#if __has_include(<unistd.h>)
...	@@ -31,7 +30,7 @@	...	@@ -31,7 +30,7 @@
31	# include <sys/time.h> // for gettimeofday and timeval	30	# include <sys/time.h> // for gettimeofday and timeval
32	#endif	31	#endif
33		32
34	#if defined(__LLVM_LIBC__)	33	#if _LIBCPP_LIBC_LLVM_LIBC
35	# define _LIBCPP_HAS_TIMESPEC_GET	34	# define _LIBCPP_HAS_TIMESPEC_GET
36	#endif	35	#endif
37		36
...	@@ -64,6 +63,7 @@	...	@@ -64,6 +63,7 @@
64	#endif	63	#endif
65		64
66	_LIBCPP_BEGIN_NAMESPACE_STD	65	_LIBCPP_BEGIN_NAMESPACE_STD
		66	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
67		67
68	namespace chrono {	68	namespace chrono {
69		69
...	@@ -262,4 +262,5 @@ steady_clock::time_point steady_clock::now() noexcept { return __libcpp_steady_c	...	@@ -262,4 +262,5 @@ steady_clock::time_point steady_clock::now() noexcept { return __libcpp_steady_c
262		262
263	} // namespace chrono	263	} // namespace chrono
264		264
		265	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
265	_LIBCPP_END_NAMESPACE_STD	266	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/condition_variable.cpp+2

...	@@ -23,6 +23,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -23,6 +23,7 @@ _LIBCPP_PUSH_MACROS
23	#include <__undef_macros>	23	#include <__undef_macros>
24		24
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
		26	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
26		27
27	// ~condition_variable is defined elsewhere.	28	// ~condition_variable is defined elsewhere.
28		29
...	@@ -72,6 +73,7 @@ void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk)	...	@@ -72,6 +73,7 @@ void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk)
72	__thread_local_data()->notify_all_at_thread_exit(&cond, lk.release());	73	__thread_local_data()->notify_all_at_thread_exit(&cond, lk.release());
73	}	74	}
74		75
		76	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
75	_LIBCPP_END_NAMESPACE_STD	77	_LIBCPP_END_NAMESPACE_STD
76		78
77	_LIBCPP_POP_MACROS	79	_LIBCPP_POP_MACROS

lib/libcxx/src/condition_variable_destructor.cpp+2

...	@@ -19,6 +19,7 @@	...	@@ -19,6 +19,7 @@
19	#endif	19	#endif
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
		22	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
22		23
23	#ifdef NEEDS_CONDVAR_DESTRUCTOR	24	#ifdef NEEDS_CONDVAR_DESTRUCTOR
24		25
...	@@ -37,4 +38,5 @@ public:	...	@@ -37,4 +38,5 @@ public:
37	condition_variable::~condition_variable() { __libcpp_condvar_destroy(&__cv_); }	38	condition_variable::~condition_variable() { __libcpp_condvar_destroy(&__cv_); }
38	#endif	39	#endif
39		40
		41	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
40	_LIBCPP_END_NAMESPACE_STD	42	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/error_category.cpp+2

...	@@ -17,6 +17,7 @@	...	@@ -17,6 +17,7 @@
17	#include <system_error>	17	#include <system_error>
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
		20	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
20		21
21	// class error_category	22	// class error_category
22		23
...	@@ -36,4 +37,5 @@ bool error_category::equivalent(const error_code& code, int condition) const noe	...	@@ -36,4 +37,5 @@ bool error_category::equivalent(const error_code& code, int condition) const noe
36	return *this == code.category() && code.value() == condition;	37	return *this == code.category() && code.value() == condition;
37	}	38	}
38		39
		40	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
39	_LIBCPP_END_NAMESPACE_STD	41	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/expected.cpp+4

...	@@ -9,5 +9,9 @@	...	@@ -9,5 +9,9 @@
9	#include <expected>	9	#include <expected>
10		10
11	_LIBCPP_BEGIN_NAMESPACE_STD	11	_LIBCPP_BEGIN_NAMESPACE_STD
		12	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
		13
12	const char* bad_expected_access<void>::what() const noexcept { return "bad access to std::expected"; }	14	const char* bad_expected_access<void>::what() const noexcept { return "bad access to std::expected"; }
		15
		16	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
13	_LIBCPP_END_NAMESPACE_STD	17	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/experimental/chrono_exception.cpp+2

...	@@ -9,6 +9,7 @@	...	@@ -9,6 +9,7 @@
9	#include <chrono>	9	#include <chrono>
10		10
11	_LIBCPP_BEGIN_NAMESPACE_STD	11	_LIBCPP_BEGIN_NAMESPACE_STD
		12	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
12		13
13	namespace chrono {	14	namespace chrono {
14		15
...	@@ -19,4 +20,5 @@ _LIBCPP_EXPORTED_FROM_ABI ambiguous_local_time::~ambiguous_local_time() = defaul	...	@@ -19,4 +20,5 @@ _LIBCPP_EXPORTED_FROM_ABI ambiguous_local_time::~ambiguous_local_time() = defaul
19		20
20	} // namespace chrono	21	} // namespace chrono
21		22
		23	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
22	_LIBCPP_END_NAMESPACE_STD	24	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/experimental/include/tzdb/tzdb_private.h+2

...	@@ -16,6 +16,7 @@	...	@@ -16,6 +16,7 @@
16	#include "types_private.h"	16	#include "types_private.h"
17		17
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
		19	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
19		20
20	namespace chrono {	21	namespace chrono {
21		22
...	@@ -23,6 +24,7 @@ void __init_tzdb(tzdb& __tzdb, __tz::__rules_storage_type& __rules);	...	@@ -23,6 +24,7 @@ void __init_tzdb(tzdb& __tzdb, __tz::__rules_storage_type& __rules);
23		24
24	} // namespace chrono	25	} // namespace chrono
25		26
		27	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
26	_LIBCPP_END_NAMESPACE_STD	28	_LIBCPP_END_NAMESPACE_STD
27		29
28	#endif // _LIBCPP_SRC_INCLUDE_TZDB_TZ_PRIVATE_H	30	#endif // _LIBCPP_SRC_INCLUDE_TZDB_TZ_PRIVATE_H

lib/libcxx/src/experimental/log_hardening_failure.cpp+2

...	@@ -15,6 +15,7 @@	...	@@ -15,6 +15,7 @@
15	#endif // __BIONIC__	15	#endif // __BIONIC__
16		16
17	_LIBCPP_BEGIN_NAMESPACE_STD	17	_LIBCPP_BEGIN_NAMESPACE_STD
		18	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
18		19
19	void __log_hardening_failure(const char* message) noexcept {	20	void __log_hardening_failure(const char* message) noexcept {
20	// Always log the message to `stderr` in case the platform-specific system calls fail.	21	// Always log the message to `stderr` in case the platform-specific system calls fail.
...	@@ -28,4 +29,5 @@ void __log_hardening_failure(const char* message) noexcept {	...	@@ -28,4 +29,5 @@ void __log_hardening_failure(const char* message) noexcept {
28	#endif	29	#endif
29	}	30	}
30		31
		32	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
31	_LIBCPP_END_NAMESPACE_STD	33	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/experimental/time_zone.cpp+2-6

...	@@ -55,6 +55,7 @@	...	@@ -55,6 +55,7 @@
55	#endif	55	#endif
56		56
57	_LIBCPP_BEGIN_NAMESPACE_STD	57	_LIBCPP_BEGIN_NAMESPACE_STD
		58	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
58		59
59	#ifdef PRINT	60	#ifdef PRINT
60	template <>	61	template <>
...	@@ -209,8 +210,6 @@ __format(const __tz::__continuation& __continuation, const string& __letters, se	...	@@ -209,8 +210,6 @@ __format(const __tz::__continuation& __continuation, const string& __letters, se
209	return chrono::seconds{0};	210	return chrono::seconds{0};
210	else	211	else
211	static_assert(false);	212	static_assert(false);
212
213	std::__libcpp_unreachable();
214	},	213	},
215	__continuation.__rules);	214	__continuation.__rules);
216		215
...	@@ -235,8 +234,6 @@ __format(const __tz::__continuation& __continuation, const string& __letters, se	...	@@ -235,8 +234,6 @@ __format(const __tz::__continuation& __continuation, const string& __letters, se
235	return __value(__year, __month);	234	return __value(__year, __month);
236	else	235	else
237	static_assert(false);	236	static_assert(false);
238
239	std::__libcpp_unreachable();
240	},	237	},
241	__on);	238	__on);
242	}	239	}
...	@@ -698,8 +695,6 @@ __get_sys_info(sys_seconds __time,	...	@@ -698,8 +695,6 @@ __get_sys_info(sys_seconds __time,
698	return chrono::__get_sys_info_basic(__time, __continuation_begin, __continuation, __value.__time);	695	return chrono::__get_sys_info_basic(__time, __continuation_begin, __continuation, __value.__time);
699	else	696	else
700	static_assert(false);	697	static_assert(false);
701
702	std::__libcpp_unreachable();
703	},	698	},
704	__continuation.__rules);	699	__continuation.__rules);
705	}	700	}
...	@@ -1061,4 +1056,5 @@ time_zone::__get_info(local_seconds __local_time) const {	...	@@ -1061,4 +1056,5 @@ time_zone::__get_info(local_seconds __local_time) const {
1061		1056
1062	} // namespace chrono	1057	} // namespace chrono
1063		1058
		1059	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
1064	_LIBCPP_END_NAMESPACE_STD	1060	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/experimental/tzdb.cpp+3-1

...	@@ -46,6 +46,7 @@	...	@@ -46,6 +46,7 @@
46	// TODO TZDB Implement the Windows mapping in tzdb::current_zone	46	// TODO TZDB Implement the Windows mapping in tzdb::current_zone
47		47
48	_LIBCPP_BEGIN_NAMESPACE_STD	48	_LIBCPP_BEGIN_NAMESPACE_STD
		49	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
49		50
50	namespace chrono {	51	namespace chrono {
51		52
...	@@ -53,7 +54,7 @@ _LIBCPP_DIAGNOSTIC_PUSH	...	@@ -53,7 +54,7 @@ _LIBCPP_DIAGNOSTIC_PUSH
53	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wmissing-prototypes")	54	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wmissing-prototypes")
54	// This function is weak so it can be overriden in the tests. The	55	// This function is weak so it can be overriden in the tests. The
55	// declaration is in the test header test/support/test_tzdb.h	56	// declaration is in the test header test/support/test_tzdb.h
56	_LIBCPP_WEAK string_view __libcpp_tzdb_directory() {	57	[[gnu::weak]] string_view __libcpp_tzdb_directory() {
57	#if defined(__linux__)	58	#if defined(__linux__)
58	return "/usr/share/zoneinfo/";	59	return "/usr/share/zoneinfo/";
59	#else	60	#else
...	@@ -825,4 +826,5 @@ _LIBCPP_AVAILABILITY_TZDB _LIBCPP_EXPORTED_FROM_ABI string remote_version() {	...	@@ -825,4 +826,5 @@ _LIBCPP_AVAILABILITY_TZDB _LIBCPP_EXPORTED_FROM_ABI string remote_version() {
825		826
826	} // namespace chrono	827	} // namespace chrono
827		828
		829	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
828	_LIBCPP_END_NAMESPACE_STD	830	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/experimental/tzdb_list.cpp+2

...	@@ -13,6 +13,7 @@	...	@@ -13,6 +13,7 @@
13	#include "include/tzdb/tzdb_list_private.h"	13	#include "include/tzdb/tzdb_list_private.h"
14		14
15	_LIBCPP_BEGIN_NAMESPACE_STD	15	_LIBCPP_BEGIN_NAMESPACE_STD
		16	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
16		17
17	namespace chrono {	18	namespace chrono {
18		19
...	@@ -40,4 +41,5 @@ _LIBCPP_EXPORTED_FROM_ABI tzdb_list::const_iterator tzdb_list::__erase_after(con	...	@@ -40,4 +41,5 @@ _LIBCPP_EXPORTED_FROM_ABI tzdb_list::const_iterator tzdb_list::__erase_after(con
40		41
41	} // namespace chrono	42	} // namespace chrono
42		43
		44	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
43	_LIBCPP_END_NAMESPACE_STD	45	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/filesystem/directory_entry.cpp+2

...	@@ -16,6 +16,7 @@	...	@@ -16,6 +16,7 @@
16	#include "time_utils.h"	16	#include "time_utils.h"
17		17
18	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	18	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		19	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
19		20
20	error_code directory_entry::__do_refresh() noexcept {	21	error_code directory_entry::__do_refresh() noexcept {
21	__data_.__reset();	22	__data_.__reset();
...	@@ -70,4 +71,5 @@ error_code directory_entry::__do_refresh() noexcept {	...	@@ -70,4 +71,5 @@ error_code directory_entry::__do_refresh() noexcept {
70	return failure_ec;	71	return failure_ec;
71	}	72	}
72		73
		74	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
73	_LIBCPP_END_NAMESPACE_FILESYSTEM	75	_LIBCPP_END_NAMESPACE_FILESYSTEM

lib/libcxx/src/filesystem/directory_iterator.cpp+2

...	@@ -26,6 +26,7 @@	...	@@ -26,6 +26,7 @@
26	#endif	26	#endif
27		27
28	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	28	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		29	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
29		30
30	using detail::ErrorHandler;	31	using detail::ErrorHandler;
31		32
...	@@ -320,4 +321,5 @@ bool recursive_directory_iterator::__try_recursion(error_code* ec) {	...	@@ -320,4 +321,5 @@ bool recursive_directory_iterator::__try_recursion(error_code* ec) {
320	return false;	321	return false;
321	}	322	}
322		323
		324	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
323	_LIBCPP_END_NAMESPACE_FILESYSTEM	325	_LIBCPP_END_NAMESPACE_FILESYSTEM

lib/libcxx/src/filesystem/filesystem_clock.cpp+3-1

...	@@ -32,7 +32,7 @@	...	@@ -32,7 +32,7 @@
32	# include <sys/time.h> // for gettimeofday and timeval	32	# include <sys/time.h> // for gettimeofday and timeval
33	#endif	33	#endif
34		34
35	#if defined(__LLVM_LIBC__)	35	#if _LIBCPP_LIBC_LLVM_LIBC
36	# define _LIBCPP_HAS_TIMESPEC_GET	36	# define _LIBCPP_HAS_TIMESPEC_GET
37	#endif	37	#endif
38		38
...	@@ -42,6 +42,7 @@	...	@@ -42,6 +42,7 @@
42	#endif	42	#endif
43		43
44	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	44	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		45	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
45		46
46	_LIBCPP_DIAGNOSTIC_PUSH	47	_LIBCPP_DIAGNOSTIC_PUSH
47	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated")	48	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wdeprecated")
...	@@ -76,4 +77,5 @@ _FilesystemClock::time_point _FilesystemClock::now() noexcept {	...	@@ -76,4 +77,5 @@ _FilesystemClock::time_point _FilesystemClock::now() noexcept {
76	#endif	77	#endif
77	}	78	}
78		79
		80	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
79	_LIBCPP_END_NAMESPACE_FILESYSTEM	81	_LIBCPP_END_NAMESPACE_FILESYSTEM

lib/libcxx/src/filesystem/filesystem_error.cpp+2

...	@@ -15,6 +15,7 @@	...	@@ -15,6 +15,7 @@
15	#include "format_string.h"	15	#include "format_string.h"
16		16
17	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	17	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		18	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
18		19
19	filesystem_error::~filesystem_error() {}	20	filesystem_error::~filesystem_error() {}
20		21
...	@@ -37,4 +38,5 @@ void filesystem_error::__create_what(int __num_paths) {	...	@@ -37,4 +38,5 @@ void filesystem_error::__create_what(int __num_paths) {
37	}();	38	}();
38	}	39	}
39		40
		41	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
40	_LIBCPP_END_NAMESPACE_FILESYSTEM	42	_LIBCPP_END_NAMESPACE_FILESYSTEM

lib/libcxx/src/filesystem/operations.cpp+5

...	@@ -69,6 +69,7 @@	...	@@ -69,6 +69,7 @@
69	#endif	69	#endif
70		70
71	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM	71	_LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
		72	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
72		73
73	using detail::capture_errno;	74	using detail::capture_errno;
74	using detail::ErrorHandler;	75	using detail::ErrorHandler;
...	@@ -904,6 +905,9 @@ uintmax_t remove_all_impl(int parent_directory, const path& p, error_code& ec) {	...	@@ -904,6 +905,9 @@ uintmax_t remove_all_impl(int parent_directory, const path& p, error_code& ec) {
904	break; // we're done iterating through the directory	905	break; // we're done iterating through the directory
905	} else {	906	} else {
906	count += remove_all_impl(fd, str, ec);	907	count += remove_all_impl(fd, str, ec);
		908	// If there's an error removing the child, return immediately to preserve the error code.
		909	if (ec)
		910	return count;
907	}	911	}
908	}	912	}
909		913
...	@@ -1077,4 +1081,5 @@ path __weakly_canonical(const path& p, error_code* ec) {	...	@@ -1077,4 +1081,5 @@ path __weakly_canonical(const path& p, error_code* ec) {
1077	return result.lexically_normal();	1081	return result.lexically_normal();
1078	}	1082	}
1079		1083
		1084	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
1080	_LIBCPP_END_NAMESPACE_FILESYSTEM	1085	_LIBCPP_END_NAMESPACE_FILESYSTEM

lib/libcxx/src/filesystem/path.cpp+12-11

 @@ -14,6 +14,7 @@
 #include "path_parser.h"
 _LIBCPP_BEGIN_NAMESPACE_FILESYSTEM
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 using detail::ErrorHandler;
 using parser::createView;
 @@ -139,21 +140,20 @@ string_view_t path::__extension() const { return parser::separate_filename(__fil
 ////////////////////////////////////////////////////////////////////////////
 // path.gen
-enum PathPartKind : unsigned char { PK_None, PK_RootSep, PK_Filename, PK_Dot, PK_DotDot, PK_TrailingSep };
+enum PathPartKind : unsigned char { PK_None, PK_RootName, PK_RootSep, PK_Filename, PK_Dot, PK_DotDot, PK_TrailingSep };
-static PathPartKind ClassifyPathPart(string_view_t Part) {
+static PathPartKind ClassifyPathPart(const PathParser& PP) {
+  if (PP.inRootName())
+    return PK_RootName;
+  if (PP.inRootDir())
+    return PK_RootSep;
+  string_view_t Part = *PP;
   if (Part.empty())
     return PK_TrailingSep;
   if (Part == PATHSTR("."))
     return PK_Dot;
   if (Part == PATHSTR(".."))
     return PK_DotDot;
-  if (Part == PATHSTR("/"))
-    return PK_RootSep;
-#if defined(_LIBCPP_WIN32API)
-  if (Part == PATHSTR("\\"))
-    return PK_RootSep;
-#endif
   return PK_Filename;
 }
 @@ -183,13 +183,13 @@ path path::lexically_normal() const {
   // Build a stack containing the remaining elements of the path, popping off
   // elements which occur before a '..' entry.
   for (auto PP = PathParser::CreateBegin(__pn_); PP; ++PP) {
-    auto Part         = *PP;
+    PathPartKind Kind = ClassifyPathPart(PP);
-    PathPartKind Kind = ClassifyPathPart(Part);
     switch (Kind) {
     case PK_Filename:
+    case PK_RootName:
     case PK_RootSep: {
       // Add all non-dot and non-dot-dot elements to the stack of elements.
-      AddPart(Kind, Part);
+      AddPart(Kind, *PP);
       MaybeNeedTrailingSep = false;
       break;
     }
 @@ -444,4 +444,5 @@ size_t __char_to_wide(const string& str, wchar_t* out, size_t outlen) {
 }
 #endif
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_FILESYSTEM

lib/libcxx/src/fstream.cpp+2

...	@@ -18,6 +18,7 @@	...	@@ -18,6 +18,7 @@
18	#endif	18	#endif
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
		21	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
21		22
22	#if defined(_LIBCPP_WIN32API)	23	#if defined(_LIBCPP_WIN32API)
23		24
...	@@ -34,4 +35,5 @@ _LIBCPP_EXPORTED_FROM_ABI void* __filebuf_windows_native_handle(FILE* __file) no	...	@@ -34,4 +35,5 @@ _LIBCPP_EXPORTED_FROM_ABI void* __filebuf_windows_native_handle(FILE* __file) no
34		35
35	#endif	36	#endif
36		37
		38	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
37	_LIBCPP_END_NAMESPACE_STD	39	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/functional.cpp+2

...	@@ -9,6 +9,7 @@	...	@@ -9,6 +9,7 @@
9	#include <functional>	9	#include <functional>
10		10
11	_LIBCPP_BEGIN_NAMESPACE_STD	11	_LIBCPP_BEGIN_NAMESPACE_STD
		12	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
12		13
13	bad_function_call::~bad_function_call() noexcept {}	14	bad_function_call::~bad_function_call() noexcept {}
14		15
...	@@ -18,4 +19,5 @@ size_t __hash_memory(_LIBCPP_NOESCAPE const void* ptr, size_t size) noexcept {	...	@@ -18,4 +19,5 @@ size_t __hash_memory(_LIBCPP_NOESCAPE const void* ptr, size_t size) noexcept {
18	return __murmur2_or_cityhash<size_t>()(ptr, size);	19	return __murmur2_or_cityhash<size_t>()(ptr, size);
19	}	20	}
20		21
		22	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
21	_LIBCPP_END_NAMESPACE_STD	23	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/future.cpp+2

...	@@ -10,6 +10,7 @@	...	@@ -10,6 +10,7 @@
10	#include <string>	10	#include <string>
11		11
12	_LIBCPP_BEGIN_NAMESPACE_STD	12	_LIBCPP_BEGIN_NAMESPACE_STD
		13	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
13		14
14	class _LIBCPP_HIDDEN __future_error_category : public __do_message {	15	class _LIBCPP_HIDDEN __future_error_category : public __do_message {
15	public:	16	public:
...	@@ -194,4 +195,5 @@ shared_future<void>& shared_future<void>::operator=(const shared_future& __rhs)	...	@@ -194,4 +195,5 @@ shared_future<void>& shared_future<void>::operator=(const shared_future& __rhs)
194	return *this;	195	return *this;
195	}	196	}
196		197
		198	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
197	_LIBCPP_END_NAMESPACE_STD	199	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/hash.cpp+17-334

...	@@ -13,6 +13,7 @@	...	@@ -13,6 +13,7 @@
13	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wtautological-constant-out-of-range-compare")	13	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wtautological-constant-out-of-range-compare")
14		14
15	_LIBCPP_BEGIN_NAMESPACE_STD	15	_LIBCPP_BEGIN_NAMESPACE_STD
		16	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
16		17
17	namespace {	18	namespace {
18		19
...	@@ -30,6 +31,13 @@ const unsigned indices[] = {	...	@@ -30,6 +31,13 @@ const unsigned indices[] = {
30	71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 121, 127, 131, 137, 139,	31	71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 121, 127, 131, 137, 139,
31	143, 149, 151, 157, 163, 167, 169, 173, 179, 181, 187, 191, 193, 197, 199, 209};	32	143, 149, 151, 157, 163, 167, 169, 173, 179, 181, 187, 191, 193, 197, 199, 209};
32		33
		34	// These are the amount we increment by when checking for potential
		35	// primes in the loop in __next_prime.
		36	const uint8_t increments[] = {
		37	0, 10, 2, 4, 2, 4, 6, 2, 6, 4, 2, 4, 6, 6, 2, 6, 4, 2, 6, 4, 6, 8, 4, 2,
		38	4, 2, 4, 8, 6, 4, 6, 2, 4, 6, 2, 6, 6, 4, 2, 4, 6, 2, 6, 4, 2, 4, 2, 10,
		39	};
		40
33	} // namespace	41	} // namespace
34		42
35	// Returns: If n == 0, returns 0. Else returns the lowest prime number that	43	// Returns: If n == 0, returns 0. Else returns the lowest prime number that
...	@@ -97,340 +105,14 @@ size_t __next_prime(size_t n) {	...	@@ -97,340 +105,14 @@ size_t __next_prime(size_t n) {
97	{	105	{
98	size_t i = 211;	106	size_t i = 211;
99	while (true) {	107	while (true) {
100	std::size_t q = n / i;	108	for (auto inc : increments) {
101	if (q < i)	109	i += inc;
102	return n;	110	std::size_t q = n / i;
103	if (n == q * i)	111	if (q < i)
104	break;	112	return n;
105		113	if (n == q * i)
106	i += 10;	114	goto next;
107	q = n / i;	115	}
108	if (q < i)
109	return n;
110	if (n == q * i)
111	break;
112
113	i += 2;
114	q = n / i;
115	if (q < i)
116	return n;
117	if (n == q * i)
118	break;
119
120	i += 4;
121	q = n / i;
122	if (q < i)
123	return n;
124	if (n == q * i)
125	break;
126
127	i += 2;
128	q = n / i;
129	if (q < i)
130	return n;
131	if (n == q * i)
132	break;
133
134	i += 4;
135	q = n / i;
136	if (q < i)
137	return n;
138	if (n == q * i)
139	break;
140
141	i += 6;
142	q = n / i;
143	if (q < i)
144	return n;
145	if (n == q * i)
146	break;
147
148	i += 2;
149	q = n / i;
150	if (q < i)
151	return n;
152	if (n == q * i)
153	break;
154
155	i += 6;
156	q = n / i;
157	if (q < i)
158	return n;
159	if (n == q * i)
160	break;
161
162	i += 4;
163	q = n / i;
164	if (q < i)
165	return n;
166	if (n == q * i)
167	break;
168
169	i += 2;
170	q = n / i;
171	if (q < i)
172	return n;
173	if (n == q * i)
174	break;
175
176	i += 4;
177	q = n / i;
178	if (q < i)
179	return n;
180	if (n == q * i)
181	break;
182
183	i += 6;
184	q = n / i;
185	if (q < i)
186	return n;
187	if (n == q * i)
188	break;
189
190	i += 6;
191	q = n / i;
192	if (q < i)
193	return n;
194	if (n == q * i)
195	break;
196
197	i += 2;
198	q = n / i;
199	if (q < i)
200	return n;
201	if (n == q * i)
202	break;
203
204	i += 6;
205	q = n / i;
206	if (q < i)
207	return n;
208	if (n == q * i)
209	break;
210
211	i += 4;
212	q = n / i;
213	if (q < i)
214	return n;
215	if (n == q * i)
216	break;
217
218	i += 2;
219	q = n / i;
220	if (q < i)
221	return n;
222	if (n == q * i)
223	break;
224
225	i += 6;
226	q = n / i;
227	if (q < i)
228	return n;
229	if (n == q * i)
230	break;
231
232	i += 4;
233	q = n / i;
234	if (q < i)
235	return n;
236	if (n == q * i)
237	break;
238
239	i += 6;
240	q = n / i;
241	if (q < i)
242	return n;
243	if (n == q * i)
244	break;
245
246	i += 8;
247	q = n / i;
248	if (q < i)
249	return n;
250	if (n == q * i)
251	break;
252
253	i += 4;
254	q = n / i;
255	if (q < i)
256	return n;
257	if (n == q * i)
258	break;
259
260	i += 2;
261	q = n / i;
262	if (q < i)
263	return n;
264	if (n == q * i)
265	break;
266
267	i += 4;
268	q = n / i;
269	if (q < i)
270	return n;
271	if (n == q * i)
272	break;
273
274	i += 2;
275	q = n / i;
276	if (q < i)
277	return n;
278	if (n == q * i)
279	break;
280
281	i += 4;
282	q = n / i;
283	if (q < i)
284	return n;
285	if (n == q * i)
286	break;
287
288	i += 8;
289	q = n / i;
290	if (q < i)
291	return n;
292	if (n == q * i)
293	break;
294
295	i += 6;
296	q = n / i;
297	if (q < i)
298	return n;
299	if (n == q * i)
300	break;
301
302	i += 4;
303	q = n / i;
304	if (q < i)
305	return n;
306	if (n == q * i)
307	break;
308
309	i += 6;
310	q = n / i;
311	if (q < i)
312	return n;
313	if (n == q * i)
314	break;
315
316	i += 2;
317	q = n / i;
318	if (q < i)
319	return n;
320	if (n == q * i)
321	break;
322
323	i += 4;
324	q = n / i;
325	if (q < i)
326	return n;
327	if (n == q * i)
328	break;
329
330	i += 6;
331	q = n / i;
332	if (q < i)
333	return n;
334	if (n == q * i)
335	break;
336
337	i += 2;
338	q = n / i;
339	if (q < i)
340	return n;
341	if (n == q * i)
342	break;
343
344	i += 6;
345	q = n / i;
346	if (q < i)
347	return n;
348	if (n == q * i)
349	break;
350
351	i += 6;
352	q = n / i;
353	if (q < i)
354	return n;
355	if (n == q * i)
356	break;
357
358	i += 4;
359	q = n / i;
360	if (q < i)
361	return n;
362	if (n == q * i)
363	break;
364
365	i += 2;
366	q = n / i;
367	if (q < i)
368	return n;
369	if (n == q * i)
370	break;
371
372	i += 4;
373	q = n / i;
374	if (q < i)
375	return n;
376	if (n == q * i)
377	break;
378
379	i += 6;
380	q = n / i;
381	if (q < i)
382	return n;
383	if (n == q * i)
384	break;
385
386	i += 2;
387	q = n / i;
388	if (q < i)
389	return n;
390	if (n == q * i)
391	break;
392
393	i += 6;
394	q = n / i;
395	if (q < i)
396	return n;
397	if (n == q * i)
398	break;
399
400	i += 4;
401	q = n / i;
402	if (q < i)
403	return n;
404	if (n == q * i)
405	break;
406
407	i += 2;
408	q = n / i;
409	if (q < i)
410	return n;
411	if (n == q * i)
412	break;
413
414	i += 4;
415	q = n / i;
416	if (q < i)
417	return n;
418	if (n == q * i)
419	break;
420
421	i += 2;
422	q = n / i;
423	if (q < i)
424	return n;
425	if (n == q * i)
426	break;
427
428	i += 10;
429	q = n / i;
430	if (q < i)
431	return n;
432	if (n == q * i)
433	break;
434		116
435	// This will loop i to the next "plane" of potential primes	117	// This will loop i to the next "plane" of potential primes
436	i += 2;	118	i += 2;
...	@@ -446,4 +128,5 @@ size_t __next_prime(size_t n) {	...	@@ -446,4 +128,5 @@ size_t __next_prime(size_t n) {
446	}	128	}
447	}	129	}
448		130
		131	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
449	_LIBCPP_END_NAMESPACE_STD	132	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/include/apple_availability.h deleted-34

...	@@ -1,34 +0,0 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#ifndef _LIBCPP_SRC_INCLUDE_APPLE_AVAILABILITY_H
10	#define _LIBCPP_SRC_INCLUDE_APPLE_AVAILABILITY_H
11
12	#if defined(__APPLE__)
13
14	# if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__)
15	# if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 101500
16	# define _LIBCPP_USE_ULOCK
17	# endif
18	# elif defined(__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__)
19	# if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 130000
20	# define _LIBCPP_USE_ULOCK
21	# endif
22	# elif defined(__ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__)
23	# if __ENVIRONMENT_TV_OS_VERSION_MIN_REQUIRED__ >= 130000
24	# define _LIBCPP_USE_ULOCK
25	# endif
26	# elif defined(__ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__)
27	# if __ENVIRONMENT_WATCH_OS_VERSION_MIN_REQUIRED__ >= 60000
28	# define _LIBCPP_USE_ULOCK
29	# endif
30	# endif // __ENVIRONMENT_.*_VERSION_MIN_REQUIRED__
31
32	#endif // __APPLE__
33
34	#endif // _LIBCPP_SRC_INCLUDE_APPLE_AVAILABILITY_H

lib/libcxx/src/include/config_elast.h+4-1

...	@@ -21,7 +21,7 @@	...	@@ -21,7 +21,7 @@
21	// where strerror/strerror_r can't handle out-of-range errno values.	21	// where strerror/strerror_r can't handle out-of-range errno values.
22	#if defined(ELAST)	22	#if defined(ELAST)
23	# define _LIBCPP_ELAST ELAST	23	# define _LIBCPP_ELAST ELAST
24	#elif defined(__LLVM_LIBC__)	24	#elif _LIBCPP_LIBC_LLVM_LIBC
25	// No _LIBCPP_ELAST needed for LLVM libc	25	// No _LIBCPP_ELAST needed for LLVM libc
26	#elif _LIBCPP_LIBC_NEWLIB	26	#elif _LIBCPP_LIBC_NEWLIB
27	# define _LIBCPP_ELAST __ELASTERROR	27	# define _LIBCPP_ELAST __ELASTERROR
...	@@ -33,6 +33,9 @@	...	@@ -33,6 +33,9 @@
33	// No _LIBCPP_ELAST needed on WASI	33	// No _LIBCPP_ELAST needed on WASI
34	#elif defined(__EMSCRIPTEN__)	34	#elif defined(__EMSCRIPTEN__)
35	// No _LIBCPP_ELAST needed on Emscripten	35	// No _LIBCPP_ELAST needed on Emscripten
		36	// zig patch: haiku support
		37	#elif defined(__HAIKU__)
		38	// No _LIBCPP_ELAST needed on Haiku
36	#elif defined(__linux__) \|\| _LIBCPP_HAS_MUSL_LIBC	39	#elif defined(__linux__) \|\| _LIBCPP_HAS_MUSL_LIBC
37	# define _LIBCPP_ELAST 4095	40	# define _LIBCPP_ELAST 4095
38	#elif defined(__APPLE__)	41	#elif defined(__APPLE__)

lib/libcxx/src/include/overridable_function.h+80-50

...	@@ -11,11 +11,6 @@	...	@@ -11,11 +11,6 @@
11	#define _LIBCPP_SRC_INCLUDE_OVERRIDABLE_FUNCTION_H	11	#define _LIBCPP_SRC_INCLUDE_OVERRIDABLE_FUNCTION_H
12		12
13	#include <__config>	13	#include <__config>
14	#include <cstdint>
15
16	#if __has_feature(ptrauth_calls)
17	# include <ptrauth.h>
18	#endif
19		14
20	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)	15	#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
21	# pragma GCC system_header	16	# pragma GCC system_header
...	@@ -42,18 +37,19 @@	...	@@ -42,18 +37,19 @@
42	// -------------------	37	// -------------------
43	//	38	//
44	// Let's say we want to check whether a weak function `f` has been overridden by the user.	39	// Let's say we want to check whether a weak function `f` has been overridden by the user.
45	// The general mechanism works by placing `f`'s definition (in the libc++ built library)	40	// The general mechanism works by defining a local symbol `__impl_ref<f>::__impl_` with
46	// inside a special section, which we do using the `__section__` attribute via the	41	// the same address as `f` as a constant expression using direct PC-relative
47	// OVERRIDABLE_FUNCTION macro.	42	// materialization thus pointing at the symbol defined in the same TU. At runtime, it
		43	// compares the address of `__impl_ref<f>::__impl_` with the address of `f` loaded from
		44	// GOT: if `f` was overridden by the user in another TU, the addresses will be different.
48	//	45	//
49	// Then, when comes the time to check whether the function has been overridden, we take	46	// When pointer authentication is used, the above mechanism doesn't work (yet) so we use
50	// the address of the function and we check whether it falls inside the special function	47	// a different strategy placing `f`'s definition (in the libc++ built library) inside
51	// we created. This can be done by finding pointers to the start and the end of the section	48	// a special section, which we do using the `__section__` attribute via the
52	// (which is done differently for ELF and Mach-O), and then checking whether `f` falls	49	// OVERRIDABLE_FUNCTION macro. Then, when comes the time to check whether the function has
53	// within those bounds. If it falls within those bounds, then `f` is still inside the	50	// been overridden, we take the address of the function and we check whether it falls inside
54	// special section and so it is the version we defined in the libc++ built library, i.e.	51	// the special section we created. This can be done by finding pointers to the start and
55	// it was not overridden. Otherwise, it was overridden by the user because it falls	52	// the end of the section, and then checking whether `f` falls within those bounds.
56	// outside of the section.
57	//	53	//
58	// Important note	54	// Important note
59	// --------------	55	// --------------
...	@@ -63,50 +59,80 @@	...	@@ -63,50 +59,80 @@
63	// want to be defining special sections inside user's executables which use our headers.	59	// want to be defining special sections inside user's executables which use our headers.
64	//	60	//
65		61
66	#if defined(_LIBCPP_OBJECT_FORMAT_MACHO)	62	#if defined(_LIBCPP_OBJECT_FORMAT_MACHO) \|\| (defined(_LIBCPP_OBJECT_FORMAT_ELF) && !defined(__NVPTX__))
67		63
68	# define _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION 1	64	# define _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION 1
69	# define OVERRIDABLE_FUNCTION \
70	__attribute__((__section__("__TEXT,__lcxx_override,regular,pure_instructions"))) _LIBCPP_WEAK
71		65
72	_LIBCPP_BEGIN_NAMESPACE_STD template <typename T, T* _Func>	66	# if !__has_feature(ptrauth_calls)
73	_LIBCPP_HIDE_FROM_ABI inline bool __is_function_overridden() noexcept {
74	// Declare two dummy bytes and give them these special `__asm` values. These values are
75	// defined by the linker, which means that referring to `&__lcxx_override_start` will
76	// effectively refer to the address where the section starts (and same for the end).
77	extern char __lcxx_override_start __asm("section$start$__TEXT$__lcxx_override");
78	extern char __lcxx_override_end __asm("section$end$__TEXT$__lcxx_override");
79
80	// Now get a uintptr_t out of these locations, and out of the function pointer.
81	uintptr_t __start = reinterpret_cast<uintptr_t>(&__lcxx_override_start);
82	uintptr_t __end = reinterpret_cast<uintptr_t>(&__lcxx_override_end);
83	uintptr_t __ptr = reinterpret_cast<uintptr_t>(_Func);
84		67
85	# if __has_feature(ptrauth_calls)	68	# define OVERRIDABLE_FUNCTION [[gnu::weak]]
86	// We must pass a void* to ptrauth_strip since it only accepts a pointer type. Also, in particular,
87	// we must NOT pass a function pointer, otherwise we will strip the function pointer, and then attempt
88	// to authenticate and re-sign it when casting it to a uintptr_t again, which will fail because we just
89	// stripped the function pointer. See rdar://122927845.
90	__ptr = reinterpret_cast<uintptr_t>(ptrauth_strip(reinterpret_cast<void*>(__ptr), ptrauth_key_function_pointer));
91	# endif
92		69
93	// Finally, the function was overridden if it falls outside of the section's bounds.	70	_LIBCPP_BEGIN_NAMESPACE_STD
94	return __ptr < __start \|\| __ptr > __end;	71
		72	namespace {
		73
		74	// This is used to prevent TBAA from optimizing away the function pointer comparison.
		75	template <typename T>
		76	[[nodiscard]] inline _LIBCPP_HIDE_FROM_ABI T* __launder_function_pointer(T* __ptr) noexcept {
		77	__asm__ volatile("" : "+r"(__ptr));
		78	return __ptr;
95	}	79	}
		80
		81	} // namespace
		82
		83	template <auto* _Func>
		84	struct __impl_ref;
		85
		86	// __impl_ref<...>::__impl_ is expected to be defined elsewhere, so the compiler emits
		87	// assembly references to the mangled symbol with no definition. This template saves us
		88	// the trouble of providing manual declarations for overloads with some other local name
		89	// for each function name being overloaded (operator new, operator new[], etc.).
		90	template <typename _Ret, typename... _Args, _Ret (*_Func)(_Args...)>
		91	struct __impl_ref<_Func> {
		92	[[gnu::visibility("hidden")]] static _Ret __impl_(_Args...);
		93	};
		94
		95	// This takes a function type template argument first so that the second non-type template
		96	// argument (pointer to the public function) gets the benefit of type-aware overload
		97	// resolution, rather than having to use a static_cast.
		98	template <typename T, T* _Func>
		99	_LIBCPP_HIDE_FROM_ABI inline bool __is_function_overridden() noexcept {
		100	# if !defined(_LIBCPP_CLANG_VER) \|\| _LIBCPP_CLANG_VER >= 2101
		101	__asm__("%cc0 = %cc1" : : "X"(__impl_ref<_Func>::__impl_), "X"(_Func));
		102	# else
		103	__asm__("%c0 = %c1" : : "X"(__impl_ref<_Func>::__impl_), "X"(_Func));
		104	# endif
		105	// This just has the compiler compare the two symbols. For PIC mode, this will do a
		106	// direct PC-relative materialization for __impl_ref<...>::__impl_ and a GOT load for
		107	// the _Func symbol. The compiler thinks __impl_ref<...>::__impl_ is defined elsewhere
		108	// at link time and will be an undefined symbol. It doesn't know that the __asm__ tells
		109	// the assembler to define it as a local symbol.
		110	return __launder_function_pointer(_Func) != __impl_ref<_Func>::__impl_;
		111	}
		112
96	_LIBCPP_END_NAMESPACE_STD	113	_LIBCPP_END_NAMESPACE_STD
97		114
98	// The NVPTX linker cannot create '__start/__stop' sections.	115	# else // __has_feature(ptrauth_calls)
99	#elif defined(_LIBCPP_OBJECT_FORMAT_ELF) && !defined(__NVPTX__)
100		116
101	# define _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION 1	117	# include <cstdint>
102	# define OVERRIDABLE_FUNCTION __attribute__((__section__("__lcxx_override"))) _LIBCPP_WEAK	118	# include <ptrauth.h>
103		119
		120	# if defined(_LIBCPP_OBJECT_FORMAT_MACHO)
		121	# define OVERRIDABLE_FUNCTION [[gnu::weak, gnu::section("__TEXT,__lcxx_override,regular,pure_instructions")]]
		122	// Declare two dummy bytes and give them these special `__asm` values. These values are
		123	// defined by the linker, which means that referring to `&__lcxx_override_start` will
		124	// effectively refer to the address where the section starts (and same for the end).
		125	extern char __start___lcxx_override __asm("section$start$__TEXT$__lcxx_override");
		126	extern char __stop___lcxx_override __asm("section$end$__TEXT$__lcxx_override");
		127	# elif defined(_LIBCPP_OBJECT_FORMAT_ELF)
104	// This is very similar to what we do for Mach-O above. The ELF linker will implicitly define	128	// This is very similar to what we do for Mach-O above. The ELF linker will implicitly define
105	// variables with those names corresponding to the start and the end of the section.	129	// variables with those names corresponding to the start and the end of the section.
106	//	130	//
107	// See https://stackoverflow.com/questions/16552710/how-do-you-get-the-start-and-end-addresses-of-a-custom-elf-section	131	// See https://stackoverflow.com/questions/16552710/how-do-you-get-the-start-and-end-addresses-of-a-custom-elf-section
		132	# define OVERRIDABLE_FUNCTION [[gnu::weak, gnu::section("__lcxx_override")]]
108	extern char __start___lcxx_override;	133	extern char __start___lcxx_override;
109	extern char __stop___lcxx_override;	134	extern char __stop___lcxx_override;
		135	# endif
110		136
111	_LIBCPP_BEGIN_NAMESPACE_STD	137	_LIBCPP_BEGIN_NAMESPACE_STD
112	template <typename T, T* _Func>	138	template <typename T, T* _Func>
...	@@ -115,20 +141,24 @@ _LIBCPP_HIDE_FROM_ABI inline bool __is_function_overridden() noexcept {	...	@@ -115,20 +141,24 @@ _LIBCPP_HIDE_FROM_ABI inline bool __is_function_overridden() noexcept {
115	uintptr_t __end = reinterpret_cast<uintptr_t>(&__stop___lcxx_override);	141	uintptr_t __end = reinterpret_cast<uintptr_t>(&__stop___lcxx_override);
116	uintptr_t __ptr = reinterpret_cast<uintptr_t>(_Func);	142	uintptr_t __ptr = reinterpret_cast<uintptr_t>(_Func);
117		143
118	# if __has_feature(ptrauth_calls)	144	// We must pass a void* to ptrauth_strip since it only accepts a pointer type. Also, in particular,
119	// We must pass a void* to ptrauth_strip since it only accepts a pointer type. See full explanation above.	145	// we must NOT pass a function pointer, otherwise we will strip the function pointer, and then attempt
		146	// to authenticate and re-sign it when casting it to a uintptr_t again, which will fail because we just
		147	// stripped the function pointer. See rdar://122927845.
120	__ptr = reinterpret_cast<uintptr_t>(ptrauth_strip(reinterpret_cast<void*>(__ptr), ptrauth_key_function_pointer));	148	__ptr = reinterpret_cast<uintptr_t>(ptrauth_strip(reinterpret_cast<void*>(__ptr), ptrauth_key_function_pointer));
121	# endif
122		149
		150	// Finally, the function was overridden if it falls outside of the section's bounds.
123	return __ptr < __start \|\| __ptr > __end;	151	return __ptr < __start \|\| __ptr > __end;
124	}	152	}
125	_LIBCPP_END_NAMESPACE_STD	153	_LIBCPP_END_NAMESPACE_STD
126		154
127	#else	155	# endif // __has_feature(ptrauth_calls)
		156
		157	#else // defined(_LIBCPP_OBJECT_FORMAT_MACHO) \|\| (defined(_LIBCPP_OBJECT_FORMAT_ELF) && !defined(__NVPTX__))
128		158
129	# define _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION 0	159	# define _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION 0
130	# define OVERRIDABLE_FUNCTION _LIBCPP_WEAK	160	# define OVERRIDABLE_FUNCTION [[gnu::weak]]
131		161
132	#endif	162	#endif // defined(_LIBCPP_OBJECT_FORMAT_MACHO) \|\| (defined(_LIBCPP_OBJECT_FORMAT_ELF) && !defined(__NVPTX__))
133		163
134	#endif // _LIBCPP_SRC_INCLUDE_OVERRIDABLE_FUNCTION_H	164	#endif // _LIBCPP_SRC_INCLUDE_OVERRIDABLE_FUNCTION_H

lib/libcxx/src/include/refstring.h+1-1

...	@@ -15,7 +15,7 @@	...	@@ -15,7 +15,7 @@
15	#include <cstring>	15	#include <cstring>
16	#include <stdexcept>	16	#include <stdexcept>
17		17
18	// MacOS and iOS used to ship with libstdc++, and still support old applications	18	// macOS and iOS used to ship with libstdc++, and still support old applications
19	// linking against libstdc++. The libc++ and libstdc++ exceptions are supposed	19	// linking against libstdc++. The libc++ and libstdc++ exceptions are supposed
20	// to be ABI compatible, such that they can be thrown from one library and caught	20	// to be ABI compatible, such that they can be thrown from one library and caught
21	// in the other.	21	// in the other.

lib/libcxx/src/include/ryu/ryu.h-18

...	@@ -67,24 +67,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -67,24 +67,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD
67		67
68	// https://github.com/ulfjack/ryu/tree/59661c3/ryu	68	// https://github.com/ulfjack/ryu/tree/59661c3/ryu
69		69
70	#if !defined(_MSC_VER)
71	_LIBCPP_HIDE_FROM_ABI inline unsigned char _BitScanForward64(unsigned long* __index, unsigned long long __mask) {
72	if (__mask == 0) {
73	return false;
74	}
75	*__index = __builtin_ctzll(__mask);
76	return true;
77	}
78
79	_LIBCPP_HIDE_FROM_ABI inline unsigned char _BitScanForward(unsigned long* __index, unsigned int __mask) {
80	if (__mask == 0) {
81	return false;
82	}
83	*__index = __builtin_ctz(__mask);
84	return true;
85	}
86	#endif // !_MSC_VER
87
88	template <class _Floating>	70	template <class _Floating>
89	[[nodiscard]] to_chars_result _Floating_to_chars_ryu(	71	[[nodiscard]] to_chars_result _Floating_to_chars_ryu(
90	char* const _First, char* const _Last, const _Floating _Value, const chars_format _Fmt) noexcept {	72	char* const _First, char* const _Last, const _Floating _Value, const chars_format _Fmt) noexcept {

lib/libcxx/src/include/to_chars_floating_point.h+1-1

...	@@ -38,7 +38,7 @@ namespace __itoa {	...	@@ -38,7 +38,7 @@ namespace __itoa {
38	inline constexpr char _Charconv_digits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e',	38	inline constexpr char _Charconv_digits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e',
39	'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};	39	'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'};
40	static_assert(std::size(_Charconv_digits) == 36);	40	static_assert(std::size(_Charconv_digits) == 36);
41	} // __itoa	41	} // namespace __itoa
42		42
43	// vvvvvvvvvv DERIVED FROM corecrt_internal_fltintrn.h vvvvvvvvvv	43	// vvvvvvvvvv DERIVED FROM corecrt_internal_fltintrn.h vvvvvvvvvv
44		44

lib/libcxx/src/ios.cpp+38-39

 @@ -9,6 +9,7 @@
 #include <__config>
 #include <__locale>
 #include <algorithm>
+#include <atomic>
 #include <ios>
 #include <limits>
 #include <memory>
 @@ -22,6 +23,7 @@ _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 class _LIBCPP_HIDDEN __iostream_category : public __do_message {
 public:
 @@ -102,25 +104,13 @@ void ios_base::__call_callbacks(event ev) {
 // locale
 locale ios_base::imbue(const locale& newloc) {
-  static_assert(sizeof(locale) == sizeof(__loc_), "");
+  locale loc = newloc;
-  locale& loc_storage = *reinterpret_cast<locale*>(&__loc_);
+  std::swap(__loc_, loc);
-  locale oldloc       = loc_storage;
-  loc_storage         = newloc;
   __call_callbacks(imbue_event);
-  return oldloc;
+  return loc;
 }
-locale ios_base::getloc() const {
+locale ios_base::getloc() const { return __loc_; }
-  const locale& loc_storage = *reinterpret_cast<const locale*>(&__loc_);
-  return loc_storage;
-}
-// xalloc
-#if _LIBCPP_HAS_C_ATOMIC_IMP && _LIBCPP_HAS_THREADS
-atomic<int> ios_base::__xindex_{0};
-#else
-int ios_base::__xindex_ = 0;
-#endif
 template <typename _Tp>
 static size_t __ios_new_cap(size_t __req_size, size_t __current_cap) { // Precondition: __req_size > __current_cap
 @@ -131,7 +121,17 @@ static size_t __ios_new_cap(size_t __req_size, size_t __current_cap) { // Precon
     return mx;
 }
-int ios_base::xalloc() { return __xindex_++; }
+int ios_base::xalloc() {
+#if _LIBCPP_HAS_THREADS
+  constinit static atomic<int> xindex = 0;
+#else
+  // If we don't have atomics, fall back to single-threaded implementation.
+  // FIXME: Should "single-threaded" be a separate option from
+  // _LIBCPP_HAS_THREADS?
+  static int xindex = 0;
+#endif // _LIBCPP_HAS_THREADS
+  return xindex++;
+}
 long& ios_base::iword(int index) {
   size_t req_size = static_cast<size_t>(index) + 1;
 @@ -180,12 +180,16 @@ void ios_base::register_callback(event_callback fn, int index) {
   if (req_size > __event_cap_) {
     size_t newcap       = __ios_new_cap<event_callback>(req_size, __event_cap_);
     event_callback* fns = static_cast<event_callback*>(realloc(__fn_, newcap * sizeof(event_callback)));
-    if (fns == 0)
+    if (fns == 0) {
       setstate(badbit);
+      return;
+    }
     __fn_      = fns;
     int* indxs = static_cast<int*>(realloc(__index_, newcap * sizeof(int)));
-    if (indxs == 0)
+    if (indxs == 0) {
       setstate(badbit);
+      return;
+    }
     __index_     = indxs;
     __event_cap_ = newcap;
   }
 @@ -197,11 +201,10 @@ void ios_base::register_callback(event_callback fn, int index) {
 ios_base::~ios_base() {
   // Avoid UB when not properly initialized. See ios_base::ios_base for
   // more information.
-  if (!__loc_)
+  if (!__loc_.__locale_)
     return;
   __call_callbacks(erase_event);
-  locale& loc_storage = *reinterpret_cast<locale*>(&__loc_);
+  __loc_.~locale();
-  loc_storage.~locale();
   free(__fn_);
   free(__index_);
   free(__iarray_);
 @@ -273,12 +276,10 @@ void ios_base::copyfmt(const ios_base& rhs) {
       std::__throw_bad_alloc();
   }
   // Got everything we need.  Copy everything but __rdstate_, __rdbuf_ and __exceptions_
-  __fmtflags_           = rhs.__fmtflags_;
+  __fmtflags_  = rhs.__fmtflags_;
-  __precision_          = rhs.__precision_;
+  __precision_ = rhs.__precision_;
-  __width_              = rhs.__width_;
+  __width_     = rhs.__width_;
-  locale& lhs_loc       = *reinterpret_cast<locale*>(&__loc_);
+  __loc_       = rhs.__loc_;
-  const locale& rhs_loc = *reinterpret_cast<const locale*>(&rhs.__loc_);
-  lhs_loc               = rhs_loc;
   if (__event_cap_ < rhs.__event_size_) {
     free(__fn_);
     __fn_ = new_callbacks.release();
 @@ -308,14 +309,13 @@ void ios_base::copyfmt(const ios_base& rhs) {
 void ios_base::move(ios_base& rhs) {
   // *this is uninitialized
-  __fmtflags_     = rhs.__fmtflags_;
+  __fmtflags_   = rhs.__fmtflags_;
-  __precision_    = rhs.__precision_;
+  __precision_  = rhs.__precision_;
-  __width_        = rhs.__width_;
+  __width_      = rhs.__width_;
-  __rdstate_      = rhs.__rdstate_;
+  __rdstate_    = rhs.__rdstate_;
-  __exceptions_   = rhs.__exceptions_;
+  __exceptions_ = rhs.__exceptions_;
-  __rdbuf_        = 0;
+  __rdbuf_      = 0;
-  locale& rhs_loc = *reinterpret_cast<locale*>(&rhs.__loc_);
+  ::new (&__loc_) locale(rhs.__loc_);
-  ::new (&__loc_) locale(rhs_loc);
   __fn_              = rhs.__fn_;
   rhs.__fn_          = 0;
   __index_           = rhs.__index_;
 @@ -344,9 +344,7 @@ void ios_base::swap(ios_base& rhs) noexcept {
   std::swap(__width_, rhs.__width_);
   std::swap(__rdstate_, rhs.__rdstate_);
   std::swap(__exceptions_, rhs.__exceptions_);
-  locale& lhs_loc = *reinterpret_cast<locale*>(&__loc_);
+  std::swap(__loc_, rhs.__loc_);
-  locale& rhs_loc = *reinterpret_cast<locale*>(&rhs.__loc_);
-  std::swap(lhs_loc, rhs_loc);
   std::swap(__fn_, rhs.__fn_);
   std::swap(__index_, rhs.__index_);
   std::swap(__event_size_, rhs.__event_size_);
 @@ -382,6 +380,7 @@ bool ios_base::sync_with_stdio(bool sync) {
   return r;
 }
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS

lib/libcxx/src/ios.instantiations.cpp+21

...	@@ -15,6 +15,26 @@	...	@@ -15,6 +15,26 @@
15	#include <streambuf>	15	#include <streambuf>
16		16
17	_LIBCPP_BEGIN_NAMESPACE_STD	17	_LIBCPP_BEGIN_NAMESPACE_STD
		18	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
		19
		20	#if _LIBCPP_HAS_FILESYSTEM
		21	// This is provided for ABI compatiblity with programs compiled against old headers.
		22	// TODO: Is this actually required? If so, this should be guarded with
		23	// `_LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 24`. Otherwise this should be removed.
		24	template <class _CharT, class _Traits>
		25	bool basic_filebuf<_CharT, _Traits>::__read_mode() {
		26	if (!(__cm_ & ios_base::in)) {
		27	this->setp(nullptr, nullptr);
		28	if (__always_noconv_)
		29	this->setg((char_type)__extbuf_, (char_type)__extbuf_ + __ebs_, (char_type*)__extbuf_ + __ebs_);
		30	else
		31	this->setg(__intbuf_, __intbuf_ + __ibs_, __intbuf_ + __ibs_);
		32	__cm_ = ios_base::in;
		33	return true;
		34	}
		35	return false;
		36	}
		37	#endif
18		38
19	// Original explicit instantiations provided in the library	39	// Original explicit instantiations provided in the library
20	template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_ios<char>;	40	template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_ios<char>;
...	@@ -45,4 +65,5 @@ template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_filebuf<char>;	...	@@ -45,4 +65,5 @@ template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS basic_filebuf<char>;
45		65
46	// Add more here if needed...	66	// Add more here if needed...
47		67
		68	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
48	_LIBCPP_END_NAMESPACE_STD	69	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/iostream.cpp+2

...	@@ -15,6 +15,7 @@	...	@@ -15,6 +15,7 @@
15	#define ABI_NAMESPACE_STR _LIBCPP_TOSTRING(_LIBCPP_ABI_NAMESPACE)	15	#define ABI_NAMESPACE_STR _LIBCPP_TOSTRING(_LIBCPP_ABI_NAMESPACE)
16		16
17	_LIBCPP_BEGIN_NAMESPACE_STD	17	_LIBCPP_BEGIN_NAMESPACE_STD
		18	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
18		19
19	// This file implements the various stream objects provided inside <iostream>. We're doing some ODR violations in here,	20	// This file implements the various stream objects provided inside <iostream>. We're doing some ODR violations in here,
20	// so this quite fragile. Specifically, the size of the stream objects (i.e. cout, cin etc.) needs to stay the same.	21	// so this quite fragile. Specifically, the size of the stream objects (i.e. cout, cin etc.) needs to stay the same.
...	@@ -154,4 +155,5 @@ ios_base::Init::Init() {	...	@@ -154,4 +155,5 @@ ios_base::Init::Init() {
154		155
155	ios_base::Init::~Init() {}	156	ios_base::Init::~Init() {}
156		157
		158	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
157	_LIBCPP_END_NAMESPACE_STD	159	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/locale.cpp+22-18

...	@@ -45,6 +45,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -45,6 +45,7 @@ _LIBCPP_PUSH_MACROS
45	#include <__undef_macros>	45	#include <__undef_macros>
46		46
47	_LIBCPP_BEGIN_NAMESPACE_STD	47	_LIBCPP_BEGIN_NAMESPACE_STD
		48	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
48		49
49	struct __libcpp_unique_locale {	50	struct __libcpp_unique_locale {
50	__libcpp_unique_locale(const char* nm) : __loc_(__locale::__newlocale(_LIBCPP_ALL_MASK, nm, 0)) {}	51	__libcpp_unique_locale(const char* nm) : __loc_(__locale::__newlocale(_LIBCPP_ALL_MASK, nm, 0)) {}
...	@@ -158,11 +159,11 @@ locale::__imp::__imp(size_t refs) : facet(refs), facets_(N), name_("C") {	...	@@ -158,11 +159,11 @@ locale::__imp::__imp(size_t refs) : facet(refs), facets_(N), name_("C") {
158	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	159	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
159	install(&make<codecvt<char16_t, char, mbstate_t> >(1u));	160	install(&make<codecvt<char16_t, char, mbstate_t> >(1u));
160	install(&make<codecvt<char32_t, char, mbstate_t> >(1u));	161	install(&make<codecvt<char32_t, char, mbstate_t> >(1u));
161	_LIBCPP_SUPPRESS_DEPRECATED_POP
162	#if _LIBCPP_HAS_CHAR8_T	162	#if _LIBCPP_HAS_CHAR8_T
163	install(&make<codecvt<char16_t, char8_t, mbstate_t> >(1u));	163	install(&make<codecvt<char16_t, char8_t, mbstate_t> >(1u));
164	install(&make<codecvt<char32_t, char8_t, mbstate_t> >(1u));	164	install(&make<codecvt<char32_t, char8_t, mbstate_t> >(1u));
165	#endif	165	#endif
		166	_LIBCPP_SUPPRESS_DEPRECATED_POP
166	install(&make<numpunct<char> >(1u));	167	install(&make<numpunct<char> >(1u));
167	#if _LIBCPP_HAS_WIDE_CHARACTERS	168	#if _LIBCPP_HAS_WIDE_CHARACTERS
168	install(&make<numpunct<wchar_t> >(1u));	169	install(&make<numpunct<wchar_t> >(1u));
...	@@ -228,11 +229,11 @@ locale::__imp::__imp(const string& name, size_t refs) : facet(refs), facets_(N),	...	@@ -228,11 +229,11 @@ locale::__imp::__imp(const string& name, size_t refs) : facet(refs), facets_(N),
228	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	229	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
229	install(new codecvt_byname<char16_t, char, mbstate_t>(name_));	230	install(new codecvt_byname<char16_t, char, mbstate_t>(name_));
230	install(new codecvt_byname<char32_t, char, mbstate_t>(name_));	231	install(new codecvt_byname<char32_t, char, mbstate_t>(name_));
231	_LIBCPP_SUPPRESS_DEPRECATED_POP
232	#if _LIBCPP_HAS_CHAR8_T	232	#if _LIBCPP_HAS_CHAR8_T
233	install(new codecvt_byname<char16_t, char8_t, mbstate_t>(name_));	233	install(new codecvt_byname<char16_t, char8_t, mbstate_t>(name_));
234	install(new codecvt_byname<char32_t, char8_t, mbstate_t>(name_));	234	install(new codecvt_byname<char32_t, char8_t, mbstate_t>(name_));
235	#endif	235	#endif
		236	_LIBCPP_SUPPRESS_DEPRECATED_POP
236	install(new numpunct_byname<char>(name_));	237	install(new numpunct_byname<char>(name_));
237	#if _LIBCPP_HAS_WIDE_CHARACTERS	238	#if _LIBCPP_HAS_WIDE_CHARACTERS
238	install(new numpunct_byname<wchar_t>(name_));	239	install(new numpunct_byname<wchar_t>(name_));
...	@@ -294,11 +295,11 @@ locale::__imp::__imp(const __imp& other, const string& name, locale::category c)	...	@@ -294,11 +295,11 @@ locale::__imp::__imp(const __imp& other, const string& name, locale::category c)
294	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	295	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
295	install(new codecvt_byname<char16_t, char, mbstate_t>(name));	296	install(new codecvt_byname<char16_t, char, mbstate_t>(name));
296	install(new codecvt_byname<char32_t, char, mbstate_t>(name));	297	install(new codecvt_byname<char32_t, char, mbstate_t>(name));
297	_LIBCPP_SUPPRESS_DEPRECATED_POP
298	#if _LIBCPP_HAS_CHAR8_T	298	#if _LIBCPP_HAS_CHAR8_T
299	install(new codecvt_byname<char16_t, char8_t, mbstate_t>(name));	299	install(new codecvt_byname<char16_t, char8_t, mbstate_t>(name));
300	install(new codecvt_byname<char32_t, char8_t, mbstate_t>(name));	300	install(new codecvt_byname<char32_t, char8_t, mbstate_t>(name));
301	#endif	301	#endif
		302	_LIBCPP_SUPPRESS_DEPRECATED_POP
302	}	303	}
303	if (c & locale::monetary) {	304	if (c & locale::monetary) {
304	install(new moneypunct_byname<char, false>(name));	305	install(new moneypunct_byname<char, false>(name));
...	@@ -366,11 +367,11 @@ locale::__imp::__imp(const __imp& other, const __imp& one, locale::category c)	...	@@ -366,11 +367,11 @@ locale::__imp::__imp(const __imp& other, const __imp& one, locale::category c)
366	_LIBCPP_SUPPRESS_DEPRECATED_PUSH	367	_LIBCPP_SUPPRESS_DEPRECATED_PUSH
367	install_from<std::codecvt<char16_t, char, mbstate_t> >(one);	368	install_from<std::codecvt<char16_t, char, mbstate_t> >(one);
368	install_from<std::codecvt<char32_t, char, mbstate_t> >(one);	369	install_from<std::codecvt<char32_t, char, mbstate_t> >(one);
369	_LIBCPP_SUPPRESS_DEPRECATED_POP
370	#if _LIBCPP_HAS_CHAR8_T	370	#if _LIBCPP_HAS_CHAR8_T
371	install_from<std::codecvt<char16_t, char8_t, mbstate_t> >(one);	371	install_from<std::codecvt<char16_t, char8_t, mbstate_t> >(one);
372	install_from<std::codecvt<char32_t, char8_t, mbstate_t> >(one);	372	install_from<std::codecvt<char32_t, char8_t, mbstate_t> >(one);
373	#endif	373	#endif
		374	_LIBCPP_SUPPRESS_DEPRECATED_POP
374	#if _LIBCPP_HAS_WIDE_CHARACTERS	375	#if _LIBCPP_HAS_WIDE_CHARACTERS
375	install_from<std::codecvt<wchar_t, char, mbstate_t> >(one);	376	install_from<std::codecvt<wchar_t, char, mbstate_t> >(one);
376	#endif	377	#endif
...	@@ -2318,7 +2319,7 @@ static codecvt_base::result utf16be_to_ucs4(	...	@@ -2318,7 +2319,7 @@ static codecvt_base::result utf16be_to_ucs4(
2318	frm_nxt += 2;	2319	frm_nxt += 2;
2319	}	2320	}
2320	for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {	2321	for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {
2321	uint16_t c1 = static_cast<uint16_t>(frm_nxt[0] << 8 \| frm_nxt[1]);	2322	uint16_t c1 = static_cast<uint16_t>((frm_nxt[0] << 8) \| frm_nxt[1]);
2322	if ((c1 & 0xFC00) == 0xDC00)	2323	if ((c1 & 0xFC00) == 0xDC00)
2323	return codecvt_base::error;	2324	return codecvt_base::error;
2324	if ((c1 & 0xFC00) != 0xD800) {	2325	if ((c1 & 0xFC00) != 0xD800) {
...	@@ -2329,7 +2330,7 @@ static codecvt_base::result utf16be_to_ucs4(	...	@@ -2329,7 +2330,7 @@ static codecvt_base::result utf16be_to_ucs4(
2329	} else {	2330	} else {
2330	if (frm_end - frm_nxt < 4)	2331	if (frm_end - frm_nxt < 4)
2331	return codecvt_base::partial;	2332	return codecvt_base::partial;
2332	uint16_t c2 = static_cast<uint16_t>(frm_nxt[2] << 8 \| frm_nxt[3]);	2333	uint16_t c2 = static_cast<uint16_t>((frm_nxt[2] << 8) \| frm_nxt[3]);
2333	if ((c2 & 0xFC00) != 0xDC00)	2334	if ((c2 & 0xFC00) != 0xDC00)
2334	return codecvt_base::error;	2335	return codecvt_base::error;
2335	uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) \| ((c1 & 0x003F) << 10) \| (c2 & 0x03FF));	2336	uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) \| ((c1 & 0x003F) << 10) \| (c2 & 0x03FF));
...	@@ -2354,7 +2355,7 @@ static int utf16be_to_ucs4_length(	...	@@ -2354,7 +2355,7 @@ static int utf16be_to_ucs4_length(
2354	frm_nxt += 2;	2355	frm_nxt += 2;
2355	}	2356	}
2356	for (size_t nchar32_t = 0; frm_nxt < frm_end - 1 && nchar32_t < mx; ++nchar32_t) {	2357	for (size_t nchar32_t = 0; frm_nxt < frm_end - 1 && nchar32_t < mx; ++nchar32_t) {
2357	uint16_t c1 = static_cast<uint16_t>(frm_nxt[0] << 8 \| frm_nxt[1]);	2358	uint16_t c1 = static_cast<uint16_t>((frm_nxt[0] << 8) \| frm_nxt[1]);
2358	if ((c1 & 0xFC00) == 0xDC00)	2359	if ((c1 & 0xFC00) == 0xDC00)
2359	break;	2360	break;
2360	if ((c1 & 0xFC00) != 0xD800) {	2361	if ((c1 & 0xFC00) != 0xD800) {
...	@@ -2364,7 +2365,7 @@ static int utf16be_to_ucs4_length(	...	@@ -2364,7 +2365,7 @@ static int utf16be_to_ucs4_length(
2364	} else {	2365	} else {
2365	if (frm_end - frm_nxt < 4)	2366	if (frm_end - frm_nxt < 4)
2366	break;	2367	break;
2367	uint16_t c2 = static_cast<uint16_t>(frm_nxt[2] << 8 \| frm_nxt[3]);	2368	uint16_t c2 = static_cast<uint16_t>((frm_nxt[2] << 8) \| frm_nxt[3]);
2368	if ((c2 & 0xFC00) != 0xDC00)	2369	if ((c2 & 0xFC00) != 0xDC00)
2369	break;	2370	break;
2370	uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) \| ((c1 & 0x003F) << 10) \| (c2 & 0x03FF));	2371	uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) \| ((c1 & 0x003F) << 10) \| (c2 & 0x03FF));
...	@@ -2432,7 +2433,7 @@ static codecvt_base::result utf16le_to_ucs4(	...	@@ -2432,7 +2433,7 @@ static codecvt_base::result utf16le_to_ucs4(
2432	frm_nxt += 2;	2433	frm_nxt += 2;
2433	}	2434	}
2434	for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {	2435	for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {
2435	uint16_t c1 = static_cast<uint16_t>(frm_nxt[1] << 8 \| frm_nxt[0]);	2436	uint16_t c1 = static_cast<uint16_t>((frm_nxt[1] << 8) \| frm_nxt[0]);
2436	if ((c1 & 0xFC00) == 0xDC00)	2437	if ((c1 & 0xFC00) == 0xDC00)
2437	return codecvt_base::error;	2438	return codecvt_base::error;
2438	if ((c1 & 0xFC00) != 0xD800) {	2439	if ((c1 & 0xFC00) != 0xD800) {
...	@@ -2443,7 +2444,7 @@ static codecvt_base::result utf16le_to_ucs4(	...	@@ -2443,7 +2444,7 @@ static codecvt_base::result utf16le_to_ucs4(
2443	} else {	2444	} else {
2444	if (frm_end - frm_nxt < 4)	2445	if (frm_end - frm_nxt < 4)
2445	return codecvt_base::partial;	2446	return codecvt_base::partial;
2446	uint16_t c2 = static_cast<uint16_t>(frm_nxt[3] << 8 \| frm_nxt[2]);	2447	uint16_t c2 = static_cast<uint16_t>((frm_nxt[3] << 8) \| frm_nxt[2]);
2447	if ((c2 & 0xFC00) != 0xDC00)	2448	if ((c2 & 0xFC00) != 0xDC00)
2448	return codecvt_base::error;	2449	return codecvt_base::error;
2449	uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) \| ((c1 & 0x003F) << 10) \| (c2 & 0x03FF));	2450	uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) \| ((c1 & 0x003F) << 10) \| (c2 & 0x03FF));
...	@@ -2468,7 +2469,7 @@ static int utf16le_to_ucs4_length(	...	@@ -2468,7 +2469,7 @@ static int utf16le_to_ucs4_length(
2468	frm_nxt += 2;	2469	frm_nxt += 2;
2469	}	2470	}
2470	for (size_t nchar32_t = 0; frm_nxt < frm_end - 1 && nchar32_t < mx; ++nchar32_t) {	2471	for (size_t nchar32_t = 0; frm_nxt < frm_end - 1 && nchar32_t < mx; ++nchar32_t) {
2471	uint16_t c1 = static_cast<uint16_t>(frm_nxt[1] << 8 \| frm_nxt[0]);	2472	uint16_t c1 = static_cast<uint16_t>((frm_nxt[1] << 8) \| frm_nxt[0]);
2472	if ((c1 & 0xFC00) == 0xDC00)	2473	if ((c1 & 0xFC00) == 0xDC00)
2473	break;	2474	break;
2474	if ((c1 & 0xFC00) != 0xD800) {	2475	if ((c1 & 0xFC00) != 0xD800) {
...	@@ -2478,7 +2479,7 @@ static int utf16le_to_ucs4_length(	...	@@ -2478,7 +2479,7 @@ static int utf16le_to_ucs4_length(
2478	} else {	2479	} else {
2479	if (frm_end - frm_nxt < 4)	2480	if (frm_end - frm_nxt < 4)
2480	break;	2481	break;
2481	uint16_t c2 = static_cast<uint16_t>(frm_nxt[3] << 8 \| frm_nxt[2]);	2482	uint16_t c2 = static_cast<uint16_t>((frm_nxt[3] << 8) \| frm_nxt[2]);
2482	if ((c2 & 0xFC00) != 0xDC00)	2483	if ((c2 & 0xFC00) != 0xDC00)
2483	break;	2484	break;
2484	uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) \| ((c1 & 0x003F) << 10) \| (c2 & 0x03FF));	2485	uint32_t t = static_cast<uint32_t>(((((c1 & 0x03C0) >> 6) + 1) << 16) \| ((c1 & 0x003F) << 10) \| (c2 & 0x03FF));
...	@@ -2535,7 +2536,7 @@ static codecvt_base::result utf16be_to_ucs2(	...	@@ -2535,7 +2536,7 @@ static codecvt_base::result utf16be_to_ucs2(
2535	frm_nxt += 2;	2536	frm_nxt += 2;
2536	}	2537	}
2537	for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {	2538	for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {
2538	uint16_t c1 = static_cast<uint16_t>(frm_nxt[0] << 8 \| frm_nxt[1]);	2539	uint16_t c1 = static_cast<uint16_t>((frm_nxt[0] << 8) \| frm_nxt[1]);
2539	if ((c1 & 0xF800) == 0xD800 \|\| c1 > Maxcode)	2540	if ((c1 & 0xF800) == 0xD800 \|\| c1 > Maxcode)
2540	return codecvt_base::error;	2541	return codecvt_base::error;
2541	*to_nxt = c1;	2542	*to_nxt = c1;
...	@@ -2556,7 +2557,7 @@ static int utf16be_to_ucs2_length(	...	@@ -2556,7 +2557,7 @@ static int utf16be_to_ucs2_length(
2556	frm_nxt += 2;	2557	frm_nxt += 2;
2557	}	2558	}
2558	for (size_t nchar16_t = 0; frm_nxt < frm_end - 1 && nchar16_t < mx; ++nchar16_t) {	2559	for (size_t nchar16_t = 0; frm_nxt < frm_end - 1 && nchar16_t < mx; ++nchar16_t) {
2559	uint16_t c1 = static_cast<uint16_t>(frm_nxt[0] << 8 \| frm_nxt[1]);	2560	uint16_t c1 = static_cast<uint16_t>((frm_nxt[0] << 8) \| frm_nxt[1]);
2560	if ((c1 & 0xF800) == 0xD800 \|\| c1 > Maxcode)	2561	if ((c1 & 0xF800) == 0xD800 \|\| c1 > Maxcode)
2561	break;	2562	break;
2562	frm_nxt += 2;	2563	frm_nxt += 2;
...	@@ -2609,7 +2610,7 @@ static codecvt_base::result utf16le_to_ucs2(	...	@@ -2609,7 +2610,7 @@ static codecvt_base::result utf16le_to_ucs2(
2609	frm_nxt += 2;	2610	frm_nxt += 2;
2610	}	2611	}
2611	for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {	2612	for (; frm_nxt < frm_end - 1 && to_nxt < to_end; ++to_nxt) {
2612	uint16_t c1 = static_cast<uint16_t>(frm_nxt[1] << 8 \| frm_nxt[0]);	2613	uint16_t c1 = static_cast<uint16_t>((frm_nxt[1] << 8) \| frm_nxt[0]);
2613	if ((c1 & 0xF800) == 0xD800 \|\| c1 > Maxcode)	2614	if ((c1 & 0xF800) == 0xD800 \|\| c1 > Maxcode)
2614	return codecvt_base::error;	2615	return codecvt_base::error;
2615	*to_nxt = c1;	2616	*to_nxt = c1;
...	@@ -2631,7 +2632,7 @@ static int utf16le_to_ucs2_length(	...	@@ -2631,7 +2632,7 @@ static int utf16le_to_ucs2_length(
2631	frm_nxt += 2;	2632	frm_nxt += 2;
2632	}	2633	}
2633	for (size_t nchar16_t = 0; frm_nxt < frm_end - 1 && nchar16_t < mx; ++nchar16_t) {	2634	for (size_t nchar16_t = 0; frm_nxt < frm_end - 1 && nchar16_t < mx; ++nchar16_t) {
2634	uint16_t c1 = static_cast<uint16_t>(frm_nxt[1] << 8 \| frm_nxt[0]);	2635	uint16_t c1 = static_cast<uint16_t>((frm_nxt[1] << 8) \| frm_nxt[0]);
2635	if ((c1 & 0xF800) == 0xD800 \|\| c1 > Maxcode)	2636	if ((c1 & 0xF800) == 0xD800 \|\| c1 > Maxcode)
2636	break;	2637	break;
2637	frm_nxt += 2;	2638	frm_nxt += 2;
...	@@ -5651,10 +5652,13 @@ template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_	...	@@ -5651,10 +5652,13 @@ template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_
5651	template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS	5652	template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
5652	codecvt_byname<char32_t, char, mbstate_t>;	5653	codecvt_byname<char32_t, char, mbstate_t>;
5653	#if _LIBCPP_HAS_CHAR8_T	5654	#if _LIBCPP_HAS_CHAR8_T
5654	template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<char16_t, char8_t, mbstate_t>;	5655	template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
5655	template class _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS codecvt_byname<char32_t, char8_t, mbstate_t>;	5656	codecvt_byname<char16_t, char8_t, mbstate_t>;
		5657	template class _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_CLASS_TEMPLATE_INSTANTIATION_VIS
		5658	codecvt_byname<char32_t, char8_t, mbstate_t>;
5656	#endif	5659	#endif
5657		5660
		5661	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
5658	_LIBCPP_END_NAMESPACE_STD	5662	_LIBCPP_END_NAMESPACE_STD
5659		5663
5660	_LIBCPP_POP_MACROS	5664	_LIBCPP_POP_MACROS

lib/libcxx/src/memory.cpp+3-2

...	@@ -7,8 +7,7 @@	...	@@ -7,8 +7,7 @@
7	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
8		8
9	#include <__config>	9	#include <__config>
10	#if !defined(_LIBCPP_OBJECT_FORMAT_COFF) && !defined(_LIBCPP_OBJECT_FORMAT_XCOFF) && \	10	#if !defined(_LIBCPP_OBJECT_FORMAT_COFF) && _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 5
11	_LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 5
12	# define _LIBCPP_SHARED_PTR_DEFINE_LEGACY_INLINE_FUNCTIONS	11	# define _LIBCPP_SHARED_PTR_DEFINE_LEGACY_INLINE_FUNCTIONS
13	#endif	12	#endif
14		13
...	@@ -27,6 +26,7 @@	...	@@ -27,6 +26,7 @@
27	#include "include/atomic_support.h"	26	#include "include/atomic_support.h"
28		27
29	_LIBCPP_BEGIN_NAMESPACE_STD	28	_LIBCPP_BEGIN_NAMESPACE_STD
		29	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
30		30
31	bad_weak_ptr::~bad_weak_ptr() noexcept {}	31	bad_weak_ptr::~bad_weak_ptr() noexcept {}
32		32
...	@@ -145,4 +145,5 @@ _LIBCPP_DIAGNOSTIC_POP	...	@@ -145,4 +145,5 @@ _LIBCPP_DIAGNOSTIC_POP
145		145
146	#endif	146	#endif
147		147
		148	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
148	_LIBCPP_END_NAMESPACE_STD	149	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/memory_resource.cpp+3-34

...	@@ -6,20 +6,13 @@	...	@@ -6,20 +6,13 @@
6	//	6	//
7	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
8		8
		9	#include <atomic>
9	#include <cstddef>	10	#include <cstddef>
10	#include <memory>	11	#include <memory>
11	#include <memory_resource>	12	#include <memory_resource>
12		13
13	#if _LIBCPP_HAS_ATOMIC_HEADER
14	# include <atomic>
15	#elif _LIBCPP_HAS_THREADS
16	# include <mutex>
17	# if defined(__ELF__) && defined(_LIBCPP_LINK_PTHREAD_LIB)
18	# pragma comment(lib, "pthread")
19	# endif
20	#endif
21
22	_LIBCPP_BEGIN_NAMESPACE_STD	14	_LIBCPP_BEGIN_NAMESPACE_STD
		15	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
23		16
24	namespace pmr {	17	namespace pmr {
25		18
...	@@ -94,7 +87,6 @@ memory_resource* null_memory_resource() noexcept { return &res_init.resources.nu	...	@@ -94,7 +87,6 @@ memory_resource* null_memory_resource() noexcept { return &res_init.resources.nu
94	// default_memory_resource()	87	// default_memory_resource()
95		88
96	static memory_resource* __default_memory_resource(bool set = false, memory_resource* new_res = nullptr) noexcept {	89	static memory_resource* __default_memory_resource(bool set = false, memory_resource* new_res = nullptr) noexcept {
97	#if _LIBCPP_HAS_ATOMIC_HEADER
98	static constinit atomic<memory_resource*> __res{&res_init.resources.new_delete_res};	90	static constinit atomic<memory_resource*> __res{&res_init.resources.new_delete_res};
99	if (set) {	91	if (set) {
100	new_res = new_res ? new_res : new_delete_resource();	92	new_res = new_res ? new_res : new_delete_resource();
...	@@ -103,30 +95,6 @@ static memory_resource* __default_memory_resource(bool set = false, memory_resou	...	@@ -103,30 +95,6 @@ static memory_resource* __default_memory_resource(bool set = false, memory_resou
103	} else {	95	} else {
104	return std::atomic_load_explicit(&__res, memory_order_acquire);	96	return std::atomic_load_explicit(&__res, memory_order_acquire);
105	}	97	}
106	#elif _LIBCPP_HAS_THREADS
107	static constinit memory_resource* res = &res_init.resources.new_delete_res;
108	static mutex res_lock;
109	if (set) {
110	new_res = new_res ? new_res : new_delete_resource();
111	lock_guard<mutex> guard(res_lock);
112	memory_resource* old_res = res;
113	res = new_res;
114	return old_res;
115	} else {
116	lock_guard<mutex> guard(res_lock);
117	return res;
118	}
119	#else
120	static constinit memory_resource* res = &res_init.resources.new_delete_res;
121	if (set) {
122	new_res = new_res ? new_res : new_delete_resource();
123	memory_resource* old_res = res;
124	res = new_res;
125	return old_res;
126	} else {
127	return res;
128	}
129	#endif
130	}	98	}
131		99
132	memory_resource* get_default_resource() noexcept { return __default_memory_resource(); }	100	memory_resource* get_default_resource() noexcept { return __default_memory_resource(); }
...	@@ -497,4 +465,5 @@ void* monotonic_buffer_resource::do_allocate(size_t bytes, size_t align) {	...	@@ -497,4 +465,5 @@ void* monotonic_buffer_resource::do_allocate(size_t bytes, size_t align) {
497		465
498	} // namespace pmr	466	} // namespace pmr
499		467
		468	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
500	_LIBCPP_END_NAMESPACE_STD	469	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/mutex.cpp+2

...	@@ -23,6 +23,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -23,6 +23,7 @@ _LIBCPP_PUSH_MACROS
23	#include <__undef_macros>	23	#include <__undef_macros>
24		24
25	_LIBCPP_BEGIN_NAMESPACE_STD	25	_LIBCPP_BEGIN_NAMESPACE_STD
		26	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
26		27
27	// ~mutex is defined elsewhere	28	// ~mutex is defined elsewhere
28		29
...	@@ -141,6 +142,7 @@ void recursive_timed_mutex::unlock() noexcept {	...	@@ -141,6 +142,7 @@ void recursive_timed_mutex::unlock() noexcept {
141	}	142	}
142	}	143	}
143		144
		145	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
144	_LIBCPP_END_NAMESPACE_STD	146	_LIBCPP_END_NAMESPACE_STD
145		147
146	_LIBCPP_POP_MACROS	148	_LIBCPP_POP_MACROS

lib/libcxx/src/mutex_destructor.cpp+2

...	@@ -24,6 +24,7 @@	...	@@ -24,6 +24,7 @@
24	#endif	24	#endif
25		25
26	_LIBCPP_BEGIN_NAMESPACE_STD	26	_LIBCPP_BEGIN_NAMESPACE_STD
		27	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
27		28
28	#ifdef NEEDS_MUTEX_DESTRUCTOR	29	#ifdef NEEDS_MUTEX_DESTRUCTOR
29	class _LIBCPP_EXPORTED_FROM_ABI mutex {	30	class _LIBCPP_EXPORTED_FROM_ABI mutex {
...	@@ -39,4 +40,5 @@ public:	...	@@ -39,4 +40,5 @@ public:
39	mutex::~mutex() noexcept { __libcpp_mutex_destroy(&__m_); }	40	mutex::~mutex() noexcept { __libcpp_mutex_destroy(&__m_); }
40	#endif // !NEEDS_MUTEX_DESTRUCTOR	41	#endif // !NEEDS_MUTEX_DESTRUCTOR
41		42
		43	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
42	_LIBCPP_END_NAMESPACE_STD	44	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/new.cpp+16-16

lib/libcxx/src/optional.cpp+2

...	@@ -24,6 +24,7 @@ const char* bad_optional_access::what() const noexcept { return "bad_optional_ac	...	@@ -24,6 +24,7 @@ const char* bad_optional_access::what() const noexcept { return "bad_optional_ac
24	// Preserve std::experimental::bad_optional_access for ABI compatibility	24	// Preserve std::experimental::bad_optional_access for ABI compatibility
25	// Even though it no longer exists in a header file	25	// Even though it no longer exists in a header file
26	_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL	26	_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
		27	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
27		28
28	class _LIBCPP_EXPORTED_FROM_ABI bad_optional_access : public std::logic_error {	29	class _LIBCPP_EXPORTED_FROM_ABI bad_optional_access : public std::logic_error {
29	public:	30	public:
...	@@ -35,6 +36,7 @@ public:	...	@@ -35,6 +36,7 @@ public:
35		36
36	bad_optional_access::~bad_optional_access() noexcept = default;	37	bad_optional_access::~bad_optional_access() noexcept = default;
37		38
		39	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
38	_LIBCPP_END_NAMESPACE_EXPERIMENTAL	40	_LIBCPP_END_NAMESPACE_EXPERIMENTAL
39		41
40	#endif // _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 7	42	#endif // _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 7

lib/libcxx/src/ostream.cpp+2

...	@@ -15,6 +15,7 @@	...	@@ -15,6 +15,7 @@
15	#include "std_stream.h"	15	#include "std_stream.h"
16		16
17	_LIBCPP_BEGIN_NAMESPACE_STD	17	_LIBCPP_BEGIN_NAMESPACE_STD
		18	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
18		19
19	_LIBCPP_EXPORTED_FROM_ABI FILE* __get_ostream_file(ostream& __os) {	20	_LIBCPP_EXPORTED_FROM_ABI FILE* __get_ostream_file(ostream& __os) {
20	// dynamic_cast requires RTTI, this only affects users whose vendor builds	21	// dynamic_cast requires RTTI, this only affects users whose vendor builds
...	@@ -38,4 +39,5 @@ _LIBCPP_EXPORTED_FROM_ABI FILE* __get_ostream_file(ostream& __os) {	...	@@ -38,4 +39,5 @@ _LIBCPP_EXPORTED_FROM_ABI FILE* __get_ostream_file(ostream& __os) {
38	return nullptr;	39	return nullptr;
39	}	40	}
40		41
		42	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
41	_LIBCPP_END_NAMESPACE_STD	43	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/print.cpp+6-1

 @@ -33,6 +33,7 @@
 #endif
 _LIBCPP_BEGIN_NAMESPACE_STD
+_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 #if defined(_LIBCPP_WIN32API)
 @@ -64,9 +65,13 @@ __write_to_windows_console([[maybe_unused]] FILE* __stream, [[maybe_unused]] wst
 }
 #  endif // _LIBCPP_HAS_WIDE_CHARACTERS
-#elif defined(HAS_FILENO_AND_ISATTY) // !_LIBCPP_WIN32API
+#elif defined(HAS_FILENO_AND_ISATTY) && _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 23 // !_LIBCPP_WIN32API
+_LIBCPP_DIAGNOSTIC_PUSH
+_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wmissing-prototypes")
 _LIBCPP_EXPORTED_FROM_ABI bool __is_posix_terminal(FILE* __stream) { return isatty(fileno(__stream)); }
+_LIBCPP_DIAGNOSTIC_POP
 #endif
+_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
 _LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/pstl/libdispatch.cpp+2

...	@@ -12,6 +12,7 @@	...	@@ -12,6 +12,7 @@
12	#include <dispatch/dispatch.h>	12	#include <dispatch/dispatch.h>
13		13
14	_LIBCPP_BEGIN_NAMESPACE_STD	14	_LIBCPP_BEGIN_NAMESPACE_STD
		15	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
15	namespace __pstl::__libdispatch {	16	namespace __pstl::__libdispatch {
16		17
17	void __dispatch_apply(size_t chunk_count, void* context, void (func)(void context, size_t chunk)) noexcept {	18	void __dispatch_apply(size_t chunk_count, void* context, void (func)(void context, size_t chunk)) noexcept {
...	@@ -29,4 +30,5 @@ __chunk_partitions __partition_chunks(ptrdiff_t element_count) noexcept {	...	@@ -29,4 +30,5 @@ __chunk_partitions __partition_chunks(ptrdiff_t element_count) noexcept {
29	}	30	}
30		31
31	} // namespace __pstl::__libdispatch	32	} // namespace __pstl::__libdispatch
		33	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
32	_LIBCPP_END_NAMESPACE_STD	34	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/random.cpp+2

...	@@ -36,6 +36,7 @@	...	@@ -36,6 +36,7 @@
36	#endif	36	#endif
37		37
38	_LIBCPP_BEGIN_NAMESPACE_STD	38	_LIBCPP_BEGIN_NAMESPACE_STD
		39	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
39		40
40	#if defined(_LIBCPP_USING_GETENTROPY)	41	#if defined(_LIBCPP_USING_GETENTROPY)
41		42
...	@@ -153,4 +154,5 @@ double random_device::entropy() const noexcept {	...	@@ -153,4 +154,5 @@ double random_device::entropy() const noexcept {
153	#endif	154	#endif
154	}	155	}
155		156
		157	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
156	_LIBCPP_END_NAMESPACE_STD	158	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/random_shuffle.cpp+2

...	@@ -17,6 +17,7 @@	...	@@ -17,6 +17,7 @@
17	#endif	17	#endif
18		18
19	_LIBCPP_BEGIN_NAMESPACE_STD	19	_LIBCPP_BEGIN_NAMESPACE_STD
		20	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
20		21
21	#if _LIBCPP_HAS_THREADS	22	#if _LIBCPP_HAS_THREADS
22	static constinit __libcpp_mutex_t __rs_mut = _LIBCPP_MUTEX_INITIALIZER;	23	static constinit __libcpp_mutex_t __rs_mut = _LIBCPP_MUTEX_INITIALIZER;
...	@@ -48,4 +49,5 @@ __rs_default::result_type __rs_default::operator()() {	...	@@ -48,4 +49,5 @@ __rs_default::result_type __rs_default::operator()() {
48		49
49	__rs_default __rs_get() { return __rs_default(); }	50	__rs_default __rs_get() { return __rs_default(); }
50		51
		52	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
51	_LIBCPP_END_NAMESPACE_STD	53	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/regex.cpp+2

...	@@ -11,6 +11,7 @@	...	@@ -11,6 +11,7 @@
11	#include <regex>	11	#include <regex>
12		12
13	_LIBCPP_BEGIN_NAMESPACE_STD	13	_LIBCPP_BEGIN_NAMESPACE_STD
		14	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
14		15
15	static const char* make_error_type_string(regex_constants::error_type ecode) {	16	static const char* make_error_type_string(regex_constants::error_type ecode) {
16	switch (ecode) {	17	switch (ecode) {
...	@@ -396,4 +397,5 @@ void __match_any_but_newline<wchar_t>::__exec(__state& __s) const {	...	@@ -396,4 +397,5 @@ void __match_any_but_newline<wchar_t>::__exec(__state& __s) const {
396	}	397	}
397	}	398	}
398		399
		400	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
399	_LIBCPP_END_NAMESPACE_STD	401	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/ryu/d2s.cpp+2-13

 @@ -41,6 +41,7 @@
 #include <__assert>
 #include <__config>
+#include <bit>
 #include <charconv>
 #include <cstddef>
 @@ -478,19 +479,7 @@ struct __floating_decimal_64 {
           2882303761517u, 576460752303u, 115292150460u, 23058430092u, 4611686018u, 922337203u, 184467440u,
           36893488u, 7378697u, 1475739u, 295147u, 59029u, 11805u, 2361u, 472u, 94u, 18u, 3u };
-        unsigned long _Trailing_zero_bits;
+        unsigned long _Trailing_zero_bits = std::countr_zero(__v.__mantissa);
-#if _LIBCPP_HAS_BITSCAN64
-        (void) _BitScanForward64(&_Trailing_zero_bits, __v.__mantissa); // __v.__mantissa is guaranteed nonzero
-#else // ^^^ 64-bit ^^^ / vvv 32-bit vvv
-        const uint32_t _Low_mantissa = static_cast<uint32_t>(__v.__mantissa);
-        if (_Low_mantissa != 0) {
-          (void) _BitScanForward(&_Trailing_zero_bits, _Low_mantissa);
-        } else {
-          const uint32_t _High_mantissa = static_cast<uint32_t>(__v.__mantissa >> 32); // nonzero here
-          (void) _BitScanForward(&_Trailing_zero_bits, _High_mantissa);
-          _Trailing_zero_bits += 32;
-        }
-#endif // ^^^ 32-bit ^^^
         const uint64_t _Shifted_mantissa = __v.__mantissa >> _Trailing_zero_bits;
         _Can_use_ryu = _Shifted_mantissa <= _Max_shifted_mantissa[_Ryu_exponent];
       }

lib/libcxx/src/ryu/f2s.cpp+2-2

...	@@ -41,6 +41,7 @@	...	@@ -41,6 +41,7 @@
41		41
42	#include <__assert>	42	#include <__assert>
43	#include <__config>	43	#include <__config>
		44	#include <bit>
44	#include <charconv>	45	#include <charconv>
45	#include <cstdint>	46	#include <cstdint>
46	#include <cstddef>	47	#include <cstddef>
...	@@ -535,8 +536,7 @@ struct __floating_decimal_32 {	...	@@ -535,8 +536,7 @@ struct __floating_decimal_32 {
535	static constexpr uint32_t _Max_shifted_mantissa[11] = {	536	static constexpr uint32_t _Max_shifted_mantissa[11] = {
536	16777215, 3355443, 671088, 134217, 26843, 5368, 1073, 214, 42, 8, 1 };	537	16777215, 3355443, 671088, 134217, 26843, 5368, 1073, 214, 42, 8, 1 };
537		538
538	unsigned long _Trailing_zero_bits;	539	unsigned long _Trailing_zero_bits = std::countr_zero(__v.__mantissa); // __v.__mantissa is guaranteed nonzero
539	(void) _BitScanForward(&_Trailing_zero_bits, __v.__mantissa); // __v.__mantissa is guaranteed nonzero
540	const uint32_t _Shifted_mantissa = __v.__mantissa >> _Trailing_zero_bits;	540	const uint32_t _Shifted_mantissa = __v.__mantissa >> _Trailing_zero_bits;
541	_Can_use_ryu = _Shifted_mantissa <= _Max_shifted_mantissa[_Ryu_exponent];	541	_Can_use_ryu = _Shifted_mantissa <= _Max_shifted_mantissa[_Ryu_exponent];
542	}	542	}

lib/libcxx/src/shared_mutex.cpp+2

...	@@ -13,6 +13,7 @@	...	@@ -13,6 +13,7 @@
13	#endif	13	#endif
14		14
15	_LIBCPP_BEGIN_NAMESPACE_STD	15	_LIBCPP_BEGIN_NAMESPACE_STD
		16	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
16		17
17	// Shared Mutex Base	18	// Shared Mutex Base
18	__shared_mutex_base::__shared_mutex_base() : __state_(0) {}	19	__shared_mutex_base::__shared_mutex_base() : __state_(0) {}
...	@@ -96,4 +97,5 @@ void shared_timed_mutex::lock_shared() { return __base_.lock_shared(); }	...	@@ -96,4 +97,5 @@ void shared_timed_mutex::lock_shared() { return __base_.lock_shared(); }
96	bool shared_timed_mutex::try_lock_shared() { return __base_.try_lock_shared(); }	97	bool shared_timed_mutex::try_lock_shared() { return __base_.try_lock_shared(); }
97	void shared_timed_mutex::unlock_shared() { return __base_.unlock_shared(); }	98	void shared_timed_mutex::unlock_shared() { return __base_.unlock_shared(); }
98		99
		100	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
99	_LIBCPP_END_NAMESPACE_STD	101	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/std_stream.h+2

...	@@ -24,6 +24,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -24,6 +24,7 @@ _LIBCPP_PUSH_MACROS
24	#include <__undef_macros>	24	#include <__undef_macros>
25		25
26	_LIBCPP_BEGIN_NAMESPACE_STD	26	_LIBCPP_BEGIN_NAMESPACE_STD
		27	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
27		28
28	static const int __limit = 8;	29	static const int __limit = 8;
29		30
...	@@ -380,6 +381,7 @@ void __stdoutbuf<_CharT>::imbue(const locale& __loc) {	...	@@ -380,6 +381,7 @@ void __stdoutbuf<_CharT>::imbue(const locale& __loc) {
380	__always_noconv_ = __cv_->always_noconv();	381	__always_noconv_ = __cv_->always_noconv();
381	}	382	}
382		383
		384	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
383	_LIBCPP_END_NAMESPACE_STD	385	_LIBCPP_END_NAMESPACE_STD
384		386
385	_LIBCPP_POP_MACROS	387	_LIBCPP_POP_MACROS

lib/libcxx/src/stdexcept.cpp+2

...	@@ -18,6 +18,7 @@	...	@@ -18,6 +18,7 @@
18	#endif	18	#endif
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
		21	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
21		22
22	void __throw_runtime_error(const char* msg) {	23	void __throw_runtime_error(const char* msg) {
23	#if _LIBCPP_HAS_EXCEPTIONS	24	#if _LIBCPP_HAS_EXCEPTIONS
...	@@ -27,4 +28,5 @@ void __throw_runtime_error(const char* msg) {	...	@@ -27,4 +28,5 @@ void __throw_runtime_error(const char* msg) {
27	#endif	28	#endif
28	}	29	}
29		30
		31	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
30	_LIBCPP_END_NAMESPACE_STD	32	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/string.cpp+2

...	@@ -19,6 +19,7 @@	...	@@ -19,6 +19,7 @@
19	#endif	19	#endif
20		20
21	_LIBCPP_BEGIN_NAMESPACE_STD	21	_LIBCPP_BEGIN_NAMESPACE_STD
		22	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
22		23
23	#if _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 14	24	#if _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 14
24		25
...	@@ -367,4 +368,5 @@ wstring to_wstring(double val) { return as_string(get_swprintf(), initial_string	...	@@ -367,4 +368,5 @@ wstring to_wstring(double val) { return as_string(get_swprintf(), initial_string
367	wstring to_wstring(long double val) { return as_string(get_swprintf(), initial_string<wstring>()(), L"%Lf", val); }	368	wstring to_wstring(long double val) { return as_string(get_swprintf(), initial_string<wstring>()(), L"%Lf", val); }
368	#endif	369	#endif
369		370
		371	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
370	_LIBCPP_END_NAMESPACE_STD	372	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/strstream.cpp+2

...	@@ -18,6 +18,7 @@ _LIBCPP_PUSH_MACROS	...	@@ -18,6 +18,7 @@ _LIBCPP_PUSH_MACROS
18	#include <__undef_macros>	18	#include <__undef_macros>
19		19
20	_LIBCPP_BEGIN_NAMESPACE_STD	20	_LIBCPP_BEGIN_NAMESPACE_STD
		21	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
21		22
22	strstreambuf::strstreambuf(streamsize __alsize)	23	strstreambuf::strstreambuf(streamsize __alsize)
23	: __strmode_(__dynamic), __alsize_(__alsize), __palloc_(nullptr), __pfree_(nullptr) {}	24	: __strmode_(__dynamic), __alsize_(__alsize), __palloc_(nullptr), __pfree_(nullptr) {}
...	@@ -253,6 +254,7 @@ ostrstream::~ostrstream() {}	...	@@ -253,6 +254,7 @@ ostrstream::~ostrstream() {}
253		254
254	strstream::~strstream() {}	255	strstream::~strstream() {}
255		256
		257	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
256	_LIBCPP_END_NAMESPACE_STD	258	_LIBCPP_END_NAMESPACE_STD
257		259
258	_LIBCPP_POP_MACROS	260	_LIBCPP_POP_MACROS

lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp+425-34

...	@@ -7,62 +7,453 @@	...	@@ -7,62 +7,453 @@
7	//	7	//
8	//===----------------------------------------------------------------------===//	8	//===----------------------------------------------------------------------===//
9		9
10	#include <exception>	10	_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wmultichar")
11	#include <stdio.h>
12	#include <stdlib.h>
13
14	_LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrCreate(void*);
15	_LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrDestroy(void*);
16	_LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrCopy(void, const void);
17	_LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrAssign(void, const void);
18	_LIBCPP_CRT_FUNC bool __cdecl __ExceptionPtrCompare(const void, const void);
19	_LIBCPP_CRT_FUNC bool __cdecl __ExceptionPtrToBool(const void*);
20	_LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrSwap(void, void);
21	_LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrCurrentException(void*);
22	[[noreturn]] _LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrRethrow(const void*);
23	_LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrCopyException(void, const void, const void*);
24		11
25	namespace std {	12	#include <__exception/exception_ptr.h>
		13	#include <__memory/shared_count.h>
		14	#include <cstdlib>
		15	#include <cstring>
26		16
27	exception_ptr::exception_ptr() noexcept { __ExceptionPtrCreate(this); }	17	#include <unknwn.h>
28	exception_ptr::exception_ptr(nullptr_t) noexcept { __ExceptionPtrCreate(this); }	18	#include <windows.h>
		19	struct _ThrowInfo;
		20	#include <eh.h>
		21	#include <ehdata.h>
		22	#include <malloc.h> // alloca
29		23
30	exception_ptr::exception_ptr(const exception_ptr& __other) noexcept { __ExceptionPtrCopy(this, &__other); }	24	// Pre-V4 managed exception code
31	exception_ptr& exception_ptr::operator=(const exception_ptr& __other) noexcept {	25	#define MANAGED_EXCEPTION_CODE 0XE0434F4D
32	__ExceptionPtrAssign(this, &__other);	26
33	return *this;	27	// V4 and later managed exception code
		28	#define MANAGED_EXCEPTION_CODE_V4 0XE0434352
		29
		30	extern "C" _LIBCPP_CRT_FUNC void* __cdecl __AdjustPointer(void*, const PMD&);
		31	extern "C" _LIBCPP_CRT_FUNC void** __cdecl __current_exception();
		32
		33	namespace {
		34
		35	typedef void(__stdcall* __prepare_for_throw_t)(void*);
		36
		37	struct __winrt_exception_info {
		38	void* __description;
		39	void* __restricted_error_string;
		40	void* __restricted_error_reference;
		41	void* __capability_sid;
		42	long __hr;
		43	void* __restricted_info;
		44	ThrowInfo* __throw_info;
		45	unsigned int __size;
		46	__prepare_for_throw_t __prepare_throw;
		47	};
		48
		49	inline EHExceptionRecord* __get_current_exception() noexcept {
		50	return reinterpret_cast<EHExceptionRecord*>(__current_exception());
34	}	51	}
35		52
36	exception_ptr& exception_ptr::operator=(nullptr_t) noexcept {	53	inline void __call_member_function_0(void* __this, void* __mfn) {
37	exception_ptr dummy;	54	auto __fn = reinterpret_cast<void(__thiscall)(void)>(__mfn);
38	__ExceptionPtrAssign(this, &dummy);	55	__fn(__this);
39	return *this;	56	}
		57
		58	inline void __call_member_function_1(void* __this, void* __mfn, void* __arg) {
		59	auto __fn = reinterpret_cast<void(__thiscall)(void, void*)>(__mfn);
		60	__fn(__this, __arg);
		61	}
		62
		63	inline void __call_member_function_2(void* __this, void* __mfn, void* __arg1, int __arg2) {
		64	auto __fn = reinterpret_cast<void(__thiscall)(void, void*, int)>(__mfn);
		65	__fn(__this, __arg1, __arg2);
40	}	66	}
41		67
42	exception_ptr::~exception_ptr() noexcept { __ExceptionPtrDestroy(this); }	68	void __populate_cpp_exception_record(
		69	_EXCEPTION_RECORD& __record, const void* const __except_obj, ThrowInfo* __throw_info) noexcept {
		70	__record.ExceptionCode = EH_EXCEPTION_NUMBER;
		71	__record.ExceptionFlags = EXCEPTION_NONCONTINUABLE;
		72	__record.ExceptionRecord = nullptr; // No SEH to chain.
		73	__record.ExceptionAddress = nullptr; // Address of exception. This will be overwritten by OS.
		74	__record.NumberParameters = EH_EXCEPTION_PARAMETERS;
		75	__record.ExceptionInformation[0] = EH_MAGIC_NUMBER1;
		76	__record.ExceptionInformation[1] = reinterpret_cast<ULONG_PTR>(__except_obj);
		77
		78	if (__throw_info && (__throw_info->attributes & TI_IsWinRT)) {
		79	// The pointer to the ExceptionInfo structure is stored sizeof(void*) in front of each WinRT Exception Info.
		80	const auto __wei = (static_cast<__winrt_exception_info* const>(const_cast<void>(__except_obj)))[-1];
		81	__throw_info = __wei->__throw_info;
		82	}
		83
		84	__record.ExceptionInformation[2] = reinterpret_cast<ULONG_PTR>(__throw_info);
		85
		86	#if _EH_RELATIVE_TYPEINFO
		87	void* __throw_image_base =
		88	__throw_info ? RtlPcToFileHeader(const_cast<void>(static_cast<const void>(__throw_info)), &__throw_image_base)
		89	: nullptr;
		90	__record.ExceptionInformation[3] = reinterpret_cast<ULONG_PTR>(__throw_image_base);
		91	#endif // _EH_RELATIVE_TYPEINFO
		92
		93	// If the throw info indicates this throw is from a pure region, set the magic number to the Pure one, so only a
		94	// pure-region catch will see it.
		95	//
		96	// Also use the Pure magic number on 64-bit platforms if we were unable to determine an image base, since that was the
		97	// old way to determine a pure throw, before the TI_IsPure bit was added to the FuncInfo attributes field.
		98	if (__throw_info && ((__throw_info->attributes & TI_IsPure)
		99	#if _EH_RELATIVE_TYPEINFO
		100	\|\| !__throw_image_base
		101	#endif // _EH_RELATIVE_TYPEINFO
		102	))
		103	__record.ExceptionInformation[0] = EH_PURE_MAGIC_NUMBER1;
		104	}
		105
		106	void __copy_exception_record(_EXCEPTION_RECORD& __dest, const _EXCEPTION_RECORD& __src) noexcept {
		107	__dest.ExceptionCode = __src.ExceptionCode;
		108	// We force EXCEPTION_NONCONTINUABLE because rethrow_exception is [[noreturn]].
		109	__dest.ExceptionFlags = __src.ExceptionFlags \| EXCEPTION_NONCONTINUABLE;
		110	__dest.ExceptionRecord = nullptr; // We don't chain SEH exceptions.
		111	__dest.ExceptionAddress = nullptr; // Useless field to copy. It will be overwritten by RaiseException().
		112	const auto __parameters = __src.NumberParameters;
		113	__dest.NumberParameters = __parameters;
		114
		115	// Copy the number of parameters in use.
		116	constexpr auto __max_parameters = static_cast<DWORD>(EXCEPTION_MAXIMUM_PARAMETERS);
		117	const auto __in_use = (__parameters < __max_parameters) ? __parameters : __max_parameters;
		118	std::memcpy(__dest.ExceptionInformation, __src.ExceptionInformation, __in_use * sizeof(ULONG_PTR));
		119	std::memset(&__dest.ExceptionInformation[__in_use], 0, (__max_parameters - __in_use) * sizeof(ULONG_PTR));
		120	}
		121
		122	void __copy_exception_object(void* __dest, const void* __src, const CatchableType* const __type
		123	#if _EH_RELATIVE_TYPEINFO
		124	,
		125	uintptr_t __throw_image_base
		126	#endif // _EH_RELATIVE_TYPEINFO
		127	) {
		128	// Copy an object of type denoted by *_PType from __src to __dDest; throws whatever the copy ctor of the type denoted
		129	// by *_PType throws.
		130	if ((__type->properties & CT_IsSimpleType) \|\| __type->copyFunction == 0) {
		131	std::memcpy(__dest, __src, __type->sizeOrOffset);
		132
		133	if (__type->properties & CT_IsWinRTHandle) {
		134	const auto __unknown = static_cast<IUnknown const>(const_cast<void>(__src));
		135	if (__unknown)
		136	__unknown->AddRef();
		137	}
		138	return;
		139	}
		140
		141	#if _EH_RELATIVE_TYPEINFO
		142	const auto __copy_func = reinterpret_cast<void*>(__throw_image_base + __type->copyFunction);
		143	#else // _EH_RELATIVE_TYPEINFO
		144	const auto __copy_func = reinterpret_cast<void*>(__type->copyFunction);
		145	#endif // _EH_RELATIVE_TYPEINFO
		146
		147	const auto __adjusted = __AdjustPointer(const_cast<void*>(__src), __type->thisDisplacement);
		148	if (__type->properties & CT_HasVirtualBase)
		149	__call_member_function_2(__dest, __copy_func, __adjusted, 1);
		150	else
		151	__call_member_function_1(__dest, __copy_func, __adjusted);
		152	}
		153
		154	struct __exception_ptr_storage : public std::__shared_count {
		155	_EXCEPTION_RECORD __record_;
		156	explicit __exception_ptr_storage(long __refs = 0) noexcept : std::__shared_count(__refs) {}
		157	};
		158
		159	template <class _StaticEx>
		160	struct __exception_ptr_static final : public __exception_ptr_storage {
		161	_StaticEx __ex_;
		162
		163	__exception_ptr_static() noexcept : __exception_ptr_storage(0) {
		164	__populate_cpp_exception_record(__record_, &__ex_, static_cast<ThrowInfo*>(__GetExceptionInfo(__ex_)));
		165	}
		166
		167	void __on_zero_shared() noexcept override {}
		168
		169	static __exception_ptr_storage* __get() noexcept {
		170	struct __container {
		171	union {
		172	__exception_ptr_static __instance_;
		173	};
		174	__container() noexcept : __instance_() {}
		175	~__container() {}
		176	};
		177	static __container __storage;
		178	return &__storage.__instance_;
		179	}
		180	};
		181
		182	struct alignas(__STDCPP_DEFAULT_NEW_ALIGNMENT__) __exception_ptr_normal final : public __exception_ptr_storage {
		183	explicit __exception_ptr_normal(const _EXCEPTION_RECORD& __record) noexcept : __exception_ptr_storage(0) {
		184	__copy_exception_record(__record_, __record);
		185	}
		186
		187	void __on_zero_shared() noexcept override {
		188	const auto& __cpp_eh_record = reinterpret_cast<EHExceptionRecord&>(__record_);
		189	if (PER_IS_MSVC_PURE_OR_NATIVE_EH(&__cpp_eh_record)) {
		190	const auto* __throw_info = __cpp_eh_record.params.pThrowInfo;
		191	if (__throw_info && __cpp_eh_record.params.pExceptionObject) {
		192	#if _EH_RELATIVE_TYPEINFO
		193	const auto __throw_image_base = reinterpret_cast<uintptr_t>(__cpp_eh_record.params.pThrowImageBase);
		194	const auto* __catchable_type_array = reinterpret_cast<const CatchableTypeArray*>(
		195	static_cast<uintptr_t>(__throw_info->pCatchableTypeArray) + __throw_image_base);
		196	const auto* __type = reinterpret_cast<CatchableType*>(
		197	static_cast<uintptr_t>(__catchable_type_array->arrayOfCatchableTypes[0]) + __throw_image_base);
		198	#else // _EH_RELATIVE_TYPEINFO
		199	const auto* __type = __throw_info->pCatchableTypeArray->arrayOfCatchableTypes[0];
		200	#endif // _EH_RELATIVE_TYPEINFO
		201	if (__throw_info->pmfnUnwind) {
		202	// The exception was a user defined type with a nontrivial destructor, call it.
		203	#if _EH_RELATIVE_TYPEINFO
		204	__call_member_function_0(__cpp_eh_record.params.pExceptionObject,
		205	reinterpret_cast<void*>(__throw_info->pmfnUnwind + __throw_image_base));
		206	#else // _EH_RELATIVE_TYPEINFO
		207	__call_member_function_0(__cpp_eh_record.params.pExceptionObject,
		208	reinterpret_cast<void*>(__throw_info->pmfnUnwind));
		209	#endif // _EH_RELATIVE_TYPEINFO
		210	} else if (__type->properties & CT_IsWinRTHandle) {
		211	const auto* __unknown = static_cast<IUnknown const*>(__cpp_eh_record.params.pExceptionObject);
		212	if (__unknown)
		213	const_cast<IUnknown*>(__unknown)->Release();
		214	}
		215	}
		216	}
		217	std::free(this);
		218	}
		219	};
		220
		221	static_assert(sizeof(__exception_ptr_normal) % __STDCPP_DEFAULT_NEW_ALIGNMENT__ == 0,
		222	"Exception in exception_ptr would be constructed with the wrong alignment");
43		223
44	exception_ptr::operator bool() const noexcept { return __ExceptionPtrToBool(this); }	224	void __assign_seh_exception_ptr_from_record(
		225	void& __dest, const _EXCEPTION_RECORD& __record, void const __rx_raw) noexcept {
		226	if (!__rx_raw) {
		227	__dest = __exception_ptr_static<std::bad_alloc>::__get();
		228	return;
		229	}
45		230
46	bool operator==(const exception_ptr& __x, const exception_ptr& __y) noexcept {	231	__dest = ::new (__rx_raw) __exception_ptr_normal(__record);
47	return __ExceptionPtrCompare(&__x, &__y);
48	}	232	}
49		233
50	void swap(exception_ptr& lhs, exception_ptr& rhs) noexcept { __ExceptionPtrSwap(&rhs, &lhs); }	234	void __assign_cpp_exception_ptr_from_record(void*& __dest, const EHExceptionRecord& __record) noexcept {
		235	// Construct a reference count control block for the C++ exception recorded by __record, and bind it to __dest.
		236	//
		237	// * If allocating memory for the reference count control block fails, sets __dest to bad_alloc.
		238	// * If copying the exception object referred to __record throws, constructs a reference count control block for that
		239	// exception instead.
		240	// * If copying the exception object thrown by copying the original exception object throws, sets __dest to
		241	// bad_exception.
		242	const auto* __throw_info = __record.params.pThrowInfo;
		243	#if _EH_RELATIVE_TYPEINFO
		244	const auto __throw_image_base = reinterpret_cast<uintptr_t>(__record.params.pThrowImageBase);
		245	const auto* __catchable_type_array = reinterpret_cast<const CatchableTypeArray*>(
		246	static_cast<uintptr_t>(__throw_info->pCatchableTypeArray) + __throw_image_base);
		247	const auto* __type = reinterpret_cast<CatchableType*>(
		248	static_cast<uintptr_t>(__catchable_type_array->arrayOfCatchableTypes[0]) + __throw_image_base);
		249	#else // _EH_RELATIVE_TYPEINFO
		250	const auto* __type = __throw_info->pCatchableTypeArray->arrayOfCatchableTypes[0];
		251	#endif // _EH_RELATIVE_TYPEINFO
		252
		253	const auto __except_obj_size = static_cast<size_t>(__type->sizeOrOffset);
		254	const auto __alloc_size = sizeof(__exception_ptr_normal) + __except_obj_size;
		255	auto* __rx_raw = std::malloc(__alloc_size);
		256	if (!__rx_raw) {
		257	__dest = __exception_ptr_static<std::bad_alloc>::__get();
		258	return;
		259	}
		260
		261	try {
		262	__copy_exception_object(static_cast<__exception_ptr_normal*>(__rx_raw) + 1,
		263	__record.params.pExceptionObject,
		264	__type
		265	#if _EH_RELATIVE_TYPEINFO
		266	,
		267	__throw_image_base
		268	#endif // _EH_RELATIVE_TYPEINFO
		269	);
		270
		271	const auto* __rx = ::new (__rx_raw) __exception_ptr_normal(reinterpret_cast<const _EXCEPTION_RECORD&>(__record));
		272	reinterpret_cast<EHExceptionRecord&>(const_cast<__exception_ptr_normal*>(__rx)->__record_).params.pExceptionObject =
		273	static_cast<__exception_ptr_normal*>(__rx_raw) + 1;
		274	__dest = const_cast<__exception_ptr_normal*>(__rx);
		275	} catch (...) { // Copying the exception object threw an exception.
		276	// Exception thrown by the original exception's copy ctor.
		277	const auto* __inner_record_ptr = __get_current_exception();
		278	if (!__inner_record_ptr) {
		279	std::free(__rx_raw);
		280	__dest = __exception_ptr_static<std::bad_exception>::__get();
		281	return;
		282	}
		283	const auto& __inner_record = *__inner_record_ptr;
		284	if (__inner_record.ExceptionCode == MANAGED_EXCEPTION_CODE \|\|
		285	__inner_record.ExceptionCode == MANAGED_EXCEPTION_CODE_V4) {
		286	// We don't support managed exceptions and don't want to say there's no active exception, so give up and say
		287	// bad_exception.
		288	std::free(__rx_raw);
		289	__dest = __exception_ptr_static<std::bad_exception>::__get();
		290	return;
		291	}
		292
		293	if (!PER_IS_MSVC_PURE_OR_NATIVE_EH(&__inner_record)) { // Catching a non-C++ exception depends on /EHa.
		294	__assign_seh_exception_ptr_from_record(
		295	__dest, reinterpret_cast<const _EXCEPTION_RECORD&>(__inner_record), __rx_raw);
		296	return;
		297	}
		298
		299	const auto* __inner_throw = __inner_record.params.pThrowInfo;
		300	#if _EH_RELATIVE_TYPEINFO
		301	const auto __inner_throw_image_base = reinterpret_cast<uintptr_t>(__inner_record.params.pThrowImageBase);
		302	const auto* __inner_catchable_type_array = reinterpret_cast<const CatchableTypeArray*>(
		303	static_cast<uintptr_t>(__inner_throw->pCatchableTypeArray) + __inner_throw_image_base);
		304	const auto* __inner_type = reinterpret_cast<CatchableType*>(
		305	static_cast<uintptr_t>(__inner_catchable_type_array->arrayOfCatchableTypes[0]) + __inner_throw_image_base);
		306	#else // _EH_RELATIVE_TYPEINFO
		307	const auto* __inner_type = __inner_throw->pCatchableTypeArray->arrayOfCatchableTypes[0];
		308	#endif // _EH_RELATIVE_TYPEINFO
		309
		310	const auto __inner_except_size = static_cast<size_t>(__inner_type->sizeOrOffset);
		311	const auto __inner_alloc_size = sizeof(__exception_ptr_normal) + __inner_except_size;
		312	if (__inner_alloc_size > __alloc_size) {
		313	std::free(__rx_raw);
		314	__rx_raw = std::malloc(__inner_alloc_size);
		315	if (!__rx_raw) {
		316	__dest = __exception_ptr_static<std::bad_alloc>::__get();
		317	return;
		318	}
		319	}
		320
		321	try {
		322	__copy_exception_object(static_cast<__exception_ptr_normal*>(__rx_raw) + 1,
		323	__inner_record.params.pExceptionObject,
		324	__inner_type
		325	#if _EH_RELATIVE_TYPEINFO
		326	,
		327	__inner_throw_image_base
		328	#endif // _EH_RELATIVE_TYPEINFO
		329	);
		330	} catch (...) { // Copying the exception emitted while copying the original exception also threw, give up.
		331	std::free(__rx_raw);
		332	__dest = __exception_ptr_static<std::bad_exception>::__get();
		333	return;
		334	}
		335
		336	// This next block must be duplicated inside the catch (even though it looks identical to the block in the try) so
		337	// that __inner_record is held alive; exiting the catch will destroy it.
		338	const auto* __rx =
		339	::new (__rx_raw) __exception_ptr_normal(reinterpret_cast<const _EXCEPTION_RECORD&>(__inner_record));
		340	reinterpret_cast<EHExceptionRecord&>(const_cast<__exception_ptr_normal*>(__rx)->__record_).params.pExceptionObject =
		341	static_cast<__exception_ptr_normal*>(__rx_raw) + 1;
		342	__dest = const_cast<__exception_ptr_normal*>(__rx);
		343	}
		344	}
		345
		346	} // namespace
		347
		348	namespace std {
		349
		350	exception_ptr::~exception_ptr() noexcept {
		351	if (__ptr_)
		352	static_cast<__shared_count*>(__ptr_)->__release_shared();
		353	}
		354
		355	exception_ptr::exception_ptr(const exception_ptr& __other) noexcept : __ptr_(__other.__ptr_) {
		356	if (__ptr_)
		357	static_cast<__shared_count*>(__ptr_)->__add_shared();
		358	}
		359
		360	exception_ptr& exception_ptr::operator=(const exception_ptr& __other) noexcept {
		361	if (__ptr_ != __other.__ptr_) {
		362	if (__other.__ptr_)
		363	static_cast<__shared_count*>(__other.__ptr_)->__add_shared();
		364	if (__ptr_)
		365	static_cast<__shared_count*>(__ptr_)->__release_shared();
		366	__ptr_ = __other.__ptr_;
		367	}
		368	return *this;
		369	}
		370
		371	exception_ptr exception_ptr::__from_native_exception_pointer(void* __p) noexcept {
		372	exception_ptr __ret;
		373	__ret.__ptr_ = __p;
		374	if (__ret.__ptr_)
		375	static_cast<__shared_count*>(__ret.__ptr_)->__add_shared();
		376	return __ret;
		377	}
51		378
52	exception_ptr __copy_exception_ptr(void* __except, const void* __ptr) {	379	exception_ptr __copy_exception_ptr(void* __except, const void* __ptr) {
53	exception_ptr __ret = nullptr;	380	exception_ptr __ret = nullptr;
54	if (__ptr)	381	if (!__ptr)
55	__ExceptionPtrCopyException(&__ret, __except, __ptr);	382	return __ret;
		383
		384	_EXCEPTION_RECORD __record;
		385	__populate_cpp_exception_record(__record, __except, static_cast<ThrowInfo>(const_cast<void>(__ptr)));
		386	__assign_cpp_exception_ptr_from_record(__ret.__ptr_, reinterpret_cast<const EHExceptionRecord&>(__record));
56	return __ret;	387	return __ret;
57	}	388	}
58		389
59	exception_ptr current_exception() noexcept {	390	exception_ptr current_exception() noexcept {
60	exception_ptr __ret;	391	exception_ptr __ret;
61	__ExceptionPtrCurrentException(&__ret);	392	const auto* __record = __get_current_exception();
		393	if (!__record \|\| __record->ExceptionCode == MANAGED_EXCEPTION_CODE \|\|
		394	__record->ExceptionCode == MANAGED_EXCEPTION_CODE_V4)
		395	return __ret;
		396
		397	if (PER_IS_MSVC_PURE_OR_NATIVE_EH(__record))
		398	__assign_cpp_exception_ptr_from_record(__ret.__ptr_, *__record);
		399	else
		400	__assign_seh_exception_ptr_from_record(
		401	__ret.__ptr_, reinterpret_cast<const _EXCEPTION_RECORD&>(*__record), std::malloc(sizeof(__exception_ptr_normal)));
62	return __ret;	402	return __ret;
63	}	403	}
64		404
65	[[noreturn]] void rethrow_exception(exception_ptr p) { __ExceptionPtrRethrow(&p); }	405	[[noreturn]] void rethrow_exception(exception_ptr __p) {
		406	if (!__p)
		407	throw bad_exception();
		408
		409	auto* __rep = static_cast<__exception_ptr_storage*>(__p.__ptr_);
		410	auto __record_copy = __rep->__record_;
		411	auto& __cpp_record = reinterpret_cast<EHExceptionRecord&>(__record_copy);
		412	if (PER_IS_MSVC_PURE_OR_NATIVE_EH(&__cpp_record)) {
		413	const auto* __throw_info = __cpp_record.params.pThrowInfo;
		414	if (!__cpp_record.params.pExceptionObject \|\| !__throw_info \|\| !__throw_info->pCatchableTypeArray)
		415	terminate();
		416
		417	#if _EH_RELATIVE_TYPEINFO
		418	const auto __throw_image_base = reinterpret_cast<uintptr_t>(__cpp_record.params.pThrowImageBase);
		419	const auto* __catchable_type_array =
		420	reinterpret_cast<const CatchableTypeArray*>(__throw_image_base + __throw_info->pCatchableTypeArray);
		421	#else // _EH_RELATIVE_TYPEINFO
		422	const auto* __catchable_type_array = __throw_info->pCatchableTypeArray;
		423	#endif // _EH_RELATIVE_TYPEINFO
		424
		425	if (__catchable_type_array->nCatchableTypes <= 0)
		426	terminate();
		427
		428	#if _EH_RELATIVE_TYPEINFO
		429	const auto* __type = reinterpret_cast<CatchableType*>(
		430	static_cast<uintptr_t>(__catchable_type_array->arrayOfCatchableTypes[0]) + __throw_image_base);
		431	#else // _EH_RELATIVE_TYPEINFO
		432	const auto* __type = __throw_info->pCatchableTypeArray->arrayOfCatchableTypes[0];
		433	#endif // _EH_RELATIVE_TYPEINFO
		434
		435	#pragma warning(suppress : 6255)
		436	void* __exception_buffer = alloca(__type->sizeOrOffset);
		437	__copy_exception_object(__exception_buffer, __cpp_record.params.pExceptionObject, __type
		438	#if _EH_RELATIVE_TYPEINFO
		439	,
		440	__throw_image_base
		441	#endif // _EH_RELATIVE_TYPEINFO
		442	);
		443
		444	__cpp_record.params.pExceptionObject = __exception_buffer;
		445	}
		446
		447	// Under MSVC C++ exception handling (/EHsc), C Win32 API functions like RaiseException
		448	// are assumed not to throw synchronous C++ exceptions. As a result, stack unwinding
		449	// initiated by RaiseException does not execute local destructors in this frame.
		450	// We must explicitly reset __p here so that the reference count on the stored
		451	// exception record is properly decremented before unwinding begins.
		452	__p = nullptr;
		453	RaiseException(__record_copy.ExceptionCode, __record_copy.ExceptionFlags, __record_copy.NumberParameters,
		454	__record_copy.ExceptionInformation);
		455	terminate();
		456	}
66		457
67	nested_exception::nested_exception() noexcept : __ptr_(current_exception()) {}	458	nested_exception::nested_exception() noexcept : __ptr_(current_exception()) {}
68		459

lib/libcxx/src/support/win32/locale_win32.cpp+262

...	@@ -7,6 +7,8 @@	...	@@ -7,6 +7,8 @@
7	//===----------------------------------------------------------------------===//	7	//===----------------------------------------------------------------------===//
8		8
9	#include <__locale_dir/support/windows.h>	9	#include <__locale_dir/support/windows.h>
		10	#include <cctype>
		11	#include <charconv>
10	#include <clocale> // std::localeconv() & friends	12	#include <clocale> // std::localeconv() & friends
11	#include <cstdarg> // va_start & friends	13	#include <cstdarg> // va_start & friends
12	#include <cstddef>	14	#include <cstddef>
...	@@ -14,8 +16,11 @@	...	@@ -14,8 +16,11 @@
14	#include <cstdlib> // std::strtof & friends	16	#include <cstdlib> // std::strtof & friends
15	#include <ctime> // std::strftime	17	#include <ctime> // std::strftime
16	#include <cwchar> // wide char manipulation	18	#include <cwchar> // wide char manipulation
		19	#include <string_view>
		20	#include <windows.h>
17		21
18	_LIBCPP_BEGIN_NAMESPACE_STD	22	_LIBCPP_BEGIN_NAMESPACE_STD
		23	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
19	namespace __locale {	24	namespace __locale {
20		25
21	//	26	//
...	@@ -34,6 +39,262 @@ __lconv_t* __localeconv(__locale_t& loc) {	...	@@ -34,6 +39,262 @@ __lconv_t* __localeconv(__locale_t& loc) {
34	return loc.__store_lconv(lc);	39	return loc.__store_lconv(lc);
35	}	40	}
36		41
		42	namespace {
		43	const char* __codepage_name(unsigned int __codepage) {
		44	switch (__codepage) {
		45	case 0:
		46	// If no ANSI code page is available, only Unicode can be used for the locale.
		47	// In this case, the value is CP_ACP (0).
		48	// Such a locale cannot be set as the system locale.
		49	// Applications that do not support Unicode do not work correctly with locales
		50	// marked as "Unicode only".
		51	return nullptr;
		52	case 037:
		53	return "IBM037";
		54	case 437:
		55	return "IBM437";
		56	case 500:
		57	return "IBM500";
		58	case 708:
		59	return "ASMO-708";
		60	case 709:
		61	return "ASMO_449";
		62	case 775:
		63	return "IBM775";
		64	case 850:
		65	return "IBM850";
		66	case 852:
		67	return "IBM852";
		68	case 855:
		69	return "IBM855";
		70	case 857:
		71	return "IBM857";
		72	case 858:
		73	return "IBM00858";
		74	case 860:
		75	return "IBM860";
		76	case 861:
		77	return "IBM861";
		78	case 862:
		79	return "IBM862";
		80	case 863:
		81	return "IBM863";
		82	case 864:
		83	return "IBM864";
		84	case 865:
		85	return "IBM865";
		86	case 866:
		87	return "IBM866";
		88	case 869:
		89	return "IBM869";
		90	case 870:
		91	return "IBM870";
		92	case 874:
		93	return "windows-874";
		94	case 932:
		95	return "Shift_JIS";
		96	case 936:
		97	return "GB2312";
		98	case 949:
		99	return "KS_C_5601-1989";
		100	case 950:
		101	return "Big5";
		102	case 1026:
		103	return "IBM1026";
		104	case 1047:
		105	return "IBM1047";
		106	case 1140:
		107	return "IBM01140";
		108	case 1141:
		109	return "IBM01141";
		110	case 1142:
		111	return "IBM01142";
		112	case 1143:
		113	return "IBM01143";
		114	case 1144:
		115	return "IBM01144";
		116	case 1145:
		117	return "IBM01145";
		118	case 1146:
		119	return "IBM01146";
		120	case 1147:
		121	return "IBM01147";
		122	case 1148:
		123	return "IBM01148";
		124	case 1149:
		125	return "IBM01149";
		126	case 1200:
		127	return "UTF-16LE";
		128	case 1201:
		129	return "UTF-16BE";
		130	case 1250:
		131	return "windows-1250";
		132	case 1251:
		133	return "windows-1251";
		134	case 1252:
		135	return "windows-1252";
		136	case 1253:
		137	return "windows-1253";
		138	case 1254:
		139	return "windows-1254";
		140	case 1255:
		141	return "windows-1255";
		142	case 1256:
		143	return "windows-1256";
		144	case 1257:
		145	return "windows-1257";
		146	case 1258:
		147	return "windows-1258";
		148	case 10000:
		149	return "macintosh";
		150	case 12000:
		151	return "UTF-32LE";
		152	case 12001:
		153	return "UTF-32BE";
		154	case 20127:
		155	return "US-ASCII";
		156	case 20273:
		157	return "IBM273";
		158	case 20277:
		159	return "IBM277";
		160	case 20278:
		161	return "IBM278";
		162	case 20280:
		163	return "IBM280";
		164	case 20284:
		165	return "IBM284";
		166	case 20285:
		167	return "IBM285";
		168	case 20290:
		169	return "IBM290";
		170	case 20297:
		171	return "IBM297";
		172	case 20420:
		173	return "IBM420";
		174	case 20423:
		175	return "IBM423";
		176	case 20424:
		177	return "IBM424";
		178	case 20838:
		179	return "IBM-Thai";
		180	case 20866:
		181	return "KOI8-R";
		182	case 20871:
		183	return "IBM871";
		184	case 20880:
		185	return "IBM880";
		186	case 20905:
		187	return "IBM905";
		188	case 20924:
		189	return "IBM00924";
		190	case 20932:
		191	return "EUC-JP";
		192	case 21866:
		193	return "KOI8-U";
		194	case 28591:
		195	return "ISO-8859-1";
		196	case 28592:
		197	return "ISO-8859-2";
		198	case 28593:
		199	return "ISO-8859-3";
		200	case 28594:
		201	return "ISO-8859-4";
		202	case 28595:
		203	return "ISO-8859-9";
		204	case 28596:
		205	return "ISO-8859-10";
		206	case 28597:
		207	return "ISO-8859-7";
		208	case 28598:
		209	return "ISO-8859-8";
		210	case 28599:
		211	return "ISO-8859-9-Windows-Latin-5";
		212	case 28603:
		213	return "ISO-8859-13";
		214	case 28605:
		215	return "ISO-8859-15";
		216	case 38598:
		217	return "ISO-8859-8-I";
		218	case 50220:
		219	case 50221:
		220	case 50222:
		221	return "ISO-2022-JP";
		222	case 51932:
		223	return "EUC-JP";
		224	case 51936:
		225	return "GB2312";
		226	case 51949:
		227	return "EUC-KR";
		228	case 52936:
		229	return "HZ-GB-2312";
		230	case 54936:
		231	return "GB18030";
		232	case 65000:
		233	return "UTF-7";
		234	case 65001:
		235	return "UTF-8";
		236	default:
		237	return nullptr;
		238	}
		239	}
		240	} // namespace
		241
		242	const char* __get_locale_encoding(__locale_t loc) {
		243	const char* locale_name = loc.__get_locale();
		244	if (locale_name == nullptr) {
		245	return __codepage_name(::GetACP());
		246	}
		247
		248	std::string_view __sv(locale_name);
		249
		250	// locale :: "locale-name"
		251	// \| "language"[_country-region[.code-page]]
		252	// \| ".code-page"
		253	// GetLocaleInfoEx doesn't accept anything other than BCP-47 locale names, e.g. "en_US",
		254	// so do a best-attempt to derive the text encoding from the name.
		255	if (__sv == "C" \|\| __sv == "") {
		256	// "A locale argument value of C specifies the minimal ANSI conforming environment for C translation."
		257	// TODO: Figure out what to do for an empty string:
		258	// "If locale points to an empty string, the locale is the implementation-defined native environment."
		259	return __codepage_name(::GetACP());
		260	} else if (auto dot = __sv.find('.'); dot != std::string_view::npos) {
		261	std::string_view __code_page(locale_name + dot + 1);
		262
		263	// Windows allows the codepage number as part of the name,
		264	// e.g. "en_US.1252" for English US, Windows-1252.
		265	if (std::isdigit(__code_page[0])) {
		266	unsigned int __cpage{};
		267	auto __res = std::from_chars(__code_page.data(), __code_page.data() + __code_page.size(), __cpage);
		268	if (__res) {
		269	return __codepage_name(__cpage);
		270	}
		271	} else { // POSIX-style name
		272	return locale_name + dot + 1;
		273	}
		274	}
		275
		276	wchar_t locale_wbuffer[LOCALE_NAME_MAX_LENGTH + 1]{};
		277	wchar_t number_buffer[11]{};
		278
		279	bool is_ansi = ::AreFileApisANSI();
		280	auto codepage = is_ansi ? CP_ACP : CP_OEMCP;
		281	int ret = ::MultiByteToWideChar(
		282	codepage, MB_ERR_INVALID_CHARS, locale_name, __sv.size(), locale_wbuffer, LOCALE_NAME_MAX_LENGTH);
		283
		284	if (ret <= 0)
		285	return nullptr;
		286
		287	// The below function fills the string with the number in text.
		288	auto lctype = is_ansi ? LOCALE_IDEFAULTANSICODEPAGE : LOCALE_IDEFAULTCODEPAGE;
		289	int result = ::GetLocaleInfoEx(locale_wbuffer, lctype, number_buffer, 10);
		290
		291	if (result <= 0)
		292	return nullptr;
		293
		294	unsigned int acp = std::wcstoul(number_buffer, nullptr, 10);
		295	return __codepage_name(acp);
		296	}
		297
37	//	298	//
38	// Strtonum functions	299	// Strtonum functions
39	//	300	//
...	@@ -182,4 +443,5 @@ int __asprintf(char** ret, __locale_t loc, const char* format, ...) {	...	@@ -182,4 +443,5 @@ int __asprintf(char** ret, __locale_t loc, const char* format, ...) {
182	}	443	}
183		444
184	} // namespace __locale	445	} // namespace __locale
		446	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
185	_LIBCPP_END_NAMESPACE_STD	447	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/support/win32/thread_win32.cpp+2

...	@@ -16,6 +16,7 @@	...	@@ -16,6 +16,7 @@
16	#include <fibersapi.h>	16	#include <fibersapi.h>
17		17
18	_LIBCPP_BEGIN_NAMESPACE_STD	18	_LIBCPP_BEGIN_NAMESPACE_STD
		19	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
19		20
20	static_assert(sizeof(__libcpp_mutex_t) == sizeof(SRWLOCK), "");	21	static_assert(sizeof(__libcpp_mutex_t) == sizeof(SRWLOCK), "");
21	static_assert(alignof(__libcpp_mutex_t) == alignof(SRWLOCK), "");	22	static_assert(alignof(__libcpp_mutex_t) == alignof(SRWLOCK), "");
...	@@ -211,4 +212,5 @@ int __libcpp_tls_set(__libcpp_tls_key __key, void* __p) {	...	@@ -211,4 +212,5 @@ int __libcpp_tls_set(__libcpp_tls_key __key, void* __p) {
211	return 0;	212	return 0;
212	}	213	}
213		214
		215	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
214	_LIBCPP_END_NAMESPACE_STD	216	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/system_error.cpp+2

...	@@ -27,6 +27,7 @@	...	@@ -27,6 +27,7 @@
27	#endif	27	#endif
28		28
29	_LIBCPP_BEGIN_NAMESPACE_STD	29	_LIBCPP_BEGIN_NAMESPACE_STD
		30	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
30		31
31	#if defined(_LIBCPP_WIN32API)	32	#if defined(_LIBCPP_WIN32API)
32		33
...	@@ -368,4 +369,5 @@ void __throw_system_error(int ev, const char* what_arg) {	...	@@ -368,4 +369,5 @@ void __throw_system_error(int ev, const char* what_arg) {
368	#endif	369	#endif
369	}	370	}
370		371
		372	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
371	_LIBCPP_END_NAMESPACE_STD	373	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/text_encoding.cpp created+54

...	@@ -0,0 +1,54 @@
1	//===----------------------------------------------------------------------===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8
9	#include <__config>
10	#include <__locale_dir/locale_base_api.h>
11	#include <__utility/scope_guard.h>
12	#include <text_encoding>
13
14	_LIBCPP_BEGIN_NAMESPACE_STD
15	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
16
17	#if defined(__ANDROID__)
18	// UTF-8 is the always the environment encoding on Android.
19	std::text_encoding __get_locale_encoding([[maybe_unused]] const char* __name) { return std::text_encoding::id::UTF8; }
20	#else
21	static text_encoding __make_text_encoding(const char* __name) {
22	if (__name == nullptr)
23	return text_encoding{};
24
25	string_view __name_view(__name);
26	if (__name_view.size() > text_encoding::max_name_length)
27	return text_encoding{};
28
29	return text_encoding(__name_view);
30	}
31
32	std::text_encoding __get_locale_encoding(const char* __name) {
33	if (__name == nullptr)
34	return __make_text_encoding(__locale::__get_locale_encoding(static_cast<__locale::__locale_t>(0)));
35
36	__locale::__locale_t __l = __locale::__newlocale(_LIBCPP_CTYPE_MASK, __name, static_cast<__locale::__locale_t>(0));
37
38	__scope_guard __locale_guard([&__l] {
39	if (__l) {
40	__locale::__freelocale(__l);
41	}
42	});
43
44	if (!__l) {
45	return text_encoding{};
46	}
47
48	return __make_text_encoding(__locale::__get_locale_encoding(__l));
49	}
50
51	#endif // __ANDROID__
52
53	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
54	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/thread.cpp+2

...	@@ -33,6 +33,7 @@	...	@@ -33,6 +33,7 @@
33	#endif	33	#endif
34		34
35	_LIBCPP_BEGIN_NAMESPACE_STD	35	_LIBCPP_BEGIN_NAMESPACE_STD
		36	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
36		37
37	thread::~thread() {	38	thread::~thread() {
38	if (!__libcpp_thread_isnull(&__t_))	39	if (!__libcpp_thread_isnull(&__t_))
...	@@ -170,4 +171,5 @@ void __thread_struct::notify_all_at_thread_exit(condition_variable* cv, mutex* m	...	@@ -170,4 +171,5 @@ void __thread_struct::notify_all_at_thread_exit(condition_variable* cv, mutex* m
170		171
171	void __thread_struct::__make_ready_at_thread_exit(__assoc_sub_state* __s) { __p_->__make_ready_at_thread_exit(__s); }	172	void __thread_struct::__make_ready_at_thread_exit(__assoc_sub_state* __s) { __p_->__make_ready_at_thread_exit(__s); }
172		173
		174	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
173	_LIBCPP_END_NAMESPACE_STD	175	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/valarray.cpp+2

...	@@ -9,6 +9,7 @@	...	@@ -9,6 +9,7 @@
9	#include <valarray>	9	#include <valarray>
10		10
11	_LIBCPP_BEGIN_NAMESPACE_STD	11	_LIBCPP_BEGIN_NAMESPACE_STD
		12	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
12		13
13	#if _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 9	14	#if _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 9
14	template _LIBCPP_EXPORTED_FROM_ABI valarray<size_t>::valarray(size_t);	15	template _LIBCPP_EXPORTED_FROM_ABI valarray<size_t>::valarray(size_t);
...	@@ -45,4 +46,5 @@ void gslice::__init(size_t __start) {	...	@@ -45,4 +46,5 @@ void gslice::__init(size_t __start) {
45	}	46	}
46	}	47	}
47		48
		49	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
48	_LIBCPP_END_NAMESPACE_STD	50	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/variant.cpp+2

...	@@ -12,4 +12,6 @@ namespace std {	...	@@ -12,4 +12,6 @@ namespace std {
12		12
13	const char* bad_variant_access::what() const noexcept { return "bad_variant_access"; }	13	const char* bad_variant_access::what() const noexcept { return "bad_variant_access"; }
14		14
		15	const char* __bad_variant_access_with_msg::what() const noexcept { return __msg_; }
		16
15	} // namespace std	17	} // namespace std

lib/libcxx/src/vector.cpp+2

...	@@ -9,6 +9,7 @@	...	@@ -9,6 +9,7 @@
9	#include <vector>	9	#include <vector>
10		10
11	_LIBCPP_BEGIN_NAMESPACE_STD	11	_LIBCPP_BEGIN_NAMESPACE_STD
		12	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
12		13
13	#if _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 15	14	#if _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 15
14		15
...	@@ -27,4 +28,5 @@ void __vector_base_common<true>::__throw_out_of_range() const { std::__throw_out	...	@@ -27,4 +28,5 @@ void __vector_base_common<true>::__throw_out_of_range() const { std::__throw_out
27		28
28	#endif // _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 15	29	#endif // _LIBCPP_AVAILABILITY_MINIMUM_HEADER_VERSION < 15
29		30
		31	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
30	_LIBCPP_END_NAMESPACE_STD	32	_LIBCPP_END_NAMESPACE_STD

lib/libcxx/src/verbose_abort.cpp+3-1

...	@@ -22,8 +22,9 @@ extern "C" void android_set_abort_message(const char* msg);	...	@@ -22,8 +22,9 @@ extern "C" void android_set_abort_message(const char* msg);
22	#endif	22	#endif
23		23
24	_LIBCPP_BEGIN_NAMESPACE_STD	24	_LIBCPP_BEGIN_NAMESPACE_STD
		25	_LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
25		26
26	_LIBCPP_WEAK void __libcpp_verbose_abort(char const* format, ...) noexcept {	27	[[gnu::weak]] void __libcpp_verbose_abort(char const* format, ...) noexcept {
27	// Write message to stderr. We do this before formatting into a	28	// Write message to stderr. We do this before formatting into a
28	// buffer so that we still get some information out if that fails.	29	// buffer so that we still get some information out if that fails.
29	{	30	{
...	@@ -62,4 +63,5 @@ _LIBCPP_WEAK void __libcpp_verbose_abort(char const* format, ...) noexcept {	...	@@ -62,4 +63,5 @@ _LIBCPP_WEAK void __libcpp_verbose_abort(char const* format, ...) noexcept {
62	std::abort();	63	std::abort();
63	}	64	}
64		65
		66	_LIBCPP_END_EXPLICIT_ABI_ANNOTATIONS
65	_LIBCPP_END_NAMESPACE_STD	67	_LIBCPP_END_NAMESPACE_STD

lib/libcxxabi/include/__cxxabi_config.h+6

...	@@ -128,4 +128,10 @@	...	@@ -128,4 +128,10 @@
128	# define _LIBCXXABI_NOEXCEPT noexcept	128	# define _LIBCXXABI_NOEXCEPT noexcept
129	#endif	129	#endif
130		130
		131	#if defined(__POINTER_FIELD_PROTECTION_ABI__)
		132	# define _LIBCXXABI_DISABLE_POINTER_FIELD_PROTECTION [[_Clang::__no_field_protection__]]
		133	#else
		134	# define _LIBCXXABI_DISABLE_POINTER_FIELD_PROTECTION
		135	#endif
		136
131	#endif // ____CXXABI_CONFIG_H	137	#endif // ____CXXABI_CONFIG_H

lib/libcxxabi/include/cxxabi.h+13-12

 @@ -19,8 +19,7 @@
 #include <__cxxabi_config.h>
-#define _LIBCPPABI_VERSION 15000
+#define _LIBCPPABI_VERSION 230000
-#define _LIBCXXABI_NORETURN  __attribute__((noreturn))
 #define _LIBCXXABI_ALWAYS_COLD __attribute__((cold))
 #ifdef __cplusplus
 @@ -31,7 +30,7 @@ class _LIBCXXABI_TYPE_VIS type_info; // forward declaration
 #else
 class type_info; // forward declaration
 #endif
-}
+} // namespace std
 // runtime routines use C calling conventions, but are in __cxxabiv1 namespace
 @@ -56,7 +55,7 @@ __cxa_init_primary_exception(void* object, std::type_info* tinfo, void(_LIBCXXAB
 #endif
 // 2.4.3 Throwing the Exception Object
-extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void
+[[__noreturn__]] extern _LIBCXXABI_FUNC_VIS void
 __cxa_throw(void *thrown_exception, std::type_info *tinfo,
 #ifdef __wasm__
             void *(_LIBCXXABI_DTOR_FUNC *dest)(void *));
 @@ -80,22 +79,22 @@ extern _LIBCXXABI_FUNC_VIS std::type_info *__cxa_current_exception_type();
 // GNU extension
 // Calls `terminate` with the current exception being caught. This function is used by GCC when a `noexcept` function
 // throws an exception inside a try/catch block and doesn't catch it.
-extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_call_terminate(void*) _LIBCXXABI_NOEXCEPT;
+[[__noreturn__]] extern _LIBCXXABI_FUNC_VIS void __cxa_call_terminate(void*) _LIBCXXABI_NOEXCEPT;
 // 2.5.4 Rethrowing Exceptions
-extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_rethrow();
+[[__noreturn__]] extern _LIBCXXABI_FUNC_VIS void __cxa_rethrow();
 // 2.6 Auxiliary Runtime APIs
-extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_cast(void);
+[[__noreturn__]] extern _LIBCXXABI_FUNC_VIS void __cxa_bad_cast(void);
-extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_typeid(void);
+[[__noreturn__]] extern _LIBCXXABI_FUNC_VIS void __cxa_bad_typeid(void);
-extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void
+[[__noreturn__]] extern _LIBCXXABI_FUNC_VIS void
 __cxa_throw_bad_array_new_length(void);
 // 3.2.6 Pure Virtual Function API
-extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_pure_virtual(void);
+[[__noreturn__]] extern _LIBCXXABI_FUNC_VIS void __cxa_pure_virtual(void);
 // 3.2.7 Deleted Virtual Function API
-extern _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_deleted_virtual(void);
+[[__noreturn__]] extern _LIBCXXABI_FUNC_VIS void __cxa_deleted_virtual(void);
 // 3.3.2 One-time Construction API
 #if defined(_LIBCXXABI_GUARD_ABI_ARM)
 @@ -180,7 +179,9 @@ __cxa_decrement_exception_refcount(void *primary_exception) _LIBCXXABI_NOEXCEPT;
 extern _LIBCXXABI_FUNC_VIS bool __cxa_uncaught_exception() _LIBCXXABI_NOEXCEPT;
 extern _LIBCXXABI_FUNC_VIS unsigned int __cxa_uncaught_exceptions() _LIBCXXABI_NOEXCEPT;
-#if defined(__linux__) || defined(__Fuchsia__)
+// zig patch: haiku support
+// zig patch: serenity support
+#if defined(__linux__) || defined(__Fuchsia__) || defined(__HAIKU__) || defined(__serenity__)
 // Linux and Fuchsia TLS support. Not yet an official part of the Itanium ABI.
 // https://sourceware.org/glibc/wiki/Destructor%20support%20for%20thread_local%20variables
 extern _LIBCXXABI_FUNC_VIS int __cxa_thread_atexit(void (*)(void *), void *,

lib/libcxxabi/src/abort_message.h+1-1

...	@@ -11,7 +11,7 @@	...	@@ -11,7 +11,7 @@
11		11
12	#include "cxxabi.h"	12	#include "cxxabi.h"
13		13
14	extern "C" _LIBCXXABI_HIDDEN _LIBCXXABI_NORETURN void	14	extern "C" [[noreturn]] _LIBCXXABI_HIDDEN void
15	__abort_message(const char *format, ...) __attribute__((format(printf, 1, 2)));	15	__abort_message(const char *format, ...) __attribute__((format(printf, 1, 2)));
16		16
17	#ifndef _LIBCXXABI_ASSERT	17	#ifndef _LIBCXXABI_ASSERT

lib/libcxxabi/src/cxa_aux_runtime.cpp+3-3

...	@@ -16,7 +16,7 @@	...	@@ -16,7 +16,7 @@
16		16
17	namespace __cxxabiv1 {	17	namespace __cxxabiv1 {
18	extern "C" {	18	extern "C" {
19	_LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_cast(void) {	19	[[noreturn]] _LIBCXXABI_FUNC_VIS void __cxa_bad_cast(void) {
20	#ifndef _LIBCXXABI_NO_EXCEPTIONS	20	#ifndef _LIBCXXABI_NO_EXCEPTIONS
21	throw std::bad_cast();	21	throw std::bad_cast();
22	#else	22	#else
...	@@ -24,7 +24,7 @@ _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_cast(void) {	...	@@ -24,7 +24,7 @@ _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_cast(void) {
24	#endif	24	#endif
25	}	25	}
26		26
27	_LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_typeid(void) {	27	[[noreturn]] _LIBCXXABI_FUNC_VIS void __cxa_bad_typeid(void) {
28	#ifndef _LIBCXXABI_NO_EXCEPTIONS	28	#ifndef _LIBCXXABI_NO_EXCEPTIONS
29	throw std::bad_typeid();	29	throw std::bad_typeid();
30	#else	30	#else
...	@@ -32,7 +32,7 @@ _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_typeid(void) {	...	@@ -32,7 +32,7 @@ _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void __cxa_bad_typeid(void) {
32	#endif	32	#endif
33	}	33	}
34		34
35	_LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN void	35	[[noreturn]] _LIBCXXABI_FUNC_VIS void
36	__cxa_throw_bad_array_new_length(void) {	36	__cxa_throw_bad_array_new_length(void) {
37	#ifndef _LIBCXXABI_NO_EXCEPTIONS	37	#ifndef _LIBCXXABI_NO_EXCEPTIONS
38	throw std::bad_array_new_length();	38	throw std::bad_array_new_length();

lib/libcxxabi/src/cxa_default_handlers.cpp+4-6

 @@ -24,8 +24,7 @@
 static constinit const char* cause = "uncaught";
 #  ifndef _LIBCXXABI_NO_EXCEPTIONS
-__attribute__((noreturn))
+[[noreturn]] static void demangling_terminate_handler()
-static void demangling_terminate_handler()
 {
     using namespace __cxxabiv1;
     __cxa_eh_globals* globals = __cxa_get_globals_fast();
 @@ -78,15 +77,14 @@ static void demangling_terminate_handler()
     }
 }
 #else // !_LIBCXXABI_NO_EXCEPTIONS
-__attribute__((noreturn))
+[[noreturn]] static void demangling_terminate_handler()
-static void demangling_terminate_handler()
 {
+    (void)cause;
     __abort_message("terminating");
 }
 #endif // !_LIBCXXABI_NO_EXCEPTIONS
-__attribute__((noreturn))
+[[noreturn]] static void demangling_unexpected_handler()
-static void demangling_unexpected_handler()
 {
     cause = "unexpected";
     std::terminate();

lib/libcxxabi/src/cxa_exception.cpp+1-1

...	@@ -140,7 +140,7 @@ exception_cleanup_func(_Unwind_Reason_Code reason, _Unwind_Exception* unwind_exc	...	@@ -140,7 +140,7 @@ exception_cleanup_func(_Unwind_Reason_Code reason, _Unwind_Exception* unwind_exc
140	__cxa_decrement_exception_refcount(unwind_exception + 1);	140	__cxa_decrement_exception_refcount(unwind_exception + 1);
141	}	141	}
142		142
143	static _LIBCXXABI_NORETURN void failed_throw(__cxa_exception* exception_header) {	143	[[noreturn]] static void failed_throw(__cxa_exception* exception_header) {
144	// Section 2.5.3 says:	144	// Section 2.5.3 says:
145	// * For purposes of this ABI, several things are considered exception handlers:	145	// * For purposes of this ABI, several things are considered exception handlers:
146	// ** A terminate() call due to a throw.	146	// ** A terminate() call due to a throw.

lib/libcxxabi/src/cxa_guard_impl.h+1-1

...	@@ -637,7 +637,7 @@ struct GlobalStatic {	...	@@ -637,7 +637,7 @@ struct GlobalStatic {
637	static T instance;	637	static T instance;
638	};	638	};
639	template <class T>	639	template <class T>
640	_LIBCPP_CONSTINIT T GlobalStatic<T>::instance = {};	640	constinit T GlobalStatic<T>::instance = {};
641		641
642	enum class Implementation { NoThreads, GlobalMutex, Futex };	642	enum class Implementation { NoThreads, GlobalMutex, Futex };
643		643

lib/libcxxabi/src/cxa_handlers.cpp+2-4

...	@@ -36,8 +36,7 @@ __unexpected(unexpected_handler func)	...	@@ -36,8 +36,7 @@ __unexpected(unexpected_handler func)
36	__abort_message("unexpected_handler unexpectedly returned");	36	__abort_message("unexpected_handler unexpectedly returned");
37	}	37	}
38		38
39	__attribute__((noreturn))	39	[[noreturn]] void
40	void
41	unexpected()	40	unexpected()
42	{	41	{
43	__unexpected(get_unexpected());	42	__unexpected(get_unexpected());
...	@@ -69,8 +68,7 @@ __terminate(terminate_handler func) noexcept	...	@@ -69,8 +68,7 @@ __terminate(terminate_handler func) noexcept
69	#endif // _LIBCXXABI_NO_EXCEPTIONS	68	#endif // _LIBCXXABI_NO_EXCEPTIONS
70	}	69	}
71		70
72	__attribute__((noreturn))	71	[[noreturn]] void
73	void
74	terminate() noexcept	72	terminate() noexcept
75	{	73	{
76	#ifndef _LIBCXXABI_NO_EXCEPTIONS	74	#ifndef _LIBCXXABI_NO_EXCEPTIONS

lib/libcxxabi/src/cxa_handlers.h+2-2

...	@@ -19,11 +19,11 @@	...	@@ -19,11 +19,11 @@
19	namespace std	19	namespace std
20	{	20	{
21		21
22	_LIBCXXABI_HIDDEN _LIBCXXABI_NORETURN	22	[[noreturn]] _LIBCXXABI_HIDDEN
23	void	23	void
24	__unexpected(unexpected_handler func);	24	__unexpected(unexpected_handler func);
25		25
26	_LIBCXXABI_HIDDEN _LIBCXXABI_NORETURN	26	[[noreturn]] _LIBCXXABI_HIDDEN
27	void	27	void
28	__terminate(terminate_handler func) noexcept;	28	__terminate(terminate_handler func) noexcept;
29		29

lib/libcxxabi/src/cxa_personality.cpp+3-15

 @@ -23,7 +23,7 @@
 #if __has_feature(ptrauth_calls)
-// CXXABI depends on defintions in libunwind as pointer auth couples the
+// CXXABI depends on definitions in libunwind as pointer auth couples the
 // definitions
 #  include "libunwind.h"
 @@ -67,15 +67,6 @@
 #  pragma clang diagnostic ignored "-Wmissing-prototypes"
 #endif
-// TODO: This is a temporary workaround for libc++abi to recognize that it's being
-// built against LLVM's libunwind. LLVM's libunwind started reporting _LIBUNWIND_VERSION
-// in LLVM 15 -- we can remove this workaround after shipping LLVM 17. Once we remove
-// this workaround, it won't be possible to build libc++abi against libunwind headers
-// from LLVM 14 and before anymore.
-#if defined(____LIBUNWIND_CONFIG_H__) && !defined(_LIBUNWIND_VERSION)
-#   define _LIBUNWIND_VERSION
-#endif
 #if defined(__SEH__) && !defined(__USING_SJLJ_EXCEPTIONS__)
 #include <windows.h>
 #include <winnt.h>
 @@ -1125,9 +1116,7 @@ __gxx_personality_seh0(PEXCEPTION_RECORD ms_exc, void *this_frame,
 #else
-// zig patch: https://github.com/llvm/llvm-project/issues/194232
+extern "C" _Unwind_Reason_Code __gnu_unwind_frame(_Unwind_Exception*, _Unwind_Context*);
-extern "C" _Unwind_Reason_Code __gnu_unwind_frame(_Unwind_Exception*,
-                                                  _Unwind_Context*);
 // Helper function to unwind one frame.
 // ARM EHABI 7.3 and 7.4: If the personality function returns _URC_CONTINUE_UNWIND, the
 @@ -1283,8 +1272,7 @@ __gxx_personality_v0(_Unwind_State state,
 #endif
-__attribute__((noreturn))
+[[noreturn]] _LIBCXXABI_FUNC_VIS void
-_LIBCXXABI_FUNC_VIS void
 __cxa_call_unexpected(void* arg)
 {
     _Unwind_Exception* unwind_exception = static_cast<_Unwind_Exception*>(arg);

lib/libcxxabi/src/cxa_thread_atexit.cpp+3-1

...	@@ -106,7 +106,9 @@ namespace {	...	@@ -106,7 +106,9 @@ namespace {
106		106
107	#endif // HAVE___CXA_THREAD_ATEXIT_IMPL	107	#endif // HAVE___CXA_THREAD_ATEXIT_IMPL
108		108
109	#if defined(__linux__) \|\| defined(__Fuchsia__)	109	// zig patch: haiku support
		110	// zig patch: serenity support
		111	#if defined(__linux__) \|\| defined(__Fuchsia__) \|\| defined(__HAIKU__) \|\| defined(__serenity__)
110	extern "C" {	112	extern "C" {
111		113
112	_LIBCXXABI_FUNC_VIS int __cxa_thread_atexit(Dtor dtor, void* obj, void* dso_symbol) throw() {	114	_LIBCXXABI_FUNC_VIS int __cxa_thread_atexit(Dtor dtor, void* obj, void* dso_symbol) throw() {

lib/libcxxabi/src/cxa_vector.cpp+1-2

...	@@ -116,8 +116,7 @@ namespace {	...	@@ -116,8 +116,7 @@ namespace {
116	//	116	//
117		117
118	namespace {	118	namespace {
119	_LIBCXXABI_NORETURN	119	[[noreturn]] void throw_bad_array_new_length() {
120	void throw_bad_array_new_length() {
121	#ifndef _LIBCXXABI_NO_EXCEPTIONS	120	#ifndef _LIBCXXABI_NO_EXCEPTIONS
122	throw std::bad_array_new_length();	121	throw std::bad_array_new_length();
123	#else	122	#else

lib/libcxxabi/src/cxa_virtual.cpp+2-2

...	@@ -11,12 +11,12 @@	...	@@ -11,12 +11,12 @@
11		11
12	namespace __cxxabiv1 {	12	namespace __cxxabiv1 {
13	extern "C" {	13	extern "C" {
14	_LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN	14	[[noreturn]] _LIBCXXABI_FUNC_VIS
15	void __cxa_pure_virtual(void) {	15	void __cxa_pure_virtual(void) {
16	__abort_message("Pure virtual function called!");	16	__abort_message("Pure virtual function called!");
17	}	17	}
18		18
19	_LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN	19	[[noreturn]] _LIBCXXABI_FUNC_VIS
20	void __cxa_deleted_virtual(void) {	20	void __cxa_deleted_virtual(void) {
21	__abort_message("Deleted virtual function called!");	21	__abort_message("Deleted virtual function called!");
22	}	22	}

lib/libcxxabi/src/demangle/ItaniumDemangle.h+54

...	@@ -1537,6 +1537,27 @@ public:	...	@@ -1537,6 +1537,27 @@ public:
1537	}	1537	}
1538	};	1538	};
1539		1539
		1540	class PackIndexing final : public Node {
		1541	const Node *Pattern;
		1542	const Node *Index;
		1543
		1544	public:
		1545	PackIndexing(const Node Pattern_, const Node Index_)
		1546	: Node(KPackIndexing), Pattern(Pattern_), Index(Index_) {}
		1547
		1548	template <typename Fn> void match(Fn F) const { F(Pattern, Index); }
		1549
		1550	void printLeft(OutputBuffer &OB) const override {
		1551	OB.printOpen('(');
		1552	ParameterPackExpansion PPE(Pattern);
		1553	PPE.printLeft(OB);
		1554	OB.printClose(')');
		1555	OB.printOpen('[');
		1556	OB.printLeft(*Index);
		1557	OB.printClose(']');
		1558	}
		1559	};
		1560
1540	class TemplateArgs final : public Node {	1561	class TemplateArgs final : public Node {
1541	NodeArray Params;	1562	NodeArray Params;
1542	Node *Requires;	1563	Node *Requires;
...	@@ -4531,6 +4552,18 @@ Node *AbstractManglingParser<Derived, Alloc>::parseType() {	...	@@ -4531,6 +4552,18 @@ Node *AbstractManglingParser<Derived, Alloc>::parseType() {
4531	Result = make<ParameterPackExpansion>(Child);	4552	Result = make<ParameterPackExpansion>(Child);
4532	break;	4553	break;
4533	}	4554	}
		4555	// ::= Dy <type> <expression> # pack indexing (C++26)
		4556	case 'y': {
		4557	First += 2;
		4558	Node *Pattern = getDerived().parseType();
		4559	if (!Pattern)
		4560	return nullptr;
		4561	Node *Index = getDerived().parseExpr();
		4562	if (!Index)
		4563	return nullptr;
		4564	Result = make<PackIndexing>(Pattern, Index);
		4565	break;
		4566	}
4534	// Exception specifier on a function type.	4567	// Exception specifier on a function type.
4535	case 'o':	4568	case 'o':
4536	case 'O':	4569	case 'O':
...	@@ -5375,6 +5408,16 @@ Node *AbstractManglingParser<Derived, Alloc>::parseExpr() {	...	@@ -5375,6 +5408,16 @@ Node *AbstractManglingParser<Derived, Alloc>::parseExpr() {
5375	return nullptr;	5408	return nullptr;
5376	return make<ParameterPackExpansion>(Child);	5409	return make<ParameterPackExpansion>(Child);
5377	}	5410	}
		5411	if (consumeIf("sy")) {
		5412	Node *Pattern = look() == 'T' ? getDerived().parseTemplateParam()
		5413	: getDerived().parseFunctionParam();
		5414	if (Pattern == nullptr)
		5415	return nullptr;
		5416	Node *Index = getDerived().parseExpr();
		5417	if (Index == nullptr)
		5418	return nullptr;
		5419	return make<PackIndexing>(Pattern, Index);
		5420	}
5378	if (consumeIf("sZ")) {	5421	if (consumeIf("sZ")) {
5379	if (look() == 'T') {	5422	if (look() == 'T') {
5380	Node *R = getDerived().parseTemplateParam();	5423	Node *R = getDerived().parseTemplateParam();
...	@@ -6157,8 +6200,17 @@ AbstractManglingParser<Derived, Alloc>::parseTemplateArgs(bool TagTemplates) {	...	@@ -6157,8 +6200,17 @@ AbstractManglingParser<Derived, Alloc>::parseTemplateArgs(bool TagTemplates) {
6157	// extension ::= ___Z <encoding> _block_invoke	6200	// extension ::= ___Z <encoding> _block_invoke
6158	// extension ::= ___Z <encoding> _block_invoke<decimal-digit>+	6201	// extension ::= ___Z <encoding> _block_invoke<decimal-digit>+
6159	// extension ::= ___Z <encoding> _block_invoke_<decimal-digit>+	6202	// extension ::= ___Z <encoding> _block_invoke_<decimal-digit>+
		6203	// extension ::= __alloc_token__Z <encoding>
		6204	// extension ::= __alloc_token_<decimal-digit>+__Z <encoding>
6160	template <typename Derived, typename Alloc>	6205	template <typename Derived, typename Alloc>
6161	Node *AbstractManglingParser<Derived, Alloc>::parse(bool ParseParams) {	6206	Node *AbstractManglingParser<Derived, Alloc>::parse(bool ParseParams) {
		6207	bool AllocToken = consumeIf("__alloc_token_");
		6208	if (AllocToken) {
		6209	const char *Saved = First;
		6210	if (parseNumber().empty() \|\| !consumeIf('_'))
		6211	First = Saved;
		6212	}
		6213
6162	if (consumeIf("_Z") \|\| consumeIf("__Z")) {	6214	if (consumeIf("_Z") \|\| consumeIf("__Z")) {
6163	Node *Encoding = getDerived().parseEncoding(ParseParams);	6215	Node *Encoding = getDerived().parseEncoding(ParseParams);
6164	if (Encoding == nullptr)	6216	if (Encoding == nullptr)
...	@@ -6168,6 +6220,8 @@ Node *AbstractManglingParser<Derived, Alloc>::parse(bool ParseParams) {	...	@@ -6168,6 +6220,8 @@ Node *AbstractManglingParser<Derived, Alloc>::parse(bool ParseParams) {
6168	make<DotSuffix>(Encoding, std::string_view(First, Last - First));	6220	make<DotSuffix>(Encoding, std::string_view(First, Last - First));
6169	First = Last;	6221	First = Last;
6170	}	6222	}
		6223	if (AllocToken)
		6224	Encoding = make<DotSuffix>(Encoding, ".alloc_token");
6171	if (numLeft() != 0)	6225	if (numLeft() != 0)
6172	return nullptr;	6226	return nullptr;
6173	return Encoding;	6227	return Encoding;

lib/libcxxabi/src/demangle/ItaniumNodes.def+1-1

...	@@ -100,5 +100,5 @@ NODE(ExprRequirement)	...	@@ -100,5 +100,5 @@ NODE(ExprRequirement)
100	NODE(TypeRequirement)	100	NODE(TypeRequirement)
101	NODE(NestedRequirement)	101	NODE(NestedRequirement)
102	NODE(ExplicitObjectParameter)	102	NODE(ExplicitObjectParameter)
103		103	NODE(PackIndexing)
104	#undef NODE	104	#undef NODE

lib/libcxxabi/src/demangle/Utility.h+1-1

...	@@ -31,7 +31,7 @@ class Node;	...	@@ -31,7 +31,7 @@ class Node;
31		31
32	// Stream that AST nodes write their string representation into after the AST	32	// Stream that AST nodes write their string representation into after the AST
33	// has been parsed.	33	// has been parsed.
34	class OutputBuffer {	34	class DEMANGLE_ABI OutputBuffer {
35	char *Buffer = nullptr;	35	char *Buffer = nullptr;
36	size_t CurrentPosition = 0;	36	size_t CurrentPosition = 0;
37	size_t BufferCapacity = 0;	37	size_t BufferCapacity = 0;

lib/libcxxabi/src/fallback_malloc.cpp+2-2

...	@@ -35,9 +35,9 @@ namespace {	...	@@ -35,9 +35,9 @@ namespace {
35		35
36	// When POSIX threads are not available, make the mutex operations a nop	36	// When POSIX threads are not available, make the mutex operations a nop
37	#ifndef _LIBCXXABI_HAS_NO_THREADS	37	#ifndef _LIBCXXABI_HAS_NO_THREADS
38	static _LIBCPP_CONSTINIT std::__libcpp_mutex_t heap_mutex = _LIBCPP_MUTEX_INITIALIZER;	38	static constinit std::__libcpp_mutex_t heap_mutex = _LIBCPP_MUTEX_INITIALIZER;
39	#else	39	#else
40	static _LIBCPP_CONSTINIT void* heap_mutex = 0;	40	static constinit void* heap_mutex = 0;
41	#endif	41	#endif
42		42
43	class mutexor {	43	class mutexor {

lib/libcxxabi/src/private_typeinfo.cpp+18-20

...	@@ -99,28 +99,27 @@ struct derived_object_info {	...	@@ -99,28 +99,27 @@ struct derived_object_info {
99	};	99	};
100		100
101	/// A helper function that gets (dynamic_ptr, dynamic_type, offset_to_derived) from static_ptr.	101	/// A helper function that gets (dynamic_ptr, dynamic_type, offset_to_derived) from static_ptr.
102	void dyn_cast_get_derived_info(derived_object_info* info, const void* static_ptr)	102	derived_object_info dyn_cast_get_derived_info(const void* static_ptr) {
103	{	103	derived_object_info info;
104	#if __has_feature(cxx_abi_relative_vtable)	104	#if __has_feature(cxx_abi_relative_vtable)
105	// The vtable address will point to the first virtual function, which is 8	105	// The vtable address will point to the first virtual function, which is 8
106	// bytes after the start of the vtable (4 for the offset from top + 4 for	106	// bytes after the start of the vtable (4 for the offset from top + 4 for
107	// the typeinfo component).	107	// the typeinfo component).
108	const int32_t* vtable =	108	const int32_t* vtable = reinterpret_cast<const int32_t const*>(static_ptr);
109	reinterpret_cast<const int32_t const*>(static_ptr);	109	info.offset_to_derived = static_cast<std::ptrdiff_t>(vtable[-2]);
110	info->offset_to_derived = static_cast<std::ptrdiff_t>(vtable[-2]);	110	info.dynamic_ptr = static_cast<const char*>(static_ptr) + info.offset_to_derived;
111	info->dynamic_ptr = static_cast<const char*>(static_ptr) + info->offset_to_derived;	111
112		112	// The typeinfo component is now a relative offset to a proxy.
113	// The typeinfo component is now a relative offset to a proxy.	113	int32_t offset_to_ti_proxy = vtable[-1];
114	int32_t offset_to_ti_proxy = vtable[-1];	114	const uint8_t* ptr_to_ti_proxy = reinterpret_cast<const uint8_t*>(vtable) + offset_to_ti_proxy;
115	const uint8_t* ptr_to_ti_proxy =	115	info.dynamic_type = (reinterpret_cast<const __class_type_info const*>(ptr_to_ti_proxy));
116	reinterpret_cast<const uint8_t*>(vtable) + offset_to_ti_proxy;
117	info->dynamic_type = (reinterpret_cast<const __class_type_info const*>(ptr_to_ti_proxy));
118	#else	116	#else
119	void** vtable = strip_vtable(static_cast<void* const*>(static_ptr));	117	void** vtable = strip_vtable(static_cast<void* const*>(static_ptr));
120	info->offset_to_derived = reinterpret_cast<ptrdiff_t>(vtable[-2]);	118	info.offset_to_derived = reinterpret_cast<ptrdiff_t>(vtable[-2]);
121	info->dynamic_ptr = static_cast<const char*>(static_ptr) + info->offset_to_derived;	119	info.dynamic_ptr = static_cast<const char*>(static_ptr) + info.offset_to_derived;
122	info->dynamic_type = static_cast<const __class_type_info*>(vtable[-1]);	120	info.dynamic_type = static_cast<const __class_type_info*>(vtable[-1]);
123	#endif	121	#endif
		122	return info;
124	}	123	}
125		124
126	/// A helper function for __dynamic_cast that casts a base sub-object pointer	125	/// A helper function for __dynamic_cast that casts a base sub-object pointer
...	@@ -915,8 +914,7 @@ __dynamic_cast(const void static_ptr, const __class_type_info static_type,	...	@@ -915,8 +914,7 @@ __dynamic_cast(const void static_ptr, const __class_type_info static_type,
915	const __class_type_info *dst_type,	914	const __class_type_info *dst_type,
916	std::ptrdiff_t src2dst_offset) {	915	std::ptrdiff_t src2dst_offset) {
917	// Get (dynamic_ptr, dynamic_type) from static_ptr	916	// Get (dynamic_ptr, dynamic_type) from static_ptr
918	derived_object_info derived_info;	917	derived_object_info derived_info = dyn_cast_get_derived_info(static_ptr);
919	dyn_cast_get_derived_info(&derived_info, static_ptr);
920		918
921	// Initialize answer to nullptr. This will be changed from the search	919	// Initialize answer to nullptr. This will be changed from the search
922	// results if a non-null answer is found. Regardless, this is what will	920	// results if a non-null answer is found. Regardless, this is what will

lib/libcxxabi/src/private_typeinfo.h+3-3

...	@@ -145,7 +145,7 @@ public:	...	@@ -145,7 +145,7 @@ public:
145	// Has one non-virtual public base class at offset zero	145	// Has one non-virtual public base class at offset zero
146	class _LIBCXXABI_TYPE_VIS __si_class_type_info : public __class_type_info {	146	class _LIBCXXABI_TYPE_VIS __si_class_type_info : public __class_type_info {
147	public:	147	public:
148	const __class_type_info *__base_type;	148	_LIBCXXABI_DISABLE_POINTER_FIELD_PROTECTION const __class_type_info* __base_type;
149		149
150	_LIBCXXABI_HIDDEN virtual ~__si_class_type_info();	150	_LIBCXXABI_HIDDEN virtual ~__si_class_type_info();
151		151
...	@@ -204,7 +204,7 @@ public:	...	@@ -204,7 +204,7 @@ public:
204	class _LIBCXXABI_TYPE_VIS __pbase_type_info : public __shim_type_info {	204	class _LIBCXXABI_TYPE_VIS __pbase_type_info : public __shim_type_info {
205	public:	205	public:
206	unsigned int __flags;	206	unsigned int __flags;
207	const __shim_type_info *__pointee;	207	_LIBCXXABI_DISABLE_POINTER_FIELD_PROTECTION const __shim_type_info* __pointee;
208		208
209	enum __masks {	209	enum __masks {
210	__const_mask = 0x1,	210	__const_mask = 0x1,
...	@@ -245,7 +245,7 @@ public:	...	@@ -245,7 +245,7 @@ public:
245	class _LIBCXXABI_TYPE_VIS __pointer_to_member_type_info	245	class _LIBCXXABI_TYPE_VIS __pointer_to_member_type_info
246	: public __pbase_type_info {	246	: public __pbase_type_info {
247	public:	247	public:
248	const __class_type_info *__context;	248	_LIBCXXABI_DISABLE_POINTER_FIELD_PROTECTION const __class_type_info* __context;
249		249
250	_LIBCXXABI_HIDDEN virtual ~__pointer_to_member_type_info();	250	_LIBCXXABI_HIDDEN virtual ~__pointer_to_member_type_info();
251	_LIBCXXABI_HIDDEN virtual bool can_catch(const __shim_type_info *,	251	_LIBCXXABI_HIDDEN virtual bool can_catch(const __shim_type_info *,

lib/libcxxabi/src/stdlib_new_delete.cpp+16-20

 @@ -20,10 +20,6 @@
 #  error The _THROW_BAD_ALLOC macro should be already defined by libc++
 #endif
-#ifndef _LIBCPP_WEAK
-#  error The _LIBCPP_WEAK macro should be already defined by libc++
-#endif
 #if defined(_LIBCXXABI_NO_EXCEPTIONS) != !_LIBCPP_HAS_EXCEPTIONS
 #  error libc++ and libc++abi seem to disagree on whether exceptions are enabled
 #endif
 @@ -70,7 +66,7 @@ OVERRIDABLE_FUNCTION void* operator new(std::size_t size) _THROW_BAD_ALLOC {
   return p;
 }
-_LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept {
+[[gnu::weak]] void* operator new(size_t size, const std::nothrow_t&) noexcept {
 #if !_LIBCPP_HAS_EXCEPTIONS
 #  if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
 @@ -96,7 +92,7 @@ _LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept {
 OVERRIDABLE_FUNCTION void* operator new[](size_t size) _THROW_BAD_ALLOC { return ::operator new(size); }
-_LIBCPP_WEAK void* operator new[](size_t size, const std::nothrow_t&) noexcept {
+[[gnu::weak]] void* operator new[](size_t size, const std::nothrow_t&) noexcept {
 #if !_LIBCPP_HAS_EXCEPTIONS
 #  if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
 @@ -120,17 +116,17 @@ _LIBCPP_WEAK void* operator new[](size_t size, const std::nothrow_t&) noexcept {
 #endif
 }
-_LIBCPP_WEAK void operator delete(void* ptr) noexcept { std::free(ptr); }
+[[gnu::weak]] void operator delete(void* ptr) noexcept { std::free(ptr); }
-_LIBCPP_WEAK void operator delete(void* ptr, const std::nothrow_t&) noexcept { ::operator delete(ptr); }
+[[gnu::weak]] void operator delete(void* ptr, const std::nothrow_t&) noexcept { ::operator delete(ptr); }
-_LIBCPP_WEAK void operator delete(void* ptr, size_t) noexcept { ::operator delete(ptr); }
+[[gnu::weak]] void operator delete(void* ptr, size_t) noexcept { ::operator delete(ptr); }
-_LIBCPP_WEAK void operator delete[](void* ptr) noexcept { ::operator delete(ptr); }
+[[gnu::weak]] void operator delete[](void* ptr) noexcept { ::operator delete(ptr); }
-_LIBCPP_WEAK void operator delete[](void* ptr, const std::nothrow_t&) noexcept { ::operator delete[](ptr); }
+[[gnu::weak]] void operator delete[](void* ptr, const std::nothrow_t&) noexcept { ::operator delete[](ptr); }
-_LIBCPP_WEAK void operator delete[](void* ptr, size_t) noexcept { ::operator delete[](ptr); }
+[[gnu::weak]] void operator delete[](void* ptr, size_t) noexcept { ::operator delete[](ptr); }
 #if _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
 @@ -161,7 +157,7 @@ OVERRIDABLE_FUNCTION void* operator new(std::size_t size, std::align_val_t align
   return p;
 }
-_LIBCPP_WEAK void* operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
+[[gnu::weak]] void* operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
 #  if !_LIBCPP_HAS_EXCEPTIONS
 #    if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
 @@ -189,7 +185,7 @@ OVERRIDABLE_FUNCTION void* operator new[](size_t size, std::align_val_t alignmen
   return ::operator new(size, alignment);
 }
-_LIBCPP_WEAK void* operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
+[[gnu::weak]] void* operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
 #  if !_LIBCPP_HAS_EXCEPTIONS
 #    if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
   _LIBCPP_ASSERT_SHIM(
 @@ -213,25 +209,25 @@ _LIBCPP_WEAK void* operator new[](size_t size, std::align_val_t alignment, const
 #  endif
 }
-_LIBCPP_WEAK void operator delete(void* ptr, std::align_val_t) noexcept { std::__libcpp_aligned_free(ptr); }
+[[gnu::weak]] void operator delete(void* ptr, std::align_val_t) noexcept { std::__libcpp_aligned_free(ptr); }
-_LIBCPP_WEAK void operator delete(void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept {
+[[gnu::weak]] void operator delete(void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept {
   ::operator delete(ptr, alignment);
 }
-_LIBCPP_WEAK void operator delete(void* ptr, size_t, std::align_val_t alignment) noexcept {
+[[gnu::weak]] void operator delete(void* ptr, size_t, std::align_val_t alignment) noexcept {
   ::operator delete(ptr, alignment);
 }
-_LIBCPP_WEAK void operator delete[](void* ptr, std::align_val_t alignment) noexcept {
+[[gnu::weak]] void operator delete[](void* ptr, std::align_val_t alignment) noexcept {
   ::operator delete(ptr, alignment);
 }
-_LIBCPP_WEAK void operator delete[](void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept {
+[[gnu::weak]] void operator delete[](void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept {
   ::operator delete[](ptr, alignment);
 }
-_LIBCPP_WEAK void operator delete[](void* ptr, size_t, std::align_val_t alignment) noexcept {
+[[gnu::weak]] void operator delete[](void* ptr, size_t, std::align_val_t alignment) noexcept {
   ::operator delete[](ptr, alignment);
 }

lib/libtsan/interception/interception.h+10

...	@@ -362,6 +362,16 @@ const interpose_substitution substitution_##func_name[] \	...	@@ -362,6 +362,16 @@ const interpose_substitution substitution_##func_name[] \
362	// so we use casts via uintptr_t (the local __sanitizer::uptr equivalent).	362	// so we use casts via uintptr_t (the local __sanitizer::uptr equivalent).
363	namespace __interception {	363	namespace __interception {
364		364
		365	// Dynamic library loading helpers (dlopen/LoadLibrary, dlsym/GetProcAddress).
		366	// Implemented in interception_linux.cpp on non-Windows targets and
		367	// interception_win.cpp on Windows.
		368	bool DynamicLoaderAvailable();
		369	void* OpenLibrary(const char* name);
		370	void* LookupSymbol(void* handle, const char* symbol);
		371	void* LookupSymbolDefault(const char* symbol);
		372	void* LookupSymbolNext(const char* symbol);
		373	void* LookupSymbolNextVersioned(const char* symbol, const char* version);
		374
365	#if defined(__ELF__) && !SANITIZER_FUCHSIA	375	#if defined(__ELF__) && !SANITIZER_FUCHSIA
366	// The use of interceptors makes many sanitizers unusable for static linking.	376	// The use of interceptors makes many sanitizers unusable for static linking.
367	// Define a function, if called, will cause a linker error (undefined _DYNAMIC).	377	// Define a function, if called, will cause a linker error (undefined _DYNAMIC).

lib/libtsan/interception/interception_linux.cpp+58-5

...	@@ -9,15 +9,68 @@	...	@@ -9,15 +9,68 @@
9	// This file is a part of AddressSanitizer, an address sanity checker.	9	// This file is a part of AddressSanitizer, an address sanity checker.
10	//	10	//
11	// Linux-specific interception methods.	11	// Linux-specific interception methods.
		12	//
		13	// POSIX dynamic-library helpers (dlopen / dlsym) live here for every
		14	// non-Windows interception target (Linux, *BSD, Darwin, AIX, Fuchsia, ...).
		15	// macOS/AIX/Fuchsia compile this TU for RTInterception but do not use the
		16	// Linux-specific InterceptFunction helpers below.
12	//===----------------------------------------------------------------------===//	17	//===----------------------------------------------------------------------===//
13		18
14	#include "interception.h"	19	#include "interception.h"
15		20
		21	#if !SANITIZER_WINDOWS
		22
		23	# include <dlfcn.h>
		24
		25	# pragma weak dlopen
		26	# pragma weak dlsym
		27	#if SANITIZER_GLIBC \|\| SANITIZER_FREEBSD \|\| SANITIZER_NETBSD
		28	# pragma weak dlvsym
		29	#endif
		30
		31	namespace __interception {
		32
		33	bool DynamicLoaderAvailable() { return dlopen != nullptr && dlsym != nullptr; }
		34
		35	void* OpenLibrary(const char* name) {
		36	if (!DynamicLoaderAvailable())
		37	return nullptr;
		38	return dlopen(name, RTLD_LAZY \| RTLD_LOCAL);
		39	}
		40
		41	void* LookupSymbol(void* handle, const char* symbol) {
		42	if (!DynamicLoaderAvailable())
		43	return nullptr;
		44	return dlsym(handle, symbol);
		45	}
		46
		47	void* LookupSymbolDefault(const char* symbol) {
		48	if (!DynamicLoaderAvailable())
		49	return nullptr;
		50	return dlsym(RTLD_DEFAULT, symbol);
		51	}
		52
		53	void* LookupSymbolNext(const char* symbol) {
		54	if (!DynamicLoaderAvailable())
		55	return nullptr;
		56	return dlsym(RTLD_NEXT, symbol);
		57	}
		58
		59	#if SANITIZER_GLIBC \|\| SANITIZER_FREEBSD \|\| SANITIZER_NETBSD
		60	void* LookupSymbolNextVersioned(const char* symbol, const char* version) {
		61	if (!DynamicLoaderAvailable() \|\| dlvsym == nullptr)
		62	return nullptr;
		63	return dlvsym(RTLD_NEXT, symbol, version);
		64	}
		65	#endif // SANITIZER_GLIBC \|\| SANITIZER_FREEBSD \|\| SANITIZER_NETBSD
		66
		67	} // namespace __interception
		68
		69	#endif // !SANITIZER_WINDOWS
		70
16	#if SANITIZER_LINUX \|\| SANITIZER_FREEBSD \|\| SANITIZER_NETBSD \|\| \	71	#if SANITIZER_LINUX \|\| SANITIZER_FREEBSD \|\| SANITIZER_NETBSD \|\| \
17	SANITIZER_SOLARIS \|\| SANITIZER_HAIKU	72	SANITIZER_SOLARIS \|\| SANITIZER_HAIKU
18		73
19	#include <dlfcn.h> // for dlsym() and dlvsym()
20
21	namespace __interception {	74	namespace __interception {
22		75
23	#if SANITIZER_NETBSD	76	#if SANITIZER_NETBSD
...	@@ -39,14 +92,14 @@ static void GetFuncAddr(const char name, uptr trampoline) {	...	@@ -39,14 +92,14 @@ static void GetFuncAddr(const char name, uptr trampoline) {
39	if (StrCmp(name, "sigaction"))	92	if (StrCmp(name, "sigaction"))
40	name = "__sigaction14";	93	name = "__sigaction14";
41	#endif	94	#endif
42	void *addr = dlsym(RTLD_NEXT, name);	95	void* addr = LookupSymbolNext(name);
43	if (!addr) {	96	if (!addr) {
44	// If the lookup using RTLD_NEXT failed, the sanitizer runtime library is	97	// If the lookup using RTLD_NEXT failed, the sanitizer runtime library is
45	// later in the library search order than the DSO that we are trying to	98	// later in the library search order than the DSO that we are trying to
46	// intercept, which means that we cannot intercept this function. We still	99	// intercept, which means that we cannot intercept this function. We still
47	// want the address of the real definition, though, so look it up using	100	// want the address of the real definition, though, so look it up using
48	// RTLD_DEFAULT.	101	// RTLD_DEFAULT.
49	addr = dlsym(RTLD_DEFAULT, name);	102	addr = LookupSymbolDefault(name);
50		103
51	// In case `name' is not loaded, dlsym ends up finding the actual wrapper.	104	// In case `name' is not loaded, dlsym ends up finding the actual wrapper.
52	// We don't want to intercept the wrapper and have it point to itself.	105	// We don't want to intercept the wrapper and have it point to itself.
...	@@ -66,7 +119,7 @@ bool InterceptFunction(const char name, uptr ptr_to_real, uptr func,	...	@@ -66,7 +119,7 @@ bool InterceptFunction(const char name, uptr ptr_to_real, uptr func,
66	// dlvsym is a GNU extension supported by some other platforms.	119	// dlvsym is a GNU extension supported by some other platforms.
67	#if SANITIZER_GLIBC \|\| SANITIZER_FREEBSD \|\| SANITIZER_NETBSD	120	#if SANITIZER_GLIBC \|\| SANITIZER_FREEBSD \|\| SANITIZER_NETBSD
68	static void GetFuncAddr(const char name, const char *ver) {	121	static void GetFuncAddr(const char name, const char *ver) {
69	return dlvsym(RTLD_NEXT, name, ver);	122	return LookupSymbolNextVersioned(name, ver);
70	}	123	}
71		124
72	bool InterceptFunction(const char name, const char ver, uptr *ptr_to_real,	125	bool InterceptFunction(const char name, const char ver, uptr *ptr_to_real,

lib/libtsan/interception/interception_win.cpp+25

...	@@ -134,6 +134,30 @@	...	@@ -134,6 +134,30 @@
134		134
135	namespace __interception {	135	namespace __interception {
136		136
		137	bool DynamicLoaderAvailable() { return true; }
		138
		139	void* OpenLibrary(const char* name) {
		140	if (!name)
		141	return reinterpret_cast<void*>(GetModuleHandleA(nullptr));
		142	return reinterpret_cast<void*>(LoadLibraryA(name));
		143	}
		144
		145	void* LookupSymbol(void* handle, const char* symbol) {
		146	if (!handle)
		147	return nullptr;
		148	return reinterpret_cast<void*>(reinterpret_cast<__sanitizer::uptr>(
		149	GetProcAddress(reinterpret_cast<HMODULE>(handle), symbol)));
		150	}
		151
		152	void* LookupSymbolDefault(const char* symbol) {
		153	return LookupSymbol(reinterpret_cast<void*>(GetModuleHandleA(nullptr)),
		154	symbol);
		155	}
		156
		157	void* LookupSymbolNext(const char*) { return nullptr; }
		158
		159	void* LookupSymbolNextVersioned(const char, const char) { return nullptr; }
		160
137	static const int kAddressLength = FIRST_32_SECOND_64(4, 8);	161	static const int kAddressLength = FIRST_32_SECOND_64(4, 8);
138	static const int kJumpInstructionLength = 5;	162	static const int kJumpInstructionLength = 5;
139	static const int kShortJumpInstructionLength = 2;	163	static const int kShortJumpInstructionLength = 2;
...	@@ -655,6 +679,7 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) {	...	@@ -655,6 +679,7 @@ static size_t GetInstructionSize(uptr address, size_t* rel_offset = nullptr) {
655	return 2;	679	return 2;
656		680
657	case 0x3980: // 80 39 XX : cmp BYTE PTR [rcx], XX	681	case 0x3980: // 80 39 XX : cmp BYTE PTR [rcx], XX
		682	case 0x3a80: // 80 3A XX : cmp BYTE PTR [rdx], XX
658	case 0x4D8B: // 8B 4D XX : mov XX(%ebp), ecx	683	case 0x4D8B: // 8B 4D XX : mov XX(%ebp), ecx
659	case 0x558B: // 8B 55 XX : mov XX(%ebp), edx	684	case 0x558B: // 8B 55 XX : mov XX(%ebp), edx
660	case 0x758B: // 8B 75 XX : mov XX(%ebp), esp	685	case 0x758B: // 8B 75 XX : mov XX(%ebp), esp

lib/libtsan/sanitizer_common/sanitizer_allocator.cpp+3-2

 @@ -109,14 +109,15 @@ void *InternalReallocArray(void *addr, uptr count, uptr size,
   return InternalRealloc(addr, count * size, cache);
 }
-void *InternalCalloc(uptr count, uptr size, InternalAllocatorCache *cache) {
+void* InternalCalloc(uptr count, uptr size, InternalAllocatorCache* cache,
+                     uptr alignment) {
   if (UNLIKELY(CheckForCallocOverflow(count, size))) {
     Report("FATAL: %s: calloc parameters overflow: count * size (%zd * %zd) "
            "cannot be represented in type size_t\n", SanitizerToolName, count,
            size);
     Die();
   }
-  void *p = InternalAlloc(count * size, cache);
+  void* p = InternalAlloc(count * size, cache, alignment);
   if (LIKELY(p))
     internal_memset(p, 0, count * size);
   return p;

lib/libtsan/sanitizer_common/sanitizer_allocator.h-6

...	@@ -47,12 +47,6 @@ void PrintHintAllocatorCannotReturnNull();	...	@@ -47,12 +47,6 @@ void PrintHintAllocatorCannotReturnNull();
47	// Callback type for iterating over chunks.	47	// Callback type for iterating over chunks.
48	typedef void (ForEachChunkCallback)(uptr chunk, void arg);	48	typedef void (ForEachChunkCallback)(uptr chunk, void arg);
49		49
50	inline u32 Rand(u32 *state) { // ANSI C linear congruential PRNG.
51	return (state = state * 1103515245 + 12345) >> 16;
52	}
53
54	inline u32 RandN(u32 *state, u32 n) { return Rand(state) % n; } // [0, n)
55
56	template<typename T>	50	template<typename T>
57	inline void RandomShuffle(T a, u32 n, u32 rand_state) {	51	inline void RandomShuffle(T a, u32 n, u32 rand_state) {
58	if (n <= 1) return;	52	if (n <= 1) return;

lib/libtsan/sanitizer_common/sanitizer_allocator_dlsym.h+5-5

...	@@ -40,8 +40,8 @@ struct DlSymAllocator {	...	@@ -40,8 +40,8 @@ struct DlSymAllocator {
40	return ptr;	40	return ptr;
41	}	41	}
42		42
43	static void *Callocate(usize nmemb, usize size) {	43	static void* Callocate(usize nmemb, usize size, uptr align = kWordSize) {
44	void *ptr = InternalCalloc(nmemb, size);	44	void* ptr = InternalCalloc(nmemb, size, nullptr, align);
45	CHECK(internal_allocator()->FromPrimary(ptr));	45	CHECK(internal_allocator()->FromPrimary(ptr));
46	Details::OnAllocate(ptr, GetSize(ptr));	46	Details::OnAllocate(ptr, GetSize(ptr));
47	return ptr;	47	return ptr;
...	@@ -53,9 +53,9 @@ struct DlSymAllocator {	...	@@ -53,9 +53,9 @@ struct DlSymAllocator {
53	InternalFree(ptr);	53	InternalFree(ptr);
54	}	54	}
55		55
56	static void Realloc(void ptr, uptr new_size) {	56	static void* Realloc(void* ptr, uptr new_size, uptr align = kWordSize) {
57	if (!ptr)	57	if (!ptr)
58	return Allocate(new_size);	58	return Allocate(new_size, align);
59	CHECK(internal_allocator()->FromPrimary(ptr));	59	CHECK(internal_allocator()->FromPrimary(ptr));
60	if (!new_size) {	60	if (!new_size) {
61	Free(ptr);	61	Free(ptr);
...	@@ -63,7 +63,7 @@ struct DlSymAllocator {	...	@@ -63,7 +63,7 @@ struct DlSymAllocator {
63	}	63	}
64	uptr size = GetSize(ptr);	64	uptr size = GetSize(ptr);
65	uptr memcpy_size = Min(new_size, size);	65	uptr memcpy_size = Min(new_size, size);
66	void *new_ptr = Allocate(new_size);	66	void* new_ptr = Allocate(new_size, align);
67	if (new_ptr)	67	if (new_ptr)
68	internal_memcpy(new_ptr, ptr, memcpy_size);	68	internal_memcpy(new_ptr, ptr, memcpy_size);
69	Free(ptr);	69	Free(ptr);

lib/libtsan/sanitizer_common/sanitizer_allocator_internal.h+3-2

 @@ -45,8 +45,9 @@ void *InternalRealloc(void *p, uptr size,
                       InternalAllocatorCache *cache = nullptr);
 void *InternalReallocArray(void *p, uptr count, uptr size,
                            InternalAllocatorCache *cache = nullptr);
-void *InternalCalloc(uptr count, uptr size,
+void* InternalCalloc(uptr count, uptr size,
-                     InternalAllocatorCache *cache = nullptr);
+                     InternalAllocatorCache* cache = nullptr,
+                     uptr alignment = 0);
 void InternalFree(void *p, InternalAllocatorCache *cache = nullptr);
 void InternalAllocatorLock();
 void InternalAllocatorUnlock();

lib/libtsan/sanitizer_common/sanitizer_asm.h+4-2

...	@@ -61,6 +61,8 @@	...	@@ -61,6 +61,8 @@
61	# define ASM_TAIL_CALL jg	61	# define ASM_TAIL_CALL jg
62	#elif defined(__riscv)	62	#elif defined(__riscv)
63	# define ASM_TAIL_CALL tail	63	# define ASM_TAIL_CALL tail
		64	#elif defined(__hexagon__)
		65	# define ASM_TAIL_CALL jump
64	#endif	66	#endif
65		67
66	// Currently, almost all of the shared libraries rely on the value of	68	// Currently, almost all of the shared libraries rely on the value of
...	@@ -103,8 +105,8 @@	...	@@ -103,8 +105,8 @@
103	# define ASM_SIZE(symbol) .size symbol, .-symbol	105	# define ASM_SIZE(symbol) .size symbol, .-symbol
104	# define ASM_SYMBOL(symbol) symbol	106	# define ASM_SYMBOL(symbol) symbol
105	# define ASM_SYMBOL_INTERCEPTOR(symbol) symbol	107	# define ASM_SYMBOL_INTERCEPTOR(symbol) symbol
106	# if defined(__i386__) \|\| defined(__powerpc__) \|\| defined(__s390__) \|\| \	108	# if defined(__i386__) \|\| defined(__powerpc__) \|\| defined(__s390__) \|\| \
107	defined(__sparc__)	109	defined(__sparc__) \|\| defined(__alpha__)
108	// For details, see interception.h	110	// For details, see interception.h
109	# define ASM_WRAPPER_NAME(symbol) __interceptor_##symbol	111	# define ASM_WRAPPER_NAME(symbol) __interceptor_##symbol
110	# define ASM_TRAMPOLINE_ALIAS(symbol, name) \	112	# define ASM_TRAMPOLINE_ALIAS(symbol, name) \

lib/libtsan/sanitizer_common/sanitizer_common.h+19-4

 @@ -387,8 +387,8 @@ void ReportDeadlySignal(const SignalContext &sig, u32 tid,
                         const void *unwind_context);
 // Alternative signal stack (POSIX-only).
-void SetAlternateSignalStack();
+void* SetAlternateSignalStack();
-void UnsetAlternateSignalStack();
+void UnsetAlternateSignalStack(void* altstack_base);
 bool IsSignalHandlerFromSanitizer(int signum);
 bool SetSignalHandlerFromSanitizer(int signum, bool new_state);
 @@ -906,7 +906,14 @@ class LoadedModule {
 class ListOfModules {
  public:
   ListOfModules() : initialized(false) {}
-  ~ListOfModules() { clear(); }
+  ~ListOfModules() {
+    clear();
+    if (initialized)
+      modules_.Destroy();
+  }
+  ListOfModules(const ListOfModules&) = delete;
+  ListOfModules& operator=(const ListOfModules&) = delete;
   void init();
   void fallbackInit();  // Uses fallback init if available, otherwise clears
   const LoadedModule *begin() const { return modules_.begin(); }
 @@ -1085,7 +1092,9 @@ struct StackDepotStats {
 // indicate that sanitizer allocator should not attempt to release memory to OS.
 const s32 kReleaseToOSIntervalNever = -1;
-void CheckNoDeepBind(const char *filename, int flag);
+// Platform hook invoked before dlopen. Performs platform-specific dlopen flag
+// checks (e.g. RTLD_DEEPBIND on Linux).
+void OnDlOpen(const char* filename, int flag);
 // Returns the requested amount of random data (up to 256 bytes) that can then
 // be used to seed a PRNG. Defaults to blocking like the underlying syscall.
 @@ -1100,6 +1109,12 @@ inline u32 GetNumberOfCPUsCached() {
   return NumberOfCPUsCached;
 }
+inline u32 Rand(u32* state) {  // ANSI C linear congruential PRNG.
+  return (*state = *state * 1103515245 + 12345) >> 16;
+}
+inline u32 RandN(u32* state, u32 n) { return Rand(state) % n; }  // [0, n)
 }  // namespace __sanitizer
 inline void *operator new(__sanitizer::usize size,

lib/libtsan/sanitizer_common/sanitizer_common_interceptors.inc+65-2

...	@@ -277,8 +277,11 @@ extern const short *_tolower_tab_;	...	@@ -277,8 +277,11 @@ extern const short *_tolower_tab_;
277	common_flags()->strict_string_checks ? (internal_strlen(s)) + 1 : (n) )	277	common_flags()->strict_string_checks ? (internal_strlen(s)) + 1 : (n) )
278		278
279	#ifndef COMMON_INTERCEPTOR_DLOPEN	279	#ifndef COMMON_INTERCEPTOR_DLOPEN
280	#define COMMON_INTERCEPTOR_DLOPEN(filename, flag) \	280	# define COMMON_INTERCEPTOR_DLOPEN(filename, flag) \
281	({ CheckNoDeepBind(filename, flag); REAL(dlopen)(filename, flag); })	281	({ \
		282	OnDlOpen(filename, flag); \
		283	REAL(dlopen)(filename, flag); \
		284	})
282	#endif	285	#endif
283		286
284	#ifndef COMMON_INTERCEPTOR_GET_TLS_RANGE	287	#ifndef COMMON_INTERCEPTOR_GET_TLS_RANGE
...	@@ -1023,6 +1026,25 @@ INTERCEPTOR(SSIZE_T, read, int fd, void *ptr, SIZE_T count) {	...	@@ -1023,6 +1026,25 @@ INTERCEPTOR(SSIZE_T, read, int fd, void *ptr, SIZE_T count) {
1023	#define INIT_READ	1026	#define INIT_READ
1024	#endif	1027	#endif
1025		1028
		1029	#if SANITIZER_INTERCEPT___READ_CHK
		1030	INTERCEPTOR(SSIZE_T, __read_chk, int fd, void* ptr, SIZE_T count,
		1031	SIZE_T buflen) {
		1032	void* ctx;
		1033	COMMON_INTERCEPTOR_ENTER(ctx, __read_chk, fd, ptr, count, buflen);
		1034	COMMON_INTERCEPTOR_FD_ACCESS(ctx, fd);
		1035	SSIZE_T res =
		1036	COMMON_INTERCEPTOR_BLOCK_REAL(__read_chk)(fd, ptr, count, buflen);
		1037	if (res > 0)
		1038	COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ptr, res);
		1039	if (res >= 0 && fd >= 0)
		1040	COMMON_INTERCEPTOR_FD_ACQUIRE(ctx, fd);
		1041	return res;
		1042	}
		1043	# define INIT___READ_CHK COMMON_INTERCEPT_FUNCTION(__read_chk)
		1044	#else
		1045	# define INIT___READ_CHK
		1046	#endif
		1047
1026	#if SANITIZER_INTERCEPT_FREAD	1048	#if SANITIZER_INTERCEPT_FREAD
1027	INTERCEPTOR(SIZE_T, fread, void ptr, SIZE_T size, SIZE_T nmemb, void file) {	1049	INTERCEPTOR(SIZE_T, fread, void ptr, SIZE_T size, SIZE_T nmemb, void file) {
1028	// libc file streams can call user-supplied functions, see fopencookie.	1050	// libc file streams can call user-supplied functions, see fopencookie.
...	@@ -1058,6 +1080,25 @@ INTERCEPTOR(SSIZE_T, pread, int fd, void *ptr, SIZE_T count, OFF_T offset) {	...	@@ -1058,6 +1080,25 @@ INTERCEPTOR(SSIZE_T, pread, int fd, void *ptr, SIZE_T count, OFF_T offset) {
1058	#define INIT_PREAD	1080	#define INIT_PREAD
1059	#endif	1081	#endif
1060		1082
		1083	#if SANITIZER_INTERCEPT___PREAD_CHK
		1084	INTERCEPTOR(SSIZE_T, __pread_chk, int fd, void* ptr, SIZE_T count, OFF_T offset,
		1085	SIZE_T buflen) {
		1086	void* ctx;
		1087	COMMON_INTERCEPTOR_ENTER(ctx, __pread_chk, fd, ptr, count, offset, buflen);
		1088	COMMON_INTERCEPTOR_FD_ACCESS(ctx, fd);
		1089	SSIZE_T res = COMMON_INTERCEPTOR_BLOCK_REAL(__pread_chk)(fd, ptr, count,
		1090	offset, buflen);
		1091	if (res > 0)
		1092	COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ptr, res);
		1093	if (res >= 0 && fd >= 0)
		1094	COMMON_INTERCEPTOR_FD_ACQUIRE(ctx, fd);
		1095	return res;
		1096	}
		1097	# define INIT___PREAD_CHK COMMON_INTERCEPT_FUNCTION(__pread_chk)
		1098	#else
		1099	# define INIT___PREAD_CHK
		1100	#endif
		1101
1061	#if SANITIZER_INTERCEPT_PREAD64	1102	#if SANITIZER_INTERCEPT_PREAD64
1062	INTERCEPTOR(SSIZE_T, pread64, int fd, void *ptr, SIZE_T count, OFF64_T offset) {	1103	INTERCEPTOR(SSIZE_T, pread64, int fd, void *ptr, SIZE_T count, OFF64_T offset) {
1063	void *ctx;	1104	void *ctx;
...	@@ -1076,6 +1117,25 @@ INTERCEPTOR(SSIZE_T, pread64, int fd, void *ptr, SIZE_T count, OFF64_T offset) {	...	@@ -1076,6 +1117,25 @@ INTERCEPTOR(SSIZE_T, pread64, int fd, void *ptr, SIZE_T count, OFF64_T offset) {
1076	#define INIT_PREAD64	1117	#define INIT_PREAD64
1077	#endif	1118	#endif
1078		1119
		1120	#if SANITIZER_INTERCEPT___PREAD64_CHK
		1121	INTERCEPTOR(SSIZE_T, __pread64_chk, int fd, void* ptr, SIZE_T count,
		1122	OFF64_T offset, SIZE_T buflen) {
		1123	void* ctx;
		1124	COMMON_INTERCEPTOR_ENTER(ctx, __pread64_chk, fd, ptr, count, offset, buflen);
		1125	COMMON_INTERCEPTOR_FD_ACCESS(ctx, fd);
		1126	SSIZE_T res = COMMON_INTERCEPTOR_BLOCK_REAL(__pread64_chk)(fd, ptr, count,
		1127	offset, buflen);
		1128	if (res > 0)
		1129	COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ptr, res);
		1130	if (res >= 0 && fd >= 0)
		1131	COMMON_INTERCEPTOR_FD_ACQUIRE(ctx, fd);
		1132	return res;
		1133	}
		1134	# define INIT___PREAD64_CHK COMMON_INTERCEPT_FUNCTION(__pread64_chk)
		1135	#else
		1136	# define INIT___PREAD64_CHK
		1137	#endif
		1138
1079	#if SANITIZER_INTERCEPT_READV	1139	#if SANITIZER_INTERCEPT_READV
1080	INTERCEPTOR_WITH_SUFFIX(SSIZE_T, readv, int fd, __sanitizer_iovec *iov,	1140	INTERCEPTOR_WITH_SUFFIX(SSIZE_T, readv, int fd, __sanitizer_iovec *iov,
1081	int iovcnt) {	1141	int iovcnt) {
...	@@ -10428,9 +10488,12 @@ static void InitializeCommonInterceptors() {	...	@@ -10428,9 +10488,12 @@ static void InitializeCommonInterceptors() {
10428	INIT_MEMRCHR;	10488	INIT_MEMRCHR;
10429	INIT_MEMMEM;	10489	INIT_MEMMEM;
10430	INIT_READ;	10490	INIT_READ;
		10491	INIT___READ_CHK;
10431	INIT_FREAD;	10492	INIT_FREAD;
10432	INIT_PREAD;	10493	INIT_PREAD;
		10494	INIT___PREAD_CHK;
10433	INIT_PREAD64;	10495	INIT_PREAD64;
		10496	INIT___PREAD64_CHK;
10434	INIT_READV;	10497	INIT_READV;
10435	INIT_PREADV;	10498	INIT_PREADV;
10436	INIT_PREADV64;	10499	INIT_PREADV64;

lib/libtsan/sanitizer_common/sanitizer_common_interface.inc-1

...	@@ -10,7 +10,6 @@	...	@@ -10,7 +10,6 @@
10	INTERFACE_FUNCTION(__sanitizer_acquire_crash_state)	10	INTERFACE_FUNCTION(__sanitizer_acquire_crash_state)
11	INTERFACE_FUNCTION(__sanitizer_annotate_contiguous_container)	11	INTERFACE_FUNCTION(__sanitizer_annotate_contiguous_container)
12	INTERFACE_FUNCTION(__sanitizer_annotate_double_ended_contiguous_container)	12	INTERFACE_FUNCTION(__sanitizer_annotate_double_ended_contiguous_container)
13	INTERFACE_FUNCTION(__sanitizer_copy_contiguous_container_annotations)
14	INTERFACE_FUNCTION(__sanitizer_contiguous_container_find_bad_address)	13	INTERFACE_FUNCTION(__sanitizer_contiguous_container_find_bad_address)
15	INTERFACE_FUNCTION(	14	INTERFACE_FUNCTION(
16	__sanitizer_double_ended_contiguous_container_find_bad_address)	15	__sanitizer_double_ended_contiguous_container_find_bad_address)

lib/libtsan/sanitizer_common/sanitizer_dense_map.h+57-95

 @@ -44,10 +44,10 @@ class DenseMapBase {
   }
   void clear() {
-    if (getNumEntries() == 0 && getNumTombstones() == 0)
+    if (getNumEntries() == 0)
       return;
-    const KeyT EmptyKey = getEmptyKey(), TombstoneKey = getTombstoneKey();
+    const KeyT EmptyKey = getEmptyKey();
     if (__sanitizer::is_trivially_destructible<ValueT>::value) {
       // Use a simpler loop when values don't need destruction.
       for (BucketT *P = getBuckets(), *E = getBucketsEnd(); P != E; ++P)
 @@ -56,17 +56,14 @@ class DenseMapBase {
       unsigned NumEntries = getNumEntries();
       for (BucketT *P = getBuckets(), *E = getBucketsEnd(); P != E; ++P) {
         if (!KeyInfoT::isEqual(P->getFirst(), EmptyKey)) {
-          if (!KeyInfoT::isEqual(P->getFirst(), TombstoneKey)) {
+          P->getSecond().~ValueT();
-            P->getSecond().~ValueT();
+          --NumEntries;
-            --NumEntries;
-          }
           P->getFirst() = EmptyKey;
         }
       }
       CHECK_EQ(NumEntries, 0);
     }
     setNumEntries(0);
-    setNumTombstones(0);
   }
   /// Return true if the specified key is in the map, false otherwise.
 @@ -171,20 +168,13 @@ class DenseMapBase {
     if (!TheBucket)
       return false;  // not in map.
-    TheBucket->getSecond().~ValueT();
+    eraseFromFilledBucket(TheBucket);
-    TheBucket->getFirst() = getTombstoneKey();
-    decrementNumEntries();
-    incrementNumTombstones();
     return true;
   }
   void erase(value_type *I) {
     CHECK_NE(I, nullptr);
-    BucketT *TheBucket = &*I;
+    eraseFromFilledBucket(I);
-    TheBucket->getSecond().~ValueT();
-    TheBucket->getFirst() = getTombstoneKey();
-    decrementNumEntries();
-    incrementNumTombstones();
   }
   value_type &FindAndConstruct(const KeyT &Key) {
 @@ -214,11 +204,10 @@ class DenseMapBase {
   /// Function can return fast to stop the process.
   template <class Fn>
   void forEach(Fn fn) {
-    const KeyT EmptyKey = getEmptyKey(), TombstoneKey = getTombstoneKey();
+    const KeyT EmptyKey = getEmptyKey();
     for (auto *P = getBuckets(), *E = getBucketsEnd(); P != E; ++P) {
       const KeyT K = P->getFirst();
-      if (!KeyInfoT::isEqual(K, EmptyKey) &&
+      if (!KeyInfoT::isEqual(K, EmptyKey)) {
-          !KeyInfoT::isEqual(K, TombstoneKey)) {
         if (!fn(*P))
           return;
       }
 @@ -238,10 +227,9 @@ class DenseMapBase {
     if (getNumBuckets() == 0)  // Nothing to do.
       return;
-    const KeyT EmptyKey = getEmptyKey(), TombstoneKey = getTombstoneKey();
+    const KeyT EmptyKey = getEmptyKey();
     for (BucketT *P = getBuckets(), *E = getBucketsEnd(); P != E; ++P) {
-      if (!KeyInfoT::isEqual(P->getFirst(), EmptyKey) &&
+      if (!KeyInfoT::isEqual(P->getFirst(), EmptyKey))
-          !KeyInfoT::isEqual(P->getFirst(), TombstoneKey))
         P->getSecond().~ValueT();
       P->getFirst().~KeyT();
     }
 @@ -249,7 +237,6 @@ class DenseMapBase {
   void initEmpty() {
     setNumEntries(0);
-    setNumTombstones(0);
     CHECK_EQ((getNumBuckets() & (getNumBuckets() - 1)), 0);
     const KeyT EmptyKey = getEmptyKey();
 @@ -273,10 +260,8 @@ class DenseMapBase {
     // Insert all the old elements.
     const KeyT EmptyKey = getEmptyKey();
-    const KeyT TombstoneKey = getTombstoneKey();
     for (BucketT *B = OldBucketsBegin, *E = OldBucketsEnd; B != E; ++B) {
-      if (!KeyInfoT::isEqual(B->getFirst(), EmptyKey) &&
+      if (!KeyInfoT::isEqual(B->getFirst(), EmptyKey)) {
-          !KeyInfoT::isEqual(B->getFirst(), TombstoneKey)) {
         // Insert the key/value into the new table.
         BucketT *DestBucket;
         bool FoundVal = LookupBucketFor(B->getFirst(), DestBucket);
 @@ -301,7 +286,6 @@ class DenseMapBase {
     CHECK_EQ(getNumBuckets(), other.getNumBuckets());
     setNumEntries(other.getNumEntries());
-    setNumTombstones(other.getNumTombstones());
     if (__sanitizer::is_trivially_copyable<KeyT>::value &&
         __sanitizer::is_trivially_copyable<ValueT>::value)
 @@ -311,8 +295,7 @@ class DenseMapBase {
       for (uptr i = 0; i < getNumBuckets(); ++i) {
         ::new (&getBuckets()[i].getFirst())
             KeyT(other.getBuckets()[i].getFirst());
-        if (!KeyInfoT::isEqual(getBuckets()[i].getFirst(), getEmptyKey()) &&
+        if (!KeyInfoT::isEqual(getBuckets()[i].getFirst(), getEmptyKey()))
-            !KeyInfoT::isEqual(getBuckets()[i].getFirst(), getTombstoneKey()))
           ::new (&getBuckets()[i].getSecond())
               ValueT(other.getBuckets()[i].getSecond());
       }
 @@ -329,9 +312,40 @@ class DenseMapBase {
   static const KeyT getEmptyKey() { return KeyInfoT::getEmptyKey(); }
-  static const KeyT getTombstoneKey() { return KeyInfoT::getTombstoneKey(); }
  private:
+  /// Erase the entry at \p TheBucket and close the resulting hole via Knuth
+  /// TAOCP 6.4 Algorithm R: walk forward over the cluster, shifting back any
+  /// entry whose linear-probe chain from its home bucket passes through the
+  /// hole, until an empty bucket terminates the cluster.
+  void eraseFromFilledBucket(BucketT* TheBucket) {
+    TheBucket->getSecond().~ValueT();
+    decrementNumEntries();
+    BucketT* BucketsPtr = getBuckets();
+    const unsigned NumBuckets = getNumBuckets();
+    const unsigned Mask = NumBuckets - 1;
+    const KeyT EmptyKey = getEmptyKey();
+    unsigned I = static_cast<unsigned>(TheBucket - BucketsPtr);
+    unsigned J = I;
+    while (true) {
+      J = (J + 1) & Mask;
+      BucketT& BJ = BucketsPtr[J];
+      if (KeyInfoT::isEqual(BJ.getFirst(), EmptyKey))
+        break;
+      unsigned Ideal = getHashValue(BJ.getFirst()) & Mask;
+      // If the hole (I) lies on the linear-probe chain from the home bucket
+      // (Ideal) to J, shift J into the hole and make J the new hole.
+      if (((I - Ideal) & Mask) < ((J - Ideal) & Mask)) {
+        BucketT& BI = BucketsPtr[I];
+        BI.getFirst() = __sanitizer::move(BJ.getFirst());
+        ::new (&BI.getSecond()) ValueT(__sanitizer::move(BJ.getSecond()));
+        BJ.getSecond().~ValueT();
+        I = J;
+      }
+    }
+    BucketsPtr[I].getFirst() = EmptyKey;
+  }
   unsigned getNumEntries() const {
     return static_cast<const DerivedT *>(this)->getNumEntries();
   }
 @@ -344,18 +358,6 @@ class DenseMapBase {
   void decrementNumEntries() { setNumEntries(getNumEntries() - 1); }
-  unsigned getNumTombstones() const {
-    return static_cast<const DerivedT *>(this)->getNumTombstones();
-  }
-  void setNumTombstones(unsigned Num) {
-    static_cast<DerivedT *>(this)->setNumTombstones(Num);
-  }
-  void incrementNumTombstones() { setNumTombstones(getNumTombstones() + 1); }
-  void decrementNumTombstones() { setNumTombstones(getNumTombstones() - 1); }
   const BucketT *getBuckets() const {
     return static_cast<const DerivedT *>(this)->getBuckets();
   }
 @@ -398,25 +400,16 @@ class DenseMapBase {
   template <typename LookupKeyT>
   BucketT *InsertIntoBucketImpl(const KeyT &Key, const LookupKeyT &Lookup,
                                 BucketT *TheBucket) {
-    // If the load of the hash table is more than 3/4, or if fewer than 1/8 of
+    // Grow the table if the load factor would exceed 3/4 after insertion.
-    // the buckets are empty (meaning that many are filled with tombstones),
+    // Linear probing with gap-closing deletion (Knuth Algorithm R) keeps every
-    // grow the table.
+    // chain compact and bounded by the table's empty-bucket count, so no
-    //
+    // tombstone-driven resize is needed.
-    // The later case is tricky.  For example, if we had one empty bucket with
-    // tons of tombstones, failing lookups (e.g. for insertion) would have to
-    // probe almost the entire table until it found the empty bucket.  If the
-    // table completely filled with tombstones, no lookup would ever succeed,
-    // causing infinite loops in lookup.
     unsigned NewNumEntries = getNumEntries() + 1;
     unsigned NumBuckets = getNumBuckets();
     if (UNLIKELY(NewNumEntries * 4 >= NumBuckets * 3)) {
       this->grow(NumBuckets * 2);
       LookupBucketFor(Lookup, TheBucket);
       NumBuckets = getNumBuckets();
-    } else if (UNLIKELY(NumBuckets - (NewNumEntries + getNumTombstones()) <=
-                        NumBuckets / 8)) {
-      this->grow(NumBuckets);
-      LookupBucketFor(Lookup, TheBucket);
     }
     CHECK(TheBucket);
 @@ -424,11 +417,6 @@ class DenseMapBase {
     // so that when growing buckets we have self-consistent entry count.
     incrementNumEntries();
-    // If we are writing over a tombstone, remember this.
-    const KeyT EmptyKey = getEmptyKey();
-    if (!KeyInfoT::isEqual(TheBucket->getFirst(), EmptyKey))
-      decrementNumTombstones();
     return TheBucket;
   }
 @@ -441,7 +429,6 @@ class DenseMapBase {
     const KeyT EmptyKey = getEmptyKey();
     unsigned BucketNo = getHashValue(Val) & (NumBuckets - 1);
-    unsigned ProbeAmt = 1;
     while (true) {
       BucketT *Bucket = BucketsPtr + BucketNo;
       if (LIKELY(KeyInfoT::isEqual(Val, Bucket->getFirst())))
 @@ -449,10 +436,8 @@ class DenseMapBase {
       if (LIKELY(KeyInfoT::isEqual(Bucket->getFirst(), EmptyKey)))
         return nullptr;
-      // Otherwise, it's a hash collision or a tombstone, continue quadratic
+      // Hash collision: continue linear probing.
-      // probing.
+      BucketNo = (BucketNo + 1) & (NumBuckets - 1);
-      BucketNo += ProbeAmt++;
-      BucketNo &= NumBuckets - 1;
     }
   }
 @@ -463,8 +448,8 @@ class DenseMapBase {
   /// LookupBucketFor - Lookup the appropriate bucket for Val, returning it in
   /// FoundBucket.  If the bucket contains the key and a value, this returns
-  /// true, otherwise it returns a bucket with an empty marker or tombstone and
+  /// true, otherwise it returns a bucket with an empty marker and returns
-  /// returns false.
+  /// false.
   template <typename LookupKeyT>
   bool LookupBucketFor(const LookupKeyT &Val,
                        const BucketT *&FoundBucket) const {
 @@ -476,15 +461,10 @@ class DenseMapBase {
       return false;
     }
-    // FoundTombstone - Keep track of whether we find a tombstone while probing.
-    const BucketT *FoundTombstone = nullptr;
     const KeyT EmptyKey = getEmptyKey();
-    const KeyT TombstoneKey = getTombstoneKey();
     CHECK(!KeyInfoT::isEqual(Val, EmptyKey));
-    CHECK(!KeyInfoT::isEqual(Val, TombstoneKey));
     unsigned BucketNo = getHashValue(Val) & (NumBuckets - 1);
-    unsigned ProbeAmt = 1;
     while (true) {
       const BucketT *ThisBucket = BucketsPtr + BucketNo;
       // Found Val's bucket?  If so, return it.
 @@ -494,24 +474,14 @@ class DenseMapBase {
       }
       // If we found an empty bucket, the key doesn't exist in the set.
-      // Insert it and return the default value.
+      // Return it as the insertion point.
       if (LIKELY(KeyInfoT::isEqual(ThisBucket->getFirst(), EmptyKey))) {
-        // If we've already seen a tombstone while probing, fill it in instead
+        FoundBucket = ThisBucket;
-        // of the empty bucket we eventually probed to.
-        FoundBucket = FoundTombstone ? FoundTombstone : ThisBucket;
         return false;
       }
-      // If this is a tombstone, remember it.  If Val ends up not in the map, we
+      // Hash collision: continue linear probing.
-      // prefer to return it than something that would require more probing.
+      BucketNo = (BucketNo + 1) & (NumBuckets - 1);
-      if (KeyInfoT::isEqual(ThisBucket->getFirst(), TombstoneKey) &&
-          !FoundTombstone)
-        FoundTombstone = ThisBucket;  // Remember the first tombstone found.
-      // Otherwise, it's a hash collision or a tombstone, continue quadratic
-      // probing.
-      BucketNo += ProbeAmt++;
-      BucketNo &= (NumBuckets - 1);
     }
   }
 @@ -587,7 +557,6 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
   BucketT *Buckets = nullptr;
   unsigned NumEntries = 0;
-  unsigned NumTombstones = 0;
   unsigned NumBuckets = 0;
  public:
 @@ -614,7 +583,6 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
   void swap(DenseMap &RHS) {
     Swap(Buckets, RHS.Buckets);
     Swap(NumEntries, RHS.NumEntries);
-    Swap(NumTombstones, RHS.NumTombstones);
     Swap(NumBuckets, RHS.NumBuckets);
   }
 @@ -639,7 +607,6 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
       this->BaseT::copyFrom(other);
     } else {
       NumEntries = 0;
-      NumTombstones = 0;
     }
   }
 @@ -649,7 +616,6 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
       this->BaseT::initEmpty();
     } else {
       NumEntries = 0;
-      NumTombstones = 0;
     }
   }
 @@ -675,10 +641,6 @@ class DenseMap : public DenseMapBase<DenseMap<KeyT, ValueT, KeyInfoT, BucketT>,
   void setNumEntries(unsigned Num) { NumEntries = Num; }
-  unsigned getNumTombstones() const { return NumTombstones; }
-  void setNumTombstones(unsigned Num) { NumTombstones = Num; }
   BucketT *getBuckets() const { return Buckets; }
   unsigned getNumBuckets() const { return NumBuckets; }

lib/libtsan/sanitizer_common/sanitizer_dense_map_info.h-25

...	@@ -62,7 +62,6 @@ struct DenseMapPair {	...	@@ -62,7 +62,6 @@ struct DenseMapPair {
62	template <typename T>	62	template <typename T>
63	struct DenseMapInfo {	63	struct DenseMapInfo {
64	// static T getEmptyKey();	64	// static T getEmptyKey();
65	// static T getTombstoneKey();
66	// static unsigned getHashValue(const T &Val);	65	// static unsigned getHashValue(const T &Val);
67	// static bool isEqual(const T &LHS, const T &RHS);	66	// static bool isEqual(const T &LHS, const T &RHS);
68	};	67	};
...	@@ -86,12 +85,6 @@ struct DenseMapInfo<T *> {	...	@@ -86,12 +85,6 @@ struct DenseMapInfo<T *> {
86	return reinterpret_cast<T *>(Val);	85	return reinterpret_cast<T *>(Val);
87	}	86	}
88		87
89	static constexpr T *getTombstoneKey() {
90	uptr Val = static_cast<uptr>(-2);
91	Val <<= Log2MaxAlign;
92	return reinterpret_cast<T *>(Val);
93	}
94
95	static constexpr unsigned getHashValue(const T *PtrVal) {	88	static constexpr unsigned getHashValue(const T *PtrVal) {
96	return (unsigned((uptr)PtrVal) >> 4) ^ (unsigned((uptr)PtrVal) >> 9);	89	return (unsigned((uptr)PtrVal) >> 4) ^ (unsigned((uptr)PtrVal) >> 9);
97	}	90	}
...	@@ -105,7 +98,6 @@ struct DenseMapInfo<T *> {	...	@@ -105,7 +98,6 @@ struct DenseMapInfo<T *> {
105	template <>	98	template <>
106	struct DenseMapInfo<char> {	99	struct DenseMapInfo<char> {
107	static constexpr char getEmptyKey() { return ~0; }	100	static constexpr char getEmptyKey() { return ~0; }
108	static constexpr char getTombstoneKey() { return ~0 - 1; }
109	static constexpr unsigned getHashValue(const char &Val) { return Val * 37U; }	101	static constexpr unsigned getHashValue(const char &Val) { return Val * 37U; }
110		102
111	static constexpr bool isEqual(const char &LHS, const char &RHS) {	103	static constexpr bool isEqual(const char &LHS, const char &RHS) {
...	@@ -117,7 +109,6 @@ struct DenseMapInfo<char> {	...	@@ -117,7 +109,6 @@ struct DenseMapInfo<char> {
117	template <>	109	template <>
118	struct DenseMapInfo<unsigned char> {	110	struct DenseMapInfo<unsigned char> {
119	static constexpr unsigned char getEmptyKey() { return ~0; }	111	static constexpr unsigned char getEmptyKey() { return ~0; }
120	static constexpr unsigned char getTombstoneKey() { return ~0 - 1; }
121	static constexpr unsigned getHashValue(const unsigned char &Val) {	112	static constexpr unsigned getHashValue(const unsigned char &Val) {
122	return Val * 37U;	113	return Val * 37U;
123	}	114	}
...	@@ -132,7 +123,6 @@ struct DenseMapInfo<unsigned char> {	...	@@ -132,7 +123,6 @@ struct DenseMapInfo<unsigned char> {
132	template <>	123	template <>
133	struct DenseMapInfo<unsigned short> {	124	struct DenseMapInfo<unsigned short> {
134	static constexpr unsigned short getEmptyKey() { return 0xFFFF; }	125	static constexpr unsigned short getEmptyKey() { return 0xFFFF; }
135	static constexpr unsigned short getTombstoneKey() { return 0xFFFF - 1; }
136	static constexpr unsigned getHashValue(const unsigned short &Val) {	126	static constexpr unsigned getHashValue(const unsigned short &Val) {
137	return Val * 37U;	127	return Val * 37U;
138	}	128	}
...	@@ -147,7 +137,6 @@ struct DenseMapInfo<unsigned short> {	...	@@ -147,7 +137,6 @@ struct DenseMapInfo<unsigned short> {
147	template <>	137	template <>
148	struct DenseMapInfo<unsigned> {	138	struct DenseMapInfo<unsigned> {
149	static constexpr unsigned getEmptyKey() { return ~0U; }	139	static constexpr unsigned getEmptyKey() { return ~0U; }
150	static constexpr unsigned getTombstoneKey() { return ~0U - 1; }
151	static constexpr unsigned getHashValue(const unsigned &Val) {	140	static constexpr unsigned getHashValue(const unsigned &Val) {
152	return Val * 37U;	141	return Val * 37U;
153	}	142	}
...	@@ -161,7 +150,6 @@ struct DenseMapInfo<unsigned> {	...	@@ -161,7 +150,6 @@ struct DenseMapInfo<unsigned> {
161	template <>	150	template <>
162	struct DenseMapInfo<unsigned long> {	151	struct DenseMapInfo<unsigned long> {
163	static constexpr unsigned long getEmptyKey() { return ~0UL; }	152	static constexpr unsigned long getEmptyKey() { return ~0UL; }
164	static constexpr unsigned long getTombstoneKey() { return ~0UL - 1L; }
165		153
166	static constexpr unsigned getHashValue(const unsigned long &Val) {	154	static constexpr unsigned getHashValue(const unsigned long &Val) {
167	return (unsigned)(Val * 37UL);	155	return (unsigned)(Val * 37UL);
...	@@ -177,7 +165,6 @@ struct DenseMapInfo<unsigned long> {	...	@@ -177,7 +165,6 @@ struct DenseMapInfo<unsigned long> {
177	template <>	165	template <>
178	struct DenseMapInfo<unsigned long long> {	166	struct DenseMapInfo<unsigned long long> {
179	static constexpr unsigned long long getEmptyKey() { return ~0ULL; }	167	static constexpr unsigned long long getEmptyKey() { return ~0ULL; }
180	static constexpr unsigned long long getTombstoneKey() { return ~0ULL - 1ULL; }
181		168
182	static constexpr unsigned getHashValue(const unsigned long long &Val) {	169	static constexpr unsigned getHashValue(const unsigned long long &Val) {
183	return (unsigned)(Val * 37ULL);	170	return (unsigned)(Val * 37ULL);
...	@@ -193,7 +180,6 @@ struct DenseMapInfo<unsigned long long> {	...	@@ -193,7 +180,6 @@ struct DenseMapInfo<unsigned long long> {
193	template <>	180	template <>
194	struct DenseMapInfo<short> {	181	struct DenseMapInfo<short> {
195	static constexpr short getEmptyKey() { return 0x7FFF; }	182	static constexpr short getEmptyKey() { return 0x7FFF; }
196	static constexpr short getTombstoneKey() { return -0x7FFF - 1; }
197	static constexpr unsigned getHashValue(const short &Val) { return Val * 37U; }	183	static constexpr unsigned getHashValue(const short &Val) { return Val * 37U; }
198	static constexpr bool isEqual(const short &LHS, const short &RHS) {	184	static constexpr bool isEqual(const short &LHS, const short &RHS) {
199	return LHS == RHS;	185	return LHS == RHS;
...	@@ -204,7 +190,6 @@ struct DenseMapInfo<short> {	...	@@ -204,7 +190,6 @@ struct DenseMapInfo<short> {
204	template <>	190	template <>
205	struct DenseMapInfo<int> {	191	struct DenseMapInfo<int> {
206	static constexpr int getEmptyKey() { return 0x7fffffff; }	192	static constexpr int getEmptyKey() { return 0x7fffffff; }
207	static constexpr int getTombstoneKey() { return -0x7fffffff - 1; }
208	static constexpr unsigned getHashValue(const int &Val) {	193	static constexpr unsigned getHashValue(const int &Val) {
209	return (unsigned)(Val * 37U);	194	return (unsigned)(Val * 37U);
210	}	195	}
...	@@ -221,8 +206,6 @@ struct DenseMapInfo<long> {	...	@@ -221,8 +206,6 @@ struct DenseMapInfo<long> {
221	return (1UL << (sizeof(long) * 8 - 1)) - 1UL;	206	return (1UL << (sizeof(long) * 8 - 1)) - 1UL;
222	}	207	}
223		208
224	static constexpr long getTombstoneKey() { return getEmptyKey() - 1L; }
225
226	static constexpr unsigned getHashValue(const long &Val) {	209	static constexpr unsigned getHashValue(const long &Val) {
227	return (unsigned)(Val * 37UL);	210	return (unsigned)(Val * 37UL);
228	}	211	}
...	@@ -236,9 +219,6 @@ struct DenseMapInfo<long> {	...	@@ -236,9 +219,6 @@ struct DenseMapInfo<long> {
236	template <>	219	template <>
237	struct DenseMapInfo<long long> {	220	struct DenseMapInfo<long long> {
238	static constexpr long long getEmptyKey() { return 0x7fffffffffffffffLL; }	221	static constexpr long long getEmptyKey() { return 0x7fffffffffffffffLL; }
239	static constexpr long long getTombstoneKey() {
240	return -0x7fffffffffffffffLL - 1;
241	}
242		222
243	static constexpr unsigned getHashValue(const long long &Val) {	223	static constexpr unsigned getHashValue(const long long &Val) {
244	return (unsigned)(Val * 37ULL);	224	return (unsigned)(Val * 37ULL);
...	@@ -261,11 +241,6 @@ struct DenseMapInfo<detail::DenseMapPair<T, U>> {	...	@@ -261,11 +241,6 @@ struct DenseMapInfo<detail::DenseMapPair<T, U>> {
261	SecondInfo::getEmptyKey());	241	SecondInfo::getEmptyKey());
262	}	242	}
263		243
264	static constexpr Pair getTombstoneKey() {
265	return detail::DenseMapPair<T, U>(FirstInfo::getTombstoneKey(),
266	SecondInfo::getTombstoneKey());
267	}
268
269	static constexpr unsigned getHashValue(const Pair &PairVal) {	244	static constexpr unsigned getHashValue(const Pair &PairVal) {
270	return detail::combineHashValue(FirstInfo::getHashValue(PairVal.first),	245	return detail::combineHashValue(FirstInfo::getHashValue(PairVal.first),
271	SecondInfo::getHashValue(PairVal.second));	246	SecondInfo::getHashValue(PairVal.second));

lib/libtsan/sanitizer_common/sanitizer_errno.h+2

...	@@ -31,6 +31,8 @@	...	@@ -31,6 +31,8 @@
31	# define __errno_location _errno	31	# define __errno_location _errno
32	#elif SANITIZER_HAIKU	32	#elif SANITIZER_HAIKU
33	# define __errno_location _errnop	33	# define __errno_location _errnop
		34	#elif SANITIZER_AIX
		35	# define __errno_location _Errno
34	#endif	36	#endif
35		37
36	extern "C" int *__errno_location();	38	extern "C" int *__errno_location();

lib/libtsan/sanitizer_common/sanitizer_flag_parser.h+2-2

...	@@ -189,8 +189,8 @@ class FlagParser {	...	@@ -189,8 +189,8 @@ class FlagParser {
189	};	189	};
190		190
191	template <typename T>	191	template <typename T>
192	static void RegisterFlag(FlagParser parser, const char name, const char *desc,	192	void RegisterFlag(FlagParser* parser, const char* name, const char* desc,
193	T *var) {	193	T* var) {
194	FlagHandler<T> *fh = new (GetGlobalLowLevelAllocator()) FlagHandler<T>(var);	194	FlagHandler<T> *fh = new (GetGlobalLowLevelAllocator()) FlagHandler<T>(var);
195	parser->RegisterHandler(name, fh, desc);	195	parser->RegisterHandler(name, fh, desc);
196	}	196	}

lib/libtsan/sanitizer_common/sanitizer_fuchsia.cpp+2-2

...	@@ -93,8 +93,8 @@ void CheckMPROTECT() {}	...	@@ -93,8 +93,8 @@ void CheckMPROTECT() {}
93	void PlatformPrepareForSandboxing(void *args) {}	93	void PlatformPrepareForSandboxing(void *args) {}
94	void DisableCoreDumperIfNecessary() {}	94	void DisableCoreDumperIfNecessary() {}
95	void InstallDeadlySignalHandlers(SignalHandlerType handler) {}	95	void InstallDeadlySignalHandlers(SignalHandlerType handler) {}
96	void SetAlternateSignalStack() {}	96	void* SetAlternateSignalStack() { return nullptr; }
97	void UnsetAlternateSignalStack() {}	97	void UnsetAlternateSignalStack(void* altstack_base) {}
98		98
99	bool SignalContext::IsStackOverflow() const { return false; }	99	bool SignalContext::IsStackOverflow() const { return false; }
100	void SignalContext::DumpAllRegisters(void *context) { UNIMPLEMENTED(); }	100	void SignalContext::DumpAllRegisters(void *context) { UNIMPLEMENTED(); }

lib/libtsan/sanitizer_common/sanitizer_haiku.cpp+4

 @@ -128,6 +128,10 @@ uptr internal_close(fd_t fd) {
   RETURN_AND_SET_ERRNO(_kern_close(fd));
 }
+uptr internal_close_range(fd_t lowfd, fd_t highfd, int flags) {
+  return -1;  // Not supported.
+}
 uptr internal_open(const char *filename, int flags) {
   CHECK(&_kern_open);
   RETURN_AND_SET_ERRNO(_kern_open(-1, filename, flags, 0));

lib/libtsan/sanitizer_common/sanitizer_interface_internal.h-5

 @@ -76,11 +76,6 @@ void __sanitizer_annotate_double_ended_contiguous_container(
     const void *old_container_beg, const void *old_container_end,
     const void *new_container_beg, const void *new_container_end);
 SANITIZER_INTERFACE_ATTRIBUTE
-void __sanitizer_copy_contiguous_container_annotations(const void *src_begin,
-                                                       const void *src_end,
-                                                       const void *dst_begin,
-                                                       const void *dst_end);
-SANITIZER_INTERFACE_ATTRIBUTE
 int __sanitizer_verify_contiguous_container(const void *beg, const void *mid,
                                             const void *end);
 SANITIZER_INTERFACE_ATTRIBUTE

lib/libtsan/sanitizer_common/sanitizer_internal_defs.h+16-12

 @@ -29,20 +29,24 @@
 // Only use SANITIZER_*ATTRIBUTE* before the function return type!
 #if SANITIZER_WINDOWS
-#if SANITIZER_IMPORT_INTERFACE
+#  if SANITIZER_IMPORT_INTERFACE
-# define SANITIZER_INTERFACE_ATTRIBUTE __declspec(dllimport)
+#    define SANITIZER_INTERFACE_ATTRIBUTE __declspec(dllimport)
-#else
+#  else
-# define SANITIZER_INTERFACE_ATTRIBUTE __declspec(dllexport)
+#    define SANITIZER_INTERFACE_ATTRIBUTE __declspec(dllexport)
-#endif
+#  endif
-# define SANITIZER_WEAK_ATTRIBUTE
+#  define SANITIZER_WEAK_ATTRIBUTE
-#  define SANITIZER_WEAK_IMPORT
-#elif SANITIZER_GO
-# define SANITIZER_INTERFACE_ATTRIBUTE
-# define SANITIZER_WEAK_ATTRIBUTE
 #  define SANITIZER_WEAK_IMPORT
 #else
-# define SANITIZER_INTERFACE_ATTRIBUTE __attribute__((visibility("default")))
+#  if SANITIZER_GO
-# define SANITIZER_WEAK_ATTRIBUTE  __attribute__((weak))
+#    define SANITIZER_INTERFACE_ATTRIBUTE
+#    define SANITIZER_WEAK_ATTRIBUTE
+#  elif SANITIZER_AMDGPU || SANITIZER_NVPTX
+#    define SANITIZER_INTERFACE_ATTRIBUTE __attribute__((visibility("hidden")))
+#    define SANITIZER_WEAK_ATTRIBUTE __attribute__((weak))
+#  else
+#    define SANITIZER_INTERFACE_ATTRIBUTE __attribute__((visibility("default")))
+#    define SANITIZER_WEAK_ATTRIBUTE __attribute__((weak))
+#  endif  // SANITIZER_GO
 #  if SANITIZER_APPLE
 #    define SANITIZER_WEAK_IMPORT extern "C" __attribute((weak_import))
 #  else

lib/libtsan/sanitizer_common/sanitizer_linux.cpp+81-12

 @@ -90,10 +90,18 @@
 extern "C" SANITIZER_WEAK_ATTRIBUTE const char *strerrorname_np(int);
 #  endif
-#  if SANITIZER_LINUX && defined(__loongarch__)
+#  if SANITIZER_LINUX && \
+      (defined(__loongarch__) || defined(__hexagon__) || defined(__alpha__))
 #    include <sys/sysmacros.h>
 #  endif
+// Hexagon uses statx() instead of stat64().  glibc provides struct statx
+// through <sys/stat.h>, but musl does not — pull it from <linux/stat.h>.
+// On this musl/hexagon combination the two headers coexist without conflict.
+#  if SANITIZER_LINUX && defined(__hexagon__)
+#    include <linux/stat.h>
+#  endif
 #  if SANITIZER_LINUX && defined(__powerpc64__)
 #    include <asm/ptrace.h>
 #  endif
 @@ -254,6 +262,8 @@ ScopedBlockSignals::~ScopedBlockSignals() { SetSigProcMask(&saved_, nullptr); }
 #    include "sanitizer_syscall_linux_hexagon.inc"
 #  elif SANITIZER_LINUX && SANITIZER_LOONGARCH64
 #    include "sanitizer_syscall_linux_loongarch64.inc"
+#  elif SANITIZER_LINUX && SANITIZER_ALPHA
+#    include "sanitizer_syscall_linux_alpha.inc"
 #  else
 #    include "sanitizer_syscall_generic.inc"
 #  endif
 @@ -296,11 +306,13 @@ int internal_madvise(uptr addr, uptr length, int advice) {
   return internal_syscall(SYSCALL(madvise), addr, length, advice);
 }
-#    if SANITIZER_FREEBSD
 uptr internal_close_range(fd_t lowfd, fd_t highfd, int flags) {
+#    if SANITIZER_FREEBSD || (SANITIZER_LINUX && defined(__NR_close_range))
   return internal_syscall(SYSCALL(close_range), lowfd, highfd, flags);
-}
 #    endif
+  return -1;  // Not supported.
+}
 uptr internal_close(fd_t fd) { return internal_syscall(SYSCALL(close), fd); }
 uptr internal_open(const char *filename, int flags) {
 @@ -341,7 +353,8 @@ uptr internal_ftruncate(fd_t fd, uptr size) {
   return res;
 }
-#    if !SANITIZER_LINUX_USES_64BIT_SYSCALLS && SANITIZER_LINUX
+#    if !SANITIZER_LINUX_USES_64BIT_SYSCALLS && SANITIZER_LINUX && \
+        !defined(__hexagon__)
 static void stat64_to_stat(struct stat64 *in, struct stat *out) {
   internal_memset(out, 0, sizeof(*out));
   out->st_dev = in->st_dev;
 @@ -360,7 +373,8 @@ static void stat64_to_stat(struct stat64 *in, struct stat *out) {
 }
 #    endif
-#    if SANITIZER_LINUX && defined(__loongarch__)
+#    if SANITIZER_LINUX && \
+        (defined(__loongarch__) || defined(__hexagon__) || defined(__alpha__))
 static void statx_to_stat(struct statx *in, struct stat *out) {
   internal_memset(out, 0, sizeof(*out));
   out->st_dev = makedev(in->stx_dev_major, in->stx_dev_minor);
 @@ -440,7 +454,7 @@ uptr internal_stat(const char *path, void *buf) {
 #    if SANITIZER_FREEBSD
   return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path, (uptr)buf, 0);
 #    elif SANITIZER_LINUX
-#      if defined(__loongarch__)
+#      if defined(__loongarch__) || defined(__hexagon__) || defined(__alpha__)
   struct statx bufx;
   int res = internal_syscall(SYSCALL(statx), AT_FDCWD, (uptr)path,
                              AT_NO_AUTOMOUNT, STATX_BASIC_STATS, (uptr)&bufx);
 @@ -478,7 +492,7 @@ uptr internal_lstat(const char *path, void *buf) {
   return internal_syscall(SYSCALL(fstatat), AT_FDCWD, (uptr)path, (uptr)buf,
                           AT_SYMLINK_NOFOLLOW);
 #    elif SANITIZER_LINUX
-#      if defined(__loongarch__)
+#      if defined(__loongarch__) || defined(__hexagon__) || defined(__alpha__)
   struct statx bufx;
   int res = internal_syscall(SYSCALL(statx), AT_FDCWD, (uptr)path,
                              AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT,
 @@ -526,7 +540,7 @@ uptr internal_fstat(fd_t fd, void *buf) {
   int res = internal_syscall(SYSCALL(fstat64), fd, &kbuf);
   kernel_stat_to_stat(&kbuf, (struct stat *)buf);
   return res;
-#      elif SANITIZER_LINUX && defined(__loongarch__)
+#      elif SANITIZER_LINUX && (defined(__loongarch__) || defined(__alpha__))
   struct statx bufx;
   int res = internal_syscall(SYSCALL(statx), fd, "", AT_EMPTY_PATH,
                              STATX_BASIC_STATS, (uptr)&bufx);
 @@ -535,6 +549,13 @@ uptr internal_fstat(fd_t fd, void *buf) {
 #      else
   return internal_syscall(SYSCALL(fstat), fd, (uptr)buf);
 #      endif
+#    elif SANITIZER_LINUX && defined(__hexagon__)
+  // Hexagon musl lacks struct stat64; use statx() instead.
+  struct statx bufx;
+  int res = internal_syscall(SYSCALL(statx), fd, "", AT_EMPTY_PATH,
+                             STATX_BASIC_STATS, (uptr)&bufx);
+  statx_to_stat(&bufx, (struct stat*)buf);
+  return res;
 #    else
   struct stat64 buf64;
   int res = internal_syscall(SYSCALL(fstat64), fd, &buf64);
 @@ -1003,7 +1024,7 @@ int internal_sigaction_norestorer(int signum, const void *act, void *oldact) {
     // rt_sigaction, so we need to do the same (we'll need to reimplement the
     // restorers; for x86_64 the restorer address can be obtained from
     // oldact->sa_restorer upon a call to sigaction(xxx, NULL, oldact).
-#      if !SANITIZER_ANDROID || !SANITIZER_MIPS32
+#      if (!SANITIZER_ANDROID || !SANITIZER_MIPS32) && !defined(__alpha__)
     k_act.sa_restorer = u_act->sa_restorer;
 #      endif
   }
 @@ -1019,7 +1040,7 @@ int internal_sigaction_norestorer(int signum, const void *act, void *oldact) {
     internal_memcpy(&u_oldact->sa_mask, &k_oldact.sa_mask,
                     sizeof(__sanitizer_kernel_sigset_t));
     u_oldact->sa_flags = k_oldact.sa_flags;
-#      if !SANITIZER_ANDROID || !SANITIZER_MIPS32
+#      if (!SANITIZER_ANDROID || !SANITIZER_MIPS32) && !defined(__alpha__)
     u_oldact->sa_restorer = k_oldact.sa_restorer;
 #      endif
   }
 @@ -1228,6 +1249,16 @@ uptr GetMaxVirtualAddress() {
   // loongarch64 also has multiple address space layouts: default is 47-bit.
   // RISC-V 64 also has multiple address space layouts: 39, 48 and 57-bit.
   return (1ULL << (MostSignificantSetBitIndex(GET_CURRENT_FRAME()) + 1)) - 1;
+#    elif SANITIZER_ALPHA
+  // Linux/Alpha uses a 42-bit user VAS (TASK_SIZE = 0x40000000000).  With
+  // fixed shadow offset 0x10000000000 (1 TiB) the layout is:
+  //   LowMem:    [0x000000000000, 0x00ffffffffff]  (1 TiB)
+  //   LowShadow: [0x010000000000, 0x011fffffffff]  (128 GiB)
+  //   ShadowGap: [0x012000000000, 0x012fffffffff]
+  //   HighShadow:[0x013000000000, 0x017fffffffff]  (256 GiB)
+  //   HighMem:   [0x018000000000, 0x03ffffffffff]  (2.5 TiB, stack near top)
+  // Capping at TASK_SIZE - 1 avoids treating kernel addresses as HighMem.
+  return (1ULL << 42) - 1;  // TASK_SIZE - 1
 #    elif SANITIZER_MIPS64
   return (1ULL << 40) - 1;  // 0x000000ffffffffffUL;
 #    elif defined(__s390x__)
 @@ -1894,6 +1925,39 @@ uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg,
       : "memory");
   return res;
 }
+#    elif defined(__hexagon__)
+uptr internal_clone(int (*fn)(void*), void* child_stack, int flags, void* arg,
+                    int* parent_tidptr, void* newtls, int* child_tidptr) {
+  if (!fn || !child_stack)
+    return -EINVAL;
+  child_stack = (char*)child_stack - 2 * sizeof(unsigned int);
+  ((unsigned int*)child_stack)[0] = (uptr)fn;
+  ((unsigned int*)child_stack)[1] = (uptr)arg;
+  // Hexagon clone syscall uses the generic argument order (no
+  // CONFIG_CLONE_BACKWARDS): flags, stack, ptid, ctid, tls.
+  register int r0 __asm__("r0") = flags;
+  register void* r1 __asm__("r1") = child_stack;
+  register int* r2 __asm__("r2") = parent_tidptr;
+  register int* r3 __asm__("r3") = child_tidptr;
+  register void* r4 __asm__("r4") = newtls;
+  register int r6 __asm__("r6") = __NR_clone;
+  __asm__ __volatile__(
+      "trap0(#1)\n"             /* syscall */
+      "{ p0 = cmp.eq(r0, #0)\n" /* child? */
+      "  if (!p0.new) jump:nt 1f }\n"
+      "r1 = memw(r29 + #0)\n" /* r1 = fn */
+      "r0 = memw(r29 + #4)\n" /* r0 = arg */
+      "callr r1\n"            /* fn(arg) */
+      "r6 = #%7\n"            /* __NR_exit */
+      "trap0(#1)\n"
+      "1:\n"
+      : "=r"(r0)
+      : "0"(r0), "r"(r1), "r"(r2), "r"(r3), "r"(r4), "r"(r6), "i"(__NR_exit)
+      : "memory", "p0", "r1", "lr");
+  return (uptr)r0;
+}
 #    endif
 #  endif  // SANITIZER_LINUX
 @@ -2427,7 +2491,7 @@ static void DumpSingleReg(ucontext_t *ctx, int RegNum) {
 #      if SANITIZER_LINUX
          ctx->uc_mcontext.gregs[RegNum]
 #      elif SANITIZER_NETBSD
-         ctx->uc_mcontext.__gregs[RegNum]
+         (unsigned long long)ctx->uc_mcontext.__gregs[RegNum]
 #      endif
   );
 #    elif defined(__i386__)
 @@ -2729,6 +2793,11 @@ static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {
   *pc = ucontext->uc_mcontext.__pc;
   *bp = ucontext->uc_mcontext.__gregs[22];
   *sp = ucontext->uc_mcontext.__gregs[3];
+#  elif defined(__alpha__)
+  ucontext_t* ucontext = (ucontext_t*)context;
+  *pc = ucontext->uc_mcontext.sc_pc;
+  *bp = ucontext->uc_mcontext.sc_regs[15];  // $fp / $s6
+  *sp = ucontext->uc_mcontext.sc_regs[30];  // $sp
 #  else
 #    error "Unsupported arch"
 #  endif
 @@ -2819,7 +2888,7 @@ void CheckMPROTECT() {
 #  endif
 }
-void CheckNoDeepBind(const char *filename, int flag) {
+void OnDlOpen(const char* filename, int flag) {
 #  ifdef RTLD_DEEPBIND
   if (flag & RTLD_DEEPBIND) {
     Report(

lib/libtsan/sanitizer_common/sanitizer_linux.h+2-1

...	@@ -86,7 +86,8 @@ int internal_sigaction_norestorer(int signum, const void act, void oldact);	...	@@ -86,7 +86,8 @@ int internal_sigaction_norestorer(int signum, const void act, void oldact);
86	void internal_sigdelset(__sanitizer_sigset_t *set, int signum);	86	void internal_sigdelset(__sanitizer_sigset_t *set, int signum);
87	# if defined(__x86_64__) \|\| defined(__mips__) \|\| defined(__aarch64__) \|\| \	87	# if defined(__x86_64__) \|\| defined(__mips__) \|\| defined(__aarch64__) \|\| \
88	defined(__powerpc64__) \|\| defined(__s390__) \|\| defined(__i386__) \|\| \	88	defined(__powerpc64__) \|\| defined(__s390__) \|\| defined(__i386__) \|\| \
89	defined(__arm__) \|\| SANITIZER_RISCV64 \|\| SANITIZER_LOONGARCH64	89	defined(__arm__) \|\| defined(__hexagon__) \|\| SANITIZER_RISCV64 \|\| \
		90	SANITIZER_LOONGARCH64
90	uptr internal_clone(int (fn)(void ), void child_stack, int flags, void arg,	91	uptr internal_clone(int (fn)(void ), void child_stack, int flags, void arg,
91	int parent_tidptr, void newtls, int *child_tidptr);	92	int parent_tidptr, void newtls, int *child_tidptr);
92	# endif	93	# endif

lib/libtsan/sanitizer_common/sanitizer_linux_libcdep.cpp+6-2

 @@ -284,6 +284,10 @@ static uptr ThreadDescriptorSizeFallback() {
 #    if defined(__powerpc64__)
   return 1776;  // from glibc.ppc64le 2.20-8.fc21
 #    endif
+#    if defined(__alpha__)
+  return 1824;  // from glibc 2.43
+#    endif
 }
 #  endif  // SANITIZER_GLIBC && !SANITIZER_GO
 @@ -494,10 +498,10 @@ __attribute__((unused)) static void GetStaticTlsBoundary(uptr *addr, uptr *size,
   // loader places static TLS blocks this way not to waste space.
   uptr l = one;
   *align = ranges[l].align;
-  while (l != 0 && ranges[l].begin < ranges[l - 1].end + ranges[l].align)
+  while (l != 0 && ranges[l].begin <= ranges[l - 1].end + ranges[l].align)
     *align = Max(*align, ranges[--l].align);
   uptr r = one + 1;
-  while (r != len && ranges[r].begin < ranges[r - 1].end + ranges[r].align)
+  while (r != len && ranges[r].begin <= ranges[r - 1].end + ranges[r].align)
     *align = Max(*align, ranges[r++].align);
   *addr = ranges[l].begin;
   *size = ranges[r - 1].end - ranges[l].begin;

lib/libtsan/sanitizer_common/sanitizer_lzw.h+1-3

 @@ -26,9 +26,7 @@ ItOut LzwEncode(ItIn begin, ItIn end, ItOut out) {
   // Sentinel value for substrings of len 1.
   static constexpr LzwCodeType kNoPrefix =
-      Min(DenseMapInfo<Substring>::getEmptyKey().first,
+      DenseMapInfo<Substring>::getEmptyKey().first - 1;
-          DenseMapInfo<Substring>::getTombstoneKey().first) -
-      1;
   DenseMap<Substring, LzwCodeType> prefix_to_code;
   {
     // Add all substring of len 1 as initial dictionary.

lib/libtsan/sanitizer_common/sanitizer_mac.cpp+30-2

...	@@ -170,6 +170,10 @@ uptr internal_close(fd_t fd) {	...	@@ -170,6 +170,10 @@ uptr internal_close(fd_t fd) {
170	return close(fd);	170	return close(fd);
171	}	171	}
172		172
		173	uptr internal_close_range(fd_t lowfd, fd_t highfd, int flags) {
		174	return -1; // Not supported.
		175	}
		176
173	uptr internal_open(const char *filename, int flags) {	177	uptr internal_open(const char *filename, int flags) {
174	return open(filename, flags);	178	return open(filename, flags);
175	}	179	}
...	@@ -609,7 +613,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {	...	@@ -609,7 +613,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {
609	u16 os_major = kernel_major - offset;	613	u16 os_major = kernel_major - offset;
610		614
611	const char *format = "%d.0";	615	const char *format = "%d.0";
612	if (TARGET_OS_OSX) {	616	if (kernel_major >= 27) {
		617	// with kernel major 27 <=> OSes 27.0, OS versions are aligned with kernel
		618	os_major = kernel_major;
		619	} else if (kernel_major >= 25) {
		620	// with kernel_major 25 <=> OSes 26.0, OS versions are aligned
		621	os_major = kernel_major + 1;
		622	} else if (TARGET_OS_OSX) {
613	if (os_major >= 16) { // macOS 11+	623	if (os_major >= 16) { // macOS 11+
614	os_major -= 5;	624	os_major -= 5;
615	} else { // macOS 10.15 and below	625	} else { // macOS 10.15 and below
...	@@ -666,6 +676,24 @@ static void MapToMacos(u16 major, u16 minor) {	...	@@ -666,6 +676,24 @@ static void MapToMacos(u16 major, u16 minor) {
666	if (TARGET_OS_OSX)	676	if (TARGET_OS_OSX)
667	return;	677	return;
668		678
		679	// All supported platforms (including DriverKit) have
		680	// aligned version numbers in macOS 27+
		681	if (*major >= 27)
		682	return;
		683
		684	# if TARGET_OS_DRIVERKIT
		685	// Driverkit 25.0+ aligns with macOS 26+
		686	if (*major >= 25) {
		687	*major += 1;
		688	return;
		689	}
		690	# else
		691	// macOS 26 and later have aligned version strings.
		692	if (*major >= 26)
		693	return;
		694	# endif
		695
		696	// Below are mappings for pre-macOS-25-aligned releases
669	if (TARGET_OS_IOS \|\| TARGET_OS_TV)	697	if (TARGET_OS_IOS \|\| TARGET_OS_TV)
670	*major += 2;	698	*major += 2;
671	else if (TARGET_OS_WATCH)	699	else if (TARGET_OS_WATCH)
...	@@ -1529,7 +1557,7 @@ void DumpProcessMap() {	...	@@ -1529,7 +1557,7 @@ void DumpProcessMap() {
1529	Printf("End of module map.\n");	1557	Printf("End of module map.\n");
1530	}	1558	}
1531		1559
1532	void CheckNoDeepBind(const char *filename, int flag) {	1560	void OnDlOpen(const char* filename, int flag) {
1533	// Do nothing.	1561	// Do nothing.
1534	}	1562	}
1535		1563

lib/libtsan/sanitizer_common/sanitizer_netbsd.cpp+4

 @@ -126,6 +126,10 @@ uptr internal_close(fd_t fd) {
   return _sys_close(fd);
 }
+uptr internal_close_range(fd_t lowfd, fd_t highfd, int flags) {
+  return -1;  // Not supported.
+}
 uptr internal_open(const char *filename, int flags) {
   CHECK(&_sys_open);
   return _sys_open(filename, flags);

lib/libtsan/sanitizer_common/sanitizer_platform.h+33-2

...	@@ -15,7 +15,8 @@	...	@@ -15,7 +15,8 @@
15	#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \	15	#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
16	!defined(__APPLE__) && !defined(_WIN32) && !defined(__Fuchsia__) && \	16	!defined(__APPLE__) && !defined(_WIN32) && !defined(__Fuchsia__) && \
17	!(defined(__sun__) && defined(__svr4__)) && !defined(__HAIKU__) && \	17	!(defined(__sun__) && defined(__svr4__)) && !defined(__HAIKU__) && \
18	!defined(__wasi__)	18	!defined(__wasi__) && !defined(__NVPTX__) && !defined(__AMDGPU__) && \
		19	!defined(__SPIRV__) && !defined(_AIX)
19	# error "This operating system is not supported"	20	# error "This operating system is not supported"
20	#endif	21	#endif
21		22
...	@@ -32,6 +33,12 @@	...	@@ -32,6 +33,12 @@
32	# define SANITIZER_LINUX 0	33	# define SANITIZER_LINUX 0
33	#endif	34	#endif
34		35
		36	#if defined(_AIX)
		37	# define SANITIZER_AIX 1
		38	#else
		39	# define SANITIZER_AIX 0
		40	#endif
		41
35	#if defined(__GLIBC__)	42	#if defined(__GLIBC__)
36	# define SANITIZER_GLIBC 1	43	# define SANITIZER_GLIBC 1
37	#else	44	#else
...	@@ -151,7 +158,7 @@	...	@@ -151,7 +158,7 @@
151		158
152	#define SANITIZER_POSIX \	159	#define SANITIZER_POSIX \
153	(SANITIZER_FREEBSD \|\| SANITIZER_LINUX \|\| SANITIZER_APPLE \|\| \	160	(SANITIZER_FREEBSD \|\| SANITIZER_LINUX \|\| SANITIZER_APPLE \|\| \
154	SANITIZER_NETBSD \|\| SANITIZER_SOLARIS \|\| SANITIZER_HAIKU)	161	SANITIZER_NETBSD \|\| SANITIZER_SOLARIS \|\| SANITIZER_HAIKU \|\| SANITIZER_AIX)
155		162
156	#if __LP64__ \|\| defined(_WIN64)	163	#if __LP64__ \|\| defined(_WIN64)
157	# define SANITIZER_WORDSIZE 64	164	# define SANITIZER_WORDSIZE 64
...	@@ -302,6 +309,30 @@	...	@@ -302,6 +309,30 @@
302	# define SANITIZER_LOONGARCH64 0	309	# define SANITIZER_LOONGARCH64 0
303	#endif	310	#endif
304		311
		312	#if defined(__alpha__)
		313	# define SANITIZER_ALPHA 1
		314	#else
		315	# define SANITIZER_ALPHA 0
		316	#endif
		317
		318	#if defined(__AMDGPU__)
		319	# define SANITIZER_AMDGPU 1
		320	#else
		321	# define SANITIZER_AMDGPU 0
		322	#endif
		323
		324	#if defined(__NVPTX__)
		325	# define SANITIZER_NVPTX 1
		326	#else
		327	# define SANITIZER_NVPTX 0
		328	#endif
		329
		330	#if defined(__SPIRV__)
		331	# define SANITIZER_SPIRV 1
		332	#else
		333	# define SANITIZER_SPIRV 0
		334	#endif
		335
305	// By default we allow to use SizeClassAllocator64 on 64-bit platform.	336	// By default we allow to use SizeClassAllocator64 on 64-bit platform.
306	// But in some cases SizeClassAllocator64 does not work well and we need to	337	// But in some cases SizeClassAllocator64 does not work well and we need to
307	// fallback to SizeClassAllocator32.	338	// fallback to SizeClassAllocator32.

lib/libtsan/sanitizer_common/sanitizer_platform_interceptors.h+6-1

lib/libtsan/sanitizer_common/sanitizer_platform_limits_linux.cpp+1-1

...	@@ -60,7 +60,7 @@ using namespace __sanitizer;	...	@@ -60,7 +60,7 @@ using namespace __sanitizer;
60	# if !defined(__powerpc64__) && !defined(__x86_64__) && \	60	# if !defined(__powerpc64__) && !defined(__x86_64__) && \
61	!defined(__aarch64__) && !defined(__mips__) && !defined(__s390__) && \	61	!defined(__aarch64__) && !defined(__mips__) && !defined(__s390__) && \
62	!defined(__sparc__) && !defined(__riscv) && !defined(__hexagon__) && \	62	!defined(__sparc__) && !defined(__riscv) && !defined(__hexagon__) && \
63	!defined(__loongarch__)	63	!defined(__loongarch__) && !defined(__alpha__)
64	COMPILER_CHECK(struct___old_kernel_stat_sz == sizeof(struct __old_kernel_stat));	64	COMPILER_CHECK(struct___old_kernel_stat_sz == sizeof(struct __old_kernel_stat));
65	#endif	65	#endif
66		66

lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.cpp+57-25

 @@ -24,7 +24,7 @@
 // Must go after undef _FILE_OFFSET_BITS.
 #include "sanitizer_platform.h"
-#if SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU
+#if SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU || SANITIZER_AIX
 // Must go after undef _FILE_OFFSET_BITS.
 #include "sanitizer_glibc_version.h"
 @@ -61,11 +61,11 @@
 #endif
 #if !SANITIZER_ANDROID
-#if !SANITIZER_HAIKU
+#    if !SANITIZER_HAIKU && !SANITIZER_AIX
-#include <sys/mount.h>
+#      include <sys/mount.h>
-#endif
+#    endif
-#include <sys/timeb.h>
+#    include <sys/timeb.h>
-#include <utmpx.h>
+#    include <utmpx.h>
 #endif
 #if SANITIZER_LINUX
 @@ -113,11 +113,15 @@ typedef struct user_fpregs elf_fpregset_t;
 #endif
 #if !SANITIZER_ANDROID
-#include <ifaddrs.h>
+#    if !SANITIZER_AIX
-#if !SANITIZER_HAIKU
+#      include <ifaddrs.h>
-#include <sys/ucontext.h>
+#    else
-#include <wordexp.h>
+#      include <netinet/in.h>
-#endif
+#    endif
+#    if !SANITIZER_HAIKU
+#      include <sys/ucontext.h>
+#      include <wordexp.h>
+#    endif
 #endif
 #if SANITIZER_LINUX
 @@ -182,6 +186,17 @@ typedef struct user_fpregs elf_fpregset_t;
 #include <sys/ioctl.h>
 #endif
+#  if SANITIZER_AIX
+#    include <netinet/ip_mroute.h>
+#    include <stropts.h>
+#    include <sys/ioctl.h>
+#    include <sys/statfs.h>
+#    include <unistd.h>
+#    if HAVE_RPC_XDR_H
+#      include <tirpc/rpc/xdr.h>
+#    endif
+#  endif
 // Include these after system headers to avoid name clashes and ambiguities.
 #  include "sanitizer_common.h"
 #  include "sanitizer_internal_defs.h"
 @@ -293,7 +308,7 @@ namespace __sanitizer {
 #define SIZEOF_STRUCT_USTAT 32
 #    elif defined(__arm__) || defined(__i386__) || defined(__mips__) ||    \
         defined(__powerpc__) || defined(__s390__) || defined(__sparc__) || \
-        defined(__hexagon__)
+        defined(__hexagon__) || defined(__alpha__)
 #      define SIZEOF_STRUCT_USTAT 20
 #    elif defined(__loongarch__)
   // Not used. The minimum Glibc version available for LoongArch is 2.36
 @@ -305,9 +320,12 @@ namespace __sanitizer {
   unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
   unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
   unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
-#endif // SANITIZER_GLIBC
+#  elif SANITIZER_MUSL
+  // On musl, rlimit64 is an alias for rlimit.
+  unsigned struct_rlimit64_sz = sizeof(struct rlimit);
+#  endif  // SANITIZER_GLIBC
-#if SANITIZER_LINUX && !SANITIZER_ANDROID
+#  if SANITIZER_LINUX && !SANITIZER_ANDROID
   unsigned struct_timex_sz = sizeof(struct timex);
   unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds);
   unsigned struct_mq_attr_sz = sizeof(struct mq_attr);
 @@ -556,13 +574,13 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
   const unsigned IOCTL_NOT_PRESENT = 0;
   unsigned IOCTL_FIONBIO = FIONBIO;
-#if !SANITIZER_HAIKU
+#  if !SANITIZER_HAIKU
   unsigned IOCTL_FIOASYNC = FIOASYNC;
   unsigned IOCTL_FIOCLEX = FIOCLEX;
   unsigned IOCTL_FIOGETOWN = FIOGETOWN;
   unsigned IOCTL_FIONCLEX = FIONCLEX;
   unsigned IOCTL_FIOSETOWN = FIOSETOWN;
-#endif
+#  endif
   unsigned IOCTL_SIOCADDMULTI = SIOCADDMULTI;
   unsigned IOCTL_SIOCATMARK = SIOCATMARK;
   unsigned IOCTL_SIOCDELMULTI = SIOCDELMULTI;
 @@ -584,14 +602,14 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
   unsigned IOCTL_SIOCSIFNETMASK = SIOCSIFNETMASK;
   unsigned IOCTL_SIOCSPGRP = SIOCSPGRP;
-#if !SANITIZER_HAIKU
+#  if !SANITIZER_HAIKU
   unsigned IOCTL_TIOCCONS = TIOCCONS;
   unsigned IOCTL_TIOCGETD = TIOCGETD;
   unsigned IOCTL_TIOCNOTTY = TIOCNOTTY;
   unsigned IOCTL_TIOCPKT = TIOCPKT;
   unsigned IOCTL_TIOCSETD = TIOCSETD;
   unsigned IOCTL_TIOCSTI = TIOCSTI;
-#endif
+#  endif
   unsigned IOCTL_TIOCEXCL = TIOCEXCL;
   unsigned IOCTL_TIOCGPGRP = TIOCGPGRP;
 @@ -602,10 +620,12 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
   unsigned IOCTL_TIOCMSET = TIOCMSET;
   unsigned IOCTL_TIOCNXCL = TIOCNXCL;
   unsigned IOCTL_TIOCOUTQ = TIOCOUTQ;
+#  if !SANITIZER_AIX
   unsigned IOCTL_TIOCSCTTY = TIOCSCTTY;
+#  endif
   unsigned IOCTL_TIOCSPGRP = TIOCSPGRP;
   unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ;
-#if SANITIZER_LINUX && !SANITIZER_ANDROID
+#  if SANITIZER_LINUX && !SANITIZER_ANDROID
   unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT;
   unsigned IOCTL_SIOCGETVIFCNT = SIOCGETVIFCNT;
 #endif
 @@ -1067,6 +1087,9 @@ CHECK_SIZE_AND_OFFSET(addrinfo, ai_protocol);
 CHECK_SIZE_AND_OFFSET(addrinfo, ai_addrlen);
 CHECK_SIZE_AND_OFFSET(addrinfo, ai_canonname);
 CHECK_SIZE_AND_OFFSET(addrinfo, ai_addr);
+#  if SANITIZER_AIX
+CHECK_SIZE_AND_OFFSET(addrinfo, ai_eflags);
+#  endif
 CHECK_TYPE_SIZE(hostent);
 CHECK_SIZE_AND_OFFSET(hostent, h_name);
 @@ -1113,11 +1136,13 @@ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
 CHECK_SIZE_AND_OFFSET(dirent, d_ino);
 #if SANITIZER_APPLE
 CHECK_SIZE_AND_OFFSET(dirent, d_seekoff);
-#elif SANITIZER_FREEBSD || SANITIZER_HAIKU
+#  elif SANITIZER_AIX
+CHECK_SIZE_AND_OFFSET(dirent, d_offset);
+#  elif SANITIZER_FREEBSD || SANITIZER_HAIKU
 // There is no 'd_off' field on FreeBSD.
-#else
+#  else
 CHECK_SIZE_AND_OFFSET(dirent, d_off);
-#endif
+#  endif
 CHECK_SIZE_AND_OFFSET(dirent, d_reclen);
 #if SANITIZER_GLIBC
 @@ -1151,7 +1176,8 @@ CHECK_STRUCT_SIZE_AND_OFFSET(sigaction, sa_mask);
 // didn't exist.
 CHECK_STRUCT_SIZE_AND_OFFSET(sigaction, sa_flags);
 #endif
-#if SANITIZER_LINUX && (!SANITIZER_ANDROID || !SANITIZER_MIPS32)
+#  if SANITIZER_LINUX && (!SANITIZER_ANDROID || !SANITIZER_MIPS32) && \
+      !defined(__alpha__)
 CHECK_STRUCT_SIZE_AND_OFFSET(sigaction, sa_restorer);
 #endif
 @@ -1192,6 +1218,10 @@ CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordc);
 CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordv);
 CHECK_SIZE_AND_OFFSET(wordexp_t, we_offs);
 #endif
+#  if SANITIZER_AIX
+CHECK_SIZE_AND_OFFSET(wordexp_t, we_sflags);
+CHECK_SIZE_AND_OFFSET(wordexp_t, we_soffs);
+#  endif
 CHECK_TYPE_SIZE(tm);
 CHECK_SIZE_AND_OFFSET(tm, tm_sec);
 @@ -1203,10 +1233,12 @@ CHECK_SIZE_AND_OFFSET(tm, tm_year);
 CHECK_SIZE_AND_OFFSET(tm, tm_wday);
 CHECK_SIZE_AND_OFFSET(tm, tm_yday);
 CHECK_SIZE_AND_OFFSET(tm, tm_isdst);
+#  if !SANITIZER_AIX
 CHECK_SIZE_AND_OFFSET(tm, tm_gmtoff);
 CHECK_SIZE_AND_OFFSET(tm, tm_zone);
+#  endif
-#if SANITIZER_LINUX
+#  if SANITIZER_LINUX
 CHECK_TYPE_SIZE(mntent);
 CHECK_SIZE_AND_OFFSET(mntent, mnt_fsname);
 CHECK_SIZE_AND_OFFSET(mntent, mnt_dir);
 @@ -1256,7 +1288,7 @@ CHECK_TYPE_SIZE(clock_t);
 CHECK_TYPE_SIZE(clockid_t);
 #endif
-#if !SANITIZER_ANDROID && !SANITIZER_HAIKU
+#  if !SANITIZER_ANDROID && !SANITIZER_HAIKU && !SANITIZER_AIX
 CHECK_TYPE_SIZE(ifaddrs);
 CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_next);
 CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_name);

lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.h+69-13

 @@ -14,7 +14,7 @@
 #ifndef SANITIZER_PLATFORM_LIMITS_POSIX_H
 #define SANITIZER_PLATFORM_LIMITS_POSIX_H
-#if SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU
+#if SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU || SANITIZER_AIX
 #  include "sanitizer_internal_defs.h"
 #  include "sanitizer_mallinfo.h"
 @@ -29,7 +29,7 @@
 #      define SANITIZER_HAS_STAT64 0
 #      define SANITIZER_HAS_STATFS64 0
 #    endif
-#  elif SANITIZER_GLIBC || SANITIZER_ANDROID
+#  elif SANITIZER_GLIBC || SANITIZER_ANDROID || SANITIZER_AIX
 #    define SANITIZER_HAS_STAT64 1
 #    define SANITIZER_HAS_STATFS64 1
 #  elif SANITIZER_HAIKU
 @@ -103,9 +103,15 @@ const unsigned struct_kernel_stat64_sz = 104;
 const unsigned struct_kernel_stat_sz = SANITIZER_ANDROID
                                            ? FIRST_32_SECOND_64(104, 128)
 #      if defined(_ABIN32) && _MIPS_SIM == _ABIN32
+#        if defined(_TIME_BITS) && _TIME_BITS == 64
+                                           : FIRST_32_SECOND_64(112, 216);
+#        else
                                            : FIRST_32_SECOND_64(176, 216);
+#        endif
 #      elif SANITIZER_MUSL
                                            : FIRST_32_SECOND_64(160, 208);
+#      elif defined(_TIME_BITS) && _TIME_BITS == 64
+                                           : FIRST_32_SECOND_64(112, 216);
 #      else
                                            : FIRST_32_SECOND_64(160, 216);
 #      endif
 @@ -133,6 +139,9 @@ const unsigned struct_kernel_stat64_sz = 0;
 #    elif defined(__loongarch__)
 const unsigned struct_kernel_stat_sz = 128;
 const unsigned struct_kernel_stat64_sz = 0;
+#    elif defined(__alpha__)
+const unsigned struct_kernel_stat_sz = 80;
+const unsigned struct_kernel_stat64_sz = 136;
 #    endif
 struct __sanitizer_perf_event_attr {
   unsigned type;
 @@ -323,7 +332,7 @@ struct __sanitizer_iovec {
   usize iov_len;
 };
-#  if !SANITIZER_ANDROID
+#  if !SANITIZER_ANDROID && !SANITIZER_AIX
 struct __sanitizer_ifaddrs {
   struct __sanitizer_ifaddrs *ifa_next;
   char *ifa_name;
 @@ -337,7 +346,7 @@ struct __sanitizer_ifaddrs {
   void *ifa_dstaddr;  // (struct sockaddr *)
   void *ifa_data;
 };
-#  endif  // !SANITIZER_ANDROID
+#  endif  // !SANITIZER_ANDROID && !SANITIZER_AIX
 #  if SANITIZER_APPLE
 typedef unsigned long __sanitizer_pthread_key_t;
 @@ -345,7 +354,7 @@ typedef unsigned long __sanitizer_pthread_key_t;
 typedef unsigned __sanitizer_pthread_key_t;
 #  endif
-#  if SANITIZER_LINUX && !SANITIZER_ANDROID
+#  if (SANITIZER_LINUX && !SANITIZER_ANDROID) || SANITIZER_AIX
 struct __sanitizer_XDR {
   int x_op;
 @@ -440,12 +449,14 @@ struct __sanitizer_tm {
   int tm_wday;
   int tm_yday;
   int tm_isdst;
-#  if SANITIZER_HAIKU
+#  if !SANITIZER_AIX
+#    if SANITIZER_HAIKU
   int tm_gmtoff;
 #  else
   long int tm_gmtoff;
 #  endif
   const char *tm_zone;
+#  endif
 };
 #  if SANITIZER_LINUX
 @@ -513,11 +524,19 @@ struct __sanitizer_msghdr {
   struct __sanitizer_iovec *msg_iov;
   uptr msg_iovlen;
   void *msg_control;
+#    if !SANITIZER_AIX
   uptr msg_controllen;
+#    else
+  unsigned msg_controllen;
+#    endif
   int msg_flags;
 };
 struct __sanitizer_cmsghdr {
+#    if !SANITIZER_AIX
   uptr cmsg_len;
+#    else
+  unsigned cmsg_len;
+#    endif
   int cmsg_level;
   int cmsg_type;
 };
 @@ -554,10 +573,23 @@ struct __sanitizer_dirent {
   unsigned short d_reclen;
   // more fields that we don't care about
 };
+#  elif defined(__alpha__)
+struct __sanitizer_dirent {
+  unsigned int d_ino;  // ino_t is 32-bit on Alpha
+  int __pad;           // explicit padding before d_off
+  unsigned long d_off;
+  unsigned short d_reclen;
+  // more fields that we don't care about
+};
 #  else
 struct __sanitizer_dirent {
+#    if SANITIZER_AIX
+  uptr d_offset;
+  uptr d_ino;
+#    else
   uptr d_ino;
   uptr d_off;
+#    endif
   unsigned short d_reclen;
   // more fields that we don't care about
 };
 @@ -573,7 +605,7 @@ struct __sanitizer_dirent64 {
 extern unsigned struct_sock_fprog_sz;
 #  endif
-#  if SANITIZER_HAIKU
+#  if SANITIZER_HAIKU || SANITIZER_AIX
 typedef int __sanitizer_clock_t;
 #  elif defined(__x86_64__) && !defined(_LP64)
 typedef long long __sanitizer_clock_t;
 @@ -581,8 +613,10 @@ typedef long long __sanitizer_clock_t;
 typedef long __sanitizer_clock_t;
 #  endif
-#  if SANITIZER_LINUX || SANITIZER_HAIKU
+#  if SANITIZER_LINUX || SANITIZER_HAIKU || SANITIZER_AIX
 typedef int __sanitizer_clockid_t;
+#  endif
+#  if SANITIZER_LINUX || SANITIZER_HAIKU
 typedef unsigned long long __sanitizer_eventfd_t;
 #  endif
 @@ -637,6 +671,14 @@ struct __sanitizer_sigset_t {
   // The size is determined by looking at sizeof of real sigset_t on linux.
   uptr val[128 / sizeof(uptr)];
 };
+#  elif SANITIZER_AIX
+struct __sanitizer_sigset_t {
+#    if SANITIZER_WORDSIZE == 64
+  uptr val[4];
+#    else
+  uptr val[2];
+#    endif
+};
 #  endif
 struct __sanitizer_siginfo_pad {
 @@ -741,7 +783,7 @@ struct __sanitizer_sigaction {
 #        endif
 #      endif
 #    endif
-#    if SANITIZER_LINUX || SANITIZER_HAIKU
+#    if (SANITIZER_LINUX || SANITIZER_HAIKU) && !defined(__alpha__)
   void (*sa_restorer)();
 #    endif
 #    if defined(__mips__) && (SANITIZER_WORDSIZE == 32) && !SANITIZER_MUSL
 @@ -828,8 +870,12 @@ struct __sanitizer_addrinfo {
   int ai_family;
   int ai_socktype;
   int ai_protocol;
-#  if SANITIZER_ANDROID || SANITIZER_APPLE || SANITIZER_HAIKU
+#  if SANITIZER_ANDROID || SANITIZER_APPLE || SANITIZER_HAIKU || SANITIZER_AIX
+#    if SANITIZER_AIX  // AIX ai_addrlen type is size_t
+  uptr ai_addrlen;
+#    else
   unsigned ai_addrlen;
+#    endif
   char *ai_canonname;
   void *ai_addr;
 #  else  // LINUX
 @@ -838,6 +884,9 @@ struct __sanitizer_addrinfo {
   char *ai_canonname;
 #  endif
   struct __sanitizer_addrinfo *ai_next;
+#  if SANITIZER_AIX
+  int ai_eflags;
+#  endif
 };
 struct __sanitizer_hostent {
 @@ -854,7 +903,7 @@ struct __sanitizer_pollfd {
   short revents;
 };
-#  if SANITIZER_ANDROID || SANITIZER_APPLE
+#  if SANITIZER_ANDROID || SANITIZER_APPLE || SANITIZER_AIX
 typedef unsigned __sanitizer_nfds_t;
 #  else
 typedef unsigned long __sanitizer_nfds_t;
 @@ -892,6 +941,10 @@ struct __sanitizer_wordexp_t {
   uptr we_wordc;
   char **we_wordv;
   uptr we_offs;
+#  if SANITIZER_AIX
+  int we_sflags;
+  uptr we_soffs;
+#  endif
 };
 #  if SANITIZER_LINUX && !SANITIZER_ANDROID
 @@ -1023,7 +1076,7 @@ struct __sanitizer_cookie_io_functions_t {
 #  define IOC_NRBITS 8
 #  define IOC_TYPEBITS 8
 #  if defined(__powerpc__) || defined(__powerpc64__) || defined(__mips__) || \
-      defined(__sparc__)
+      defined(__sparc__) || defined(__alpha__)
 #    define IOC_SIZEBITS 13
 #    define IOC_DIRBITS 3
 #    define IOC_NONE 1U
 @@ -1193,7 +1246,9 @@ extern unsigned IOCTL_TIOCMGET;
 extern unsigned IOCTL_TIOCMSET;
 extern unsigned IOCTL_TIOCNXCL;
 extern unsigned IOCTL_TIOCOUTQ;
+#  if !SANITIZER_AIX
 extern unsigned IOCTL_TIOCSCTTY;
+#  endif
 extern unsigned IOCTL_TIOCSPGRP;
 extern unsigned IOCTL_TIOCSWINSZ;
 #  if SANITIZER_LINUX && !SANITIZER_ANDROID
 @@ -1593,6 +1648,7 @@ extern const int si_SEGV_ACCERR;
 typedef void *__sanitizer_timer_t;
 #  endif
-#endif  // SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU
+#endif  // SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU ||
+        // SANITIZER_AIX
 #endif

lib/libtsan/sanitizer_common/sanitizer_platform_limits_solaris.cpp+1

...	@@ -51,6 +51,7 @@	...	@@ -51,6 +51,7 @@
51	#include <sys/timeb.h>	51	#include <sys/timeb.h>
52	#include <sys/times.h>	52	#include <sys/times.h>
53	#include <sys/types.h>	53	#include <sys/types.h>
		54	#include <sys/ucontext.h>
54	#include <sys/utsname.h>	55	#include <sys/utsname.h>
55	#include <termios.h>	56	#include <termios.h>
56	#include <time.h>	57	#include <time.h>

lib/libtsan/sanitizer_common/sanitizer_posix.cpp+9-7

 @@ -27,12 +27,13 @@
 #include <signal.h>
 #include <sys/mman.h>
-#if SANITIZER_FREEBSD
+#  if SANITIZER_FREEBSD || SANITIZER_AIX
 // The MAP_NORESERVE define has been removed in FreeBSD 11.x, and even before
 // that, it was never implemented.  So just define it to zero.
-#undef  MAP_NORESERVE
+// Similarly, AIX does not define MAP_NORESERVE.
-#define MAP_NORESERVE 0
+#    undef MAP_NORESERVE
-#endif
+#    define MAP_NORESERVE 0
+#  endif
 namespace __sanitizer {
 @@ -357,9 +358,10 @@ int GetNamedMappingFd(const char *name, uptr size, int *flags) {
   if (!common_flags()->decorate_proc_maps || !name)
     return -1;
   char shmname[200];
-  CHECK(internal_strlen(name) < sizeof(shmname) - 10);
+  int len =
-  internal_snprintf(shmname, sizeof(shmname), "/dev/shm/%zu [%s]",
+      internal_snprintf(shmname, sizeof(shmname), "/dev/shm/%zu.%llu [%s]",
-                    internal_getpid(), name);
+                        internal_getpid(), GetTid(), name);
+  CHECK_LT(len, sizeof(shmname));
   int o_cloexec = 0;
 #if defined(O_CLOEXEC)
   o_cloexec = O_CLOEXEC;

lib/libtsan/sanitizer_common/sanitizer_posix.h+2-2

 @@ -28,9 +28,9 @@ namespace __sanitizer {
 // Don't use directly, use __sanitizer::OpenFile() instead.
 uptr internal_open(const char *filename, int flags);
 uptr internal_open(const char *filename, int flags, u32 mode);
-#  if SANITIZER_FREEBSD
+// Closes all file descriptors from lowfd to highfd (inclusive).
+// Returns 0 on success or non-zero if not supported on this platform.
 uptr internal_close_range(fd_t lowfd, fd_t highfd, int flags);
-#  endif
 uptr internal_close(fd_t fd);
 uptr internal_read(fd_t fd, void *buf, uptr count);

lib/libtsan/sanitizer_common/sanitizer_posix_libcdep.cpp+12-9

 @@ -188,12 +188,13 @@ static uptr GetAltStackSize() {
   return SIGSTKSZ * 4;
 }
-void SetAlternateSignalStack() {
+void* SetAlternateSignalStack() {
   stack_t altstack, oldstack;
   CHECK_EQ(0, sigaltstack(nullptr, &oldstack));
   // If the alternate stack is already in place, do nothing.
   // Android always sets an alternate stack, but it's too small for us.
-  if (!SANITIZER_ANDROID && !(oldstack.ss_flags & SS_DISABLE)) return;
+  if (!SANITIZER_ANDROID && !(oldstack.ss_flags & SS_DISABLE))
+    return nullptr;
   // TODO(glider): the mapped stack should have the MAP_STACK flag in the
   // future. It is not required by man 2 sigaltstack now (they're using
   // malloc()).
 @@ -201,15 +202,18 @@ void SetAlternateSignalStack() {
   altstack.ss_sp = (char *)MmapOrDie(altstack.ss_size, __func__);
   altstack.ss_flags = 0;
   CHECK_EQ(0, sigaltstack(&altstack, nullptr));
+  return altstack.ss_sp;
 }
-void UnsetAlternateSignalStack() {
+void UnsetAlternateSignalStack(void* altstack_base) {
   stack_t altstack, oldstack;
   altstack.ss_sp = nullptr;
   altstack.ss_flags = SS_DISABLE;
   altstack.ss_size = GetAltStackSize();  // Some sane value required on Darwin.
   CHECK_EQ(0, sigaltstack(&altstack, &oldstack));
-  UnmapOrDie(oldstack.ss_sp, oldstack.ss_size);
+  if (altstack_base && altstack_base == oldstack.ss_sp) {
+    UnmapOrDie(oldstack.ss_sp, oldstack.ss_size);
+  }
 }
 bool IsSignalHandlerFromSanitizer(int signum) {
 @@ -562,11 +566,10 @@ pid_t StartSubprocess(const char *program, const char *const argv[],
       internal_close(stderr_fd);
     }
-#  if SANITIZER_FREEBSD
+    // Close all fds except stdin/stdout/stderr before exec.
-    internal_close_range(3, ~static_cast<fd_t>(0), 0);
+    // Fallback to the loop if close_range is not supported.
-#  else
+    if (internal_close_range(3, ~static_cast<fd_t>(0), 0) != 0)
-    for (int fd = sysconf(_SC_OPEN_MAX); fd > 2; fd--) internal_close(fd);
+      for (int fd = sysconf(_SC_OPEN_MAX); fd > 2; fd--) internal_close(fd);
-#  endif
     internal_execve(program, const_cast<char **>(&argv[0]),
                     const_cast<char *const *>(envp));

lib/libtsan/sanitizer_common/sanitizer_redefine_builtins.h+17-5

...	@@ -17,11 +17,23 @@	...	@@ -17,11 +17,23 @@
17	// The asm hack only works with GCC and Clang.	17	// The asm hack only works with GCC and Clang.
18	# if !defined(_WIN32) && !defined(_AIX) && !defined(__APPLE__)	18	# if !defined(_WIN32) && !defined(_AIX) && !defined(__APPLE__)
19		19
20	asm(R"(	20	# if defined(__hexagon__)
21	.set memcpy, __sanitizer_internal_memcpy	21
22	.set memmove, __sanitizer_internal_memmove	22	# define SANITIZER_REDEFINE_BUILTIN_ASM(name) \
23	.set memset, __sanitizer_internal_memset	23	asm(".set " #name ", __sanitizer_internal_" #name)
24	)");	24
		25	# else
		26
		27	# define SANITIZER_REDEFINE_BUILTIN_ASM(name) \
		28	asm(#name " = __sanitizer_internal_" #name)
		29
		30	# endif
		31
		32	SANITIZER_REDEFINE_BUILTIN_ASM(memcpy);
		33	SANITIZER_REDEFINE_BUILTIN_ASM(memmove);
		34	SANITIZER_REDEFINE_BUILTIN_ASM(memset);
		35
		36	# undef SANITIZER_REDEFINE_BUILTIN_ASM
25		37
26	# if defined(__cplusplus) && \	38	# if defined(__cplusplus) && \
27	!defined(SANITIZER_COMMON_REDEFINE_BUILTINS_IN_STD)	39	!defined(SANITIZER_COMMON_REDEFINE_BUILTINS_IN_STD)

lib/libtsan/sanitizer_common/sanitizer_solaris.cpp+4

 @@ -102,6 +102,10 @@ uptr internal_open(const char *filename, int flags, u32 mode) {
   return _REAL64(open)(filename, flags, mode);
 }
+uptr internal_close_range(fd_t lowfd, fd_t highfd, int flags) {
+  return -1;  // Not supported.
+}
 DECLARE__REAL_AND_INTERNAL(uptr, read, fd_t fd, void *buf, uptr count) {
   return _REAL(read)(fd, buf, count);
 }

lib/libtsan/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp+11-3

 @@ -16,7 +16,8 @@
 #if SANITIZER_LINUX &&                                                   \
     (defined(__x86_64__) || defined(__mips__) || defined(__aarch64__) || \
      defined(__powerpc64__) || defined(__s390__) || defined(__i386__) || \
-     defined(__arm__) || SANITIZER_RISCV64 || SANITIZER_LOONGARCH64)
+     defined(__arm__) || defined(__hexagon__) || SANITIZER_RISCV64 || \
+     SANITIZER_LOONGARCH64)
 #include "sanitizer_stoptheworld.h"
 @@ -32,8 +33,8 @@
 #include <sys/uio.h> // for iovec
 #include <elf.h> // for NT_PRSTATUS
 #if (defined(__aarch64__) || defined(__powerpc64__) || \
-     SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) &&    \
+     defined(__hexagon__) || SANITIZER_RISCV64 ||       \
-     !SANITIZER_ANDROID
+     SANITIZER_LOONGARCH64) && !SANITIZER_ANDROID
 // GLIBC 2.20+ sys/user does not include asm/ptrace.h
 # include <asm/ptrace.h>
 #endif
 @@ -613,6 +614,13 @@ typedef _user_regs_struct regs_struct;
 static constexpr uptr kExtraRegs[] = {0};
 #define ARCH_IOVEC_FOR_GETREGSET
+#elif defined(__hexagon__)
+#include <asm/user.h>
+typedef struct user_regs_struct regs_struct;
+#define REG_SP r29
+static constexpr uptr kExtraRegs[] = {0};
+#define ARCH_IOVEC_FOR_GETREGSET
 #else
 #error "Unsupported architecture"
 #endif // SANITIZER_ANDROID && defined(__arm__)

lib/libtsan/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp+7-7

 @@ -475,6 +475,13 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) {
       return new (*allocator) Addr2LinePool(found_path, allocator);
     }
   }
+#    if SANITIZER_APPLE
+  Report(
+      "WARN: No external symbolizers found. Symbols may be missing or "
+      "unreliable.\n");
+  Report("HINT: Is PATH set? Does sandbox allow file-read of /usr/bin/atos?\n");
+#    endif
   return nullptr;
 #  endif    // SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH
 }
 @@ -509,13 +516,6 @@ static void ChooseSymbolizerTools(IntrusiveList<SymbolizerTool> *list,
   }
 #  if SANITIZER_APPLE
-  if (list->empty()) {
-    Report(
-        "WARN: No external symbolizers found. Symbols may be missing or "
-        "unreliable.\n");
-    Report(
-        "HINT: Is PATH set? Does sandbox allow file-read of /usr/bin/atos?\n");
-  }
   VReport(2, "Using dladdr symbolizer.\n");
   list->push_back(new (*allocator) DlAddrSymbolizer());
 #  endif  // SANITIZER_APPLE

lib/libtsan/sanitizer_common/sanitizer_symbolizer_report.cpp+7-6

...	@@ -184,7 +184,7 @@ static void MaybeReportNonExecRegion(uptr pc) {	...	@@ -184,7 +184,7 @@ static void MaybeReportNonExecRegion(uptr pc) {
184	MemoryMappedSegment segment;	184	MemoryMappedSegment segment;
185	while (proc_maps.Next(&segment)) {	185	while (proc_maps.Next(&segment)) {
186	if (pc >= segment.start && pc < segment.end && !segment.IsExecutable())	186	if (pc >= segment.start && pc < segment.end && !segment.IsExecutable())
187	Report("Hint: PC is at a non-executable region. Maybe a wild jump?\n");	187	Report("HINT: PC is at a non-executable region. Maybe a wild jump?\n");
188	}	188	}
189	#endif	189	#endif
190	}	190	}
...	@@ -254,7 +254,7 @@ static void ReportDeadlySignalImpl(const SignalContext &sig, u32 tid,	...	@@ -254,7 +254,7 @@ static void ReportDeadlySignalImpl(const SignalContext &sig, u32 tid,
254	(void )sig.bp, (void )sig.sp, tid);	254	(void )sig.bp, (void )sig.sp, tid);
255	Printf("%s", d.Default());	255	Printf("%s", d.Default());
256	if (sig.pc < GetPageSizeCached())	256	if (sig.pc < GetPageSizeCached())
257	Report("Hint: pc points to the zero page.\n");	257	Report("HINT: pc points to the zero page.\n");
258	if (sig.is_memory_access) {	258	if (sig.is_memory_access) {
259	const char *access_type =	259	const char *access_type =
260	sig.write_flag == SignalContext::Write	260	sig.write_flag == SignalContext::Write
...	@@ -262,11 +262,12 @@ static void ReportDeadlySignalImpl(const SignalContext &sig, u32 tid,	...	@@ -262,11 +262,12 @@ static void ReportDeadlySignalImpl(const SignalContext &sig, u32 tid,
262	: (sig.write_flag == SignalContext::Read ? "READ" : "UNKNOWN");	262	: (sig.write_flag == SignalContext::Read ? "READ" : "UNKNOWN");
263	Report("The signal is caused by a %s memory access.\n", access_type);	263	Report("The signal is caused by a %s memory access.\n", access_type);
264	if (!sig.is_true_faulting_addr)	264	if (!sig.is_true_faulting_addr)
265	Report("Hint: this fault was caused by a dereference of a high value "	265	Report(
266	"address (see register values below). Disassemble the provided "	266	"HINT: this fault was caused by a dereference of a high value "
267	"pc to learn which register was used.\n");	267	"address (see register values below). Disassemble the provided "
		268	"pc to learn which register was used.\n");
268	else if (sig.addr < GetPageSizeCached())	269	else if (sig.addr < GetPageSizeCached())
269	Report("Hint: address points to the zero page.\n");	270	Report("HINT: address points to the zero page.\n");
270	}	271	}
271	MaybeReportNonExecRegion(sig.pc);	272	MaybeReportNonExecRegion(sig.pc);
272	InternalMmapVector<BufferedStackTrace> stack_buffer(1);	273	InternalMmapVector<BufferedStackTrace> stack_buffer(1);

lib/libtsan/sanitizer_common/sanitizer_unwind_win.cpp+43-6

...	@@ -43,10 +43,47 @@ void BufferedStackTrace::UnwindSlow(uptr pc, u32 max_depth) {	...	@@ -43,10 +43,47 @@ void BufferedStackTrace::UnwindSlow(uptr pc, u32 max_depth) {
43	trace_buffer[0] = pc;	43	trace_buffer[0] = pc;
44	}	44	}
45		45
46	#ifdef __clang__	46	PVOID CALLBACK FallbackFunctionTableAccess(HANDLE hProcess,
47	#pragma clang diagnostic push	47	DWORD64 dwAddrBase) {
48	#pragma clang diagnostic ignored "-Wframe-larger-than="	48	// First try DbgHelp's function.
49	#endif	49	if (PVOID pResult =
		50	__sanitizer::SymFunctionTableAccess64(hProcess, dwAddrBase)) {
		51	return pResult;
		52	}
		53
		54	// Fall back to RtlLookupFunctionEntry for dynamic code.
		55	// Function registered with RtlAddFunctionTable is not necessarily registered
		56	// with DbgHelp, so this is required to cover some edge cases (e.g. JIT
		57	// compilers can use Rtl* functions).
		58	# if SANITIZER_WINDOWS64
		59	DWORD64 dw64ImageBase = 0;
		60	return RtlLookupFunctionEntry(dwAddrBase, &dw64ImageBase, nullptr);
		61	# else
		62	return nullptr;
		63	# endif
		64	}
		65
		66	DWORD64 CALLBACK FallbackGetModuleBase(HANDLE hProcess, DWORD64 dwAddr) {
		67	if (DWORD64 dwResult = __sanitizer::SymGetModuleBase64(hProcess, dwAddr)) {
		68	return dwResult;
		69	}
		70
		71	// Both GetModuleBase and FunctionTableAccess must provide this fallback,
		72	// otherwise dynamic functions won't be properly unwound.
		73	# if SANITIZER_WINDOWS64
		74	DWORD64 dw64ImageBase = 0;
		75	if (RtlLookupFunctionEntry(dwAddr, &dw64ImageBase, nullptr)) {
		76	return dw64ImageBase;
		77	}
		78	# endif
		79
		80	return 0;
		81	}
		82
		83	# ifdef __clang__
		84	# pragma clang diagnostic push
		85	# pragma clang diagnostic ignored "-Wframe-larger-than="
		86	# endif
50	void BufferedStackTrace::UnwindSlow(uptr pc, void *context, u32 max_depth) {	87	void BufferedStackTrace::UnwindSlow(uptr pc, void *context, u32 max_depth) {
51	CHECK(context);	88	CHECK(context);
52	CHECK_GE(max_depth, 2);	89	CHECK_GE(max_depth, 2);
...	@@ -91,8 +128,8 @@ void BufferedStackTrace::UnwindSlow(uptr pc, void *context, u32 max_depth) {	...	@@ -91,8 +128,8 @@ void BufferedStackTrace::UnwindSlow(uptr pc, void *context, u32 max_depth) {
91	stack_frame.AddrFrame.Mode = AddrModeFlat;	128	stack_frame.AddrFrame.Mode = AddrModeFlat;
92	stack_frame.AddrStack.Mode = AddrModeFlat;	129	stack_frame.AddrStack.Mode = AddrModeFlat;
93	while (StackWalk64(machine_type, GetCurrentProcess(), GetCurrentThread(),	130	while (StackWalk64(machine_type, GetCurrentProcess(), GetCurrentThread(),
94	&stack_frame, &ctx, NULL, SymFunctionTableAccess64,	131	&stack_frame, &ctx, NULL, FallbackFunctionTableAccess,
95	SymGetModuleBase64, NULL) &&	132	FallbackGetModuleBase, NULL) &&
96	size < Min(max_depth, kStackTraceMax)) {	133	size < Min(max_depth, kStackTraceMax)) {
97	trace_buffer[size++] = (uptr)stack_frame.AddrPC.Offset;	134	trace_buffer[size++] = (uptr)stack_frame.AddrPC.Offset;
98	}	135	}

lib/libtsan/sanitizer_common/sanitizer_win.cpp+4-3

 @@ -913,11 +913,12 @@ void ReportFile::Write(const char *buffer, uptr length) {
   }
 }
-void SetAlternateSignalStack() {
+void* SetAlternateSignalStack() {
   // FIXME: Decide what to do on Windows.
+  return nullptr;
 }
-void UnsetAlternateSignalStack() {
+void UnsetAlternateSignalStack(void* altstack_base) {
   // FIXME: Decide what to do on Windows.
 }
 @@ -1222,7 +1223,7 @@ int WaitForProcess(pid_t pid) { return -1; }
 // FIXME implement on this platform.
 void GetMemoryProfile(fill_profile_f cb, uptr *stats) {}
-void CheckNoDeepBind(const char *filename, int flag) {
+void OnDlOpen(const char* filename, int flag) {
   // Do nothing.
 }

lib/libtsan/tsan_adaptive_delay.cpp created+433

...	@@ -0,0 +1,433 @@
1	//===-- tsan_adaptive_delay.h ------------------------------------ C++ --===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8	//
9	// This file is a part of ThreadSanitizer (TSan), a race detector.
10	//
11	//===----------------------------------------------------------------------===//
12
13	#include "tsan_adaptive_delay.h"
14
15	#include "interception/interception.h"
16	#include "sanitizer_common/sanitizer_allocator_internal.h"
17	#include "sanitizer_common/sanitizer_common.h"
18	#include "sanitizer_common/sanitizer_errno_codes.h"
19	#include "tsan_interface.h"
20	#include "tsan_rtl.h"
21
22	namespace __tsan {
23
24	namespace {
25
26	// =============================================================================
27	// DelaySpec: Represents a delay configuration parsed from flag strings
28	// =============================================================================
29	//
30	// Delay can be specified as:
31	// - "spin=N" : Spin for up to N cycles (very short delays)
32	// - "yield" : Call sched_yield() once
33	// - "sleep_us=N" : Sleep for up to N microseconds
34
35	enum class DelayType { Spin, Yield, SleepUs };
36
37	struct DelaySpec {
38	DelayType type;
39	int value; // spin cycles or sleep_us value; ignored for yield
40
41	// Both estimates below are used internally as a very rough estimate for
42	// delay overhead calculation, to cap the overall delay to the
43	// adaptive_delay_aggressiveness option. They're not intended to be 100%
44	// accurate on any or all architectures/operating systems, or for use in any
45	// other contexts.
46	//
47	// Estimated nanoseconds per spin cycle (volatile loop iteration).
48	static constexpr u64 kNsPerSpinCycle = 1;
49	// Estimated nanoseconds for a yield (context switch overhead)
50	static constexpr u64 kNsPerYield = 500;
51
52	static DelaySpec Parse(const char* str) {
53	DelaySpec spec;
54	if (internal_strncmp(str, "spin=", 5) == 0) {
55	spec.type = DelayType::Spin;
56	spec.value = internal_atoll(str + 5);
57	if (spec.value <= 0 \|\| spec.value > 10000) {
58	Printf(
59	"FATAL: Invalid TSAN_OPTIONS spin value '%s'; value must be "
60	"between 1 and 10000\n",
61	str);
62	Die();
63	}
64	} else if (internal_strcmp(str, "yield") == 0) {
65	spec.type = DelayType::Yield;
66	spec.value = 0;
67	} else if (internal_strncmp(str, "sleep_us=", 9) == 0) {
68	spec.type = DelayType::SleepUs;
69	spec.value = internal_atoll(str + 9);
70	if (spec.value <= 0) {
71	Printf(
72	"FATAL: Invalid TSAN_OPTIONS sleep_us value '%s'; value must be a "
73	"positive integer\n",
74	str);
75	Die();
76	}
77	} else {
78	Printf("FATAL: Unrecognized delay spec '%s', check TSAN_OPTIONS\n", str);
79	Die();
80	}
81	return spec;
82	}
83
84	const char* TypeName() const {
85	switch (type) {
86	case DelayType::Spin:
87	return "spin";
88	case DelayType::Yield:
89	return "yield";
90	case DelayType::SleepUs:
91	return "sleep_us";
92	}
93	return "unknown";
94	}
95	};
96
97	} // namespace
98
99	// =============================================================================
100	// AdaptiveDelayImpl: Time-budget aware delay injection for race exposure
101	// =============================================================================
102	//
103	// This implementation injects delays to expose data races while maintaining a
104	// configurable overhead target. It uses several strategies:
105	//
106	// 1. Time-Budget Controller: Tracks cumulative delays vs wall-clock time
107	// and adjusts delay probability to maintain target overhead.
108	//
109	// 2. Tiered Delays: Different delay strategies for different op types:
110	// - Relaxed atomics: Very rare sampling, tiny spin delays
111	// - Sync atomics (acq/rel/seq_cst): Moderate sampling, small usleep
112	// - Mutex/CV ops: Higher sampling, larger delays
113	// - Thread create/join: Always delay (rare but high value)
114	//
115	// 3. Address-based Sampling: Exponential backoff per address to avoid
116	// repeatedly delaying hot atomics.
117
118	struct AdaptiveDelayImpl {
119	ALWAYS_INLINE static AdaptiveDelayState* TLS() {
120	return &cur_thread()->adaptive_delay_state;
121	}
122	ALWAYS_INLINE static unsigned int* GetRandomSeed() {
123	return &TLS()->tls_random_seed_;
124	}
125	ALWAYS_INLINE static void SetRandomSeed(unsigned int seed) {
126	TLS()->tls_random_seed_ = seed;
127	}
128
129	// The public facing option is adaptive_delay_aggressiveness, which is an
130	// opaque value for the user to tune the amount of delay injected into the
131	// program. Internally, the implementation maps the aggressiveness to a target
132	// percent delay for the overall program runtime. It's not easy to implement
133	// a true wall clock delay target (e.g., 25% program wall time slowdown)
134	// because 1) spin loops and yield are hard to calculate actual wall time
135	// slowness and 2) usleep(N) is often slower than advertised. Thus, we keep
136	// the user facing parameter opaque to not under deliver on a promise of
137	// percent wall time slowdown.
138	struct TimeBudget {
139	int target_overhead_pct_;
140	Percent target_low_;
141	Percent target_high_;
142
143	void Init(int target_pct) {
144	target_overhead_pct_ = target_pct;
145	target_low_ = Percent::FromPct(
146	target_overhead_pct_ >= 5 ? target_overhead_pct_ - 5 : 0);
147	target_high_ = Percent::FromPct(target_overhead_pct_ + 5);
148	}
149
150	static constexpr u64 BucketDurationNs = 30'000'000'000ULL;
151
152	void RecordDelay(u64 delay_ns) {
153	u64 now = NanoTime();
154	u64 elapsed_ns = now - TLS()->bucket_start_ns_;
155
156	if (elapsed_ns >= BucketDurationNs) {
157	// Shift: old bucket is discarded, new becomes old, start fresh new
158	TLS()->delay_buckets_ns_[0] = TLS()->delay_buckets_ns_[1];
159	TLS()->delay_buckets_ns_[1] = 0;
160	TLS()->bucket_start_ns_ = now;
161	TLS()->bucket0_window_ns = BucketDurationNs;
162	}
163
164	TLS()->delay_buckets_ns_[1] += delay_ns;
165	}
166
167	Percent GetOverheadPercent() {
168	u64 now = NanoTime();
169	u64 elapsed_ns = now - TLS()->bucket_start_ns_;
170
171	// Need at least 1ms to calculate
172	if (elapsed_ns < 1'000'000ULL)
173	return Percent::FromPct(0);
174
175	if (elapsed_ns > BucketDurationNs * 2) {
176	// Both buckets are stale
177	return Percent::FromPct(0);
178	} else if (elapsed_ns > BucketDurationNs) {
179	// bucket[0] is stale, use only bucket[1] (current bucket)
180	u64 total_delay_ns = TLS()->delay_buckets_ns_[1];
181	return Percent::FromRatio(total_delay_ns, elapsed_ns);
182	} else {
183	u64 total_delay_ns =
184	TLS()->delay_buckets_ns_[0] + TLS()->delay_buckets_ns_[1];
185	u64 window_ns = TLS()->bucket0_window_ns + elapsed_ns;
186	return Percent::FromRatio(total_delay_ns, window_ns);
187	}
188	}
189
190	bool ShouldDelay() {
191	Percent ratio = GetOverheadPercent();
192
193	if (ratio < target_low_)
194	return true;
195	if (ratio > target_high_)
196	return false;
197
198	// Linear interpolation: at target_low -> 100%, at target_high -> 0%
199	Percent prob = (target_high_ - ratio) / (target_high_ - target_low_);
200	return prob.RandomCheck(GetRandomSeed());
201	}
202	};
203
204	// Address Sampler with Exponential Backoff
205	struct AddressSampler {
206	static constexpr u64 TABLE_SIZE = 2048;
207	struct Entry {
208	atomic_uintptr_t addr_;
209	atomic_uint32_t count_;
210	};
211	Entry table_[TABLE_SIZE];
212	static constexpr u32 ExponentialBackoffCap = 64;
213
214	void Init() {
215	for (u64 i = 0; i < TABLE_SIZE; ++i) {
216	atomic_store(&table_[i].addr_, 0, memory_order_relaxed);
217	atomic_store(&table_[i].count_, 0, memory_order_relaxed);
218	}
219	}
220
221	static ALWAYS_INLINE u64 splitmix64(u64 x) {
222	x = (x ^ (x >> 30)) * 0xBF58476D1CE4E5B9ULL;
223	x = (x ^ (x >> 27)) * 0x94D049BB133111EBULL;
224	x = x ^ (x >> 31);
225	return x;
226	}
227
228	// Uses exponential backoff: delay on 1st, 2nd, 4th, 8th, 16th, ...
229	bool ShouldDelayAddr(uptr addr) {
230	u64 idx = splitmix64(addr >> 3) & (TABLE_SIZE - 1);
231	Entry& e = table_[idx];
232
233	// This function is not thread safe.
234	// If two threads access the same hashed entry in parallel,
235	// worst case, we may end up returning true too often. This is
236	// acceptable...instead of full locking.
237
238	uptr stored_addr = atomic_load(&e.addr_, memory_order_relaxed);
239	if (stored_addr != addr) {
240	// Hash Collision - reset
241	atomic_store(&e.addr_, addr, memory_order_relaxed);
242	atomic_store(&e.count_, 1, memory_order_relaxed);
243	return true;
244	}
245
246	u32 count = atomic_fetch_add(&e.count_, 1, memory_order_relaxed) + 1;
247
248	if ((count & (count - 1)) == 0 && count <= ExponentialBackoffCap)
249	return true;
250	return false;
251	}
252	};
253
254	TimeBudget budget_;
255	AddressSampler sampler_;
256
257	int relaxed_sample_rate_;
258	int sync_atomic_sample_rate_;
259	int mutex_sample_rate_;
260	DelaySpec atomic_delay_;
261	DelaySpec sync_delay_;
262
263	void Init() { InitTls(); }
264
265	void InitTls() {
266	TLS()->bucket_start_ns_ = NanoTime();
267	TLS()->delay_buckets_ns_[0] = 0;
268	TLS()->delay_buckets_ns_[1] = 0;
269	TLS()->bucket0_window_ns = 0;
270
271	SetRandomSeed(NanoTime());
272	TLS()->tls_initialized_ = true;
273	}
274
275	bool IsTlsInitialized() const { return TLS()->tls_initialized_; }
276
277	AdaptiveDelayImpl() {
278	relaxed_sample_rate_ = flags()->adaptive_delay_relaxed_sample_rate;
279	sync_atomic_sample_rate_ = flags()->adaptive_delay_sync_atomic_sample_rate;
280	mutex_sample_rate_ = flags()->adaptive_delay_mutex_sample_rate;
281	atomic_delay_ = DelaySpec::Parse(flags()->adaptive_delay_max_atomic);
282	sync_delay_ = DelaySpec::Parse(flags()->adaptive_delay_max_sync);
283
284	int delay_aggressiveness = flags()->adaptive_delay_aggressiveness;
285	if (delay_aggressiveness < 1)
286	delay_aggressiveness = 1;
287
288	budget_.Init(delay_aggressiveness);
289	sampler_.Init();
290
291	VPrintf(1, "INFO: ThreadSanitizer AdaptiveDelay initialized\n");
292	VPrintf(1, " Delay aggressiveness: %d\n", delay_aggressiveness);
293	VPrintf(1, " Relaxed atomic sample rate: 1/%d\n", relaxed_sample_rate_);
294	VPrintf(1, " Sync atomic sample rate: 1/%d\n", sync_atomic_sample_rate_);
295	VPrintf(1, " Mutex sample rate: 1/%d\n", mutex_sample_rate_);
296	VPrintf(1, " Atomic delay: %s=%d\n", atomic_delay_.TypeName(),
297	atomic_delay_.value);
298	VPrintf(1, " Sync delay: %s=%d\n", sync_delay_.TypeName(),
299	sync_delay_.value);
300	}
301
302	void DoSpinDelay(int iters) {
303	volatile int v = 0;
304	for (int i = 0; i < iters; ++i) v = i;
305	(void)v;
306	budget_.RecordDelay(iters * DelaySpec::kNsPerSpinCycle);
307	}
308
309	void DoYieldDelay() {
310	internal_sched_yield();
311	budget_.RecordDelay(DelaySpec::kNsPerYield);
312	}
313
314	void DoSleepUsDelay(int max_us) {
315	// Use two Rand() calls to get full 32-bit range for larger sleep values
316	u32 rnd = ((u32)Rand(GetRandomSeed()) << 16) \| Rand(GetRandomSeed());
317	int delay_us = 1 + (rnd % max_us);
318	internal_usleep(delay_us);
319	budget_.RecordDelay(delay_us * 1000ULL);
320	}
321
322	void ExecuteDelay(const DelaySpec& spec) {
323	switch (spec.type) {
324	case DelayType::Spin: {
325	int iters = 1 + (Rand(GetRandomSeed()) % spec.value);
326	DoSpinDelay(iters);
327	break;
328	}
329	case DelayType::Yield:
330	DoYieldDelay();
331	break;
332	case DelayType::SleepUs:
333	DoSleepUsDelay(spec.value);
334	break;
335	}
336	}
337
338	void AtomicRelaxedOpDelay() {
339	if ((Rand(GetRandomSeed()) % relaxed_sample_rate_) != 0)
340	return;
341	if (!budget_.ShouldDelay())
342	return;
343
344	int iters = 10 + (Rand(GetRandomSeed()) % 10);
345	DoSpinDelay(iters);
346	}
347
348	void AtomicSyncOpDelay(uptr* addr) {
349	if ((Rand(GetRandomSeed()) % sync_atomic_sample_rate_) != 0)
350	return;
351	if (!budget_.ShouldDelay())
352	return;
353
354	if (addr && !sampler_.ShouldDelayAddr(*addr))
355	return;
356
357	ExecuteDelay(atomic_delay_);
358	}
359
360	void AtomicOpFence(int mo) {
361	CHECK(IsTlsInitialized());
362
363	if (mo < mo_acquire)
364	AtomicRelaxedOpDelay();
365	else
366	AtomicSyncOpDelay(nullptr);
367	}
368
369	void AtomicOpAddr(uptr addr, int mo) {
370	CHECK(IsTlsInitialized());
371
372	if (mo < mo_acquire)
373	AtomicRelaxedOpDelay();
374	else
375	AtomicSyncOpDelay(&addr);
376	}
377
378	void UnsampledDelay() {
379	CHECK(IsTlsInitialized());
380
381	if (!budget_.ShouldDelay())
382	return;
383
384	ExecuteDelay(sync_delay_);
385	}
386
387	void SyncOp() {
388	CHECK(IsTlsInitialized());
389
390	if ((Rand(GetRandomSeed()) % mutex_sample_rate_) != 0)
391	return;
392	if (!budget_.ShouldDelay())
393	return;
394
395	ExecuteDelay(sync_delay_);
396	}
397
398	void BeforeChildThreadRuns() {
399	InitTls();
400	UnsampledDelay();
401	}
402
403	void AfterThreadCreation() { UnsampledDelay(); }
404	};
405
406	AdaptiveDelayImpl& GetImpl() {
407	static AdaptiveDelayImpl impl;
408	return impl;
409	}
410
411	bool AdaptiveDelay::is_adaptive_delay_enabled;
412
413	void AdaptiveDelay::InitImpl() {
414	AdaptiveDelay::is_adaptive_delay_enabled = flags()->enable_adaptive_delay;
415	if (!AdaptiveDelay::is_adaptive_delay_enabled)
416	return;
417
418	GetImpl().Init();
419	}
420
421	void AdaptiveDelay::SyncOpImpl() { GetImpl().SyncOp(); }
422	void AdaptiveDelay::AtomicOpFenceImpl(int mo) { GetImpl().AtomicOpFence(mo); }
423	void AdaptiveDelay::AtomicOpAddrImpl(__sanitizer::uptr addr, int mo) {
424	GetImpl().AtomicOpAddr(addr, mo);
425	}
426	void AdaptiveDelay::AfterThreadCreationImpl() {
427	GetImpl().AfterThreadCreation();
428	}
429	void AdaptiveDelay::BeforeChildThreadRunsImpl() {
430	GetImpl().BeforeChildThreadRuns();
431	}
432
433	} // namespace __tsan

lib/libtsan/tsan_adaptive_delay.h created+173

...	@@ -0,0 +1,173 @@
1	//===-- tsan_adaptive_delay.h ------------------------------------ C++ --===//
2	//
3	// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4	// See https://llvm.org/LICENSE.txt for license information.
5	// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6	//
7	//===----------------------------------------------------------------------===//
8	//
9	// This file is a part of ThreadSanitizer (TSan), a race detector.
10	//
11	//===----------------------------------------------------------------------===//
12
13	#ifndef TSAN_ADAPTIVE_DELAY_H
14	#define TSAN_ADAPTIVE_DELAY_H
15
16	#include "sanitizer_common/sanitizer_common.h"
17	#include "sanitizer_common/sanitizer_internal_defs.h"
18
19	namespace __tsan {
20
21	// AdaptiveDelay injects delays at synchronization points, atomic operations,
22	// and thread lifecycle events to increase the likelihood of exposing data
23	// races. The delay injection is controlled by an approximate time budget to
24	// maintain a configurable overhead target.
25	//
26	// SyncOp() delays non-atomic synchronization points (those with clear
27	// happens-before relationships):
28	// - Acquire operations like locking a mutex delays before the mutex is locked.
29	// - Release operations like unlocking a mutex delays after the mutex is
30	// unlocked
31	// These are more likely to expose interesting (rare) thread interleavings.
32	// For example, delaying a thread that unlocks a mutex from running to allow
33	// newly woken thread to execute before the unlocking thread would normally
34	// execute.
35	//
36	// TODO:
37	// - Move the adaptive delay implementation into sanitizer_common so that
38	// ASAN can also leverage it in pthread_* interceptors
39	// - Integrate into other interceptors like libdispatch.
40	struct AdaptiveDelay {
41	ALWAYS_INLINE static void Init() { InitImpl(); }
42
43	ALWAYS_INLINE static void SyncOp() {
44	if (!is_adaptive_delay_enabled)
45	return;
46	SyncOpImpl();
47	}
48
49	ALWAYS_INLINE static void AtomicOpFence(int mo) {
50	if (!is_adaptive_delay_enabled)
51	return;
52	AtomicOpFenceImpl(mo);
53	}
54
55	ALWAYS_INLINE static void AtomicOpAddr(__sanitizer::uptr addr, int mo) {
56	if (!is_adaptive_delay_enabled)
57	return;
58	AtomicOpAddrImpl(addr, mo);
59	}
60
61	ALWAYS_INLINE static void AfterThreadCreation() {
62	if (!is_adaptive_delay_enabled)
63	return;
64	AfterThreadCreationImpl();
65	}
66
67	ALWAYS_INLINE static void BeforeChildThreadRuns() {
68	if (!is_adaptive_delay_enabled)
69	return;
70	BeforeChildThreadRunsImpl();
71	}
72
73	private:
74	static void InitImpl();
75
76	static void SyncOpImpl();
77
78	static void AtomicOpFenceImpl(int mo);
79	static void AtomicOpAddrImpl(__sanitizer::uptr addr, int mo);
80
81	static void AfterThreadCreationImpl();
82	static void BeforeChildThreadRunsImpl();
83
84	static bool is_adaptive_delay_enabled;
85	};
86
87	// The runtime defines cur_thread() to retrieve TLS thread state, and it
88	// takes care of platform specific implementation details. The AdaptiveDelay
89	// implementation stores per-thread data in this struct, which is embedded
90	// in cur_thread().
91	struct AdaptiveDelayState {
92	// For the adaptive delay implementation
93	// Sliding window delay tracking: 2 buckets of 30 seconds each
94	u64 delay_buckets_ns_[2]; // [0] = older 30s, [1] = newer 30s
95	u64 bucket_start_ns_; // When current bucket (index 1) started
96	u64 bucket0_window_ns; // 0ns before the first bucket has rolled, and set to
97	// the bucket window time after This handles the case
98	// where, before the program has ran one bucket window
99	// duration, we should not include the previous bucket
100	// duration in the overhead percent calculation.
101	unsigned int tls_random_seed_;
102	bool tls_initialized_;
103	};
104
105	// Fixed-point arithmetic type that mimics floating point operations
106	class Percent {
107	using u32 = __sanitizer::u32;
108	using u64 = __sanitizer::u64;
109
110	u32 bp_{}; // basis points (0-10000 represents 0.0-1.0)
111	bool is_valid_{};
112
113	static constexpr u32 kBasisPointsPerUnit = 10000;
114
115	Percent(u32 bp, bool is_valid) : bp_(bp), is_valid_(is_valid) {}
116
117	public:
118	Percent() = default;
119	Percent(const Percent&) = default;
120	Percent& operator=(const Percent&) = default;
121	Percent(Percent&&) = default;
122	Percent& operator=(Percent&&) = default;
123
124	static Percent FromPct(u32 pct) { return Percent{pct * 100, true}; }
125	static Percent FromRatio(u64 numerator, u64 denominator) {
126	if (denominator == 0)
127	return Percent{0, false};
128	// Avoid overflow: scale down if needed
129	if (numerator > UINT64_MAX / kBasisPointsPerUnit) {
130	return Percent{(u32)((numerator / denominator) * kBasisPointsPerUnit),
131	true};
132	}
133	return Percent{(u32)((numerator * kBasisPointsPerUnit) / denominator),
134	true};
135	}
136
137	bool IsValid() const { return is_valid_; }
138
139	// Returns true with probability equal to the percentage.
140	bool RandomCheck(u32* seed) const {
141	return (Rand(seed) % kBasisPointsPerUnit) < bp_;
142	}
143
144	int GetPct() const { return bp_ / 100; }
145	int GetBasisPoints() const { return bp_; }
146
147	bool operator==(const Percent& other) const { return bp_ == other.bp_; }
148	bool operator!=(const Percent& other) const { return bp_ != other.bp_; }
149	bool operator<(const Percent& other) const { return bp_ < other.bp_; }
150	bool operator>(const Percent& other) const { return bp_ > other.bp_; }
151	bool operator<=(const Percent& other) const { return bp_ <= other.bp_; }
152	bool operator>=(const Percent& other) const { return bp_ >= other.bp_; }
153
154	Percent operator-(const Percent& other) const {
155	if (!is_valid_ \|\| !other.is_valid_)
156	return Percent{0, false};
157	if (bp_ < other.bp_)
158	return Percent{0, false};
159	return Percent{bp_ - other.bp_, true};
160	}
161
162	Percent operator/(const Percent& other) const {
163	if (!is_valid_ \|\| !other.is_valid_)
164	return Percent{0, false};
165	if (other.bp_ == 0)
166	return Percent{0, false};
167	return Percent{(bp_ * kBasisPointsPerUnit) / other.bp_, true};
168	}
169	};
170
171	} // namespace __tsan
172
173	#endif // TSAN_ADAPTIVE_DELAY_H

lib/libtsan/tsan_flags.cpp+1-1

...	@@ -37,7 +37,7 @@ inline bool FlagHandler<LockDuringWriteSetting>::Parse(const char *value) {	...	@@ -37,7 +37,7 @@ inline bool FlagHandler<LockDuringWriteSetting>::Parse(const char *value) {
37	*t_ = kNoLockDuringWritesAllProcesses;	37	*t_ = kNoLockDuringWritesAllProcesses;
38	return true;	38	return true;
39	}	39	}
40	Printf("ERROR: Invalid value for signal handler option: '%s'\n", value);	40	Printf("ERROR: Invalid value for lock_during_write option: '%s'\n", value);
41	return false;	41	return false;
42	}	42	}
43		43

lib/libtsan/tsan_flags.inc+27

...	@@ -92,3 +92,30 @@ TSAN_FLAG(LockDuringWriteSetting, lock_during_write, kLockDuringAllWrites,	...	@@ -92,3 +92,30 @@ TSAN_FLAG(LockDuringWriteSetting, lock_during_write, kLockDuringAllWrites,
92	"\"disable_for_all_processes\" - don't lock during all writes in "	92	"\"disable_for_all_processes\" - don't lock during all writes in "
93	"the current process and it's children processes.")	93	"the current process and it's children processes.")
94	#endif	94	#endif
		95
		96	TSAN_FLAG(bool, enable_adaptive_delay, false,
		97	"Enable adaptive delay injection to expose data races. When "
		98	"enabled, delays are strategically injected at synchronization "
		99	"points, atomic operations, and thread lifecycle events to increase "
		100	"the likelihood of exposing races while maintaining a configurable "
		101	"overhead budget.")
		102
		103	TSAN_FLAG(
		104	int, adaptive_delay_aggressiveness, 25,
		105	"Controls delay injection intensity for race detection. Higher values "
		106	"inject more delays to expose races. Suggested values: 10 (minimal delay), "
		107	"50 (moderate delay), 200 (aggressive). "
		108	"This is a tuning parameter; actual overhead varies by workload and "
		109	"platform.")
		110	TSAN_FLAG(int, adaptive_delay_relaxed_sample_rate, 10000,
		111	"Sample 1 in N relaxed atomic operations for delay")
		112	TSAN_FLAG(int, adaptive_delay_sync_atomic_sample_rate, 100,
		113	"Sample 1 in N acquire/release/seq_cst atomic operations for delay")
		114	TSAN_FLAG(int, adaptive_delay_mutex_sample_rate, 10,
		115	"Sample 1 in N mutex/cv operations for delay")
		116	TSAN_FLAG(const char*, adaptive_delay_max_atomic, "sleep_us=50",
		117	"Delay for atomic operations: 'spin=N' (max N spins), 'yield', or "
		118	"'sleep_us=N' (max N>0 us sleep)")
		119	TSAN_FLAG(const char*, adaptive_delay_max_sync, "sleep_us=500",
		120	"Delay for sync operations: 'spin=N' (max N spins), 'yield', or "
		121	"'sleep_us=N' (max N>0 us sleep)")

lib/libtsan/tsan_interceptors_posix.cpp+24-2

lib/libtsan/tsan_interface_ann.cpp+9-5

 @@ -9,17 +9,19 @@
 // This file is a part of ThreadSanitizer (TSan), a race detector.
 //
 //===----------------------------------------------------------------------===//
-#include "sanitizer_common/sanitizer_libc.h"
+#include "tsan_interface_ann.h"
 #include "sanitizer_common/sanitizer_internal_defs.h"
+#include "sanitizer_common/sanitizer_libc.h"
 #include "sanitizer_common/sanitizer_placement_new.h"
 #include "sanitizer_common/sanitizer_stacktrace.h"
 #include "sanitizer_common/sanitizer_vector.h"
-#include "tsan_interface_ann.h"
+#include "tsan_adaptive_delay.h"
-#include "tsan_report.h"
-#include "tsan_rtl.h"
-#include "tsan_mman.h"
 #include "tsan_flags.h"
+#include "tsan_mman.h"
 #include "tsan_platform.h"
+#include "tsan_report.h"
+#include "tsan_rtl.h"
 #define CALLERPC ((uptr)__builtin_return_address(0))
 @@ -370,6 +372,7 @@ void __tsan_mutex_pre_lock(void *m, unsigned flagz) {
   }
   ThreadIgnoreBegin(thr, 0);
   ThreadIgnoreSyncBegin(thr, 0);
+  AdaptiveDelay::SyncOp();
 }
 INTERFACE_ATTRIBUTE
 @@ -402,6 +405,7 @@ int __tsan_mutex_pre_unlock(void *m, unsigned flagz) {
 INTERFACE_ATTRIBUTE
 void __tsan_mutex_post_unlock(void *m, unsigned flagz) {
+  AdaptiveDelay::SyncOp();
   SCOPED_ANNOTATION(__tsan_mutex_post_unlock);
   ThreadIgnoreSyncEnd(thr);
   ThreadIgnoreEnd(thr);

lib/libtsan/tsan_interface_atomic.cpp+12

 @@ -21,6 +21,7 @@
 #include "sanitizer_common/sanitizer_mutex.h"
 #include "sanitizer_common/sanitizer_placement_new.h"
 #include "sanitizer_common/sanitizer_stacktrace.h"
+#include "tsan_adaptive_delay.h"
 #include "tsan_flags.h"
 #include "tsan_interface.h"
 #include "tsan_rtl.h"
 @@ -520,8 +521,19 @@ static morder to_morder(int mo) {
   return res;
 }
+template <class... Types>
+ALWAYS_INLINE auto AtomicDelayImpl(morder mo, Types... args) {
+  AdaptiveDelay::AtomicOpFence(mo);
+}
+template <class AddrType, class... Types>
+ALWAYS_INLINE auto AtomicDelayImpl(morder mo, AddrType addr, Types... args) {
+  AdaptiveDelay::AtomicOpAddr((uptr)addr, (int)mo);
+}
 template <class Op, class... Types>
 ALWAYS_INLINE auto AtomicImpl(morder mo, Types... args) {
+  AtomicDelayImpl(mo, args...);
   ThreadState *const thr = cur_thread();
   ProcessPendingSignals(thr);
   if (UNLIKELY(thr->ignore_sync || thr->ignore_interceptors))

lib/libtsan/tsan_platform.h+10-7

 @@ -404,7 +404,7 @@ struct MappingRiscv64_39 {
   static const uptr kHeapMemBeg = 0x2c00000000ull;
   static const uptr kHeapMemEnd = 0x2c00000000ull;
   static const uptr kHiAppMemBeg = 0x3c00000000ull;
-  static const uptr kHiAppMemEnd = 0x3fffffffffull;
+  static const uptr kHiAppMemEnd = 0x4000000000ull;
   static const uptr kShadowMsk = 0x3800000000ull;
   static const uptr kShadowXor = 0x0800000000ull;
   static const uptr kShadowAdd = 0x0000000000ull;
 @@ -434,7 +434,7 @@ struct MappingRiscv64_48 {
   static const uptr kHeapMemBeg = 0x5a0000000000ull;
   static const uptr kHeapMemEnd = 0x5a0000000000ull;
   static const uptr kHiAppMemBeg = 0x7a0000000000ull;
-  static const uptr kHiAppMemEnd = 0x7fffffffffffull;
+  static const uptr kHiAppMemEnd = 0x800000000000ull;
   static const uptr kShadowMsk = 0x700000000000ull;
   static const uptr kShadowXor = 0x100000000000ull;
   static const uptr kShadowAdd = 0x000000000000ull;
 @@ -738,13 +738,16 @@ struct MappingGoRiscv64_48 {
 Go on linux/s390x
 0000 0000 1000 - 1000 0000 0000: executable and heap - 16 TiB
 1000 0000 0000 - 4000 0000 0000: -
-4000 0000 0000 - 6000 0000 0000: shadow - 64TiB (4 * app)
+4000 0000 0000 - 6000 0000 0000: shadow - 32 TiB (2 * app)
-6000 0000 0000 - 9000 0000 0000: -
+6000 0000 0000 - 7000 0000 0000: -
-9000 0000 0000 - 9800 0000 0000: metainfo - 8TiB (0.5 * app)
+7000 0000 0000 - 7800 0000 0000: metainfo - 8 TiB (0.5 * app)
+7800 0000 0000 - 8000 0000 0000: -
 */
 struct MappingGoS390x {
-  static const uptr kMetaShadowBeg = 0x900000000000ull;
+  // Keep the mapping below 2^47 for QEMU linux-user on x86-64 hosts with
-  static const uptr kMetaShadowEnd = 0x980000000000ull;
+  // four-level page tables.
+  static const uptr kMetaShadowBeg = 0x700000000000ull;
+  static const uptr kMetaShadowEnd = 0x780000000000ull;
   static const uptr kShadowBeg     = 0x400000000000ull;
   static const uptr kShadowEnd = 0x600000000000ull;
   static const uptr kLoAppMemBeg = 0x000000001000ull;

lib/libtsan/tsan_platform_linux.cpp+12

...	@@ -27,6 +27,18 @@	...	@@ -27,6 +27,18 @@
27	#include "tsan_platform.h"	27	#include "tsan_platform.h"
28	#include "tsan_rtl.h"	28	#include "tsan_rtl.h"
29		29
		30	#if SANITIZER_NETBSD
		31	# // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
		32	# define _RTLD_SOURCE
		33	# include <sys/types.h>
		34	# include <machine/mcontext.h>
		35	# undef _RTLD_SOURCE
		36	# include <sys/param.h>
		37	# if __NetBSD_Version__ >= 1099001200
		38	# include <machine/lwp_private.h>
		39	# endif
		40	#endif
		41
30	#include <fcntl.h>	42	#include <fcntl.h>
31	#include <pthread.h>	43	#include <pthread.h>
32	#include <signal.h>	44	#include <signal.h>

lib/libtsan/tsan_report.cpp+3-2

 @@ -317,8 +317,9 @@ void PrintReport(const ReportDesc *rep) {
       } else {
         PrintStack(rep->stacks[i]);
         if (i == 0)
-          Printf("    Hint: use TSAN_OPTIONS=second_deadlock_stack=1 "
+          Printf(
-                 "to get more informative warning message\n\n");
+              "    HINT: use TSAN_OPTIONS=second_deadlock_stack=1 "
+              "to get more informative warning message\n\n");
       }
     }
   } else {

lib/libtsan/tsan_rtl.cpp+5

...	@@ -21,6 +21,7 @@	...	@@ -21,6 +21,7 @@
21	#include "sanitizer_common/sanitizer_placement_new.h"	21	#include "sanitizer_common/sanitizer_placement_new.h"
22	#include "sanitizer_common/sanitizer_stackdepot.h"	22	#include "sanitizer_common/sanitizer_stackdepot.h"
23	#include "sanitizer_common/sanitizer_symbolizer.h"	23	#include "sanitizer_common/sanitizer_symbolizer.h"
		24	#include "tsan_adaptive_delay.h"
24	#include "tsan_defs.h"	25	#include "tsan_defs.h"
25	#include "tsan_interface.h"	26	#include "tsan_interface.h"
26	#include "tsan_mman.h"	27	#include "tsan_mman.h"
...	@@ -775,6 +776,10 @@ void Initialize(ThreadState *thr) {	...	@@ -775,6 +776,10 @@ void Initialize(ThreadState *thr) {
775	while (__tsan_resumed == 0) {}	776	while (__tsan_resumed == 0) {}
776	}	777	}
777		778
		779	#if !SANITIZER_GO
		780	AdaptiveDelay::Init();
		781	#endif
		782
778	OnInitialize();	783	OnInitialize();
779	}	784	}
780		785

lib/libtsan/tsan_rtl.h+3

...	@@ -34,6 +34,7 @@	...	@@ -34,6 +34,7 @@
34	#include "sanitizer_common/sanitizer_suppressions.h"	34	#include "sanitizer_common/sanitizer_suppressions.h"
35	#include "sanitizer_common/sanitizer_thread_registry.h"	35	#include "sanitizer_common/sanitizer_thread_registry.h"
36	#include "sanitizer_common/sanitizer_vector.h"	36	#include "sanitizer_common/sanitizer_vector.h"
		37	#include "tsan_adaptive_delay.h"
37	#include "tsan_defs.h"	38	#include "tsan_defs.h"
38	#include "tsan_flags.h"	39	#include "tsan_flags.h"
39	#include "tsan_ignoreset.h"	40	#include "tsan_ignoreset.h"
...	@@ -240,6 +241,8 @@ struct alignas(SANITIZER_CACHE_LINE_SIZE) ThreadState {	...	@@ -240,6 +241,8 @@ struct alignas(SANITIZER_CACHE_LINE_SIZE) ThreadState {
240	bool in_internal_write_call;	241	bool in_internal_write_call;
241	#endif	242	#endif
242		243
		244	AdaptiveDelayState adaptive_delay_state;
		245
243	explicit ThreadState(Tid tid);	246	explicit ThreadState(Tid tid);
244	};	247	};
245		248

lib/libtsan/ubsan/ubsan_flags.h+4

 @@ -41,6 +41,10 @@ extern "C" {
 // override the default flag values.
 SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE
 const char *__ubsan_default_options();
+// Users may provide their own implementation of __ubsan_default_suppressions to
+// override the default suppression values.
+SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE const char *
+__ubsan_default_suppressions();
 }  // extern "C"
 #endif  // UBSAN_FLAGS_H

lib/libunwind/include/__libunwind_config.h+1-1

...	@@ -9,7 +9,7 @@	...	@@ -9,7 +9,7 @@
9	#ifndef ____LIBUNWIND_CONFIG_H__	9	#ifndef ____LIBUNWIND_CONFIG_H__
10	#define ____LIBUNWIND_CONFIG_H__	10	#define ____LIBUNWIND_CONFIG_H__
11		11
12	#define _LIBUNWIND_VERSION 15000	12	#define _LIBUNWIND_VERSION 230000
13		13
14	#if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) && \	14	#if defined(__arm__) && !defined(__USING_SJLJ_EXCEPTIONS__) && \
15	!defined(__ARM_DWARF_EH__) && !defined(__SEH__)	15	!defined(__ARM_DWARF_EH__) && !defined(__SEH__)

lib/libunwind/include/libunwind.h+1-1

...	@@ -122,7 +122,7 @@	...	@@ -122,7 +122,7 @@
122	__unwind_ptrauth_restricted_intptr(ptrauth_key_function_pointer, 1, \	122	__unwind_ptrauth_restricted_intptr(ptrauth_key_function_pointer, 1, \
123	__ptrauth_unwind_cie_info_personality_disc)	123	__ptrauth_unwind_cie_info_personality_disc)
124		124
125	// ptrauth_string_discriminator("personality") == 0x7EAD)	125	// ptrauth_string_discriminator("personality") == 0x7EAD
126	#define __ptrauth_unwind_pauthtest_personality_disc 0x7EAD	126	#define __ptrauth_unwind_pauthtest_personality_disc 0x7EAD
127		127
128	#else	128	#else

lib/libunwind/include/mach-o/compact_unwind_encoding.h+1-1

...	@@ -443,7 +443,7 @@ struct unwind_info_section_header_lsda_index_entry	...	@@ -443,7 +443,7 @@ struct unwind_info_section_header_lsda_index_entry
443		443
444	struct unwind_info_regular_second_level_entry	444	struct unwind_info_regular_second_level_entry
445	{	445	{
446	uint32_t functionOffset;	446	uint32_t functionOffset;
447	compact_unwind_encoding_t encoding;	447	compact_unwind_encoding_t encoding;
448	};	448	};
449		449

lib/libunwind/include/unwind_itanium.h+1-1

...	@@ -32,7 +32,7 @@ struct _Unwind_Exception {	...	@@ -32,7 +32,7 @@ struct _Unwind_Exception {
32	// The implementation of _Unwind_Exception uses an attribute mode on the	32	// The implementation of _Unwind_Exception uses an attribute mode on the
33	// above fields which has the side effect of causing this whole struct to	33	// above fields which has the side effect of causing this whole struct to
34	// round up to 32 bytes in size (48 with SEH). To be more explicit, we add	34	// round up to 32 bytes in size (48 with SEH). To be more explicit, we add
35	// pad fields added for binary compatibility.	35	// pad fields for binary compatibility.
36	uint32_t reserved[3];	36	uint32_t reserved[3];
37	#endif	37	#endif
38	// The Itanium ABI requires that _Unwind_Exception objects are "double-word	38	// The Itanium ABI requires that _Unwind_Exception objects are "double-word

lib/libunwind/src/AddressSpace.hpp-1

...	@@ -666,7 +666,6 @@ inline bool LocalAddressSpace::findUnwindSections(	...	@@ -666,7 +666,6 @@ inline bool LocalAddressSpace::findUnwindSections(
666	return true;	666	return true;
667	}	667	}
668	#endif	668	#endif
669	// zig patch: https://github.com/llvm/llvm-project/issues/194228
670	dl_iterate_cb_data cb_data = {this, &info, static_cast<pint_t>(targetAddr)};	669	dl_iterate_cb_data cb_data = {this, &info, static_cast<pint_t>(targetAddr)};
671	int found = dl_iterate_phdr(findUnwindSectionsByPhdr, &cb_data);	670	int found = dl_iterate_phdr(findUnwindSectionsByPhdr, &cb_data);
672	return static_cast<bool>(found);	671	return static_cast<bool>(found);

lib/libunwind/src/CompactUnwinder.hpp+5-4

...	@@ -12,6 +12,7 @@	...	@@ -12,6 +12,7 @@
12	#ifndef __COMPACT_UNWINDER_HPP__	12	#ifndef __COMPACT_UNWINDER_HPP__
13	#define __COMPACT_UNWINDER_HPP__	13	#define __COMPACT_UNWINDER_HPP__
14		14
		15	#include <inttypes.h>
15	#include <stdint.h>	16	#include <stdint.h>
16	#include <stdlib.h>	17	#include <stdlib.h>
17		18
...	@@ -335,8 +336,8 @@ int CompactUnwinder_x86_64<A>::stepWithCompactEncodingRBPFrame(	...	@@ -335,8 +336,8 @@ int CompactUnwinder_x86_64<A>::stepWithCompactEncodingRBPFrame(
335	default:	336	default:
336	(void)functionStart;	337	(void)functionStart;
337	_LIBUNWIND_DEBUG_LOG("bad register for RBP frame, encoding=%08X for "	338	_LIBUNWIND_DEBUG_LOG("bad register for RBP frame, encoding=%08X for "
338	"function starting at 0x%llX",	339	"function starting at 0x%" PRIu64 "X",
339	compactEncoding, functionStart);	340	compactEncoding, functionStart);
340	_LIBUNWIND_ABORT("invalid compact unwind encoding");	341	_LIBUNWIND_ABORT("invalid compact unwind encoding");
341	}	342	}
342	savedRegisters += 8;	343	savedRegisters += 8;
...	@@ -454,8 +455,8 @@ int CompactUnwinder_x86_64<A>::stepWithCompactEncodingFrameless(	...	@@ -454,8 +455,8 @@ int CompactUnwinder_x86_64<A>::stepWithCompactEncodingFrameless(
454	break;	455	break;
455	default:	456	default:
456	_LIBUNWIND_DEBUG_LOG("bad register for frameless, encoding=%08X for "	457	_LIBUNWIND_DEBUG_LOG("bad register for frameless, encoding=%08X for "
457	"function starting at 0x%llX",	458	"function starting at 0x%" PRIu64 "X",
458	encoding, functionStart);	459	encoding, functionStart);
459	_LIBUNWIND_ABORT("invalid compact unwind encoding");	460	_LIBUNWIND_ABORT("invalid compact unwind encoding");
460	}	461	}
461	savedRegisters += 8;	462	savedRegisters += 8;

lib/libunwind/src/DwarfInstructions.hpp+17-26

 @@ -76,10 +76,14 @@ private:
     __builtin_unreachable();
   }
 #if defined(_LIBUNWIND_TARGET_AARCH64)
-  static bool isReturnAddressSigned(A &addressSpace, R registers, pint_t cfa,
+  enum RASignStatus {
-                                    PrologInfo &prolog);
+    RANotSigned = 0,
-  static bool isReturnAddressSignedWithPC(A &addressSpace, R registers,
+    RASigned = 1,
-                                          pint_t cfa, PrologInfo &prolog);
+    RASignedWithPC = 2,
+  };
+  static RASignStatus getReturnAddressSignStatus(A &addressSpace, R registers,
+                                                 pint_t cfa,
+                                                 PrologInfo &prolog);
 #endif
 };
 @@ -177,7 +181,8 @@ v128 DwarfInstructions<A, R>::getSavedVectorRegister(
 }
 #if defined(_LIBUNWIND_TARGET_AARCH64)
 template <typename A, typename R>
-bool DwarfInstructions<A, R>::isReturnAddressSigned(A &addressSpace,
+typename DwarfInstructions<A, R>::RASignStatus
+DwarfInstructions<A, R>::getReturnAddressSignStatus(A &addressSpace,
                                                     R registers, pint_t cfa,
                                                     PrologInfo &prolog) {
   pint_t raSignState;
 @@ -187,24 +192,9 @@ bool DwarfInstructions<A, R>::isReturnAddressSigned(A &addressSpace,
   else
     raSignState = getSavedRegister(addressSpace, registers, cfa, regloc);
-  // Only bit[0] is meaningful.
+  // bits[1:0] describe how RA is signed.
-  return raSignState & 0x01;
+  assert((raSignState & 0x3) != 3 && "unexpected RA sign state");
-}
+  return static_cast<RASignStatus>(raSignState & 0x3);
-template <typename A, typename R>
-bool DwarfInstructions<A, R>::isReturnAddressSignedWithPC(A &addressSpace,
-                                                          R registers,
-                                                          pint_t cfa,
-                                                          PrologInfo &prolog) {
-  pint_t raSignState;
-  auto regloc = prolog.savedRegisters[UNW_AARCH64_RA_SIGN_STATE];
-  if (regloc.location == CFI_Parser<A>::kRegisterUnused)
-    raSignState = static_cast<pint_t>(regloc.value);
-  else
-    raSignState = getSavedRegister(addressSpace, registers, cfa, regloc);
-  // Only bit[1] is meaningful.
-  return raSignState & 0x02;
 }
 #endif
 @@ -317,8 +307,9 @@ int DwarfInstructions<A, R>::stepWithDwarf(
       // return address needs to be authenticated before the return address is
       // restored. autia1716 is used instead of autia as autia1716 assembles
       // to a NOP on pre-v8.3a architectures.
-      if ((R::getArch() == REGISTERS_ARM64) &&
+      RASignStatus RAState =
-          isReturnAddressSigned(addressSpace, registers, cfa, prolog) &&
+          getReturnAddressSignStatus(addressSpace, registers, cfa, prolog);
+      if ((R::getArch() == REGISTERS_ARM64) && RAState != RANotSigned &&
           returnAddress != 0) {
 #if !defined(_LIBUNWIND_IS_NATIVE_ONLY)
         return UNW_ECROSSRASIGNING;
 @@ -329,7 +320,7 @@ int DwarfInstructions<A, R>::stepWithDwarf(
         // We use the hint versions of the authentication instructions below to
         // ensure they're assembled by the compiler even for targets with no
         // FEAT_PAuth/FEAT_PAuth_LR support.
-        if (isReturnAddressSignedWithPC(addressSpace, registers, cfa, prolog)) {
+        if (RAState == RASignedWithPC) {
           register unsigned long long x15 __asm("x15") =
               prolog.ptrAuthDiversifier;
           if (cieInfo.addressesSignedWithBKey) {

lib/libunwind/src/DwarfParser.hpp-1

...	@@ -473,7 +473,6 @@ bool CFI_Parser<A>::parseFDEInstructions(	...	@@ -473,7 +473,6 @@ bool CFI_Parser<A>::parseFDEInstructions(
473	pint_t pcoffset;	473	pint_t pcoffset;
474	};	474	};
475		475
476	// zig patch: https://github.com/llvm/llvm-project/issues/194228
477	ParseInfo parseInfoArray[] = {	476	ParseInfo parseInfoArray[] = {
478	{cieInfo.cieInstructions, cieInfo.cieStart + cieInfo.cieLength,	477	{cieInfo.cieInstructions, cieInfo.cieStart + cieInfo.cieLength,
479	(pint_t)(-1)},	478	(pint_t)(-1)},

lib/libunwind/src/FrameHeaderCache.hpp+1-1

...	@@ -24,7 +24,7 @@	...	@@ -24,7 +24,7 @@
24	#define _LIBUNWIND_FRAMEHEADERCACHE_TRACE(msg, ...)	24	#define _LIBUNWIND_FRAMEHEADERCACHE_TRACE(msg, ...)
25	#endif	25	#endif
26		26
27	// This cache should only be be used from within a dl_iterate_phdr callback.	27	// This cache should only be used from within a dl_iterate_phdr callback.
28	// dl_iterate_phdr does the necessary synchronization to prevent problems	28	// dl_iterate_phdr does the necessary synchronization to prevent problems
29	// with concurrent access via the libc load lock. Adding synchronization	29	// with concurrent access via the libc load lock. Adding synchronization
30	// for other uses is possible, but not currently done.	30	// for other uses is possible, but not currently done.

lib/libunwind/src/Registers.hpp+17-6

 @@ -20,6 +20,9 @@
 #include "libunwind_ext.h"
 #include "shadow_stack_unwind.h"
+#if defined(__APPLE__)
+#include <sys/sysctl.h>
+#endif
 #if defined(_LIBUNWIND_HAVE_GETAUXVAL) || defined(_LIBUNWIND_HAVE_ELF_AUX_INFO)
 #include <sys/auxv.h>
 #endif
 @@ -1892,7 +1895,7 @@ public:
     uint64_t value = _registers.__pc;
 #if defined(_LIBUNWIND_TARGET_AARCH64_AUTHENTICATED_UNWINDING)
     // Note the value of the PC was signed to its address in the register state
-    // but everyone else expects it to be sign by the SP, so convert on return.
+    // but everyone else expects it to be signed by the SP, so convert on return.
     value = (uint64_t)ptrauth_auth_and_resign((void *)_registers.__pc,
                                               ptrauth_key_return_address,
                                               &_registers.__pc,
 @@ -1940,7 +1943,15 @@ private:
       _LIBUNWIND_ABORT("SME ZA disable failed");
   }
-#if defined(_LIBUNWIND_HAVE_GETAUXVAL)
+#if defined(__APPLE__)
+  static bool checkHasSME() {
+    int has_sme = 0;
+    size_t size = sizeof(has_sme);
+    if (sysctlbyname("hw.optional.arm.FEAT_SME", &has_sme, &size, NULL, 0))
+      return false;
+    return has_sme != 0;
+  }
+#elif defined(_LIBUNWIND_HAVE_GETAUXVAL)
   static bool checkHasSME() {
     constexpr int hwcap2_sme = (1 << 23);
     unsigned long hwcap2 = getauxval(AT_HWCAP2);
 @@ -3724,21 +3735,21 @@ inline void Registers_sparc::setRegister(int regNum, uint32_t value) {
 inline bool Registers_sparc::validFloatRegister(int) const { return false; }
 inline double Registers_sparc::getFloatRegister(int) const {
-  _LIBUNWIND_ABORT("no Sparc float registers");
+  _LIBUNWIND_ABORT("no sparc float registers");
 }
 inline void Registers_sparc::setFloatRegister(int, double) {
-  _LIBUNWIND_ABORT("no Sparc float registers");
+  _LIBUNWIND_ABORT("no sparc float registers");
 }
 inline bool Registers_sparc::validVectorRegister(int) const { return false; }
 inline v128 Registers_sparc::getVectorRegister(int) const {
-  _LIBUNWIND_ABORT("no Sparc vector registers");
+  _LIBUNWIND_ABORT("no sparc vector registers");
 }
 inline void Registers_sparc::setVectorRegister(int, v128) {
-  _LIBUNWIND_ABORT("no Sparc vector registers");
+  _LIBUNWIND_ABORT("no sparc vector registers");
 }
 inline const char *Registers_sparc::getRegisterName(int regNum) {

lib/libunwind/src/Unwind-wasm.c+20-3

 @@ -54,7 +54,7 @@ _Unwind_Reason_Code _Unwind_CallPersonality(void *exception_ptr) {
   __wasm_lpad_context.selector = 0;
   // Call personality function. Wasm does not have two-phase unwinding, so we
-  // only do the cleanup phase.
+  // only do the search phase.
   return __gxx_personality_wasm0(
       1, _UA_SEARCH_PHASE, exception_object->exception_class, exception_object,
       (struct _Unwind_Context *)&__wasm_lpad_context);
 @@ -69,6 +69,21 @@ _Unwind_RaiseException(_Unwind_Exception *exception_object) {
   __builtin_wasm_throw(0, exception_object);
 }
+// Define the `__cpp_exception` symbol which `__builtin_wasm_throw` above will
+// reference. This is defined here in `libunwind` as the single canonical
+// definition for this API and it's required for users to ensure that there's
+// only one copy of `libunwind` within a wasm module to ensure this is only
+// defined once and exactly once.
+__asm__(".globl __cpp_exception\n"
+#if defined(__wasm32__)
+        ".tagtype __cpp_exception i32\n"
+#elif defined(__wasm64__)
+        ".tagtype __cpp_exception i64\n"
+#else
+#error "Unsupported Wasm architecture"
+#endif
+        "__cpp_exception:\n");
 /// Called by __cxa_end_catch.
 _LIBUNWIND_EXPORT void
 _Unwind_DeleteException(_Unwind_Exception *exception_object) {
 @@ -102,7 +117,8 @@ _LIBUNWIND_EXPORT uintptr_t _Unwind_GetIP(struct _Unwind_Context *context) {
 }
 /// Not used in Wasm.
-_LIBUNWIND_EXPORT void _Unwind_SetIP(struct _Unwind_Context *, uintptr_t) {}
+_LIBUNWIND_EXPORT void _Unwind_SetIP(struct _Unwind_Context *context,
+                                     uintptr_t value) {}
 /// Called by personality handler to get LSDA for current frame.
 _LIBUNWIND_EXPORT uintptr_t
 @@ -114,7 +130,8 @@ _Unwind_GetLanguageSpecificData(struct _Unwind_Context *context) {
 }
 /// Not used in Wasm.
-_LIBUNWIND_EXPORT uintptr_t _Unwind_GetRegionStart(struct _Unwind_Context *) {
+_LIBUNWIND_EXPORT uintptr_t
+_Unwind_GetRegionStart(struct _Unwind_Context *context) {
   return 0;
 }

lib/libunwind/src/UnwindCursor.hpp+119-7

...	@@ -963,7 +963,7 @@ template <typename A, typename R> bool UnwindCursor<A, R>::isSignalFrame() {	...	@@ -963,7 +963,7 @@ template <typename A, typename R> bool UnwindCursor<A, R>::isSignalFrame() {
963	/// UnwindCursor contains all state (including all register values) during	963	/// UnwindCursor contains all state (including all register values) during
964	/// an unwind. This is normally stack allocated inside a unw_cursor_t.	964	/// an unwind. This is normally stack allocated inside a unw_cursor_t.
965	template <typename A, typename R>	965	template <typename A, typename R>
966	class UnwindCursor : public AbstractUnwindCursor{	966	class UnwindCursor : public AbstractUnwindCursor {
967	typedef typename A::pint_t pint_t;	967	typedef typename A::pint_t pint_t;
968	public:	968	public:
969	UnwindCursor(unw_context_t *context, A &as);	969	UnwindCursor(unw_context_t *context, A &as);
...	@@ -1363,6 +1363,10 @@ private:	...	@@ -1363,6 +1363,10 @@ private:
1363	reinterpret_cast<tbtable *>(_info.unwind_info),	1363	reinterpret_cast<tbtable *>(_info.unwind_info),
1364	_registers, _isSignalFrame);	1364	_registers, _isSignalFrame);
1365	}	1365	}
		1366	bool isKnownVapiNotActive() const { return _isKnownVapiNotActive; }
		1367	void setIsKnownVapiNotActive(bool val) { _isKnownVapiNotActive = val; }
		1368	static pint_t getVAPILR();
		1369
1366	#endif // defined(_LIBUNWIND_SUPPORT_TBTAB_UNWIND)	1370	#endif // defined(_LIBUNWIND_SUPPORT_TBTAB_UNWIND)
1367		1371
1368	A &_addressSpace;	1372	A &_addressSpace;
...	@@ -1377,13 +1381,23 @@ private:	...	@@ -1377,13 +1381,23 @@ private:
1377	#ifdef _LIBUNWIND_TRACE_RET_INJECT	1381	#ifdef _LIBUNWIND_TRACE_RET_INJECT
1378	uint32_t _walkedFrames;	1382	uint32_t _walkedFrames;
1379	#endif	1383	#endif
		1384	#if defined(_LIBUNWIND_SUPPORT_TBTAB_UNWIND)
		1385	// TODO: this will need to be recorded in the unw_context_t by unw_getcontext
		1386	// to support cases where the cursor is retrieved prior to invocation of the
		1387	// Virtual API.
		1388	bool _isKnownVapiNotActive;
		1389	#endif
1380	};	1390	};
1381		1391
1382
1383	template <typename A, typename R>	1392	template <typename A, typename R>
1384	UnwindCursor<A, R>::UnwindCursor(unw_context_t *context, A &as)	1393	UnwindCursor<A, R>::UnwindCursor(unw_context_t *context, A &as)
1385	: _addressSpace(as), _registers(context), _unwindInfoMissing(false),	1394	: _addressSpace(as), _registers(context), _unwindInfoMissing(false),
1386	_isSignalFrame(false) {	1395	_isSignalFrame(false)
		1396	#if defined(_LIBUNWIND_SUPPORT_TBTAB_UNWIND)
		1397	,
		1398	_isKnownVapiNotActive(false)
		1399	#endif
		1400	{
1387	static_assert((check_fit<UnwindCursor<A, R>, unw_cursor_t>::does_fit),	1401	static_assert((check_fit<UnwindCursor<A, R>, unw_cursor_t>::does_fit),
1388	"UnwindCursor<> does not fit in unw_cursor_t");	1402	"UnwindCursor<> does not fit in unw_cursor_t");
1389	static_assert((alignof(UnwindCursor<A, R>) <= alignof(unw_cursor_t)),	1403	static_assert((alignof(UnwindCursor<A, R>) <= alignof(unw_cursor_t)),
...	@@ -1393,13 +1407,17 @@ UnwindCursor<A, R>::UnwindCursor(unw_context_t *context, A &as)	...	@@ -1393,13 +1407,17 @@ UnwindCursor<A, R>::UnwindCursor(unw_context_t *context, A &as)
1393		1407
1394	template <typename A, typename R>	1408	template <typename A, typename R>
1395	UnwindCursor<A, R>::UnwindCursor(A &as, void *)	1409	UnwindCursor<A, R>::UnwindCursor(A &as, void *)
1396	: _addressSpace(as), _unwindInfoMissing(false), _isSignalFrame(false) {	1410	: _addressSpace(as), _unwindInfoMissing(false), _isSignalFrame(false)
		1411	#if defined(_LIBUNWIND_SUPPORT_TBTAB_UNWIND)
		1412	,
		1413	_isKnownVapiNotActive(false)
		1414	#endif
		1415	{
1397	memset(static_cast<void *>(&_info), 0, sizeof(_info));	1416	memset(static_cast<void *>(&_info), 0, sizeof(_info));
1398	// FIXME	1417	// FIXME
1399	// fill in _registers from thread arg	1418	// fill in _registers from thread arg
1400	}	1419	}
1401		1420
1402
1403	template <typename A, typename R>	1421	template <typename A, typename R>
1404	bool UnwindCursor<A, R>::validReg(int regNum) {	1422	bool UnwindCursor<A, R>::validReg(int regNum) {
1405	return _registers.validRegister(regNum);	1423	return _registers.validRegister(regNum);
...	@@ -1469,6 +1487,30 @@ template <typename A, typename R> void UnwindCursor<A, R>::jumpto() {	...	@@ -1469,6 +1487,30 @@ template <typename A, typename R> void UnwindCursor<A, R>::jumpto() {
1469	static constexpr size_t _EXTRA_LIBUNWIND_FRAMES_WALKED = 5 - 1;	1487	static constexpr size_t _EXTRA_LIBUNWIND_FRAMES_WALKED = 5 - 1;
1470	_registers.returnto(_walkedFrames + _EXTRA_LIBUNWIND_FRAMES_WALKED);	1488	_registers.returnto(_walkedFrames + _EXTRA_LIBUNWIND_FRAMES_WALKED);
1471	#else	1489	#else
		1490	#if defined(_LIBUNWIND_SUPPORT_TBTAB_UNWIND)
		1491	if (isKnownVapiNotActive()) {
		1492	// If the current frame is known VAPI not active, execute the VAPI return
		1493	// glue to clear the VAPI control block. The VAPI return glue is used by
		1494	// AIX longjmp based on the VAPI active status recorded by setjmp in the
		1495	// jmp_buf, which means that the VAPI return glue can be called solely on
		1496	// the basis of the VAPI active status of the target context.
		1497
		1498	// VAPI return glue address is the VAPI glue address - 4.
		1499	#ifdef __64BIT__
		1500	constexpr pint_t VAPIReturnGlue = 0x8e40 - 4;
		1501	#else
		1502	constexpr pint_t VAPIReturnGlue = 0x8c40 - 4;
		1503	#endif
		1504
		1505	_LIBUNWIND_TRACE_UNWINDING("VAPI: executing return glue %p\n",
		1506	reinterpret_cast<void *>(VAPIReturnGlue));
		1507	register auto *registers __asm__("r30") = &_registers;
		1508	__asm__ __volatile__("bla %[retglue]"
		1509	: "+r"(registers)
		1510	: [retglue] "i"(VAPIReturnGlue));
		1511	registers->jumpto();
		1512	}
		1513	#endif // defined(_LIBUNWIND_SUPPORT_TBTAB_UNWIND)
1472	_registers.jumpto();	1514	_registers.jumpto();
1473	#endif	1515	#endif
1474	}	1516	}
...	@@ -2037,7 +2079,7 @@ bool UnwindCursor<A, R>::getInfoFromCompactEncodingSection(	...	@@ -2037,7 +2079,7 @@ bool UnwindCursor<A, R>::getInfoFromCompactEncodingSection(
2037	if (personalityIndex != 0) {	2079	if (personalityIndex != 0) {
2038	--personalityIndex; // change 1-based to zero-based index	2080	--personalityIndex; // change 1-based to zero-based index
2039	if (personalityIndex >= sectionHeader.personalityArrayCount()) {	2081	if (personalityIndex >= sectionHeader.personalityArrayCount()) {
2040	_LIBUNWIND_DEBUG_LOG("found encoding 0x%08X with personality index %d, "	2082	_LIBUNWIND_DEBUG_LOG("found encoding 0x%08X with personality index %d, "
2041	"but personality table has only %d entries",	2083	"but personality table has only %d entries",
2042	encoding, personalityIndex,	2084	encoding, personalityIndex,
2043	sectionHeader.personalityArrayCount());	2085	sectionHeader.personalityArrayCount());
...	@@ -2459,6 +2501,45 @@ bool UnwindCursor<A, R>::getInfoFromTBTable(pint_t pc, R &registers) {	...	@@ -2459,6 +2501,45 @@ bool UnwindCursor<A, R>::getInfoFromTBTable(pint_t pc, R &registers) {
2459	return true;	2501	return true;
2460	}	2502	}
2461		2503
		2504	// VAPI glue addresses
		2505	constexpr uintptr_t vapi_glue_addr_ext_32 = 0x8b80;
		2506	constexpr uintptr_t vapi_addr_64 = 0x8e00;
		2507	constexpr size_t vapi_size_64 = 0x0200;
		2508	constexpr uintptr_t vapi_glue_addr_begin =
		2509	vapi_glue_addr_ext_32; // Start address in 32-bit
		2510	constexpr uintptr_t vapi_glue_addr_end =
		2511	vapi_addr_64 + vapi_size_64; // End address in 64-bit
		2512
		2513	#ifdef __64BIT__
		2514	constexpr size_t VAPI_CB_SIZE = 256;
		2515	constexpr ptrdiff_t TLS_POINTER_OFFSET = 30 * 1024;
		2516	constexpr size_t TLSCB_BASE_SIZE = 256;
		2517
		2518	static __inline__ __attribute__((__always_inline__)) char *tptr(void) {
		2519	char *result;
		2520	__asm__("mr %0, 13" : "=r"(result));
		2521	return result;
		2522	}
		2523	#else // 32-bit
		2524	constexpr size_t VAPI_CB_SIZE = 128;
		2525	constexpr ptrdiff_t TLS_POINTER_OFFSET = 31 * 1024;
		2526	constexpr size_t TLSCB_BASE_SIZE = 128;
		2527
		2528	static __inline__ __attribute__((__always_inline__)) char *tptr(void) {
		2529	char *result;
		2530	__asm__("mfspr %0, 259" : "=r"(result));
		2531	return result;
		2532	}
		2533	#endif
		2534
		2535	constexpr ptrdiff_t VAPI_CB_OFFSET =
		2536	TLS_POINTER_OFFSET + VAPI_CB_SIZE + TLSCB_BASE_SIZE;
		2537
		2538	template <typename A, typename R>
		2539	typename UnwindCursor<A, R>::pint_t UnwindCursor<A, R>::getVAPILR() {
		2540	return reinterpret_cast<pint_t >(tptr() - VAPI_CB_OFFSET + 8);
		2541	}
		2542
2462	// Step back up the stack following the frame back link.	2543	// Step back up the stack following the frame back link.
2463	template <typename A, typename R>	2544	template <typename A, typename R>
2464	int UnwindCursor<A, R>::stepWithTBTable(pint_t pc, tbtable *TBTable,	2545	int UnwindCursor<A, R>::stepWithTBTable(pint_t pc, tbtable *TBTable,
...	@@ -2511,6 +2592,16 @@ int UnwindCursor<A, R>::stepWithTBTable(pint_t pc, tbtable *TBTable,	...	@@ -2511,6 +2592,16 @@ int UnwindCursor<A, R>::stepWithTBTable(pint_t pc, tbtable *TBTable,
2511	_LIBUNWIND_TRACE_UNWINDING("Possible signal handler frame: lastStack=%p",	2592	_LIBUNWIND_TRACE_UNWINDING("Possible signal handler frame: lastStack=%p",
2512	reinterpret_cast<void *>(lastStack));	2593	reinterpret_cast<void *>(lastStack));
2513		2594
		2595	pint_t returnAddressInStack = reinterpret_cast<pint_t *>(lastStack)[2];
		2596	if (vapi_glue_addr_begin <= returnAddressInStack &&
		2597	returnAddressInStack < vapi_glue_addr_end) {
		2598	_LIBUNWIND_TRACE_UNWINDING(
		2599	"The return address in stack %p is within the range of VAPI address;"
		2600	" set isKnownVapiNotActive to true\n",
		2601	reinterpret_cast<void *>(returnAddressInStack));
		2602	setIsKnownVapiNotActive(true);
		2603	}
		2604
2514	sigcontext sigContext = reinterpret_cast<sigcontext >(	2605	sigcontext sigContext = reinterpret_cast<sigcontext >(
2515	reinterpret_cast<char *>(lastStack) + STKMINALIGN);	2606	reinterpret_cast<char *>(lastStack) + STKMINALIGN);
2516	returnAddress = sigContext->sc_jmpbuf.jmp_context.iar;	2607	returnAddress = sigContext->sc_jmpbuf.jmp_context.iar;
...	@@ -2579,6 +2670,17 @@ int UnwindCursor<A, R>::stepWithTBTable(pint_t pc, tbtable *TBTable,	...	@@ -2579,6 +2670,17 @@ int UnwindCursor<A, R>::stepWithTBTable(pint_t pc, tbtable *TBTable,
2579	} else {	2670	} else {
2580	// Otherwise, use the LR value in the stack link area.	2671	// Otherwise, use the LR value in the stack link area.
2581	returnAddress = reinterpret_cast<pint_t *>(lastStack)[2];	2672	returnAddress = reinterpret_cast<pint_t *>(lastStack)[2];
		2673
		2674	if (vapi_glue_addr_begin <= returnAddress &&
		2675	returnAddress < vapi_glue_addr_end) {
		2676	_LIBUNWIND_TRACE_UNWINDING(
		2677	"The return address=%p is within the range of VAPI address;",
		2678	reinterpret_cast<void *>(returnAddress));
		2679	setIsKnownVapiNotActive(true);
		2680	returnAddress = getVAPILR();
		2681	_LIBUNWIND_TRACE_UNWINDING("return address=%p from VAPI\n",
		2682	reinterpret_cast<void *>(returnAddress));
		2683	}
2582	}	2684	}
2583		2685
2584	// Reset LR in the current context.	2686	// Reset LR in the current context.
...	@@ -2709,6 +2811,16 @@ int UnwindCursor<A, R>::stepWithTBTable(pint_t pc, tbtable *TBTable,	...	@@ -2709,6 +2811,16 @@ int UnwindCursor<A, R>::stepWithTBTable(pint_t pc, tbtable *TBTable,
2709	// Return address is the address after call site instruction.	2811	// Return address is the address after call site instruction.
2710	pint_t nextReturnAddress = reinterpret_cast<pint_t *>(nextStack)[2];	2812	pint_t nextReturnAddress = reinterpret_cast<pint_t *>(nextStack)[2];
2711		2813
		2814	if (vapi_glue_addr_begin <= nextReturnAddress &&
		2815	nextReturnAddress < vapi_glue_addr_end) {
		2816	_LIBUNWIND_TRACE_UNWINDING(
		2817	"The next return address=%p is within the range of VAPI address;",
		2818	reinterpret_cast<void *>(nextReturnAddress));
		2819	nextReturnAddress = getVAPILR();
		2820	_LIBUNWIND_TRACE_UNWINDING("the next return address=%p from VAPI\n",
		2821	reinterpret_cast<void *>(nextReturnAddress));
		2822	}
		2823
2712	if (nextReturnAddress > 0x01 && nextReturnAddress < 0x10000) {	2824	if (nextReturnAddress > 0x01 && nextReturnAddress < 0x10000) {
2713	_LIBUNWIND_TRACE_UNWINDING("The next is a signal handler frame: "	2825	_LIBUNWIND_TRACE_UNWINDING("The next is a signal handler frame: "
2714	"nextStack=%p, next return address=%p\n",	2826	"nextStack=%p, next return address=%p\n",
...	@@ -3256,7 +3368,7 @@ int UnwindCursor<A, R>::stepThroughSigReturn() {	...	@@ -3256,7 +3368,7 @@ int UnwindCursor<A, R>::stepThroughSigReturn() {
3256		3368
3257	template <typename A, typename R> int UnwindCursor<A, R>::step(bool stage2) {	3369	template <typename A, typename R> int UnwindCursor<A, R>::step(bool stage2) {
3258	(void)stage2;	3370	(void)stage2;
3259	// Bottom of stack is defined is when unwind info cannot be found.	3371	// Bottom of stack is defined when unwind info cannot be found.
3260	if (_unwindInfoMissing)	3372	if (_unwindInfoMissing)
3261	return UNW_STEP_END;	3373	return UNW_STEP_END;
3262		3374

lib/libunwind/src/UnwindLevel1-gcc-ext.c+1-1

...	@@ -284,7 +284,7 @@ _LIBUNWIND_EXPORT void __deregister_frame(const void *fde) {	...	@@ -284,7 +284,7 @@ _LIBUNWIND_EXPORT void __deregister_frame(const void *fde) {
284	// before 10.6 used keymgr to track known FDEs, but these functions	284	// before 10.6 used keymgr to track known FDEs, but these functions
285	// never got updated to use keymgr.	285	// never got updated to use keymgr.
286	// For now, we implement these as do-nothing functions to keep any existing	286	// For now, we implement these as do-nothing functions to keep any existing
287	// applications working. We also add the not in 10.6 symbol so that nwe	287	// applications working. We also add the not in 10.6 symbol so that new
288	// application won't be able to use them.	288	// application won't be able to use them.
289		289
290	#if defined(_LIBUNWIND_SUPPORT_FRAME_APIS)	290	#if defined(_LIBUNWIND_SUPPORT_FRAME_APIS)

lib/libunwind/src/UnwindLevel1.c+1-1

...	@@ -14,7 +14,7 @@	...	@@ -14,7 +14,7 @@
14	// ARM EHABI does not specify _Unwind_{Get,Set}{GR,IP}(). Thus, we are	14	// ARM EHABI does not specify _Unwind_{Get,Set}{GR,IP}(). Thus, we are
15	// defining inline functions to delegate the function calls to	15	// defining inline functions to delegate the function calls to
16	// _Unwind_VRS_{Get,Set}(). However, some applications might declare the	16	// _Unwind_VRS_{Get,Set}(). However, some applications might declare the
17	// function protetype directly (instead of including <unwind.h>), thus we need	17	// function prototype directly (instead of including <unwind.h>), thus we need
18	// to export these functions from libunwind.so as well.	18	// to export these functions from libunwind.so as well.
19	#define _LIBUNWIND_UNWIND_LEVEL1_EXTERNAL_LINKAGE 1	19	#define _LIBUNWIND_UNWIND_LEVEL1_EXTERNAL_LINKAGE 1
20		20

lib/libunwind/src/UnwindRegistersRestore.S+18-1

 @@ -678,9 +678,15 @@ DEFINE_LIBUNWIND_FUNCTION(__libunwind_Registers_arm64_jumpto)
   ldp    x18,x19, [x0, #0x090]
   ldp    x20,x21, [x0, #0x0A0]
   ldp    x22,x23, [x0, #0x0B0]
+#if defined(__LFI__)
+  ldr    x24,     [x0, #0x0C0]
+  // Skip reloading x25-x28; reserved by LFI ABI.
+  ldr    x29,     [x0, #0x0E8]
+#else
   ldp    x24,x25, [x0, #0x0C0]
   ldp    x26,x27, [x0, #0x0D0]
   ldp    x28,x29, [x0, #0x0E0]
+#endif
 #if defined(__ARM_FP) && __ARM_FP != 0
   ldp    d0, d1,  [x0, #0x110]
 @@ -941,11 +947,22 @@ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind14Registers_or1k6jumptoEv)
 #elif defined(__hexagon__)
 # On entry:
-#  thread_state pointer is in r2
+#  thread_state pointer is in r0
 DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind17Registers_hexagon6jumptoEv)
 #
 # void libunwind::Registers_hexagon::jumpto()
 #
+# The context layout is hexagon_thread_state_t: unsigned int __r[35]
+# __r[0..31] = r0..r31, __r[32] = predicates, __r[33] = PC.
+# Offsets: __r[n] is at byte offset n*4.  r0 is the context pointer, so
+# it is restored last; r31 is loaded with the saved PC as the jumpr target.
+  r2 = memw(r0+#8)
+  r3 = memw(r0+#12)
+  r4 = memw(r0+#16)
+  r5 = memw(r0+#20)
+  r6 = memw(r0+#24)
+  r7 = memw(r0+#28)
   r8 = memw(r0+#32)
   r9 = memw(r0+#36)
   r10 = memw(r0+#40)

lib/libunwind/src/UnwindRegistersSave.S+28-3

...	@@ -794,13 +794,20 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)	...	@@ -794,13 +794,20 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
794	stp x18,x19, [x0, #0x090]	794	stp x18,x19, [x0, #0x090]
795	stp x20,x21, [x0, #0x0A0]	795	stp x20,x21, [x0, #0x0A0]
796	stp x22,x23, [x0, #0x0B0]	796	stp x22,x23, [x0, #0x0B0]
		797	#if defined(__LFI__)
		798	str x24, [x0, #0x0C0]
		799	// Skip spilling x25-x28; reserved by LFI ABI.
		800	str x29, [x0, #0x0E8]
		801	#else
797	stp x24,x25, [x0, #0x0C0]	802	stp x24,x25, [x0, #0x0C0]
798	stp x26,x27, [x0, #0x0D0]	803	stp x26,x27, [x0, #0x0D0]
799	stp x28,x29, [x0, #0x0E0]	804	stp x28,x29, [x0, #0x0E0]
		805	#endif
800	str x30, [x0, #0x0F0]	806	str x30, [x0, #0x0F0]
801	mov x1,sp	807	mov x1,sp
802	str x1, [x0, #0x0F8]	808	str x1, [x0, #0x0F8]
803	str x30, [x0, #0x100] // store return address as pc	809	str x30, [x0, #0x100] // store return address as pc
		810	str xzr, [x0, #0x108] // zero __ra_sign_state
804	// skip cpsr	811	// skip cpsr
805	#if defined(__ARM_FP) && __ARM_FP != 0	812	#if defined(__ARM_FP) && __ARM_FP != 0
806	stp d0, d1, [x0, #0x110]	813	stp d0, d1, [x0, #0x110]
...	@@ -1096,8 +1103,21 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)	...	@@ -1096,8 +1103,21 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
1096	# On entry:	1103	# On entry:
1097	# thread_state pointer is in r0	1104	# thread_state pointer is in r0
1098	#	1105	#
		1106	# The context layout is hexagon_thread_state_t: unsigned int __r[35]
		1107	# __r[0..31] = r0..r31, __r[32] = predicates, __r[33] = PC, __r[34] = unused
		1108	# Offsets: __r[n] is at byte offset n*4.
		1109	#
1099	#define OFFSET(offset) (offset/4)	1110	#define OFFSET(offset) (offset/4)
1100	DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)	1111	DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
		1112	// Save r1-r7 first (r0 is the context pointer, saved last)
		1113	memw(r0+#4) = r1
		1114	memw(r0+#8) = r2
		1115	memw(r0+#12) = r3
		1116	memw(r0+#16) = r4
		1117	memw(r0+#20) = r5
		1118	memw(r0+#24) = r6
		1119	memw(r0+#28) = r7
		1120
1101	memw(r0+#32) = r8	1121	memw(r0+#32) = r8
1102	memw(r0+#36) = r9	1122	memw(r0+#36) = r9
1103	memw(r0+#40) = r10	1123	memw(r0+#40) = r10
...	@@ -1127,12 +1147,17 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)	...	@@ -1127,12 +1147,17 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
1127	memw(r0+#116) = r29	1147	memw(r0+#116) = r29
1128	memw(r0+#120) = r30	1148	memw(r0+#120) = r30
1129	memw(r0+#124) = r31	1149	memw(r0+#124) = r31
1130	r1 = c4 // Predicate register	1150
		1151	r1 = c4 // Predicate register
1131	memw(r0+#128) = r1	1152	memw(r0+#128) = r1
1132	r1 = memw(r30) // *FP == Saved FP	1153
1133	r1 = r31	1154	r1 = r31 // Store return address as PC
1134	memw(r0+#132) = r1	1155	memw(r0+#132) = r1
1135		1156
		1157	// Save r0 (the context pointer itself) last
		1158	memw(r0+#0) = r0
		1159
		1160	r0 = #0 // return UNW_ESUCCESS
1136	jumpr r31	1161	jumpr r31
1137		1162
1138	#elif defined(__sparc__) && defined(__arch64__)	1163	#elif defined(__sparc__) && defined(__arch64__)

lib/libunwind/src/libunwind.cpp+15-19

...	@@ -32,7 +32,7 @@	...	@@ -32,7 +32,7 @@
32		32
33	using namespace libunwind;	33	using namespace libunwind;
34		34
35	/// internal object to represent this processes address space	35	/// internal object to represent this process's address space
36	LocalAddressSpace LocalAddressSpace::sThisAddressSpace;	36	LocalAddressSpace LocalAddressSpace::sThisAddressSpace;
37		37
38	_LIBUNWIND_EXPORT unw_addr_space_t unw_local_addr_space =	38	_LIBUNWIND_EXPORT unw_addr_space_t unw_local_addr_space =
...	@@ -131,23 +131,19 @@ _LIBUNWIND_HIDDEN int __unw_set_reg(unw_cursor_t *cursor, unw_regnum_t regNum,	...	@@ -131,23 +131,19 @@ _LIBUNWIND_HIDDEN int __unw_set_reg(unw_cursor_t *cursor, unw_regnum_t regNum,
131	{	131	{
132	// It is only valid to set the IP within the current function. This is	132	// It is only valid to set the IP within the current function. This is
133	// important for ptrauth, otherwise the IP cannot be correctly signed.	133	// important for ptrauth, otherwise the IP cannot be correctly signed.
134	// The current signature of `value` is via the schema:	134	//
135	// __ptrauth(ptrauth_key_return_address, <<sp>>, 0)	135	// However many JITs do not configure CFI frames, so we cannot actually
136	// For this to be generally usable we manually re-sign it to the	136	// enforce this - at least not without an extremely expensive syscall.
137	// directly supported schema:	137	//
138	// __ptrauth(ptrauth_key_return_address, 1, 0)	138	// For the forseeable future this will need to be a debug only assertion
139	unw_word_t	139	// so we just strip and assert to avoid the unnecessary auths in release
140	__unwind_ptrauth_restricted_intptr(ptrauth_key_return_address, 1,	140	// builds.
141	0) authenticated_value;	141	unw_word_t stripped_value = (unw_word_t)ptrauth_strip(
142	unw_word_t opaque_value = (uint64_t)ptrauth_auth_and_resign(	142	(void *)value, ptrauth_key_return_address);
143	(void *)value, ptrauth_key_return_address, sp,	143	if (stripped_value < info.start_ip && stripped_value > info.end_ip)
144	ptrauth_key_return_address, &authenticated_value);	144	_LIBUNWIND_LOG("Badly behaved use of unw_set_reg: moving IP(0x%zX) "
145	memmove(reinterpret_cast<void *>(&authenticated_value),	145	"outside of CFI bounds function (0x%zX, 0x%zX)",
146	reinterpret_cast<void *>(&opaque_value),	146	stripped_value, info.start_ip, info.end_ip);
147	sizeof(authenticated_value));
148	if (authenticated_value < info.start_ip \|\|
149	authenticated_value > info.end_ip)
150	_LIBUNWIND_ABORT("PC vs frame info mismatch");
151		147
152	// PC should have been signed with the sp, so we verify that	148	// PC should have been signed with the sp, so we verify that
153	// roundtripping does not fail. The `ptrauth_auth_and_resign` is	149	// roundtripping does not fail. The `ptrauth_auth_and_resign` is
...	@@ -306,7 +302,7 @@ _LIBUNWIND_HIDDEN int __unw_is_fpreg(unw_cursor_t *cursor,	...	@@ -306,7 +302,7 @@ _LIBUNWIND_HIDDEN int __unw_is_fpreg(unw_cursor_t *cursor,
306	}	302	}
307	_LIBUNWIND_WEAK_ALIAS(__unw_is_fpreg, unw_is_fpreg)	303	_LIBUNWIND_WEAK_ALIAS(__unw_is_fpreg, unw_is_fpreg)
308		304
309	/// Checks if a register is a floating-point register.	305	/// Get name of specified register at cursor position in stack frame.
310	_LIBUNWIND_HIDDEN const char __unw_regname(unw_cursor_t cursor,	306	_LIBUNWIND_HIDDEN const char __unw_regname(unw_cursor_t cursor,
311	unw_regnum_t regNum) {	307	unw_regnum_t regNum) {
312	_LIBUNWIND_TRACE_API("__unw_regname(cursor=%p, regNum=%d)",	308	_LIBUNWIND_TRACE_API("__unw_regname(cursor=%p, regNum=%d)",

lib/libunwind/src/libunwind_ext.h+2-2

...	@@ -120,10 +120,10 @@ typedef int (*unw_find_dynamic_unwind_sections)(	...	@@ -120,10 +120,10 @@ typedef int (*unw_find_dynamic_unwind_sections)(
120	extern int __unw_add_find_dynamic_unwind_sections(	120	extern int __unw_add_find_dynamic_unwind_sections(
121	unw_find_dynamic_unwind_sections find_dynamic_unwind_sections);	121	unw_find_dynamic_unwind_sections find_dynamic_unwind_sections);
122		122
123	// Deregister a dynacim unwind-info lookup callback.	123	// Deregister a dynamic unwind-info lookup callback.
124	//	124	//
125	// Returns UNW_ESUCCESS for successful deregistrations. If the given callback	125	// Returns UNW_ESUCCESS for successful deregistrations. If the given callback
126	// has already been registered then UNW_EINVAL will be returned.	126	// is not present then UNW_EINVAL will be returned.
127	extern int __unw_remove_find_dynamic_unwind_sections(	127	extern int __unw_remove_find_dynamic_unwind_sections(
128	unw_find_dynamic_unwind_sections find_dynamic_unwind_sections);	128	unw_find_dynamic_unwind_sections find_dynamic_unwind_sections);
129		129

lib/std/Target.zig+6-2

...	@@ -1247,7 +1247,7 @@ pub const Cpu = struct {	...	@@ -1247,7 +1247,7 @@ pub const Cpu = struct {
1247	pub const Set = struct {	1247	pub const Set = struct {
1248	ints: [usize_count]usize,	1248	ints: [usize_count]usize,
1249		1249
1250	pub const needed_bit_count = 347;	1250	pub const needed_bit_count = 378;
1251	pub const byte_count = @divCeil(needed_bit_count, 8);	1251	pub const byte_count = @divCeil(needed_bit_count, 8);
1252	pub const usize_count = (byte_count + (@sizeOf(usize) - 1)) / @sizeOf(usize);	1252	pub const usize_count = (byte_count + (@sizeOf(usize) - 1)) / @sizeOf(usize);
1253	pub const Index = std.math.Log2Int(@Int(.unsigned, usize_count * @bitSizeOf(usize)));	1253	pub const Index = std.math.Log2Int(@Int(.unsigned, usize_count * @bitSizeOf(usize)));
...	@@ -1961,9 +1961,11 @@ pub const Cpu = struct {	...	@@ -1961,9 +1961,11 @@ pub const Cpu = struct {
1961	=> &.{.lanai},	1961	=> &.{.lanai},
1962		1962
1963	.loongarch64_lp64,	1963	.loongarch64_lp64,
		1964	.loongarch64_preserve_none,
1964	=> &.{.loongarch64},	1965	=> &.{.loongarch64},
1965		1966
1966	.loongarch32_ilp32,	1967	.loongarch32_ilp32,
		1968	.loongarch32_preserve_none,
1967	=> &.{.loongarch32},	1969	=> &.{.loongarch32},
1968		1970
1969	.m68k_sysv,	1971	.m68k_sysv,
...	@@ -2401,7 +2403,6 @@ pub fn supportsAddressSpace(	...	@@ -2401,7 +2403,6 @@ pub fn supportsAddressSpace(
2401	.param => is_nvptx,	2403	.param => is_nvptx,
2402	.input, .output, .uniform, .push_constant, .storage_buffer => is_spirv,	2404	.input, .output, .uniform, .push_constant, .storage_buffer => is_spirv,
2403	.physical_storage_buffer => arch == .spirv64,	2405	.physical_storage_buffer => arch == .spirv64,
2404	.externref, .funcref => target.cpu.has(.wasm, .reference_types),
2405	};	2406	};
2406	}	2407	}
2407		2408
...	@@ -2566,6 +2567,9 @@ pub const DynamicLinker = struct {	...	@@ -2566,6 +2567,9 @@ pub const DynamicLinker = struct {
2566	.aarch64_be,	2567	.aarch64_be,
2567	=> \|arch\| if (abi == .gnu) initFmt("/lib/ld-{s}.so.1", .{@tagName(arch)}) else none,	2568	=> \|arch\| if (abi == .gnu) initFmt("/lib/ld-{s}.so.1", .{@tagName(arch)}) else none,
2568		2569
		2570	.riscv64,
		2571	=> if (abi == .gnu) init("/lib/ld-riscv64-lp64.so.1") else none,
		2572
2569	.x86 => if (abi == .gnu) init("/lib/ld.so.1") else none,	2573	.x86 => if (abi == .gnu) init("/lib/ld.so.1") else none,
2570	.x86_64 => initFmt("/lib/ld-{s}.so.1", .{switch (abi) {	2574	.x86_64 => initFmt("/lib/ld-{s}.so.1", .{switch (abi) {
2571	.gnu => "x86-64",	2575	.gnu => "x86-64",

lib/std/Target/aarch64.zig+191-33

 @@ -10,6 +10,7 @@ pub const Feature = enum {
     aes,
     aggressive_fma,
     aggressive_interleaving,
+    align_cmp_csel_pairs,
     alternate_sextload_cvt_f32_pattern,
     altnzcv,
     alu_lsl_fast,
 @@ -38,7 +39,6 @@ pub const Feature = enum {
     ccpp,
     chk,
     clrbhb,
-    cmh,
     cmp_bcc_fusion,
     cmpbr,
     complxnum,
 @@ -48,6 +48,7 @@ pub const Feature = enum {
     crypto,
     cssc,
     d128,
+    disable_distinct_predicate_dst_reg,
     disable_fast_inc_vl,
     disable_latency_sched_heuristic,
     disable_ldp,
 @@ -71,8 +72,10 @@ pub const Feature = enum {
     f8f16mm,
     f8f32mm,
     faminmax,
+    fast_ld1_single,
     fgt,
     fix_cortex_a53_835769,
+    fixed_load_latency_4,
     flagm,
     fmv,
     force_32bit_jump_tables,
 @@ -95,14 +98,16 @@ pub const Feature = enum {
     fuse_crypto_eor,
     fuse_csel,
     fuse_cset,
+    fuse_fcsel,
     fuse_literals,
     gcie,
     gcs,
     harden_sls_blr,
     harden_sls_nocomdat,
     harden_sls_retbr,
+    has_limited_64bit_vector_mul_bandwidth,
     hbc,
-    hcx,
+    hinte,
     i8mm,
     ite,
     jsconv,
 @@ -121,12 +126,13 @@ pub const Feature = enum {
     mops,
     mops_go,
     mpam,
-    mpamv2,
     mte,
     mtetc,
     neon,
     nmi,
     no_bti_at_return_twice,
+    no_lfi_loads,
+    no_lfi_stores,
     no_neg_immediates,
     no_sve_fp_ld1r,
     no_zcz_fpr64,
 @@ -138,7 +144,6 @@ pub const Feature = enum {
     pan_rwv,
     pauth,
     pauth_lr,
-    pcdphint,
     perfmon,
     poe2,
     pops,
 @@ -328,6 +333,11 @@ pub const all_features = blk: {
         .description = "Make use of aggressive interleaving during vectorization",
         .dependencies = featureSet(&[_]Feature{}),
     };
+    result[@backingInt(Feature.align_cmp_csel_pairs)] = .{
+        .llvm_name = "align-cmp-csel-pairs",
+        .description = "Align certain CMP/FCMP and CSEL/FCSEL instruction pairs",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.alternate_sextload_cvt_f32_pattern)] = .{
         .llvm_name = "alternate-sextload-cvt-f32-pattern",
         .description = "Use alternative pattern for sextload convert to f32",
 @@ -476,11 +486,6 @@ pub const all_features = blk: {
         .description = "Enable Clear BHB instruction",
         .dependencies = featureSet(&[_]Feature{}),
     };
-    result[@backingInt(Feature.cmh)] = .{
-        .llvm_name = "cmh",
-        .description = "Enable Armv9.7-A Contention Management Hints",
-        .dependencies = featureSet(&[_]Feature{}),
-    };
     result[@backingInt(Feature.cmp_bcc_fusion)] = .{
         .llvm_name = "cmp-bcc-fusion",
         .description = "CPU fuses cmp+bcc operations",
 @@ -533,6 +538,11 @@ pub const all_features = blk: {
             .lse128,
         }),
     };
+    result[@backingInt(Feature.disable_distinct_predicate_dst_reg)] = .{
+        .llvm_name = "disable-distinct-predicate-dst-reg",
+        .description = "Disabling selecting a distinct predicate register for the destination operand of instructions that take a governing predicate",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.disable_fast_inc_vl)] = .{
         .llvm_name = "disable-fast-inc-vl",
         .description = "Do not prefer INC/DEC, ALL, { 1, 2, 4 } over ADDVL",
 @@ -545,7 +555,7 @@ pub const all_features = blk: {
     };
     result[@backingInt(Feature.disable_ldp)] = .{
         .llvm_name = "disable-ldp",
-        .description = "Do not emit ldp",
+        .description = "Prefer not to emit ldp",
         .dependencies = featureSet(&[_]Feature{}),
     };
     result[@backingInt(Feature.disable_maximize_scalable_bandwidth)] = .{
 @@ -555,7 +565,7 @@ pub const all_features = blk: {
     };
     result[@backingInt(Feature.disable_stp)] = .{
         .llvm_name = "disable-stp",
-        .description = "Do not emit stp",
+        .description = "Prefer not to emit stp",
         .dependencies = featureSet(&[_]Feature{}),
     };
     result[@backingInt(Feature.disable_unpredicated_ld_st_lower)] = .{
 @@ -671,6 +681,11 @@ pub const all_features = blk: {
             .neon,
         }),
     };
+    result[@backingInt(Feature.fast_ld1_single)] = .{
+        .llvm_name = "fast-ld1-single",
+        .description = "Single-element LD1 to vector lane has same performance as regular load",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.fgt)] = .{
         .llvm_name = "fgt",
         .description = "Enable fine grained virtualization traps extension",
 @@ -681,6 +696,11 @@ pub const all_features = blk: {
         .description = "Mitigate Cortex-A53 Erratum 835769",
         .dependencies = featureSet(&[_]Feature{}),
     };
+    result[@backingInt(Feature.fixed_load_latency_4)] = .{
+        .llvm_name = "fixed-load-latency-4",
+        .description = "Use a fixed latency of 4 for loads instead of querying the scheduling model",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.flagm)] = .{
         .llvm_name = "flagm",
         .description = "Enable Armv8.4-A Flag Manipulation instructions",
 @@ -813,6 +833,11 @@ pub const all_features = blk: {
         .description = "CPU can fuse CMP and CSET operations",
         .dependencies = featureSet(&[_]Feature{}),
     };
+    result[@backingInt(Feature.fuse_fcsel)] = .{
+        .llvm_name = "fuse-fcsel",
+        .description = "CPU can fuse FCMP and FCSEL operations",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.fuse_literals)] = .{
         .llvm_name = "fuse-literals",
         .description = "CPU fuses literal generation operations",
 @@ -845,14 +870,19 @@ pub const all_features = blk: {
         .description = "Harden against straight line speculation across RET and BR instructions",
         .dependencies = featureSet(&[_]Feature{}),
     };
+    result[@backingInt(Feature.has_limited_64bit_vector_mul_bandwidth)] = .{
+        .llvm_name = "has-limited-64bit-vector-mul-bandwidth",
+        .description = "Has limited 64bit vector multiply bandwidth compared to scalar multiply",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.hbc)] = .{
         .llvm_name = "hbc",
         .description = "Enable Armv8.8-A Hinted Conditional Branches Extension",
         .dependencies = featureSet(&[_]Feature{}),
     };
-    result[@backingInt(Feature.hcx)] = .{
+    result[@backingInt(Feature.hinte)] = .{
-        .llvm_name = "hcx",
+        .llvm_name = "hinte",
-        .description = "Enable Armv8.7-A HCRX_EL2 system register",
+        .description = "Enable extended A64 hint instruction space",
         .dependencies = featureSet(&[_]Feature{}),
     };
     result[@backingInt(Feature.i8mm)] = .{
 @@ -962,11 +992,6 @@ pub const all_features = blk: {
         .description = "Enable Armv8.4-A Memory system Partitioning and Monitoring extension",
         .dependencies = featureSet(&[_]Feature{}),
     };
-    result[@backingInt(Feature.mpamv2)] = .{
-        .llvm_name = "mpamv2",
-        .description = "Enable Armv9.7-A MPAMv2 Lookaside Buffer Invalidate instructions",
-        .dependencies = featureSet(&[_]Feature{}),
-    };
     result[@backingInt(Feature.mte)] = .{
         .llvm_name = "mte",
         .description = "Enable Memory Tagging Extension",
 @@ -996,6 +1021,16 @@ pub const all_features = blk: {
         .description = "Don't place a BTI instruction after a return-twice",
         .dependencies = featureSet(&[_]Feature{}),
     };
+    result[@backingInt(Feature.no_lfi_loads)] = .{
+        .llvm_name = "no-lfi-loads",
+        .description = "Disable LFI sandboxing for load instructions",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
+    result[@backingInt(Feature.no_lfi_stores)] = .{
+        .llvm_name = "no-lfi-stores",
+        .description = "Disable LFI sandboxing for store instructions",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.no_neg_immediates)] = .{
         .llvm_name = "no-neg-immediates",
         .description = "Convert immediates and instructions to their negated or complemented equivalent when the immediate does not fit in the encoding.",
 @@ -1063,11 +1098,6 @@ pub const all_features = blk: {
         .description = "Enable Armv9.5-A PAC enhancements",
         .dependencies = featureSet(&[_]Feature{}),
     };
-    result[@backingInt(Feature.pcdphint)] = .{
-        .llvm_name = "pcdphint",
-        .description = "Enable Armv9.6-A Producer Consumer Data Placement hints",
-        .dependencies = featureSet(&[_]Feature{}),
-    };
     result[@backingInt(Feature.perfmon)] = .{
         .llvm_name = "perfmon",
         .description = "Enable Armv8.0-A PMUv3 Performance Monitors extension",
 @@ -1813,7 +1843,6 @@ pub const all_features = blk: {
         .llvm_name = "v8.7a",
         .description = "Support ARM v8.7a architecture",
         .dependencies = featureSet(&[_]Feature{
-            .hcx,
             .spe_eef,
             .v8_6a,
             .wfxt,
 @@ -1931,6 +1960,7 @@ pub const all_features = blk: {
         .description = "Support ARM v9.6a architecture",
         .dependencies = featureSet(&[_]Feature{
             .cmpbr,
+            .hinte,
             .lsui,
             .occmo,
             .v9_5a,
 @@ -2265,12 +2295,14 @@ pub const cpu = struct {
         .features = featureSet(&[_]Feature{
             .aes,
             .aggressive_fma,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .altnzcv,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .ccdp,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fptoint,
             .fuse_address,
 @@ -2301,10 +2333,12 @@ pub const cpu = struct {
         .llvm_name = "apple-a15",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2332,10 +2366,12 @@ pub const cpu = struct {
         .llvm_name = "apple-a16",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2344,8 +2380,8 @@ pub const cpu = struct {
             .fuse_arith_logic,
             .fuse_crypto_eor,
             .fuse_csel,
+            .fuse_fcsel,
             .fuse_literals,
-            .hcx,
             .max_interleave_factor_4,
             .no_zcz_fpr64,
             .perfmon,
 @@ -2364,10 +2400,12 @@ pub const cpu = struct {
         .llvm_name = "apple-a17",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2376,8 +2414,8 @@ pub const cpu = struct {
             .fuse_arith_logic,
             .fuse_crypto_eor,
             .fuse_csel,
+            .fuse_fcsel,
             .fuse_literals,
-            .hcx,
             .max_interleave_factor_4,
             .no_zcz_fpr64,
             .perfmon,
 @@ -2396,10 +2434,12 @@ pub const cpu = struct {
         .llvm_name = "apple-a18",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2408,6 +2448,7 @@ pub const cpu = struct {
             .fuse_arith_logic,
             .fuse_crypto_eor,
             .fuse_csel,
+            .fuse_fcsel,
             .fuse_literals,
             .max_interleave_factor_4,
             .no_zcz_fpr64,
 @@ -2429,11 +2470,13 @@ pub const cpu = struct {
         .llvm_name = "apple-a19",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .cssc,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2442,6 +2485,7 @@ pub const cpu = struct {
             .fuse_arith_logic,
             .fuse_crypto_eor,
             .fuse_csel,
+            .fuse_fcsel,
             .fuse_literals,
             .hbc,
             .max_interleave_factor_4,
 @@ -2541,12 +2585,14 @@ pub const cpu = struct {
         .features = featureSet(&[_]Feature{
             .aes,
             .aggressive_fma,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .altnzcv,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .ccdp,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fptoint,
             .fuse_address,
 @@ -2577,10 +2623,12 @@ pub const cpu = struct {
         .llvm_name = "apple-m2",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2608,10 +2656,12 @@ pub const cpu = struct {
         .llvm_name = "apple-m3",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2620,8 +2670,8 @@ pub const cpu = struct {
             .fuse_arith_logic,
             .fuse_crypto_eor,
             .fuse_csel,
+            .fuse_fcsel,
             .fuse_literals,
-            .hcx,
             .max_interleave_factor_4,
             .no_zcz_fpr64,
             .perfmon,
 @@ -2640,10 +2690,12 @@ pub const cpu = struct {
         .llvm_name = "apple-m4",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2652,6 +2704,7 @@ pub const cpu = struct {
             .fuse_arith_logic,
             .fuse_crypto_eor,
             .fuse_csel,
+            .fuse_fcsel,
             .fuse_literals,
             .max_interleave_factor_4,
             .no_zcz_fpr64,
 @@ -2673,11 +2726,13 @@ pub const cpu = struct {
         .llvm_name = "apple-m5",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .cssc,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2686,6 +2741,7 @@ pub const cpu = struct {
             .fuse_arith_logic,
             .fuse_crypto_eor,
             .fuse_csel,
+            .fuse_fcsel,
             .fuse_literals,
             .hbc,
             .max_interleave_factor_4,
 @@ -2712,10 +2768,12 @@ pub const cpu = struct {
         .llvm_name = "apple-s10",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2724,8 +2782,8 @@ pub const cpu = struct {
             .fuse_arith_logic,
             .fuse_crypto_eor,
             .fuse_csel,
+            .fuse_fcsel,
             .fuse_literals,
-            .hcx,
             .max_interleave_factor_4,
             .no_zcz_fpr64,
             .perfmon,
 @@ -2864,10 +2922,12 @@ pub const cpu = struct {
         .llvm_name = "apple-s9",
         .features = featureSet(&[_]Feature{
             .aes,
+            .align_cmp_csel_pairs,
             .alternate_sextload_cvt_f32_pattern,
             .arith_bcc_fusion,
             .arith_cbz_fusion,
             .disable_latency_sched_heuristic,
+            .fast_ld1_single,
             .fp16fml,
             .fpac,
             .fuse_address,
 @@ -2876,8 +2936,8 @@ pub const cpu = struct {
             .fuse_arith_logic,
             .fuse_crypto_eor,
             .fuse_csel,
+            .fuse_fcsel,
             .fuse_literals,
-            .hcx,
             .max_interleave_factor_4,
             .no_zcz_fpr64,
             .perfmon,
 @@ -2891,6 +2951,34 @@ pub const cpu = struct {
             .zcz_gpr64,
         }),
     };
+    pub const armagicpu: CpuModel = .{
+        .name = "armagicpu",
+        .llvm_name = "armagicpu",
+        .features = featureSet(&[_]Feature{
+            .alu_lsl_fast,
+            .avoid_ldapur,
+            .brbe,
+            .enable_select_opt,
+            .ete,
+            .fp16fml,
+            .fpac,
+            .fuse_adrp_add,
+            .fuse_aes,
+            .fuse_csel,
+            .fuse_cset,
+            .has_limited_64bit_vector_mul_bandwidth,
+            .ls64,
+            .mte,
+            .perfmon,
+            .predictable_select_expensive,
+            .rand,
+            .spe,
+            .sve_bitperm,
+            .use_fixed_over_scalable_if_equal_cost,
+            .use_postra_scheduler,
+            .v9_2a,
+        }),
+    };
     pub const c1_nano: CpuModel = .{
         .name = "c1_nano",
         .llvm_name = "c1-nano",
 @@ -2987,6 +3075,7 @@ pub const cpu = struct {
             .fuse_aes,
             .fuse_csel,
             .fuse_cset,
+            .max_interleave_factor_4,
             .mte,
             .perfmon,
             .predictable_select_expensive,
 @@ -3016,7 +3105,6 @@ pub const cpu = struct {
         .features = featureSet(&[_]Feature{
             .alu_lsl_fast,
             .bf16,
-            .disable_maximize_scalable_bandwidth,
             .enable_select_opt,
             .ete,
             .fp16fml,
 @@ -3025,11 +3113,13 @@ pub const cpu = struct {
             .fuse_aes,
             .fuse_csel,
             .fuse_cset,
+            .has_limited_64bit_vector_mul_bandwidth,
             .i8mm,
             .mte,
             .perfmon,
             .predictable_select_expensive,
             .sve_bitperm,
+            .use_fixed_over_scalable_if_equal_cost,
             .use_postra_scheduler,
             .v9a,
         }),
 @@ -3562,6 +3652,7 @@ pub const cpu = struct {
             .fullfp16,
             .fuse_adrp_add,
             .fuse_aes,
+            .max_interleave_factor_4,
             .perfmon,
             .predictable_select_expensive,
             .rcpc,
 @@ -3587,6 +3678,7 @@ pub const cpu = struct {
             .fuse_adrp_add,
             .fuse_aes,
             .lse2,
+            .max_interleave_factor_4,
             .pauth,
             .perfmon,
             .predictable_select_expensive,
 @@ -3612,6 +3704,7 @@ pub const cpu = struct {
             .fuse_adrp_add,
             .fuse_aes,
             .i8mm,
+            .max_interleave_factor_4,
             .mte,
             .perfmon,
             .predictable_select_expensive,
 @@ -3635,6 +3728,7 @@ pub const cpu = struct {
             .fuse_adrp_add,
             .fuse_aes,
             .i8mm,
+            .max_interleave_factor_4,
             .mte,
             .perfmon,
             .predictable_select_expensive,
 @@ -3659,6 +3753,7 @@ pub const cpu = struct {
             .fuse_aes,
             .fuse_csel,
             .fuse_cset,
+            .max_interleave_factor_4,
             .mte,
             .perfmon,
             .predictable_select_expensive,
 @@ -3683,6 +3778,7 @@ pub const cpu = struct {
             .fuse_aes,
             .fuse_csel,
             .fuse_cset,
+            .max_interleave_factor_4,
             .mte,
             .perfmon,
             .predictable_select_expensive,
 @@ -3898,6 +3994,7 @@ pub const cpu = struct {
             .fuse_aes,
             .fuse_csel,
             .fuse_cset,
+            .max_interleave_factor_4,
             .mte,
             .perfmon,
             .predictable_select_expensive,
 @@ -3917,6 +4014,7 @@ pub const cpu = struct {
         .features = featureSet(&[_]Feature{
             .enable_select_opt,
             .ete,
+            .fixed_load_latency_4,
             .fuse_adrp_add,
             .fuse_aes,
             .neon,
 @@ -3955,6 +4053,36 @@ pub const cpu = struct {
             .v9a,
         }),
     };
+    pub const hip12: CpuModel = .{
+        .name = "hip12",
+        .llvm_name = "hip12",
+        .features = featureSet(&[_]Feature{
+            .addr_lsl_slow_14,
+            .alu_lsl_fast,
+            .brbe,
+            .cmp_bcc_fusion,
+            .ete,
+            .fp16fml,
+            .fpac,
+            .fuse_aes,
+            .hbc,
+            .ls64,
+            .nmi,
+            .perfmon,
+            .rand,
+            .rcpc3,
+            .rme,
+            .spe,
+            .store_pair_suppress,
+            .sve2,
+            .sve_aes,
+            .sve_bitperm,
+            .sve_sha3,
+            .sve_sm4,
+            .use_postra_scheduler,
+            .v8_7a,
+        }),
+    };
     pub const kryo: CpuModel = .{
         .name = "kryo",
         .llvm_name = "kryo",
 @@ -4045,7 +4173,6 @@ pub const cpu = struct {
         .features = featureSet(&[_]Feature{
             .alu_lsl_fast,
             .bf16,
-            .disable_maximize_scalable_bandwidth,
             .enable_select_opt,
             .ete,
             .fp16fml,
 @@ -4054,11 +4181,13 @@ pub const cpu = struct {
             .fuse_aes,
             .fuse_csel,
             .fuse_cset,
+            .has_limited_64bit_vector_mul_bandwidth,
             .i8mm,
             .mte,
             .perfmon,
             .predictable_select_expensive,
             .sve_bitperm,
+            .use_fixed_over_scalable_if_equal_cost,
             .use_postra_scheduler,
             .v9a,
         }),
 @@ -4169,6 +4298,7 @@ pub const cpu = struct {
             .rand,
             .spe,
             .sve_bitperm,
+            .use_fixed_over_scalable_if_equal_cost,
             .use_postra_scheduler,
             .v9_2a,
         }),
 @@ -4188,14 +4318,15 @@ pub const cpu = struct {
             .fuse_aes,
             .fuse_csel,
             .fuse_cset,
+            .has_limited_64bit_vector_mul_bandwidth,
             .ls64,
-            .max_interleave_factor_4,
             .mte,
             .perfmon,
             .predictable_select_expensive,
             .rand,
             .spe,
             .sve_bitperm,
+            .use_fixed_over_scalable_if_equal_cost,
             .use_postra_scheduler,
             .v9_2a,
         }),
 @@ -4248,6 +4379,33 @@ pub const cpu = struct {
             .v8_6a,
         }),
     };
+    pub const rigel: CpuModel = .{
+        .name = "rigel",
+        .llvm_name = "rigel",
+        .features = featureSet(&[_]Feature{
+            .brbe,
+            .chk,
+            .ete,
+            .faminmax,
+            .fp16fml,
+            .fp8dot2,
+            .fp8dot4,
+            .fp8fma,
+            .fpac,
+            .ls64,
+            .lut,
+            .mte,
+            .olympus,
+            .perfmon,
+            .rand,
+            .spe,
+            .sve_aes,
+            .sve_bitperm,
+            .sve_sha3,
+            .sve_sm4,
+            .v9_2a,
+        }),
+    };
     pub const saphira: CpuModel = .{
         .name = "saphira",
         .llvm_name = "saphira",

lib/std/Target/amdgcn.zig+998-133

...	@@ -6,6 +6,7 @@ const CpuModel = std.Target.Cpu.Model;	...	@@ -6,6 +6,7 @@ const CpuModel = std.Target.Cpu.Model;
6		6
7	pub const Feature = enum {	7	pub const Feature = enum {
8	@"1024_addressable_vgprs",	8	@"1024_addressable_vgprs",
		9	@"1536_physical_vgprs",
9	@"16_bit_insts",	10	@"16_bit_insts",
10	@"45_bit_num_records_buffer_resource",	11	@"45_bit_num_records_buffer_resource",
11	@"64_bit_literals",	12	@"64_bit_literals",
...	@@ -18,12 +19,12 @@ pub const Feature = enum {	...	@@ -18,12 +19,12 @@ pub const Feature = enum {
18	addressablelocalmemorysize327680,	19	addressablelocalmemorysize327680,
19	addressablelocalmemorysize65536,	20	addressablelocalmemorysize65536,
20	agent_scope_fine_grained_remote_memory_atomics,	21	agent_scope_fine_grained_remote_memory_atomics,
21	allocate1_5xvgprs,
22	aperture_regs,	22	aperture_regs,
23	architected_flat_scratch,	23	architected_flat_scratch,
24	architected_sgprs,	24	architected_sgprs,
25	ashr_pk_insts,	25	ashr_pk_insts,
26	assembler_permissive_wavesize,	26	assembler_permissive_wavesize,
		27	asynccnt,
27	atomic_buffer_global_pk_add_f16_insts,	28	atomic_buffer_global_pk_add_f16_insts,
28	atomic_buffer_global_pk_add_f16_no_rtn_insts,	29	atomic_buffer_global_pk_add_f16_no_rtn_insts,
29	atomic_buffer_pk_add_bf16_inst,	30	atomic_buffer_pk_add_bf16_inst,
...	@@ -75,9 +76,12 @@ pub const Feature = enum {	...	@@ -75,9 +76,12 @@ pub const Feature = enum {
75	dpp,	76	dpp,
76	dpp8,	77	dpp8,
77	dpp_64bit,	78	dpp_64bit,
		79	dpp_row_bcast,
78	dpp_src1_sgpr,	80	dpp_src1_sgpr,
		81	dpp_wavefront_shifts,
79	ds128,	82	ds128,
80	ds_src2_insts,	83	ds_src2_insts,
		84	dx10_clamp_and_ieee_mode,
81	emulated_system_scope_atomics,	85	emulated_system_scope_atomics,
82	extended_image_insts,	86	extended_image_insts,
83	f16bf16_to_fp6bf6_cvt_scale_insts,	87	f16bf16_to_fp6bf6_cvt_scale_insts,
...	@@ -91,13 +95,17 @@ pub const Feature = enum {	...	@@ -91,13 +95,17 @@ pub const Feature = enum {
91	flat_global_insts,	95	flat_global_insts,
92	flat_gvs_mode,	96	flat_gvs_mode,
93	flat_inst_offsets,	97	flat_inst_offsets,
		98	flat_offset_bits_12,
		99	flat_offset_bits_24,
94	flat_scratch,	100	flat_scratch,
95	flat_scratch_insts,	101	flat_scratch_insts,
96	flat_segment_offset_bug,	102	flat_segment_offset_bug,
		103	flat_signed_offset,
97	fma_mix_bf16_insts,	104	fma_mix_bf16_insts,
98	fma_mix_insts,	105	fma_mix_insts,
99	fmacf64_inst,	106	fmacf64_inst,
100	fmaf,	107	fmaf,
		108	formatted_mubuf_insts,
101	fp4_cvt_scale_insts,	109	fp4_cvt_scale_insts,
102	fp64,	110	fp64,
103	fp6bf6_cvt_scale_insts,	111	fp6bf6_cvt_scale_insts,
...	@@ -116,10 +124,15 @@ pub const Feature = enum {	...	@@ -116,10 +124,15 @@ pub const Feature = enum {
116	gfx10_b_encoding,	124	gfx10_b_encoding,
117	gfx10_insts,	125	gfx10_insts,
118	gfx11,	126	gfx11,
		127	gfx11_7_insts,
119	gfx11_insts,	128	gfx11_insts,
120	gfx12,	129	gfx12,
121	gfx1250_insts,	130	gfx1250_insts,
		131	gfx1251_gemm_insts,
		132	gfx125x_lowest_rate_wmma,
122	gfx12_insts,	133	gfx12_insts,
		134	gfx13,
		135	gfx13_insts,
123	gfx7_gfx8_gfx9_insts,	136	gfx7_gfx8_gfx9_insts,
124	gfx8_insts,	137	gfx8_insts,
125	gfx9,	138	gfx9,
...	@@ -135,6 +148,8 @@ pub const Feature = enum {	...	@@ -135,6 +148,8 @@ pub const Feature = enum {
135	image_insts,	148	image_insts,
136	image_store_d16_bug,	149	image_store_d16_bug,
137	inst_fwd_prefetch_bug,	150	inst_fwd_prefetch_bug,
		151	instcachelinesize128,
		152	instcachelinesize64,
138	int_clamp_insts,	153	int_clamp_insts,
139	inv_2pi_inline_imm,	154	inv_2pi_inline_imm,
140	kernarg_preload,	155	kernarg_preload,
...	@@ -149,6 +164,7 @@ pub const Feature = enum {	...	@@ -149,6 +164,7 @@ pub const Feature = enum {
149	mad_intra_fwd_bug,	164	mad_intra_fwd_bug,
150	mad_mac_f32_insts,	165	mad_mac_f32_insts,
151	mad_mix_insts,	166	mad_mix_insts,
		167	mad_nc_64_32_insts,
152	mad_u32_inst,	168	mad_u32_inst,
153	mai_insts,	169	mai_insts,
154	max_hard_clause_length_32,	170	max_hard_clause_length_32,
...	@@ -161,22 +177,31 @@ pub const Feature = enum {	...	@@ -161,22 +177,31 @@ pub const Feature = enum {
161	mfma_inline_literal_bug,	177	mfma_inline_literal_bug,
162	mimg_r128,	178	mimg_r128,
163	min3_max3_pkf16,	179	min3_max3_pkf16,
		180	min_max_i64_insts,
164	minimum3_maximum3_f16,	181	minimum3_maximum3_f16,
165	minimum3_maximum3_f32,	182	minimum3_maximum3_f32,
166	minimum3_maximum3_pkf16,	183	minimum3_maximum3_pkf16,
167	movrel,	184	movrel,
		185	mqsad_insts,
		186	mqsad_pk_insts,
168	msaa_load_dst_sel_bug,	187	msaa_load_dst_sel_bug,
		188	msad_insts,
		189	mtbuf_insts,
169	negative_scratch_offset_bug,	190	negative_scratch_offset_bug,
170	negative_unaligned_scratch_offset_bug,	191	negative_unaligned_scratch_offset_bug,
171	no_data_dep_hazard,	192	no_data_dep_hazard,
		193	no_f16_pseudo_scalar_trans_inline_constants,
172	no_sdst_cmpx,	194	no_sdst_cmpx,
173	nsa_clause_bug,	195	nsa_clause_bug,
174	nsa_encoding,	196	nsa_encoding,
175	nsa_to_vmem_bug,	197	nsa_to_vmem_bug,
176	offset_3f_bug,	198	offset_3f_bug,
177	packed_fp32_ops,	199	packed_fp32_ops,
		200	packed_fp64_ops,
178	packed_tid,	201	packed_tid,
		202	packed_u64_ops,
179	partial_nsa_encoding,	203	partial_nsa_encoding,
		204	permlane16_insts,
180	permlane16_swap,	205	permlane16_swap,
181	permlane32_swap,	206	permlane32_swap,
182	pk_add_min_max_insts,	207	pk_add_min_max_insts,
...	@@ -185,23 +210,25 @@ pub const Feature = enum {	...	@@ -185,23 +210,25 @@ pub const Feature = enum {
185	precise_memory,	210	precise_memory,
186	priv_enabled_trap2_nop_bug,	211	priv_enabled_trap2_nop_bug,
187	prng_inst,	212	prng_inst,
188	promote_alloca,
189	prt_strict_null,	213	prt_strict_null,
190	pseudo_scalar_trans,	214	pseudo_scalar_trans,
191	qsad_insts,	215	qsad_insts,
192	r128_a16,	216	r128_a16,
193	real_true16,	217	real_true16,
194	relaxed_buffer_oob_mode,
195	required_export_priority,	218	required_export_priority,
196	requires_cov6,	219	requires_cov6,
		220	requires_initial_unclause_vmem,
197	restricted_soffset,	221	restricted_soffset,
		222	s_barrier_leave_imm,
198	s_memrealtime,	223	s_memrealtime,
199	s_memtime_inst,	224	s_memtime_inst,
200	s_wakeup_barrier_inst,	225	s_wakeup_barrier_inst,
		226	s_wakeup_imm,
201	sad_insts,	227	sad_insts,
202	safe_cu_prefetch,	228	safe_cu_prefetch,
203	safe_smem_prefetch,	229	safe_smem_prefetch,
204	salu_float,	230	salu_float,
		231	salu_minimum_maximum_insts,
205	scalar_atomics,	232	scalar_atomics,
206	scalar_dwordx3_loads,	233	scalar_dwordx3_loads,
207	scalar_flat_scratch_insts,	234	scalar_flat_scratch_insts,
...	@@ -219,13 +246,17 @@ pub const Feature = enum {	...	@@ -219,13 +246,17 @@ pub const Feature = enum {
219	shader_cycles_hi_lo_registers,	246	shader_cycles_hi_lo_registers,
220	shader_cycles_register,	247	shader_cycles_register,
221	si_scheduler,	248	si_scheduler,
		249	smem_prefetch_insts,
222	smem_to_vector_write_hazard,	250	smem_to_vector_write_hazard,
223	southern_islands,	251	southern_islands,
224	sramecc,	252	sramecc,
225	sramecc_support,	253	sramecc_support,
		254	swmmac_gfx1200_insts,
		255	swmmac_gfx1250_insts,
226	tanh_insts,	256	tanh_insts,
227	tensor_cvt_lut_insts,	257	tensor_cvt_lut_insts,
228	tgsplit,	258	tgsplit_support,
		259	trans_coexecution_hazard,
229	transpose_load_f4f6_insts,	260	transpose_load_f4f6_insts,
230	trap_handler,	261	trap_handler,
231	trig_reduced_range,	262	trig_reduced_range,
...	@@ -236,7 +267,10 @@ pub const Feature = enum {	...	@@ -236,7 +267,10 @@ pub const Feature = enum {
236	unaligned_scratch_access,	267	unaligned_scratch_access,
237	unpacked_d16_vmem,	268	unpacked_d16_vmem,
238	unsafe_ds_offset_folding,	269	unsafe_ds_offset_folding,
		270	use_add_pc64_inst,
239	user_sgpr_init16_bug,	271	user_sgpr_init16_bug,
		272	v_mov_b64_inst,
		273	v_mul_u64_inst,
240	valu_trans_use_hazard,	274	valu_trans_use_hazard,
241	vcmpx_exec_war_hazard,	275	vcmpx_exec_war_hazard,
242	vcmpx_permlane_hazard,	276	vcmpx_permlane_hazard,
...	@@ -249,6 +283,7 @@ pub const Feature = enum {	...	@@ -249,6 +283,7 @@ pub const Feature = enum {
249	volcanic_islands,	283	volcanic_islands,
250	vop3_literal,	284	vop3_literal,
251	vop3p,	285	vop3p,
		286	vop3px2_increments_va_vdst_twice,
252	vopd,	287	vopd,
253	vscnt,	288	vscnt,
254	wait_xcnt,	289	wait_xcnt,
...	@@ -256,8 +291,12 @@ pub const Feature = enum {	...	@@ -256,8 +291,12 @@ pub const Feature = enum {
256	wavefrontsize16,	291	wavefrontsize16,
257	wavefrontsize32,	292	wavefrontsize32,
258	wavefrontsize64,	293	wavefrontsize64,
		294	wmma_128b_insts,
		295	wmma_256b_insts,
		296	wmma_coexecution_hazards,
259	xf32_insts,	297	xf32_insts,
260	xnack,	298	xnack,
		299	xnack_on_off_modes,
261	xnack_support,	300	xnack_support,
262	};	301	};
263		302
...	@@ -276,6 +315,11 @@ pub const all_features = blk: {	...	@@ -276,6 +315,11 @@ pub const all_features = blk: {
276	.description = "Has 1024 addressable VGPRs",	315	.description = "Has 1024 addressable VGPRs",
277	.dependencies = featureSet(&[_]Feature{}),	316	.dependencies = featureSet(&[_]Feature{}),
278	};	317	};
		318	result[@backingInt(Feature.@"1536_physical_vgprs")] = .{
		319	.llvm_name = "1536-physical-vgprs",
		320	.description = "Has 1536 physical VGPRs per SIMD",
		321	.dependencies = featureSet(&[_]Feature{}),
		322	};
279	result[@backingInt(Feature.@"16_bit_insts")] = .{	323	result[@backingInt(Feature.@"16_bit_insts")] = .{
280	.llvm_name = "16-bit-insts",	324	.llvm_name = "16-bit-insts",
281	.description = "Has i16/f16 instructions",	325	.description = "Has i16/f16 instructions",
...	@@ -336,11 +380,6 @@ pub const all_features = blk: {	...	@@ -336,11 +380,6 @@ pub const all_features = blk: {
336	.description = "Agent (device) scoped atomic operations, excluding those directly supported by PCIe (i.e. integer atomic add, exchange, and compare-and-swap), are functional for allocations in host or peer device memory.",	380	.description = "Agent (device) scoped atomic operations, excluding those directly supported by PCIe (i.e. integer atomic add, exchange, and compare-and-swap), are functional for allocations in host or peer device memory.",
337	.dependencies = featureSet(&[_]Feature{}),	381	.dependencies = featureSet(&[_]Feature{}),
338	};	382	};
339	result[@backingInt(Feature.allocate1_5xvgprs)] = .{
340	.llvm_name = "allocate1_5xvgprs",
341	.description = "Has 50% more physical VGPRs and 50% larger allocation granule",
342	.dependencies = featureSet(&[_]Feature{}),
343	};
344	result[@backingInt(Feature.aperture_regs)] = .{	383	result[@backingInt(Feature.aperture_regs)] = .{
345	.llvm_name = "aperture-regs",	384	.llvm_name = "aperture-regs",
346	.description = "Has Memory Aperture Base and Size Registers",	385	.description = "Has Memory Aperture Base and Size Registers",
...	@@ -363,7 +402,12 @@ pub const all_features = blk: {	...	@@ -363,7 +402,12 @@ pub const all_features = blk: {
363	};	402	};
364	result[@backingInt(Feature.assembler_permissive_wavesize)] = .{	403	result[@backingInt(Feature.assembler_permissive_wavesize)] = .{
365	.llvm_name = "assembler-permissive-wavesize",	404	.llvm_name = "assembler-permissive-wavesize",
366	.description = "allow parsing wave32 and wave64 variants of instructions",	405	.description = "Allow parsing wave32 and wave64 variants of instructions",
		406	.dependencies = featureSet(&[_]Feature{}),
		407	};
		408	result[@backingInt(Feature.asynccnt)] = .{
		409	.llvm_name = "asynccnt",
		410	.description = "Has separate asynccnt counter",
367	.dependencies = featureSet(&[_]Feature{}),	411	.dependencies = featureSet(&[_]Feature{}),
368	};	412	};
369	result[@backingInt(Feature.atomic_buffer_global_pk_add_f16_insts)] = .{	413	result[@backingInt(Feature.atomic_buffer_global_pk_add_f16_insts)] = .{
...	@@ -637,11 +681,21 @@ pub const all_features = blk: {	...	@@ -637,11 +681,21 @@ pub const all_features = blk: {
637	.description = "Support DPP (Data Parallel Primitives) extension in DP ALU",	681	.description = "Support DPP (Data Parallel Primitives) extension in DP ALU",
638	.dependencies = featureSet(&[_]Feature{}),	682	.dependencies = featureSet(&[_]Feature{}),
639	};	683	};
		684	result[@backingInt(Feature.dpp_row_bcast)] = .{
		685	.llvm_name = "dpp-row-bcast",
		686	.description = "Support DPP row_bcast15/row_bcast31",
		687	.dependencies = featureSet(&[_]Feature{}),
		688	};
640	result[@backingInt(Feature.dpp_src1_sgpr)] = .{	689	result[@backingInt(Feature.dpp_src1_sgpr)] = .{
641	.llvm_name = "dpp-src1-sgpr",	690	.llvm_name = "dpp-src1-sgpr",
642	.description = "Support SGPR for Src1 of DPP instructions",	691	.description = "Support SGPR for Src1 of DPP instructions",
643	.dependencies = featureSet(&[_]Feature{}),	692	.dependencies = featureSet(&[_]Feature{}),
644	};	693	};
		694	result[@backingInt(Feature.dpp_wavefront_shifts)] = .{
		695	.llvm_name = "dpp-wavefront-shifts",
		696	.description = "Support DPP wave_shl/wave_rol/wave_shr/wave_ror",
		697	.dependencies = featureSet(&[_]Feature{}),
		698	};
645	result[@backingInt(Feature.ds128)] = .{	699	result[@backingInt(Feature.ds128)] = .{
646	.llvm_name = "enable-ds128",	700	.llvm_name = "enable-ds128",
647	.description = "Use ds_{read\|write}_b128",	701	.description = "Use ds_{read\|write}_b128",
...	@@ -652,6 +706,11 @@ pub const all_features = blk: {	...	@@ -652,6 +706,11 @@ pub const all_features = blk: {
652	.description = "Has ds_*_src2 instructions",	706	.description = "Has ds_*_src2 instructions",
653	.dependencies = featureSet(&[_]Feature{}),	707	.dependencies = featureSet(&[_]Feature{}),
654	};	708	};
		709	result[@backingInt(Feature.dx10_clamp_and_ieee_mode)] = .{
		710	.llvm_name = "dx10-clamp-and-ieee-mode",
		711	.description = "Target has DX10_CLAMP and IEEE_MODE kernel descriptor bits",
		712	.dependencies = featureSet(&[_]Feature{}),
		713	};
655	result[@backingInt(Feature.emulated_system_scope_atomics)] = .{	714	result[@backingInt(Feature.emulated_system_scope_atomics)] = .{
656	.llvm_name = "emulated-system-scope-atomics",	715	.llvm_name = "emulated-system-scope-atomics",
657	.description = "System scope atomics unsupported by the PCI-e are emulated in HW via CAS loop and functional.",	716	.description = "System scope atomics unsupported by the PCI-e are emulated in HW via CAS loop and functional.",
...	@@ -723,6 +782,16 @@ pub const all_features = blk: {	...	@@ -723,6 +782,16 @@ pub const all_features = blk: {
723	.description = "Flat instructions have immediate offset addressing mode",	782	.description = "Flat instructions have immediate offset addressing mode",
724	.dependencies = featureSet(&[_]Feature{}),	783	.dependencies = featureSet(&[_]Feature{}),
725	};	784	};
		785	result[@backingInt(Feature.flat_offset_bits_12)] = .{
		786	.llvm_name = "flat-offset-bits-12",
		787	.description = "Number of bits for flat offset encoding",
		788	.dependencies = featureSet(&[_]Feature{}),
		789	};
		790	result[@backingInt(Feature.flat_offset_bits_24)] = .{
		791	.llvm_name = "flat-offset-bits-24",
		792	.description = "Number of bits for flat offset encoding",
		793	.dependencies = featureSet(&[_]Feature{}),
		794	};
726	result[@backingInt(Feature.flat_scratch)] = .{	795	result[@backingInt(Feature.flat_scratch)] = .{
727	.llvm_name = "enable-flat-scratch",	796	.llvm_name = "enable-flat-scratch",
728	.description = "Use scratch_* flat memory instructions to access scratch",	797	.description = "Use scratch_* flat memory instructions to access scratch",
...	@@ -740,6 +809,11 @@ pub const all_features = blk: {	...	@@ -740,6 +809,11 @@ pub const all_features = blk: {
740	.description = "GFX10 bug where inst_offset is ignored when flat instructions access global memory",	809	.description = "GFX10 bug where inst_offset is ignored when flat instructions access global memory",
741	.dependencies = featureSet(&[_]Feature{}),	810	.dependencies = featureSet(&[_]Feature{}),
742	};	811	};
		812	result[@backingInt(Feature.flat_signed_offset)] = .{
		813	.llvm_name = "flat-signed-offset",
		814	.description = "Immediate offset of FLAT instructions are always signed",
		815	.dependencies = featureSet(&[_]Feature{}),
		816	};
743	result[@backingInt(Feature.fma_mix_bf16_insts)] = .{	817	result[@backingInt(Feature.fma_mix_bf16_insts)] = .{
744	.llvm_name = "fma-mix-bf16-insts",	818	.llvm_name = "fma-mix-bf16-insts",
745	.description = "Has v_fma_mix_f32_bf16, v_fma_mixlo_bf16, v_fma_mixhi_bf16 instructions",	819	.description = "Has v_fma_mix_f32_bf16, v_fma_mixlo_bf16, v_fma_mixhi_bf16 instructions",
...	@@ -760,6 +834,11 @@ pub const all_features = blk: {	...	@@ -760,6 +834,11 @@ pub const all_features = blk: {
760	.description = "Enable single precision FMA (not as fast as mul+add, but fused)",	834	.description = "Enable single precision FMA (not as fast as mul+add, but fused)",
761	.dependencies = featureSet(&[_]Feature{}),	835	.dependencies = featureSet(&[_]Feature{}),
762	};	836	};
		837	result[@backingInt(Feature.formatted_mubuf_insts)] = .{
		838	.llvm_name = "formatted-mubuf-insts",
		839	.description = "Has formatted memory untyped buffer instructions.",
		840	.dependencies = featureSet(&[_]Feature{}),
		841	};
763	result[@backingInt(Feature.fp4_cvt_scale_insts)] = .{	842	result[@backingInt(Feature.fp4_cvt_scale_insts)] = .{
764	.llvm_name = "fp4-cvt-scale-insts",	843	.llvm_name = "fp4-cvt-scale-insts",
765	.description = "Has fp4 conversion scale instructions",	844	.description = "Has fp4 conversion scale instructions",
...	@@ -841,13 +920,16 @@ pub const all_features = blk: {	...	@@ -841,13 +920,16 @@ pub const all_features = blk: {
841	.default_component_zero,	920	.default_component_zero,
842	.dpp,	921	.dpp,
843	.dpp8,	922	.dpp8,
		923	.dx10_clamp_and_ieee_mode,
844	.extended_image_insts,	924	.extended_image_insts,
845	.fast_denormal_f32,	925	.fast_denormal_f32,
846	.fast_fmaf,	926	.fast_fmaf,
847	.flat_global_insts,	927	.flat_global_insts,
848	.flat_inst_offsets,	928	.flat_inst_offsets,
		929	.flat_offset_bits_12,
849	.flat_scratch_insts,	930	.flat_scratch_insts,
850	.fma_mix_insts,	931	.fma_mix_insts,
		932	.formatted_mubuf_insts,
851	.fp64,	933	.fp64,
852	.g16,	934	.g16,
853	.gds,	935	.gds,
...	@@ -856,14 +938,20 @@ pub const all_features = blk: {	...	@@ -856,14 +938,20 @@ pub const all_features = blk: {
856	.gfx9_insts,	938	.gfx9_insts,
857	.gws,	939	.gws,
858	.image_insts,	940	.image_insts,
		941	.instcachelinesize64,
859	.int_clamp_insts,	942	.int_clamp_insts,
860	.inv_2pi_inline_imm,	943	.inv_2pi_inline_imm,
861	.lerp_inst,	944	.lerp_inst,
862	.max_hard_clause_length_63,	945	.max_hard_clause_length_63,
863	.mimg_r128,	946	.mimg_r128,
864	.movrel,	947	.movrel,
		948	.mqsad_insts,
		949	.mqsad_pk_insts,
		950	.msad_insts,
		951	.mtbuf_insts,
865	.no_data_dep_hazard,	952	.no_data_dep_hazard,
866	.no_sdst_cmpx,	953	.no_sdst_cmpx,
		954	.permlane16_insts,
867	.pk_fmac_f16_inst,	955	.pk_fmac_f16_inst,
868	.qsad_insts,	956	.qsad_insts,
869	.s_memrealtime,	957	.s_memrealtime,
...	@@ -929,6 +1017,7 @@ pub const all_features = blk: {	...	@@ -929,6 +1017,7 @@ pub const all_features = blk: {
929	.flat_inst_offsets,	1017	.flat_inst_offsets,
930	.flat_scratch_insts,	1018	.flat_scratch_insts,
931	.fma_mix_insts,	1019	.fma_mix_insts,
		1020	.formatted_mubuf_insts,
932	.fp64,	1021	.fp64,
933	.g16,	1022	.g16,
934	.gds,	1023	.gds,
...	@@ -940,14 +1029,20 @@ pub const all_features = blk: {	...	@@ -940,14 +1029,20 @@ pub const all_features = blk: {
940	.gfx8_insts,	1029	.gfx8_insts,
941	.gfx9_insts,	1030	.gfx9_insts,
942	.gws,	1031	.gws,
		1032	.instcachelinesize128,
943	.int_clamp_insts,	1033	.int_clamp_insts,
944	.inv_2pi_inline_imm,	1034	.inv_2pi_inline_imm,
945	.lerp_inst,	1035	.lerp_inst,
946	.max_hard_clause_length_32,	1036	.max_hard_clause_length_32,
947	.mimg_r128,	1037	.mimg_r128,
948	.movrel,	1038	.movrel,
		1039	.mqsad_insts,
		1040	.mqsad_pk_insts,
		1041	.msad_insts,
		1042	.mtbuf_insts,
949	.no_data_dep_hazard,	1043	.no_data_dep_hazard,
950	.no_sdst_cmpx,	1044	.no_sdst_cmpx,
		1045	.permlane16_insts,
951	.pk_fmac_f16_inst,	1046	.pk_fmac_f16_inst,
952	.qsad_insts,	1047	.qsad_insts,
953	.sad_insts,	1048	.sad_insts,
...	@@ -962,6 +1057,11 @@ pub const all_features = blk: {	...	@@ -962,6 +1057,11 @@ pub const all_features = blk: {
962	.vscnt,	1057	.vscnt,
963	}),	1058	}),
964	};	1059	};
		1060	result[@backingInt(Feature.gfx11_7_insts)] = .{
		1061	.llvm_name = "gfx11-7-insts",
		1062	.description = "Additional instructions for GFX11.7",
		1063	.dependencies = featureSet(&[_]Feature{}),
		1064	};
965	result[@backingInt(Feature.gfx11_insts)] = .{	1065	result[@backingInt(Feature.gfx11_insts)] = .{
966	.llvm_name = "gfx11-insts",	1066	.llvm_name = "gfx11-insts",
967	.description = "Additional instructions for GFX11+",	1067	.description = "Additional instructions for GFX11+",
...	@@ -986,7 +1086,9 @@ pub const all_features = blk: {	...	@@ -986,7 +1086,9 @@ pub const all_features = blk: {
986	.fast_fmaf,	1086	.fast_fmaf,
987	.flat_global_insts,	1087	.flat_global_insts,
988	.flat_inst_offsets,	1088	.flat_inst_offsets,
		1089	.flat_offset_bits_24,
989	.flat_scratch_insts,	1090	.flat_scratch_insts,
		1091	.flat_signed_offset,
990	.fma_mix_insts,	1092	.fma_mix_insts,
991	.fp64,	1093	.fp64,
992	.g16,	1094	.g16,
...	@@ -999,6 +1101,7 @@ pub const all_features = blk: {	...	@@ -999,6 +1101,7 @@ pub const all_features = blk: {
999	.gfx8_insts,	1101	.gfx8_insts,
1000	.gfx9_insts,	1102	.gfx9_insts,
1001	.ieee_minimum_maximum_insts,	1103	.ieee_minimum_maximum_insts,
		1104	.instcachelinesize128,
1002	.int_clamp_insts,	1105	.int_clamp_insts,
1003	.inv_2pi_inline_imm,	1106	.inv_2pi_inline_imm,
1004	.max_hard_clause_length_32,	1107	.max_hard_clause_length_32,
...	@@ -1008,7 +1111,9 @@ pub const all_features = blk: {	...	@@ -1008,7 +1111,9 @@ pub const all_features = blk: {
1008	.movrel,	1111	.movrel,
1009	.no_data_dep_hazard,	1112	.no_data_dep_hazard,
1010	.no_sdst_cmpx,	1113	.no_sdst_cmpx,
		1114	.permlane16_insts,
1011	.pk_fmac_f16_inst,	1115	.pk_fmac_f16_inst,
		1116	.salu_minimum_maximum_insts,
1012	.true16,	1117	.true16,
1013	.unaligned_buffer_access,	1118	.unaligned_buffer_access,
1014	.unaligned_ds_access,	1119	.unaligned_ds_access,
...	@@ -1024,11 +1129,91 @@ pub const all_features = blk: {	...	@@ -1024,11 +1129,91 @@ pub const all_features = blk: {
1024	.description = "Additional instructions for GFX1250+",	1129	.description = "Additional instructions for GFX1250+",
1025	.dependencies = featureSet(&[_]Feature{}),	1130	.dependencies = featureSet(&[_]Feature{}),
1026	};	1131	};
		1132	result[@backingInt(Feature.gfx1251_gemm_insts)] = .{
		1133	.llvm_name = "gfx1251-gemm-insts",
		1134	.description = "Has additional gfx1251 DGEMM instructions",
		1135	.dependencies = featureSet(&[_]Feature{}),
		1136	};
		1137	result[@backingInt(Feature.gfx125x_lowest_rate_wmma)] = .{
		1138	.llvm_name = "gfx125x-lowest-rate-wmma",
		1139	.description = "Has the lowest rate wmma in the gfx125x family, mainly for the gfx12-5-generic",
		1140	.dependencies = featureSet(&[_]Feature{}),
		1141	};
1027	result[@backingInt(Feature.gfx12_insts)] = .{	1142	result[@backingInt(Feature.gfx12_insts)] = .{
1028	.llvm_name = "gfx12-insts",	1143	.llvm_name = "gfx12-insts",
1029	.description = "Additional instructions for GFX12+",	1144	.description = "Additional instructions for GFX12+",
1030	.dependencies = featureSet(&[_]Feature{}),	1145	.dependencies = featureSet(&[_]Feature{}),
1031	};	1146	};
		1147	result[@backingInt(Feature.gfx13)] = .{
		1148	.llvm_name = "gfx13",
		1149	.description = "GFX13 GPU generation",
		1150	.dependencies = featureSet(&[_]Feature{
		1151	.@"16_bit_insts",
		1152	.a16,
		1153	.add_no_carry_insts,
		1154	.agent_scope_fine_grained_remote_memory_atomics,
		1155	.aperture_regs,
		1156	.atomic_fmin_fmax_flat_f32,
		1157	.atomic_fmin_fmax_global_f32,
		1158	.ci_insts,
		1159	.default_component_broadcast,
		1160	.dpp,
		1161	.dpp8,
		1162	.extended_image_insts,
		1163	.fast_denormal_f32,
		1164	.fast_fmaf,
		1165	.flat_global_insts,
		1166	.flat_inst_offsets,
		1167	.flat_offset_bits_24,
		1168	.flat_scratch_insts,
		1169	.flat_signed_offset,
		1170	.fma_mix_insts,
		1171	.formatted_mubuf_insts,
		1172	.fp64,
		1173	.g16,
		1174	.gfx10_3_insts,
		1175	.gfx10_a_encoding,
		1176	.gfx10_b_encoding,
		1177	.gfx10_insts,
		1178	.gfx11_insts,
		1179	.gfx12_insts,
		1180	.gfx13_insts,
		1181	.gfx8_insts,
		1182	.gfx9_insts,
		1183	.ieee_minimum_maximum_insts,
		1184	.image_insts,
		1185	.instcachelinesize128,
		1186	.int_clamp_insts,
		1187	.inv_2pi_inline_imm,
		1188	.max_hard_clause_length_32,
		1189	.mimg_r128,
		1190	.minimum3_maximum3_f16,
		1191	.minimum3_maximum3_f32,
		1192	.movrel,
		1193	.mtbuf_insts,
		1194	.no_data_dep_hazard,
		1195	.no_sdst_cmpx,
		1196	.permlane16_insts,
		1197	.pk_fmac_f16_inst,
		1198	.salu_minimum_maximum_insts,
		1199	.true16,
		1200	.unaligned_buffer_access,
		1201	.unaligned_ds_access,
		1202	.unaligned_scratch_access,
		1203	.vop3_literal,
		1204	.vop3p,
		1205	.vopd,
		1206	.vscnt,
		1207	}),
		1208	};
		1209	result[@backingInt(Feature.gfx13_insts)] = .{
		1210	.llvm_name = "gfx13-insts",
		1211	.description = "Additional instructions for GFX13+",
		1212	.dependencies = featureSet(&[_]Feature{
		1213	.s_barrier_leave_imm,
		1214	.s_wakeup_imm,
		1215	}),
		1216	};
1032	result[@backingInt(Feature.gfx7_gfx8_gfx9_insts)] = .{	1217	result[@backingInt(Feature.gfx7_gfx8_gfx9_insts)] = .{
1033	.llvm_name = "gfx7-gfx8-gfx9-insts",	1218	.llvm_name = "gfx7-gfx8-gfx9-insts",
1034	.description = "Instructions shared in GFX7, GFX8, GFX9",	1219	.description = "Instructions shared in GFX7, GFX8, GFX9",
...	@@ -1054,20 +1239,29 @@ pub const all_features = blk: {	...	@@ -1054,20 +1239,29 @@ pub const all_features = blk: {
1054	.cvt_pknorm_vop3_insts,	1239	.cvt_pknorm_vop3_insts,
1055	.default_component_zero,	1240	.default_component_zero,
1056	.dpp,	1241	.dpp,
		1242	.dpp_row_bcast,
		1243	.dpp_wavefront_shifts,
		1244	.dx10_clamp_and_ieee_mode,
1057	.fast_denormal_f32,	1245	.fast_denormal_f32,
1058	.fast_fmaf,	1246	.fast_fmaf,
1059	.flat_global_insts,	1247	.flat_global_insts,
1060	.flat_inst_offsets,	1248	.flat_inst_offsets,
1061	.flat_scratch_insts,	1249	.flat_scratch_insts,
		1250	.formatted_mubuf_insts,
1062	.fp64,	1251	.fp64,
1063	.gcn3_encoding,	1252	.gcn3_encoding,
1064	.gfx7_gfx8_gfx9_insts,	1253	.gfx7_gfx8_gfx9_insts,
1065	.gfx8_insts,	1254	.gfx8_insts,
1066	.gfx9_insts,	1255	.gfx9_insts,
1067	.gws,	1256	.gws,
		1257	.instcachelinesize64,
1068	.int_clamp_insts,	1258	.int_clamp_insts,
1069	.inv_2pi_inline_imm,	1259	.inv_2pi_inline_imm,
1070	.lerp_inst,	1260	.lerp_inst,
		1261	.mqsad_insts,
		1262	.mqsad_pk_insts,
		1263	.msad_insts,
		1264	.mtbuf_insts,
1071	.negative_scratch_offset_bug,	1265	.negative_scratch_offset_bug,
1072	.qsad_insts,	1266	.qsad_insts,
1073	.r128_a16,	1267	.r128_a16,
...	@@ -1089,7 +1283,7 @@ pub const all_features = blk: {	...	@@ -1089,7 +1283,7 @@ pub const all_features = blk: {
1089	.vmem_write_vgpr_in_order,	1283	.vmem_write_vgpr_in_order,
1090	.vop3p,	1284	.vop3p,
1091	.wavefrontsize64,	1285	.wavefrontsize64,
1092	.xnack_support,	1286	.xnack_on_off_modes,
1093	}),	1287	}),
1094	};	1288	};
1095	result[@backingInt(Feature.gfx90a_insts)] = .{	1289	result[@backingInt(Feature.gfx90a_insts)] = .{
...	@@ -1142,7 +1336,7 @@ pub const all_features = blk: {	...	@@ -1142,7 +1336,7 @@ pub const all_features = blk: {
1142	};	1336	};
1143	result[@backingInt(Feature.ieee_minimum_maximum_insts)] = .{	1337	result[@backingInt(Feature.ieee_minimum_maximum_insts)] = .{
1144	.llvm_name = "ieee-minimum-maximum-insts",	1338	.llvm_name = "ieee-minimum-maximum-insts",
1145	.description = "Has v_minimum/maximum_f16/f32/f64, v_minimummaximum/maximumminimum_f16/f32 and v_pk_minimum/maximum_f16 instructions",	1339	.description = "Has v_minimum/maximum_f16/f32/f64, v_minimummaximum/maximumminimum_f16/f32 andv_pk_minimum/maximum_f16 instructions",
1146	.dependencies = featureSet(&[_]Feature{}),	1340	.dependencies = featureSet(&[_]Feature{}),
1147	};	1341	};
1148	result[@backingInt(Feature.image_gather4_d16_bug)] = .{	1342	result[@backingInt(Feature.image_gather4_d16_bug)] = .{
...	@@ -1165,6 +1359,16 @@ pub const all_features = blk: {	...	@@ -1165,6 +1359,16 @@ pub const all_features = blk: {
1165	.description = "S_INST_PREFETCH instruction causes shader to hang",	1359	.description = "S_INST_PREFETCH instruction causes shader to hang",
1166	.dependencies = featureSet(&[_]Feature{}),	1360	.dependencies = featureSet(&[_]Feature{}),
1167	};	1361	};
		1362	result[@backingInt(Feature.instcachelinesize128)] = .{
		1363	.llvm_name = "instcachelinesize128",
		1364	.description = "Instruction cache line size in bytes.",
		1365	.dependencies = featureSet(&[_]Feature{}),
		1366	};
		1367	result[@backingInt(Feature.instcachelinesize64)] = .{
		1368	.llvm_name = "instcachelinesize64",
		1369	.description = "Instruction cache line size in bytes.",
		1370	.dependencies = featureSet(&[_]Feature{}),
		1371	};
1168	result[@backingInt(Feature.int_clamp_insts)] = .{	1372	result[@backingInt(Feature.int_clamp_insts)] = .{
1169	.llvm_name = "int-clamp-insts",	1373	.llvm_name = "int-clamp-insts",
1170	.description = "Support clamp for integer destination",	1374	.description = "Support clamp for integer destination",
...	@@ -1235,6 +1439,11 @@ pub const all_features = blk: {	...	@@ -1235,6 +1439,11 @@ pub const all_features = blk: {
1235	.description = "Has v_mad_mix_f32, v_mad_mixlo_f16, v_mad_mixhi_f16 instructions",	1439	.description = "Has v_mad_mix_f32, v_mad_mixlo_f16, v_mad_mixhi_f16 instructions",
1236	.dependencies = featureSet(&[_]Feature{}),	1440	.dependencies = featureSet(&[_]Feature{}),
1237	};	1441	};
		1442	result[@backingInt(Feature.mad_nc_64_32_insts)] = .{
		1443	.llvm_name = "mad-nc-64-32-insts",
		1444	.description = "Has v_mad_nc_{u64_u32\|i64_i32} instructions",
		1445	.dependencies = featureSet(&[_]Feature{}),
		1446	};
1238	result[@backingInt(Feature.mad_u32_inst)] = .{	1447	result[@backingInt(Feature.mad_u32_inst)] = .{
1239	.llvm_name = "mad-u32-inst",	1448	.llvm_name = "mad-u32-inst",
1240	.description = "Has v_mad_u32 instruction",	1449	.description = "Has v_mad_u32 instruction",
...	@@ -1295,6 +1504,11 @@ pub const all_features = blk: {	...	@@ -1295,6 +1504,11 @@ pub const all_features = blk: {
1295	.description = "Has v_pk_min3_num_f16 and v_pk_max3_num_f16 instructions",	1504	.description = "Has v_pk_min3_num_f16 and v_pk_max3_num_f16 instructions",
1296	.dependencies = featureSet(&[_]Feature{}),	1505	.dependencies = featureSet(&[_]Feature{}),
1297	};	1506	};
		1507	result[@backingInt(Feature.min_max_i64_insts)] = .{
		1508	.llvm_name = "min-max-i64-insts",
		1509	.description = "Has v_{min\|max}_{i\|u}64 instructions",
		1510	.dependencies = featureSet(&[_]Feature{}),
		1511	};
1298	result[@backingInt(Feature.minimum3_maximum3_f16)] = .{	1512	result[@backingInt(Feature.minimum3_maximum3_f16)] = .{
1299	.llvm_name = "minimum3-maximum3-f16",	1513	.llvm_name = "minimum3-maximum3-f16",
1300	.description = "Has v_minimum3_f16 and v_maximum3_f16 instructions",	1514	.description = "Has v_minimum3_f16 and v_maximum3_f16 instructions",
...	@@ -1315,11 +1529,31 @@ pub const all_features = blk: {	...	@@ -1315,11 +1529,31 @@ pub const all_features = blk: {
1315	.description = "Has v_movrel*_b32 instructions",	1529	.description = "Has v_movrel*_b32 instructions",
1316	.dependencies = featureSet(&[_]Feature{}),	1530	.dependencies = featureSet(&[_]Feature{}),
1317	};	1531	};
		1532	result[@backingInt(Feature.mqsad_insts)] = .{
		1533	.llvm_name = "mqsad-insts",
		1534	.description = "Has v_mqsad_u32_u8 instruction",
		1535	.dependencies = featureSet(&[_]Feature{}),
		1536	};
		1537	result[@backingInt(Feature.mqsad_pk_insts)] = .{
		1538	.llvm_name = "mqsad-pk-insts",
		1539	.description = "Has v_mqsad_pk_u16_u8 instruction",
		1540	.dependencies = featureSet(&[_]Feature{}),
		1541	};
1318	result[@backingInt(Feature.msaa_load_dst_sel_bug)] = .{	1542	result[@backingInt(Feature.msaa_load_dst_sel_bug)] = .{
1319	.llvm_name = "msaa-load-dst-sel-bug",	1543	.llvm_name = "msaa-load-dst-sel-bug",
1320	.description = "MSAA loads not honoring dst_sel bug",	1544	.description = "MSAA loads not honoring dst_sel bug",
1321	.dependencies = featureSet(&[_]Feature{}),	1545	.dependencies = featureSet(&[_]Feature{}),
1322	};	1546	};
		1547	result[@backingInt(Feature.msad_insts)] = .{
		1548	.llvm_name = "msad-insts",
		1549	.description = "Has v_msad_u8 instruction",
		1550	.dependencies = featureSet(&[_]Feature{}),
		1551	};
		1552	result[@backingInt(Feature.mtbuf_insts)] = .{
		1553	.llvm_name = "mtbuf-insts",
		1554	.description = "Has memory typed buffer instructions.",
		1555	.dependencies = featureSet(&[_]Feature{}),
		1556	};
1323	result[@backingInt(Feature.negative_scratch_offset_bug)] = .{	1557	result[@backingInt(Feature.negative_scratch_offset_bug)] = .{
1324	.llvm_name = "negative-scratch-offset-bug",	1558	.llvm_name = "negative-scratch-offset-bug",
1325	.description = "Negative immediate offsets in scratch instructions with an SGPR offset page fault on GFX9",	1559	.description = "Negative immediate offsets in scratch instructions with an SGPR offset page fault on GFX9",
...	@@ -1327,7 +1561,7 @@ pub const all_features = blk: {	...	@@ -1327,7 +1561,7 @@ pub const all_features = blk: {
1327	};	1561	};
1328	result[@backingInt(Feature.negative_unaligned_scratch_offset_bug)] = .{	1562	result[@backingInt(Feature.negative_unaligned_scratch_offset_bug)] = .{
1329	.llvm_name = "negative-unaligned-scratch-offset-bug",	1563	.llvm_name = "negative-unaligned-scratch-offset-bug",
1330	.description = "Scratch instructions with a VGPR offset and a negative immediate offset that is not a multiple of 4 read wrong memory on GFX10",	1564	.description = "Scratch instructions with a VGPR offset and a negative immediate offset thatis not a multiple of 4 read wrong memory on GFX10",
1331	.dependencies = featureSet(&[_]Feature{}),	1565	.dependencies = featureSet(&[_]Feature{}),
1332	};	1566	};
1333	result[@backingInt(Feature.no_data_dep_hazard)] = .{	1567	result[@backingInt(Feature.no_data_dep_hazard)] = .{
...	@@ -1335,6 +1569,11 @@ pub const all_features = blk: {	...	@@ -1335,6 +1569,11 @@ pub const all_features = blk: {
1335	.description = "Does not need SW waitstates",	1569	.description = "Does not need SW waitstates",
1336	.dependencies = featureSet(&[_]Feature{}),	1570	.dependencies = featureSet(&[_]Feature{}),
1337	};	1571	};
		1572	result[@backingInt(Feature.no_f16_pseudo_scalar_trans_inline_constants)] = .{
		1573	.llvm_name = "no-f16-pseudo-scalar-trans-inline-constants",
		1574	.description = "Inline constants are not supported for F16 pseudo scalar transcendentals",
		1575	.dependencies = featureSet(&[_]Feature{}),
		1576	};
1338	result[@backingInt(Feature.no_sdst_cmpx)] = .{	1577	result[@backingInt(Feature.no_sdst_cmpx)] = .{
1339	.llvm_name = "no-sdst-cmpx",	1578	.llvm_name = "no-sdst-cmpx",
1340	.description = "V_CMPX does not write VCC/SGPR in addition to EXEC",	1579	.description = "V_CMPX does not write VCC/SGPR in addition to EXEC",
...	@@ -1365,16 +1604,31 @@ pub const all_features = blk: {	...	@@ -1365,16 +1604,31 @@ pub const all_features = blk: {
1365	.description = "Support packed fp32 instructions",	1604	.description = "Support packed fp32 instructions",
1366	.dependencies = featureSet(&[_]Feature{}),	1605	.dependencies = featureSet(&[_]Feature{}),
1367	};	1606	};
		1607	result[@backingInt(Feature.packed_fp64_ops)] = .{
		1608	.llvm_name = "packed-fp64-ops",
		1609	.description = "Support packed fp64 instructions",
		1610	.dependencies = featureSet(&[_]Feature{}),
		1611	};
1368	result[@backingInt(Feature.packed_tid)] = .{	1612	result[@backingInt(Feature.packed_tid)] = .{
1369	.llvm_name = "packed-tid",	1613	.llvm_name = "packed-tid",
1370	.description = "Workitem IDs are packed into v0 at kernel launch",	1614	.description = "Workitem IDs are packed into v0 at kernel launch",
1371	.dependencies = featureSet(&[_]Feature{}),	1615	.dependencies = featureSet(&[_]Feature{}),
1372	};	1616	};
		1617	result[@backingInt(Feature.packed_u64_ops)] = .{
		1618	.llvm_name = "packed-u64-ops",
		1619	.description = "Support packed uint64 instructions",
		1620	.dependencies = featureSet(&[_]Feature{}),
		1621	};
1373	result[@backingInt(Feature.partial_nsa_encoding)] = .{	1622	result[@backingInt(Feature.partial_nsa_encoding)] = .{
1374	.llvm_name = "partial-nsa-encoding",	1623	.llvm_name = "partial-nsa-encoding",
1375	.description = "Support partial NSA encoding for image instructions",	1624	.description = "Support partial NSA encoding for image instructions",
1376	.dependencies = featureSet(&[_]Feature{}),	1625	.dependencies = featureSet(&[_]Feature{}),
1377	};	1626	};
		1627	result[@backingInt(Feature.permlane16_insts)] = .{
		1628	.llvm_name = "permlane16-insts",
		1629	.description = "Has v_permlane16_b32/v_permlanex16_b32 instructions",
		1630	.dependencies = featureSet(&[_]Feature{}),
		1631	};
1378	result[@backingInt(Feature.permlane16_swap)] = .{	1632	result[@backingInt(Feature.permlane16_swap)] = .{
1379	.llvm_name = "permlane16-swap",	1633	.llvm_name = "permlane16-swap",
1380	.description = "Has v_permlane16_swap_b32 instructions",	1634	.description = "Has v_permlane16_swap_b32 instructions",
...	@@ -1415,11 +1669,6 @@ pub const all_features = blk: {	...	@@ -1415,11 +1669,6 @@ pub const all_features = blk: {
1415	.description = "Has v_prng_b32 instruction",	1669	.description = "Has v_prng_b32 instruction",
1416	.dependencies = featureSet(&[_]Feature{}),	1670	.dependencies = featureSet(&[_]Feature{}),
1417	};	1671	};
1418	result[@backingInt(Feature.promote_alloca)] = .{
1419	.llvm_name = "promote-alloca",
1420	.description = "Enable promote alloca pass",
1421	.dependencies = featureSet(&[_]Feature{}),
1422	};
1423	result[@backingInt(Feature.prt_strict_null)] = .{	1672	result[@backingInt(Feature.prt_strict_null)] = .{
1424	.llvm_name = "enable-prt-strict-null",	1673	.llvm_name = "enable-prt-strict-null",
1425	.description = "Enable zeroing of result registers for sparse texture fetches",	1674	.description = "Enable zeroing of result registers for sparse texture fetches",
...	@@ -1445,11 +1694,6 @@ pub const all_features = blk: {	...	@@ -1445,11 +1694,6 @@ pub const all_features = blk: {
1445	.description = "Use true 16-bit registers",	1694	.description = "Use true 16-bit registers",
1446	.dependencies = featureSet(&[_]Feature{}),	1695	.dependencies = featureSet(&[_]Feature{}),
1447	};	1696	};
1448	result[@backingInt(Feature.relaxed_buffer_oob_mode)] = .{
1449	.llvm_name = "relaxed-buffer-oob-mode",
1450	.description = "Disable strict out-of-bounds buffer guarantees. An OOB access may potentially cause an adjacent access to be treated as if it were also OOB",
1451	.dependencies = featureSet(&[_]Feature{}),
1452	};
1453	result[@backingInt(Feature.required_export_priority)] = .{	1697	result[@backingInt(Feature.required_export_priority)] = .{
1454	.llvm_name = "required-export-priority",	1698	.llvm_name = "required-export-priority",
1455	.description = "Export priority must be explicitly manipulated on GFX11.5",	1699	.description = "Export priority must be explicitly manipulated on GFX11.5",
...	@@ -1460,11 +1704,21 @@ pub const all_features = blk: {	...	@@ -1460,11 +1704,21 @@ pub const all_features = blk: {
1460	.description = "Target Requires Code Object V6",	1704	.description = "Target Requires Code Object V6",
1461	.dependencies = featureSet(&[_]Feature{}),	1705	.dependencies = featureSet(&[_]Feature{}),
1462	};	1706	};
		1707	result[@backingInt(Feature.requires_initial_unclause_vmem)] = .{
		1708	.llvm_name = "requires-initial-unclause-vmem",
		1709	.description = "Hardware entrypoints require first VMEM instruction to be unclaused",
		1710	.dependencies = featureSet(&[_]Feature{}),
		1711	};
1463	result[@backingInt(Feature.restricted_soffset)] = .{	1712	result[@backingInt(Feature.restricted_soffset)] = .{
1464	.llvm_name = "restricted-soffset",	1713	.llvm_name = "restricted-soffset",
1465	.description = "Has restricted SOffset (immediate not supported).",	1714	.description = "Has restricted SOffset (immediate not supported).",
1466	.dependencies = featureSet(&[_]Feature{}),	1715	.dependencies = featureSet(&[_]Feature{}),
1467	};	1716	};
		1717	result[@backingInt(Feature.s_barrier_leave_imm)] = .{
		1718	.llvm_name = "s-barrier-leave-imm",
		1719	.description = "s_barrier_leave takes an immediate operand",
		1720	.dependencies = featureSet(&[_]Feature{}),
		1721	};
1468	result[@backingInt(Feature.s_memrealtime)] = .{	1722	result[@backingInt(Feature.s_memrealtime)] = .{
1469	.llvm_name = "s-memrealtime",	1723	.llvm_name = "s-memrealtime",
1470	.description = "Has s_memrealtime instruction",	1724	.description = "Has s_memrealtime instruction",
...	@@ -1480,6 +1734,11 @@ pub const all_features = blk: {	...	@@ -1480,6 +1734,11 @@ pub const all_features = blk: {
1480	.description = "Has s_wakeup_barrier instruction.",	1734	.description = "Has s_wakeup_barrier instruction.",
1481	.dependencies = featureSet(&[_]Feature{}),	1735	.dependencies = featureSet(&[_]Feature{}),
1482	};	1736	};
		1737	result[@backingInt(Feature.s_wakeup_imm)] = .{
		1738	.llvm_name = "s-wakeup-imm",
		1739	.description = "s_wakeup takes an immediate operand",
		1740	.dependencies = featureSet(&[_]Feature{}),
		1741	};
1483	result[@backingInt(Feature.sad_insts)] = .{	1742	result[@backingInt(Feature.sad_insts)] = .{
1484	.llvm_name = "sad-insts",	1743	.llvm_name = "sad-insts",
1485	.description = "Has v_sad* instructions",	1744	.description = "Has v_sad* instructions",
...	@@ -1500,6 +1759,11 @@ pub const all_features = blk: {	...	@@ -1500,6 +1759,11 @@ pub const all_features = blk: {
1500	.description = "Has SALU floating point instructions",	1759	.description = "Has SALU floating point instructions",
1501	.dependencies = featureSet(&[_]Feature{}),	1760	.dependencies = featureSet(&[_]Feature{}),
1502	};	1761	};
		1762	result[@backingInt(Feature.salu_minimum_maximum_insts)] = .{
		1763	.llvm_name = "salu-minimum-maximum-insts",
		1764	.description = "Has s_minimum/maximum_f16/f32 instructions",
		1765	.dependencies = featureSet(&[_]Feature{}),
		1766	};
1503	result[@backingInt(Feature.scalar_atomics)] = .{	1767	result[@backingInt(Feature.scalar_atomics)] = .{
1504	.llvm_name = "scalar-atomics",	1768	.llvm_name = "scalar-atomics",
1505	.description = "Has atomic scalar memory instructions",	1769	.description = "Has atomic scalar memory instructions",
...	@@ -1564,16 +1828,23 @@ pub const all_features = blk: {	...	@@ -1564,16 +1828,23 @@ pub const all_features = blk: {
1564	.cvt_pknorm_vop2_insts,	1828	.cvt_pknorm_vop2_insts,
1565	.default_component_zero,	1829	.default_component_zero,
1566	.ds_src2_insts,	1830	.ds_src2_insts,
		1831	.dx10_clamp_and_ieee_mode,
1567	.extended_image_insts,	1832	.extended_image_insts,
		1833	.formatted_mubuf_insts,
1568	.fp64,	1834	.fp64,
1569	.gds,	1835	.gds,
1570	.gfx7_gfx8_gfx9_insts,	1836	.gfx7_gfx8_gfx9_insts,
1571	.gws,	1837	.gws,
1572	.image_insts,	1838	.image_insts,
		1839	.instcachelinesize64,
1573	.lerp_inst,	1840	.lerp_inst,
1574	.mad_mac_f32_insts,	1841	.mad_mac_f32_insts,
1575	.mimg_r128,	1842	.mimg_r128,
1576	.movrel,	1843	.movrel,
		1844	.mqsad_insts,
		1845	.mqsad_pk_insts,
		1846	.msad_insts,
		1847	.mtbuf_insts,
1577	.qsad_insts,	1848	.qsad_insts,
1578	.s_memtime_inst,	1849	.s_memtime_inst,
1579	.sad_insts,	1850	.sad_insts,
...	@@ -1613,6 +1884,11 @@ pub const all_features = blk: {	...	@@ -1613,6 +1884,11 @@ pub const all_features = blk: {
1613	.description = "Enable SI Machine Scheduler",	1884	.description = "Enable SI Machine Scheduler",
1614	.dependencies = featureSet(&[_]Feature{}),	1885	.dependencies = featureSet(&[_]Feature{}),
1615	};	1886	};
		1887	result[@backingInt(Feature.smem_prefetch_insts)] = .{
		1888	.llvm_name = "smem-prefetch-insts",
		1889	.description = "Has s_prefetch_inst, s_prefetch_inst_pc_rel, s_prefetch_data and s_prefetch_data_pc_rel instructions",
		1890	.dependencies = featureSet(&[_]Feature{}),
		1891	};
1616	result[@backingInt(Feature.smem_to_vector_write_hazard)] = .{	1892	result[@backingInt(Feature.smem_to_vector_write_hazard)] = .{
1617	.llvm_name = "smem-to-vector-write-hazard",	1893	.llvm_name = "smem-to-vector-write-hazard",
1618	.description = "s_load_dword followed by v_cmp page faults",	1894	.description = "s_load_dword followed by v_cmp page faults",
...	@@ -1629,16 +1905,22 @@ pub const all_features = blk: {	...	@@ -1629,16 +1905,22 @@ pub const all_features = blk: {
1629	.cvt_pknorm_vop2_insts,	1905	.cvt_pknorm_vop2_insts,
1630	.default_component_zero,	1906	.default_component_zero,
1631	.ds_src2_insts,	1907	.ds_src2_insts,
		1908	.dx10_clamp_and_ieee_mode,
1632	.extended_image_insts,	1909	.extended_image_insts,
		1910	.formatted_mubuf_insts,
1633	.fp64,	1911	.fp64,
1634	.gds,	1912	.gds,
1635	.gws,	1913	.gws,
1636	.image_insts,	1914	.image_insts,
		1915	.instcachelinesize64,
1637	.ldsbankcount32,	1916	.ldsbankcount32,
1638	.lerp_inst,	1917	.lerp_inst,
1639	.mad_mac_f32_insts,	1918	.mad_mac_f32_insts,
1640	.mimg_r128,	1919	.mimg_r128,
1641	.movrel,	1920	.movrel,
		1921	.mqsad_pk_insts,
		1922	.msad_insts,
		1923	.mtbuf_insts,
1642	.s_memtime_inst,	1924	.s_memtime_inst,
1643	.sad_insts,	1925	.sad_insts,
1644	.trig_reduced_range,	1926	.trig_reduced_range,
...	@@ -1656,6 +1938,16 @@ pub const all_features = blk: {	...	@@ -1656,6 +1938,16 @@ pub const all_features = blk: {
1656	.description = "Hardware supports SRAMECC",	1938	.description = "Hardware supports SRAMECC",
1657	.dependencies = featureSet(&[_]Feature{}),	1939	.dependencies = featureSet(&[_]Feature{}),
1658	};	1940	};
		1941	result[@backingInt(Feature.swmmac_gfx1200_insts)] = .{
		1942	.llvm_name = "swmmac-gfx1200-insts",
		1943	.description = "Has GFX1200 SWMMAC instructions",
		1944	.dependencies = featureSet(&[_]Feature{}),
		1945	};
		1946	result[@backingInt(Feature.swmmac_gfx1250_insts)] = .{
		1947	.llvm_name = "swmmac-gfx1250-insts",
		1948	.description = "Has GFX1250 SWMMAC instructions",
		1949	.dependencies = featureSet(&[_]Feature{}),
		1950	};
1659	result[@backingInt(Feature.tanh_insts)] = .{	1951	result[@backingInt(Feature.tanh_insts)] = .{
1660	.llvm_name = "tanh-insts",	1952	.llvm_name = "tanh-insts",
1661	.description = "Has v_tanh_f32/f16 instructions",	1953	.description = "Has v_tanh_f32/f16 instructions",
...	@@ -1666,9 +1958,14 @@ pub const all_features = blk: {	...	@@ -1666,9 +1958,14 @@ pub const all_features = blk: {
1666	.description = "Has v_perm_pk16* instructions",	1958	.description = "Has v_perm_pk16* instructions",
1667	.dependencies = featureSet(&[_]Feature{}),	1959	.dependencies = featureSet(&[_]Feature{}),
1668	};	1960	};
1669	result[@backingInt(Feature.tgsplit)] = .{	1961	result[@backingInt(Feature.tgsplit_support)] = .{
1670	.llvm_name = "tgsplit",	1962	.llvm_name = "tgsplit-support",
1671	.description = "Enable threadgroup split execution",	1963	.description = "Hardware support for threadgroup split execution mode",
		1964	.dependencies = featureSet(&[_]Feature{}),
		1965	};
		1966	result[@backingInt(Feature.trans_coexecution_hazard)] = .{
		1967	.llvm_name = "trans-coexecution-hazard",
		1968	.description = "Hazard when TRANS co-executes with other VALU instruction",
1672	.dependencies = featureSet(&[_]Feature{}),	1969	.dependencies = featureSet(&[_]Feature{}),
1673	};	1970	};
1674	result[@backingInt(Feature.transpose_load_f4f6_insts)] = .{	1971	result[@backingInt(Feature.transpose_load_f4f6_insts)] = .{
...	@@ -1721,11 +2018,26 @@ pub const all_features = blk: {	...	@@ -1721,11 +2018,26 @@ pub const all_features = blk: {
1721	.description = "Force using DS instruction immediate offsets on SI",	2018	.description = "Force using DS instruction immediate offsets on SI",
1722	.dependencies = featureSet(&[_]Feature{}),	2019	.dependencies = featureSet(&[_]Feature{}),
1723	};	2020	};
		2021	result[@backingInt(Feature.use_add_pc64_inst)] = .{
		2022	.llvm_name = "use-add-pc64-inst",
		2023	.description = "Use s_add_pc_i64 instruction.",
		2024	.dependencies = featureSet(&[_]Feature{}),
		2025	};
1724	result[@backingInt(Feature.user_sgpr_init16_bug)] = .{	2026	result[@backingInt(Feature.user_sgpr_init16_bug)] = .{
1725	.llvm_name = "user-sgpr-init16-bug",	2027	.llvm_name = "user-sgpr-init16-bug",
1726	.description = "Bug requiring at least 16 user+system SGPRs to be enabled",	2028	.description = "Bug requiring at least 16 user+system SGPRs to be enabled",
1727	.dependencies = featureSet(&[_]Feature{}),	2029	.dependencies = featureSet(&[_]Feature{}),
1728	};	2030	};
		2031	result[@backingInt(Feature.v_mov_b64_inst)] = .{
		2032	.llvm_name = "v-mov-b64-inst",
		2033	.description = "Has v_mov_b64 instruction",
		2034	.dependencies = featureSet(&[_]Feature{}),
		2035	};
		2036	result[@backingInt(Feature.v_mul_u64_inst)] = .{
		2037	.llvm_name = "v-mul-u64-inst",
		2038	.description = "Has v_mul_u64 instruction.",
		2039	.dependencies = featureSet(&[_]Feature{}),
		2040	};
1729	result[@backingInt(Feature.valu_trans_use_hazard)] = .{	2041	result[@backingInt(Feature.valu_trans_use_hazard)] = .{
1730	.llvm_name = "valu-trans-use-hazard",	2042	.llvm_name = "valu-trans-use-hazard",
1731	.description = "Hazard when TRANS instructions are closely followed by a use of the result",	2043	.description = "Hazard when TRANS instructions are closely followed by a use of the result",
...	@@ -1758,7 +2070,7 @@ pub const all_features = blk: {	...	@@ -1758,7 +2070,7 @@ pub const all_features = blk: {
1758	};	2070	};
1759	result[@backingInt(Feature.vmem_to_lds_load_insts)] = .{	2071	result[@backingInt(Feature.vmem_to_lds_load_insts)] = .{
1760	.llvm_name = "vmem-to-lds-load-insts",	2072	.llvm_name = "vmem-to-lds-load-insts",
1761	.description = "The platform has memory to lds instructions (global_load w/lds bit set, buffer_load w/lds bit set or global_load_lds. This does not include scratch_load_lds.",	2073	.description = "The platform has memory to lds instructions (global_load w/lds bit set, buffer_loadw/lds bit set or global_load_lds. This does not include scratch_load_lds.",
1762	.dependencies = featureSet(&[_]Feature{}),	2074	.dependencies = featureSet(&[_]Feature{}),
1763	};	2075	};
1764	result[@backingInt(Feature.vmem_to_scalar_write_hazard)] = .{	2076	result[@backingInt(Feature.vmem_to_scalar_write_hazard)] = .{
...	@@ -1782,10 +2094,14 @@ pub const all_features = blk: {	...	@@ -1782,10 +2094,14 @@ pub const all_features = blk: {
1782	.cvt_pknorm_vop2_insts,	2094	.cvt_pknorm_vop2_insts,
1783	.default_component_zero,	2095	.default_component_zero,
1784	.dpp,	2096	.dpp,
		2097	.dpp_row_bcast,
		2098	.dpp_wavefront_shifts,
1785	.ds_src2_insts,	2099	.ds_src2_insts,
		2100	.dx10_clamp_and_ieee_mode,
1786	.extended_image_insts,	2101	.extended_image_insts,
1787	.fast_denormal_f32,	2102	.fast_denormal_f32,
1788	.flat_address_space,	2103	.flat_address_space,
		2104	.formatted_mubuf_insts,
1789	.fp64,	2105	.fp64,
1790	.gcn3_encoding,	2106	.gcn3_encoding,
1791	.gds,	2107	.gds,
...	@@ -1793,12 +2109,17 @@ pub const all_features = blk: {	...	@@ -1793,12 +2109,17 @@ pub const all_features = blk: {
1793	.gfx8_insts,	2109	.gfx8_insts,
1794	.gws,	2110	.gws,
1795	.image_insts,	2111	.image_insts,
		2112	.instcachelinesize64,
1796	.int_clamp_insts,	2113	.int_clamp_insts,
1797	.inv_2pi_inline_imm,	2114	.inv_2pi_inline_imm,
1798	.lerp_inst,	2115	.lerp_inst,
1799	.mad_mac_f32_insts,	2116	.mad_mac_f32_insts,
1800	.mimg_r128,	2117	.mimg_r128,
1801	.movrel,	2118	.movrel,
		2119	.mqsad_insts,
		2120	.mqsad_pk_insts,
		2121	.msad_insts,
		2122	.mtbuf_insts,
1802	.qsad_insts,	2123	.qsad_insts,
1803	.s_memrealtime,	2124	.s_memrealtime,
1804	.s_memtime_inst,	2125	.s_memtime_inst,
...	@@ -1824,6 +2145,11 @@ pub const all_features = blk: {	...	@@ -1824,6 +2145,11 @@ pub const all_features = blk: {
1824	.description = "Has VOP3P packed instructions",	2145	.description = "Has VOP3P packed instructions",
1825	.dependencies = featureSet(&[_]Feature{}),	2146	.dependencies = featureSet(&[_]Feature{}),
1826	};	2147	};
		2148	result[@backingInt(Feature.vop3px2_increments_va_vdst_twice)] = .{
		2149	.llvm_name = "vop3px2-increments-va-vdst-twice",
		2150	.description = "VOP3PX2 encoded instructions increment the VaVdst counter twice",
		2151	.dependencies = featureSet(&[_]Feature{}),
		2152	};
1827	result[@backingInt(Feature.vopd)] = .{	2153	result[@backingInt(Feature.vopd)] = .{
1828	.llvm_name = "vopd",	2154	.llvm_name = "vopd",
1829	.description = "Has VOPD dual issue wave32 instructions",	2155	.description = "Has VOPD dual issue wave32 instructions",
...	@@ -1859,6 +2185,21 @@ pub const all_features = blk: {	...	@@ -1859,6 +2185,21 @@ pub const all_features = blk: {
1859	.description = "The number of threads per wavefront",	2185	.description = "The number of threads per wavefront",
1860	.dependencies = featureSet(&[_]Feature{}),	2186	.dependencies = featureSet(&[_]Feature{}),
1861	};	2187	};
		2188	result[@backingInt(Feature.wmma_128b_insts)] = .{
		2189	.llvm_name = "wmma-128b-insts",
		2190	.description = "Has WMMA instructions where A and B matrices do not have duplicated data",
		2191	.dependencies = featureSet(&[_]Feature{}),
		2192	};
		2193	result[@backingInt(Feature.wmma_256b_insts)] = .{
		2194	.llvm_name = "wmma-256b-insts",
		2195	.description = "Has WMMA instructions where A and B matrices have duplicated data",
		2196	.dependencies = featureSet(&[_]Feature{}),
		2197	};
		2198	result[@backingInt(Feature.wmma_coexecution_hazards)] = .{
		2199	.llvm_name = "wmma-coexecution-hazards",
		2200	.description = "Hazards when WMMA co-executes with other WMMA/VALU instruction",
		2201	.dependencies = featureSet(&[_]Feature{}),
		2202	};
1862	result[@backingInt(Feature.xf32_insts)] = .{	2203	result[@backingInt(Feature.xf32_insts)] = .{
1863	.llvm_name = "xf32-insts",	2204	.llvm_name = "xf32-insts",
1864	.description = "Has instructions that support xf32 format, such as v_mfma_f32_16x16x8_xf32 and v_mfma_f32_32x32x4_xf32",	2205	.description = "Has instructions that support xf32 format, such as v_mfma_f32_16x16x8_xf32 and v_mfma_f32_32x32x4_xf32",
...	@@ -1867,7 +2208,16 @@ pub const all_features = blk: {	...	@@ -1867,7 +2208,16 @@ pub const all_features = blk: {
1867	result[@backingInt(Feature.xnack)] = .{	2208	result[@backingInt(Feature.xnack)] = .{
1868	.llvm_name = "xnack",	2209	.llvm_name = "xnack",
1869	.description = "Enable XNACK support",	2210	.description = "Enable XNACK support",
1870	.dependencies = featureSet(&[_]Feature{}),	2211	.dependencies = featureSet(&[_]Feature{
		2212	.xnack_support,
		2213	}),
		2214	};
		2215	result[@backingInt(Feature.xnack_on_off_modes)] = .{
		2216	.llvm_name = "xnack-on-off-modes",
		2217	.description = "Target supports XNACK on/off modes",
		2218	.dependencies = featureSet(&[_]Feature{
		2219	.xnack_support,
		2220	}),
1871	};	2221	};
1872	result[@backingInt(Feature.xnack_support)] = .{	2222	result[@backingInt(Feature.xnack_support)] = .{
1873	.llvm_name = "xnack-support",	2223	.llvm_name = "xnack-support",
...	@@ -1900,7 +2250,7 @@ pub const cpu = struct {	...	@@ -1900,7 +2250,7 @@ pub const cpu = struct {
1900	.ldsbankcount32,	2250	.ldsbankcount32,
1901	.unpacked_d16_vmem,	2251	.unpacked_d16_vmem,
1902	.volcanic_islands,	2252	.volcanic_islands,
1903	.xnack_support,	2253	.xnack_on_off_modes,
1904	}),	2254	}),
1905	};	2255	};
1906	pub const fiji: CpuModel = .{	2256	pub const fiji: CpuModel = .{
...	@@ -1951,7 +2301,7 @@ pub const cpu = struct {	...	@@ -1951,7 +2301,7 @@ pub const cpu = struct {
1951	.vcmpx_exec_war_hazard,	2301	.vcmpx_exec_war_hazard,
1952	.vcmpx_permlane_hazard,	2302	.vcmpx_permlane_hazard,
1953	.vmem_to_scalar_write_hazard,	2303	.vmem_to_scalar_write_hazard,
1954	.xnack_support,	2304	.xnack_on_off_modes,
1955	}),	2305	}),
1956	};	2306	};
1957	pub const gfx1011: CpuModel = .{	2307	pub const gfx1011: CpuModel = .{
...	@@ -1987,7 +2337,7 @@ pub const cpu = struct {	...	@@ -1987,7 +2337,7 @@ pub const cpu = struct {
1987	.vcmpx_exec_war_hazard,	2337	.vcmpx_exec_war_hazard,
1988	.vcmpx_permlane_hazard,	2338	.vcmpx_permlane_hazard,
1989	.vmem_to_scalar_write_hazard,	2339	.vmem_to_scalar_write_hazard,
1990	.xnack_support,	2340	.xnack_on_off_modes,
1991	}),	2341	}),
1992	};	2342	};
1993	pub const gfx1012: CpuModel = .{	2343	pub const gfx1012: CpuModel = .{
...	@@ -2023,7 +2373,7 @@ pub const cpu = struct {	...	@@ -2023,7 +2373,7 @@ pub const cpu = struct {
2023	.vcmpx_exec_war_hazard,	2373	.vcmpx_exec_war_hazard,
2024	.vcmpx_permlane_hazard,	2374	.vcmpx_permlane_hazard,
2025	.vmem_to_scalar_write_hazard,	2375	.vmem_to_scalar_write_hazard,
2026	.xnack_support,	2376	.xnack_on_off_modes,
2027	}),	2377	}),
2028	};	2378	};
2029	pub const gfx1013: CpuModel = .{	2379	pub const gfx1013: CpuModel = .{
...	@@ -2054,7 +2404,7 @@ pub const cpu = struct {	...	@@ -2054,7 +2404,7 @@ pub const cpu = struct {
2054	.vcmpx_exec_war_hazard,	2404	.vcmpx_exec_war_hazard,
2055	.vcmpx_permlane_hazard,	2405	.vcmpx_permlane_hazard,
2056	.vmem_to_scalar_write_hazard,	2406	.vmem_to_scalar_write_hazard,
2057	.xnack_support,	2407	.xnack_on_off_modes,
2058	}),	2408	}),
2059	};	2409	};
2060	pub const gfx1030: CpuModel = .{	2410	pub const gfx1030: CpuModel = .{
...	@@ -2232,7 +2582,7 @@ pub const cpu = struct {	...	@@ -2232,7 +2582,7 @@ pub const cpu = struct {
2232	.vcmpx_exec_war_hazard,	2582	.vcmpx_exec_war_hazard,
2233	.vcmpx_permlane_hazard,	2583	.vcmpx_permlane_hazard,
2234	.vmem_to_scalar_write_hazard,	2584	.vmem_to_scalar_write_hazard,
2235	.xnack_support,	2585	.xnack_on_off_modes,
2236	}),	2586	}),
2237	};	2587	};
2238	pub const gfx10_3_generic: CpuModel = .{	2588	pub const gfx10_3_generic: CpuModel = .{
...	@@ -2261,7 +2611,7 @@ pub const cpu = struct {	...	@@ -2261,7 +2611,7 @@ pub const cpu = struct {
2261	.name = "gfx1100",	2611	.name = "gfx1100",
2262	.llvm_name = "gfx1100",	2612	.llvm_name = "gfx1100",
2263	.features = featureSet(&[_]Feature{	2613	.features = featureSet(&[_]Feature{
2264	.allocate1_5xvgprs,	2614	.@"1536_physical_vgprs",
2265	.architected_flat_scratch,	2615	.architected_flat_scratch,
2266	.atomic_fadd_no_rtn_insts,	2616	.atomic_fadd_no_rtn_insts,
2267	.atomic_fadd_rtn_insts,	2617	.atomic_fadd_rtn_insts,
...	@@ -2274,6 +2624,7 @@ pub const cpu = struct {	...	@@ -2274,6 +2624,7 @@ pub const cpu = struct {
2274	.dot7_insts,	2624	.dot7_insts,
2275	.dot8_insts,	2625	.dot8_insts,
2276	.dot9_insts,	2626	.dot9_insts,
		2627	.dx10_clamp_and_ieee_mode,
2277	.flat_atomic_fadd_f32_inst,	2628	.flat_atomic_fadd_f32_inst,
2278	.gfx11,	2629	.gfx11,
2279	.image_insts,	2630	.image_insts,
...	@@ -2290,13 +2641,14 @@ pub const cpu = struct {	...	@@ -2290,13 +2641,14 @@ pub const cpu = struct {
2290	.user_sgpr_init16_bug,	2641	.user_sgpr_init16_bug,
2291	.valu_trans_use_hazard,	2642	.valu_trans_use_hazard,
2292	.vcmpx_permlane_hazard,	2643	.vcmpx_permlane_hazard,
		2644	.wmma_256b_insts,
2293	}),	2645	}),
2294	};	2646	};
2295	pub const gfx1101: CpuModel = .{	2647	pub const gfx1101: CpuModel = .{
2296	.name = "gfx1101",	2648	.name = "gfx1101",
2297	.llvm_name = "gfx1101",	2649	.llvm_name = "gfx1101",
2298	.features = featureSet(&[_]Feature{	2650	.features = featureSet(&[_]Feature{
2299	.allocate1_5xvgprs,	2651	.@"1536_physical_vgprs",
2300	.architected_flat_scratch,	2652	.architected_flat_scratch,
2301	.atomic_fadd_no_rtn_insts,	2653	.atomic_fadd_no_rtn_insts,
2302	.atomic_fadd_rtn_insts,	2654	.atomic_fadd_rtn_insts,
...	@@ -2309,6 +2661,7 @@ pub const cpu = struct {	...	@@ -2309,6 +2661,7 @@ pub const cpu = struct {
2309	.dot7_insts,	2661	.dot7_insts,
2310	.dot8_insts,	2662	.dot8_insts,
2311	.dot9_insts,	2663	.dot9_insts,
		2664	.dx10_clamp_and_ieee_mode,
2312	.flat_atomic_fadd_f32_inst,	2665	.flat_atomic_fadd_f32_inst,
2313	.gfx11,	2666	.gfx11,
2314	.image_insts,	2667	.image_insts,
...	@@ -2324,6 +2677,7 @@ pub const cpu = struct {	...	@@ -2324,6 +2677,7 @@ pub const cpu = struct {
2324	.shader_cycles_register,	2677	.shader_cycles_register,
2325	.valu_trans_use_hazard,	2678	.valu_trans_use_hazard,
2326	.vcmpx_permlane_hazard,	2679	.vcmpx_permlane_hazard,
		2680	.wmma_256b_insts,
2327	}),	2681	}),
2328	};	2682	};
2329	pub const gfx1102: CpuModel = .{	2683	pub const gfx1102: CpuModel = .{
...	@@ -2342,6 +2696,7 @@ pub const cpu = struct {	...	@@ -2342,6 +2696,7 @@ pub const cpu = struct {
2342	.dot7_insts,	2696	.dot7_insts,
2343	.dot8_insts,	2697	.dot8_insts,
2344	.dot9_insts,	2698	.dot9_insts,
		2699	.dx10_clamp_and_ieee_mode,
2345	.flat_atomic_fadd_f32_inst,	2700	.flat_atomic_fadd_f32_inst,
2346	.gfx11,	2701	.gfx11,
2347	.image_insts,	2702	.image_insts,
...	@@ -2358,6 +2713,7 @@ pub const cpu = struct {	...	@@ -2358,6 +2713,7 @@ pub const cpu = struct {
2358	.user_sgpr_init16_bug,	2713	.user_sgpr_init16_bug,
2359	.valu_trans_use_hazard,	2714	.valu_trans_use_hazard,
2360	.vcmpx_permlane_hazard,	2715	.vcmpx_permlane_hazard,
		2716	.wmma_256b_insts,
2361	}),	2717	}),
2362	};	2718	};
2363	pub const gfx1103: CpuModel = .{	2719	pub const gfx1103: CpuModel = .{
...	@@ -2376,6 +2732,7 @@ pub const cpu = struct {	...	@@ -2376,6 +2732,7 @@ pub const cpu = struct {
2376	.dot7_insts,	2732	.dot7_insts,
2377	.dot8_insts,	2733	.dot8_insts,
2378	.dot9_insts,	2734	.dot9_insts,
		2735	.dx10_clamp_and_ieee_mode,
2379	.flat_atomic_fadd_f32_inst,	2736	.flat_atomic_fadd_f32_inst,
2380	.gfx11,	2737	.gfx11,
2381	.image_insts,	2738	.image_insts,
...	@@ -2391,6 +2748,7 @@ pub const cpu = struct {	...	@@ -2391,6 +2748,7 @@ pub const cpu = struct {
2391	.shader_cycles_register,	2748	.shader_cycles_register,
2392	.valu_trans_use_hazard,	2749	.valu_trans_use_hazard,
2393	.vcmpx_permlane_hazard,	2750	.vcmpx_permlane_hazard,
		2751	.wmma_256b_insts,
2394	}),	2752	}),
2395	};	2753	};
2396	pub const gfx1150: CpuModel = .{	2754	pub const gfx1150: CpuModel = .{
...	@@ -2410,6 +2768,7 @@ pub const cpu = struct {	...	@@ -2410,6 +2768,7 @@ pub const cpu = struct {
2410	.dot8_insts,	2768	.dot8_insts,
2411	.dot9_insts,	2769	.dot9_insts,
2412	.dpp_src1_sgpr,	2770	.dpp_src1_sgpr,
		2771	.dx10_clamp_and_ieee_mode,
2413	.flat_atomic_fadd_f32_inst,	2772	.flat_atomic_fadd_f32_inst,
2414	.gfx11,	2773	.gfx11,
2415	.image_insts,	2774	.image_insts,
...	@@ -2424,13 +2783,14 @@ pub const cpu = struct {	...	@@ -2424,13 +2783,14 @@ pub const cpu = struct {
2424	.salu_float,	2783	.salu_float,
2425	.shader_cycles_register,	2784	.shader_cycles_register,
2426	.vcmpx_permlane_hazard,	2785	.vcmpx_permlane_hazard,
		2786	.wmma_256b_insts,
2427	}),	2787	}),
2428	};	2788	};
2429	pub const gfx1151: CpuModel = .{	2789	pub const gfx1151: CpuModel = .{
2430	.name = "gfx1151",	2790	.name = "gfx1151",
2431	.llvm_name = "gfx1151",	2791	.llvm_name = "gfx1151",
2432	.features = featureSet(&[_]Feature{	2792	.features = featureSet(&[_]Feature{
2433	.allocate1_5xvgprs,	2793	.@"1536_physical_vgprs",
2434	.architected_flat_scratch,	2794	.architected_flat_scratch,
2435	.atomic_fadd_no_rtn_insts,	2795	.atomic_fadd_no_rtn_insts,
2436	.atomic_fadd_rtn_insts,	2796	.atomic_fadd_rtn_insts,
...	@@ -2444,6 +2804,7 @@ pub const cpu = struct {	...	@@ -2444,6 +2804,7 @@ pub const cpu = struct {
2444	.dot8_insts,	2804	.dot8_insts,
2445	.dot9_insts,	2805	.dot9_insts,
2446	.dpp_src1_sgpr,	2806	.dpp_src1_sgpr,
		2807	.dx10_clamp_and_ieee_mode,
2447	.flat_atomic_fadd_f32_inst,	2808	.flat_atomic_fadd_f32_inst,
2448	.gfx11,	2809	.gfx11,
2449	.image_insts,	2810	.image_insts,
...	@@ -2458,6 +2819,7 @@ pub const cpu = struct {	...	@@ -2458,6 +2819,7 @@ pub const cpu = struct {
2458	.salu_float,	2819	.salu_float,
2459	.shader_cycles_register,	2820	.shader_cycles_register,
2460	.vcmpx_permlane_hazard,	2821	.vcmpx_permlane_hazard,
		2822	.wmma_256b_insts,
2461	}),	2823	}),
2462	};	2824	};
2463	pub const gfx1152: CpuModel = .{	2825	pub const gfx1152: CpuModel = .{
...	@@ -2477,6 +2839,7 @@ pub const cpu = struct {	...	@@ -2477,6 +2839,7 @@ pub const cpu = struct {
2477	.dot8_insts,	2839	.dot8_insts,
2478	.dot9_insts,	2840	.dot9_insts,
2479	.dpp_src1_sgpr,	2841	.dpp_src1_sgpr,
		2842	.dx10_clamp_and_ieee_mode,
2480	.flat_atomic_fadd_f32_inst,	2843	.flat_atomic_fadd_f32_inst,
2481	.gfx11,	2844	.gfx11,
2482	.image_insts,	2845	.image_insts,
...	@@ -2491,6 +2854,7 @@ pub const cpu = struct {	...	@@ -2491,6 +2854,7 @@ pub const cpu = struct {
2491	.salu_float,	2854	.salu_float,
2492	.shader_cycles_register,	2855	.shader_cycles_register,
2493	.vcmpx_permlane_hazard,	2856	.vcmpx_permlane_hazard,
		2857	.wmma_256b_insts,
2494	}),	2858	}),
2495	};	2859	};
2496	pub const gfx1153: CpuModel = .{	2860	pub const gfx1153: CpuModel = .{
...	@@ -2510,6 +2874,7 @@ pub const cpu = struct {	...	@@ -2510,6 +2874,7 @@ pub const cpu = struct {
2510	.dot8_insts,	2874	.dot8_insts,
2511	.dot9_insts,	2875	.dot9_insts,
2512	.dpp_src1_sgpr,	2876	.dpp_src1_sgpr,
		2877	.dx10_clamp_and_ieee_mode,
2513	.flat_atomic_fadd_f32_inst,	2878	.flat_atomic_fadd_f32_inst,
2514	.gfx11,	2879	.gfx11,
2515	.image_insts,	2880	.image_insts,
...	@@ -2523,11 +2888,12 @@ pub const cpu = struct {	...	@@ -2523,11 +2888,12 @@ pub const cpu = struct {
2523	.salu_float,	2888	.salu_float,
2524	.shader_cycles_register,	2889	.shader_cycles_register,
2525	.vcmpx_permlane_hazard,	2890	.vcmpx_permlane_hazard,
		2891	.wmma_256b_insts,
2526	}),	2892	}),
2527	};	2893	};
2528	pub const gfx11_generic: CpuModel = .{	2894	pub const gfx1154: CpuModel = .{
2529	.name = "gfx11_generic",	2895	.name = "gfx1154",
2530	.llvm_name = "gfx11-generic",	2896	.llvm_name = "gfx1154",
2531	.features = featureSet(&[_]Feature{	2897	.features = featureSet(&[_]Feature{
2532	.architected_flat_scratch,	2898	.architected_flat_scratch,
2533	.atomic_fadd_no_rtn_insts,	2899	.atomic_fadd_no_rtn_insts,
...	@@ -2541,47 +2907,32 @@ pub const cpu = struct {	...	@@ -2541,47 +2907,32 @@ pub const cpu = struct {
2541	.dot7_insts,	2907	.dot7_insts,
2542	.dot8_insts,	2908	.dot8_insts,
2543	.dot9_insts,	2909	.dot9_insts,
		2910	.dpp_src1_sgpr,
		2911	.dx10_clamp_and_ieee_mode,
2544	.flat_atomic_fadd_f32_inst,	2912	.flat_atomic_fadd_f32_inst,
2545	.gfx11,	2913	.gfx11,
2546	.image_insts,	2914	.image_insts,
2547	.ldsbankcount32,	2915	.ldsbankcount32,
2548	.mad_intra_fwd_bug,
2549	.memory_atomic_fadd_f32_denormal_support,	2916	.memory_atomic_fadd_f32_denormal_support,
2550	.msaa_load_dst_sel_bug,
2551	.nsa_encoding,	2917	.nsa_encoding,
2552	.packed_tid,	2918	.packed_tid,
2553	.partial_nsa_encoding,	2919	.partial_nsa_encoding,
2554	.priv_enabled_trap2_nop_bug,
2555	.real_true16,	2920	.real_true16,
2556	.required_export_priority,	2921	.required_export_priority,
2557	.requires_cov6,	2922	.salu_float,
2558	.shader_cycles_register,	2923	.shader_cycles_register,
2559	.user_sgpr_init16_bug,
2560	.valu_trans_use_hazard,
2561	.vcmpx_permlane_hazard,	2924	.vcmpx_permlane_hazard,
		2925	.wmma_256b_insts,
2562	}),	2926	}),
2563	};	2927	};
2564	pub const gfx1200: CpuModel = .{	2928	pub const gfx1170: CpuModel = .{
2565	.name = "gfx1200",	2929	.name = "gfx1170",
2566	.llvm_name = "gfx1200",	2930	.llvm_name = "gfx1170",
2567	.features = featureSet(&[_]Feature{	2931	.features = featureSet(&[_]Feature{
2568	.addressablelocalmemorysize65536,
2569	.allocate1_5xvgprs,
2570	.architected_flat_scratch,	2932	.architected_flat_scratch,
2571	.architected_sgprs,
2572	.atomic_buffer_global_pk_add_f16_insts,
2573	.atomic_buffer_pk_add_bf16_inst,
2574	.atomic_ds_pk_add_16_insts,
2575	.atomic_fadd_no_rtn_insts,	2933	.atomic_fadd_no_rtn_insts,
2576	.atomic_fadd_rtn_insts,	2934	.atomic_fadd_rtn_insts,
2577	.atomic_flat_pk_add_16_insts,
2578	.atomic_global_pk_add_bf16_inst,
2579	.back_off_barrier,	2935	.back_off_barrier,
2580	.bvh_dual_bvh_8_insts,
2581	.cube_insts,
2582	.cvt_norm_insts,
2583	.cvt_pknorm_vop2_insts,
2584	.cvt_pknorm_vop3_insts,
2585	.d16_write_vgpr32,	2936	.d16_write_vgpr32,
2586	.dl_insts,	2937	.dl_insts,
2587	.dot10_insts,	2938	.dot10_insts,
...	@@ -2591,49 +2942,36 @@ pub const cpu = struct {	...	@@ -2591,49 +2942,36 @@ pub const cpu = struct {
2591	.dot8_insts,	2942	.dot8_insts,
2592	.dot9_insts,	2943	.dot9_insts,
2593	.dpp_src1_sgpr,	2944	.dpp_src1_sgpr,
2594	.extended_image_insts,
2595	.flat_atomic_fadd_f32_inst,	2945	.flat_atomic_fadd_f32_inst,
2596	.fp8_conversion_insts,	2946	.fp8_conversion_insts,
2597	.gfx12,	2947	.gfx11,
		2948	.gfx11_7_insts,
		2949	.ieee_minimum_maximum_insts,
2598	.image_insts,	2950	.image_insts,
2599	.ldsbankcount32,	2951	.ldsbankcount32,
2600	.lerp_inst,
2601	.memory_atomic_fadd_f32_denormal_support,	2952	.memory_atomic_fadd_f32_denormal_support,
		2953	.minimum3_maximum3_f16,
		2954	.minimum3_maximum3_f32,
		2955	.no_f16_pseudo_scalar_trans_inline_constants,
2602	.nsa_encoding,	2956	.nsa_encoding,
2603	.packed_tid,	2957	.packed_tid,
2604	.partial_nsa_encoding,	2958	.partial_nsa_encoding,
2605	.pseudo_scalar_trans,	2959	.real_true16,
2606	.qsad_insts,
2607	.restricted_soffset,
2608	.sad_insts,
2609	.salu_float,	2960	.salu_float,
2610	.scalar_dwordx3_loads,	2961	.shader_cycles_register,
2611	.shader_cycles_hi_lo_registers,	2962	.swmmac_gfx1200_insts,
2612	.vcmpx_permlane_hazard,	2963	.vcmpx_permlane_hazard,
2613	.waits_before_system_scope_stores,	2964	.wmma_128b_insts,
2614	}),	2965	}),
2615	};	2966	};
2616	pub const gfx1201: CpuModel = .{	2967	pub const gfx1171: CpuModel = .{
2617	.name = "gfx1201",	2968	.name = "gfx1171",
2618	.llvm_name = "gfx1201",	2969	.llvm_name = "gfx1171",
2619	.features = featureSet(&[_]Feature{	2970	.features = featureSet(&[_]Feature{
2620	.addressablelocalmemorysize65536,
2621	.allocate1_5xvgprs,
2622	.architected_flat_scratch,	2971	.architected_flat_scratch,
2623	.architected_sgprs,
2624	.atomic_buffer_global_pk_add_f16_insts,
2625	.atomic_buffer_pk_add_bf16_inst,
2626	.atomic_ds_pk_add_16_insts,
2627	.atomic_fadd_no_rtn_insts,	2972	.atomic_fadd_no_rtn_insts,
2628	.atomic_fadd_rtn_insts,	2973	.atomic_fadd_rtn_insts,
2629	.atomic_flat_pk_add_16_insts,
2630	.atomic_global_pk_add_bf16_inst,
2631	.back_off_barrier,	2974	.back_off_barrier,
2632	.bvh_dual_bvh_8_insts,
2633	.cube_insts,
2634	.cvt_norm_insts,
2635	.cvt_pknorm_vop2_insts,
2636	.cvt_pknorm_vop3_insts,
2637	.d16_write_vgpr32,	2975	.d16_write_vgpr32,
2638	.dl_insts,	2976	.dl_insts,
2639	.dot10_insts,	2977	.dot10_insts,
...	@@ -2643,61 +2981,304 @@ pub const cpu = struct {	...	@@ -2643,61 +2981,304 @@ pub const cpu = struct {
2643	.dot8_insts,	2981	.dot8_insts,
2644	.dot9_insts,	2982	.dot9_insts,
2645	.dpp_src1_sgpr,	2983	.dpp_src1_sgpr,
2646	.extended_image_insts,
2647	.flat_atomic_fadd_f32_inst,	2984	.flat_atomic_fadd_f32_inst,
2648	.fp8_conversion_insts,	2985	.fp8_conversion_insts,
2649	.gfx12,	2986	.gfx11,
		2987	.gfx11_7_insts,
		2988	.ieee_minimum_maximum_insts,
2650	.image_insts,	2989	.image_insts,
2651	.ldsbankcount32,	2990	.ldsbankcount32,
2652	.lerp_inst,
2653	.memory_atomic_fadd_f32_denormal_support,	2991	.memory_atomic_fadd_f32_denormal_support,
		2992	.minimum3_maximum3_f16,
		2993	.minimum3_maximum3_f32,
		2994	.no_f16_pseudo_scalar_trans_inline_constants,
2654	.nsa_encoding,	2995	.nsa_encoding,
2655	.packed_tid,	2996	.packed_tid,
2656	.partial_nsa_encoding,	2997	.partial_nsa_encoding,
2657	.pseudo_scalar_trans,	2998	.real_true16,
2658	.qsad_insts,
2659	.restricted_soffset,
2660	.sad_insts,
2661	.salu_float,	2999	.salu_float,
2662	.scalar_dwordx3_loads,	3000	.shader_cycles_register,
2663	.shader_cycles_hi_lo_registers,	3001	.swmmac_gfx1200_insts,
2664	.vcmpx_permlane_hazard,	3002	.vcmpx_permlane_hazard,
2665	.waits_before_system_scope_stores,	3003	.wmma_128b_insts,
2666	}),	3004	}),
2667	};	3005	};
2668	pub const gfx1250: CpuModel = .{	3006	pub const gfx1172: CpuModel = .{
2669	.name = "gfx1250",	3007	.name = "gfx1172",
2670	.llvm_name = "gfx1250",	3008	.llvm_name = "gfx1172",
2671	.features = featureSet(&[_]Feature{	3009	.features = featureSet(&[_]Feature{
2672	.@"1024_addressable_vgprs",
2673	.@"45_bit_num_records_buffer_resource",
2674	.@"64_bit_literals",
2675	.add_min_max_insts,
2676	.add_sub_u64_insts,
2677	.addressablelocalmemorysize327680,
2678	.architected_flat_scratch,	3010	.architected_flat_scratch,
2679	.architected_sgprs,
2680	.ashr_pk_insts,
2681	.atomic_buffer_global_pk_add_f16_insts,
2682	.atomic_buffer_pk_add_bf16_inst,
2683	.atomic_ds_pk_add_16_insts,
2684	.atomic_fadd_no_rtn_insts,	3011	.atomic_fadd_no_rtn_insts,
2685	.atomic_fadd_rtn_insts,	3012	.atomic_fadd_rtn_insts,
2686	.atomic_flat_pk_add_16_insts,	3013	.back_off_barrier,
2687	.atomic_fmin_fmax_flat_f64,	3014	.d16_write_vgpr32,
2688	.atomic_fmin_fmax_global_f64,	3015	.dl_insts,
2689	.atomic_global_pk_add_bf16_inst,	3016	.dot10_insts,
2690	.bf16_cvt_insts,	3017	.dot11_insts,
2691	.bf16_pk_insts,	3018	.dot12_insts,
2692	.bf16_trans_insts,	3019	.dot7_insts,
2693	.bitop3_insts,	3020	.dot8_insts,
2694	.clusters,	3021	.dot9_insts,
2695	.cube_insts,	3022	.dpp_src1_sgpr,
2696	.cumode,	3023	.flat_atomic_fadd_f32_inst,
2697	.cvt_norm_insts,	3024	.fp8_conversion_insts,
2698	.cvt_pk_f16_f32_inst,	3025	.gfx11,
2699	.cvt_pknorm_vop2_insts,	3026	.gfx11_7_insts,
2700	.cvt_pknorm_vop3_insts,	3027	.ieee_minimum_maximum_insts,
		3028	.image_insts,
		3029	.ldsbankcount32,
		3030	.memory_atomic_fadd_f32_denormal_support,
		3031	.minimum3_maximum3_f16,
		3032	.minimum3_maximum3_f32,
		3033	.no_f16_pseudo_scalar_trans_inline_constants,
		3034	.nsa_encoding,
		3035	.packed_tid,
		3036	.partial_nsa_encoding,
		3037	.real_true16,
		3038	.salu_float,
		3039	.shader_cycles_register,
		3040	.swmmac_gfx1200_insts,
		3041	.vcmpx_permlane_hazard,
		3042	.wmma_128b_insts,
		3043	}),
		3044	};
		3045	pub const gfx11_7_generic: CpuModel = .{
		3046	.name = "gfx11_7_generic",
		3047	.llvm_name = "gfx11-7-generic",
		3048	.features = featureSet(&[_]Feature{
		3049	.architected_flat_scratch,
		3050	.atomic_fadd_no_rtn_insts,
		3051	.atomic_fadd_rtn_insts,
		3052	.back_off_barrier,
		3053	.d16_write_vgpr32,
		3054	.dl_insts,
		3055	.dot10_insts,
		3056	.dot11_insts,
		3057	.dot12_insts,
		3058	.dot7_insts,
		3059	.dot8_insts,
		3060	.dot9_insts,
		3061	.dpp_src1_sgpr,
		3062	.flat_atomic_fadd_f32_inst,
		3063	.fp8_conversion_insts,
		3064	.gfx11,
		3065	.gfx11_7_insts,
		3066	.ieee_minimum_maximum_insts,
		3067	.image_insts,
		3068	.ldsbankcount32,
		3069	.memory_atomic_fadd_f32_denormal_support,
		3070	.minimum3_maximum3_f16,
		3071	.minimum3_maximum3_f32,
		3072	.no_f16_pseudo_scalar_trans_inline_constants,
		3073	.nsa_encoding,
		3074	.packed_tid,
		3075	.partial_nsa_encoding,
		3076	.real_true16,
		3077	.requires_cov6,
		3078	.salu_float,
		3079	.shader_cycles_register,
		3080	.swmmac_gfx1200_insts,
		3081	.vcmpx_permlane_hazard,
		3082	.wmma_128b_insts,
		3083	}),
		3084	};
		3085	pub const gfx11_generic: CpuModel = .{
		3086	.name = "gfx11_generic",
		3087	.llvm_name = "gfx11-generic",
		3088	.features = featureSet(&[_]Feature{
		3089	.architected_flat_scratch,
		3090	.atomic_fadd_no_rtn_insts,
		3091	.atomic_fadd_rtn_insts,
		3092	.back_off_barrier,
		3093	.d16_write_vgpr32,
		3094	.dl_insts,
		3095	.dot10_insts,
		3096	.dot12_insts,
		3097	.dot5_insts,
		3098	.dot7_insts,
		3099	.dot8_insts,
		3100	.dot9_insts,
		3101	.dx10_clamp_and_ieee_mode,
		3102	.flat_atomic_fadd_f32_inst,
		3103	.gfx11,
		3104	.image_insts,
		3105	.ldsbankcount32,
		3106	.mad_intra_fwd_bug,
		3107	.memory_atomic_fadd_f32_denormal_support,
		3108	.msaa_load_dst_sel_bug,
		3109	.nsa_encoding,
		3110	.packed_tid,
		3111	.partial_nsa_encoding,
		3112	.priv_enabled_trap2_nop_bug,
		3113	.real_true16,
		3114	.required_export_priority,
		3115	.requires_cov6,
		3116	.shader_cycles_register,
		3117	.user_sgpr_init16_bug,
		3118	.valu_trans_use_hazard,
		3119	.vcmpx_permlane_hazard,
		3120	.wmma_256b_insts,
		3121	}),
		3122	};
		3123	pub const gfx1200: CpuModel = .{
		3124	.name = "gfx1200",
		3125	.llvm_name = "gfx1200",
		3126	.features = featureSet(&[_]Feature{
		3127	.@"1536_physical_vgprs",
		3128	.addressablelocalmemorysize65536,
		3129	.architected_flat_scratch,
		3130	.architected_sgprs,
		3131	.atomic_buffer_global_pk_add_f16_insts,
		3132	.atomic_buffer_pk_add_bf16_inst,
		3133	.atomic_ds_pk_add_16_insts,
		3134	.atomic_fadd_no_rtn_insts,
		3135	.atomic_fadd_rtn_insts,
		3136	.atomic_flat_pk_add_16_insts,
		3137	.atomic_global_pk_add_bf16_inst,
		3138	.back_off_barrier,
		3139	.bvh_dual_bvh_8_insts,
		3140	.cube_insts,
		3141	.cvt_norm_insts,
		3142	.cvt_pknorm_vop2_insts,
		3143	.cvt_pknorm_vop3_insts,
		3144	.d16_write_vgpr32,
		3145	.dl_insts,
		3146	.dot10_insts,
		3147	.dot11_insts,
		3148	.dot12_insts,
		3149	.dot7_insts,
		3150	.dot8_insts,
		3151	.dot9_insts,
		3152	.dpp_src1_sgpr,
		3153	.extended_image_insts,
		3154	.flat_atomic_fadd_f32_inst,
		3155	.formatted_mubuf_insts,
		3156	.fp8_conversion_insts,
		3157	.gfx12,
		3158	.image_insts,
		3159	.ldsbankcount32,
		3160	.lerp_inst,
		3161	.memory_atomic_fadd_f32_denormal_support,
		3162	.mqsad_insts,
		3163	.mqsad_pk_insts,
		3164	.msad_insts,
		3165	.mtbuf_insts,
		3166	.no_f16_pseudo_scalar_trans_inline_constants,
		3167	.nsa_encoding,
		3168	.packed_tid,
		3169	.partial_nsa_encoding,
		3170	.pseudo_scalar_trans,
		3171	.qsad_insts,
		3172	.real_true16,
		3173	.restricted_soffset,
		3174	.sad_insts,
		3175	.salu_float,
		3176	.scalar_dwordx3_loads,
		3177	.shader_cycles_hi_lo_registers,
		3178	.smem_prefetch_insts,
		3179	.swmmac_gfx1200_insts,
		3180	.vcmpx_permlane_hazard,
		3181	.waits_before_system_scope_stores,
		3182	.wmma_128b_insts,
		3183	}),
		3184	};
		3185	pub const gfx1201: CpuModel = .{
		3186	.name = "gfx1201",
		3187	.llvm_name = "gfx1201",
		3188	.features = featureSet(&[_]Feature{
		3189	.@"1536_physical_vgprs",
		3190	.addressablelocalmemorysize65536,
		3191	.architected_flat_scratch,
		3192	.architected_sgprs,
		3193	.atomic_buffer_global_pk_add_f16_insts,
		3194	.atomic_buffer_pk_add_bf16_inst,
		3195	.atomic_ds_pk_add_16_insts,
		3196	.atomic_fadd_no_rtn_insts,
		3197	.atomic_fadd_rtn_insts,
		3198	.atomic_flat_pk_add_16_insts,
		3199	.atomic_global_pk_add_bf16_inst,
		3200	.back_off_barrier,
		3201	.bvh_dual_bvh_8_insts,
		3202	.cube_insts,
		3203	.cvt_norm_insts,
		3204	.cvt_pknorm_vop2_insts,
		3205	.cvt_pknorm_vop3_insts,
		3206	.d16_write_vgpr32,
		3207	.dl_insts,
		3208	.dot10_insts,
		3209	.dot11_insts,
		3210	.dot12_insts,
		3211	.dot7_insts,
		3212	.dot8_insts,
		3213	.dot9_insts,
		3214	.dpp_src1_sgpr,
		3215	.extended_image_insts,
		3216	.flat_atomic_fadd_f32_inst,
		3217	.formatted_mubuf_insts,
		3218	.fp8_conversion_insts,
		3219	.gfx12,
		3220	.image_insts,
		3221	.ldsbankcount32,
		3222	.lerp_inst,
		3223	.memory_atomic_fadd_f32_denormal_support,
		3224	.mqsad_insts,
		3225	.mqsad_pk_insts,
		3226	.msad_insts,
		3227	.mtbuf_insts,
		3228	.no_f16_pseudo_scalar_trans_inline_constants,
		3229	.nsa_encoding,
		3230	.packed_tid,
		3231	.partial_nsa_encoding,
		3232	.pseudo_scalar_trans,
		3233	.qsad_insts,
		3234	.real_true16,
		3235	.restricted_soffset,
		3236	.sad_insts,
		3237	.salu_float,
		3238	.scalar_dwordx3_loads,
		3239	.shader_cycles_hi_lo_registers,
		3240	.smem_prefetch_insts,
		3241	.swmmac_gfx1200_insts,
		3242	.vcmpx_permlane_hazard,
		3243	.waits_before_system_scope_stores,
		3244	.wmma_128b_insts,
		3245	}),
		3246	};
		3247	pub const gfx1250: CpuModel = .{
		3248	.name = "gfx1250",
		3249	.llvm_name = "gfx1250",
		3250	.features = featureSet(&[_]Feature{
		3251	.@"1024_addressable_vgprs",
		3252	.@"45_bit_num_records_buffer_resource",
		3253	.@"64_bit_literals",
		3254	.add_min_max_insts,
		3255	.add_sub_u64_insts,
		3256	.addressablelocalmemorysize327680,
		3257	.architected_flat_scratch,
		3258	.architected_sgprs,
		3259	.ashr_pk_insts,
		3260	.asynccnt,
		3261	.atomic_buffer_global_pk_add_f16_insts,
		3262	.atomic_buffer_pk_add_bf16_inst,
		3263	.atomic_ds_pk_add_16_insts,
		3264	.atomic_fadd_no_rtn_insts,
		3265	.atomic_fadd_rtn_insts,
		3266	.atomic_flat_pk_add_16_insts,
		3267	.atomic_fmin_fmax_flat_f64,
		3268	.atomic_fmin_fmax_global_f64,
		3269	.atomic_global_pk_add_bf16_inst,
		3270	.back_off_barrier,
		3271	.bf16_cvt_insts,
		3272	.bf16_pk_insts,
		3273	.bf16_trans_insts,
		3274	.bitop3_insts,
		3275	.clusters,
		3276	.cube_insts,
		3277	.cumode,
		3278	.cvt_norm_insts,
		3279	.cvt_pk_f16_f32_inst,
		3280	.cvt_pknorm_vop2_insts,
		3281	.cvt_pknorm_vop3_insts,
2701	.d16_write_vgpr32,	3282	.d16_write_vgpr32,
2702	.dl_insts,	3283	.dl_insts,
2703	.dot7_insts,	3284	.dot7_insts,
...	@@ -2719,12 +3300,18 @@ pub const cpu = struct {	...	@@ -2719,12 +3300,18 @@ pub const cpu = struct {
2719	.ldsbankcount32,	3300	.ldsbankcount32,
2720	.lerp_inst,	3301	.lerp_inst,
2721	.lshl_add_u64_inst,	3302	.lshl_add_u64_inst,
		3303	.mad_nc_64_32_insts,
2722	.mad_u32_inst,	3304	.mad_u32_inst,
2723	.max_hard_clause_length_63,	3305	.max_hard_clause_length_63,
2724	.mcast_load_insts,	3306	.mcast_load_insts,
2725	.memory_atomic_fadd_f32_denormal_support,	3307	.memory_atomic_fadd_f32_denormal_support,
2726	.min3_max3_pkf16,	3308	.min3_max3_pkf16,
		3309	.min_max_i64_insts,
2727	.minimum3_maximum3_pkf16,	3310	.minimum3_maximum3_pkf16,
		3311	.mqsad_insts,
		3312	.mqsad_pk_insts,
		3313	.msad_insts,
		3314	.no_f16_pseudo_scalar_trans_inline_constants,
2728	.packed_fp32_ops,	3315	.packed_fp32_ops,
2729	.packed_tid,	3316	.packed_tid,
2730	.permlane16_swap,	3317	.permlane16_swap,
...	@@ -2732,6 +3319,8 @@ pub const cpu = struct {	...	@@ -2732,6 +3319,8 @@ pub const cpu = struct {
2732	.prng_inst,	3319	.prng_inst,
2733	.pseudo_scalar_trans,	3320	.pseudo_scalar_trans,
2734	.qsad_insts,	3321	.qsad_insts,
		3322	.real_true16,
		3323	.requires_initial_unclause_vmem,
2735	.restricted_soffset,	3324	.restricted_soffset,
2736	.s_wakeup_barrier_inst,	3325	.s_wakeup_barrier_inst,
2737	.sad_insts,	3326	.sad_insts,
...	@@ -2740,17 +3329,24 @@ pub const cpu = struct {	...	@@ -2740,17 +3329,24 @@ pub const cpu = struct {
2740	.setprio_inc_wg_inst,	3329	.setprio_inc_wg_inst,
2741	.setreg_vgpr_msb_fixup,	3330	.setreg_vgpr_msb_fixup,
2742	.shader_cycles_hi_lo_registers,	3331	.shader_cycles_hi_lo_registers,
		3332	.smem_prefetch_insts,
2743	.sramecc_support,	3333	.sramecc_support,
		3334	.swmmac_gfx1200_insts,
		3335	.swmmac_gfx1250_insts,
2744	.tanh_insts,	3336	.tanh_insts,
2745	.tensor_cvt_lut_insts,	3337	.tensor_cvt_lut_insts,
		3338	.trans_coexecution_hazard,
2746	.transpose_load_f4f6_insts,	3339	.transpose_load_f4f6_insts,
		3340	.v_mov_b64_inst,
		3341	.v_mul_u64_inst,
2747	.vcmpx_permlane_hazard,	3342	.vcmpx_permlane_hazard,
2748	.vgpr_align2,	3343	.vgpr_align2,
2749	.vmem_pref_insts,	3344	.vmem_pref_insts,
		3345	.vop3px2_increments_va_vdst_twice,
2750	.wait_xcnt,	3346	.wait_xcnt,
2751	.wavefrontsize32,	3347	.wavefrontsize32,
		3348	.wmma_coexecution_hazards,
2752	.xnack,	3349	.xnack,
2753	.xnack_support,
2754	}),	3350	}),
2755	};	3351	};
2756	pub const gfx1251: CpuModel = .{	3352	pub const gfx1251: CpuModel = .{
...	@@ -2766,6 +3362,7 @@ pub const cpu = struct {	...	@@ -2766,6 +3362,7 @@ pub const cpu = struct {
2766	.architected_flat_scratch,	3362	.architected_flat_scratch,
2767	.architected_sgprs,	3363	.architected_sgprs,
2768	.ashr_pk_insts,	3364	.ashr_pk_insts,
		3365	.asynccnt,
2769	.atomic_buffer_global_pk_add_f16_insts,	3366	.atomic_buffer_global_pk_add_f16_insts,
2770	.atomic_buffer_pk_add_bf16_inst,	3367	.atomic_buffer_pk_add_bf16_inst,
2771	.atomic_ds_pk_add_16_insts,	3368	.atomic_ds_pk_add_16_insts,
...	@@ -2775,6 +3372,7 @@ pub const cpu = struct {	...	@@ -2775,6 +3372,7 @@ pub const cpu = struct {
2775	.atomic_fmin_fmax_flat_f64,	3372	.atomic_fmin_fmax_flat_f64,
2776	.atomic_fmin_fmax_global_f64,	3373	.atomic_fmin_fmax_global_f64,
2777	.atomic_global_pk_add_bf16_inst,	3374	.atomic_global_pk_add_bf16_inst,
		3375	.back_off_barrier,
2778	.bf16_cvt_insts,	3376	.bf16_cvt_insts,
2779	.bf16_pk_insts,	3377	.bf16_pk_insts,
2780	.bf16_trans_insts,	3378	.bf16_trans_insts,
...	@@ -2800,27 +3398,40 @@ pub const cpu = struct {	...	@@ -2800,27 +3398,40 @@ pub const cpu = struct {
2800	.fmacf64_inst,	3398	.fmacf64_inst,
2801	.fp8_conversion_insts,	3399	.fp8_conversion_insts,
2802	.fp8e5m3_insts,	3400	.fp8e5m3_insts,
		3401	.full_rate_64_ops,
2803	.gfx12,	3402	.gfx12,
2804	.gfx1250_insts,	3403	.gfx1250_insts,
		3404	.gfx1251_gemm_insts,
		3405	.gfx125x_lowest_rate_wmma,
2805	.globally_addressable_scratch,	3406	.globally_addressable_scratch,
2806	.kernarg_preload,	3407	.kernarg_preload,
2807	.lds_barrier_arrive_atomic,	3408	.lds_barrier_arrive_atomic,
2808	.ldsbankcount32,	3409	.ldsbankcount32,
2809	.lerp_inst,	3410	.lerp_inst,
2810	.lshl_add_u64_inst,	3411	.lshl_add_u64_inst,
		3412	.mad_nc_64_32_insts,
2811	.mad_u32_inst,	3413	.mad_u32_inst,
2812	.max_hard_clause_length_63,	3414	.max_hard_clause_length_63,
2813	.mcast_load_insts,	3415	.mcast_load_insts,
2814	.memory_atomic_fadd_f32_denormal_support,	3416	.memory_atomic_fadd_f32_denormal_support,
2815	.min3_max3_pkf16,	3417	.min3_max3_pkf16,
		3418	.min_max_i64_insts,
2816	.minimum3_maximum3_pkf16,	3419	.minimum3_maximum3_pkf16,
		3420	.mqsad_insts,
		3421	.mqsad_pk_insts,
		3422	.msad_insts,
		3423	.no_f16_pseudo_scalar_trans_inline_constants,
2817	.packed_fp32_ops,	3424	.packed_fp32_ops,
		3425	.packed_fp64_ops,
2818	.packed_tid,	3426	.packed_tid,
		3427	.packed_u64_ops,
2819	.permlane16_swap,	3428	.permlane16_swap,
2820	.pk_add_min_max_insts,	3429	.pk_add_min_max_insts,
2821	.prng_inst,	3430	.prng_inst,
2822	.pseudo_scalar_trans,	3431	.pseudo_scalar_trans,
2823	.qsad_insts,	3432	.qsad_insts,
		3433	.real_true16,
		3434	.requires_initial_unclause_vmem,
2824	.restricted_soffset,	3435	.restricted_soffset,
2825	.s_wakeup_barrier_inst,	3436	.s_wakeup_barrier_inst,
2826	.sad_insts,	3437	.sad_insts,
...	@@ -2828,25 +3439,127 @@ pub const cpu = struct {	...	@@ -2828,25 +3439,127 @@ pub const cpu = struct {
2828	.scalar_dwordx3_loads,	3439	.scalar_dwordx3_loads,
2829	.setprio_inc_wg_inst,	3440	.setprio_inc_wg_inst,
2830	.shader_cycles_hi_lo_registers,	3441	.shader_cycles_hi_lo_registers,
		3442	.smem_prefetch_insts,
2831	.sramecc_support,	3443	.sramecc_support,
		3444	.swmmac_gfx1200_insts,
		3445	.swmmac_gfx1250_insts,
2832	.tanh_insts,	3446	.tanh_insts,
2833	.tensor_cvt_lut_insts,	3447	.tensor_cvt_lut_insts,
		3448	.trans_coexecution_hazard,
2834	.transpose_load_f4f6_insts,	3449	.transpose_load_f4f6_insts,
		3450	.use_add_pc64_inst,
		3451	.v_mov_b64_inst,
		3452	.v_mul_u64_inst,
2835	.vcmpx_permlane_hazard,	3453	.vcmpx_permlane_hazard,
2836	.vgpr_align2,	3454	.vgpr_align2,
2837	.vmem_pref_insts,	3455	.vmem_pref_insts,
		3456	.vop3px2_increments_va_vdst_twice,
2838	.wait_xcnt,	3457	.wait_xcnt,
2839	.wavefrontsize32,	3458	.wavefrontsize32,
		3459	.wmma_coexecution_hazards,
		3460	.xnack,
		3461	}),
		3462	};
		3463	pub const gfx12_5_generic: CpuModel = .{
		3464	.name = "gfx12_5_generic",
		3465	.llvm_name = "gfx12-5-generic",
		3466	.features = featureSet(&[_]Feature{
		3467	.@"1024_addressable_vgprs",
		3468	.@"45_bit_num_records_buffer_resource",
		3469	.@"64_bit_literals",
		3470	.add_min_max_insts,
		3471	.add_sub_u64_insts,
		3472	.addressablelocalmemorysize327680,
		3473	.architected_flat_scratch,
		3474	.architected_sgprs,
		3475	.ashr_pk_insts,
		3476	.asynccnt,
		3477	.atomic_buffer_global_pk_add_f16_insts,
		3478	.atomic_buffer_pk_add_bf16_inst,
		3479	.atomic_ds_pk_add_16_insts,
		3480	.atomic_fadd_no_rtn_insts,
		3481	.atomic_fadd_rtn_insts,
		3482	.atomic_flat_pk_add_16_insts,
		3483	.atomic_fmin_fmax_flat_f64,
		3484	.atomic_fmin_fmax_global_f64,
		3485	.atomic_global_pk_add_bf16_inst,
		3486	.back_off_barrier,
		3487	.bf16_cvt_insts,
		3488	.bf16_pk_insts,
		3489	.bf16_trans_insts,
		3490	.bitop3_insts,
		3491	.clusters,
		3492	.cumode,
		3493	.cvt_pk_f16_f32_inst,
		3494	.d16_write_vgpr32,
		3495	.dl_insts,
		3496	.dot7_insts,
		3497	.dot8_insts,
		3498	.dpp_src1_sgpr,
		3499	.emulated_system_scope_atomics,
		3500	.flat_atomic_fadd_f32_inst,
		3501	.flat_buffer_global_fadd_f64_inst,
		3502	.flat_gvs_mode,
		3503	.fma_mix_bf16_insts,
		3504	.fmacf64_inst,
		3505	.fp8_conversion_insts,
		3506	.fp8e5m3_insts,
		3507	.gfx12,
		3508	.gfx1250_insts,
		3509	.gfx125x_lowest_rate_wmma,
		3510	.globally_addressable_scratch,
		3511	.kernarg_preload,
		3512	.lds_barrier_arrive_atomic,
		3513	.ldsbankcount32,
		3514	.lshl_add_u64_inst,
		3515	.mad_nc_64_32_insts,
		3516	.mad_u32_inst,
		3517	.max_hard_clause_length_63,
		3518	.mcast_load_insts,
		3519	.memory_atomic_fadd_f32_denormal_support,
		3520	.min3_max3_pkf16,
		3521	.min_max_i64_insts,
		3522	.minimum3_maximum3_pkf16,
		3523	.no_f16_pseudo_scalar_trans_inline_constants,
		3524	.packed_fp32_ops,
		3525	.packed_tid,
		3526	.permlane16_swap,
		3527	.pk_add_min_max_insts,
		3528	.prng_inst,
		3529	.pseudo_scalar_trans,
		3530	.real_true16,
		3531	.requires_cov6,
		3532	.requires_initial_unclause_vmem,
		3533	.restricted_soffset,
		3534	.s_wakeup_barrier_inst,
		3535	.salu_float,
		3536	.scalar_dwordx3_loads,
		3537	.setprio_inc_wg_inst,
		3538	.setreg_vgpr_msb_fixup,
		3539	.shader_cycles_hi_lo_registers,
		3540	.smem_prefetch_insts,
		3541	.sramecc_support,
		3542	.tanh_insts,
		3543	.tensor_cvt_lut_insts,
		3544	.trans_coexecution_hazard,
		3545	.transpose_load_f4f6_insts,
		3546	.v_mov_b64_inst,
		3547	.v_mul_u64_inst,
		3548	.vcmpx_permlane_hazard,
		3549	.vgpr_align2,
		3550	.vmem_pref_insts,
		3551	.wait_xcnt,
		3552	.wavefrontsize32,
		3553	.wmma_coexecution_hazards,
2840	.xnack,	3554	.xnack,
2841	.xnack_support,
2842	}),	3555	}),
2843	};	3556	};
2844	pub const gfx12_generic: CpuModel = .{	3557	pub const gfx12_generic: CpuModel = .{
2845	.name = "gfx12_generic",	3558	.name = "gfx12_generic",
2846	.llvm_name = "gfx12-generic",	3559	.llvm_name = "gfx12-generic",
2847	.features = featureSet(&[_]Feature{	3560	.features = featureSet(&[_]Feature{
		3561	.@"1536_physical_vgprs",
2848	.addressablelocalmemorysize65536,	3562	.addressablelocalmemorysize65536,
2849	.allocate1_5xvgprs,
2850	.architected_flat_scratch,	3563	.architected_flat_scratch,
2851	.architected_sgprs,	3564	.architected_sgprs,
2852	.atomic_buffer_global_pk_add_f16_insts,	3565	.atomic_buffer_global_pk_add_f16_insts,
...	@@ -2873,25 +3586,170 @@ pub const cpu = struct {	...	@@ -2873,25 +3586,170 @@ pub const cpu = struct {
2873	.dpp_src1_sgpr,	3586	.dpp_src1_sgpr,
2874	.extended_image_insts,	3587	.extended_image_insts,
2875	.flat_atomic_fadd_f32_inst,	3588	.flat_atomic_fadd_f32_inst,
		3589	.formatted_mubuf_insts,
2876	.fp8_conversion_insts,	3590	.fp8_conversion_insts,
2877	.gfx12,	3591	.gfx12,
2878	.image_insts,	3592	.image_insts,
2879	.ldsbankcount32,	3593	.ldsbankcount32,
2880	.lerp_inst,	3594	.lerp_inst,
2881	.memory_atomic_fadd_f32_denormal_support,	3595	.memory_atomic_fadd_f32_denormal_support,
		3596	.mqsad_insts,
		3597	.mqsad_pk_insts,
		3598	.msad_insts,
		3599	.mtbuf_insts,
		3600	.no_f16_pseudo_scalar_trans_inline_constants,
2882	.nsa_encoding,	3601	.nsa_encoding,
2883	.packed_tid,	3602	.packed_tid,
2884	.partial_nsa_encoding,	3603	.partial_nsa_encoding,
2885	.pseudo_scalar_trans,	3604	.pseudo_scalar_trans,
2886	.qsad_insts,	3605	.qsad_insts,
		3606	.real_true16,
2887	.requires_cov6,	3607	.requires_cov6,
2888	.restricted_soffset,	3608	.restricted_soffset,
2889	.sad_insts,	3609	.sad_insts,
2890	.salu_float,	3610	.salu_float,
2891	.scalar_dwordx3_loads,	3611	.scalar_dwordx3_loads,
2892	.shader_cycles_hi_lo_registers,	3612	.shader_cycles_hi_lo_registers,
		3613	.smem_prefetch_insts,
		3614	.swmmac_gfx1200_insts,
2893	.vcmpx_permlane_hazard,	3615	.vcmpx_permlane_hazard,
2894	.waits_before_system_scope_stores,	3616	.waits_before_system_scope_stores,
		3617	.wmma_128b_insts,
		3618	}),
		3619	};
		3620	pub const gfx1310: CpuModel = .{
		3621	.name = "gfx1310",
		3622	.llvm_name = "gfx1310",
		3623	.features = featureSet(&[_]Feature{
		3624	.@"1536_physical_vgprs",
		3625	.@"64_bit_literals",
		3626	.addressablelocalmemorysize65536,
		3627	.architected_flat_scratch,
		3628	.architected_sgprs,
		3629	.ashr_pk_insts,
		3630	.atomic_buffer_global_pk_add_f16_insts,
		3631	.atomic_buffer_pk_add_bf16_inst,
		3632	.atomic_ds_pk_add_16_insts,
		3633	.atomic_fadd_no_rtn_insts,
		3634	.atomic_fadd_rtn_insts,
		3635	.atomic_flat_pk_add_16_insts,
		3636	.atomic_fmin_fmax_flat_f64,
		3637	.atomic_fmin_fmax_global_f64,
		3638	.atomic_global_pk_add_bf16_inst,
		3639	.bf16_cvt_insts,
		3640	.bf16_pk_insts,
		3641	.bf16_trans_insts,
		3642	.bitop3_insts,
		3643	.clusters,
		3644	.cube_insts,
		3645	.cvt_norm_insts,
		3646	.cvt_pk_f16_f32_inst,
		3647	.cvt_pknorm_vop2_insts,
		3648	.cvt_pknorm_vop3_insts,
		3649	.dl_insts,
		3650	.dot7_insts,
		3651	.dot8_insts,
		3652	.dpp_src1_sgpr,
		3653	.f16bf16_to_fp6bf6_cvt_scale_insts,
		3654	.flat_atomic_fadd_f32_inst,
		3655	.flat_gvs_mode,
		3656	.fma_mix_bf16_insts,
		3657	.fmacf64_inst,
		3658	.fp8_conversion_insts,
		3659	.gfx1250_insts,
		3660	.gfx13,
		3661	.globally_addressable_scratch,
		3662	.ldsbankcount32,
		3663	.lerp_inst,
		3664	.mqsad_insts,
		3665	.mqsad_pk_insts,
		3666	.msad_insts,
		3667	.nsa_encoding,
		3668	.packed_tid,
		3669	.partial_nsa_encoding,
		3670	.permlane16_swap,
		3671	.prng_inst,
		3672	.pseudo_scalar_trans,
		3673	.qsad_insts,
		3674	.restricted_soffset,
		3675	.s_wakeup_barrier_inst,
		3676	.sad_insts,
		3677	.salu_float,
		3678	.scalar_dwordx3_loads,
		3679	.shader_cycles_register,
		3680	.smem_prefetch_insts,
		3681	.tanh_insts,
		3682	.tensor_cvt_lut_insts,
		3683	.transpose_load_f4f6_insts,
		3684	.vcmpx_permlane_hazard,
		3685	}),
		3686	};
		3687	pub const gfx13_generic: CpuModel = .{
		3688	.name = "gfx13_generic",
		3689	.llvm_name = "gfx13-generic",
		3690	.features = featureSet(&[_]Feature{
		3691	.@"1536_physical_vgprs",
		3692	.@"64_bit_literals",
		3693	.addressablelocalmemorysize65536,
		3694	.architected_flat_scratch,
		3695	.architected_sgprs,
		3696	.ashr_pk_insts,
		3697	.atomic_buffer_global_pk_add_f16_insts,
		3698	.atomic_buffer_pk_add_bf16_inst,
		3699	.atomic_ds_pk_add_16_insts,
		3700	.atomic_fadd_no_rtn_insts,
		3701	.atomic_fadd_rtn_insts,
		3702	.atomic_flat_pk_add_16_insts,
		3703	.atomic_fmin_fmax_flat_f64,
		3704	.atomic_fmin_fmax_global_f64,
		3705	.atomic_global_pk_add_bf16_inst,
		3706	.bf16_cvt_insts,
		3707	.bf16_pk_insts,
		3708	.bf16_trans_insts,
		3709	.bitop3_insts,
		3710	.clusters,
		3711	.cube_insts,
		3712	.cvt_norm_insts,
		3713	.cvt_pk_f16_f32_inst,
		3714	.cvt_pknorm_vop2_insts,
		3715	.cvt_pknorm_vop3_insts,
		3716	.dl_insts,
		3717	.dot7_insts,
		3718	.dot8_insts,
		3719	.dpp_src1_sgpr,
		3720	.f16bf16_to_fp6bf6_cvt_scale_insts,
		3721	.flat_atomic_fadd_f32_inst,
		3722	.flat_gvs_mode,
		3723	.fma_mix_bf16_insts,
		3724	.fmacf64_inst,
		3725	.fp8_conversion_insts,
		3726	.gfx1250_insts,
		3727	.gfx13,
		3728	.globally_addressable_scratch,
		3729	.ldsbankcount32,
		3730	.lerp_inst,
		3731	.mqsad_insts,
		3732	.mqsad_pk_insts,
		3733	.msad_insts,
		3734	.nsa_encoding,
		3735	.packed_tid,
		3736	.partial_nsa_encoding,
		3737	.permlane16_swap,
		3738	.prng_inst,
		3739	.pseudo_scalar_trans,
		3740	.qsad_insts,
		3741	.requires_cov6,
		3742	.restricted_soffset,
		3743	.s_wakeup_barrier_inst,
		3744	.sad_insts,
		3745	.salu_float,
		3746	.scalar_dwordx3_loads,
		3747	.shader_cycles_register,
		3748	.smem_prefetch_insts,
		3749	.tanh_insts,
		3750	.tensor_cvt_lut_insts,
		3751	.transpose_load_f4f6_insts,
		3752	.vcmpx_permlane_hazard,
2895	}),	3753	}),
2896	};	3754	};
2897	pub const gfx600: CpuModel = .{	3755	pub const gfx600: CpuModel = .{
...	@@ -2977,7 +3835,7 @@ pub const cpu = struct {	...	@@ -2977,7 +3835,7 @@ pub const cpu = struct {
2977	.ldsbankcount32,	3835	.ldsbankcount32,
2978	.unpacked_d16_vmem,	3836	.unpacked_d16_vmem,
2979	.volcanic_islands,	3837	.volcanic_islands,
2980	.xnack_support,	3838	.xnack_on_off_modes,
2981	}),	3839	}),
2982	};	3840	};
2983	pub const gfx802: CpuModel = .{	3841	pub const gfx802: CpuModel = .{
...	@@ -3017,7 +3875,7 @@ pub const cpu = struct {	...	@@ -3017,7 +3875,7 @@ pub const cpu = struct {
3017	.image_store_d16_bug,	3875	.image_store_d16_bug,
3018	.ldsbankcount16,	3876	.ldsbankcount16,
3019	.volcanic_islands,	3877	.volcanic_islands,
3020	.xnack_support,	3878	.xnack_on_off_modes,
3021	}),	3879	}),
3022	};	3880	};
3023	pub const gfx900: CpuModel = .{	3881	pub const gfx900: CpuModel = .{
...	@@ -3175,6 +4033,7 @@ pub const cpu = struct {	...	@@ -3175,6 +4033,7 @@ pub const cpu = struct {
3175	.packed_tid,	4033	.packed_tid,
3176	.pk_fmac_f16_inst,	4034	.pk_fmac_f16_inst,
3177	.sramecc_support,	4035	.sramecc_support,
		4036	.tgsplit_support,
3178	.vgpr_align2,	4037	.vgpr_align2,
3179	}),	4038	}),
3180	};	4039	};
...	@@ -3239,6 +4098,8 @@ pub const cpu = struct {	...	@@ -3239,6 +4098,8 @@ pub const cpu = struct {
3239	.packed_tid,	4098	.packed_tid,
3240	.pk_fmac_f16_inst,	4099	.pk_fmac_f16_inst,
3241	.sramecc_support,	4100	.sramecc_support,
		4101	.tgsplit_support,
		4102	.v_mov_b64_inst,
3242	.vgpr_align2,	4103	.vgpr_align2,
3243	.xf32_insts,	4104	.xf32_insts,
3244	}),	4105	}),
...	@@ -3295,6 +4156,8 @@ pub const cpu = struct {	...	@@ -3295,6 +4156,8 @@ pub const cpu = struct {
3295	.pk_fmac_f16_inst,	4156	.pk_fmac_f16_inst,
3296	.prng_inst,	4157	.prng_inst,
3297	.sramecc_support,	4158	.sramecc_support,
		4159	.tgsplit_support,
		4160	.v_mov_b64_inst,
3298	.vgpr_align2,	4161	.vgpr_align2,
3299	}),	4162	}),
3300	};	4163	};
...	@@ -3342,6 +4205,8 @@ pub const cpu = struct {	...	@@ -3342,6 +4205,8 @@ pub const cpu = struct {
3342	.pk_fmac_f16_inst,	4205	.pk_fmac_f16_inst,
3343	.requires_cov6,	4206	.requires_cov6,
3344	.sramecc_support,	4207	.sramecc_support,
		4208	.tgsplit_support,
		4209	.v_mov_b64_inst,
3345	.vgpr_align2,	4210	.vgpr_align2,
3346	}),	4211	}),
3347	};	4212	};
...	@@ -3452,7 +4317,7 @@ pub const cpu = struct {	...	@@ -3452,7 +4317,7 @@ pub const cpu = struct {
3452	.image_store_d16_bug,	4317	.image_store_d16_bug,
3453	.ldsbankcount16,	4318	.ldsbankcount16,
3454	.volcanic_islands,	4319	.volcanic_islands,
3455	.xnack_support,	4320	.xnack_on_off_modes,
3456	}),	4321	}),
3457	};	4322	};
3458	pub const tahiti: CpuModel = .{	4323	pub const tahiti: CpuModel = .{

lib/std/Target/hexagon.zig+204

...	@@ -34,7 +34,41 @@ pub const Feature = enum {	...	@@ -34,7 +34,41 @@ pub const Feature = enum {
34	nvs,	34	nvs,
35	packets,	35	packets,
36	prev65,	36	prev65,
		37	reserved_r10,
		38	reserved_r11,
		39	reserved_r12,
		40	reserved_r13,
		41	reserved_r14,
		42	reserved_r15,
		43	reserved_r16,
		44	reserved_r17,
		45	reserved_r18,
37	reserved_r19,	46	reserved_r19,
		47	reserved_r20,
		48	reserved_r21,
		49	reserved_r22,
		50	reserved_r23,
		51	reserved_r24,
		52	reserved_r25,
		53	reserved_r26,
		54	reserved_r27,
		55	reserved_r28,
		56	reserved_r6,
		57	reserved_r7,
		58	reserved_r8,
		59	reserved_r9,
		60	scs_reg_r16,
		61	scs_reg_r17,
		62	scs_reg_r18,
		63	scs_reg_r19,
		64	scs_reg_r20,
		65	scs_reg_r21,
		66	scs_reg_r22,
		67	scs_reg_r23,
		68	scs_reg_r24,
		69	scs_reg_r25,
		70	scs_reg_r26,
		71	scs_reg_r27,
38	small_data,	72	small_data,
39	tinycore,	73	tinycore,
40	v5,	74	v5,
...	@@ -241,11 +275,181 @@ pub const all_features = blk: {	...	@@ -241,11 +275,181 @@ pub const all_features = blk: {
241	.description = "Support features deprecated in v65",	275	.description = "Support features deprecated in v65",
242	.dependencies = featureSet(&[_]Feature{}),	276	.dependencies = featureSet(&[_]Feature{}),
243	};	277	};
		278	result[@backingInt(Feature.reserved_r10)] = .{
		279	.llvm_name = "reserved-r10",
		280	.description = "Reserve register R10",
		281	.dependencies = featureSet(&[_]Feature{}),
		282	};
		283	result[@backingInt(Feature.reserved_r11)] = .{
		284	.llvm_name = "reserved-r11",
		285	.description = "Reserve register R11",
		286	.dependencies = featureSet(&[_]Feature{}),
		287	};
		288	result[@backingInt(Feature.reserved_r12)] = .{
		289	.llvm_name = "reserved-r12",
		290	.description = "Reserve register R12",
		291	.dependencies = featureSet(&[_]Feature{}),
		292	};
		293	result[@backingInt(Feature.reserved_r13)] = .{
		294	.llvm_name = "reserved-r13",
		295	.description = "Reserve register R13",
		296	.dependencies = featureSet(&[_]Feature{}),
		297	};
		298	result[@backingInt(Feature.reserved_r14)] = .{
		299	.llvm_name = "reserved-r14",
		300	.description = "Reserve register R14",
		301	.dependencies = featureSet(&[_]Feature{}),
		302	};
		303	result[@backingInt(Feature.reserved_r15)] = .{
		304	.llvm_name = "reserved-r15",
		305	.description = "Reserve register R15",
		306	.dependencies = featureSet(&[_]Feature{}),
		307	};
		308	result[@backingInt(Feature.reserved_r16)] = .{
		309	.llvm_name = "reserved-r16",
		310	.description = "Reserve register R16",
		311	.dependencies = featureSet(&[_]Feature{}),
		312	};
		313	result[@backingInt(Feature.reserved_r17)] = .{
		314	.llvm_name = "reserved-r17",
		315	.description = "Reserve register R17",
		316	.dependencies = featureSet(&[_]Feature{}),
		317	};
		318	result[@backingInt(Feature.reserved_r18)] = .{
		319	.llvm_name = "reserved-r18",
		320	.description = "Reserve register R18",
		321	.dependencies = featureSet(&[_]Feature{}),
		322	};
244	result[@backingInt(Feature.reserved_r19)] = .{	323	result[@backingInt(Feature.reserved_r19)] = .{
245	.llvm_name = "reserved-r19",	324	.llvm_name = "reserved-r19",
246	.description = "Reserve register R19",	325	.description = "Reserve register R19",
247	.dependencies = featureSet(&[_]Feature{}),	326	.dependencies = featureSet(&[_]Feature{}),
248	};	327	};
		328	result[@backingInt(Feature.reserved_r20)] = .{
		329	.llvm_name = "reserved-r20",
		330	.description = "Reserve register R20",
		331	.dependencies = featureSet(&[_]Feature{}),
		332	};
		333	result[@backingInt(Feature.reserved_r21)] = .{
		334	.llvm_name = "reserved-r21",
		335	.description = "Reserve register R21",
		336	.dependencies = featureSet(&[_]Feature{}),
		337	};
		338	result[@backingInt(Feature.reserved_r22)] = .{
		339	.llvm_name = "reserved-r22",
		340	.description = "Reserve register R22",
		341	.dependencies = featureSet(&[_]Feature{}),
		342	};
		343	result[@backingInt(Feature.reserved_r23)] = .{
		344	.llvm_name = "reserved-r23",
		345	.description = "Reserve register R23",
		346	.dependencies = featureSet(&[_]Feature{}),
		347	};
		348	result[@backingInt(Feature.reserved_r24)] = .{
		349	.llvm_name = "reserved-r24",
		350	.description = "Reserve register R24",
		351	.dependencies = featureSet(&[_]Feature{}),
		352	};
		353	result[@backingInt(Feature.reserved_r25)] = .{
		354	.llvm_name = "reserved-r25",
		355	.description = "Reserve register R25",
		356	.dependencies = featureSet(&[_]Feature{}),
		357	};
		358	result[@backingInt(Feature.reserved_r26)] = .{
		359	.llvm_name = "reserved-r26",
		360	.description = "Reserve register R26",
		361	.dependencies = featureSet(&[_]Feature{}),
		362	};
		363	result[@backingInt(Feature.reserved_r27)] = .{
		364	.llvm_name = "reserved-r27",
		365	.description = "Reserve register R27",
		366	.dependencies = featureSet(&[_]Feature{}),
		367	};
		368	result[@backingInt(Feature.reserved_r28)] = .{
		369	.llvm_name = "reserved-r28",
		370	.description = "Reserve register R28",
		371	.dependencies = featureSet(&[_]Feature{}),
		372	};
		373	result[@backingInt(Feature.reserved_r6)] = .{
		374	.llvm_name = "reserved-r6",
		375	.description = "Reserve register R6",
		376	.dependencies = featureSet(&[_]Feature{}),
		377	};
		378	result[@backingInt(Feature.reserved_r7)] = .{
		379	.llvm_name = "reserved-r7",
		380	.description = "Reserve register R7",
		381	.dependencies = featureSet(&[_]Feature{}),
		382	};
		383	result[@backingInt(Feature.reserved_r8)] = .{
		384	.llvm_name = "reserved-r8",
		385	.description = "Reserve register R8",
		386	.dependencies = featureSet(&[_]Feature{}),
		387	};
		388	result[@backingInt(Feature.reserved_r9)] = .{
		389	.llvm_name = "reserved-r9",
		390	.description = "Reserve register R9",
		391	.dependencies = featureSet(&[_]Feature{}),
		392	};
		393	result[@backingInt(Feature.scs_reg_r16)] = .{
		394	.llvm_name = "scs-reg-r16",
		395	.description = "Use register R16 as the shadow call stack pointer",
		396	.dependencies = featureSet(&[_]Feature{}),
		397	};
		398	result[@backingInt(Feature.scs_reg_r17)] = .{
		399	.llvm_name = "scs-reg-r17",
		400	.description = "Use register R17 as the shadow call stack pointer",
		401	.dependencies = featureSet(&[_]Feature{}),
		402	};
		403	result[@backingInt(Feature.scs_reg_r18)] = .{
		404	.llvm_name = "scs-reg-r18",
		405	.description = "Use register R18 as the shadow call stack pointer",
		406	.dependencies = featureSet(&[_]Feature{}),
		407	};
		408	result[@backingInt(Feature.scs_reg_r19)] = .{
		409	.llvm_name = "scs-reg-r19",
		410	.description = "Use register R19 as the shadow call stack pointer",
		411	.dependencies = featureSet(&[_]Feature{}),
		412	};
		413	result[@backingInt(Feature.scs_reg_r20)] = .{
		414	.llvm_name = "scs-reg-r20",
		415	.description = "Use register R20 as the shadow call stack pointer",
		416	.dependencies = featureSet(&[_]Feature{}),
		417	};
		418	result[@backingInt(Feature.scs_reg_r21)] = .{
		419	.llvm_name = "scs-reg-r21",
		420	.description = "Use register R21 as the shadow call stack pointer",
		421	.dependencies = featureSet(&[_]Feature{}),
		422	};
		423	result[@backingInt(Feature.scs_reg_r22)] = .{
		424	.llvm_name = "scs-reg-r22",
		425	.description = "Use register R22 as the shadow call stack pointer",
		426	.dependencies = featureSet(&[_]Feature{}),
		427	};
		428	result[@backingInt(Feature.scs_reg_r23)] = .{
		429	.llvm_name = "scs-reg-r23",
		430	.description = "Use register R23 as the shadow call stack pointer",
		431	.dependencies = featureSet(&[_]Feature{}),
		432	};
		433	result[@backingInt(Feature.scs_reg_r24)] = .{
		434	.llvm_name = "scs-reg-r24",
		435	.description = "Use register R24 as the shadow call stack pointer",
		436	.dependencies = featureSet(&[_]Feature{}),
		437	};
		438	result[@backingInt(Feature.scs_reg_r25)] = .{
		439	.llvm_name = "scs-reg-r25",
		440	.description = "Use register R25 as the shadow call stack pointer",
		441	.dependencies = featureSet(&[_]Feature{}),
		442	};
		443	result[@backingInt(Feature.scs_reg_r26)] = .{
		444	.llvm_name = "scs-reg-r26",
		445	.description = "Use register R26 as the shadow call stack pointer",
		446	.dependencies = featureSet(&[_]Feature{}),
		447	};
		448	result[@backingInt(Feature.scs_reg_r27)] = .{
		449	.llvm_name = "scs-reg-r27",
		450	.description = "Use register R27 as the shadow call stack pointer",
		451	.dependencies = featureSet(&[_]Feature{}),
		452	};
249	result[@backingInt(Feature.small_data)] = .{	453	result[@backingInt(Feature.small_data)] = .{
250	.llvm_name = "small-data",	454	.llvm_name = "small-data",
251	.description = "Allow GP-relative addressing of global variables",	455	.description = "Allow GP-relative addressing of global variables",

lib/std/Target/mips.zig+23

 @@ -13,6 +13,7 @@ pub const Feature = enum {
     dspr2,
     dspr3,
     eva,
+    fix_r5900,
     fp64,
     fpxx,
     ginv,
 @@ -52,6 +53,7 @@ pub const Feature = enum {
     notraps,
     p5600,
     ptr64,
+    r5900,
     single_float,
     soft_float,
     strict_align,
 @@ -121,6 +123,11 @@ pub const all_features = blk: {
         .description = "Mips EVA ASE",
         .dependencies = featureSet(&[_]Feature{}),
     };
+    result[@backingInt(Feature.fix_r5900)] = .{
+        .llvm_name = "fix-r5900",
+        .description = "Enable R5900 short loop erratum fix",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.fp64)] = .{
         .llvm_name = "fp64",
         .description = "Support 64-bit FP registers",
 @@ -372,6 +379,15 @@ pub const all_features = blk: {
         .description = "Pointers are 64-bit wide",
         .dependencies = featureSet(&[_]Feature{}),
     };
+    result[@backingInt(Feature.r5900)] = .{
+        .llvm_name = "r5900",
+        .description = "R5900 (PS2 Emotion Engine) Support",
+        .dependencies = featureSet(&[_]Feature{
+            .fix_r5900,
+            .mips3,
+            .single_float,
+        }),
+    };
     result[@backingInt(Feature.single_float)] = .{
         .llvm_name = "single-float",
         .description = "Only supports single precision float",
 @@ -596,4 +612,11 @@ pub const cpu = struct {
             .soft_float,
         }),
     };
+    pub const r5900: CpuModel = .{
+        .name = "r5900",
+        .llvm_name = "r5900",
+        .features = featureSet(&[_]Feature{
+            .r5900,
+        }),
+    };
 };

lib/std/Target/nvptx.zig+18

...	@@ -36,6 +36,9 @@ pub const Feature = enum {	...	@@ -36,6 +36,9 @@ pub const Feature = enum {
36	ptx87,	36	ptx87,
37	ptx88,	37	ptx88,
38	ptx90,	38	ptx90,
		39	ptx91,
		40	ptx92,
		41	ptx93,
39	sm_100,	42	sm_100,
40	sm_100a,	43	sm_100a,
41	sm_100f,	44	sm_100f,
...	@@ -242,6 +245,21 @@ pub const all_features = blk: {	...	@@ -242,6 +245,21 @@ pub const all_features = blk: {
242	.description = "Use PTX version 90",	245	.description = "Use PTX version 90",
243	.dependencies = featureSet(&[_]Feature{}),	246	.dependencies = featureSet(&[_]Feature{}),
244	};	247	};
		248	result[@backingInt(Feature.ptx91)] = .{
		249	.llvm_name = "ptx91",
		250	.description = "Use PTX version 91",
		251	.dependencies = featureSet(&[_]Feature{}),
		252	};
		253	result[@backingInt(Feature.ptx92)] = .{
		254	.llvm_name = "ptx92",
		255	.description = "Use PTX version 92",
		256	.dependencies = featureSet(&[_]Feature{}),
		257	};
		258	result[@backingInt(Feature.ptx93)] = .{
		259	.llvm_name = "ptx93",
		260	.description = "Use PTX version 93",
		261	.dependencies = featureSet(&[_]Feature{}),
		262	};
245	result[@backingInt(Feature.sm_100)] = .{	263	result[@backingInt(Feature.sm_100)] = .{
246	.llvm_name = "sm_100",	264	.llvm_name = "sm_100",
247	.description = "Target SM 100",	265	.description = "Target SM 100",

lib/std/Target/powerpc.zig+51-2

 @@ -43,6 +43,7 @@ pub const Feature = enum {
     fuse_wideimm,
     fuse_zeromove,
     fusion,
+    future_vector,
     hard_float,
     htm,
     icbt,
 @@ -83,6 +84,7 @@ pub const Feature = enum {
     spe,
     stfiwx,
     two_const_nr,
+    use_ptrgl_helper,
     vectors_use_two_units,
     vsx,
 };
 @@ -342,6 +344,14 @@ pub const all_features = blk: {
         .description = "Target supports instruction fusion",
         .dependencies = featureSet(&[_]Feature{}),
     };
+    result[@backingInt(Feature.future_vector)] = .{
+        .llvm_name = "future-vector",
+        .description = "Enable Future vector instructions",
+        .dependencies = featureSet(&[_]Feature{
+            .isa_future_instructions,
+            .power10_vector,
+        }),
+    };
     result[@backingInt(Feature.hard_float)] = .{
         .llvm_name = "hard-float",
         .description = "Enable floating-point instructions",
 @@ -441,6 +451,7 @@ pub const all_features = blk: {
         .description = "32Byte load and store instructions",
         .dependencies = featureSet(&[_]Feature{
             .isa_v30_instructions,
+            .vsx,
         }),
     };
     result[@backingInt(Feature.partword_atomics)] = .{
 @@ -580,6 +591,11 @@ pub const all_features = blk: {
         .description = "Requires two constant Newton-Raphson computation",
         .dependencies = featureSet(&[_]Feature{}),
     };
+    result[@backingInt(Feature.use_ptrgl_helper)] = .{
+        .llvm_name = "use-ptrgl-helper",
+        .description = "Use ._ptrgl for indirect calls",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.vectors_use_two_units)] = .{
         .llvm_name = "vectors-use-two-units",
         .description = "Vectors use two units",
 @@ -747,6 +763,19 @@ pub const cpu = struct {
             .stfiwx,
         }),
     };
+    pub const cell: CpuModel = .{
+        .name = "cell",
+        .llvm_name = null,
+        .features = featureSet(&[_]Feature{
+            .@"64bit_support",
+            .altivec,
+            .fres,
+            .frsqrte,
+            .fsqrt,
+            .mfocrf,
+            .stfiwx,
+        }),
+    };
     pub const e500: CpuModel = .{
         .name = "e500",
         .llvm_name = "e500",
 @@ -765,6 +794,15 @@ pub const cpu = struct {
             .stfiwx,
         }),
     };
+    pub const e500v2: CpuModel = .{
+        .name = "e500v2",
+        .llvm_name = null,
+        .features = featureSet(&[_]Feature{
+            .efpu2,
+            .isel,
+            .msync,
+        }),
+    };
     pub const e5500: CpuModel = .{
         .name = "e5500",
         .llvm_name = "e5500",
 @@ -776,6 +814,18 @@ pub const cpu = struct {
             .stfiwx,
         }),
     };
+    pub const e6500: CpuModel = .{
+        .name = "e6500",
+        .llvm_name = null,
+        .features = featureSet(&[_]Feature{
+            .@"64bit_support",
+            .altivec,
+            .booke,
+            .isel,
+            .mfocrf,
+            .stfiwx,
+        }),
+    };
     pub const future: CpuModel = .{
         .name = "future",
         .llvm_name = "future",
 @@ -803,8 +853,8 @@ pub const cpu = struct {
             .fuse_logical_add,
             .fuse_sha3,
             .fuse_store,
+            .future_vector,
             .icbt,
-            .isa_future_instructions,
             .isa_v206_instructions,
             .isel,
             .ldbrx,
 @@ -814,7 +864,6 @@ pub const cpu = struct {
             .partword_atomics,
             .pcrelative_memops,
             .popcntd,
-            .power10_vector,
             .ppc_postra_sched,
             .ppc_prera_sched,
             .predictable_select_expensive,

lib/std/Target/riscv.zig+673-134

...	@@ -8,13 +8,8 @@ pub const Feature = enum {	...	@@ -8,13 +8,8 @@ pub const Feature = enum {
8	@"32bit",	8	@"32bit",
9	@"64bit",	9	@"64bit",
10	a,	10	a,
11	add_load_fusion,
12	addi_load_fusion,
13	andes45,	11	andes45,
14	auipc_addi_fusion,
15	auipc_load_fusion,
16	b,	12	b,
17	bfext_fusion,
18	c,	13	c,
19	conditional_cmv_fusion,	14	conditional_cmv_fusion,
20	d,	15	d,
...	@@ -25,6 +20,7 @@ pub const Feature = enum {	...	@@ -25,6 +20,7 @@ pub const Feature = enum {
25	disable_postmisched_store_clustering,	20	disable_postmisched_store_clustering,
26	dlen_factor_2,	21	dlen_factor_2,
27	e,	22	e,
		23	enable_select_opt,
28	enable_vsetvli_sched_heuristic,	24	enable_vsetvli_sched_heuristic,
29	exact_asm,	25	exact_asm,
30	experimental,	26	experimental,
...	@@ -32,26 +28,57 @@ pub const Feature = enum {	...	@@ -32,26 +28,57 @@ pub const Feature = enum {
32	experimental_rvm23u32,	28	experimental_rvm23u32,
33	experimental_smpmpmt,	29	experimental_smpmpmt,
34	experimental_svukte,	30	experimental_svukte,
35	experimental_xrivosvisni,	31	experimental_xqccmt,
36	experimental_xrivosvizip,
37	experimental_xsfmclic,	32	experimental_xsfmclic,
38	experimental_xsfsclic,	33	experimental_xsfsclic,
		34	experimental_y,
39	experimental_zibi,	35	experimental_zibi,
40	experimental_zicfilp,	36	experimental_zicfilp,
41	experimental_zicfiss,	37	experimental_zicfiss,
		38	experimental_zvabd,
42	experimental_zvbc32e,	39	experimental_zvbc32e,
		40	experimental_zvdot4a8i,
		41	experimental_zvfbdota32f,
43	experimental_zvfbfa,	42	experimental_zvfbfa,
44	experimental_zvfofp8min,	43	experimental_zvfofp8min,
		44	experimental_zvfqwbdota8f,
		45	experimental_zvfqwdota8f,
		46	experimental_zvfwbdota16bf,
		47	experimental_zvfwdota16bf,
45	experimental_zvkgs,	48	experimental_zvkgs,
46	experimental_zvqdotq,	49	experimental_zvqwbdota16i,
		50	experimental_zvqwbdota8i,
		51	experimental_zvqwdota16i,
		52	experimental_zvqwdota8i,
		53	experimental_zvvfmm,
		54	experimental_zvvmm,
		55	experimental_zvvmtls,
		56	experimental_zvvmttls,
		57	experimental_zvzip,
47	f,	58	f,
48	forced_atomics,	59	forced_atomics,
		60	fusion_add_load,
		61	fusion_add_mem,
		62	fusion_addi_load,
		63	fusion_auipc_addi,
		64	fusion_auipc_load,
		65	fusion_bfext,
		66	fusion_ld_add,
		67	fusion_logic_imm_reg,
		68	fusion_logic_reg_imm,
		69	fusion_logic_reg_reg,
		70	fusion_lui_addi,
		71	fusion_lui_load,
		72	fusion_mul_add,
		73	fusion_qc_e_li_load_store,
		74	fusion_shift_bit_extract,
		75	fusion_shifted_zextw,
		76	fusion_shxadd_load,
		77	fusion_zexth,
		78	fusion_zextw,
49	h,	79	h,
50	i,	80	i,
51	ld_add_fusion,
52	log_vrgather,	81	log_vrgather,
53	lui_addi_fusion,
54	lui_load_fusion,
55	m,	82	m,
56	mips_p8700,	83	mips_p8700,
57	no_default_unroll,	84	no_default_unroll,
...	@@ -67,6 +94,7 @@ pub const Feature = enum {	...	@@ -67,6 +94,7 @@ pub const Feature = enum {
67	optimized_zero_stride_load,	94	optimized_zero_stride_load,
68	permissive_zalrsc,	95	permissive_zalrsc,
69	predictable_select_expensive,	96	predictable_select_expensive,
		97	prefer_ascending_load_store,
70	prefer_vsetvli_over_read_vlenb,	98	prefer_vsetvli_over_read_vlenb,
71	prefer_w_inst,	99	prefer_w_inst,
72	q,	100	q,
...	@@ -118,17 +146,16 @@ pub const Feature = enum {	...	@@ -118,17 +146,16 @@ pub const Feature = enum {
118	sha,	146	sha,
119	shcounterenw,	147	shcounterenw,
120	shgatpa,	148	shgatpa,
121	shifted_zextw_fusion,
122	shlcofideleg,	149	shlcofideleg,
123	short_forward_branch_ialu,	150	short_forward_branch_ialu,
124	short_forward_branch_iload,	151	short_forward_branch_iload,
125	short_forward_branch_iminmax,	152	short_forward_branch_iminmax,
		153	short_forward_branch_imm,
126	short_forward_branch_imul,	154	short_forward_branch_imul,
127	shtvala,	155	shtvala,
128	shvsatpa,	156	shvsatpa,
129	shvstvala,	157	shvstvala,
130	shvstvecd,	158	shvstvecd,
131	shxadd_load_fusion,
132	single_element_vec_fp64,	159	single_element_vec_fp64,
133	smaia,	160	smaia,
134	smcdeleg,	161	smcdeleg,
...	@@ -165,6 +192,7 @@ pub const Feature = enum {	...	@@ -165,6 +192,7 @@ pub const Feature = enum {
165	svinval,	192	svinval,
166	svnapot,	193	svnapot,
167	svpbmt,	194	svpbmt,
		195	svrsw60t59b,
168	svvptc,	196	svvptc,
169	tagged_globals,	197	tagged_globals,
170	unaligned_scalar_mem,	198	unaligned_scalar_mem,
...	@@ -174,6 +202,7 @@ pub const Feature = enum {	...	@@ -174,6 +202,7 @@ pub const Feature = enum {
174	ventana_veyron,	202	ventana_veyron,
175	vl_dependent_latency,	203	vl_dependent_latency,
176	vxrm_pipeline_flush,	204	vxrm_pipeline_flush,
		205	xaifet,
177	xandesbfhcvt,	206	xandesbfhcvt,
178	xandesperf,	207	xandesperf,
179	xandesvbfhcvt,	208	xandesvbfhcvt,
...	@@ -181,6 +210,7 @@ pub const Feature = enum {	...	@@ -181,6 +210,7 @@ pub const Feature = enum {
181	xandesvpackfph,	210	xandesvpackfph,
182	xandesvsinth,	211	xandesvsinth,
183	xandesvsintload,	212	xandesvsintload,
		213	xcheriot,
184	xcvalu,	214	xcvalu,
185	xcvbi,	215	xcvbi,
186	xcvbitmanip,	216	xcvbitmanip,
...	@@ -215,6 +245,7 @@ pub const Feature = enum {	...	@@ -215,6 +245,7 @@ pub const Feature = enum {
215	xsfcease,	245	xsfcease,
216	xsfmm128t,	246	xsfmm128t,
217	xsfmm16t,	247	xsfmm16t,
		248	xsfmm32a,
218	xsfmm32a16f,	249	xsfmm32a16f,
219	xsfmm32a32f,	250	xsfmm32a32f,
220	xsfmm32a8f,	251	xsfmm32a8f,
...	@@ -236,6 +267,7 @@ pub const Feature = enum {	...	@@ -236,6 +267,7 @@ pub const Feature = enum {
236	xsifivecdiscarddlone,	267	xsifivecdiscarddlone,
237	xsifivecflushdlone,	268	xsifivecflushdlone,
238	xsmtvdot,	269	xsmtvdot,
		270	xsmtvdotii,
239	xtheadba,	271	xtheadba,
240	xtheadbb,	272	xtheadbb,
241	xtheadbs,	273	xtheadbs,
...	@@ -275,8 +307,6 @@ pub const Feature = enum {	...	@@ -275,8 +307,6 @@ pub const Feature = enum {
275	zcmp,	307	zcmp,
276	zcmt,	308	zcmt,
277	zdinx,	309	zdinx,
278	zexth_fusion,
279	zextw_fusion,
280	zfa,	310	zfa,
281	zfbfmin,	311	zfbfmin,
282	zfh,	312	zfh,
...	@@ -290,6 +320,7 @@ pub const Feature = enum {	...	@@ -290,6 +320,7 @@ pub const Feature = enum {
290	zicboz,	320	zicboz,
291	ziccamoa,	321	ziccamoa,
292	ziccamoc,	322	ziccamoc,
		323	ziccid,
293	ziccif,	324	ziccif,
294	zicclsm,	325	zicclsm,
295	ziccrse,	326	ziccrse,
...	@@ -301,7 +332,7 @@ pub const Feature = enum {	...	@@ -301,7 +332,7 @@ pub const Feature = enum {
301	zihintpause,	332	zihintpause,
302	zihpm,	333	zihpm,
303	zilsd,	334	zilsd,
304	zilsd_4byte_align,	335	zilsd_word_align,
305	zimop,	336	zimop,
306	zk,	337	zk,
307	zkn,	338	zkn,
...	@@ -382,31 +413,11 @@ pub const all_features = blk: {	...	@@ -382,31 +413,11 @@ pub const all_features = blk: {
382	.zalrsc,	413	.zalrsc,
383	}),	414	}),
384	};	415	};
385	result[@backingInt(Feature.add_load_fusion)] = .{
386	.llvm_name = "add-load-fusion",
387	.description = "Enable ADD(.UW) + load macrofusion",
388	.dependencies = featureSet(&[_]Feature{}),
389	};
390	result[@backingInt(Feature.addi_load_fusion)] = .{
391	.llvm_name = "addi-load-fusion",
392	.description = "Enable ADDI + load macrofusion",
393	.dependencies = featureSet(&[_]Feature{}),
394	};
395	result[@backingInt(Feature.andes45)] = .{	416	result[@backingInt(Feature.andes45)] = .{
396	.llvm_name = "andes45",	417	.llvm_name = "andes45",
397	.description = "Andes 45-Series processors",	418	.description = "Andes 45-Series processors",
398	.dependencies = featureSet(&[_]Feature{}),	419	.dependencies = featureSet(&[_]Feature{}),
399	};	420	};
400	result[@backingInt(Feature.auipc_addi_fusion)] = .{
401	.llvm_name = "auipc-addi-fusion",
402	.description = "Enable AUIPC+ADDI macrofusion",
403	.dependencies = featureSet(&[_]Feature{}),
404	};
405	result[@backingInt(Feature.auipc_load_fusion)] = .{
406	.llvm_name = "auipc-load-fusion",
407	.description = "Enable AUIPC + load macrofusion",
408	.dependencies = featureSet(&[_]Feature{}),
409	};
410	result[@backingInt(Feature.b)] = .{	421	result[@backingInt(Feature.b)] = .{
411	.llvm_name = "b",	422	.llvm_name = "b",
412	.description = "'B' (the collection of the Zba, Zbb, Zbs extensions)",	423	.description = "'B' (the collection of the Zba, Zbb, Zbs extensions)",
...	@@ -416,11 +427,6 @@ pub const all_features = blk: {	...	@@ -416,11 +427,6 @@ pub const all_features = blk: {
416	.zbs,	427	.zbs,
417	}),	428	}),
418	};	429	};
419	result[@backingInt(Feature.bfext_fusion)] = .{
420	.llvm_name = "bfext-fusion",
421	.description = "Enable SLLI+SRLI (bitfield extract) macrofusion",
422	.dependencies = featureSet(&[_]Feature{}),
423	};
424	result[@backingInt(Feature.c)] = .{	430	result[@backingInt(Feature.c)] = .{
425	.llvm_name = "c",	431	.llvm_name = "c",
426	.description = "'C' (Compressed Instructions)",	432	.description = "'C' (Compressed Instructions)",
...	@@ -475,6 +481,11 @@ pub const all_features = blk: {	...	@@ -475,6 +481,11 @@ pub const all_features = blk: {
475	.description = "'E' (Embedded Instruction Set with 16 GPRs)",	481	.description = "'E' (Embedded Instruction Set with 16 GPRs)",
476	.dependencies = featureSet(&[_]Feature{}),	482	.dependencies = featureSet(&[_]Feature{}),
477	};	483	};
		484	result[@backingInt(Feature.enable_select_opt)] = .{
		485	.llvm_name = "enable-select-opt",
		486	.description = "Enable the select optimize pass for select loop heuristics",
		487	.dependencies = featureSet(&[_]Feature{}),
		488	};
478	result[@backingInt(Feature.enable_vsetvli_sched_heuristic)] = .{	489	result[@backingInt(Feature.enable_vsetvli_sched_heuristic)] = .{
479	.llvm_name = "enable-vsetvli-sched-heuristic",	490	.llvm_name = "enable-vsetvli-sched-heuristic",
480	.description = "Enable vsetvli-based scheduling heuristic",	491	.description = "Enable vsetvli-based scheduling heuristic",
...	@@ -493,7 +504,12 @@ pub const all_features = blk: {	...	@@ -493,7 +504,12 @@ pub const all_features = blk: {
493	result[@backingInt(Feature.experimental_p)] = .{	504	result[@backingInt(Feature.experimental_p)] = .{
494	.llvm_name = "experimental-p",	505	.llvm_name = "experimental-p",
495	.description = "'P' ('Base P' (Packed SIMD))",	506	.description = "'P' ('Base P' (Packed SIMD))",
496	.dependencies = featureSet(&[_]Feature{}),	507	.dependencies = featureSet(&[_]Feature{
		508	.zba,
		509	.zbb,
		510	.zicsr,
		511	.zmmul,
		512	}),
497	};	513	};
498	result[@backingInt(Feature.experimental_rvm23u32)] = .{	514	result[@backingInt(Feature.experimental_rvm23u32)] = .{
499	.llvm_name = "experimental-rvm23u32",	515	.llvm_name = "experimental-rvm23u32",
...	@@ -522,15 +538,13 @@ pub const all_features = blk: {	...	@@ -522,15 +538,13 @@ pub const all_features = blk: {
522	.description = "'Svukte' (Address-Independent Latency of User-Mode Faults to Supervisor Addresses)",	538	.description = "'Svukte' (Address-Independent Latency of User-Mode Faults to Supervisor Addresses)",
523	.dependencies = featureSet(&[_]Feature{}),	539	.dependencies = featureSet(&[_]Feature{}),
524	};	540	};
525	result[@backingInt(Feature.experimental_xrivosvisni)] = .{	541	result[@backingInt(Feature.experimental_xqccmt)] = .{
526	.llvm_name = "experimental-xrivosvisni",	542	.llvm_name = "experimental-xqccmt",
527	.description = "'XRivosVisni' (Rivos Vector Integer Small New)",	543	.description = "'Xqccmt' (Qualcomm 16-bit Table Jump)",
528	.dependencies = featureSet(&[_]Feature{}),	544	.dependencies = featureSet(&[_]Feature{
529	};	545	.zca,
530	result[@backingInt(Feature.experimental_xrivosvizip)] = .{	546	.zicsr,
531	.llvm_name = "experimental-xrivosvizip",	547	}),
532	.description = "'XRivosVizip' (Rivos Vector Register Zips)",
533	.dependencies = featureSet(&[_]Feature{}),
534	};	548	};
535	result[@backingInt(Feature.experimental_xsfmclic)] = .{	549	result[@backingInt(Feature.experimental_xsfmclic)] = .{
536	.llvm_name = "experimental-xsfmclic",	550	.llvm_name = "experimental-xsfmclic",
...	@@ -542,6 +556,11 @@ pub const all_features = blk: {	...	@@ -542,6 +556,11 @@ pub const all_features = blk: {
542	.description = "'XSfsclic' (SiFive CLIC Supervisor-mode CSRs)",	556	.description = "'XSfsclic' (SiFive CLIC Supervisor-mode CSRs)",
543	.dependencies = featureSet(&[_]Feature{}),	557	.dependencies = featureSet(&[_]Feature{}),
544	};	558	};
		559	result[@backingInt(Feature.experimental_y)] = .{
		560	.llvm_name = "experimental-y",
		561	.description = "'Y' ('Base Y' (CHERI))",
		562	.dependencies = featureSet(&[_]Feature{}),
		563	};
545	result[@backingInt(Feature.experimental_zibi)] = .{	564	result[@backingInt(Feature.experimental_zibi)] = .{
546	.llvm_name = "experimental-zibi",	565	.llvm_name = "experimental-zibi",
547	.description = "'Zibi' (Branch with Immediate)",	566	.description = "'Zibi' (Branch with Immediate)",
...	@@ -562,6 +581,11 @@ pub const all_features = blk: {	...	@@ -562,6 +581,11 @@ pub const all_features = blk: {
562	.zimop,	581	.zimop,
563	}),	582	}),
564	};	583	};
		584	result[@backingInt(Feature.experimental_zvabd)] = .{
		585	.llvm_name = "experimental-zvabd",
		586	.description = "'Zvabd' (Vector Absolute Difference)",
		587	.dependencies = featureSet(&[_]Feature{}),
		588	};
565	result[@backingInt(Feature.experimental_zvbc32e)] = .{	589	result[@backingInt(Feature.experimental_zvbc32e)] = .{
566	.llvm_name = "experimental-zvbc32e",	590	.llvm_name = "experimental-zvbc32e",
567	.description = "'Zvbc32e' (Vector Carryless Multiplication with 32-bits elements)",	591	.description = "'Zvbc32e' (Vector Carryless Multiplication with 32-bits elements)",
...	@@ -569,6 +593,20 @@ pub const all_features = blk: {	...	@@ -569,6 +593,20 @@ pub const all_features = blk: {
569	.zve32x,	593	.zve32x,
570	}),	594	}),
571	};	595	};
		596	result[@backingInt(Feature.experimental_zvdot4a8i)] = .{
		597	.llvm_name = "experimental-zvdot4a8i",
		598	.description = "'Zvdot4a8i' (Vector 4-element Dot Product of packed 8-bit Integers)",
		599	.dependencies = featureSet(&[_]Feature{
		600	.zve32x,
		601	}),
		602	};
		603	result[@backingInt(Feature.experimental_zvfbdota32f)] = .{
		604	.llvm_name = "experimental-zvfbdota32f",
		605	.description = "'Zvfbdota32f' (FP32 batched dot-product extension)",
		606	.dependencies = featureSet(&[_]Feature{
		607	.zve32f,
		608	}),
		609	};
572	result[@backingInt(Feature.experimental_zvfbfa)] = .{	610	result[@backingInt(Feature.experimental_zvfbfa)] = .{
573	.llvm_name = "experimental-zvfbfa",	611	.llvm_name = "experimental-zvfbfa",
574	.description = "'Zvfbfa' (Additional BF16 vector compute support)",	612	.description = "'Zvfbfa' (Additional BF16 vector compute support)",
...	@@ -584,6 +622,34 @@ pub const all_features = blk: {	...	@@ -584,6 +622,34 @@ pub const all_features = blk: {
584	.zve32f,	622	.zve32f,
585	}),	623	}),
586	};	624	};
		625	result[@backingInt(Feature.experimental_zvfqwbdota8f)] = .{
		626	.llvm_name = "experimental-zvfqwbdota8f",
		627	.description = "'Zvfqwbdota8f' (OCP FP8 batched dot-product extension)",
		628	.dependencies = featureSet(&[_]Feature{
		629	.zve32f,
		630	}),
		631	};
		632	result[@backingInt(Feature.experimental_zvfqwdota8f)] = .{
		633	.llvm_name = "experimental-zvfqwdota8f",
		634	.description = "'Zvfqwdota8f' (OCP FP8 Dot-Product)",
		635	.dependencies = featureSet(&[_]Feature{
		636	.zve32f,
		637	}),
		638	};
		639	result[@backingInt(Feature.experimental_zvfwbdota16bf)] = .{
		640	.llvm_name = "experimental-zvfwbdota16bf",
		641	.description = "'Zvfwbdota16bf' (BF16 batched dot-product extension)",
		642	.dependencies = featureSet(&[_]Feature{
		643	.zve32f,
		644	}),
		645	};
		646	result[@backingInt(Feature.experimental_zvfwdota16bf)] = .{
		647	.llvm_name = "experimental-zvfwdota16bf",
		648	.description = "'Zvfwdota16bf' (BF16 Dot-Product)",
		649	.dependencies = featureSet(&[_]Feature{
		650	.zve32f,
		651	}),
		652	};
587	result[@backingInt(Feature.experimental_zvkgs)] = .{	653	result[@backingInt(Feature.experimental_zvkgs)] = .{
588	.llvm_name = "experimental-zvkgs",	654	.llvm_name = "experimental-zvkgs",
589	.description = "'Zvkgs' (Vector-Scalar GCM instructions for Cryptography)",	655	.description = "'Zvkgs' (Vector-Scalar GCM instructions for Cryptography)",
...	@@ -591,9 +657,65 @@ pub const all_features = blk: {	...	@@ -591,9 +657,65 @@ pub const all_features = blk: {
591	.zvkg,	657	.zvkg,
592	}),	658	}),
593	};	659	};
594	result[@backingInt(Feature.experimental_zvqdotq)] = .{	660	result[@backingInt(Feature.experimental_zvqwbdota16i)] = .{
595	.llvm_name = "experimental-zvqdotq",	661	.llvm_name = "experimental-zvqwbdota16i",
596	.description = "'Zvqdotq' (Vector quad widening 4D Dot Product)",	662	.description = "'Zvqwbdota16i' (16-bit integer batched dot-product extension)",
		663	.dependencies = featureSet(&[_]Feature{
		664	.zve64x,
		665	}),
		666	};
		667	result[@backingInt(Feature.experimental_zvqwbdota8i)] = .{
		668	.llvm_name = "experimental-zvqwbdota8i",
		669	.description = "'Zvqwbdota8i' (8-bit integer batched dot-product extension)",
		670	.dependencies = featureSet(&[_]Feature{
		671	.zve32x,
		672	}),
		673	};
		674	result[@backingInt(Feature.experimental_zvqwdota16i)] = .{
		675	.llvm_name = "experimental-zvqwdota16i",
		676	.description = "'Zvqwdota16i' (16-bit Integer Dot-Product)",
		677	.dependencies = featureSet(&[_]Feature{
		678	.zve64x,
		679	}),
		680	};
		681	result[@backingInt(Feature.experimental_zvqwdota8i)] = .{
		682	.llvm_name = "experimental-zvqwdota8i",
		683	.description = "'Zvqwdota8i' (8-bit Integer Dot-Product)",
		684	.dependencies = featureSet(&[_]Feature{
		685	.zve32x,
		686	}),
		687	};
		688	result[@backingInt(Feature.experimental_zvvfmm)] = .{
		689	.llvm_name = "experimental-zvvfmm",
		690	.description = "'Zvvfmm' (Floating-Point Matrix Multiply-Accumulate)",
		691	.dependencies = featureSet(&[_]Feature{
		692	.zve32f,
		693	}),
		694	};
		695	result[@backingInt(Feature.experimental_zvvmm)] = .{
		696	.llvm_name = "experimental-zvvmm",
		697	.description = "'Zvvmm' (Integer Matrix Multiply-Accumulate)",
		698	.dependencies = featureSet(&[_]Feature{
		699	.zve32x,
		700	}),
		701	};
		702	result[@backingInt(Feature.experimental_zvvmtls)] = .{
		703	.llvm_name = "experimental-zvvmtls",
		704	.description = "'Zvvmtls' (Matrix Tile Load/Store)",
		705	.dependencies = featureSet(&[_]Feature{
		706	.zve32x,
		707	}),
		708	};
		709	result[@backingInt(Feature.experimental_zvvmttls)] = .{
		710	.llvm_name = "experimental-zvvmttls",
		711	.description = "'Zvvmttls' (Transposing Matrix Tile Load/Store)",
		712	.dependencies = featureSet(&[_]Feature{
		713	.zve32x,
		714	}),
		715	};
		716	result[@backingInt(Feature.experimental_zvzip)] = .{
		717	.llvm_name = "experimental-zvzip",
		718	.description = "'Zvzip' (Vector Reordering Structured Data)",
597	.dependencies = featureSet(&[_]Feature{	719	.dependencies = featureSet(&[_]Feature{
598	.zve32x,	720	.zve32x,
599	}),	721	}),
...	@@ -610,36 +732,116 @@ pub const all_features = blk: {	...	@@ -610,36 +732,116 @@ pub const all_features = blk: {
610	.description = "Assume that lock-free native-width atomics are available",	732	.description = "Assume that lock-free native-width atomics are available",
611	.dependencies = featureSet(&[_]Feature{}),	733	.dependencies = featureSet(&[_]Feature{}),
612	};	734	};
613	result[@backingInt(Feature.h)] = .{	735	result[@backingInt(Feature.fusion_add_load)] = .{
614	.llvm_name = "h",	736	.llvm_name = "fusion-add-load",
615	.description = "'H' (Hypervisor)",	737	.description = "Enable ADD(.UW) + load macrofusion",
616	.dependencies = featureSet(&[_]Feature{}),	738	.dependencies = featureSet(&[_]Feature{}),
617	};	739	};
618	result[@backingInt(Feature.i)] = .{	740	result[@backingInt(Feature.fusion_add_mem)] = .{
619	.llvm_name = "i",	741	.llvm_name = "fusion-add-mem",
620	.description = "'I' (Base Integer Instruction Set)",	742	.description = "Enable ADD+LOAD/STORE macrofusion",
		743	.dependencies = featureSet(&[_]Feature{}),
		744	};
		745	result[@backingInt(Feature.fusion_addi_load)] = .{
		746	.llvm_name = "fusion-addi-load",
		747	.description = "Enable ADDI + load macrofusion",
		748	.dependencies = featureSet(&[_]Feature{}),
		749	};
		750	result[@backingInt(Feature.fusion_auipc_addi)] = .{
		751	.llvm_name = "fusion-auipc-addi",
		752	.description = "Enable AUIPC+ADDI macrofusion",
		753	.dependencies = featureSet(&[_]Feature{}),
		754	};
		755	result[@backingInt(Feature.fusion_auipc_load)] = .{
		756	.llvm_name = "fusion-auipc-load",
		757	.description = "Enable AUIPC + load macrofusion",
		758	.dependencies = featureSet(&[_]Feature{}),
		759	};
		760	result[@backingInt(Feature.fusion_bfext)] = .{
		761	.llvm_name = "fusion-bfext",
		762	.description = "Enable SLLI+SRLI (bitfield extract) macrofusion",
621	.dependencies = featureSet(&[_]Feature{}),	763	.dependencies = featureSet(&[_]Feature{}),
622	};	764	};
623	result[@backingInt(Feature.ld_add_fusion)] = .{	765	result[@backingInt(Feature.fusion_ld_add)] = .{
624	.llvm_name = "ld-add-fusion",	766	.llvm_name = "fusion-ld-add",
625	.description = "Enable LD+ADD macrofusion",	767	.description = "Enable LD+ADD macrofusion",
626	.dependencies = featureSet(&[_]Feature{}),	768	.dependencies = featureSet(&[_]Feature{}),
627	};	769	};
628	result[@backingInt(Feature.log_vrgather)] = .{	770	result[@backingInt(Feature.fusion_logic_imm_reg)] = .{
629	.llvm_name = "log-vrgather",	771	.llvm_name = "fusion-logic-imm-reg",
630	.description = "Has vrgather.vv with LMUL*log2(LMUL) latency",	772	.description = "Enable ANDI/ORI/XORI+AND/OR/XOR macrofusion",
		773	.dependencies = featureSet(&[_]Feature{}),
		774	};
		775	result[@backingInt(Feature.fusion_logic_reg_imm)] = .{
		776	.llvm_name = "fusion-logic-reg-imm",
		777	.description = "Enable AND/OR/XOR+ANDI/ORI/XORI macrofusion",
		778	.dependencies = featureSet(&[_]Feature{}),
		779	};
		780	result[@backingInt(Feature.fusion_logic_reg_reg)] = .{
		781	.llvm_name = "fusion-logic-reg-reg",
		782	.description = "Enable AND/OR/XOR+AND/OR/XOR macrofusion",
631	.dependencies = featureSet(&[_]Feature{}),	783	.dependencies = featureSet(&[_]Feature{}),
632	};	784	};
633	result[@backingInt(Feature.lui_addi_fusion)] = .{	785	result[@backingInt(Feature.fusion_lui_addi)] = .{
634	.llvm_name = "lui-addi-fusion",	786	.llvm_name = "fusion-lui-addi",
635	.description = "Enable LUI+ADDI macro fusion",	787	.description = "Enable LUI+ADDI macro fusion",
636	.dependencies = featureSet(&[_]Feature{}),	788	.dependencies = featureSet(&[_]Feature{}),
637	};	789	};
638	result[@backingInt(Feature.lui_load_fusion)] = .{	790	result[@backingInt(Feature.fusion_lui_load)] = .{
639	.llvm_name = "lui-load-fusion",	791	.llvm_name = "fusion-lui-load",
640	.description = "Enable LUI + load macrofusion",	792	.description = "Enable LUI + load macrofusion",
641	.dependencies = featureSet(&[_]Feature{}),	793	.dependencies = featureSet(&[_]Feature{}),
642	};	794	};
		795	result[@backingInt(Feature.fusion_mul_add)] = .{
		796	.llvm_name = "fusion-mul-add",
		797	.description = "Enable MUL+ADD macrofusion",
		798	.dependencies = featureSet(&[_]Feature{}),
		799	};
		800	result[@backingInt(Feature.fusion_qc_e_li_load_store)] = .{
		801	.llvm_name = "fusion-qc-e-li-load-store",
		802	.description = "Enable QC.E.LI + Load/Store macrofusion",
		803	.dependencies = featureSet(&[_]Feature{}),
		804	};
		805	result[@backingInt(Feature.fusion_shift_bit_extract)] = .{
		806	.llvm_name = "fusion-shift-bit-extract",
		807	.description = "Enable SLLI+SRLI/SRAI macrofusion",
		808	.dependencies = featureSet(&[_]Feature{}),
		809	};
		810	result[@backingInt(Feature.fusion_shifted_zextw)] = .{
		811	.llvm_name = "fusion-shifted-zextw",
		812	.description = "Enable SLLI+SRLI to be fused when computing (shifted) word zero extension",
		813	.dependencies = featureSet(&[_]Feature{}),
		814	};
		815	result[@backingInt(Feature.fusion_shxadd_load)] = .{
		816	.llvm_name = "fusion-shxadd-load",
		817	.description = "Enable SH(1\|2\|3)ADD(.UW) + load macrofusion",
		818	.dependencies = featureSet(&[_]Feature{}),
		819	};
		820	result[@backingInt(Feature.fusion_zexth)] = .{
		821	.llvm_name = "fusion-zexth",
		822	.description = "Enable SLLI+SRLI to be fused to zero extension of halfword",
		823	.dependencies = featureSet(&[_]Feature{}),
		824	};
		825	result[@backingInt(Feature.fusion_zextw)] = .{
		826	.llvm_name = "fusion-zextw",
		827	.description = "Enable SLLI+SRLI to be fused to zero extension of word",
		828	.dependencies = featureSet(&[_]Feature{}),
		829	};
		830	result[@backingInt(Feature.h)] = .{
		831	.llvm_name = "h",
		832	.description = "'H' (Hypervisor)",
		833	.dependencies = featureSet(&[_]Feature{}),
		834	};
		835	result[@backingInt(Feature.i)] = .{
		836	.llvm_name = "i",
		837	.description = "'I' (Base Integer Instruction Set)",
		838	.dependencies = featureSet(&[_]Feature{}),
		839	};
		840	result[@backingInt(Feature.log_vrgather)] = .{
		841	.llvm_name = "log-vrgather",
		842	.description = "Has vrgather.vv with LMUL*log2(LMUL) latency",
		843	.dependencies = featureSet(&[_]Feature{}),
		844	};
643	result[@backingInt(Feature.m)] = .{	845	result[@backingInt(Feature.m)] = .{
644	.llvm_name = "m",	846	.llvm_name = "m",
645	.description = "'M' (Integer Multiplication and Division)",	847	.description = "'M' (Integer Multiplication and Division)",
...	@@ -654,7 +856,7 @@ pub const all_features = blk: {	...	@@ -654,7 +856,7 @@ pub const all_features = blk: {
654	};	856	};
655	result[@backingInt(Feature.no_default_unroll)] = .{	857	result[@backingInt(Feature.no_default_unroll)] = .{
656	.llvm_name = "no-default-unroll",	858	.llvm_name = "no-default-unroll",
657	.description = "Disable default unroll preference.",	859	.description = "Disable default unroll preference",
658	.dependencies = featureSet(&[_]Feature{}),	860	.dependencies = featureSet(&[_]Feature{}),
659	};	861	};
660	result[@backingInt(Feature.no_sink_splat_operands)] = .{	862	result[@backingInt(Feature.no_sink_splat_operands)] = .{
...	@@ -664,7 +866,7 @@ pub const all_features = blk: {	...	@@ -664,7 +866,7 @@ pub const all_features = blk: {
664	};	866	};
665	result[@backingInt(Feature.no_trailing_seq_cst_fence)] = .{	867	result[@backingInt(Feature.no_trailing_seq_cst_fence)] = .{
666	.llvm_name = "no-trailing-seq-cst-fence",	868	.llvm_name = "no-trailing-seq-cst-fence",
667	.description = "Disable trailing fence for seq-cst store.",	869	.description = "Disable trailing fence for seq-cst store",
668	.dependencies = featureSet(&[_]Feature{}),	870	.dependencies = featureSet(&[_]Feature{}),
669	};	871	};
670	result[@backingInt(Feature.optimized_nf2_segment_load_store)] = .{	872	result[@backingInt(Feature.optimized_nf2_segment_load_store)] = .{
...	@@ -717,6 +919,11 @@ pub const all_features = blk: {	...	@@ -717,6 +919,11 @@ pub const all_features = blk: {
717	.description = "Prefer likely predicted branches over selects",	919	.description = "Prefer likely predicted branches over selects",
718	.dependencies = featureSet(&[_]Feature{}),	920	.dependencies = featureSet(&[_]Feature{}),
719	};	921	};
		922	result[@backingInt(Feature.prefer_ascending_load_store)] = .{
		923	.llvm_name = "prefer-ascending-load-store",
		924	.description = "Prefer ascending load/store order for better clustering and performance",
		925	.dependencies = featureSet(&[_]Feature{}),
		926	};
720	result[@backingInt(Feature.prefer_vsetvli_over_read_vlenb)] = .{	927	result[@backingInt(Feature.prefer_vsetvli_over_read_vlenb)] = .{
721	.llvm_name = "prefer-vsetvli-over-read-vlenb",	928	.llvm_name = "prefer-vsetvli-over-read-vlenb",
722	.description = "Prefer vsetvli over read vlenb CSR to calculate VLEN",	929	.description = "Prefer vsetvli over read vlenb CSR to calculate VLEN",
...	@@ -736,7 +943,7 @@ pub const all_features = blk: {	...	@@ -736,7 +943,7 @@ pub const all_features = blk: {
736	};	943	};
737	result[@backingInt(Feature.relax)] = .{	944	result[@backingInt(Feature.relax)] = .{
738	.llvm_name = "relax",	945	.llvm_name = "relax",
739	.description = "Enable Linker relaxation.",	946	.description = "Enable Linker relaxation",
740	.dependencies = featureSet(&[_]Feature{}),	947	.dependencies = featureSet(&[_]Feature{}),
741	};	948	};
742	result[@backingInt(Feature.reserve_x1)] = .{	949	result[@backingInt(Feature.reserve_x1)] = .{
...	@@ -1187,7 +1394,7 @@ pub const all_features = blk: {	...	@@ -1187,7 +1394,7 @@ pub const all_features = blk: {
1187	};	1394	};
1188	result[@backingInt(Feature.save_restore)] = .{	1395	result[@backingInt(Feature.save_restore)] = .{
1189	.llvm_name = "save-restore",	1396	.llvm_name = "save-restore",
1190	.description = "Enable save/restore.",	1397	.description = "Enable save/restore",
1191	.dependencies = featureSet(&[_]Feature{}),	1398	.dependencies = featureSet(&[_]Feature{}),
1192	};	1399	};
1193	result[@backingInt(Feature.sdext)] = .{	1400	result[@backingInt(Feature.sdext)] = .{
...	@@ -1224,11 +1431,6 @@ pub const all_features = blk: {	...	@@ -1224,11 +1431,6 @@ pub const all_features = blk: {
1224	.description = "'Shgatpa' (SvNNx4 mode supported for all modes supported by satp, as well as Bare)",	1431	.description = "'Shgatpa' (SvNNx4 mode supported for all modes supported by satp, as well as Bare)",
1225	.dependencies = featureSet(&[_]Feature{}),	1432	.dependencies = featureSet(&[_]Feature{}),
1226	};	1433	};
1227	result[@backingInt(Feature.shifted_zextw_fusion)] = .{
1228	.llvm_name = "shifted-zextw-fusion",
1229	.description = "Enable SLLI+SRLI to be fused when computing (shifted) word zero extension",
1230	.dependencies = featureSet(&[_]Feature{}),
1231	};
1232	result[@backingInt(Feature.shlcofideleg)] = .{	1434	result[@backingInt(Feature.shlcofideleg)] = .{
1233	.llvm_name = "shlcofideleg",	1435	.llvm_name = "shlcofideleg",
1234	.description = "'Shlcofideleg' (Delegating LCOFI Interrupts to VS-mode)",	1436	.description = "'Shlcofideleg' (Delegating LCOFI Interrupts to VS-mode)",
...	@@ -1253,6 +1455,13 @@ pub const all_features = blk: {	...	@@ -1253,6 +1455,13 @@ pub const all_features = blk: {
1253	.short_forward_branch_ialu,	1455	.short_forward_branch_ialu,
1254	}),	1456	}),
1255	};	1457	};
		1458	result[@backingInt(Feature.short_forward_branch_imm)] = .{
		1459	.llvm_name = "short-forward-branch-imm",
		1460	.description = "Enable short forward branch optimization for branches with immediates",
		1461	.dependencies = featureSet(&[_]Feature{
		1462	.short_forward_branch_ialu,
		1463	}),
		1464	};
1256	result[@backingInt(Feature.short_forward_branch_imul)] = .{	1465	result[@backingInt(Feature.short_forward_branch_imul)] = .{
1257	.llvm_name = "short-forward-branch-imul",	1466	.llvm_name = "short-forward-branch-imul",
1258	.description = "Enable short forward branch optimization for MUL instruction",	1467	.description = "Enable short forward branch optimization for MUL instruction",
...	@@ -1280,11 +1489,6 @@ pub const all_features = blk: {	...	@@ -1280,11 +1489,6 @@ pub const all_features = blk: {
1280	.description = "'Shvstvecd' (vstvec supports Direct mode)",	1489	.description = "'Shvstvecd' (vstvec supports Direct mode)",
1281	.dependencies = featureSet(&[_]Feature{}),	1490	.dependencies = featureSet(&[_]Feature{}),
1282	};	1491	};
1283	result[@backingInt(Feature.shxadd_load_fusion)] = .{
1284	.llvm_name = "shxadd-load-fusion",
1285	.description = "Enable SH(1\|2\|3)ADD(.UW) + load macrofusion",
1286	.dependencies = featureSet(&[_]Feature{}),
1287	};
1288	result[@backingInt(Feature.single_element_vec_fp64)] = .{	1492	result[@backingInt(Feature.single_element_vec_fp64)] = .{
1289	.llvm_name = "single-element-vec-fp64",	1493	.llvm_name = "single-element-vec-fp64",
1290	.description = "Certain vector FP64 operations produce a single result element per cycle",	1494	.description = "Certain vector FP64 operations produce a single result element per cycle",
...	@@ -1473,6 +1677,11 @@ pub const all_features = blk: {	...	@@ -1473,6 +1677,11 @@ pub const all_features = blk: {
1473	.description = "'Svpbmt' (Page-Based Memory Types)",	1677	.description = "'Svpbmt' (Page-Based Memory Types)",
1474	.dependencies = featureSet(&[_]Feature{}),	1678	.dependencies = featureSet(&[_]Feature{}),
1475	};	1679	};
		1680	result[@backingInt(Feature.svrsw60t59b)] = .{
		1681	.llvm_name = "svrsw60t59b",
		1682	.description = "'Svrsw60t59b' (PTE Reserved-for-Software Bits 60-59)",
		1683	.dependencies = featureSet(&[_]Feature{}),
		1684	};
1476	result[@backingInt(Feature.svvptc)] = .{	1685	result[@backingInt(Feature.svvptc)] = .{
1477	.llvm_name = "svvptc",	1686	.llvm_name = "svvptc",
1478	.description = "'Svvptc' (Obviating Memory-Management Instructions after Marking PTEs Valid)",	1687	.description = "'Svvptc' (Obviating Memory-Management Instructions after Marking PTEs Valid)",
...	@@ -1521,6 +1730,13 @@ pub const all_features = blk: {	...	@@ -1521,6 +1730,13 @@ pub const all_features = blk: {
1521	.description = "VXRM writes causes pipeline flush",	1730	.description = "VXRM writes causes pipeline flush",
1522	.dependencies = featureSet(&[_]Feature{}),	1731	.dependencies = featureSet(&[_]Feature{}),
1523	};	1732	};
		1733	result[@backingInt(Feature.xaifet)] = .{
		1734	.llvm_name = "xaifet",
		1735	.description = "'XAIFET' (AI Foundry ET Extension)",
		1736	.dependencies = featureSet(&[_]Feature{
		1737	.f,
		1738	}),
		1739	};
1524	result[@backingInt(Feature.xandesbfhcvt)] = .{	1740	result[@backingInt(Feature.xandesbfhcvt)] = .{
1525	.llvm_name = "xandesbfhcvt",	1741	.llvm_name = "xandesbfhcvt",
1526	.description = "'XAndesBFHCvt' (Andes Scalar BFLOAT16 Conversion Extension)",	1742	.description = "'XAndesBFHCvt' (Andes Scalar BFLOAT16 Conversion Extension)",
...	@@ -1568,6 +1784,15 @@ pub const all_features = blk: {	...	@@ -1568,6 +1784,15 @@ pub const all_features = blk: {
1568	.zve32x,	1784	.zve32x,
1569	}),	1785	}),
1570	};	1786	};
		1787	result[@backingInt(Feature.xcheriot)] = .{
		1788	.llvm_name = "xcheriot",
		1789	.description = "'XCheriot' (CHERIoT extension)",
		1790	.dependencies = featureSet(&[_]Feature{
		1791	.e,
		1792	.m,
		1793	.zca,
		1794	}),
		1795	};
1571	result[@backingInt(Feature.xcvalu)] = .{	1796	result[@backingInt(Feature.xcvalu)] = .{
1572	.llvm_name = "xcvalu",	1797	.llvm_name = "xcvalu",
1573	.description = "'XCValu' (CORE-V ALU Operations)",	1798	.description = "'XCValu' (CORE-V ALU Operations)",
...	@@ -1787,6 +2012,15 @@ pub const all_features = blk: {	...	@@ -1787,6 +2012,15 @@ pub const all_features = blk: {
1787	.zvl64b,	2012	.zvl64b,
1788	}),	2013	}),
1789	};	2014	};
		2015	result[@backingInt(Feature.xsfmm32a)] = .{
		2016	.llvm_name = "xsfmm32a",
		2017	.description = "'XSfmm32a' (TEW=32-bit accumulation operands - int: 8b; float: fp16, bf16, fp32)",
		2018	.dependencies = featureSet(&[_]Feature{
		2019	.xsfmm32a16f,
		2020	.xsfmm32a32f,
		2021	.xsfmm32a8i,
		2022	}),
		2023	};
1790	result[@backingInt(Feature.xsfmm32a16f)] = .{	2024	result[@backingInt(Feature.xsfmm32a16f)] = .{
1791	.llvm_name = "xsfmm32a16f",	2025	.llvm_name = "xsfmm32a16f",
1792	.description = "'XSfmm32a16f' (TEW=32-bit accumulation, operands - float: 16b, widen=2 (IEEE, BF))",	2026	.description = "'XSfmm32a16f' (TEW=32-bit accumulation, operands - float: 16b, widen=2 (IEEE, BF))",
...	@@ -1938,6 +2172,13 @@ pub const all_features = blk: {	...	@@ -1938,6 +2172,13 @@ pub const all_features = blk: {
1938	.zve32f,	2172	.zve32f,
1939	}),	2173	}),
1940	};	2174	};
		2175	result[@backingInt(Feature.xsmtvdotii)] = .{
		2176	.llvm_name = "xsmtvdotii",
		2177	.description = "'XSMTVDotII' (SpacemiT Vector Extension for Matrix 2.0)",
		2178	.dependencies = featureSet(&[_]Feature{
		2179	.zve32f,
		2180	}),
		2181	};
1941	result[@backingInt(Feature.xtheadba)] = .{	2182	result[@backingInt(Feature.xtheadba)] = .{
1942	.llvm_name = "xtheadba",	2183	.llvm_name = "xtheadba",
1943	.description = "'XTHeadBa' (T-Head address calculation instructions)",	2184	.description = "'XTHeadBa' (T-Head address calculation instructions)",
...	@@ -2069,7 +2310,9 @@ pub const all_features = blk: {	...	@@ -2069,7 +2310,9 @@ pub const all_features = blk: {
2069	result[@backingInt(Feature.zbc)] = .{	2310	result[@backingInt(Feature.zbc)] = .{
2070	.llvm_name = "zbc",	2311	.llvm_name = "zbc",
2071	.description = "'Zbc' (Carry-Less Multiplication)",	2312	.description = "'Zbc' (Carry-Less Multiplication)",
2072	.dependencies = featureSet(&[_]Feature{}),	2313	.dependencies = featureSet(&[_]Feature{
		2314	.zbkc,
		2315	}),
2073	};	2316	};
2074	result[@backingInt(Feature.zbkb)] = .{	2317	result[@backingInt(Feature.zbkb)] = .{
2075	.llvm_name = "zbkb",	2318	.llvm_name = "zbkb",
...	@@ -2165,16 +2408,6 @@ pub const all_features = blk: {	...	@@ -2165,16 +2408,6 @@ pub const all_features = blk: {
2165	.zfinx,	2408	.zfinx,
2166	}),	2409	}),
2167	};	2410	};
2168	result[@backingInt(Feature.zexth_fusion)] = .{
2169	.llvm_name = "zexth-fusion",
2170	.description = "Enable SLLI+SRLI to be fused to zero extension of halfword",
2171	.dependencies = featureSet(&[_]Feature{}),
2172	};
2173	result[@backingInt(Feature.zextw_fusion)] = .{
2174	.llvm_name = "zextw-fusion",
2175	.description = "Enable SLLI+SRLI to be fused to zero extension of word",
2176	.dependencies = featureSet(&[_]Feature{}),
2177	};
2178	result[@backingInt(Feature.zfa)] = .{	2411	result[@backingInt(Feature.zfa)] = .{
2179	.llvm_name = "zfa",	2412	.llvm_name = "zfa",
2180	.description = "'Zfa' (Additional Floating-Point)",	2413	.description = "'Zfa' (Additional Floating-Point)",
...	@@ -2254,6 +2487,13 @@ pub const all_features = blk: {	...	@@ -2254,6 +2487,13 @@ pub const all_features = blk: {
2254	.description = "'Ziccamoc' (Main Memory Supports Atomics in Zacas)",	2487	.description = "'Ziccamoc' (Main Memory Supports Atomics in Zacas)",
2255	.dependencies = featureSet(&[_]Feature{}),	2488	.dependencies = featureSet(&[_]Feature{}),
2256	};	2489	};
		2490	result[@backingInt(Feature.ziccid)] = .{
		2491	.llvm_name = "ziccid",
		2492	.description = "'Ziccid' (Instruction/Data Coherence and Consistency)",
		2493	.dependencies = featureSet(&[_]Feature{
		2494	.ziccif,
		2495	}),
		2496	};
2257	result[@backingInt(Feature.ziccif)] = .{	2497	result[@backingInt(Feature.ziccif)] = .{
2258	.llvm_name = "ziccif",	2498	.llvm_name = "ziccif",
2259	.description = "'Ziccif' (Main Memory Supports Instruction Fetch with Atomicity Requirement)",	2499	.description = "'Ziccif' (Main Memory Supports Instruction Fetch with Atomicity Requirement)",
...	@@ -2313,8 +2553,8 @@ pub const all_features = blk: {	...	@@ -2313,8 +2553,8 @@ pub const all_features = blk: {
2313	.description = "'Zilsd' (Load/Store Pair Instructions)",	2553	.description = "'Zilsd' (Load/Store Pair Instructions)",
2314	.dependencies = featureSet(&[_]Feature{}),	2554	.dependencies = featureSet(&[_]Feature{}),
2315	};	2555	};
2316	result[@backingInt(Feature.zilsd_4byte_align)] = .{	2556	result[@backingInt(Feature.zilsd_word_align)] = .{
2317	.llvm_name = "zilsd-4byte-align",	2557	.llvm_name = "zilsd-word-align",
2318	.description = "Allow 4-byte alignment for Zilsd LD/SD instructions",	2558	.description = "Allow 4-byte alignment for Zilsd LD/SD instructions",
2319	.dependencies = featureSet(&[_]Feature{}),	2559	.dependencies = featureSet(&[_]Feature{}),
2320	};	2560	};
...	@@ -2543,6 +2783,7 @@ pub const all_features = blk: {	...	@@ -2543,6 +2783,7 @@ pub const all_features = blk: {
2543	.description = "'Zvknhb' (Vector SHA-2 (SHA-256 and SHA-512))",	2783	.description = "'Zvknhb' (Vector SHA-2 (SHA-256 and SHA-512))",
2544	.dependencies = featureSet(&[_]Feature{	2784	.dependencies = featureSet(&[_]Feature{
2545	.zve64x,	2785	.zve64x,
		2786	.zvknha,
2546	}),	2787	}),
2547	};	2788	};
2548	result[@backingInt(Feature.zvks)] = .{	2789	result[@backingInt(Feature.zvks)] = .{
...	@@ -2681,6 +2922,16 @@ pub const all_features = blk: {	...	@@ -2681,6 +2922,16 @@ pub const all_features = blk: {
2681	};	2922	};
2682		2923
2683	pub const cpu = struct {	2924	pub const cpu = struct {
		2925	pub const an_erbium: CpuModel = .{
		2926	.name = "an_erbium",
		2927	.llvm_name = "an-erbium",
		2928	.features = featureSet(&[_]Feature{
		2929	.@"64bit",
		2930	.c,
		2931	.m,
		2932	.xaifet,
		2933	}),
		2934	};
2684	pub const andes_45_series: CpuModel = .{	2935	pub const andes_45_series: CpuModel = .{
2685	.name = "andes_45_series",	2936	.name = "andes_45_series",
2686	.llvm_name = "andes-45-series",	2937	.llvm_name = "andes-45-series",
...	@@ -2833,6 +3084,16 @@ pub const cpu = struct {	...	@@ -2833,6 +3084,16 @@ pub const cpu = struct {
2833	.m,	3084	.m,
2834	}),	3085	}),
2835	};	3086	};
		3087	pub const et_soc1: CpuModel = .{
		3088	.name = "et_soc1",
		3089	.llvm_name = "et-soc1",
		3090	.features = featureSet(&[_]Feature{
		3091	.@"64bit",
		3092	.c,
		3093	.m,
		3094	.xaifet,
		3095	}),
		3096	};
2836	pub const generic: CpuModel = .{	3097	pub const generic: CpuModel = .{
2837	.name = "generic",	3098	.name = "generic",
2838	.llvm_name = "generic",	3099	.llvm_name = "generic",
...	@@ -2848,6 +3109,7 @@ pub const cpu = struct {	...	@@ -2848,6 +3109,7 @@ pub const cpu = struct {
2848	.llvm_name = "generic-rv32",	3109	.llvm_name = "generic-rv32",
2849	.features = featureSet(&[_]Feature{	3110	.features = featureSet(&[_]Feature{
2850	.@"32bit",	3111	.@"32bit",
		3112	.enable_select_opt,
2851	.i,	3113	.i,
2852	.optimized_nf2_segment_load_store,	3114	.optimized_nf2_segment_load_store,
2853	}),	3115	}),
...	@@ -2857,6 +3119,7 @@ pub const cpu = struct {	...	@@ -2857,6 +3119,7 @@ pub const cpu = struct {
2857	.llvm_name = "generic-rv64",	3119	.llvm_name = "generic-rv64",
2858	.features = featureSet(&[_]Feature{	3120	.features = featureSet(&[_]Feature{
2859	.@"64bit",	3121	.@"64bit",
		3122	.enable_select_opt,
2860	.i,	3123	.i,
2861	.optimized_nf2_segment_load_store,	3124	.optimized_nf2_segment_load_store,
2862	}),	3125	}),
...	@@ -3020,13 +3283,13 @@ pub const cpu = struct {	...	@@ -3020,13 +3283,13 @@ pub const cpu = struct {
3020	.features = featureSet(&[_]Feature{	3283	.features = featureSet(&[_]Feature{
3021	.@"64bit",	3284	.@"64bit",
3022	.a,	3285	.a,
3023	.auipc_addi_fusion,
3024	.b,	3286	.b,
3025	.c,	3287	.c,
3026	.conditional_cmv_fusion,	3288	.conditional_cmv_fusion,
3027	.d,	3289	.d,
		3290	.fusion_auipc_addi,
		3291	.fusion_lui_addi,
3028	.i,	3292	.i,
3029	.lui_addi_fusion,
3030	.m,	3293	.m,
3031	.no_default_unroll,	3294	.no_default_unroll,
3032	.unaligned_scalar_mem,	3295	.unaligned_scalar_mem,
...	@@ -3055,12 +3318,12 @@ pub const cpu = struct {	...	@@ -3055,12 +3318,12 @@ pub const cpu = struct {
3055	.features = featureSet(&[_]Feature{	3318	.features = featureSet(&[_]Feature{
3056	.@"64bit",	3319	.@"64bit",
3057	.a,	3320	.a,
3058	.auipc_addi_fusion,
3059	.b,	3321	.b,
3060	.c,	3322	.c,
3061	.conditional_cmv_fusion,	3323	.conditional_cmv_fusion,
		3324	.fusion_auipc_addi,
		3325	.fusion_lui_addi,
3062	.i,	3326	.i,
3063	.lui_addi_fusion,
3064	.m,	3327	.m,
3065	.no_default_unroll,	3328	.no_default_unroll,
3066	.no_sink_splat_operands,	3329	.no_sink_splat_operands,
...	@@ -3099,12 +3362,13 @@ pub const cpu = struct {	...	@@ -3099,12 +3362,13 @@ pub const cpu = struct {
3099	.features = featureSet(&[_]Feature{	3362	.features = featureSet(&[_]Feature{
3100	.@"64bit",	3363	.@"64bit",
3101	.a,	3364	.a,
3102	.auipc_addi_fusion,
3103	.c,	3365	.c,
3104	.conditional_cmv_fusion,	3366	.conditional_cmv_fusion,
3105	.d,	3367	.d,
		3368	.enable_select_opt,
		3369	.fusion_auipc_addi,
		3370	.fusion_lui_addi,
3106	.i,	3371	.i,
3107	.lui_addi_fusion,
3108	.m,	3372	.m,
3109	.no_default_unroll,	3373	.no_default_unroll,
3110	.use_postra_scheduler,	3374	.use_postra_scheduler,
...	@@ -3119,12 +3383,12 @@ pub const cpu = struct {	...	@@ -3119,12 +3383,12 @@ pub const cpu = struct {
3119	.features = featureSet(&[_]Feature{	3383	.features = featureSet(&[_]Feature{
3120	.@"64bit",	3384	.@"64bit",
3121	.a,	3385	.a,
3122	.auipc_addi_fusion,
3123	.b,	3386	.b,
3124	.c,	3387	.c,
3125	.conditional_cmv_fusion,	3388	.conditional_cmv_fusion,
		3389	.fusion_auipc_addi,
		3390	.fusion_lui_addi,
3126	.i,	3391	.i,
3127	.lui_addi_fusion,
3128	.m,	3392	.m,
3129	.no_default_unroll,	3393	.no_default_unroll,
3130	.no_sink_splat_operands,	3394	.no_sink_splat_operands,
...	@@ -3155,18 +3419,18 @@ pub const cpu = struct {	...	@@ -3155,18 +3419,18 @@ pub const cpu = struct {
3155	.zvksg,	3419	.zvksg,
3156	}),	3420	}),
3157	};	3421	};
3158	pub const sifive_p870: CpuModel = .{	3422	pub const sifive_p870_d: CpuModel = .{
3159	.name = "sifive_p870",	3423	.name = "sifive_p870_d",
3160	.llvm_name = "sifive-p870",	3424	.llvm_name = "sifive-p870-d",
3161	.features = featureSet(&[_]Feature{	3425	.features = featureSet(&[_]Feature{
3162	.@"64bit",	3426	.@"64bit",
3163	.a,	3427	.a,
3164	.auipc_addi_fusion,
3165	.b,	3428	.b,
3166	.c,	3429	.c,
3167	.conditional_cmv_fusion,	3430	.conditional_cmv_fusion,
		3431	.fusion_auipc_addi,
		3432	.fusion_lui_addi,
3168	.i,	3433	.i,
3169	.lui_addi_fusion,
3170	.m,	3434	.m,
3171	.no_default_unroll,	3435	.no_default_unroll,
3172	.no_sink_splat_operands,	3436	.no_sink_splat_operands,
...	@@ -3294,6 +3558,103 @@ pub const cpu = struct {	...	@@ -3294,6 +3558,103 @@ pub const cpu = struct {
3294	.zifencei,	3558	.zifencei,
3295	}),	3559	}),
3296	};	3560	};
		3561	pub const sifive_x160: CpuModel = .{
		3562	.name = "sifive_x160",
		3563	.llvm_name = "sifive-x160",
		3564	.features = featureSet(&[_]Feature{
		3565	.@"32bit",
		3566	.a,
		3567	.b,
		3568	.c,
		3569	.dlen_factor_2,
		3570	.experimental_zicfilp,
		3571	.experimental_zvdot4a8i,
		3572	.experimental_zvfbfa,
		3573	.i,
		3574	.m,
		3575	.no_default_unroll,
		3576	.optimized_nf2_segment_load_store,
		3577	.optimized_zero_stride_load,
		3578	.short_forward_branch_ialu,
		3579	.use_postra_scheduler,
		3580	.vl_dependent_latency,
		3581	.xsfcease,
		3582	.zawrs,
		3583	.zce,
		3584	.zcf,
		3585	.zcmop,
		3586	.zfa,
		3587	.zfh,
		3588	.zicbom,
		3589	.zicbop,
		3590	.zicboz,
		3591	.zicond,
		3592	.zifencei,
		3593	.zihintntl,
		3594	.zihintpause,
		3595	.zihpm,
		3596	.zimop,
		3597	.zkt,
		3598	.zvbb,
		3599	.zvfbfwma,
		3600	.zvfh,
		3601	.zvkt,
		3602	.zvl128b,
		3603	}),
		3604	};
		3605	pub const sifive_x180: CpuModel = .{
		3606	.name = "sifive_x180",
		3607	.llvm_name = "sifive-x180",
		3608	.features = featureSet(&[_]Feature{
		3609	.@"64bit",
		3610	.a,
		3611	.b,
		3612	.c,
		3613	.dlen_factor_2,
		3614	.experimental_zicfilp,
		3615	.experimental_zvdot4a8i,
		3616	.experimental_zvfbfa,
		3617	.i,
		3618	.m,
		3619	.no_default_unroll,
		3620	.optimized_nf2_segment_load_store,
		3621	.optimized_zero_stride_load,
		3622	.short_forward_branch_ialu,
		3623	.use_postra_scheduler,
		3624	.v,
		3625	.vl_dependent_latency,
		3626	.xsfcease,
		3627	.xsfvfbfexp16e,
		3628	.xsfvfexp16e,
		3629	.xsfvfexp32e,
		3630	.xsfvfexpa,
		3631	.xsifivecflushdlone,
		3632	.za64rs,
		3633	.zawrs,
		3634	.zcb,
		3635	.zcd,
		3636	.zcmop,
		3637	.zfa,
		3638	.zfh,
		3639	.zic64b,
		3640	.zicbom,
		3641	.zicbop,
		3642	.zicboz,
		3643	.ziccamoa,
		3644	.ziccif,
		3645	.ziccrse,
		3646	.zicond,
		3647	.zifencei,
		3648	.zihintntl,
		3649	.zihintpause,
		3650	.zihpm,
		3651	.zimop,
		3652	.zkt,
		3653	.zvbb,
		3654	.zvfbfwma,
		3655	.zvkt,
		3656	}),
		3657	};
3297	pub const sifive_x280: CpuModel = .{	3658	pub const sifive_x280: CpuModel = .{
3298	.name = "sifive_x280",	3659	.name = "sifive_x280",
3299	.llvm_name = "sifive-x280",	3660	.llvm_name = "sifive-x280",
...	@@ -3372,7 +3733,7 @@ pub const cpu = struct {	...	@@ -3372,7 +3733,7 @@ pub const cpu = struct {
3372	};	3733	};
3373	pub const spacemit_a100: CpuModel = .{	3734	pub const spacemit_a100: CpuModel = .{
3374	.name = "spacemit_a100",	3735	.name = "spacemit_a100",
3375	.llvm_name = null,	3736	.llvm_name = "spacemit-a100",
3376	.features = featureSet(&[_]Feature{	3737	.features = featureSet(&[_]Feature{
3377	.@"64bit",	3738	.@"64bit",
3378	.a,	3739	.a,
...	@@ -3405,10 +3766,10 @@ pub const cpu = struct {	...	@@ -3405,10 +3766,10 @@ pub const cpu = struct {
3405	.unaligned_scalar_mem,	3766	.unaligned_scalar_mem,
3406	.v,	3767	.v,
3407	.vxrm_pipeline_flush,	3768	.vxrm_pipeline_flush,
		3769	.xsmtvdotii,
3408	.za64rs,	3770	.za64rs,
3409	.zawrs,	3771	.zawrs,
3410	.zbc,	3772	.zbc,
3411	.zbkc,
3412	.zcb,	3773	.zcb,
3413	.zcmop,	3774	.zcmop,
3414	.zfa,	3775	.zfa,
...	@@ -3433,7 +3794,6 @@ pub const cpu = struct {	...	@@ -3433,7 +3794,6 @@ pub const cpu = struct {
3433	.zvfbfwma,	3794	.zvfbfwma,
3434	.zvfh,	3795	.zvfh,
3435	.zvkng,	3796	.zvkng,
3436	.zvknha,
3437	.zvksc,	3797	.zvksc,
3438	.zvksg,	3798	.zvksg,
3439	.zvl1024b,	3799	.zvl1024b,
...	@@ -3441,27 +3801,75 @@ pub const cpu = struct {	...	@@ -3441,27 +3801,75 @@ pub const cpu = struct {
3441	};	3801	};
3442	pub const spacemit_x100: CpuModel = .{	3802	pub const spacemit_x100: CpuModel = .{
3443	.name = "spacemit_x100",	3803	.name = "spacemit_x100",
3444	.llvm_name = null,	3804	.llvm_name = "spacemit-x100",
3445	.features = featureSet(&[_]Feature{	3805	.features = featureSet(&[_]Feature{
		3806	.@"64bit",
		3807	.a,
		3808	.b,
		3809	.c,
3446	.dlen_factor_2,	3810	.dlen_factor_2,
		3811	.fusion_add_mem,
		3812	.fusion_logic_imm_reg,
		3813	.fusion_logic_reg_imm,
		3814	.fusion_logic_reg_reg,
		3815	.fusion_mul_add,
		3816	.fusion_shift_bit_extract,
		3817	.i,
		3818	.m,
		3819	.no_default_unroll,
3447	.optimized_nf2_segment_load_store,	3820	.optimized_nf2_segment_load_store,
3448	.optimized_nf3_segment_load_store,	3821	.optimized_nf3_segment_load_store,
3449	.optimized_nf4_segment_load_store,	3822	.optimized_nf4_segment_load_store,
3450	.rva23s64,	3823	.sha,
3451	.smepmp,	3824	.smepmp,
3452	.smnpm,	3825	.smnpm,
3453	.smstateen,	3826	.smstateen,
		3827	.ssccptr,
		3828	.sscofpmf,
		3829	.sscounterenw,
		3830	.ssnpm,
3454	.sspm,	3831	.sspm,
		3832	.sstc,
		3833	.sstvala,
		3834	.sstvecd,
		3835	.ssu64xl,
		3836	.supm,
		3837	.svade,
		3838	.svbare,
		3839	.svinval,
		3840	.svnapot,
		3841	.svpbmt,
3455	.unaligned_scalar_mem,	3842	.unaligned_scalar_mem,
		3843	.v,
3456	.vxrm_pipeline_flush,	3844	.vxrm_pipeline_flush,
3457	.xsmtvdot,	3845	.xsmtvdot,
		3846	.za64rs,
		3847	.zawrs,
3458	.zbc,	3848	.zbc,
3459	.zbkc,	3849	.zcb,
		3850	.zcmop,
		3851	.zfa,
3460	.zfh,	3852	.zfh,
		3853	.zic64b,
		3854	.zicbom,
		3855	.zicbop,
		3856	.zicboz,
		3857	.ziccamoa,
		3858	.ziccif,
		3859	.zicclsm,
		3860	.ziccrse,
		3861	.zicntr,
		3862	.zicond,
		3863	.zifencei,
		3864	.zihintntl,
		3865	.zihintpause,
		3866	.zihpm,
		3867	.zimop,
		3868	.zkt,
		3869	.zvbb,
3461	.zvfbfwma,	3870	.zvfbfwma,
3462	.zvfh,	3871	.zvfh,
3463	.zvkng,	3872	.zvkng,
3464	.zvknha,
3465	.zvksc,	3873	.zvksc,
3466	.zvksg,	3874	.zvksg,
3467	.zvl256b,	3875	.zvl256b,
...	@@ -3476,11 +3884,13 @@ pub const cpu = struct {	...	@@ -3476,11 +3884,13 @@ pub const cpu = struct {
3476	.b,	3884	.b,
3477	.c,	3885	.c,
3478	.dlen_factor_2,	3886	.dlen_factor_2,
		3887	.enable_select_opt,
3479	.i,	3888	.i,
3480	.m,	3889	.m,
3481	.optimized_nf2_segment_load_store,	3890	.optimized_nf2_segment_load_store,
3482	.optimized_nf3_segment_load_store,	3891	.optimized_nf3_segment_load_store,
3483	.optimized_nf4_segment_load_store,	3892	.optimized_nf4_segment_load_store,
		3893	.prefer_ascending_load_store,
3484	.ssccptr,	3894	.ssccptr,
3485	.sscofpmf,	3895	.sscofpmf,
3486	.sscounterenw,	3896	.sscounterenw,
...	@@ -3498,7 +3908,6 @@ pub const cpu = struct {	...	@@ -3498,7 +3908,6 @@ pub const cpu = struct {
3498	.xsmtvdot,	3908	.xsmtvdot,
3499	.za64rs,	3909	.za64rs,
3500	.zbc,	3910	.zbc,
3501	.zbkc,
3502	.zfh,	3911	.zfh,
3503	.zic64b,	3912	.zic64b,
3504	.zicbom,	3913	.zicbom,
...	@@ -3652,9 +4061,9 @@ pub const cpu = struct {	...	@@ -3652,9 +4061,9 @@ pub const cpu = struct {
3652	.zkn,	4061	.zkn,
3653	}),	4062	}),
3654	};	4063	};
3655	pub const tt_ascalon_d8: CpuModel = .{	4064	pub const tt_ascalon_x: CpuModel = .{
3656	.name = "tt_ascalon_d8",	4065	.name = "tt_ascalon_x",
3657	.llvm_name = "tt-ascalon-d8",	4066	.llvm_name = "tt-ascalon-x",
3658	.features = featureSet(&[_]Feature{	4067	.features = featureSet(&[_]Feature{
3659	.@"64bit",	4068	.@"64bit",
3660	.a,	4069	.a,
...	@@ -3674,6 +4083,10 @@ pub const cpu = struct {	...	@@ -3674,6 +4083,10 @@ pub const cpu = struct {
3674	.optimized_zero_stride_load,	4083	.optimized_zero_stride_load,
3675	.sha,	4084	.sha,
3676	.smaia,	4085	.smaia,
		4086	.smmpm,
		4087	.smnpm,
		4088	.smrnmi,
		4089	.smstateen,
3677	.ssaia,	4090	.ssaia,
3678	.ssccptr,	4091	.ssccptr,
3679	.sscofpmf,	4092	.sscofpmf,
...	@@ -3715,6 +4128,7 @@ pub const cpu = struct {	...	@@ -3715,6 +4128,7 @@ pub const cpu = struct {
3715	.zihintpause,	4128	.zihintpause,
3716	.zihpm,	4129	.zihpm,
3717	.zimop,	4130	.zimop,
		4131	.zkr,
3718	.zkt,	4132	.zkt,
3719	.zvbb,	4133	.zvbb,
3720	.zvbc,	4134	.zvbc,
...	@@ -3730,27 +4144,27 @@ pub const cpu = struct {	...	@@ -3730,27 +4144,27 @@ pub const cpu = struct {
3730	.features = featureSet(&[_]Feature{	4144	.features = featureSet(&[_]Feature{
3731	.@"64bit",	4145	.@"64bit",
3732	.a,	4146	.a,
3733	.add_load_fusion,
3734	.auipc_addi_fusion,
3735	.auipc_load_fusion,
3736	.c,	4147	.c,
3737	.d,	4148	.d,
3738	.disable_misched_load_clustering,	4149	.disable_misched_load_clustering,
3739	.disable_postmisched_load_clustering,	4150	.disable_postmisched_load_clustering,
3740	.disable_postmisched_store_clustering,	4151	.disable_postmisched_store_clustering,
		4152	.fusion_add_load,
		4153	.fusion_auipc_addi,
		4154	.fusion_auipc_load,
		4155	.fusion_lui_addi,
		4156	.fusion_lui_load,
		4157	.fusion_shifted_zextw,
		4158	.fusion_zexth,
		4159	.fusion_zextw,
3741	.i,	4160	.i,
3742	.lui_addi_fusion,
3743	.lui_load_fusion,
3744	.m,	4161	.m,
3745	.shifted_zextw_fusion,
3746	.ventana_veyron,	4162	.ventana_veyron,
3747	.xventanacondops,	4163	.xventanacondops,
3748	.zba,	4164	.zba,
3749	.zbb,	4165	.zbb,
3750	.zbc,	4166	.zbc,
3751	.zbs,	4167	.zbs,
3752	.zexth_fusion,
3753	.zextw_fusion,
3754	.zicbom,	4168	.zicbom,
3755	.zicbop,	4169	.zicbop,
3756	.zicboz,	4170	.zicboz,
...	@@ -3768,11 +4182,13 @@ pub const cpu = struct {	...	@@ -3768,11 +4182,13 @@ pub const cpu = struct {
3768	.a,	4182	.a,
3769	.b,	4183	.b,
3770	.c,	4184	.c,
		4185	.fusion_shifted_zextw,
		4186	.fusion_zexth,
		4187	.fusion_zextw,
3771	.i,	4188	.i,
3772	.m,	4189	.m,
3773	.no_default_unroll,	4190	.no_default_unroll,
3774	.sha,	4191	.sha,
3775	.shifted_zextw_fusion,
3776	.smaia,	4192	.smaia,
3777	.smcsrind,	4193	.smcsrind,
3778	.smdbltrp,	4194	.smdbltrp,
...	@@ -3806,8 +4222,6 @@ pub const cpu = struct {	...	@@ -3806,8 +4222,6 @@ pub const cpu = struct {
3806	.zbc,	4222	.zbc,
3807	.zcb,	4223	.zcb,
3808	.zcmop,	4224	.zcmop,
3809	.zexth_fusion,
3810	.zextw_fusion,
3811	.zfa,	4225	.zfa,
3812	.zfh,	4226	.zfh,
3813	.zic64b,	4227	.zic64b,
...	@@ -3841,17 +4255,17 @@ pub const cpu = struct {	...	@@ -3841,17 +4255,17 @@ pub const cpu = struct {
3841	.a,	4255	.a,
3842	.c,	4256	.c,
3843	.d,	4257	.d,
		4258	.fusion_shifted_zextw,
		4259	.fusion_zexth,
		4260	.fusion_zextw,
3844	.i,	4261	.i,
3845	.m,	4262	.m,
3846	.no_default_unroll,	4263	.no_default_unroll,
3847	.shifted_zextw_fusion,
3848	.svinval,	4264	.svinval,
3849	.zba,	4265	.zba,
3850	.zbb,	4266	.zbb,
3851	.zbc,	4267	.zbc,
3852	.zbs,	4268	.zbs,
3853	.zexth_fusion,
3854	.zextw_fusion,
3855	.zicbom,	4269	.zicbom,
3856	.zicboz,	4270	.zicboz,
3857	.zifencei,	4271	.zifencei,
...	@@ -3860,4 +4274,129 @@ pub const cpu = struct {	...	@@ -3860,4 +4274,129 @@ pub const cpu = struct {
3860	.zksh,	4274	.zksh,
3861	}),	4275	}),
3862	};	4276	};
		4277	pub const xt_c910v2: CpuModel = .{
		4278	.name = "xt_c910v2",
		4279	.llvm_name = "xt-c910v2",
		4280	.features = featureSet(&[_]Feature{
		4281	.@"64bit",
		4282	.a,
		4283	.b,
		4284	.c,
		4285	.i,
		4286	.m,
		4287	.ssccptr,
		4288	.sscofpmf,
		4289	.sscounterenw,
		4290	.sstc,
		4291	.sstvala,
		4292	.sstvecd,
		4293	.ssu64xl,
		4294	.svade,
		4295	.svbare,
		4296	.svinval,
		4297	.svnapot,
		4298	.svpbmt,
		4299	.unaligned_scalar_mem,
		4300	.use_postra_scheduler,
		4301	.vxrm_pipeline_flush,
		4302	.xtheadba,
		4303	.xtheadbb,
		4304	.xtheadbs,
		4305	.xtheadcmo,
		4306	.xtheadcondmov,
		4307	.xtheadfmemidx,
		4308	.xtheadmac,
		4309	.xtheadmemidx,
		4310	.xtheadmempair,
		4311	.xtheadsync,
		4312	.za64rs,
		4313	.zawrs,
		4314	.zbc,
		4315	.zcb,
		4316	.zcd,
		4317	.zcmop,
		4318	.zfa,
		4319	.zfbfmin,
		4320	.zfh,
		4321	.zic64b,
		4322	.zicbom,
		4323	.zicbop,
		4324	.zicboz,
		4325	.ziccamoa,
		4326	.ziccif,
		4327	.zicclsm,
		4328	.ziccrse,
		4329	.zicntr,
		4330	.zicond,
		4331	.zifencei,
		4332	.zihintntl,
		4333	.zihintpause,
		4334	.zihpm,
		4335	.zimop,
		4336	.zkt,
		4337	}),
		4338	};
		4339	pub const xt_c920v2: CpuModel = .{
		4340	.name = "xt_c920v2",
		4341	.llvm_name = "xt-c920v2",
		4342	.features = featureSet(&[_]Feature{
		4343	.@"64bit",
		4344	.a,
		4345	.b,
		4346	.c,
		4347	.i,
		4348	.m,
		4349	.ssccptr,
		4350	.sscofpmf,
		4351	.sscounterenw,
		4352	.sstc,
		4353	.sstvala,
		4354	.sstvecd,
		4355	.ssu64xl,
		4356	.svade,
		4357	.svbare,
		4358	.svinval,
		4359	.svnapot,
		4360	.svpbmt,
		4361	.unaligned_scalar_mem,
		4362	.use_postra_scheduler,
		4363	.vxrm_pipeline_flush,
		4364	.xtheadba,
		4365	.xtheadbb,
		4366	.xtheadbs,
		4367	.xtheadcmo,
		4368	.xtheadcondmov,
		4369	.xtheadfmemidx,
		4370	.xtheadmac,
		4371	.xtheadmemidx,
		4372	.xtheadmempair,
		4373	.xtheadsync,
		4374	.xtheadvdot,
		4375	.za64rs,
		4376	.zawrs,
		4377	.zbc,
		4378	.zcb,
		4379	.zcd,
		4380	.zcmop,
		4381	.zfa,
		4382	.zfh,
		4383	.zic64b,
		4384	.zicbom,
		4385	.zicbop,
		4386	.zicboz,
		4387	.ziccamoa,
		4388	.ziccif,
		4389	.ziccrse,
		4390	.zicntr,
		4391	.zicond,
		4392	.zifencei,
		4393	.zihintntl,
		4394	.zihintpause,
		4395	.zihpm,
		4396	.zimop,
		4397	.zkt,
		4398	.zvfbfwma,
		4399	.zvfh,
		4400	}),
		4401	};
3863	};	4402	};

lib/std/Target/sparc.zig+1

...	@@ -462,6 +462,7 @@ pub const cpu = struct {	...	@@ -462,6 +462,7 @@ pub const cpu = struct {
462	.name = "leon3",	462	.name = "leon3",
463	.llvm_name = "leon3",	463	.llvm_name = "leon3",
464	.features = featureSet(&[_]Feature{	464	.features = featureSet(&[_]Feature{
		465	.hasleoncasa,
465	.hasumacsmac,	466	.hasumacsmac,
466	.leon,	467	.leon,
467	}),	468	}),

lib/std/Target/wasm.zig+13-4

 @@ -19,6 +19,7 @@ pub const Feature = enum {
     nontrapping_bulk_memory_len0,
     nontrapping_fptoint,
     reference_types,
+    relaxed_atomics,
     relaxed_simd,
     sign_ext,
     simd128,
 @@ -60,7 +61,10 @@ pub const all_features = blk: {
     result[@backingInt(Feature.exception_handling)] = .{
         .llvm_name = "exception-handling",
         .description = "Enable Wasm exception handling",
-        .dependencies = featureSet(&[_]Feature{}),
+        .dependencies = featureSet(&[_]Feature{
+            .multivalue,
+            .reference_types,
+        }),
     };
     result[@backingInt(Feature.extended_const)] = .{
         .llvm_name = "extended-const",
 @@ -75,7 +79,9 @@ pub const all_features = blk: {
     result[@backingInt(Feature.gc)] = .{
         .llvm_name = "gc",
         .description = "Enable wasm gc",
-        .dependencies = featureSet(&[_]Feature{}),
+        .dependencies = featureSet(&[_]Feature{
+            .reference_types,
+        }),
     };
     result[@backingInt(Feature.multimemory)] = .{
         .llvm_name = "multimemory",
 @@ -111,6 +117,11 @@ pub const all_features = blk: {
             .call_indirect_overlong,
         }),
     };
+    result[@backingInt(Feature.relaxed_atomics)] = .{
+        .llvm_name = "relaxed-atomics",
+        .description = "Enable relaxed-atomics proposal",
+        .dependencies = featureSet(&[_]Feature{}),
+    };
     result[@backingInt(Feature.relaxed_simd)] = .{
         .llvm_name = "relaxed-simd",
         .description = "Enable relaxed-simd instructions",
 @@ -156,10 +167,8 @@ pub const cpu = struct {
             .fp16,
             .gc,
             .multimemory,
-            .multivalue,
             .mutable_globals,
             .nontrapping_fptoint,
-            .reference_types,
             .relaxed_simd,
             .sign_ext,
             .simd128,

lib/std/Target/x86.zig+533-16

...	@@ -20,7 +20,6 @@ pub const Feature = enum {	...	@@ -20,7 +20,6 @@ pub const Feature = enum {
20	amx_fp8,	20	amx_fp8,
21	amx_int8,	21	amx_int8,
22	amx_movrs,	22	amx_movrs,
23	amx_tf32,
24	amx_tile,	23	amx_tile,
25	avx,	24	avx,
26	avx10_1,	25	avx10_1,
...	@@ -28,6 +27,7 @@ pub const Feature = enum {	...	@@ -28,6 +27,7 @@ pub const Feature = enum {
28	avx2,	27	avx2,
29	avx512bf16,	28	avx512bf16,
30	avx512bitalg,	29	avx512bitalg,
		30	avx512bmm,
31	avx512bw,	31	avx512bw,
32	avx512cd,	32	avx512cd,
33	avx512dq,	33	avx512dq,
...	@@ -67,13 +67,17 @@ pub const Feature = enum {	...	@@ -67,13 +67,17 @@ pub const Feature = enum {
67	enqcmd,	67	enqcmd,
68	ermsb,	68	ermsb,
69	f16c,	69	f16c,
		70	false_deps_bls,
		71	false_deps_compress,
		72	false_deps_expand,
70	false_deps_getmant,	73	false_deps_getmant,
71	false_deps_lzcnt_tzcnt,	74	false_deps_lzcnt,
72	false_deps_mulc,	75	false_deps_mulc,
73	false_deps_mullq,	76	false_deps_mullq,
74	false_deps_perm,	77	false_deps_perm,
75	false_deps_popcnt,	78	false_deps_popcnt,
76	false_deps_range,	79	false_deps_range,
		80	false_deps_tzcnt,
77	fast_11bytenop,	81	fast_11bytenop,
78	fast_15bytenop,	82	fast_15bytenop,
79	fast_7bytenop,	83	fast_7bytenop,
...	@@ -105,6 +109,7 @@ pub const Feature = enum {	...	@@ -105,6 +109,7 @@ pub const Feature = enum {
105	idivq_to_divl,	109	idivq_to_divl,
106	inline_asm_use_gpr32,	110	inline_asm_use_gpr32,
107	invpcid,	111	invpcid,
		112	jmpabs,
108	kl,	113	kl,
109	lea_sp,	114	lea_sp,
110	lea_uses_ag,	115	lea_uses_ag,
...	@@ -137,6 +142,7 @@ pub const Feature = enum {	...	@@ -137,6 +142,7 @@ pub const Feature = enum {
137	prefer_legacy_setcc,	142	prefer_legacy_setcc,
138	prefer_mask_registers,	143	prefer_mask_registers,
139	prefer_movmsk_over_vtest,	144	prefer_movmsk_over_vtest,
		145	prefer_ndd_mem,
140	prefer_no_gather,	146	prefer_no_gather,
141	prefer_no_scatter,	147	prefer_no_scatter,
142	prefetchi,	148	prefetchi,
...	@@ -149,6 +155,31 @@ pub const Feature = enum {	...	@@ -149,6 +155,31 @@ pub const Feature = enum {
149	rdpru,	155	rdpru,
150	rdrnd,	156	rdrnd,
151	rdseed,	157	rdseed,
		158	reserve_edi,
		159	reserve_r10,
		160	reserve_r11,
		161	reserve_r12,
		162	reserve_r13,
		163	reserve_r14,
		164	reserve_r15,
		165	reserve_r16,
		166	reserve_r17,
		167	reserve_r18,
		168	reserve_r19,
		169	reserve_r20,
		170	reserve_r21,
		171	reserve_r22,
		172	reserve_r23,
		173	reserve_r24,
		174	reserve_r25,
		175	reserve_r26,
		176	reserve_r27,
		177	reserve_r28,
		178	reserve_r29,
		179	reserve_r30,
		180	reserve_r31,
		181	reserve_r8,
		182	reserve_r9,
152	retpoline,	183	retpoline,
153	retpoline_external_thunk,	184	retpoline_external_thunk,
154	retpoline_indirect_branches,	185	retpoline_indirect_branches,
...	@@ -164,6 +195,7 @@ pub const Feature = enum {	...	@@ -164,6 +195,7 @@ pub const Feature = enum {
164	shstk,	195	shstk,
165	slow_3ops_lea,	196	slow_3ops_lea,
166	slow_incdec,	197	slow_incdec,
		198	slow_indirect_call,
167	slow_lea,	199	slow_lea,
168	slow_pmaddwd,	200	slow_pmaddwd,
169	slow_pmulld,	201	slow_pmulld,
...	@@ -313,13 +345,6 @@ pub const all_features = blk: {	...	@@ -313,13 +345,6 @@ pub const all_features = blk: {
313	.amx_tile,	345	.amx_tile,
314	}),	346	}),
315	};	347	};
316	result[@backingInt(Feature.amx_tf32)] = .{
317	.llvm_name = "amx-tf32",
318	.description = "Support AMX-TF32 instructions",
319	.dependencies = featureSet(&[_]Feature{
320	.amx_tile,
321	}),
322	};
323	result[@backingInt(Feature.amx_tile)] = .{	348	result[@backingInt(Feature.amx_tile)] = .{
324	.llvm_name = "amx-tile",	349	.llvm_name = "amx-tile",
325	.description = "Support AMX-TILE instructions",	350	.description = "Support AMX-TILE instructions",
...	@@ -377,6 +402,13 @@ pub const all_features = blk: {	...	@@ -377,6 +402,13 @@ pub const all_features = blk: {
377	.avx512bw,	402	.avx512bw,
378	}),	403	}),
379	};	404	};
		405	result[@backingInt(Feature.avx512bmm)] = .{
		406	.llvm_name = "avx512bmm",
		407	.description = "Enable AVX512 Bit Matrix Multiply",
		408	.dependencies = featureSet(&[_]Feature{
		409	.avx512bw,
		410	}),
		411	};
380	result[@backingInt(Feature.avx512bw)] = .{	412	result[@backingInt(Feature.avx512bw)] = .{
381	.llvm_name = "avx512bw",	413	.llvm_name = "avx512bw",
382	.description = "Enable AVX-512 Byte and Word Instructions",	414	.description = "Enable AVX-512 Byte and Word Instructions",
...	@@ -616,14 +648,29 @@ pub const all_features = blk: {	...	@@ -616,14 +648,29 @@ pub const all_features = blk: {
616	.avx,	648	.avx,
617	}),	649	}),
618	};	650	};
		651	result[@backingInt(Feature.false_deps_bls)] = .{
		652	.llvm_name = "false-deps-bls",
		653	.description = "BLSR/BLSI/BLSMSK have a false dependency on dest register",
		654	.dependencies = featureSet(&[_]Feature{}),
		655	};
		656	result[@backingInt(Feature.false_deps_compress)] = .{
		657	.llvm_name = "false-deps-compress",
		658	.description = "V[P]COMPRESSPD/PS/Q/D/W/B with zero-masking has a false dependency on dest register",
		659	.dependencies = featureSet(&[_]Feature{}),
		660	};
		661	result[@backingInt(Feature.false_deps_expand)] = .{
		662	.llvm_name = "false-deps-expand",
		663	.description = "V[P]EXPANDPD/PS/Q/D/W/B with zero-masking has a false dependency on dest register",
		664	.dependencies = featureSet(&[_]Feature{}),
		665	};
619	result[@backingInt(Feature.false_deps_getmant)] = .{	666	result[@backingInt(Feature.false_deps_getmant)] = .{
620	.llvm_name = "false-deps-getmant",	667	.llvm_name = "false-deps-getmant",
621	.description = "VGETMANTSS/SD/SH and VGETMANDPS/PD(memory version) has a false dependency on dest register",	668	.description = "VGETMANTSS/SD/SH and VGETMANDPS/PD(memory version) has a false dependency on dest register",
622	.dependencies = featureSet(&[_]Feature{}),	669	.dependencies = featureSet(&[_]Feature{}),
623	};	670	};
624	result[@backingInt(Feature.false_deps_lzcnt_tzcnt)] = .{	671	result[@backingInt(Feature.false_deps_lzcnt)] = .{
625	.llvm_name = "false-deps-lzcnt-tzcnt",	672	.llvm_name = "false-deps-lzcnt",
626	.description = "LZCNT/TZCNT have a false dependency on dest register",	673	.description = "LZCNT has a false dependency on dest register",
627	.dependencies = featureSet(&[_]Feature{}),	674	.dependencies = featureSet(&[_]Feature{}),
628	};	675	};
629	result[@backingInt(Feature.false_deps_mulc)] = .{	676	result[@backingInt(Feature.false_deps_mulc)] = .{
...	@@ -651,6 +698,11 @@ pub const all_features = blk: {	...	@@ -651,6 +698,11 @@ pub const all_features = blk: {
651	.description = "VRANGEPD/PS/SD/SS has a false dependency on dest register",	698	.description = "VRANGEPD/PS/SD/SS has a false dependency on dest register",
652	.dependencies = featureSet(&[_]Feature{}),	699	.dependencies = featureSet(&[_]Feature{}),
653	};	700	};
		701	result[@backingInt(Feature.false_deps_tzcnt)] = .{
		702	.llvm_name = "false-deps-tzcnt",
		703	.description = "TZCNT has a false dependency on dest register",
		704	.dependencies = featureSet(&[_]Feature{}),
		705	};
654	result[@backingInt(Feature.fast_11bytenop)] = .{	706	result[@backingInt(Feature.fast_11bytenop)] = .{
655	.llvm_name = "fast-11bytenop",	707	.llvm_name = "fast-11bytenop",
656	.description = "Target can quickly decode up to 11 byte NOPs",	708	.description = "Target can quickly decode up to 11 byte NOPs",
...	@@ -813,6 +865,11 @@ pub const all_features = blk: {	...	@@ -813,6 +865,11 @@ pub const all_features = blk: {
813	.description = "Invalidate Process-Context Identifier",	865	.description = "Invalidate Process-Context Identifier",
814	.dependencies = featureSet(&[_]Feature{}),	866	.dependencies = featureSet(&[_]Feature{}),
815	};	867	};
		868	result[@backingInt(Feature.jmpabs)] = .{
		869	.llvm_name = "jmpabs",
		870	.description = "Support 64-bit absolute JMP",
		871	.dependencies = featureSet(&[_]Feature{}),
		872	};
816	result[@backingInt(Feature.kl)] = .{	873	result[@backingInt(Feature.kl)] = .{
817	.llvm_name = "kl",	874	.llvm_name = "kl",
818	.description = "Support Key Locker kl Instructions",	875	.description = "Support Key Locker kl Instructions",
...	@@ -977,6 +1034,11 @@ pub const all_features = blk: {	...	@@ -977,6 +1034,11 @@ pub const all_features = blk: {
977	.description = "Prefer movmsk over vtest instruction",	1034	.description = "Prefer movmsk over vtest instruction",
978	.dependencies = featureSet(&[_]Feature{}),	1035	.dependencies = featureSet(&[_]Feature{}),
979	};	1036	};
		1037	result[@backingInt(Feature.prefer_ndd_mem)] = .{
		1038	.llvm_name = "prefer-ndd-mem",
		1039	.description = "Prefer NDD memory addressing",
		1040	.dependencies = featureSet(&[_]Feature{}),
		1041	};
980	result[@backingInt(Feature.prefer_no_gather)] = .{	1042	result[@backingInt(Feature.prefer_no_gather)] = .{
981	.llvm_name = "prefer-no-gather",	1043	.llvm_name = "prefer-no-gather",
982	.description = "Prefer no gather instructions",	1044	.description = "Prefer no gather instructions",
...	@@ -1037,6 +1099,131 @@ pub const all_features = blk: {	...	@@ -1037,6 +1099,131 @@ pub const all_features = blk: {
1037	.description = "Support RDSEED instruction",	1099	.description = "Support RDSEED instruction",
1038	.dependencies = featureSet(&[_]Feature{}),	1100	.dependencies = featureSet(&[_]Feature{}),
1039	};	1101	};
		1102	result[@backingInt(Feature.reserve_edi)] = .{
		1103	.llvm_name = "reserve-edi",
		1104	.description = "Reserve EDI, making it unavailable as a GPR",
		1105	.dependencies = featureSet(&[_]Feature{}),
		1106	};
		1107	result[@backingInt(Feature.reserve_r10)] = .{
		1108	.llvm_name = "reserve-r10",
		1109	.description = "Reserve R10, making it unavailable as a GPR",
		1110	.dependencies = featureSet(&[_]Feature{}),
		1111	};
		1112	result[@backingInt(Feature.reserve_r11)] = .{
		1113	.llvm_name = "reserve-r11",
		1114	.description = "Reserve R11, making it unavailable as a GPR",
		1115	.dependencies = featureSet(&[_]Feature{}),
		1116	};
		1117	result[@backingInt(Feature.reserve_r12)] = .{
		1118	.llvm_name = "reserve-r12",
		1119	.description = "Reserve R12, making it unavailable as a GPR",
		1120	.dependencies = featureSet(&[_]Feature{}),
		1121	};
		1122	result[@backingInt(Feature.reserve_r13)] = .{
		1123	.llvm_name = "reserve-r13",
		1124	.description = "Reserve R13, making it unavailable as a GPR",
		1125	.dependencies = featureSet(&[_]Feature{}),
		1126	};
		1127	result[@backingInt(Feature.reserve_r14)] = .{
		1128	.llvm_name = "reserve-r14",
		1129	.description = "Reserve R14, making it unavailable as a GPR",
		1130	.dependencies = featureSet(&[_]Feature{}),
		1131	};
		1132	result[@backingInt(Feature.reserve_r15)] = .{
		1133	.llvm_name = "reserve-r15",
		1134	.description = "Reserve R15, making it unavailable as a GPR",
		1135	.dependencies = featureSet(&[_]Feature{}),
		1136	};
		1137	result[@backingInt(Feature.reserve_r16)] = .{
		1138	.llvm_name = "reserve-r16",
		1139	.description = "Reserve R16, making it unavailable as a GPR",
		1140	.dependencies = featureSet(&[_]Feature{}),
		1141	};
		1142	result[@backingInt(Feature.reserve_r17)] = .{
		1143	.llvm_name = "reserve-r17",
		1144	.description = "Reserve R17, making it unavailable as a GPR",
		1145	.dependencies = featureSet(&[_]Feature{}),
		1146	};
		1147	result[@backingInt(Feature.reserve_r18)] = .{
		1148	.llvm_name = "reserve-r18",
		1149	.description = "Reserve R18, making it unavailable as a GPR",
		1150	.dependencies = featureSet(&[_]Feature{}),
		1151	};
		1152	result[@backingInt(Feature.reserve_r19)] = .{
		1153	.llvm_name = "reserve-r19",
		1154	.description = "Reserve R19, making it unavailable as a GPR",
		1155	.dependencies = featureSet(&[_]Feature{}),
		1156	};
		1157	result[@backingInt(Feature.reserve_r20)] = .{
		1158	.llvm_name = "reserve-r20",
		1159	.description = "Reserve R20, making it unavailable as a GPR",
		1160	.dependencies = featureSet(&[_]Feature{}),
		1161	};
		1162	result[@backingInt(Feature.reserve_r21)] = .{
		1163	.llvm_name = "reserve-r21",
		1164	.description = "Reserve R21, making it unavailable as a GPR",
		1165	.dependencies = featureSet(&[_]Feature{}),
		1166	};
		1167	result[@backingInt(Feature.reserve_r22)] = .{
		1168	.llvm_name = "reserve-r22",
		1169	.description = "Reserve R22, making it unavailable as a GPR",
		1170	.dependencies = featureSet(&[_]Feature{}),
		1171	};
		1172	result[@backingInt(Feature.reserve_r23)] = .{
		1173	.llvm_name = "reserve-r23",
		1174	.description = "Reserve R23, making it unavailable as a GPR",
		1175	.dependencies = featureSet(&[_]Feature{}),
		1176	};
		1177	result[@backingInt(Feature.reserve_r24)] = .{
		1178	.llvm_name = "reserve-r24",
		1179	.description = "Reserve R24, making it unavailable as a GPR",
		1180	.dependencies = featureSet(&[_]Feature{}),
		1181	};
		1182	result[@backingInt(Feature.reserve_r25)] = .{
		1183	.llvm_name = "reserve-r25",
		1184	.description = "Reserve R25, making it unavailable as a GPR",
		1185	.dependencies = featureSet(&[_]Feature{}),
		1186	};
		1187	result[@backingInt(Feature.reserve_r26)] = .{
		1188	.llvm_name = "reserve-r26",
		1189	.description = "Reserve R26, making it unavailable as a GPR",
		1190	.dependencies = featureSet(&[_]Feature{}),
		1191	};
		1192	result[@backingInt(Feature.reserve_r27)] = .{
		1193	.llvm_name = "reserve-r27",
		1194	.description = "Reserve R27, making it unavailable as a GPR",
		1195	.dependencies = featureSet(&[_]Feature{}),
		1196	};
		1197	result[@backingInt(Feature.reserve_r28)] = .{
		1198	.llvm_name = "reserve-r28",
		1199	.description = "Reserve R28, making it unavailable as a GPR",
		1200	.dependencies = featureSet(&[_]Feature{}),
		1201	};
		1202	result[@backingInt(Feature.reserve_r29)] = .{
		1203	.llvm_name = "reserve-r29",
		1204	.description = "Reserve R29, making it unavailable as a GPR",
		1205	.dependencies = featureSet(&[_]Feature{}),
		1206	};
		1207	result[@backingInt(Feature.reserve_r30)] = .{
		1208	.llvm_name = "reserve-r30",
		1209	.description = "Reserve R30, making it unavailable as a GPR",
		1210	.dependencies = featureSet(&[_]Feature{}),
		1211	};
		1212	result[@backingInt(Feature.reserve_r31)] = .{
		1213	.llvm_name = "reserve-r31",
		1214	.description = "Reserve R31, making it unavailable as a GPR",
		1215	.dependencies = featureSet(&[_]Feature{}),
		1216	};
		1217	result[@backingInt(Feature.reserve_r8)] = .{
		1218	.llvm_name = "reserve-r8",
		1219	.description = "Reserve R8, making it unavailable as a GPR",
		1220	.dependencies = featureSet(&[_]Feature{}),
		1221	};
		1222	result[@backingInt(Feature.reserve_r9)] = .{
		1223	.llvm_name = "reserve-r9",
		1224	.description = "Reserve R9, making it unavailable as a GPR",
		1225	.dependencies = featureSet(&[_]Feature{}),
		1226	};
1040	result[@backingInt(Feature.retpoline)] = .{	1227	result[@backingInt(Feature.retpoline)] = .{
1041	.llvm_name = "retpoline",	1228	.llvm_name = "retpoline",
1042	.description = "Remove speculation of indirect branches from the generated code, either by avoiding them entirely or lowering them with a speculation blocking construct",	1229	.description = "Remove speculation of indirect branches from the generated code, either by avoiding them entirely or lowering them with a speculation blocking construct",
...	@@ -1123,6 +1310,11 @@ pub const all_features = blk: {	...	@@ -1123,6 +1310,11 @@ pub const all_features = blk: {
1123	.description = "INC and DEC instructions are slower than ADD and SUB",	1310	.description = "INC and DEC instructions are slower than ADD and SUB",
1124	.dependencies = featureSet(&[_]Feature{}),	1311	.dependencies = featureSet(&[_]Feature{}),
1125	};	1312	};
		1313	result[@backingInt(Feature.slow_indirect_call)] = .{
		1314	.llvm_name = "slow-indirect-call",
		1315	.description = "Indirect calls from memory are slow",
		1316	.dependencies = featureSet(&[_]Feature{}),
		1317	};
1126	result[@backingInt(Feature.slow_lea)] = .{	1318	result[@backingInt(Feature.slow_lea)] = .{
1127	.llvm_name = "slow-lea",	1319	.llvm_name = "slow-lea",
1128	.description = "LEA instruction with certain arguments is slow",	1320	.description = "LEA instruction with certain arguments is slow",
...	@@ -2039,8 +2231,9 @@ pub const cpu = struct {	...	@@ -2039,8 +2231,9 @@ pub const cpu = struct {
2039	.cx16,	2231	.cx16,
2040	.ermsb,	2232	.ermsb,
2041	.f16c,	2233	.f16c,
2042	.false_deps_lzcnt_tzcnt,	2234	.false_deps_lzcnt,
2043	.false_deps_popcnt,	2235	.false_deps_popcnt,
		2236	.false_deps_tzcnt,
2044	.fast_15bytenop,	2237	.fast_15bytenop,
2045	.fast_scalar_fsqrt,	2238	.fast_scalar_fsqrt,
2046	.fast_shld_rotate,	2239	.fast_shld_rotate,
...	@@ -2159,6 +2352,239 @@ pub const cpu = struct {	...	@@ -2159,6 +2352,239 @@ pub const cpu = struct {
2159	.x87,	2352	.x87,
2160	}),	2353	}),
2161	};	2354	};
		2355	pub const c86_4g_m4: CpuModel = .{
		2356	.name = "c86_4g_m4",
		2357	.llvm_name = "c86-4g-m4",
		2358	.features = featureSet(&[_]Feature{
		2359	.@"64bit",
		2360	.adx,
		2361	.aes,
		2362	.allow_light_256_bit,
		2363	.avx2,
		2364	.bmi,
		2365	.bmi2,
		2366	.clflushopt,
		2367	.clzero,
		2368	.cmov,
		2369	.cx16,
		2370	.f16c,
		2371	.fast_15bytenop,
		2372	.fast_bextr,
		2373	.fast_imm16,
		2374	.fast_lzcnt,
		2375	.fast_movbe,
		2376	.fast_scalar_fsqrt,
		2377	.fast_scalar_shift_masks,
		2378	.fast_variable_perlane_shuffle,
		2379	.fast_vector_fsqrt,
		2380	.fma,
		2381	.fsgsbase,
		2382	.fxsr,
		2383	.idivq_to_divl,
		2384	.lzcnt,
		2385	.mmx,
		2386	.movbe,
		2387	.mwaitx,
		2388	.nopl,
		2389	.pclmul,
		2390	.popcnt,
		2391	.prfchw,
		2392	.rdrnd,
		2393	.rdseed,
		2394	.sahf,
		2395	.sbb_dep_breaking,
		2396	.sha,
		2397	.slow_shld,
		2398	.sse4a,
		2399	.vzeroupper,
		2400	.x87,
		2401	.xsavec,
		2402	.xsaveopt,
		2403	.xsaves,
		2404	}),
		2405	};
		2406	pub const c86_4g_m6: CpuModel = .{
		2407	.name = "c86_4g_m6",
		2408	.llvm_name = "c86-4g-m6",
		2409	.features = featureSet(&[_]Feature{
		2410	.@"64bit",
		2411	.adx,
		2412	.aes,
		2413	.allow_light_256_bit,
		2414	.avx2,
		2415	.bmi,
		2416	.bmi2,
		2417	.clflushopt,
		2418	.clzero,
		2419	.cmov,
		2420	.cx16,
		2421	.f16c,
		2422	.fast_15bytenop,
		2423	.fast_bextr,
		2424	.fast_imm16,
		2425	.fast_lzcnt,
		2426	.fast_movbe,
		2427	.fast_scalar_fsqrt,
		2428	.fast_scalar_shift_masks,
		2429	.fast_variable_perlane_shuffle,
		2430	.fast_vector_fsqrt,
		2431	.fma,
		2432	.fsgsbase,
		2433	.fxsr,
		2434	.idivq_to_divl,
		2435	.lzcnt,
		2436	.mmx,
		2437	.movbe,
		2438	.mwaitx,
		2439	.nopl,
		2440	.pclmul,
		2441	.popcnt,
		2442	.prfchw,
		2443	.rdrnd,
		2444	.rdseed,
		2445	.sahf,
		2446	.sbb_dep_breaking,
		2447	.sha,
		2448	.slow_shld,
		2449	.sse4a,
		2450	.vzeroupper,
		2451	.x87,
		2452	.xsavec,
		2453	.xsaveopt,
		2454	.xsaves,
		2455	}),
		2456	};
		2457	pub const c86_4g_m7: CpuModel = .{
		2458	.name = "c86_4g_m7",
		2459	.llvm_name = "c86-4g-m7",
		2460	.features = featureSet(&[_]Feature{
		2461	.@"64bit",
		2462	.adx,
		2463	.allow_light_256_bit,
		2464	.avx512bf16,
		2465	.avx512bitalg,
		2466	.avx512cd,
		2467	.avx512dq,
		2468	.avx512ifma,
		2469	.avx512vbmi,
		2470	.avx512vbmi2,
		2471	.avx512vl,
		2472	.avx512vnni,
		2473	.avx512vpopcntdq,
		2474	.bmi,
		2475	.bmi2,
		2476	.branchfusion,
		2477	.clflushopt,
		2478	.clwb,
		2479	.clzero,
		2480	.cmov,
		2481	.cx16,
		2482	.fast_15bytenop,
		2483	.fast_bextr,
		2484	.fast_imm16,
		2485	.fast_lzcnt,
		2486	.fast_movbe,
		2487	.fast_scalar_fsqrt,
		2488	.fast_scalar_shift_masks,
		2489	.fast_variable_perlane_shuffle,
		2490	.fast_vector_fsqrt,
		2491	.fsgsbase,
		2492	.fxsr,
		2493	.gfni,
		2494	.idivq_to_divl,
		2495	.lzcnt,
		2496	.mmx,
		2497	.movbe,
		2498	.mwaitx,
		2499	.nopl,
		2500	.popcnt,
		2501	.prefer_256_bit,
		2502	.prefer_no_gather,
		2503	.prefer_no_scatter,
		2504	.prfchw,
		2505	.rdrnd,
		2506	.rdseed,
		2507	.sahf,
		2508	.sbb_dep_breaking,
		2509	.sha,
		2510	.slow_shld,
		2511	.sse4a,
		2512	.vaes,
		2513	.vpclmulqdq,
		2514	.vzeroupper,
		2515	.wbnoinvd,
		2516	.x87,
		2517	.xsavec,
		2518	.xsaveopt,
		2519	.xsaves,
		2520	}),
		2521	};
		2522	pub const c86_4g_m8: CpuModel = .{
		2523	.name = "c86_4g_m8",
		2524	.llvm_name = "c86-4g-m8",
		2525	.features = featureSet(&[_]Feature{
		2526	.@"64bit",
		2527	.adx,
		2528	.allow_light_256_bit,
		2529	.avx512bf16,
		2530	.avx512bitalg,
		2531	.avx512cd,
		2532	.avx512dq,
		2533	.avx512ifma,
		2534	.avx512vbmi,
		2535	.avx512vbmi2,
		2536	.avx512vl,
		2537	.avx512vnni,
		2538	.avx512vpopcntdq,
		2539	.bmi,
		2540	.bmi2,
		2541	.branchfusion,
		2542	.clflushopt,
		2543	.clwb,
		2544	.clzero,
		2545	.cmov,
		2546	.cx16,
		2547	.fast_15bytenop,
		2548	.fast_bextr,
		2549	.fast_imm16,
		2550	.fast_lzcnt,
		2551	.fast_movbe,
		2552	.fast_scalar_fsqrt,
		2553	.fast_scalar_shift_masks,
		2554	.fast_variable_perlane_shuffle,
		2555	.fast_vector_fsqrt,
		2556	.fsgsbase,
		2557	.fxsr,
		2558	.gfni,
		2559	.idivq_to_divl,
		2560	.lzcnt,
		2561	.mmx,
		2562	.movbe,
		2563	.mwaitx,
		2564	.nopl,
		2565	.popcnt,
		2566	.prefer_256_bit,
		2567	.prefer_no_gather,
		2568	.prefer_no_scatter,
		2569	.prfchw,
		2570	.rdrnd,
		2571	.rdseed,
		2572	.sahf,
		2573	.sbb_dep_breaking,
		2574	.sha,
		2575	.shstk,
		2576	.slow_shld,
		2577	.sse4a,
		2578	.vaes,
		2579	.vpclmulqdq,
		2580	.vzeroupper,
		2581	.wbnoinvd,
		2582	.x87,
		2583	.xsavec,
		2584	.xsaveopt,
		2585	.xsaves,
		2586	}),
		2587	};
2162	pub const cannonlake: CpuModel = .{	2588	pub const cannonlake: CpuModel = .{
2163	.name = "cannonlake",	2589	.name = "cannonlake",
2164	.llvm_name = "cannonlake",	2590	.llvm_name = "cannonlake",
...	@@ -2467,7 +2893,6 @@ pub const cpu = struct {	...	@@ -2467,7 +2893,6 @@ pub const cpu = struct {
2467	.amx_fp8,	2893	.amx_fp8,
2468	.amx_int8,	2894	.amx_int8,
2469	.amx_movrs,	2895	.amx_movrs,
2470	.amx_tf32,
2471	.avx10_2,	2896	.avx10_2,
2472	.avxifma,	2897	.avxifma,
2473	.avxneconvert,	2898	.avxneconvert,
...	@@ -2505,6 +2930,7 @@ pub const cpu = struct {	...	@@ -2505,6 +2930,7 @@ pub const cpu = struct {
2505	.gfni,	2930	.gfni,
2506	.idivq_to_divl,	2931	.idivq_to_divl,
2507	.invpcid,	2932	.invpcid,
		2933	.jmpabs,
2508	.lzcnt,	2934	.lzcnt,
2509	.macrofusion,	2935	.macrofusion,
2510	.mmx,	2936	.mmx,
...	@@ -2523,6 +2949,7 @@ pub const cpu = struct {	...	@@ -2523,6 +2949,7 @@ pub const cpu = struct {
2523	.popcnt,	2949	.popcnt,
2524	.ppx,	2950	.ppx,
2525	.prefer_256_bit,	2951	.prefer_256_bit,
		2952	.prefer_legacy_setcc,
2526	.prefetchi,	2953	.prefetchi,
2527	.prfchw,	2954	.prfchw,
2528	.ptwrite,	2955	.ptwrite,
...	@@ -3056,8 +3483,9 @@ pub const cpu = struct {	...	@@ -3056,8 +3483,9 @@ pub const cpu = struct {
3056	.cx16,	3483	.cx16,
3057	.ermsb,	3484	.ermsb,
3058	.f16c,	3485	.f16c,
3059	.false_deps_lzcnt_tzcnt,	3486	.false_deps_lzcnt,
3060	.false_deps_popcnt,	3487	.false_deps_popcnt,
		3488	.false_deps_tzcnt,
3061	.fast_15bytenop,	3489	.fast_15bytenop,
3062	.fast_scalar_fsqrt,	3490	.fast_scalar_fsqrt,
3063	.fast_shld_rotate,	3491	.fast_shld_rotate,
...	@@ -3679,6 +4107,7 @@ pub const cpu = struct {	...	@@ -3679,6 +4107,7 @@ pub const cpu = struct {
3679	.hreset,	4107	.hreset,
3680	.idivq_to_divl,	4108	.idivq_to_divl,
3681	.invpcid,	4109	.invpcid,
		4110	.jmpabs,
3682	.lzcnt,	4111	.lzcnt,
3683	.macrofusion,	4112	.macrofusion,
3684	.mmx,	4113	.mmx,
...	@@ -3696,6 +4125,7 @@ pub const cpu = struct {	...	@@ -3696,6 +4125,7 @@ pub const cpu = struct {
3696	.pku,	4125	.pku,
3697	.popcnt,	4126	.popcnt,
3698	.ppx,	4127	.ppx,
		4128	.prefer_legacy_setcc,
3699	.prefer_movmsk_over_vtest,	4129	.prefer_movmsk_over_vtest,
3700	.prefetchi,	4130	.prefetchi,
3701	.prfchw,	4131	.prfchw,
...	@@ -4813,8 +5243,9 @@ pub const cpu = struct {	...	@@ -4813,8 +5243,9 @@ pub const cpu = struct {
4813	.cmov,	5243	.cmov,
4814	.cx16,	5244	.cx16,
4815	.f16c,	5245	.f16c,
4816	.false_deps_lzcnt_tzcnt,	5246	.false_deps_lzcnt,
4817	.false_deps_popcnt,	5247	.false_deps_popcnt,
		5248	.false_deps_tzcnt,
4818	.fast_15bytenop,	5249	.fast_15bytenop,
4819	.fast_scalar_fsqrt,	5250	.fast_scalar_fsqrt,
4820	.fast_shld_rotate,	5251	.fast_shld_rotate,
...	@@ -5086,6 +5517,8 @@ pub const cpu = struct {	...	@@ -5086,6 +5517,8 @@ pub const cpu = struct {
5086	.clzero,	5517	.clzero,
5087	.cmov,	5518	.cmov,
5088	.cx16,	5519	.cx16,
		5520	.false_deps_compress,
		5521	.false_deps_expand,
5089	.fast_15bytenop,	5522	.fast_15bytenop,
5090	.fast_bextr,	5523	.fast_bextr,
5091	.fast_dpwssd,	5524	.fast_dpwssd,
...	@@ -5159,6 +5592,10 @@ pub const cpu = struct {	...	@@ -5159,6 +5592,10 @@ pub const cpu = struct {
5159	.clzero,	5592	.clzero,
5160	.cmov,	5593	.cmov,
5161	.cx16,	5594	.cx16,
		5595	.false_deps_bls,
		5596	.false_deps_compress,
		5597	.false_deps_expand,
		5598	.false_deps_tzcnt,
5162	.fast_15bytenop,	5599	.fast_15bytenop,
5163	.fast_bextr,	5600	.fast_bextr,
5164	.fast_dpwssd,	5601	.fast_dpwssd,
...	@@ -5195,6 +5632,7 @@ pub const cpu = struct {	...	@@ -5195,6 +5632,7 @@ pub const cpu = struct {
5195	.sbb_dep_breaking,	5632	.sbb_dep_breaking,
5196	.sha,	5633	.sha,
5197	.shstk,	5634	.shstk,
		5635	.slow_indirect_call,
5198	.smap,	5636	.smap,
5199	.smep,	5637	.smep,
5200	.sse4a,	5638	.sse4a,
...	@@ -5208,4 +5646,83 @@ pub const cpu = struct {	...	@@ -5208,4 +5646,83 @@ pub const cpu = struct {
5208	.xsaves,	5646	.xsaves,
5209	}),	5647	}),
5210	};	5648	};
		5649	pub const znver6: CpuModel = .{
		5650	.name = "znver6",
		5651	.llvm_name = "znver6",
		5652	.features = featureSet(&[_]Feature{
		5653	.@"64bit",
		5654	.adx,
		5655	.allow_light_256_bit,
		5656	.avx512bf16,
		5657	.avx512bitalg,
		5658	.avx512bmm,
		5659	.avx512cd,
		5660	.avx512dq,
		5661	.avx512fp16,
		5662	.avx512ifma,
		5663	.avx512vbmi,
		5664	.avx512vbmi2,
		5665	.avx512vl,
		5666	.avx512vnni,
		5667	.avx512vp2intersect,
		5668	.avx512vpopcntdq,
		5669	.avxifma,
		5670	.avxneconvert,
		5671	.avxvnni,
		5672	.avxvnniint8,
		5673	.bmi,
		5674	.bmi2,
		5675	.branchfusion,
		5676	.clflushopt,
		5677	.clwb,
		5678	.clzero,
		5679	.cmov,
		5680	.cx16,
		5681	.fast_15bytenop,
		5682	.fast_bextr,
		5683	.fast_dpwssd,
		5684	.fast_imm16,
		5685	.fast_lzcnt,
		5686	.fast_movbe,
		5687	.fast_scalar_fsqrt,
		5688	.fast_scalar_shift_masks,
		5689	.fast_variable_perlane_shuffle,
		5690	.fast_vector_fsqrt,
		5691	.fsgsbase,
		5692	.fsrm,
		5693	.fxsr,
		5694	.gfni,
		5695	.idivq_to_divl,
		5696	.invpcid,
		5697	.lzcnt,
		5698	.macrofusion,
		5699	.mmx,
		5700	.movbe,
		5701	.movdir64b,
		5702	.movdiri,
		5703	.mwaitx,
		5704	.nopl,
		5705	.pku,
		5706	.popcnt,
		5707	.prefetchi,
		5708	.prfchw,
		5709	.rdpid,
		5710	.rdpru,
		5711	.rdrnd,
		5712	.rdseed,
		5713	.sahf,
		5714	.sbb_dep_breaking,
		5715	.sha,
		5716	.shstk,
		5717	.sse4a,
		5718	.vaes,
		5719	.vpclmulqdq,
		5720	.vzeroupper,
		5721	.wbnoinvd,
		5722	.x87,
		5723	.xsavec,
		5724	.xsaveopt,
		5725	.xsaves,
		5726	}),
		5727	};
5211	};	5728	};

lib/std/Target/xtensa.zig+35

...	@@ -13,6 +13,7 @@ pub const Feature = enum {	...	@@ -13,6 +13,7 @@ pub const Feature = enum {
13	density,	13	density,
14	dfpaccel,	14	dfpaccel,
15	div32,	15	div32,
		16	esp32s2ops,
16	exception,	17	exception,
17	extendedl32r,	18	extendedl32r,
18	forced_atomics,	19	forced_atomics,
...	@@ -93,6 +94,11 @@ pub const all_features = blk: {	...	@@ -93,6 +94,11 @@ pub const all_features = blk: {
93	.description = "Enable Xtensa Div32 option",	94	.description = "Enable Xtensa Div32 option",
94	.dependencies = featureSet(&[_]Feature{}),	95	.dependencies = featureSet(&[_]Feature{}),
95	};	96	};
		97	result[@backingInt(Feature.esp32s2ops)] = .{
		98	.llvm_name = "esp32s2ops",
		99	.description = "Support Xtensa esp32-s2 ISA extension",
		100	.dependencies = featureSet(&[_]Feature{}),
		101	};
96	result[@backingInt(Feature.exception)] = .{	102	result[@backingInt(Feature.exception)] = .{
97	.llvm_name = "exception",	103	.llvm_name = "exception",
98	.description = "Enable Xtensa Exception option",	104	.description = "Enable Xtensa Exception option",
...	@@ -291,6 +297,35 @@ pub const cpu = struct {	...	@@ -291,6 +297,35 @@ pub const cpu = struct {
291	.windowed,	297	.windowed,
292	}),	298	}),
293	};	299	};
		300	pub const esp32s2: CpuModel = .{
		301	.name = "esp32s2",
		302	.llvm_name = "esp32s2",
		303	.features = featureSet(&[_]Feature{
		304	.clamps,
		305	.coprocessor,
		306	.dcache,
		307	.debug,
		308	.density,
		309	.div32,
		310	.esp32s2ops,
		311	.exception,
		312	.highpriinterrupts_level7,
		313	.interrupt,
		314	.minmax,
		315	.miscsr,
		316	.mul16,
		317	.mul32,
		318	.mul32high,
		319	.nsa,
		320	.prid,
		321	.regprotect,
		322	.rvector,
		323	.sext,
		324	.threadptr,
		325	.timers3,
		326	.windowed,
		327	}),
		328	};
294	pub const esp8266: CpuModel = .{	329	pub const esp8266: CpuModel = .{
295	.name = "esp8266",	330	.name = "esp8266",
296	.llvm_name = "esp8266",	331	.llvm_name = "esp8266",

lib/std/c.zig+2

...	@@ -11389,6 +11389,8 @@ pub extern "c" fn div(a: c_int, b: c_int) div_t;	...	@@ -11389,6 +11389,8 @@ pub extern "c" fn div(a: c_int, b: c_int) div_t;
11389	pub extern "c" fn ldiv(a: c_long, b: c_long) ldiv_t;	11389	pub extern "c" fn ldiv(a: c_long, b: c_long) ldiv_t;
11390	pub extern "c" fn lldiv(a: c_longlong, b: c_longlong) lldiv_t;	11390	pub extern "c" fn lldiv(a: c_longlong, b: c_longlong) lldiv_t;
11391		11391
		11392	pub extern "c" fn wcslen(s: [*:0]const wchar_t) usize;
		11393
11392	pub extern "c" fn atoi(str: [*:0]const c_char) c_int;	11394	pub extern "c" fn atoi(str: [*:0]const c_char) c_int;
11393	pub extern "c" fn atol(str: [*:0]const c_char) c_long;	11395	pub extern "c" fn atol(str: [*:0]const c_char) c_long;
11394	pub extern "c" fn atoll(str: [*:0]const c_char) c_longlong;	11396	pub extern "c" fn atoll(str: [*:0]const c_char) c_longlong;

lib/std/crypto/ecdsa.zig+3

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	const builtin = @import("builtin");
1	const std = @import("std");	2	const std = @import("std");
2	const crypto = std.crypto;	3	const crypto = std.crypto;
3	const fmt = std.fmt;	4	const fmt = std.fmt;
...	@@ -439,6 +440,8 @@ test "Basic operations over EcdsaP384Sha384" {	...	@@ -439,6 +440,8 @@ test "Basic operations over EcdsaP384Sha384" {
439	}	440	}
440		441
441	test "Basic operations over Secp256k1" {	442	test "Basic operations over Secp256k1" {
		443	if (builtin.zig_backend == .stage2_llvm and builtin.target.cpu.arch.isPowerpc64()) return error.SkipZigTest; // https://codeberg.org/ziglang/zig/issues/37121
		444
442	const io = testing.io;	445	const io = testing.io;
443	const Scheme = EcdsaSecp256k1Sha256oSha256;	446	const Scheme = EcdsaSecp256k1Sha256oSha256;
444	const kp = Scheme.KeyPair.generate(io);	447	const kp = Scheme.KeyPair.generate(io);

lib/std/crypto/ml_dsa.zig+6

lib/std/crypto/pcurves/tests/secp256k1.zig+19

lib/std/debug.zig-3

...	@@ -271,9 +271,6 @@ pub const sys_can_stack_trace = switch (builtin.cpu.arch) {	...	@@ -271,9 +271,6 @@ pub const sys_can_stack_trace = switch (builtin.cpu.arch) {
271	.bpfeb,	271	.bpfeb,
272	=> false,	272	=> false,
273		273
274	// https://codeberg.org/ziglang/zig/issues/31127
275	.avr => false,
276
277	else => true,	274	else => true,
278	};	275	};
279		276

lib/std/debug/Dwarf.zig-1

...	@@ -1597,7 +1597,6 @@ pub fn spRegNum(arch: std.Target.Cpu.Arch) u16 {	...	@@ -1597,7 +1597,6 @@ pub fn spRegNum(arch: std.Target.Cpu.Arch) u16 {
1597	/// library has a working implementation of unwinding for the current target.	1597	/// library has a working implementation of unwinding for the current target.
1598	pub fn supportsUnwinding(target: *const std.Target) bool {	1598	pub fn supportsUnwinding(target: *const std.Target) bool {
1599	return switch (target.cpu.arch) {	1599	return switch (target.cpu.arch) {
1600	.amdgcn,
1601	.nvptx,	1600	.nvptx,
1602	.nvptx64,	1601	.nvptx64,
1603	.spirv32,	1602	.spirv32,

lib/std/lang.zig+2-4

 @@ -322,9 +322,11 @@ pub const CallingConvention = union(enum(u8)) {
     /// The standard `loongarch64` calling convention.
     loongarch64_lp64: CommonOptions,
+    loongarch64_preserve_none: CommonOptions,
     /// The standard `loongarch32` calling convention.
     loongarch32_ilp32: CommonOptions,
+    loongarch32_preserve_none: CommonOptions,
     // Calling conventions for the `m68k` architecture.
     m68k_sysv: CommonOptions,
 @@ -615,10 +617,6 @@ pub const AddressSpace = enum(u5) {
     /// This address space only addresses the "lookup" ram
     lut,
-    // Web Assembly
-    externref,
-    funcref,
 };
 /// This data structure is used by the Zig language code generation and

lib/std/pdb.zig+1

...	@@ -310,6 +310,7 @@ pub const SymbolKind = enum(u16) {	...	@@ -310,6 +310,7 @@ pub const SymbolKind = enum(u16) {
310	gmandata = 4381,	310	gmandata = 4381,
311	lthread32 = 4370,	311	lthread32 = 4370,
312	gthread32 = 4371,	312	gthread32 = 4371,
		313	_,
313	};	314	};
314		315
315	pub const TypeIndex = u32;	316	pub const TypeIndex = u32;

lib/std/zig/llvm/Builder.zig+26-8

...	@@ -508,7 +508,7 @@ pub const DataLayout = struct {	...	@@ -508,7 +508,7 @@ pub const DataLayout = struct {
508	"E-m:e-p:64:64-i64:64-i128:128-n32:64-S128",	508	"E-m:e-p:64:64-i64:64-i128:128-n32:64-S128",
509	.sparc => "E-m:e-p:32:32-i64:64-i128:128-f128:64-n32-S64",	509	.sparc => "E-m:e-p:32:32-i64:64-i128:128-f128:64-n32-S64",
510	.sparc64 => "E-m:e-i64:64-i128:128-n32:64-S128",	510	.sparc64 => "E-m:e-i64:64-i128:128-n32:64-S128",
511	.s390x => "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64",	511	.s390x => "E-S64-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64",
512	.x86 => if (target.os.tag == .windows or target.os.tag == .uefi) switch (target.abi) {	512	.x86 => if (target.os.tag == .windows or target.os.tag == .uefi) switch (target.abi) {
513	.gnu => if (target.ofmt == .coff)	513	.gnu => if (target.ofmt == .coff)
514	"e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:32-n8:16:32-a:0:32-S32"	514	"e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:32-n8:16:32-a:0:32-S32"
...	@@ -2840,7 +2840,6 @@ pub const AddrSpace = enum(u24) {	...	@@ -2840,7 +2840,6 @@ pub const AddrSpace = enum(u24) {
2840	pub const gs: AddrSpace = @fromBackingInt(256);	2840	pub const gs: AddrSpace = @fromBackingInt(256);
2841	pub const fs: AddrSpace = @fromBackingInt(257);	2841	pub const fs: AddrSpace = @fromBackingInt(257);
2842	pub const ss: AddrSpace = @fromBackingInt(258);	2842	pub const ss: AddrSpace = @fromBackingInt(258);
2843
2844	pub const ptr32_sptr: AddrSpace = @fromBackingInt(270);	2843	pub const ptr32_sptr: AddrSpace = @fromBackingInt(270);
2845	pub const ptr32_uptr: AddrSpace = @fromBackingInt(271);	2844	pub const ptr32_uptr: AddrSpace = @fromBackingInt(271);
2846	pub const ptr64: AddrSpace = @fromBackingInt(272);	2845	pub const ptr64: AddrSpace = @fromBackingInt(272);
...	@@ -2858,17 +2857,19 @@ pub const AddrSpace = enum(u24) {	...	@@ -2858,17 +2857,19 @@ pub const AddrSpace = enum(u24) {
2858	pub const program5: AddrSpace = @fromBackingInt(6);	2857	pub const program5: AddrSpace = @fromBackingInt(6);
2859	};	2858	};
2860		2859
2861	// See llvm/lib/Target/NVPTX/NVPTX.h	2860	// See llvm/include/llvm/Support/NVPTXAddrSpace.h
2862	pub const nvptx = struct {	2861	pub const nvptx = struct {
2863	pub const generic: AddrSpace = @fromBackingInt(0);	2862	pub const generic: AddrSpace = @fromBackingInt(0);
2864	pub const global: AddrSpace = @fromBackingInt(1);	2863	pub const global: AddrSpace = @fromBackingInt(1);
2865	pub const constant: AddrSpace = @fromBackingInt(2);
2866	pub const shared: AddrSpace = @fromBackingInt(3);	2864	pub const shared: AddrSpace = @fromBackingInt(3);
2867	pub const param: AddrSpace = @fromBackingInt(4);	2865	pub const constant: AddrSpace = @fromBackingInt(4);
2868	pub const local: AddrSpace = @fromBackingInt(5);	2866	pub const local: AddrSpace = @fromBackingInt(5);
		2867	pub const tensor: AddrSpace = @fromBackingInt(6);
		2868	pub const shared_cluster: AddrSpace = @fromBackingInt(7);
		2869	pub const entry_param: AddrSpace = @fromBackingInt(101);
2869	};	2870	};
2870		2871
2871	// See llvm/lib/Target/AMDGPU/AMDGPU.h	2872	// See llvm/include/llvm/Support/AMDGPUAddrSpace.h
2872	pub const amdgpu = struct {	2873	pub const amdgpu = struct {
2873	pub const flat: AddrSpace = @fromBackingInt(0);	2874	pub const flat: AddrSpace = @fromBackingInt(0);
2874	pub const global: AddrSpace = @fromBackingInt(1);	2875	pub const global: AddrSpace = @fromBackingInt(1);
...	@@ -2901,6 +2902,7 @@ pub const AddrSpace = enum(u24) {	...	@@ -2901,6 +2902,7 @@ pub const AddrSpace = enum(u24) {
2901	pub const streamout_register: AddrSpace = @fromBackingInt(128);	2902	pub const streamout_register: AddrSpace = @fromBackingInt(128);
2902	};	2903	};
2903		2904
		2905	// See llvm/lib/Target/SPIRV/SPIRVUtils.h
2904	pub const spirv = struct {	2906	pub const spirv = struct {
2905	pub const function: AddrSpace = @fromBackingInt(0);	2907	pub const function: AddrSpace = @fromBackingInt(0);
2906	pub const cross_workgroup: AddrSpace = @fromBackingInt(1);	2908	pub const cross_workgroup: AddrSpace = @fromBackingInt(1);
...	@@ -2910,14 +2912,30 @@ pub const AddrSpace = enum(u24) {	...	@@ -2910,14 +2912,30 @@ pub const AddrSpace = enum(u24) {
2910	pub const device_only_intel: AddrSpace = @fromBackingInt(5);	2912	pub const device_only_intel: AddrSpace = @fromBackingInt(5);
2911	pub const host_only_intel: AddrSpace = @fromBackingInt(6);	2913	pub const host_only_intel: AddrSpace = @fromBackingInt(6);
2912	pub const input: AddrSpace = @fromBackingInt(7);	2914	pub const input: AddrSpace = @fromBackingInt(7);
		2915	pub const output: AddrSpace = @fromBackingInt(8);
		2916	pub const code_section_intel: AddrSpace = @fromBackingInt(9);
		2917	pub const private: AddrSpace = @fromBackingInt(10);
		2918	pub const storage_buffer: AddrSpace = @fromBackingInt(11);
		2919	pub const uniform: AddrSpace = @fromBackingInt(12);
		2920	pub const push_constant: AddrSpace = @fromBackingInt(13);
2913	};	2921	};
2914		2922
2915	// See llvm/include/llvm/CodeGen/WasmAddressSpaces.h	2923	// See llvm/include/llvm/CodeGen/WasmAddressSpaces.h
2916	pub const wasm = struct {	2924	pub const wasm = struct {
2917	pub const default: AddrSpace = @fromBackingInt(0);	2925	pub const default: AddrSpace = @fromBackingInt(0);
2918	pub const variable: AddrSpace = @fromBackingInt(1);	2926	pub const variable: AddrSpace = @fromBackingInt(1);
2919	pub const externref: AddrSpace = @fromBackingInt(10);	2927	};
2920	pub const funcref: AddrSpace = @fromBackingInt(20);	2928
		2929	// See llvm/lib/TargetParser/TargetDataLayout.cpp
		2930	pub const riscv = struct {
		2931	pub const purecap: AddrSpace = @fromBackingInt(200);
		2932	};
		2933
		2934	// See llvm/lib/Target/AArch64/AArch64ISelLowering.h
		2935	pub const aarch64 = struct {
		2936	pub const ptr32_sptr: AddrSpace = @fromBackingInt(270);
		2937	pub const ptr32_uptr: AddrSpace = @fromBackingInt(271);
		2938	pub const ptr64: AddrSpace = @fromBackingInt(272);
2921	};	2939	};
2922		2940
2923	pub fn format(addr_space: AddrSpace, w: *Writer) Writer.Error!void {	2941	pub fn format(addr_space: AddrSpace, w: *Writer) Writer.Error!void {

lib/std/zig/system/arm.zig+2

 @@ -121,11 +121,13 @@ pub const cpu_models = struct {
     // implementer = 0x48
     const HiSilicon = [_]E{
         E{ .part = 0xd01, .m64 = &A64.tsv110 },
+        E{ .part = 0xd06, .m64 = &A64.hip12 },
     };
     // implementer = 0x4e
     const Nvidia = [_]E{
         E{ .part = 0x004, .m64 = &A64.carmel },
         E{ .part = 0x010, .m64 = &A64.olympus },
+        E{ .part = 0x011, .m64 = &A64.rigel },
     };
     // implementer = 0x50
     const Ampere = [_]E{

lib/std/zig/system/freebsd.zig+3-3

...	@@ -80,11 +80,11 @@ const arm = struct {	...	@@ -80,11 +80,11 @@ const arm = struct {
80	const powerpc = struct {	80	const powerpc = struct {
81	const models = .{	81	const models = .{
82	.{ "Freescale e500v1 core", &std.Target.powerpc.cpu.e500 },	82	.{ "Freescale e500v1 core", &std.Target.powerpc.cpu.e500 },
83	.{ "Freescale e500v2 core", &std.Target.powerpc.cpu.e500 }, // TODO: This should have efpu2.	83	.{ "Freescale e500v2 core", &std.Target.powerpc.cpu.e500v2 },
84	.{ "Freescale e500mc core", &std.Target.powerpc.cpu.e500mc },	84	.{ "Freescale e500mc core", &std.Target.powerpc.cpu.e500mc },
85	.{ "Freescale e5500 core", &std.Target.powerpc.cpu.e5500 },	85	.{ "Freescale e5500 core", &std.Target.powerpc.cpu.e5500 },
86	.{ "Freescale e6500 core", &std.Target.powerpc.cpu.e5500 }, // TODO: This should have altivec.	86	.{ "Freescale e6500 core", &std.Target.powerpc.cpu.e6500 },
87	.{ "IBM Cell Broadband Engine", &std.Target.powerpc.cpu.ppc64 },	87	.{ "IBM Cell Broadband Engine", &std.Target.powerpc.cpu.cell },
88	.{ "IBM PowerPC 750FX", &std.Target.powerpc.cpu.@"750" },	88	.{ "IBM PowerPC 750FX", &std.Target.powerpc.cpu.@"750" },
89	.{ "IBM PowerPC 970", &std.Target.powerpc.cpu.@"970" },	89	.{ "IBM PowerPC 970", &std.Target.powerpc.cpu.@"970" },
90	.{ "IBM PowerPC 970FX", &std.Target.powerpc.cpu.@"970" },	90	.{ "IBM PowerPC 970FX", &std.Target.powerpc.cpu.@"970" },

lib/std/zig/system/linux.zig+3-3

lib/std/zig/system/openbsd.zig+4-5

 @@ -38,11 +38,10 @@ const aarch64 = struct {
         .{ "Apple Avalanche Pro", &std.Target.aarch64.cpu.apple_m2 },
         .{ "Apple Avalanche", &std.Target.aarch64.cpu.apple_m2 },
         .{ "Applied Micro X-Gene", &std.Target.aarch64.cpu.xgene1 },
-        // TODO: Add these with LLVM 23.
+        .{ "ARM C1-Nano", &std.Target.aarch64.cpu.c1_nano },
-        // .{ "ARM C1-Nano", &std.Target.aarch64.cpu.c1_nano },
+        .{ "ARM C1-Pro", &std.Target.aarch64.cpu.c1_pro },
-        // .{ "ARM C1-Pro", &std.Target.aarch64.cpu.c1_pro },
+        .{ "ARM C1-Ultra", &std.Target.aarch64.cpu.c1_ultra },
-        // .{ "ARM C1-Ultra", &std.Target.aarch64.cpu.c1_ultra },
+        .{ "ARM C1-Premium", &std.Target.aarch64.cpu.c1_premium },
-        // .{ "ARM C1-Premium", &std.Target.aarch64.cpu.c1_premium },
         .{ "ARM Cortex-A320", &std.Target.aarch64.cpu.cortex_a320 },
         .{ "ARM Cortex-A34", &std.Target.aarch64.cpu.cortex_a34 },
         .{ "ARM Cortex-A35", &std.Target.aarch64.cpu.cortex_a35 },

lib/std/zig/system/x86.zig+23-1

 @@ -74,6 +74,7 @@ pub fn detectNativeCpuAndFeatures(arch: Target.Cpu.Arch) Target.Cpu {
         if (switch (vendor) {
             0x756e6547 => detectIntelProcessor(&cpu, family, model, brand_id),
             0x68747541 => detectAmdProcessor(&cpu, family, model),
+            0x6f677948 => detectHygonProcessor(family, model),
             else => null,
         }) |m| b: {
             // Some hypervisors are evil liars and will operate in long mode while identifying as a
 @@ -209,7 +210,23 @@ fn detectAmdProcessor(cpu: *const Target.Cpu, family: u32, model: u32) ?*const T
             0x10...0x1f, 0x60...0x6f, 0x70...0x7f, 0xa0...0xaf => &Target.x86.cpu.znver4,
             else => &Target.x86.cpu.znver3,
         },
-        26 => &Target.x86.cpu.znver5,
+        26 => switch (model) {
+            0x50...0x5f, 0x80...0xcf, 0xd8...0xe7 => &Target.x86.cpu.znver6,
+            else => &Target.x86.cpu.znver5,
+        },
+        else => null,
+    };
+}
+fn detectHygonProcessor(family: u32, model: u32) ?*const Target.Cpu.Model {
+    return switch (family) {
+        24 => switch (model) {
+            4 => &Target.x86.cpu.c86_4g_m4,
+            6 => &Target.x86.cpu.c86_4g_m6,
+            7 => &Target.x86.cpu.c86_4g_m7,
+            8 => &Target.x86.cpu.c86_4g_m8,
+            else => null,
+        },
         else => null,
     };
 }
 @@ -340,9 +357,11 @@ fn detectNativeFeatures(cpu: *Target.Cpu) void {
         // AMD uses a different bit for prefetchi.
         setFeature(cpu, .prefetchi, bit(leaf.eax, 20));
+        setFeature(cpu, .avx512bmm, bit(leaf.eax, 23) and has_avx512_save);
     } else {
         for ([_]Target.x86.Feature{
             .prefetchi,
+            .avx512bmm,
         }) |feat| {
             setFeature(cpu, feat, false);
         }
 @@ -445,6 +464,7 @@ fn detectNativeFeatures(cpu: *Target.Cpu) void {
             setFeature(cpu, .nf, bit(leaf.edx, 21) and has_apx_save);
             setFeature(cpu, .cf, bit(leaf.edx, 21) and has_apx_save);
             setFeature(cpu, .zu, bit(leaf.edx, 21) and has_apx_save);
+            setFeature(cpu, .jmpabs, bit(leaf.edx, 21) and has_apx_save);
             break :has_avx10 bit(leaf.edx, 19);
         } else {
 @@ -474,6 +494,7 @@ fn detectNativeFeatures(cpu: *Target.Cpu) void {
                 .nf,
                 .cf,
                 .zu,
+                .jmpabs,
             }) |feat| {
                 setFeature(cpu, feat, false);
             }
 @@ -559,6 +580,7 @@ fn detectNativeFeatures(cpu: *Target.Cpu) void {
             .nf,
             .cf,
             .zu,
+            .jmpabs,
         }) |feat| {
             setFeature(cpu, feat, false);
         }

lib/zig.h-25

...	@@ -5880,27 +5880,12 @@ typedef __float128 zig_f128;	...	@@ -5880,27 +5880,12 @@ typedef __float128 zig_f128;
5880	#define zig_make_special_f128(sign, name, arg, repr) sign __builtin_##name##f128(arg)	5880	#define zig_make_special_f128(sign, name, arg, repr) sign __builtin_##name##f128(arg)
5881	#else	5881	#else
5882	#undef zig_has_f128	5882	#undef zig_has_f128
5883	#if defined(zig_x86_64) && defined(ZIG_TARGET_ABI_MSVC)
5884	#if defined(zig_msvc) && !defined(__clang__)
5885	#include <emmintrin.h>
5886	typedef __m128i zig_f128;
5887	#define zig_init_repr_f128(hi, lo) { .m128i_u64 = { lo, hi } }
5888	#define zig_lo_repr_f128(arg) (arg).m128i_u64[0]
5889	#define zig_hi_repr_f128(arg) (arg).m128i_u64[1]
5890	#else
5891	typedef __attribute__((__vector_size__(2 * sizeof(uint64_t)))) uint64_t zig_f128;
5892	#define zig_init_repr_f128(hi, lo) { lo, hi }
5893	#define zig_lo_repr_f128(arg) (arg)[0]
5894	#define zig_hi_repr_f128(arg) (arg)[1]
5895	#endif
5896	#else
5897	typedef zig_u128 zig_f128;	5883	typedef zig_u128 zig_f128;
5898	#define zig_init_repr_f128(hi, lo) zig_init_u128(hi, lo)	5884	#define zig_init_repr_f128(hi, lo) zig_init_u128(hi, lo)
5899	#define zig_make_repr_f128(hi, lo) zig_make_u128(hi, lo)	5885	#define zig_make_repr_f128(hi, lo) zig_make_u128(hi, lo)
5900	#define zig_lo_repr_f128(arg) zig_lo_u128(arg)	5886	#define zig_lo_repr_f128(arg) zig_lo_u128(arg)
5901	#define zig_hi_repr_f128(arg) zig_hi_u128(arg)	5887	#define zig_hi_repr_f128(arg) zig_hi_u128(arg)
5902	#endif	5888	#endif
5903	#endif
5904	#ifndef zig_has_f128	5889	#ifndef zig_has_f128
5905	#define zig_has_f128 0	5890	#define zig_has_f128 0
5906	#define zig_make_f128(fp, repr) repr	5891	#define zig_make_f128(fp, repr) repr
...	@@ -6188,16 +6173,6 @@ static inline zig_f128 zig_floatuntitf(zig_u128 arg) {	...	@@ -6188,16 +6173,6 @@ static inline zig_f128 zig_floatuntitf(zig_u128 arg) {
6188	extern zig_f128 __floatuntitf(zig_f128 arg);	6173	extern zig_f128 __floatuntitf(zig_f128 arg);
6189	return __floatuntitf(zig_f128_bitCast_u128(arg));	6174	return __floatuntitf(zig_f128_bitCast_u128(arg));
6190	}	6175	}
6191	#elif defined(zig_x86_64) && defined(zig_windows)
6192	zig_common_float_builtins(128)
6193	static inline zig_f128 zig_floattitf(zig_i128 arg) {
6194	extern zig_f128 __floattitf(zig_i128 arg);
6195	return __floattitf(arg);
6196	}
6197	static inline zig_f128 zig_floatuntitf(zig_u128 arg) {
6198	extern zig_f128 __floatuntitf(uint64_t arg_lo, uint64_t arg_hi);
6199	return __floatuntitf(zig_lo_u128(arg), zig_hi_u128(arg));
6200	}
6201	#else	6176	#else
6202	zig_float_builtins(128)	6177	zig_float_builtins(128)
6203	#endif	6178	#endif

src/Compilation.zig-2

...	@@ -6358,8 +6358,6 @@ fn addCommonCCArgs(	...	@@ -6358,8 +6358,6 @@ fn addCommonCCArgs(
6358	// LLVM doesn't distinguish between Solaris and illumos, but the illumos GCC fork	6358	// LLVM doesn't distinguish between Solaris and illumos, but the illumos GCC fork
6359	// defines this macro.	6359	// defines this macro.
6360	.illumos => try argv.append("-D__illumos__"),	6360	.illumos => try argv.append("-D__illumos__"),
6361	// This macro has not yet been upstreamed by SerenityOS to Clang.
6362	.serenity => try argv.append("-D__serenity__"),
6363	// Homebrew targets without LLVM support; use communities's preferred macros.	6361	// Homebrew targets without LLVM support; use communities's preferred macros.
6364	.@"3ds" => try argv.append("-D__3DS__"),	6362	.@"3ds" => try argv.append("-D__3DS__"),
6365	.wiiu => try argv.append("-D__WIIU__"),	6363	.wiiu => try argv.append("-D__WIIU__"),

src/Zcu.zig+2

...	@@ -4711,6 +4711,8 @@ pub fn callconvSupported(zcu: *Zcu, cc: std.lang.CallingConvention) union(enum)	...	@@ -4711,6 +4711,8 @@ pub fn callconvSupported(zcu: *Zcu, cc: std.lang.CallingConvention) union(enum)
4711	.avr_interrupt,	4711	.avr_interrupt,
4712	.avr_signal,	4712	.avr_signal,
4713	.ez80_tiflags,	4713	.ez80_tiflags,
		4714	.loongarch32_preserve_none,
		4715	.loongarch64_preserve_none,
4714	.naked,	4716	.naked,
4715	=> true, // incoming stack alignment supported	4717	=> true, // incoming stack alignment supported
4716		4718

src/clang_options.zon+246-19

 @@ -218,11 +218,16 @@
     .psl = true,
 },
 .{ .name = "d1PP", .psl = true },
+.{ .name = "d1nodatetime", .psl = true },
+.{ .name = "d1nodatetime-", .psl = true },
 .{ .name = "d1reportAllClassLayout", .psl = true },
 .{ .name = "d2FastFail", .psl = true },
 .{ .name = "d2Zi+", .psl = true },
 .{ .name = "d2epilogunwind", .psl = true },
 .{ .name = "d2epilogunwindrequirev2", .psl = true },
+.{ .name = "d2guardcfgdispatch", .psl = true },
+.{ .name = "d2guardcfgdispatch-", .psl = true },
+.{ .name = "d2guardnochecks", .psl = true },
 .{ .name = "diagnostics:caret", .psl = true },
 .{ .name = "diagnostics:classic", .psl = true },
 .{ .name = "diagnostics:column", .psl = true },
 @@ -343,6 +348,12 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{
+    .name = "cstdlib",
+    .syntax = .separate,
+    .pd1 = false,
+    .pd2 = true,
+},
 .{
     .name = "debug",
     .ze = .debug,
 @@ -523,6 +534,11 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{
+    .name = "precompile-reduced-bmi",
+    .pd1 = false,
+    .pd2 = true,
+},
 .{
     .name = "prefix",
     .syntax = .separate,
 @@ -586,6 +602,21 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{
+    .name = "ssaf-include-local-entities",
+    .pd1 = false,
+    .pd2 = true,
+},
+.{
+    .name = "ssaf-list-extractors",
+    .pd1 = false,
+    .pd2 = true,
+},
+.{
+    .name = "ssaf-list-formats",
+    .pd1 = false,
+    .pd2 = true,
+},
 .{
     .name = "std",
     .syntax = .separate,
 @@ -845,6 +876,8 @@
 .{ .name = "cl-unsafe-math-optimizations" },
 .{ .name = "clangir-disable-passes" },
 .{ .name = "clangir-disable-verifier" },
+.{ .name = "clangir-enable-idiom-recognizer" },
+.{ .name = "clangir-lib-opt" },
 .{ .name = "clear-ast-before-backend" },
 .{ .name = "code-completion-at", .syntax = .separate },
 .{ .name = "code-completion-brief-comments" },
 @@ -938,11 +971,15 @@
 .{ .name = "dwarf-debug-producer", .syntax = .separate },
 .{ .name = "dwarf-explicit-import" },
 .{ .name = "dwarf-ext-refs" },
+.{ .name = "Zsb", .psl = true },
+.{ .name = "Zss", .psl = true },
 .{ .name = "all-resources-bound", .psl = true },
 .{ .name = "Zpc", .psl = true },
 .{ .name = "Vd", .psl = true },
 .{ .name = "Gis", .psl = true },
+.{ .name = "fdx-no-source-metadata" },
 .{ .name = "hlsl-no-stdinc", .psl = true },
+.{ .name = "fdx-record-command-line", .syntax = .separate },
 .{ .name = "rootsig-define", .syntax = .separate },
 .{
     .name = "force-rootsig-ver",
 @@ -1107,6 +1144,9 @@
 .{ .name = "fcomplete-member-pointers" },
 .{ .name = "fconst-strings" },
 .{ .name = "fconstant-cfstrings" },
+.{ .name = "fconstant-nsarray-literals" },
+.{ .name = "fconstant-nsdictionary-literals" },
+.{ .name = "fconstant-nsnumber-literals" },
 .{ .name = "fconstant-string-class", .syntax = .separate },
 .{ .name = "fconvergent-functions" },
 .{ .name = "fcoro-aligned-allocation" },
 @@ -1146,6 +1186,8 @@
 .{ .name = "fdebug-pass-structure" },
 .{ .name = "fdebug-pre-fir-tree" },
 .{ .name = "fdebug-ranges-base-address" },
+.{ .name = "fdebug-record-sysroot" },
+.{ .name = "fdebug-run-lifetime-safety" },
 .{ .name = "fdebug-types-section" },
 .{ .name = "fdebug-unparse" },
 .{ .name = "fdebug-unparse-no-sema" },
 @@ -1176,6 +1218,7 @@
 .{ .name = "fdiagnostics-print-source-range-info" },
 .{ .name = "fdiagnostics-show-category", .syntax = .separate },
 .{ .name = "fdiagnostics-show-hotness" },
+.{ .name = "fdiagnostics-show-inlining-chain" },
 .{ .name = "fdiagnostics-show-line-numbers" },
 .{ .name = "fdiagnostics-show-note-include-stack" },
 .{ .name = "fdiagnostics-show-option" },
 @@ -1214,17 +1257,27 @@
 .{ .name = "femit-compact-unwind-non-canonical" },
 .{ .name = "femulated-tls" },
 .{ .name = "fenable-matrix" },
+.{ .name = "fenable-new-pm-codegen" },
 .{ .name = "fencode-extended-block-signature" },
+.{ .name = "fenumeration-type" },
 .{ .name = "ferror-limit", .syntax = .separate },
 .{ .name = "fescaping-block-tail-calls" },
 .{ .name = "fexceptions" },
+.{ .name = "fexec-charset", .syntax = .separate },
+.{ .name = "fexperimental-abi-lowering" },
+.{ .name = "fexperimental-allow-pointer-field-protection-attr" },
 .{ .name = "fexperimental-call-graph-section" },
 .{ .name = "fexperimental-isel" },
 .{ .name = "fexperimental-late-parse-attributes" },
 .{ .name = "fexperimental-library" },
+.{ .name = "fexperimental-lifetime-safety-c" },
+.{ .name = "fexperimental-logical-pointer" },
 .{ .name = "fexperimental-loop-fusion" },
 .{ .name = "fexperimental-new-constant-interpreter" },
 .{ .name = "fexperimental-omit-vtable-rtti" },
+.{ .name = "fexperimental-overflow-behavior-types" },
+.{ .name = "fexperimental-pointer-field-protection-abi" },
+.{ .name = "fexperimental-pointer-field-protection-tagged" },
 .{ .name = "fexperimental-relative-c++-abi-vtables" },
 .{ .name = "fexperimental-sanitize-metadata=atomics" },
 .{ .name = "fexperimental-sanitize-metadata=covered" },
 @@ -1259,6 +1312,7 @@
 .{ .name = "ffixed-d5" },
 .{ .name = "ffixed-d6" },
 .{ .name = "ffixed-d7" },
+.{ .name = "ffixed-edi" },
 .{ .name = "ffixed-form" },
 .{ .name = "ffixed-g1" },
 .{ .name = "ffixed-g2" },
 @@ -1288,7 +1342,31 @@
 .{ .name = "ffixed-o4" },
 .{ .name = "ffixed-o5" },
 .{ .name = "ffixed-point" },
+.{ .name = "ffixed-r10" },
+.{ .name = "ffixed-r11" },
+.{ .name = "ffixed-r12" },
+.{ .name = "ffixed-r13" },
+.{ .name = "ffixed-r14" },
+.{ .name = "ffixed-r15" },
+.{ .name = "ffixed-r16" },
+.{ .name = "ffixed-r17" },
+.{ .name = "ffixed-r18" },
 .{ .name = "ffixed-r19" },
+.{ .name = "ffixed-r20" },
+.{ .name = "ffixed-r21" },
+.{ .name = "ffixed-r22" },
+.{ .name = "ffixed-r23" },
+.{ .name = "ffixed-r24" },
+.{ .name = "ffixed-r25" },
+.{ .name = "ffixed-r26" },
+.{ .name = "ffixed-r27" },
+.{ .name = "ffixed-r28" },
+.{ .name = "ffixed-r29" },
+.{ .name = "ffixed-r30" },
+.{ .name = "ffixed-r31" },
+.{ .name = "ffixed-r6" },
+.{ .name = "ffixed-r7" },
+.{ .name = "ffixed-r8" },
 .{ .name = "ffixed-r9" },
 .{ .name = "ffixed-x1" },
 .{ .name = "ffixed-x10" },
 @@ -1362,6 +1440,7 @@
 .{ .name = "fhip-kernel-arg-name" },
 .{ .name = "fhip-new-launch-api" },
 .{ .name = "fspv-enable-maximal-reconvergence" },
+.{ .name = "fspv-preserve-interface" },
 .{ .name = "fspv-use-unknown-image-format" },
 .{ .name = "fhlsl-strict-availability" },
 .{ .name = "fhonor-infinities" },
 @@ -1405,13 +1484,12 @@
 .{ .name = "fkeep-persistent-storage-variables" },
 .{ .name = "fkeep-static-consts" },
 .{ .name = "fkeep-system-includes" },
-.{ .name = "flang-deprecated-no-hlfir" },
-.{ .name = "flang-experimental-hlfir" },
 .{ .name = "flarge-sizes" },
 .{ .name = "flat_namespace" },
 .{ .name = "flax-vector-conversions" },
-.{ .name = "fexperimental-lifetime-safety" },
+.{ .name = "flifetime-dse" },
-.{ .name = "fexperimental-lifetime-safety-inference" },
+.{ .name = "flifetime-safety-inference" },
+.{ .name = "fexperimental-lifetime-safety-tu-analysis" },
 .{ .name = "flimit-debug-info" },
 .{ .name = "flogical-abbreviations" },
 .{ .name = "floop-interchange" },
 @@ -1444,8 +1522,10 @@
 .{ .name = "fmodules-debuginfo" },
 .{ .name = "fmodules-decluse" },
 .{ .name = "fmodules-disable-diagnostic-validation" },
+.{ .name = "fmodules-driver" },
 .{ .name = "fmodules-force-validate-user-headers" },
 .{ .name = "fmodules-hash-content" },
+.{ .name = "fmodules-lazy-load-module-maps" },
 .{ .name = "fmodules-local-submodule-visibility" },
 .{ .name = "fmodules-reduced-bmi" },
 .{ .name = "fmodules-search-all" },
 @@ -1460,6 +1540,7 @@
 .{ .name = "fmodules-validate-system-headers" },
 .{ .name = "fmodulo-sched" },
 .{ .name = "fmodulo-sched-allow-regmoves" },
+.{ .name = "fms-anonymous-structs" },
 .{ .name = "fms-compatibility" },
 .{ .name = "fms-define-stdc" },
 .{ .name = "fms-extensions" },
 @@ -1539,6 +1620,9 @@
 .{ .name = "fno-complete-member-pointers" },
 .{ .name = "fno-const-strings" },
 .{ .name = "fno-constant-cfstrings" },
+.{ .name = "fno-constant-nsarray-literals" },
+.{ .name = "fno-constant-nsdictionary-literals" },
+.{ .name = "fno-constant-nsnumber-literals" },
 .{ .name = "fno-convergent-functions" },
 .{ .name = "fno-coro-aligned-allocation" },
 .{ .name = "fno-coroutines" },
 @@ -1559,6 +1643,8 @@
 .{ .name = "fno-debug-macro" },
 .{ .name = "fno-debug-pass-manager" },
 .{ .name = "fno-debug-ranges-base-address" },
+.{ .name = "fno-debug-record-sysroot" },
+.{ .name = "fno-debug-run-lifetime-safety" },
 .{ .name = "fno-debug-types-section" },
 .{ .name = "fno-declspec" },
 .{ .name = "fno-default-inline" },
 @@ -1571,6 +1657,7 @@
 .{ .name = "fno-devirtualize-speculatively" },
 .{ .name = "fno-diagnostics-fixit-info" },
 .{ .name = "fno-diagnostics-show-hotness" },
+.{ .name = "fno-diagnostics-show-inlining-chain" },
 .{ .name = "fno-diagnostics-show-line-numbers" },
 .{ .name = "fno-diagnostics-show-note-include-stack" },
 .{ .name = "fno-diagnostics-show-option" },
 @@ -1595,14 +1682,22 @@
 .{ .name = "fno-eliminate-unused-debug-types" },
 .{ .name = "fno-emit-compact-unwind-non-canonical" },
 .{ .name = "fno-emulated-tls" },
+.{ .name = "fno-enable-new-pm-codegen" },
+.{ .name = "fno-enumeration-type" },
 .{ .name = "fno-escaping-block-tail-calls" },
 .{ .name = "fno-exceptions" },
+.{ .name = "fno-experimental-allow-pointer-field-protection-attr" },
 .{ .name = "fno-experimental-call-graph-section" },
 .{ .name = "fno-experimental-isel" },
 .{ .name = "fno-experimental-late-parse-attributes" },
 .{ .name = "fno-experimental-library" },
+.{ .name = "fno-experimental-lifetime-safety-c" },
 .{ .name = "fno-experimental-loop-fusion" },
+.{ .name = "fno-experimental-new-constant-interpreter" },
 .{ .name = "fno-experimental-omit-vtable-rtti" },
+.{ .name = "fno-experimental-overflow-behavior-types" },
+.{ .name = "fno-experimental-pointer-field-protection-abi" },
+.{ .name = "fno-experimental-pointer-field-protection-tagged" },
 .{ .name = "fno-experimental-relative-c++-abi-vtables" },
 .{ .name = "fno-external-blas" },
 .{ .name = "fno-f2c" },
 @@ -1672,8 +1767,9 @@
 .{ .name = "fno-keep-system-includes" },
 .{ .name = "fno-knr-functions" },
 .{ .name = "fno-lax-vector-conversions" },
-.{ .name = "fno-experimental-lifetime-safety" },
+.{ .name = "fno-lifetime-dse" },
-.{ .name = "fno-experimental-lifetime-safety-inference" },
+.{ .name = "fno-lifetime-safety-inference" },
+.{ .name = "fno-experimental-lifetime-safety-tu-analysis" },
 .{ .name = "fno-limit-debug-info" },
 .{ .name = "fno-logical-abbreviations" },
 .{ .name = "fno-loop-interchange" },
 @@ -1695,6 +1791,7 @@
 .{ .name = "fno-modulemap-allow-subdirectory-search" },
 .{ .name = "fno-modules" },
 .{ .name = "fno-modules-decluse" },
+.{ .name = "fno-modules-driver" },
 .{ .name = "fno-modules-error-recovery" },
 .{ .name = "fno-modules-force-validate-user-headers" },
 .{ .name = "fno-modules-global-index" },
 @@ -1710,6 +1807,7 @@
 .{ .name = "fno-modules-validate-textual-header-includes" },
 .{ .name = "fno-modulo-sched" },
 .{ .name = "fno-modulo-sched-allow-regmoves" },
+.{ .name = "fno-ms-anonymous-structs" },
 .{ .name = "fno-ms-compatibility" },
 .{ .name = "fno-ms-extensions" },
 .{ .name = "fno-ms-tls-guards" },
 @@ -1720,12 +1818,15 @@
 .{ .name = "fno-objc-arc" },
 .{ .name = "fno-objc-arc-exceptions" },
 .{ .name = "fno-objc-avoid-heapify-local-blocks" },
+.{ .name = "fno-objc-constant-literals" },
 .{ .name = "fno-objc-convert-messages-to-runtime-calls" },
 .{ .name = "fno-objc-direct-precondition-thunk" },
 .{ .name = "fno-objc-encode-cxx-class-template-spec" },
 .{ .name = "fno-objc-exceptions" },
 .{ .name = "fno-objc-infer-related-result-type" },
 .{ .name = "fno-objc-legacy-dispatch" },
+.{ .name = "fno-objc-msgsend-class-selector-stubs" },
+.{ .name = "fno-objc-msgsend-selector-stubs" },
 .{ .name = "fno-objc-nonfragile-abi" },
 .{ .name = "fno-objc-weak" },
 .{ .name = "fno-offload-implicit-host-device-templates" },
 @@ -1733,7 +1834,11 @@
 .{ .name = "fno-offload-uniform-block" },
 .{ .name = "fno-offload-via-llvm" },
 .{ .name = "fno-omit-frame-pointer", .ze = .no_omit_frame_pointer },
+.{ .name = "fno-openacc-default-none-scalars-strict" },
+.{ .name = "fno-openacc-multiple-names-in-routine" },
 .{ .name = "fno-openmp" },
+.{ .name = "fno-openmp-assume-no-nested-parallelism" },
+.{ .name = "fno-openmp-assume-no-thread-state" },
 .{ .name = "fno-openmp-assume-teams-oversubscription" },
 .{ .name = "fno-openmp-assume-threads-oversubscription" },
 .{ .name = "fno-openmp-cuda-mode" },
 @@ -1742,6 +1847,7 @@
 .{ .name = "fno-openmp-optimistic-collapse" },
 .{ .name = "fno-openmp-simd" },
 .{ .name = "fno-openmp-target-debug" },
+.{ .name = "fno-openmp-target-fast" },
 .{ .name = "fno-openmp-target-jit" },
 .{ .name = "fno-openmp-target-new-runtime" },
 .{ .name = "fno-operator-names" },
 @@ -1805,12 +1911,14 @@
 .{ .name = "fno-real-8-real-10" },
 .{ .name = "fno-real-8-real-16" },
 .{ .name = "fno-real-8-real-4" },
+.{ .name = "fno-real-sum-reassociation" },
 .{ .name = "fno-realloc-lhs" },
 .{ .name = "fno-reciprocal-math" },
 .{ .name = "fno-record-command-line" },
 .{ .name = "fno-recovery-ast" },
 .{ .name = "fno-recovery-ast-type" },
 .{ .name = "fno-recursive" },
+.{ .name = "fno-reflection" },
 .{ .name = "fno-reformat" },
 .{ .name = "fno-register-global-dtors-with-atexit" },
 .{ .name = "fno-regs-graph" },
 @@ -1828,6 +1936,7 @@
 .{ .name = "fno-rtti-data" },
 .{ .name = "fno-rwpi" },
 .{ .name = "fno-safe-buffer-usage-suggestions" },
+.{ .name = "fno-safe-trampoline" },
 .{ .name = "fno-sample-profile-use-profi" },
 .{ .name = "fno-sanitize-address-globals-dead-stripping" },
 .{ .name = "fno-sanitize-address-outline-instrumentation" },
 @@ -1857,6 +1966,7 @@
 .{ .name = "fno-sanitize-thread-func-entry-exit" },
 .{ .name = "fno-sanitize-thread-memory-access" },
 .{ .name = "fno-sanitize-trap", .ze = .no_sanitize_trap },
+.{ .name = "fno-sanitize-trap-loop" },
 .{ .name = "fno-sanitize-type-outline-instrumentation" },
 .{ .name = "fno-sanitize-undefined-trap-on-error" },
 .{ .name = "fno-save-main-program" },
 @@ -1896,6 +2006,7 @@
 .{ .name = "fno-standalone-debug" },
 .{ .name = "fno-strength-reduce" },
 .{ .name = "fno-strict-aliasing" },
+.{ .name = "fno-strict-bool" },
 .{ .name = "fno-strict-enums" },
 .{ .name = "fno-strict-float-cast-overflow" },
 .{ .name = "fno-strict-overflow" },
 @@ -1975,6 +2086,7 @@
 .{ .name = "fobjc-atdefs" },
 .{ .name = "fobjc-avoid-heapify-local-blocks" },
 .{ .name = "fobjc-call-cxx-cdtors" },
+.{ .name = "fobjc-constant-literals" },
 .{ .name = "fobjc-convert-messages-to-runtime-calls" },
 .{ .name = "fobjc-direct-precondition-thunk" },
 .{ .name = "fobjc-disable-direct-methods-for-testing" },
 @@ -1985,18 +2097,23 @@
 .{ .name = "fobjc-infer-related-result-type" },
 .{ .name = "fobjc-legacy-dispatch" },
 .{ .name = "fobjc-link-runtime" },
+.{ .name = "fobjc-msgsend-class-selector-stubs" },
+.{ .name = "fobjc-msgsend-selector-stubs" },
 .{ .name = "fobjc-new-property" },
 .{ .name = "fobjc-nonfragile-abi" },
 .{ .name = "fobjc-runtime-has-weak" },
 .{ .name = "fobjc-sender-dependent-dispatch" },
 .{ .name = "fobjc-subscripting-legacy-runtime" },
 .{ .name = "fobjc-weak" },
+.{ .name = "foffload-device" },
 .{ .name = "foffload-implicit-host-device-templates" },
 .{ .name = "foffload-lto" },
 .{ .name = "foffload-uniform-block" },
 .{ .name = "foffload-via-llvm" },
 .{ .name = "fomit-frame-pointer", .ze = .omit_frame_pointer },
 .{ .name = "fopenacc" },
+.{ .name = "fopenacc-default-none-scalars-strict" },
+.{ .name = "fopenacc-multiple-names-in-routine" },
 .{ .name = "fopenmp" },
 .{ .name = "fopenmp-assume-no-nested-parallelism" },
 .{ .name = "fopenmp-assume-no-thread-state" },
 @@ -2014,6 +2131,7 @@
 .{ .name = "fopenmp-relocatable-target" },
 .{ .name = "fopenmp-simd" },
 .{ .name = "fopenmp-target-debug" },
+.{ .name = "fopenmp-target-fast" },
 .{ .name = "fopenmp-target-jit" },
 .{ .name = "fopenmp-target-new-runtime" },
 .{ .name = "fopenmp-use-tls" },
 @@ -2091,12 +2209,14 @@
 .{ .name = "freal-8-real-10" },
 .{ .name = "freal-8-real-16" },
 .{ .name = "freal-8-real-4" },
+.{ .name = "freal-sum-reassociation" },
 .{ .name = "frealloc-lhs" },
 .{ .name = "freciprocal-math" },
 .{ .name = "frecord-command-line" },
 .{ .name = "frecovery-ast" },
 .{ .name = "frecovery-ast-type" },
 .{ .name = "frecursive" },
+.{ .name = "freflection" },
 .{ .name = "freg-struct-return" },
 .{ .name = "fregister-global-dtors-with-atexit" },
 .{ .name = "fregs-graph" },
 @@ -2115,6 +2235,7 @@
 .{ .name = "frtti-data" },
 .{ .name = "frwpi" },
 .{ .name = "fsafe-buffer-usage-suggestions" },
+.{ .name = "fsafe-trampoline" },
 .{ .name = "fsample-profile-use-profi" },
 .{ .name = "fsanitize-address-globals-dead-stripping" },
 .{ .name = "fsanitize-address-outline-instrumentation" },
 @@ -2142,6 +2263,7 @@
 .{ .name = "fsanitize-coverage-trace-gep" },
 .{ .name = "fsanitize-coverage-trace-loads" },
 .{ .name = "fsanitize-coverage-trace-pc" },
+.{ .name = "fsanitize-coverage-trace-pc-entry-exit" },
 .{ .name = "fsanitize-coverage-trace-pc-guard", .ze = .san_cov_trace_pc_guard },
 .{ .name = "fsanitize-coverage-trace-stores" },
 .{ .name = "fsanitize-debug-trap-reasons" },
 @@ -2162,6 +2284,7 @@
 .{ .name = "fsanitize-thread-func-entry-exit" },
 .{ .name = "fsanitize-thread-memory-access" },
 .{ .name = "fsanitize-trap", .ze = .sanitize_trap },
+.{ .name = "fsanitize-trap-loop" },
 .{ .name = "fsanitize-type-outline-instrumentation" },
 .{ .name = "fsanitize-undefined-trap-on-error" },
 .{ .name = "fsave-main-program" },
 @@ -2208,6 +2331,7 @@
 .{ .name = "fstandalone-debug" },
 .{ .name = "fstrength-reduce" },
 .{ .name = "fstrict-aliasing" },
+.{ .name = "fstrict-bool" },
 .{ .name = "fstrict-enums" },
 .{ .name = "fstrict-float-cast-overflow" },
 .{ .name = "fstrict-overflow" },
 @@ -2216,6 +2340,7 @@
 .{ .name = "fstruct-path-tbaa" },
 .{ .name = "fswift-version-independent-apinotes" },
 .{ .name = "fsycl" },
+.{ .name = "fsycl-device-image-split" },
 .{ .name = "fsycl-device-only" },
 .{ .name = "fsycl-host-only" },
 .{ .name = "fsycl-is-device" },
 @@ -2452,6 +2577,7 @@
 .{ .name = "maix-small-local-dynamic-tls" },
 .{ .name = "maix-small-local-exec-tls" },
 .{ .name = "maix-struct-return" },
+.{ .name = "maix-use-ptrgl" },
 .{ .name = "malign-double" },
 .{ .name = "maltivec", .ze = .m },
 .{ .name = "mamdgpu-expand-waitcnt-profiling" },
 @@ -2464,7 +2590,6 @@
 .{ .name = "mamx-fp8", .ze = .m },
 .{ .name = "mamx-int8", .ze = .m },
 .{ .name = "mamx-movrs", .ze = .m },
-.{ .name = "mamx-tf32", .ze = .m },
 .{ .name = "mamx-tile", .ze = .m },
 .{ .name = "mannotate-tablejump" },
 .{ .name = "mapx-inline-asm-use-gpr32" },
 @@ -2474,11 +2599,12 @@
 .{ .name = "massembler-no-warn" },
 .{ .name = "matomics", .ze = .m },
 .{ .name = "mavx", .ze = .m },
-.{ .name = "mavx10.1" },
+.{ .name = "mavx10.1", .ze = .m },
-.{ .name = "mavx10.2" },
+.{ .name = "mavx10.2", .ze = .m },
 .{ .name = "mavx2", .ze = .m },
 .{ .name = "mavx512bf16", .ze = .m },
 .{ .name = "mavx512bitalg", .ze = .m },
+.{ .name = "mavx512bmm", .ze = .m },
 .{ .name = "mavx512bw", .ze = .m },
 .{ .name = "mavx512cd", .ze = .m },
 .{ .name = "mavx512dq", .ze = .m },
 @@ -2516,6 +2642,7 @@
 .{ .name = "mcmpb", .ze = .m },
 .{ .name = "mcmpccxadd", .ze = .m },
 .{ .name = "mcmse" },
+.{ .name = "mcompact-imports" },
 .{ .name = "mconstant-cfstrings" },
 .{ .name = "mconstructor-aliases" },
 .{ .name = "mcrbits", .ze = .m },
 @@ -2540,6 +2667,7 @@
 .{ .name = "metal", .psl = true },
 .{ .name = "mexception-handling", .ze = .m },
 .{ .name = "mexecute-only", .ze = .m },
+.{ .name = "mexperimental-mtune-syntax" },
 .{ .name = "mextended-const", .ze = .m },
 .{ .name = "mextern-sdata" },
 .{ .name = "mf16c", .ze = .m },
 @@ -2553,6 +2681,7 @@
 .{ .name = "mfix-cortex-a57-aes-1742098", .ze = .m },
 .{ .name = "mfix-cortex-a72-aes-1655431" },
 .{ .name = "mfix-gr712rc" },
+.{ .name = "mfix-r5900", .ze = .m },
 .{ .name = "mfix-ut700" },
 .{ .name = "mfloat128", .ze = .m },
 .{ .name = "mfloat-abi", .syntax = .separate },
 @@ -2569,7 +2698,7 @@
 .{ .name = "mfsgsbase", .ze = .m },
 .{ .name = "mfsmuld" },
 .{ .name = "mfxsr", .ze = .m },
-.{ .name = "mgc" },
+.{ .name = "mgc", .ze = .m },
 .{ .name = "mgeneral-regs-only" },
 .{ .name = "mgfni", .ze = .m },
 .{ .name = "mginv", .ze = .m },
 @@ -2677,17 +2806,17 @@
 .{ .name = "mno-amx-fp8", .ze = .m },
 .{ .name = "mno-amx-int8", .ze = .m },
 .{ .name = "mno-amx-movrs", .ze = .m },
-.{ .name = "mno-amx-tf32", .ze = .m },
 .{ .name = "mno-amx-tile", .ze = .m },
 .{ .name = "mno-annotate-tablejump" },
 .{ .name = "mno-apxf" },
 .{ .name = "mno-atomics", .ze = .m },
 .{ .name = "mno-avx", .ze = .m },
-.{ .name = "mno-avx10.1" },
+.{ .name = "mno-avx10.1", .ze = .m },
-.{ .name = "mno-avx10.2" },
+.{ .name = "mno-avx10.2", .ze = .m },
 .{ .name = "mno-avx2", .ze = .m },
 .{ .name = "mno-avx512bf16", .ze = .m },
 .{ .name = "mno-avx512bitalg", .ze = .m },
+.{ .name = "mno-avx512bmm", .ze = .m },
 .{ .name = "mno-avx512bw", .ze = .m },
 .{ .name = "mno-avx512cd", .ze = .m },
 .{ .name = "mno-avx512dq", .ze = .m },
 @@ -2720,6 +2849,7 @@
 .{ .name = "mno-clzero", .ze = .m },
 .{ .name = "mno-cmpb", .ze = .m },
 .{ .name = "mno-cmpccxadd", .ze = .m },
+.{ .name = "mno-compact-imports" },
 .{ .name = "mno-constant-cfstrings" },
 .{ .name = "mno-constructor-aliases" },
 .{ .name = "mno-crbits", .ze = .m },
 @@ -2736,6 +2866,7 @@
 .{ .name = "mno-exception-handling", .ze = .m },
 .{ .name = "mnoexecstack" },
 .{ .name = "mno-execute-only", .ze = .m },
+.{ .name = "mno-experimental-mtune-syntax" },
 .{ .name = "mno-extended-const", .ze = .m },
 .{ .name = "mno-extern-sdata" },
 .{ .name = "mno-f16c", .ze = .m },
 @@ -2744,6 +2875,7 @@
 .{ .name = "mno-fix-cortex-a53-843419" },
 .{ .name = "mno-fix-cortex-a57-aes-1742098", .ze = .m },
 .{ .name = "mno-fix-cortex-a72-aes-1655431" },
+.{ .name = "mno-fix-r5900", .ze = .m },
 .{ .name = "mno-float128", .ze = .m },
 .{ .name = "mno-fma", .ze = .m },
 .{ .name = "mno-fma4", .ze = .m },
 @@ -2757,7 +2889,7 @@
 .{ .name = "mno-fsmuld", .ze = .m },
 .{ .name = "mno-fxsr", .ze = .m },
 .{ .name = "mno-gather" },
-.{ .name = "mno-gc" },
+.{ .name = "mno-gc", .ze = .m },
 .{ .name = "mno-gfni", .ze = .m },
 .{ .name = "mno-ginv", .ze = .m },
 .{ .name = "mno-global-merge" },
 @@ -2848,6 +2980,7 @@
 .{ .name = "mno-relax", .ze = .m },
 .{ .name = "mno-relax-all" },
 .{ .name = "mno-relax-pic-calls" },
+.{ .name = "mno-relaxed-atomics", .ze = .m },
 .{ .name = "mno-relaxed-simd", .ze = .m },
 .{ .name = "mno-reserve-frame-pointer-reg" },
 .{ .name = "mno-restrict-it" },
 @@ -2874,6 +3007,7 @@
 .{ .name = "mno-soft-float", .ze = .m },
 .{ .name = "mno-spe", .ze = .m },
 .{ .name = "mno-speculative-load-hardening" },
+.{ .name = "mno-sramecc", .ze = .m },
 .{ .name = "mno-sse", .ze = .m },
 .{ .name = "mno-sse2", .ze = .m },
 .{ .name = "mno-sse3", .ze = .m },
 @@ -2887,7 +3021,7 @@
 .{ .name = "mno-strict-align", .ze = .m },
 .{ .name = "mno-tail-call", .ze = .m },
 .{ .name = "mno-tbm", .ze = .m },
-.{ .name = "mno-tgsplit", .ze = .m },
+.{ .name = "mno-tgsplit" },
 .{ .name = "mno-thumb" },
 .{ .name = "mno-tls-direct-seg-refs" },
 .{ .name = "mno-tocdata" },
 @@ -2919,12 +3053,15 @@
 .{ .name = "mno-x87", .ze = .m },
 .{ .name = "mno-xcoff-roptr" },
 .{ .name = "mno-xgot", .ze = .m },
+.{ .name = "mno-xnack", .ze = .m },
 .{ .name = "mno-xop", .ze = .m },
 .{ .name = "mno-xsave", .ze = .m },
 .{ .name = "mno-xsavec", .ze = .m },
 .{ .name = "mno-xsaveopt", .ze = .m },
 .{ .name = "mno-xsaves", .ze = .m },
+.{ .name = "mno-zos-ppa1-name" },
 .{ .name = "mno-zvector" },
+.{ .name = "mno-aix-use-ptrgl" },
 .{ .name = "mnocrc" },
 .{ .name = "mno-direct-move", .ze = .m },
 .{ .name = "mnontrapping-fptoint", .ze = .m },
 @@ -2935,7 +3072,6 @@
 .{ .name = "mnvs", .ze = .m },
 .{ .name = "modd-spreg" },
 .{ .name = "module-dependency-dir", .syntax = .separate },
-.{ .name = "module-file-deps" },
 .{ .name = "module-file-info" },
 .{ .name = "module-suffix", .syntax = .separate },
 .{ .name = "momit-leaf-frame-pointer" },
 @@ -2980,6 +3116,7 @@
 .{ .name = "mrelax-all" },
 .{ .name = "mrelax-pic-calls" },
 .{ .name = "mrelax-relocations=no" },
+.{ .name = "mrelaxed-atomics", .ze = .m },
 .{ .name = "mrelaxed-simd", .ze = .m },
 .{ .name = "mrelocation-model", .syntax = .separate },
 .{ .name = "mreserve-frame-pointer-reg" },
 @@ -3013,6 +3150,7 @@
 .{ .name = "msoft-quad-float" },
 .{ .name = "mspe", .ze = .m },
 .{ .name = "mspeculative-load-hardening" },
+.{ .name = "msramecc", .ze = .m },
 .{ .name = "msse", .ze = .m },
 .{ .name = "msse2", .ze = .m },
 .{ .name = "msse2avx" },
 @@ -3023,12 +3161,13 @@
 .{ .name = "msse4a", .ze = .m },
 .{ .name = "mssse3", .ze = .m },
 .{ .name = "mstack-arg-probe" },
+.{ .name = "mstack-protector-guard-record" },
 .{ .name = "mstackrealign" },
 .{ .name = "mstrict-align", .ze = .m },
 .{ .name = "msvr4-struct-return" },
 .{ .name = "mtail-call", .ze = .m },
 .{ .name = "mtbm", .ze = .m },
-.{ .name = "mtgsplit", .ze = .m },
+.{ .name = "mtgsplit" },
 .{ .name = "mthread-model", .syntax = .separate },
 .{ .name = "mthumb" },
 .{ .name = "mtls-direct-seg-refs" },
 @@ -3059,7 +3198,7 @@
 .{ .name = "mv73", .ze = .m },
 .{ .name = "mv75", .ze = .m },
 .{ .name = "mv79", .ze = .m },
-.{ .name = "mv81" },
+.{ .name = "mv81", .ze = .m },
 .{ .name = "mv8plus", .ze = .m },
 .{ .name = "mvaes", .ze = .m },
 .{ .name = "mvector-strict-align" },
 @@ -3078,15 +3217,19 @@
 .{ .name = "mwbnoinvd", .ze = .m },
 .{ .name = "mwide-arithmetic", .ze = .m },
 .{ .name = "mwidekl", .ze = .m },
-.{ .name = "mx32" },
+.{ .name = "mx32", .ze = .m },
 .{ .name = "mx87", .ze = .m },
 .{ .name = "mxcoff-roptr" },
 .{ .name = "mxgot", .ze = .m },
+.{ .name = "mxnack", .ze = .m },
 .{ .name = "mxop", .ze = .m },
 .{ .name = "mxsave", .ze = .m },
 .{ .name = "mxsavec", .ze = .m },
 .{ .name = "mxsaveopt", .ze = .m },
 .{ .name = "mxsaves", .ze = .m },
+.{ .name = "mzilsd-strict-align" },
+.{ .name = "mzilsd-word-align", .ze = .m },
+.{ .name = "mzos-ppa1-name" },
 .{ .name = "mzvector" },
 .{ .name = "n" },
 .{ .name = "new-struct-path-tbaa" },
 @@ -3160,6 +3303,11 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{
+    .name = "no-xcselect",
+    .pd1 = false,
+    .pd2 = true,
+},
 .{ .name = "nobuiltininc" },
 .{ .name = "nocpp" },
 .{ .name = "nodefaultlibs" },
 @@ -3168,6 +3316,7 @@
 .{ .name = "nogpulibc" },
 .{ .name = "nohipwrapperinc" },
 .{ .name = "nolibc", .ze = .nostdlib },
+.{ .name = "nolibsycl" },
 .{ .name = "nomultidefs" },
 .{ .name = "nopie", .ze = .no_pie },
 .{ .name = "noprebind" },
 @@ -3284,6 +3433,7 @@
 .{ .name = "reexport_framework", .syntax = .separate },
 .{ .name = "regcall4" },
 .{ .name = "relaxed-aliasing" },
+.{ .name = "frelaxed-c-loc-checks" },
 .{ .name = "relocatable-pch", .pd2 = true },
 .{ .name = "remap" },
 .{ .name = "remap-file", .syntax = .separate },
 @@ -3433,6 +3583,7 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{ .name = "verify-directives" },
 .{ .name = "verify-ignore-unexpected" },
 .{ .name = "verify-pch" },
 .{ .name = "version", .ze = .version },
 @@ -3472,11 +3623,14 @@
 .{ .name = "fvisibility-externs-nodllstorageclass=", .syntax = .joined },
 .{ .name = "fallow-runtime-check-skip-hot-cutoff=", .syntax = .joined },
 .{ .name = "fexperimental-openacc-macro-override=", .syntax = .joined },
+.{ .name = "lifetime-safety-lifetimebound-macro=", .syntax = .joined },
 .{ .name = "analyzer-config-compatibility-mode=", .syntax = .joined },
 .{ .name = "fms-secure-hotpatch-functions-file=", .syntax = .joined },
 .{ .name = "fms-secure-hotpatch-functions-list=", .syntax = .comma_joined },
 .{ .name = "fno-experimental-sanitize-metadata=", .syntax = .comma_joined },
+.{ .name = "fsanitize-ignore-for-ubsan-feature=", .syntax = .comma_joined },
 .{ .name = "mdefault-visibility-export-mapping=", .syntax = .joined },
+.{ .name = "mstack-protector-guard-value-width=", .syntax = .joined },
 .{ .name = "fsanitize-address-use-after-return=", .syntax = .joined },
 .{
     .name = "fsanitize-address-use-after-return",
 @@ -3501,11 +3655,16 @@
     .syntax = .joined,
     .psl = true,
 },
+.{ .name = "fconstant-integer-number-class=", .syntax = .joined },
 .{ .name = "fdiagnostics-hotness-threshold=", .syntax = .joined },
 .{ .name = "fexperimental-max-bitint-width=", .syntax = .joined },
+.{ .name = "fimplicit-modules-lock-timeout=", .syntax = .joined },
 .{ .name = "fsanitize-memory-track-origins=", .syntax = .joined },
+.{ .name = "lifetime-safety-max-cfg-blocks=", .syntax = .joined },
 .{ .name = "mwatchos-simulator-version-min=", .syntax = .joined },
 .{ .name = "funique-source-file-identifier=", .syntax = .joined },
+.{ .name = "fconstant-double-number-class=", .syntax = .joined },
+.{ .name = "fpreferred-function-alignment=", .syntax = .joined },
 .{ .name = "fsanitize-annotate-debug-info=", .syntax = .comma_joined },
 .{ .name = "fsanitize-coverage-ignorelist=", .syntax = .joined },
 .{ .name = "fvisibility-externs-dllimport=", .syntax = .joined },
 @@ -3522,6 +3681,7 @@
 },
 .{ .name = "miphonesimulator-version-min=", .syntax = .joined },
 .{ .name = "fcaret-diagnostics-max-lines=", .syntax = .joined },
+.{ .name = "fconstant-float-number-class=", .syntax = .joined },
 .{ .name = "fobjc-nonfragile-abi-version=", .syntax = .joined },
 .{ .name = "fprofile-instrument-use-path=", .syntax = .joined },
 .{ .name = "fsanitize-coverage-allowlist=", .syntax = .joined },
 @@ -3564,6 +3724,7 @@
 },
 .{ .name = "error-on-deserialized-decl=", .syntax = .joined },
 .{ .name = "fbfloat16-excess-precision=", .syntax = .joined },
+.{ .name = "fconstant-dictionary-class=", .syntax = .joined },
 .{ .name = "fconstexpr-backtrace-limit=", .syntax = .joined },
 .{ .name = "fdiagnostics-show-category=", .syntax = .joined },
 .{ .name = "fdiagnostics-show-location=", .syntax = .joined },
 @@ -3590,6 +3751,11 @@
 .{ .name = "mstack-protector-guard-reg=", .syntax = .joined },
 .{ .name = "msve-streaming-vector-bits=", .syntax = .joined },
 .{ .name = "Wsystem-headers-in-module=", .syntax = .joined },
+.{
+    .name = "experimental:deterministic",
+    .syntax = .joined,
+    .psl = true,
+},
 .{
     .name = "include-with-prefix-after=",
     .syntax = .joined,
 @@ -3625,6 +3791,12 @@
     .pd2 = true,
 },
 .{ .name = "Wno-nonportable-cfstrings", .syntax = .joined },
+.{
+    .name = "ssaf-compilation-unit-id=",
+    .syntax = .joined,
+    .pd1 = false,
+    .pd2 = true,
+},
 .{ .name = "analyzer-disable-checker=", .syntax = .joined },
 .{ .name = "fbuild-session-timestamp=", .syntax = .joined },
 .{ .name = "fdo-concurrent-to-openmp=", .syntax = .joined },
 @@ -3632,6 +3804,7 @@
 .{ .name = "fms-layout-compatibility=", .syntax = .joined },
 .{ .name = "fprofile-function-groups=", .syntax = .joined },
 .{ .name = "fprofile-instrument-path=", .syntax = .joined },
+.{ .name = "fsycl-device-image-split=", .syntax = .joined },
 .{ .name = "header-include-filtering=", .syntax = .joined },
 .{ .name = "mdefault-build-attributes", .syntax = .joined },
 .{ .name = "msign-return-address-key=", .syntax = .joined },
 @@ -3677,10 +3850,17 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{
+    .name = "ssaf-extract-summaries=",
+    .syntax = .comma_joined,
+    .pd1 = false,
+    .pd2 = true,
+},
 .{ .name = "analyzer-inlining-mode=", .syntax = .joined },
 .{ .name = "fcodegen-data-generate=", .syntax = .joined },
 .{ .name = "fconstant-string-class=", .syntax = .joined },
 .{ .name = "fcrash-diagnostics-dir=", .syntax = .joined },
+.{ .name = "fcrash-diagnostics-tar=", .syntax = .joined },
 .{ .name = "fdebug-compilation-dir=", .syntax = .joined },
 .{ .name = "fdebug-default-version=", .syntax = .joined },
 .{ .name = "ffp-exception-behavior=", .syntax = .joined },
 @@ -3700,6 +3880,7 @@
 .{ .name = "Wnonportable-cfstrings", .syntax = .joined },
 .{ .name = "miphoneos-version-min=", .syntax = .joined },
 .{ .name = "fbasic-block-sections=", .syntax = .joined },
+.{ .name = "fconstant-array-class=", .syntax = .joined },
 .{ .name = "fdefault-calling-conv=", .syntax = .joined },
 .{ .name = "fdenormal-fp-math-f32=", .syntax = .joined },
 .{ .name = "fembed-offload-object=", .syntax = .joined },
 @@ -3735,6 +3916,12 @@
 .{ .name = "mvscale-streaming-min=", .syntax = .joined },
 .{ .name = "Wlarge-by-value-copy=", .syntax = .joined },
 .{ .name = "Xthinlto-distributor=", .syntax = .comma_joined },
+.{
+    .name = "ssaf-tu-summary-file=",
+    .syntax = .joined,
+    .pd1 = false,
+    .pd2 = true,
+},
 .{ .name = "analyzer-constraints=", .syntax = .joined },
 .{ .name = "analyzer-dump-egraph=", .syntax = .joined },
 .{ .name = "compatibility_version", .syntax = .joined_or_separate },
 @@ -3749,6 +3936,7 @@
 .{ .name = "fthinlto-distributor=", .syntax = .joined },
 .{ .name = "fzero-call-used-regs=", .syntax = .joined },
 .{ .name = "iframeworkwithsysroot", .syntax = .joined_or_separate },
+.{ .name = "init-datetime-macros=", .syntax = .joined },
 .{ .name = "mcode-object-version=", .syntax = .joined },
 .{ .name = "mpad-max-prefix-size=", .syntax = .joined },
 .{ .name = "mprefer-vector-width=", .syntax = .joined },
 @@ -3791,6 +3979,7 @@
 .{ .name = "fbuild-session-file=", .syntax = .joined },
 .{ .name = "fcomplex-arithmetic=", .syntax = .joined },
 .{ .name = "fdiagnostics-format=", .syntax = .joined },
+.{ .name = "ffp-maxmin-behavior=", .syntax = .joined },
 .{ .name = "fgpu-default-stream=", .syntax = .joined },
 .{ .name = "fmax-stack-var-size=", .syntax = .joined },
 .{ .name = "fmemory-profile-use=", .syntax = .joined },
 @@ -3846,6 +4035,7 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{ .name = "load-bool-from-mem=", .syntax = .joined },
 .{ .name = "mbranch-protection=", .syntax = .joined },
 .{ .name = "mmacos-version-min=", .syntax = .joined },
 .{
 @@ -3856,6 +4046,7 @@
 },
 .{ .name = "pch-through-header=", .syntax = .joined },
 .{ .name = "target-sdk-version=", .syntax = .joined },
+.{ .name = "fwin-cfg-mechanism=", .syntax = .joined },
 .{
     .name = "execution-charset:",
     .syntax = .joined,
 @@ -3896,6 +4087,7 @@
 .{ .name = "fextend-arguments=", .syntax = .joined },
 .{ .name = "ffree-line-length-", .syntax = .joined },
 .{ .name = "fmacro-prefix-map=", .syntax = .joined },
+.{ .name = "fmodule-file-deps=", .syntax = .joined },
 .{
     .name = "fno-sanitize-trap=",
     .ze = .no_sanitize_trap,
 @@ -3917,7 +4109,15 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{
+    .name = "reloc-section-sym=",
+    .syntax = .joined,
+    .pd1 = false,
+    .pd2 = true,
+},
+.{ .name = "fwinx64-eh-unwind=", .syntax = .joined },
 .{ .name = "working-directory=", .syntax = .joined },
+.{ .name = "Xoffload-compiler", .syntax = .joined_and_separate },
 .{
     .name = "amdgpu-arch-tool=",
     .syntax = .joined,
 @@ -3949,6 +4149,7 @@
 .{ .name = "mfunction-return=", .syntax = .joined },
 .{ .name = "mios-version-min=", .syntax = .joined },
 .{ .name = "mno-apx-features=", .syntax = .comma_joined },
+.{ .name = "module-file-deps=", .syntax = .joined },
 .{ .name = "mrvv-vector-bits=", .syntax = .joined },
 .{ .name = "mstack-alignment=", .syntax = .joined },
 .{ .name = "msve-vector-bits=", .syntax = .joined },
 @@ -3984,6 +4185,7 @@
 .{ .name = "analyzer-output=", .syntax = .joined },
 .{ .name = "ftemplate-depth-", .syntax = .joined },
 .{ .name = "ast-dump-filter=", .syntax = .joined },
+.{ .name = "clangir-lib-opt=", .syntax = .joined },
 .{
     .name = "config-user-dir=",
     .syntax = .joined,
 @@ -4001,6 +4203,7 @@
 .{ .name = "fmemory-profile=", .syntax = .joined },
 .{ .name = "fmessage-length=", .syntax = .joined },
 .{ .name = "fms-runtime-lib=", .syntax = .joined },
+.{ .name = "fno-strict-bool=", .syntax = .joined },
 .{ .name = "fopenmp-targets=", .syntax = .comma_joined },
 .{ .name = "fopenmp-version=", .syntax = .joined },
 .{ .name = "fprofile-update=", .syntax = .joined },
 @@ -4126,6 +4329,12 @@
 .{ .name = "mindirect-jump=", .syntax = .joined },
 .{ .name = "mzos-hlq-clang=", .syntax = .joined },
 .{ .name = "preamble-bytes=", .syntax = .joined },
+.{
+    .name = "spirv-val-path=",
+    .syntax = .joined,
+    .pd1 = false,
+    .pd2 = true,
+},
 .{ .name = "Wundef-prefix=", .syntax = .comma_joined },
 .{
     .name = "vctoolsversion",
 @@ -4305,6 +4514,7 @@
 },
 .{ .name = "mharden-sls=", .syntax = .joined },
 .{ .name = "mhvx-length=", .syntax = .joined },
+.{ .name = "mhvx-qfloat=", .syntax = .joined },
 .{ .name = "mno-tocdata=", .syntax = .comma_joined },
 .{ .name = "mvscale-max=", .syntax = .joined },
 .{ .name = "mvscale-min=", .syntax = .joined },
 @@ -4544,6 +4754,7 @@
     .pd2 = true,
 },
 .{ .name = "idirafter", .syntax = .joined_or_separate },
+.{ .name = "mscs-reg=", .syntax = .joined },
 .{ .name = "mregparm=", .syntax = .joined },
 .{ .name = "mtocdata=", .syntax = .comma_joined },
 .{ .name = "sycl-std=", .syntax = .joined },
 @@ -4552,6 +4763,11 @@
     .ze = .undefined,
     .syntax = .joined_or_separate,
 },
+.{
+    .name = "pathmap:",
+    .syntax = .joined,
+    .psl = true,
+},
 .{
     .name = "extdirs=",
     .syntax = .joined,
 @@ -4577,6 +4793,12 @@
     .pd1 = false,
     .pd2 = true,
 },
+.{
+    .name = "cstdlib=",
+    .syntax = .joined,
+    .pd1 = false,
+    .pd2 = true,
+},
 .{ .name = "dsym-dir", .syntax = .joined_or_separate },
 .{ .name = "fopenmp=", .syntax = .joined },
 .{ .name = "fplugin=", .syntax = .joined },
 @@ -4857,6 +5079,11 @@
     .syntax = .joined,
     .psl = true,
 },
+.{
+    .name = "Fre",
+    .syntax = .joined_or_separate,
+    .psl = true,
+},
 .{
     .name = "Frs",
     .syntax = .joined_or_separate,

src/codegen/c/type.zig+2

...	@@ -142,6 +142,8 @@ pub const CType = union(enum) {	...	@@ -142,6 +142,8 @@ pub const CType = union(enum) {
142		142
143	.x86_64_preserve_none,	143	.x86_64_preserve_none,
144	.aarch64_preserve_none,	144	.aarch64_preserve_none,
		145	.loongarch32_preserve_none,
		146	.loongarch64_preserve_none,
145	=> .preserve_none,	147	=> .preserve_none,
146		148
147	.aarch64_vfabi => .aarch64_vector_pcs,	149	.aarch64_vfabi => .aarch64_vector_pcs,

src/codegen/llvm.zig+36-83

 @@ -1000,11 +1000,6 @@ pub const Object = struct {
         try o.flushTypePool(pt);
     }
-    fn workaroundPrivateSymbolBugs(target: *const std.Target, resolved: *const InternPool.Nav.Resolved) bool {
-        // https://codeberg.org/ziglang/zig/issues/31865
-        return target.cpu.arch.isAARCH64() and target.ofmt == .coff and resolved.@"threadlocal";
-    }
     pub fn updateNav(o: *Object, pt: Zcu.PerThread, nav_id: InternPool.Nav.Index) !void {
         const zcu = o.zcu;
         const ip = &zcu.intern_pool;
 @@ -1082,7 +1077,7 @@ pub const Object = struct {
             };
             llvm_global.ptr(&o.builder).visibility = .fromSymbolVisibility(@"extern".visibility);
         } else {
-            llvm_global.ptr(&o.builder).linkage = if (o.builder.strip and !workaroundPrivateSymbolBugs(zcu.getTarget(), &resolved)) .private else .internal;
+            llvm_global.ptr(&o.builder).linkage = if (o.builder.strip) .private else .internal;
             llvm_global.ptr(&o.builder).visibility = .default;
             llvm_global.ptr(&o.builder).dll_storage_class = .default;
             llvm_global.ptr(&o.builder).unnamed_addr = .unnamed_addr;
 @@ -4346,6 +4341,8 @@ pub fn toLlvmCallConvTag(cc_tag: std.lang.CallingConvention.Tag, target: *const
         .amdgcn_cs => .amdgpu_cs,
         .nvptx_device => .ptx_device,
         .nvptx_kernel => .ptx_kernel,
+        .loongarch32_preserve_none => .preserve_nonecc,
+        .loongarch64_preserve_none => .preserve_nonecc,
         // Calling conventions which LLVM uses function attributes for.
         .riscv64_interrupt,
 @@ -4434,88 +4431,44 @@ pub fn toLlvmCallConvTag(cc_tag: std.lang.CallingConvention.Tag, target: *const
 /// Convert a zig-address space to an llvm address space.
 pub fn toLlvmAddressSpace(address_space: std.lang.AddressSpace, target: *const std.Target) Builder.AddrSpace {
-    for (llvmAddrSpaceInfo(target)) |info| if (info.zig == address_space) return info.llvm;
-    unreachable;
-}
-const AddrSpaceInfo = struct {
-    zig: ?std.lang.AddressSpace,
-    llvm: Builder.AddrSpace,
-    non_integral: bool = false,
-    size: ?u16 = null,
-    abi: ?u16 = null,
-    pref: ?u16 = null,
-    idx: ?u16 = null,
-    force_in_data_layout: bool = false,
-};
-fn llvmAddrSpaceInfo(target: *const std.Target) []const AddrSpaceInfo {
     return switch (target.cpu.arch) {
-        .x86, .x86_64 => &.{
+        .amdgcn => switch (address_space) {
-            .{ .zig = .generic, .llvm = .default },
+            .generic => Builder.AddrSpace.amdgpu.flat,
-            .{ .zig = .gs, .llvm = Builder.AddrSpace.x86.gs },
+            .global => Builder.AddrSpace.amdgpu.global,
-            .{ .zig = .fs, .llvm = Builder.AddrSpace.x86.fs },
+            .shared => Builder.AddrSpace.amdgpu.local,
-            .{ .zig = .ss, .llvm = Builder.AddrSpace.x86.ss },
+            .constant => Builder.AddrSpace.amdgpu.constant,
-            .{ .zig = null, .llvm = Builder.AddrSpace.x86.ptr32_sptr, .size = 32, .abi = 32, .force_in_data_layout = true },
+            .local => Builder.AddrSpace.amdgpu.private,
-            .{ .zig = null, .llvm = Builder.AddrSpace.x86.ptr32_uptr, .size = 32, .abi = 32, .force_in_data_layout = true },
+            else => unreachable,
-            .{ .zig = null, .llvm = Builder.AddrSpace.x86.ptr64, .size = 64, .abi = 64, .force_in_data_layout = true },
-        },
-        .nvptx, .nvptx64 => &.{
-            .{ .zig = .generic, .llvm = Builder.AddrSpace.nvptx.generic },
-            .{ .zig = .global, .llvm = Builder.AddrSpace.nvptx.global },
-            .{ .zig = .constant, .llvm = Builder.AddrSpace.nvptx.constant },
-            .{ .zig = .param, .llvm = Builder.AddrSpace.nvptx.param },
-            .{ .zig = .shared, .llvm = Builder.AddrSpace.nvptx.shared },
-            .{ .zig = .local, .llvm = Builder.AddrSpace.nvptx.local },
-        },
-        .amdgcn => &.{
-            .{ .zig = .generic, .llvm = Builder.AddrSpace.amdgpu.flat, .force_in_data_layout = true },
-            .{ .zig = .global, .llvm = Builder.AddrSpace.amdgpu.global, .force_in_data_layout = true },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.region, .size = 32, .abi = 32 },
-            .{ .zig = .shared, .llvm = Builder.AddrSpace.amdgpu.local, .size = 32, .abi = 32 },
-            .{ .zig = .constant, .llvm = Builder.AddrSpace.amdgpu.constant, .force_in_data_layout = true },
-            .{ .zig = .local, .llvm = Builder.AddrSpace.amdgpu.private, .size = 32, .abi = 32 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_32bit, .size = 32, .abi = 32 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_fat_pointer, .non_integral = true, .size = 160, .abi = 256, .idx = 32 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_resource, .non_integral = true, .size = 128, .abi = 128 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.buffer_strided_pointer, .non_integral = true, .size = 192, .abi = 256, .idx = 32 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_0 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_1 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_2 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_3 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_4 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_5 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_6 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_7 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_8 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_9 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_10 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_11 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_12 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_13 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_14 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.constant_buffer_15 },
-            .{ .zig = null, .llvm = Builder.AddrSpace.amdgpu.streamout_register },
         },
-        .avr => &.{
+        .avr => switch (address_space) {
-            .{ .zig = .generic, .llvm = Builder.AddrSpace.avr.data, .abi = 8 },
+            .generic => Builder.AddrSpace.avr.data,
-            .{ .zig = .flash, .llvm = Builder.AddrSpace.avr.program, .abi = 8 },
+            .flash => Builder.AddrSpace.avr.program,
-            .{ .zig = .flash1, .llvm = Builder.AddrSpace.avr.program1, .abi = 8 },
+            .flash1 => Builder.AddrSpace.avr.program1,
-            .{ .zig = .flash2, .llvm = Builder.AddrSpace.avr.program2, .abi = 8 },
+            .flash2 => Builder.AddrSpace.avr.program2,
-            .{ .zig = .flash3, .llvm = Builder.AddrSpace.avr.program3, .abi = 8 },
+            .flash3 => Builder.AddrSpace.avr.program3,
-            .{ .zig = .flash4, .llvm = Builder.AddrSpace.avr.program4, .abi = 8 },
+            .flash4 => Builder.AddrSpace.avr.program4,
-            .{ .zig = .flash5, .llvm = Builder.AddrSpace.avr.program5, .abi = 8 },
+            .flash5 => Builder.AddrSpace.avr.program5,
+            else => unreachable,
         },
-        .wasm32, .wasm64 => &.{
+        .nvptx, .nvptx64 => switch (address_space) {
-            .{ .zig = .generic, .llvm = Builder.AddrSpace.wasm.default, .force_in_data_layout = true },
+            .generic => Builder.AddrSpace.nvptx.generic,
-            .{ .zig = null, .llvm = Builder.AddrSpace.wasm.variable, .non_integral = true },
+            .global => Builder.AddrSpace.nvptx.global,
-            .{ .zig = .externref, .llvm = Builder.AddrSpace.wasm.externref, .non_integral = true, .size = 8, .abi = 8 },
+            .constant => Builder.AddrSpace.nvptx.constant,
-            .{ .zig = .funcref, .llvm = Builder.AddrSpace.wasm.funcref, .non_integral = true, .size = 8, .abi = 8 },
+            .param => Builder.AddrSpace.nvptx.entry_param,
+            .shared => Builder.AddrSpace.nvptx.shared,
+            .local => Builder.AddrSpace.nvptx.local,
+            else => unreachable,
         },
-        .m68k => &.{
+        .x86, .x86_64 => switch (address_space) {
-            .{ .zig = .generic, .llvm = .default, .abi = 16, .pref = 32 },
+            .generic => .default,
+            .gs => Builder.AddrSpace.x86.gs,
+            .fs => Builder.AddrSpace.x86.fs,
+            .ss => Builder.AddrSpace.x86.ss,
+            else => unreachable,
         },
-        else => &.{
+        else => switch (address_space) {
-            .{ .zig = .generic, .llvm = .default },
+            .generic => .default,
+            else => unreachable,
         },
     };
 }

src/codegen/llvm/FuncGen.zig+6-50

 @@ -1071,7 +1071,7 @@ fn airRet(self: *FuncGen, inst: Air.Inst.Index, safety: bool) Allocator.Error!vo
     const val_is_undef = if (un_op.toInterned()) |i| Value.fromInterned(i).isUndef(zcu) else false;
     const ret_ty_align = ret_ty.abiAlignment(zcu);
-    if (val_is_undef and safety and !self.needMemsetWorkaround(ret_ty.abiSize(zcu))) {
+    if (val_is_undef and safety) {
         const rp = switch (self.ret_ptr) {
             .none => try self.buildZigAlloca(ret_ty, .none),
             else => |rp| rp,
 @@ -5069,7 +5069,7 @@ fn airStore(fg: *FuncGen, inst: Air.Inst.Index, safety: bool) Allocator.Error!Bu
     };
     const val_is_undef = if (bin_op.rhs.toInterned()) |i| Value.fromInterned(i).isUndef(zcu) else false;
-    if (val_is_undef and !fg.needMemsetWorkaround(elem_ty.abiSize(zcu))) {
+    if (val_is_undef) {
         const owner_mod = fg.ownerModule();
         // Even if safety is disabled, we still emit a memset to undefined since it conveys
 @@ -5585,11 +5585,6 @@ fn airMemset(self: *FuncGen, inst: Air.Inst.Index, safety: bool) Allocator.Error
     self.maybeMarkAllowZeroAccess(ptr_ty.ptrInfo(zcu));
-    const allow_byte_memset = !self.needMemsetWorkaround(switch (ptr_ty.ptrSize(zcu)) {
-        .one => ptr_ty.childType(zcu).abiSize(zcu),
-        .slice => null,
-        .many, .c => unreachable,
-    });
     const len_bytes = try self.sliceOrArrayLenInBytes(dest_slice, ptr_ty);
     try self.lowerMemset(
 @@ -5600,7 +5595,6 @@ fn airMemset(self: *FuncGen, inst: Air.Inst.Index, safety: bool) Allocator.Error
         len_bytes,
         access_kind,
         safety,
-        allow_byte_memset,
     );
     return .none;
 }
 @@ -5614,12 +5608,11 @@ fn lowerMemset(
     len_bytes: Builder.Value,
     access_kind: Builder.MemoryAccessKind,
     safety: bool,
-    allow_byte_memset: bool,
 ) Allocator.Error!void {
     const o = self.object;
     const zcu = o.zcu;
-    if (allow_byte_memset) if (elem_ref.toInterned()) |elem_ip_index| {
+    if (elem_ref.toInterned()) |elem_ip_index| {
         const elem_val: Value = .fromInterned(elem_ip_index);
         if (elem_val.isUndef(zcu)) {
             // Even if safety is disabled, we still emit a memset to undefined since it conveys
 @@ -5660,13 +5653,12 @@ fn lowerMemset(
             );
             return;
         }
-    };
+    }
     const value = try self.resolveInst(elem_ref);
     const elem_abi_size = elem_ty.abiSize(zcu);
     intrinsic: {
-        if (!allow_byte_memset) break :intrinsic;
         if (elem_abi_size != 1) break :intrinsic;
         // To use LLVM's intrinsic, we need to convert the operand to a raw 8-bit integer value.
         const fill_byte: Builder.Value = byte: {
 @@ -6023,7 +6015,6 @@ fn airSplat(self: *FuncGen, inst: Air.Inst.Index) Allocator.Error!Builder.Value
                 len_bytes_llvm,
                 .normal,
                 false,
-                !self.needMemsetWorkaround(len_bytes),
             );
             if (array_info.sentinel) |sent_val| {
 @@ -6551,28 +6542,19 @@ fn airPrefetch(self: *FuncGen, inst: Air.Inst.Index) Allocator.Error!Builder.Val
     comptime assert(@backingInt(std.lang.PrefetchOptions.Cache.instruction) == 0);
     comptime assert(@backingInt(std.lang.PrefetchOptions.Cache.data) == 1);
-    // LLVM fails during codegen of instruction cache prefetchs for these architectures.
-    // This is an LLVM bug as the prefetch intrinsic should be a noop if not supported
-    // by the target.
-    // To work around this, don't emit llvm.prefetch in this case.
-    // See https://bugs.llvm.org/show_bug.cgi?id=21037
     const zcu = self.object.zcu;
     const target = zcu.getTarget();
     switch (prefetch.cache) {
         .instruction => switch (target.cpu.arch) {
+            // https://github.com/llvm/llvm-project/issues/218236
             .x86_64,
             .x86,
+            // https://github.com/llvm/llvm-project/issues/218239
             .powerpc,
             .powerpcle,
             .powerpc64,
             .powerpc64le,
             => return .none,
-            .arm, .armeb, .thumb, .thumbeb => {
-                switch (prefetch.rw) {
-                    .write => return .none,
-                    else => {},
-                }
-            },
             else => {},
         },
         .data => {},
 @@ -8144,32 +8126,6 @@ fn llvmAllocaAddressSpace(target: *const std.Target) Builder.AddrSpace {
     };
 }
-/// Due to an LLVM bug, calls to `@llvm.memset.inline.*` with large constant length arguments cause
-/// LLVM to crash. As a mitigation, this function returns `true` if we should avoid emitting a
-/// memset call of the given length.
-///
-/// Most of our call sites are just setting memory to `undefined`, so can simply skip the memset
-/// call if we return `true`.
-///
-/// Upstream issue: https://github.com/llvm/llvm-project/issues/189161
-/// Zig issue: https://codeberg.org/ziglang/zig/issues/31701
-fn needMemsetWorkaround(fg: *const FuncGen, maybe_len: ?u64) bool {
-    if (!fg.disable_intrinsics) {
-        // The bug is limited to `@llvm.memset.inline.*`: normal memset calls are fine.
-        return false;
-    }
-    const len = maybe_len orelse {
-        // We don't think the length is constant, but a trivial optimization on LLVM's side could
-        // turn it into one and potentially trigger the bug. Therefore, always apply the workaround
-        // if the length is not a known constant.
-        return true;
-    };
-    // Empirically, the crash first happens at 1048561 bytes, which is 1 MiB less 15 bytes. To be
-    // safe (just in case the limit is target-specific or something like that), let's just set the
-    // cap at half of that, i.e. 512 KiB.
-    return len > 1024 * 512;
-}
 const mips_clobber_overrides = std.StaticStringMap(enum {
     @"$msair",
     @"$msacsr",

src/codegen/spirv/CodeGen.zig-2

...	@@ -845,8 +845,6 @@ pub fn storageClass(cg: *const CodeGen, as: std.lang.AddressSpace) spec.StorageC	...	@@ -845,8 +845,6 @@ pub fn storageClass(cg: *const CodeGen, as: std.lang.AddressSpace) spec.StorageC
845	.cog,	845	.cog,
846	.lut,	846	.lut,
847	.hub,	847	.hub,
848	.externref,
849	.funcref,
850	=> unreachable,	848	=> unreachable,
851	};	849	};
852	}	850	}

src/codegen/x86_64/CodeGen.zig+1763-2683

 @@ -4287,7 +4287,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -4300,6 +4299,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
                         .unused,
                         .unused,
 @@ -4308,14 +4308,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -4427,79 +4427,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -4513,8 +4440,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -4526,10 +4453,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -15038,7 +14965,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -15051,6 +14977,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__subtf3" } },
                         .unused,
                         .unused,
 @@ -15059,14 +14986,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -15178,79 +15105,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__subtf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__subtf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -15264,8 +15118,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__subtf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -15277,10 +15131,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -24822,7 +24676,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -24835,6 +24688,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
                         .unused,
                         .unused,
 @@ -24843,14 +24697,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -24962,79 +24816,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -25048,8 +24829,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -25061,10 +24842,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -27770,10 +27551,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -27890,10 +27671,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -28010,10 +27791,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -28130,10 +27911,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -28248,10 +28029,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -28373,10 +28154,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -28498,10 +28279,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -28623,10 +28404,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -28748,10 +28529,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -28878,10 +28659,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -29008,10 +28789,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -29138,10 +28919,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -29268,10 +29049,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -29399,10 +29180,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -29530,10 +29311,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -29661,10 +29442,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -29794,10 +29575,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -29920,10 +29701,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -30046,10 +29827,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -30172,10 +29953,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -30298,10 +30079,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -30425,10 +30206,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -30552,10 +30333,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -30679,10 +30460,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -33080,7 +32861,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -33093,6 +32873,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
                         .unused,
                         .unused,
 @@ -33101,14 +32882,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -33220,79 +33001,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -33306,8 +33014,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -33319,10 +33027,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -34453,7 +34161,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -34464,97 +34171,28 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     },
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
                         .{ .type = .f128, .kind = .mem },
-                        .{ .type = .usize, .kind = .{ .extern_func = "truncf128" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                        .{ ._, .v_dqa, .mov, .lea(.tmp0x), .dst0x, ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .mem },
-                        .{ .type = .usize, .kind = .{ .extern_func = "truncf128" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp0x), .dst0x, ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
-                    .src_constraints = .{
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .mem },
                         .{ .type = .usize, .kind = .{ .extern_func = "truncf128" } },
                         .unused,
                         .unused,
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                        .{ ._, ._ps, .mova, .lea(.tmp0x), .dst0x, ._, ._ },
                         .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -34669,7 +34307,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -34681,89 +34318,11 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
                         .{ .type = .f128, .kind = .mem },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "truncf128" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0x, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1x, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                        .{ ._, .v_dqa, .mov, .lea(.tmp1x), .tmp5x, ._, ._ },
-                        .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .mem },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "truncf128" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0x, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1x, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp5x, ._, ._ },
-                        .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .mem },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "truncf128" } },
                         .unused,
                         .unused,
 @@ -34774,13 +34333,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0x, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp2p, .mem(.tmp1), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1x, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp4p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                        .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp5x, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.dst0, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .mem(.tmp1), ._, ._ },
                         .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -35979,7 +35538,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
                         .src_constraints = .{
                             .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                             .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -35990,10 +35548,11 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         },
                         .call_frame = .{ .alignment = .@"16" },
                         .extra_temps = .{
+                            .{ .type = .f128, .kind = .mem },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                            .{ .type = .f128, .kind = .mem },
                             .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
                                 else => unreachable,
                                 .zero => "truncf128",
 @@ -36004,24 +35563,24 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                             .unused,
-                            .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
-                            .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.src0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .mem(.src1), ._, ._ },
-                            .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp0x), .dst0x, ._, ._ },
                             .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.tmp0), ._, ._ },
+                            .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
                         } },
                     }, .{
-                        .required_cc_abi = .win64,
+                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .sse2, null, null, null },
+                        .required_features = .{ .avx, null, null, null },
                         .src_constraints = .{
-                            .{ .scalar_float = .{ .of = .xword, .is = .xword } },
+                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .{ .scalar_float = .{ .of = .xword, .is = .xword } },
+                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                             .any,
                         },
                         .patterns = &.{
 @@ -36029,10 +35588,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         },
                         .call_frame = .{ .alignment = .@"16" },
                         .extra_temps = .{
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                            .{ .type = .f128, .kind = .mem },
                             .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
                                 else => unreachable,
                                 .zero => "truncf128",
 @@ -36045,22 +35604,24 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
-                            .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                            .{ .@"0:", .v_dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                            .{ ._, .v_dqa, .mov, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
+                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp0x), .dst0x, ._, ._ },
                             .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                            .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
+                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
+                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                         } },
                     }, .{
-                        .required_cc_abi = .win64,
+                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .sse, null, null, null },
+                        .required_features = .{ .sse2, null, null, null },
                         .src_constraints = .{
-                            .{ .scalar_float = .{ .of = .xword, .is = .xword } },
+                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .{ .scalar_float = .{ .of = .xword, .is = .xword } },
+                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                             .any,
                         },
                         .patterns = &.{
 @@ -36068,10 +35629,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         },
                         .call_frame = .{ .alignment = .@"16" },
                         .extra_temps = .{
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                            .{ .type = .f128, .kind = .mem },
                             .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
                                 else => unreachable,
                                 .zero => "truncf128",
 @@ -36084,101 +35645,21 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
-                            .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                            .{ .@"0:", ._dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                            .{ ._, ._dqa, .mov, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
+                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp0x), .dst0x, ._, ._ },
                             .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                            .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
+                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
+                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                         } },
                     }, .{
                         .required_cc_abi = .sysv64,
-                        .required_features = .{ .avx, null, null, null },
+                        .required_features = .{ .sse, null, null, null },
-                        .src_constraints = .{
-                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .any,
-                        },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .to_mem, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                            .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
-                                else => unreachable,
-                                .zero => "truncf128",
-                                .down => "floorf128",
-                            } } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .mem, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", .v_dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .src_constraints = .{
-                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .any,
-                        },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .to_mem, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                            .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
-                                else => unreachable,
-                                .zero => "truncf128",
-                                .down => "floorf128",
-                            } } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .mem, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, ._dqa, .mov, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .sse, null, null, null },
                         .src_constraints = .{
                             .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                             .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -36219,7 +35700,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
                         .src_constraints = .{
                             .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                             .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -36231,97 +35711,11 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .call_frame = .{ .alignment = .@"16" },
                         .extra_temps = .{
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
                             .{ .type = .f128, .kind = .mem },
-                            .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
-                                else => unreachable,
-                                .zero => "truncf128",
-                                .down => "floorf128",
-                            } } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .mem, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp2p, .memi(.src1x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp1x), .tmp5x, ._, ._ },
-                            .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                            .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .src_constraints = .{
-                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .any,
-                        },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .to_mem, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
-                                else => unreachable,
-                                .zero => "truncf128",
-                                .down => "floorf128",
-                            } } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .mem, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp2p, .memi(.src1x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp5x, ._, ._ },
-                            .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                            .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse, null, null, null },
-                        .src_constraints = .{
-                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                            .any,
-                        },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .to_mem, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
                                 else => unreachable,
                                 .zero => "truncf128",
 @@ -36336,13 +35730,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0x, .tmp0), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp2p, .mem(.tmp1), ._, ._ },
-                            .{ ._, ._, .lea, .tmp2p, .memi(.src1x, .tmp0), ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp4p, .memi(.src1, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                            .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp5x, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memi(.dst0, .tmp0), ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .mem(.tmp1), ._, ._ },
                             .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -37708,7 +37102,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -37719,97 +37112,28 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     },
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
                         .{ .type = .f128, .kind = .mem },
-                        .{ .type = .usize, .kind = .{ .extern_func = "floorf128" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                        .{ ._, .v_dqa, .mov, .lea(.tmp0x), .dst0x, ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .mem },
-                        .{ .type = .usize, .kind = .{ .extern_func = "floorf128" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp0x), .dst0x, ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
-                    .src_constraints = .{
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .mem },
                         .{ .type = .usize, .kind = .{ .extern_func = "floorf128" } },
                         .unused,
                         .unused,
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                        .{ ._, ._ps, .mova, .lea(.tmp0x), .dst0x, ._, ._ },
                         .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -37924,7 +37248,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -37936,89 +37259,11 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
                         .{ .type = .f128, .kind = .mem },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "floorf128" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0x, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1x, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                        .{ ._, .v_dqa, .mov, .lea(.tmp1x), .tmp5x, ._, ._ },
-                        .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .mem },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "floorf128" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0x, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1x, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp5x, ._, ._ },
-                        .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__divtf3" } },
-                        .{ .type = .f128, .kind = .mem },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "floorf128" } },
                         .unused,
                         .unused,
 @@ -38029,13 +37274,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0x, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp2p, .mem(.tmp1), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1x, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp4p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                        .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp5x, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.dst0, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .mem(.tmp1), ._, ._ },
                         .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -39575,7 +38820,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -39588,6 +38832,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fmodf128" } },
                         .unused,
                         .unused,
 @@ -39596,14 +38841,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -39715,79 +38960,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fmodf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fmodf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -39801,8 +38973,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fmodf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -39814,10 +38986,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -40229,8 +39401,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .dst0q0, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p0, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .dst0q1, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p1, .mem(.src1), ._, ._ },
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                         .{ ._, .v_q, .mov, .dst0q0, .tmp1x, ._, ._ },
                         .{ ._, ._, .mov, .tmp2q, .memd(.src1q, 8), ._, ._ },
 @@ -40271,8 +39443,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .dst0q0, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p0, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .dst0q1, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p1, .mem(.src1), ._, ._ },
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                         .{ ._, ._q, .mov, .dst0q0, .tmp1x, ._, ._ },
                         .{ ._, ._, .mov, .tmp2q, .memd(.src1q, 8), ._, ._ },
 @@ -40313,8 +39485,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .dst0q0, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p0, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .dst0q1, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p1, .mem(.src1), ._, ._ },
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                         .{ ._, ._q, .mov, .dst0q0, .tmp1x, ._, ._ },
                         .{ ._, ._, .mov, .tmp2q, .memd(.src1q, 8), ._, ._ },
 @@ -40356,8 +39528,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .dst0q0, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p0, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .dst0q1, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p1, .mem(.src1), ._, ._ },
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                         .{ ._, ._ps, .mova, .mem(.tmp2x), .tmp1x, ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .memd(.src1q, 8), ._, ._ },
 @@ -40399,8 +39571,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .dst0q0, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p0, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .dst0q1, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p1, .mem(.src1), ._, ._ },
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                         .{ ._, .v_q, .mov, .dst0q0, .tmp1x, ._, ._ },
                         .{ ._, ._, .mov, .tmp2q, .memd(.src1q, 8), ._, ._ },
 @@ -40439,8 +39611,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .dst0q0, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p0, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .dst0q1, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p1, .mem(.src1), ._, ._ },
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                         .{ ._, ._q, .mov, .dst0q0, .tmp1x, ._, ._ },
                         .{ ._, ._, .mov, .tmp2q, .memd(.src1q, 8), ._, ._ },
 @@ -40479,8 +39651,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .dst0q0, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p0, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .dst0q1, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p1, .mem(.src1), ._, ._ },
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                         .{ ._, ._q, .mov, .dst0q0, .tmp1x, ._, ._ },
                         .{ ._, ._, .mov, .tmp2q, .memd(.src1q, 8), ._, ._ },
 @@ -40520,8 +39692,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .dst0q0, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p0, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .dst0q1, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p1, .mem(.src1), ._, ._ },
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                         .{ ._, ._ps, .mova, .mem(.tmp2x), .tmp1x, ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .memd(.src1q, 8), ._, ._ },
 @@ -42969,52 +42141,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .@"64bit", .avx, null, null },
+                    .required_features = .{ .@"64bit", null, null, null },
-                    .src_constraints = .{
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fmodf128" } },
-                        .{ .type = .f128, .kind = .mem },
-                        .{ .type = .f128, .kind = .{ .reg = .xmm1 } },
-                        .{ .type = .u64, .kind = .{ .reg = .rax } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._, .mov, .tmp0q, .ua(.src0, .add_smin), ._, ._ },
-                        .{ ._, .vp_q, .extr, .tmp1q, .dst0x, .ui(1), ._ },
-                        .{ ._, ._, .mov, .tmp5q, .tmp0q, ._, ._ },
-                        .{ ._, ._, .@"and", .tmp5q, .memd(.src1q, 8), ._, ._ },
-                        .{ ._, ._, .xor, .tmp5q, .tmp1q, ._, ._ },
-                        .{ ._, .v_q, .mov, .tmp1q, .dst0x, ._, ._ },
-                        .{ ._, ._, .cmp, .tmp1q, .si(1), ._, ._ },
-                        .{ ._, ._, .sbb, .tmp5q, .tmp0q, ._, ._ },
-                        .{ ._, ._nae, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                        .{ ._, .v_dqa, .mov, .lea(.tmp0x), .dst0x, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .@"64bit", .sse4_1, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -43027,125 +42154,38 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fmodf128" } },
-                        .{ .type = .f128, .kind = .mem },
-                        .{ .type = .f128, .kind = .{ .reg = .xmm1 } },
                         .{ .type = .u64, .kind = .{ .reg = .rax } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._, .mov, .tmp0q, .ua(.src0, .add_smin), ._, ._ },
-                        .{ ._, .p_q, .extr, .tmp1q, .dst0x, .ui(1), ._ },
-                        .{ ._, ._, .mov, .tmp5q, .tmp0q, ._, ._ },
-                        .{ ._, ._, .@"and", .tmp5q, .memd(.src1q, 8), ._, ._ },
-                        .{ ._, ._, .xor, .tmp5q, .tmp1q, ._, ._ },
-                        .{ ._, ._q, .mov, .tmp1q, .dst0x, ._, ._ },
-                        .{ ._, ._, .cmp, .tmp1q, .si(1), ._, ._ },
-                        .{ ._, ._, .sbb, .tmp5q, .tmp0q, ._, ._ },
-                        .{ ._, ._nae, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp0x), .dst0x, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .@"64bit", .sse2, null, null },
-                    .src_constraints = .{
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fmodf128" } },
                         .{ .type = .f128, .kind = .mem },
-                        .{ .type = .f128, .kind = .{ .reg = .xmm1 } },
-                        .{ .type = .u64, .kind = .{ .reg = .rax } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
                         .unused,
                         .unused,
                         .unused,
                         .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src1), ._, ._ },
-                        .{ ._, .p_d, .shuf, .tmp4x, .dst0x, .ui(0b11_10_11_10), ._ },
+                        .{ ._, ._, .call, .tmp3p, ._, ._, ._ },
                         .{ ._, ._, .mov, .tmp0q, .ua(.src0, .add_smin), ._, ._ },
-                        .{ ._, ._q, .mov, .tmp1q, .tmp4x, ._, ._ },
+                        .{ ._, ._, .mov, .tmp1q, .tmp0q, ._, ._ },
-                        .{ ._, ._, .mov, .tmp5q, .tmp0q, ._, ._ },
+                        .{ ._, ._, .@"and", .tmp1q, .memd(.src1q, 8), ._, ._ },
-                        .{ ._, ._, .@"and", .tmp5q, .memd(.src1q, 8), ._, ._ },
+                        .{ ._, ._, .mov, .tmp2q, .memd(.dst0q, 8), ._, ._ },
-                        .{ ._, ._, .xor, .tmp5q, .tmp1q, ._, ._ },
+                        .{ ._, ._, .xor, .tmp1q, .tmp2q, ._, ._ },
-                        .{ ._, ._q, .mov, .tmp1q, .dst0x, ._, ._ },
+                        .{ ._, ._, .mov, .tmp4q, .mem(.dst0q), ._, ._ },
-                        .{ ._, ._, .cmp, .tmp1q, .si(1), ._, ._ },
+                        .{ ._, ._, .cmp, .tmp4q, .si(1), ._, ._ },
-                        .{ ._, ._, .sbb, .tmp5q, .tmp0q, ._, ._ },
+                        .{ ._, ._, .sbb, .tmp1q, .tmp0q, ._, ._ },
                         .{ ._, ._nae, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
+                        .{ ._, ._, .mov, .mem(.tmp5q), .tmp4q, ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp0x), .dst0x, ._, ._ },
+                        .{ ._, ._, .mov, .memd(.tmp5q, 8), .tmp2q, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.tmp5), ._, ._ },
                         .{ ._, ._, .call, .tmp6d, ._, ._, ._ },
                     } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .@"64bit", .sse, null, null },
-                    .src_constraints = .{
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fmodf128" } },
-                        .{ .type = .f128, .kind = .mem },
-                        .{ .type = .usize, .kind = .{ .reg = .rax } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .mem(.tmp3), ._, ._ },
-                        .{ ._, ._, .mov, .tmp1q, .ua(.src0, .add_smin), ._, ._ },
-                        .{ ._, ._ps, .mova, .lea(.tmp0x), .dst0x, ._, ._ },
-                        .{ ._, ._, .mov, .tmp4q, .tmp1q, ._, ._ },
-                        .{ ._, ._, .@"and", .tmp4q, .memd(.src1q, 8), ._, ._ },
-                        .{ ._, ._, .xor, .tmp4q, .lead(.tmp0q, 8), ._, ._ },
-                        .{ ._, ._, .cmp, .lea(.tmp0q), .si(1), ._, ._ },
-                        .{ ._, ._, .sbb, .tmp4q, .tmp1q, ._, ._ },
-                        .{ ._, ._nae, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
-                    } },
                 }, .{
                     .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .avx, null, null },
 @@ -47640,7 +46680,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -47653,39 +46692,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .sysv64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
                         .unused,
                         .unused,
 @@ -47698,17 +46705,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ .@"0:", .v_dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                        .{ ._, .v_dqa, .mov, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src1), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
-                    .required_features = .{ .sse2, null, null, null },
+                    .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -47735,16 +46739,16 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
+                        .{ .@"0:", .v_dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                        .{ ._, ._dqa, .mov, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
+                        .{ ._, .v_dqa, .mov, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
+                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
-                    .required_features = .{ .sse, null, null, null },
+                    .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -47771,16 +46775,16 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._ps, .mova, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
+                        .{ .@"0:", ._dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
+                        .{ ._, ._dqa, .mov, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
+                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_cc_abi = .win64,
+                    .required_cc_abi = .sysv64,
-                    .required_features = .{ .avx, null, null, null },
+                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -47792,67 +46796,30 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
                         .unused,
                         .unused,
                         .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
                         .unused,
                     },
                     .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._ps, .mova, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
+                        .{ ._, ._ps, .mova, .tmp2x, .memi(.src1x, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
+                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp1x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -47866,8 +46833,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -47879,10 +46846,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -51943,7 +50910,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -51956,6 +50922,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
                         .unused,
                         .unused,
 @@ -51964,14 +50931,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -52083,79 +51050,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .any,
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -52169,8 +51063,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -52182,10 +51076,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -54509,10 +53403,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -54620,10 +53514,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -54731,10 +53625,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -54842,10 +53736,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -54951,10 +53845,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -55066,10 +53960,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -55181,10 +54075,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -55296,10 +54190,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -55411,10 +54305,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -55532,10 +54426,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -55653,10 +54547,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -55774,10 +54668,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -55897,10 +54791,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -56015,10 +54909,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
-                        .{ ._, ._, .lea, .tmp8q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp8p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._nz, .cmov, .tmp2q, .tmp8q, ._, ._ },
+                        .{ ._, ._nz, .cmov, .tmp2p, .tmp8p, ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -56133,10 +55027,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -56251,10 +55145,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .xor, .tmp7d, .tmp7d, ._, ._ },
                         .{ ._, ._, .cmp, .tmp1b, .tmp3b, ._, ._ },
                         .{ ._, ._e, .j, .@"1f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src0, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_size, -8), ._, ._ },
                         .{ ._, ._, .@"test", .tmp1b, .tmp1b, ._, ._ },
                         .{ ._, ._z, .j, .@"0f", ._, ._, ._ },
-                        .{ ._, ._, .lea, .tmp2q, .memad(.src1, .add_size, -8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memad(.src1, .add_size, -8), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp8d, .tmp7d, ._, ._ },
                         .{ ._, ._, .sbb, .tmp8q, .leasi(.tmp2q, .@"8", .tmp0), ._, ._ },
                         .{ ._, ._, .adc, .tmp6b, .tmp6b, ._, ._ },
 @@ -67560,7 +66454,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .dst0b, .sia(32, .src0, .sub_bit_size), ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .false_deps_lzcnt_tzcnt, .lzcnt, null, null },
+                    .required_features = .{ .false_deps_lzcnt, .lzcnt, null, null },
                     .src_constraints = .{ .{ .exact_int = 16 }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mut_gpr, .none, .none } },
 @@ -67596,7 +66490,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .dst0b, .sia(16, .src0, .sub_bit_size), ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .false_deps_lzcnt_tzcnt, .lzcnt, null, null },
+                    .required_features = .{ .false_deps_lzcnt, .lzcnt, null, null },
                     .src_constraints = .{ .{ .unsigned_int = .word }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mut_gpr, .none, .none } },
 @@ -67621,7 +66515,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .dst0b, .sia(16, .src0, .sub_bit_size), ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .false_deps_lzcnt_tzcnt, .lzcnt, null, null },
+                    .required_features = .{ .false_deps_lzcnt, .lzcnt, null, null },
                     .src_constraints = .{ .{ .exact_int = 32 }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mut_gpr, .none, .none } },
 @@ -67657,7 +66551,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .dst0b, .sia(32, .src0, .sub_bit_size), ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .false_deps_lzcnt_tzcnt, .lzcnt, null, null },
+                    .required_features = .{ .false_deps_lzcnt, .lzcnt, null, null },
                     .src_constraints = .{ .{ .unsigned_int = .dword }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mut_gpr, .none, .none } },
 @@ -67682,7 +66576,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .dst0b, .sia(32, .src0, .sub_bit_size), ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .exact_int = 64 }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mut_gpr, .none, .none } },
 @@ -67720,7 +66614,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .dst0b, .sia(64, .src0, .sub_bit_size), ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .unsigned_int = .qword }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mut_gpr, .none, .none } },
 @@ -68577,7 +67471,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .dst0b, .tmp0b, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .unsigned_or_exact_remainder_int = .{ .of = .xword, .is = .qword } }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -68705,7 +67599,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .neg, .dst0d, ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .unsigned_or_exact_remainder_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -68833,7 +67727,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .neg, .dst0d, ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .remainder_int = .{ .of = .xword, .is = .qword } }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -68936,7 +67830,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .neg, .dst0d, ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .remainder_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -70092,7 +68986,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._nz, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .scalar_remainder_int = .{ .of = .xword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .scalar_int_is = .byte }, .any },
                     .patterns = &.{
 @@ -70115,7 +69009,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-16, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70129,7 +69023,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .neg, .tmp2d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp3d, .leasiad(.tmp4, .@"8", .tmp2, .add_src0_bit_size, -64), ._, ._ },
                         .{ ._, ._, .mov, .memia(.dst0b, .tmp0, .add_len), .tmp3b, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -70157,7 +69051,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-16, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70170,7 +69064,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .neg, .tmp2d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp3d, .leasiad(.tmp4, .@"8", .tmp2, .add_src0_bit_size, -64), ._, ._ },
                         .{ ._, ._, .mov, .memia(.dst0b, .tmp0, .add_len), .tmp3b, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -70198,7 +69092,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-16, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70211,12 +69105,12 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .lea, .tmp3d, .leasiad(.tmp3, .@"8", .tmp2, .sub_src0_bit_size, 1), ._, ._ },
                         .{ ._, ._, .neg, .tmp3b, ._, ._, ._ },
                         .{ ._, ._, .mov, .memia(.dst0b, .tmp0, .add_len), .tmp3b, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .scalar_remainder_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .dst_constraints = .{ .{ .scalar_int_is = .byte }, .any },
                     .patterns = &.{
 @@ -70239,7 +69133,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-8, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70253,7 +69147,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .neg, .tmp2d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp3d, .leasiad(.tmp4, .@"8", .tmp2, .add_src0_bit_size, -64), ._, ._ },
                         .{ ._, ._, .mov, .memia(.dst0b, .tmp0, .add_len), .tmp3b, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -70281,7 +69175,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-8, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70294,7 +69188,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .neg, .tmp2d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp3d, .leasiad(.tmp4, .@"8", .tmp2, .add_src0_bit_size, -64), ._, ._ },
                         .{ ._, ._, .mov, .memia(.dst0b, .tmp0, .add_len), .tmp3b, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -70322,7 +69216,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-8, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70335,12 +69229,12 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .lea, .tmp3d, .leasiad(.tmp3, .@"8", .tmp2, .sub_src0_bit_size, 1), ._, ._ },
                         .{ ._, ._, .neg, .tmp3b, ._, ._, ._ },
                         .{ ._, ._, .mov, .memia(.dst0b, .tmp0, .add_len), .tmp3b, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .scalar_remainder_int = .{ .of = .xword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .scalar_int_is = .word }, .any },
                     .patterns = &.{
 @@ -70363,7 +69257,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-16, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70377,7 +69271,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .neg, .tmp2d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp3d, .leasiad(.tmp4, .@"8", .tmp2, .add_src0_bit_size, -64), ._, ._ },
                         .{ ._, ._, .mov, .memsia(.dst0w, .@"2", .tmp0, .add_2_len), .tmp3w, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -70405,7 +69299,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-16, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70418,7 +69312,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .neg, .tmp2d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp3d, .leasiad(.tmp4, .@"8", .tmp2, .add_src0_bit_size, -64), ._, ._ },
                         .{ ._, ._, .mov, .memsia(.dst0w, .@"2", .tmp0, .add_2_len), .tmp3w, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -70446,7 +69340,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-16, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70459,12 +69353,12 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .lea, .tmp3d, .leasiad(.tmp3, .@"8", .tmp2, .sub_src0_bit_size, 1), ._, ._ },
                         .{ ._, ._, .neg, .tmp3d, ._, ._, ._ },
                         .{ ._, ._, .mov, .memsia(.dst0w, .@"2", .tmp0, .add_2_len), .tmp3w, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .false_deps_lzcnt_tzcnt, .lzcnt, null },
+                    .required_features = .{ .@"64bit", .false_deps_lzcnt, .lzcnt, null },
                     .src_constraints = .{ .{ .scalar_remainder_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .dst_constraints = .{ .{ .scalar_int_is = .word }, .any },
                     .patterns = &.{
 @@ -70487,7 +69381,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-8, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70501,7 +69395,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .neg, .tmp2d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp3d, .leasiad(.tmp4, .@"8", .tmp2, .add_src0_bit_size, -64), ._, ._ },
                         .{ ._, ._, .mov, .memsia(.dst0w, .@"2", .tmp0, .add_2_len), .tmp3w, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -70529,7 +69423,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-8, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70542,7 +69436,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .neg, .tmp2d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp3d, .leasiad(.tmp4, .@"8", .tmp2, .add_src0_bit_size, -64), ._, ._ },
                         .{ ._, ._, .mov, .memsia(.dst0w, .@"2", .tmp0, .add_2_len), .tmp3w, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -70570,7 +69464,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .sia(-8, .none, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .ua(.src0, .add_umax), ._, ._ },
                         .{ .@"1:", ._, .@"and", .tmp3q, .leai(.tmp1q, .tmp2), ._, ._ },
 @@ -70583,7 +69477,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"1:", ._, .lea, .tmp3d, .leasiad(.tmp3, .@"8", .tmp2, .sub_src0_bit_size, 1), ._, ._ },
                         .{ ._, ._, .neg, .tmp3d, ._, ._, ._ },
                         .{ ._, ._, .mov, .memsia(.dst0w, .@"2", .tmp0, .add_2_len), .tmp3w, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leaa(.tmp1, .add_src0_elem_size), ._, ._ },
                         .{ ._, ._, .add, .tmp0p, .si(1), ._, ._ },
                         .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -70649,7 +69543,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .tzcnt, .dst0w, .src0w, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .bmi, .false_deps_lzcnt_tzcnt, null, null },
+                    .required_features = .{ .bmi, .false_deps_tzcnt, null, null },
                     .src_constraints = .{ .{ .exact_int = 32 }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .mem, .none, .none } },
 @@ -70686,7 +69580,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .tzcnt, .dst0d, .src0d, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .bmi, .false_deps_lzcnt_tzcnt, null },
+                    .required_features = .{ .@"64bit", .bmi, .false_deps_tzcnt, null },
                     .src_constraints = .{ .{ .exact_int = 64 }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .mem, .none, .none } },
 @@ -70863,7 +69757,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._f, .bs, .dst0q, .src0q, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .bmi, .false_deps_lzcnt_tzcnt, null },
+                    .required_features = .{ .@"64bit", .bmi, .false_deps_tzcnt, null },
                     .src_constraints = .{ .{ .remainder_int = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -71479,13 +70373,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .mov, .tmp1q, .uia(0x33333333, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .dst0q, .tmp1q, ._, ._ },
                         .{ ._, ._, .@"and", .tmp0q, .tmp1q, ._, ._ },
-                        .{ ._, ._, .lea, .dst0q, .leai(.dst0, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p, .leai(.dst0, .tmp0), ._, ._ },
                         .{ ._, ._, .mov, .tmp0q, .dst0q, ._, ._ },
                         .{ ._, ._r, .sh, .dst0q, .ui(4), ._, ._ },
                         .{ ._, ._, .mov, .tmp1q, .uia(0x0f0f0f0f, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .tmp0q, .tmp1q, ._, ._ },
                         .{ ._, ._, .@"and", .dst0q, .tmp1q, ._, ._ },
-                        .{ ._, ._, .lea, .dst0q, .leai(.dst0, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p, .leai(.dst0, .tmp0), ._, ._ },
                         .{ ._, ._, .mov, .tmp1q, .uia(0x01010101, .none, .repeat), ._, ._ },
                         .{ ._, .i_, .mul, .dst0q, .tmp1q, ._, ._ },
                         .{ ._, ._r, .sh, .dst0q, .ui(64 - 8), ._, ._ },
 @@ -71523,13 +70417,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .mov, .tmp1q, .uia(0x33333333, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .dst0q, .tmp1q, ._, ._ },
                         .{ ._, ._, .@"and", .tmp0q, .tmp1q, ._, ._ },
-                        .{ ._, ._, .lea, .dst0q, .leai(.dst0, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p, .leai(.dst0, .tmp0), ._, ._ },
                         .{ ._, ._, .mov, .tmp0q, .dst0q, ._, ._ },
                         .{ ._, ._r, .sh, .dst0q, .ui(4), ._, ._ },
                         .{ ._, ._, .mov, .tmp1q, .uia(0x0f0f0f0f, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .tmp0q, .tmp1q, ._, ._ },
                         .{ ._, ._, .@"and", .dst0q, .tmp1q, ._, ._ },
-                        .{ ._, ._, .lea, .dst0q, .leai(.dst0, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p, .leai(.dst0, .tmp0), ._, ._ },
                         .{ ._, ._, .mov, .tmp1q, .uia(0x01010101, .none, .repeat), ._, ._ },
                         .{ ._, .i_, .mul, .dst0q, .tmp1q, ._, ._ },
                         .{ ._, ._r, .sh, .dst0q, .ui(64 - 8), ._, ._ },
 @@ -71754,13 +70648,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .mov, .tmp3q, .uia(0x33333333, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .tmp1q, .tmp3q, ._, ._ },
                         .{ ._, ._, .@"and", .tmp2q, .tmp3q, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leai(.tmp1, .tmp2), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leai(.tmp1, .tmp2), ._, ._ },
                         .{ ._, ._, .mov, .tmp2q, .tmp1q, ._, ._ },
                         .{ ._, ._r, .sh, .tmp1q, .ui(4), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .uia(0x0f0f0f0f, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .tmp2q, .tmp3q, ._, ._ },
                         .{ ._, ._, .@"and", .tmp1q, .tmp3q, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leai(.tmp1, .tmp2), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leai(.tmp1, .tmp2), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .uia(0x01010101, .none, .repeat), ._, ._ },
                         .{ ._, .i_, .mul, .tmp1q, .tmp3q, ._, ._ },
                         .{ ._, ._r, .sh, .tmp1q, .ui(64 - 8), ._, ._ },
 @@ -71806,13 +70700,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .mov, .tmp3q, .uia(0x33333333, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .tmp1q, .tmp3q, ._, ._ },
                         .{ ._, ._, .@"and", .tmp2q, .tmp3q, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leai(.tmp1, .tmp2), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leai(.tmp1, .tmp2), ._, ._ },
                         .{ ._, ._, .mov, .tmp2q, .tmp1q, ._, ._ },
                         .{ ._, ._r, .sh, .tmp1q, .ui(4), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .uia(0x0f0f0f0f, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .tmp2q, .tmp3q, ._, ._ },
                         .{ ._, ._, .@"and", .tmp1q, .tmp3q, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leai(.tmp1, .tmp2), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leai(.tmp1, .tmp2), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .uia(0x01010101, .none, .repeat), ._, ._ },
                         .{ ._, .i_, .mul, .tmp1q, .tmp3q, ._, ._ },
                         .{ ._, ._r, .sh, .tmp1q, .ui(64 - 8), ._, ._ },
 @@ -71858,13 +70752,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .mov, .tmp3q, .uia(0x33333333, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .tmp1q, .tmp3q, ._, ._ },
                         .{ ._, ._, .@"and", .tmp2q, .tmp3q, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leai(.tmp1, .tmp2), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leai(.tmp1, .tmp2), ._, ._ },
                         .{ ._, ._, .mov, .tmp2q, .tmp1q, ._, ._ },
                         .{ ._, ._r, .sh, .tmp1q, .ui(4), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .uia(0x0f0f0f0f, .none, .repeat), ._, ._ },
                         .{ ._, ._, .@"and", .tmp2q, .tmp3q, ._, ._ },
                         .{ ._, ._, .@"and", .tmp1q, .tmp3q, ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .leai(.tmp1, .tmp2), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .leai(.tmp1, .tmp2), ._, ._ },
                         .{ ._, ._, .mov, .tmp3q, .uia(0x01010101, .none, .repeat), ._, ._ },
                         .{ ._, .i_, .mul, .tmp1q, .tmp3q, ._, ._ },
                         .{ ._, ._r, .sh, .tmp1q, .ui(64 - 8), ._, ._ },
 @@ -76474,7 +75368,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -76482,6 +75375,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "sqrtf128" } },
                         .unused,
                         .unused,
 @@ -76491,13 +75385,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -76594,69 +75488,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .none, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "sqrtf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .none, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "sqrtf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -76665,8 +75496,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "sqrtf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -76679,9 +75510,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -77323,7 +76154,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .sse, null, null, null },
                         .src_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
                             .{ .src = .{ .to_mem, .none, .none } },
 @@ -77331,6 +76161,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .call_frame = .{ .alignment = .@"16" },
                         .extra_temps = .{
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = @tagName(name) ++ "f128" } },
                             .unused,
                             .unused,
 @@ -77340,13 +76171,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                             .unused,
-                            .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
-                            .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                            .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                         } },
                     }, .{
                         .required_cc_abi = .sysv64,
 @@ -77443,69 +76274,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = @tagName(name) ++ "f128" } },
-                            .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .mem, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = @tagName(name) ++ "f128" } },
-                            .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .mem, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse, null, null, null },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
                             .{ .src = .{ .to_mem, .none, .none } },
 @@ -77514,8 +76282,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .extra_temps = .{
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = @tagName(name) ++ "f128" } },
-                            .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .unused,
                             .unused,
                             .unused,
 @@ -77528,9 +76296,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
+                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -80175,7 +78943,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .sse, null, null, null },
                         .src_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
                             .{ .src = .{ .to_mem, .none, .none } },
 @@ -80183,6 +78950,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .call_frame = .{ .alignment = .@"16" },
                         .extra_temps = .{
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
                                 else => unreachable,
                                 .down => "floorf128",
 @@ -80197,13 +78965,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                             .unused,
-                            .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
-                            .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                            .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                         } },
                     }, .{
                         .required_cc_abi = .sysv64,
 @@ -80315,79 +79083,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
-                                else => unreachable,
-                                .down => "floorf128",
-                                .up => "ceilf128",
-                                .zero => "truncf128",
-                            } } },
-                            .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .mem, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
-                                else => unreachable,
-                                .down => "floorf128",
-                                .up => "ceilf128",
-                                .zero => "truncf128",
-                            } } },
-                            .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .mem, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse, null, null, null },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
                             .{ .src = .{ .to_mem, .none, .none } },
 @@ -80396,13 +79091,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .extra_temps = .{
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = switch (direction) {
                                 else => unreachable,
                                 .down => "floorf128",
                                 .up => "ceilf128",
                                 .zero => "truncf128",
                             } } },
-                            .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .unused,
                             .unused,
                             .unused,
 @@ -80415,9 +79110,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
+                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -92472,6 +91167,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .scalar_float = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -92498,6 +91194,35 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .sse, null, null, null },
+                    .src_constraints = .{ .{ .scalar_float = .{ .of = .word, .is = .word } }, .any, .any },
+                    .dst_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .{ .to_param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extendhftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -92530,6 +91255,40 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .avx, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .word, .is = .word } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .f16, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extendhftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-2, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"8", .tmp0), ._, ._ },
+                        .{ ._, .vp_, .xor, .tmp2x, .tmp2x, .tmp2x, ._ },
+                        .{ ._, .vp_w, .insr, .tmp2x, .tmp2x, .memi(.src0w, .tmp0), .ui(0) },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(2), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -92562,6 +91321,40 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .sse2, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .word, .is = .word } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .f16, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extendhftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-2, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"8", .tmp0), ._, ._ },
+                        .{ ._, .p_, .xor, .tmp2x, .tmp2x, ._, ._ },
+                        .{ ._, .p_w, .insr, .tmp2x, .memi(.src0w, .tmp0), .ui(0), ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(2), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -92594,6 +91387,40 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .tmp0d, .si(2), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
+                }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .sse, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .word, .is = .word } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .f16, .kind = .{ .reg = .ax } },
+                        .{ .type = .f32, .kind = .mem },
+                        .{ .type = .f16, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extendhftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-2, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0x, .@"8", .tmp0), ._, ._ },
+                        .{ ._, ._, .movzx, .tmp2d, .memi(.src0w, .tmp0), ._, ._ },
+                        .{ ._, ._, .mov, .mem(.tmp3d), .tmp2d, ._, ._ },
+                        .{ ._, ._ss, .mov, .tmp4x, .mem(.tmp3d), ._, ._ },
+                        .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(2), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
                 }, .{
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .scalar_float = .{ .of = .dword, .is = .dword } }, .any, .any },
 @@ -92833,6 +91660,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .scalar_float = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -92859,6 +91687,35 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .sse, null, null, null },
+                    .src_constraints = .{ .{ .scalar_float = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .{ .to_param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } }, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extendsftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -92890,6 +91747,39 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .avx, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .f32, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extendsftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-4, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"4", .tmp0), ._, ._ },
+                        .{ ._, .v_ss, .mov, .tmp2x, .memi(.src0d, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(4), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -92921,6 +91811,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -92951,6 +91842,38 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .tmp0d, .si(4), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
+                }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .sse, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .f32, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extendsftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-4, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"4", .tmp0), ._, ._ },
+                        .{ ._, ._ss, .mov, .tmp2x, .memi(.src0d, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(4), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
                 }, .{
                     .required_features = .{ .x87, null, null, null },
                     .src_constraints = .{ .{ .scalar_float = .{ .of = .qword, .is = .qword } }, .any, .any },
 @@ -93006,6 +91929,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .scalar_float = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -93032,6 +91956,35 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .sse, null, null, null },
+                    .src_constraints = .{ .{ .scalar_float = .{ .of = .qword, .is = .qword } }, .any, .any },
+                    .dst_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .{ .to_param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } }, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extenddftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -93063,6 +92016,39 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .avx, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .qword, .is = .qword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .f64, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extenddftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-8, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"2", .tmp0), ._, ._ },
+                        .{ ._, .v_sd, .mov, .tmp2x, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(8), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -93094,6 +92080,39 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .sse2, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .qword, .is = .qword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .f64, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extenddftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-8, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"2", .tmp0), ._, ._ },
+                        .{ ._, ._sd, .mov, .tmp2x, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(8), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -93125,6 +92144,39 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .tmp0d, .si(8), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
+                }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .sse, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .qword, .is = .qword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .f64, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__extenddftf2" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-8, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"2", .tmp0), ._, ._ },
+                        .{ ._, ._ps, .xor, .tmp2x, .tmp2x, ._, ._ },
+                        .{ ._, ._ps, .movl, .tmp2x, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(8), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
                 }, .{
                     .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
 @@ -93214,7 +92266,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .tbyte } }, .any, .any },
                     .dst_constraints = .{ .{ .scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -93223,6 +92274,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__extendxftf2" } },
                         .unused,
                         .unused,
 @@ -93232,13 +92284,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -93273,70 +92325,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .tbyte } }, .any, .any },
-                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .none, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__extendxftf2" } },
-                        .{ .type = .f80, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .tbyte } }, .any, .any },
-                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .none, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__extendxftf2" } },
-                        .{ .type = .f80, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
                 }, .{
                     .required_cc_abi = .sysv64,
                     .required_features = .{ .sse2, null, null, null },
 @@ -93405,7 +92393,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .tbyte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -93415,8 +92402,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__extendxftf2" } },
-                        .{ .type = .f80, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -93429,9 +92416,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -96532,7 +95519,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_unaligned_size), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
                         .{ .@"0:", ._, .movsx, .tmp2q, .memia(.src0b, .tmp0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._sq, .sto, ._, ._, ._, ._ },
                         .{ ._, ._r, .sa, .tmp2q, .si(63), ._, ._ },
 @@ -96565,7 +95552,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_unaligned_size), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
                         .{ .@"0:", ._, .movsx, .tmp2q, .memia(.src0b, .tmp0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._sq, .sto, ._, ._, ._, ._ },
                         .{ ._, ._r, .sa, .tmp2q, .si(63), ._, ._ },
 @@ -96598,7 +95585,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_unaligned_size), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
                         .{ .@"0:", ._, .movzx, .tmp2d, .memia(.src0b, .tmp0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._sq, .sto, ._, ._, ._, ._ },
                         .{ ._, ._, .xor, .tmp2d, .tmp2d, ._, ._ },
 @@ -96631,7 +95618,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_unaligned_size), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
                         .{ .@"0:", ._, .movzx, .tmp2d, .memia(.src0b, .tmp0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._sq, .sto, ._, ._, ._, ._ },
                         .{ ._, ._, .xor, .tmp2d, .tmp2d, ._, ._ },
 @@ -97484,7 +96471,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_unaligned_size), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
                         .{ .@"0:", ._, .movsx, .tmp2q, .memia(.src0w, .tmp0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._sq, .sto, ._, ._, ._, ._ },
                         .{ ._, ._r, .sa, .tmp2q, .si(63), ._, ._ },
 @@ -97517,7 +96504,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_unaligned_size), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
                         .{ .@"0:", ._, .movzx, .tmp2d, .memia(.src0w, .tmp0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._sq, .sto, ._, ._, ._, ._ },
                         .{ ._, ._, .xor, .tmp2d, .tmp2d, ._, ._ },
 @@ -98011,7 +96998,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_unaligned_size), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
                         .{ .@"0:", ._d, .movsx, .tmp2q, .memia(.src0d, .tmp0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._sq, .sto, ._, ._, ._, ._ },
                         .{ ._, ._r, .sa, .tmp2q, .si(63), ._, ._ },
 @@ -98044,7 +97031,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0p, .sa(.src0, .sub_unaligned_size), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp2d, .memia(.src0d, .tmp0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._sq, .sto, ._, ._, ._, ._ },
                         .{ ._, ._, .xor, .tmp2d, .tmp2d, ._, ._ },
 @@ -108792,7 +107779,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .@"or", .memd(.tmp2b, 1), .ui(0b000_0_11_00), ._, ._ },
                         .{ ._, .f_cw, .ld, .tmp2w, ._, ._, ._ },
                         .{ ._, ._, .mov, .memd(.tmp2b, 1), .dst0b, ._, ._ },
-                        .{ ._, ._, .lea, .dst0q, .mem(.tmp3), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p, .mem(.tmp3), ._, ._ },
                         .{ ._, .fi_p, .st, .tmp4q, ._, ._, ._ },
                         .{ ._, .f_, .sub, .lea(.dst0d), ._, ._, ._ },
                         .{ ._, ._, .mov, .tmp5q, .tmp4q, ._, ._ },
 @@ -112008,7 +110995,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .@"or", .memd(.tmp2b, 1), .ui(0b000_0_11_00), ._, ._ },
                         .{ ._, .f_cw, .ld, .tmp2w, ._, ._, ._ },
                         .{ ._, ._, .mov, .memd(.tmp2b, 1), .dst0b, ._, ._ },
-                        .{ ._, ._, .lea, .dst0q, .mem(.tmp3), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p, .mem(.tmp3), ._, ._ },
                         .{ ._, .fi_p, .st, .tmp4q, ._, ._, ._ },
                         .{ ._, .f_, .sub, .lea(.dst0d), ._, ._, ._ },
                         .{ ._, ._, .mov, .tmp5q, .tmp4q, ._, ._ },
 @@ -112051,7 +111038,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .@"or", .memd(.tmp2b, 1), .ui(0b000_0_11_11), ._, ._ },
                         .{ ._, .f_cw, .ld, .tmp2w, ._, ._, ._ },
                         .{ ._, ._, .mov, .memd(.tmp2b, 1), .dst0b, ._, ._ },
-                        .{ ._, ._, .lea, .dst0q, .mem(.tmp3), ._, ._ },
+                        .{ ._, ._, .lea, .dst0p, .mem(.tmp3), ._, ._ },
                         .{ ._, .fi_p, .st, .tmp4q, ._, ._, ._ },
                         .{ ._, .f_, .sub, .lea(.dst0d), ._, ._, ._ },
                         .{ ._, ._, .mov, .tmp5q, .tmp4q, ._, ._ },
 @@ -125336,6 +124323,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .signed_int = .byte }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125364,6 +124352,36 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .signed_int = .byte }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .mem, .none, .none } },
+                        .{ .src = .{ .to_gpr, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .movsx, .tmp1d, .src0b, ._, ._ },
+                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .unsigned_int = .byte }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125392,6 +124410,36 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .unsigned_int = .byte }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .mem, .none, .none } },
+                        .{ .src = .{ .to_gpr, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatunsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .movzx, .tmp1d, .src0b, ._, ._ },
+                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .signed_int = .word }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125420,6 +124468,36 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .signed_int = .word }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .mem, .none, .none } },
+                        .{ .src = .{ .to_gpr, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .movsx, .tmp1d, .src0w, ._, ._ },
+                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .unsigned_int = .word }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125448,6 +124526,36 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .unsigned_int = .word }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .mem, .none, .none } },
+                        .{ .src = .{ .to_gpr, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatunsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .movzx, .tmp1d, .src0w, ._, ._ },
+                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .signed_int = .dword }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125474,6 +124582,34 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .signed_int = .dword }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .{ .to_param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } }, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .unsigned_int = .dword }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125500,6 +124636,34 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .unsigned_int = .dword }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .{ .to_param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } }, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatunsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .sse, null, null },
                     .src_constraints = .{ .{ .signed_int = .qword }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125526,6 +124690,35 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .@"64bit", null, null, null },
+                    .src_constraints = .{ .{ .signed_int = .qword }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .{ .to_param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } }, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatditf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .sse, null, null },
                     .src_constraints = .{ .{ .unsigned_int = .qword }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125551,6 +124744,34 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .each = .{ .once = &.{
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                     } },
+                }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .@"64bit", null, null, null },
+                    .src_constraints = .{ .{ .unsigned_int = .qword }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .{ .to_param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } }, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatunditf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                    } },
                 }, .{
                     .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
 @@ -125580,7 +124801,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .signed_int = .xword }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
                     .patterns = &.{
 @@ -125589,6 +124809,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floattitf" } },
                         .unused,
                         .unused,
 @@ -125598,15 +124819,16 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .call, .tmp1d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .unsigned_int = .xword }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125633,6 +124855,35 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp0d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .unsigned_int = .xword }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatuntitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .sse, null, null },
                     .src_constraints = .{ .{ .remainder_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125661,6 +124912,37 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .@"64bit", null, null, null },
+                    .src_constraints = .{ .{ .remainder_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floateitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .mov, .tmp2d, .sa(.src0, .add_bit_size), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .sse, null, null },
                     .src_constraints = .{ .{ .remainder_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .float = .xword }, .any },
 @@ -125689,6 +124971,37 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .@"64bit", null, null, null },
+                    .src_constraints = .{ .{ .remainder_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .float = .xword }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatuneitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .mov, .tmp2d, .sa(.src0, .add_bit_size), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, .slow_incdec, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -125722,6 +125035,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -125749,13 +125063,150 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
                         .{ .@"0:", ._, .movsx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                         .{ ._, .v_dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
+                        .{ ._, ._c, .de, .tmp0d, ._, ._, ._ },
+                        .{ ._, ._ns, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse2, .slow_incdec, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
+                        .{ .@"0:", ._, .movsx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(1), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse2, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
+                        .{ .@"0:", ._, .movsx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
+                        .{ ._, ._c, .de, .tmp0d, ._, ._, ._ },
+                        .{ ._, ._ns, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse, .slow_incdec, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
+                        .{ .@"0:", ._, .movsx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(1), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
+                        .{ .@"0:", ._, .movsx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp4x, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._c, .de, .tmp0d, ._, ._, ._ },
                         .{ ._, ._ns, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse2, .slow_incdec, null, null },
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .slow_incdec, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -125765,9 +125216,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -125780,15 +125231,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
-                        .{ .@"0:", ._, .movsx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp2p, .tmp1p, ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .movsx, .tmp3d, .memi(.src0b, .tmp0), ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(1), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse2, null, null, null },
+                    .required_cc_abi = .win64,
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -125798,9 +125249,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -125813,16 +125264,17 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
-                        .{ .@"0:", ._, .movsx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp2p, .tmp1p, ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .movsx, .tmp3d, .memi(.src0b, .tmp0), ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._c, .de, .tmp0d, ._, ._, ._ },
                         .{ ._, ._ns, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse, .slow_incdec, null, null },
+                    .required_cc_abi = .sysv64,
-                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
+                    .required_features = .{ .avx, .slow_incdec, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -125831,8 +125283,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatunsitf" } },
                         .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
 @@ -125846,16 +125298,17 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
-                        .{ .@"0:", ._, .movsx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .movzx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, .v_dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(1), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse, null, null, null },
+                    .required_cc_abi = .sysv64,
-                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .byte, .is = .byte } }, .any, .any },
+                    .required_features = .{ .avx, null, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -125864,8 +125317,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatunsitf" } },
                         .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
 @@ -125879,15 +125332,16 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
-                        .{ .@"0:", ._, .movsx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .movzx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, .v_dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._c, .de, .tmp0d, ._, ._, ._ },
                         .{ ._, ._ns, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .avx, .slow_incdec, null, null },
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse2, .slow_incdec, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -125914,13 +125368,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
                         .{ .@"0:", ._, .movzx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(1), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .avx, null, null, null },
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -125947,13 +125402,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
                         .{ .@"0:", ._, .movzx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._c, .de, .tmp0d, ._, ._, ._ },
                         .{ ._, ._ns, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse2, .slow_incdec, null, null },
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse, .slow_incdec, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -125980,13 +125436,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
                         .{ .@"0:", ._, .movzx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp4x, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(1), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse2, null, null, null },
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126013,13 +125470,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
                         .{ .@"0:", ._, .movzx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp4x, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._c, .de, .tmp0d, ._, ._, ._ },
                         .{ ._, ._ns, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse, .slow_incdec, null, null },
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .slow_incdec, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126029,9 +125487,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floatunsitf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -126044,15 +125502,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
-                        .{ .@"0:", ._, .movzx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp2p, .tmp1p, ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .movzx, .tmp3d, .memi(.src0b, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(1), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse, null, null, null },
+                    .required_cc_abi = .win64,
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .byte, .is = .byte } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126062,9 +125520,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floatunsitf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -126077,14 +125535,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-1, .src0, .add_unaligned_size), ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .memad(.dst0, .add_unaligned_size, -16), ._, ._ },
-                        .{ .@"0:", ._, .movzx, .tmp2d, .memi(.src0b, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp2p, .tmp1p, ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .movzx, .tmp3d, .memi(.src0b, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .lea(.tmp1x), .tmp4x, ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp1p, .lead(.tmp1, -16), ._, ._ },
                         .{ ._, ._c, .de, .tmp0d, ._, ._, ._ },
                         .{ ._, ._ns, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126116,6 +125575,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126147,6 +125607,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126178,6 +125639,38 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .word, .is = .word } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-2, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"8", .tmp0), ._, ._ },
+                        .{ ._, ._, .movsx, .tmp2d, .memi(.src0w, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(2), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126209,6 +125702,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126240,6 +125734,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .word, .is = .word } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126271,6 +125766,38 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .word, .is = .word } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatunsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-2, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"8", .tmp0), ._, ._ },
+                        .{ ._, ._, .movzx, .tmp2d, .memi(.src0w, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(2), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126302,6 +125829,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126333,6 +125861,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126364,6 +125893,38 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .i32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-4, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"4", .tmp0), ._, ._ },
+                        .{ ._, ._, .mov, .tmp2d, .memi(.src0d, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(4), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126395,6 +125956,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126426,6 +125988,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126457,6 +126020,38 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .win64,
+                    .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u32, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatunsitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-4, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"4", .tmp0), ._, ._ },
+                        .{ ._, ._, .mov, .tmp2d, .memi(.src0d, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(4), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .avx, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126483,12 +126078,45 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .mov, .tmp0d, .sia(-8, .src0, .add_unaligned_size), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp1q, .memi(.src0q, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                         .{ ._, .v_dqa, .mov, .memsi(.dst0x, .@"2", .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(8), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .@"64bit", .sse2, null, null },
+                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .qword, .is = .qword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .i64, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatditf" } },
+                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .mov, .tmp0d, .sia(-8, .src0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp1q, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._dqa, .mov, .memsi(.dst0x, .@"2", .tmp0), .tmp3x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(8), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .sse2, null, null },
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .@"64bit", .sse, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126514,12 +126142,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._, .mov, .tmp0d, .sia(-8, .src0, .add_unaligned_size), ._, ._ },
                         .{ .@"0:", ._, .mov, .tmp1q, .memi(.src0q, .tmp0), ._, ._ },
                         .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memsi(.dst0x, .@"2", .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, ._ps, .mova, .memsi(.dst0x, .@"2", .tmp0), .tmp3x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(8), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .sse, null, null },
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .@"64bit", null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126528,9 +126157,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .i64, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .i64, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floatditf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -126543,13 +126172,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-8, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .mov, .tmp1q, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"2", .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .mov, .tmp2q, .memi(.src0q, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memsi(.dst0x, .@"2", .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(8), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .avx, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126581,6 +126211,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .sse2, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126612,6 +126243,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .sse, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126643,9 +126275,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_cc_abi = .sysv64,
+                    .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
+                    .required_features = .{ .@"64bit", null, null, null },
-                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .xword, .is = .xword } }, .any, .any },
+                    .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .qword, .is = .qword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -126653,9 +126285,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .i128, .kind = .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__floattitf" } },
+                        .{ .type = .u64, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatunditf" } },
                         .unused,
                         .unused,
                         .unused,
 @@ -126667,16 +126299,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
+                        .{ ._, ._, .mov, .tmp0d, .sia(-8, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .mov, .tmp1q0, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memsi(.dst0, .@"2", .tmp0), ._, ._ },
-                        .{ ._, ._, .mov, .tmp1q1, .memid(.src0q, .tmp0, 8), ._, ._ },
+                        .{ ._, ._, .mov, .tmp2q, .memi(.src0q, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, ._, .sub, .tmp0d, .si(8), ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_cc_abi = .win64,
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .avx, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126686,7 +126317,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .i128, .kind = .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floattitf" } },
                         .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
 @@ -126701,7 +126332,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp1q0, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ ._, ._, .mov, .tmp1q1, .memid(.src0q, .tmp0, 8), ._, ._ },
                         .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                         .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
 @@ -126741,8 +126373,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_cc_abi = .win64,
+                    .required_cc_abi = .sysv64,
-                    .required_features = .{ .sse2, null, null, null },
+                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126751,7 +126383,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u128, .kind = .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floattitf" } },
                         .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
 @@ -126766,15 +126398,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp1q0, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ ._, ._, .mov, .tmp1q1, .memid(.src0q, .tmp0, 8), ._, ._ },
                         .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_cc_abi = .sysv64,
+                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126783,9 +126415,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .u128, .kind = .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floattitf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -126798,17 +126430,16 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .mov, .tmp1q0, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .mov, .tmp1q1, .memid(.src0q, .tmp0, 8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_cc_abi = .win64,
+                    .required_cc_abi = .sysv64,
-                    .required_features = .{ .sse, null, null, null },
+                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{ .{ .multiple_scalar_signed_int = .{ .of = .xword, .is = .xword } }, .any, .any },
+                    .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
                         .{ .src = .{ .to_mem, .none, .none } },
 @@ -126816,8 +126447,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .u128, .kind = .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__floattitf" } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatuntitf" } },
                         .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
 @@ -126831,14 +126462,16 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp1q0, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ ._, ._, .mov, .tmp1q1, .memid(.src0q, .tmp0, 8), ._, ._ },
                         .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .avx, null, null, null },
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse2, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126865,12 +126498,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"0:", ._, .mov, .tmp1q0, .memi(.src0q, .tmp0), ._, ._ },
                         .{ ._, ._, .mov, .tmp1q1, .memid(.src0q, .tmp0, 8), ._, ._ },
                         .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse2, null, null, null },
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126897,12 +126531,12 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"0:", ._, .mov, .tmp1q0, .memi(.src0q, .tmp0), ._, ._ },
                         .{ ._, ._, .mov, .tmp1q1, .memid(.src0q, .tmp0, 8), ._, ._ },
                         .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
+                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .sse, null, null, null },
+                    .required_cc_abi = .win64,
                     .src_constraints = .{ .{ .multiple_scalar_unsigned_int = .{ .of = .xword, .is = .xword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -126911,9 +126545,9 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .call_frame = .{ .alignment = .@"16" },
                     .extra_temps = .{
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .u128, .kind = .{ .param_gpr_pair = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floatuntitf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -126926,14 +126560,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .mov, .tmp1q0, .memi(.src0q, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .mov, .tmp1q1, .memid(.src0q, .tmp0, 8), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
+                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp3x, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .avx, null, null },
                     .src_constraints = .{ .{ .scalar_remainder_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -126968,6 +126602,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .sse2, null, null },
                     .src_constraints = .{ .{ .scalar_remainder_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
 @@ -127002,41 +126637,148 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .@"64bit", .sse, null, null },
+                    .src_constraints = .{ .{ .scalar_remainder_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floateitf" } },
+                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mema(.src0, .add_unaligned_size_sub_elem_size), ._, ._ },
+                        .{ ._, ._, .mov, .tmp1d, .sia(-16, .dst0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp2p, .tmp0p, ._, ._ },
+                        .{ ._, ._, .mov, .tmp3d, .sa(.src0, .add_bit_size), ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp1), .tmp5x, ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .leaa(.tmp0, .sub_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .sub, .tmp1d, .si(16), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .@"64bit", null, null, null },
+                    .src_constraints = .{ .{ .scalar_remainder_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floateitf" } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mema(.src0, .add_unaligned_size_sub_elem_size), ._, ._ },
+                        .{ ._, ._, .mov, .tmp1d, .sia(-16, .dst0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp2p, .memi(.dst0, .tmp1), ._, ._ },
+                        .{ ._, ._, .mov, .tmp3p, .tmp0p, ._, ._ },
+                        .{ ._, ._, .mov, .tmp4d, .sa(.src0, .add_bit_size), ._, ._ },
+                        .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .leaa(.tmp0, .sub_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .sub, .tmp1d, .si(16), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .@"64bit", .avx, null, null },
+                    .src_constraints = .{ .{ .scalar_remainder_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatuneitf" } },
+                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mema(.src0, .add_unaligned_size_sub_elem_size), ._, ._ },
+                        .{ ._, ._, .mov, .tmp1d, .sia(-16, .dst0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp2p, .tmp0p, ._, ._ },
+                        .{ ._, ._, .mov, .tmp3d, .sa(.src0, .add_bit_size), ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp1), .tmp5x, ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .leaa(.tmp0, .sub_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .sub, .tmp1d, .si(16), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
+                    .required_features = .{ .@"64bit", .sse2, null, null },
+                    .src_constraints = .{ .{ .scalar_remainder_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
+                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
+                    .patterns = &.{
+                        .{ .src = .{ .to_mem, .none, .none } },
+                    },
+                    .call_frame = .{ .alignment = .@"16" },
+                    .extra_temps = .{
+                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .extern_func = "__floatuneitf" } },
+                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                        .unused,
+                    },
+                    .dst_temps = .{ .mem, .unused },
+                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
+                    .each = .{ .once = &.{
+                        .{ ._, ._, .lea, .tmp0p, .mema(.src0, .add_unaligned_size_sub_elem_size), ._, ._ },
+                        .{ ._, ._, .mov, .tmp1d, .sia(-16, .dst0, .add_unaligned_size), ._, ._ },
+                        .{ .@"0:", ._, .mov, .tmp2p, .tmp0p, ._, ._ },
+                        .{ ._, ._, .mov, .tmp3d, .sa(.src0, .add_bit_size), ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp1), .tmp5x, ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .leaa(.tmp0, .sub_src0_elem_size), ._, ._ },
+                        .{ ._, ._, .sub, .tmp1d, .si(16), ._, ._ },
+                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
+                    } },
+                }, .{
+                    .required_cc_abi = .sysv64,
                     .required_features = .{ .@"64bit", .sse, null, null },
-                    .src_constraints = .{ .{ .scalar_remainder_signed_int = .{ .of = .dword, .is = .dword } }, .any, .any },
-                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .none, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__floateitf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mema(.src0, .add_unaligned_size_sub_elem_size), ._, ._ },
-                        .{ ._, ._, .mov, .tmp1d, .sia(-16, .dst0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .mov, .tmp2p, .tmp0p, ._, ._ },
-                        .{ ._, ._, .mov, .tmp3d, .sa(.src0, .add_bit_size), ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp1), .tmp5x, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .leaa(.tmp0, .sub_src0_elem_size), ._, ._ },
-                        .{ ._, ._, .sub, .tmp1d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_features = .{ .@"64bit", .avx, null, null },
                     .src_constraints = .{ .{ .scalar_remainder_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -127064,47 +126806,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .@"0:", ._, .mov, .tmp2p, .tmp0p, ._, ._ },
                         .{ ._, ._, .mov, .tmp3d, .sa(.src0, .add_bit_size), ._, ._ },
                         .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp1), .tmp5x, ._, ._ },
+                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp1), .tmp5x, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0p, .leaa(.tmp0, .sub_src0_elem_size), ._, ._ },
-                        .{ ._, ._, .sub, .tmp1d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_features = .{ .@"64bit", .sse2, null, null },
-                    .src_constraints = .{ .{ .scalar_remainder_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
-                    .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .none, .none } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .usize, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "__floatuneitf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mema(.src0, .add_unaligned_size_sub_elem_size), ._, ._ },
-                        .{ ._, ._, .mov, .tmp1d, .sia(-16, .dst0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .mov, .tmp2p, .tmp0p, ._, ._ },
-                        .{ ._, ._, .mov, .tmp3d, .sa(.src0, .add_bit_size), ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp1), .tmp5x, ._, ._ },
                         .{ ._, ._, .lea, .tmp0p, .leaa(.tmp0, .sub_src0_elem_size), ._, ._ },
                         .{ ._, ._, .sub, .tmp1d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
                 }, .{
-                    .required_features = .{ .@"64bit", .sse, null, null },
+                    .required_cc_abi = .win64,
+                    .required_features = .{ .@"64bit", null, null, null },
                     .src_constraints = .{ .{ .scalar_remainder_unsigned_int = .{ .of = .dword, .is = .dword } }, .any, .any },
                     .dst_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any },
                     .patterns = &.{
 @@ -127116,8 +126825,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "__floatuneitf" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -127129,10 +126838,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .each = .{ .once = &.{
                         .{ ._, ._, .lea, .tmp0p, .mema(.src0, .add_unaligned_size_sub_elem_size), ._, ._ },
                         .{ ._, ._, .mov, .tmp1d, .sia(-16, .dst0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .mov, .tmp2p, .tmp0p, ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp2p, .memi(.dst0, .tmp1), ._, ._ },
-                        .{ ._, ._, .mov, .tmp3d, .sa(.src0, .add_bit_size), ._, ._ },
+                        .{ ._, ._, .mov, .tmp3p, .tmp0p, ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                        .{ ._, ._, .mov, .tmp4d, .sa(.src0, .add_bit_size), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp1), .tmp5x, ._, ._ },
+                        .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
                         .{ ._, ._, .lea, .tmp0p, .leaa(.tmp0, .sub_src0_elem_size), ._, ._ },
                         .{ ._, ._, .sub, .tmp1d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
 @@ -132481,7 +132190,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                                 .{ ._, ._, .mov, .tmp3d, .sa(.dst0, .add_size_div_8), ._, ._ },
                                 .{ ._, .@"rep _sq", .mov, ._, ._, ._, ._ },
                                 .{ .@"0:", ._, .mov, .tmp1d, .sia(-8, .dst0, .add_size), ._, ._ },
-                                .{ ._, ._, .lea, .tmp2q, .memi(.src0, .tmp0), ._, ._ },
+                                .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
                                 .{ .@"1:", ._, .mov, .tmp3q, .leai(.tmp2q, .tmp1), ._, ._ },
                                 .{ ._, ._, mir_tag, .memi(.dst0q, .tmp1), .tmp3q, ._, ._ },
                                 .{ ._, ._, .sub, .tmp1d, .si(8), ._, ._ },
 @@ -142586,75 +142295,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -142665,8 +142305,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
-                            .{ .type = .f128, .kind = .mem },
                             .unused,
                             .unused,
                             .unused,
 @@ -142674,15 +142314,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp1x), .dst0x, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.dst0), ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -152819,75 +152459,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -152898,8 +152469,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                            .{ .type = .f128, .kind = .mem },
                             .unused,
                             .unused,
                             .unused,
 @@ -152907,15 +152478,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp1x), .dst0x, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.dst0), ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -156644,7 +156215,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .{ ._, ._, .mov, .tmp3d, .sa(.dst0, .add_size_div_8), ._, ._ },
                             .{ ._, .@"rep _sq", .mov, ._, ._, ._, ._ },
                             .{ .@"0:", ._, .mov, .tmp1p, .sa(.dst0, .sub_size_div_8), ._, ._ },
-                            .{ ._, ._, .lea, .tmp2q, .memi(.src0, .tmp0), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
                             .{ ._, ._c, .cl, ._, ._, ._, ._ },
                             .{ .@"1:", ._, .mov, .tmp3q, .leasia(.tmp2q, .@"8", .tmp1, .add_src0_elem_size), ._, ._ },
                             .{ ._, ._, .adc, .memsia(.dst0q, .@"8", .tmp1, .add_size), .tmp3q, ._, ._ },
 @@ -157503,47 +157074,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0p, .sia(16, .src0, .sub_unaligned_size), ._, ._ },
                             .{ ._, ._dqa, .mov, .dst0x, .mem(.src0x), ._, ._ },
                             .{ .@"0:", ._dqa, .mov, .tmp1x, .memia(.src0x, .tmp0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, ._, .add, .tmp0p, .si(16), ._, ._ },
-                            .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .sse, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .isize, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0p, .sia(16, .src0, .sub_unaligned_size), ._, ._ },
-                            .{ ._, ._ps, .mova, .dst0x, .mem(.src0x), ._, ._ },
-                            .{ .@"0:", ._ps, .mova, .tmp1x, .memia(.src0x, .tmp0, .add_unaligned_size), ._, ._ },
                             .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                             .{ ._, ._, .add, .tmp0p, .si(16), ._, ._ },
                             .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                         } },
                     }, .{
-                        .required_cc_abi = .win64,
+                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .avx, null, null, null },
+                        .required_features = .{ .sse, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -157552,47 +157091,13 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .call_frame = .{ .alignment = .@"16" },
                         .extra_temps = .{
                             .{ .type = .isize, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
                             .unused,
                             .unused,
                             .unused,
                             .unused,
                             .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0p, .sia(16, .src0, .sub_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memia(.src0, .tmp0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .add, .tmp0p, .si(16), ._, ._ },
-                            .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .isize, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
                             .unused,
                             .unused,
                             .unused,
 @@ -157601,17 +157106,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0p, .sia(16, .src0, .sub_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                            .{ ._, ._ps, .mova, .dst0x, .mem(.src0x), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memia(.src0, .tmp0, .add_unaligned_size), ._, ._ },
+                            .{ .@"0:", ._ps, .mova, .tmp1x, .memia(.src0x, .tmp0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
                             .{ ._, ._, .add, .tmp0p, .si(16), ._, ._ },
                             .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .sse, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -157622,8 +157124,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .{ .type = .isize, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                            .{ .type = .f128, .kind = .mem },
                             .unused,
                             .unused,
                             .unused,
 @@ -157631,15 +157133,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0p, .sia(16, .src0, .sub_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.src0), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memia(.src0, .tmp0, .add_unaligned_size), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .memia(.src0, .tmp0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp1x), .dst0x, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.dst0), ._, ._ },
                             .{ ._, ._, .add, .tmp0p, .si(16), ._, ._ },
                             .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -161226,75 +160728,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .isize, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0p, .sia(16, .src0, .sub_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memia(.src0, .tmp0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .add, .tmp0p, .si(16), ._, ._ },
-                            .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .isize, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0p, .sia(16, .src0, .sub_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memia(.src0, .tmp0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .add, .tmp0p, .si(16), ._, ._ },
-                            .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -161305,8 +160738,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .{ .type = .isize, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
-                            .{ .type = .f128, .kind = .mem },
                             .unused,
                             .unused,
                             .unused,
 @@ -161314,15 +160747,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0p, .sia(16, .src0, .sub_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.src0), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memia(.src0, .tmp0, .add_unaligned_size), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .memia(.src0, .tmp0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp1x), .dst0x, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.dst0), ._, ._ },
                             .{ ._, ._, .add, .tmp0p, .si(16), ._, ._ },
                             .{ ._, ._nc, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -163053,75 +162486,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -163132,8 +162496,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "fminf128" } },
-                            .{ .type = .f128, .kind = .mem },
                             .unused,
                             .unused,
                             .unused,
 @@ -163141,15 +162505,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp1x), .dst0x, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.dst0), ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -164778,79 +164142,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
                             .{ ._, .v_dqa, .mov, .dst0x, .memad(.src0x, .add_unaligned_size, -16), ._, ._ },
                             .{ .@"0:", .v_dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._dqa, .mov, .dst0x, .memad(.src0x, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .sse, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._ps, .mova, .dst0x, .memad(.src0x, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._ps, .mova, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
                             .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
                         } },
                     }, .{
-                        .required_cc_abi = .win64,
+                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .avx, null, null, null },
+                        .required_features = .{ .sse2, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -164859,10 +164159,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .call_frame = .{ .alignment = .@"16" },
                         .extra_temps = .{
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                            .{ .type = .f128, .kind = .mem },
+                            .unused,
+                            .unused,
                             .unused,
                             .unused,
                             .unused,
 @@ -164874,17 +164174,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
+                            .{ ._, ._dqa, .mov, .dst0x, .memad(.src0x, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._dqa, .mov, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
                         } },
                     }, .{
-                        .required_cc_abi = .win64,
+                        .required_cc_abi = .sysv64,
-                        .required_features = .{ .sse2, null, null, null },
+                        .required_features = .{ .sse, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -164893,10 +164191,10 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .call_frame = .{ .alignment = .@"16" },
                         .extra_temps = .{
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
+                            .{ .type = .f128, .kind = .{ .param_sse = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                            .{ .type = .f128, .kind = .mem },
+                            .unused,
+                            .unused,
                             .unused,
                             .unused,
                             .unused,
 @@ -164908,17 +164206,14 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
+                            .{ ._, ._ps, .mova, .dst0x, .memad(.src0x, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._ps, .mova, .tmp1x, .memi(.src0x, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .call, .tmp2d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -164929,8 +164224,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "fmaxf128" } },
-                            .{ .type = .f128, .kind = .mem },
                             .unused,
                             .unused,
                             .unused,
 @@ -164938,15 +164233,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp1x), .dst0x, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.dst0), ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -167253,75 +166548,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -167332,8 +166558,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "__addtf3" } },
-                            .{ .type = .f128, .kind = .mem },
                             .unused,
                             .unused,
                             .unused,
 @@ -167341,15 +166567,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp1x), .dst0x, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.dst0), ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -168940,75 +168166,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         } },
                     }, .{
                         .required_cc_abi = .win64,
-                        .required_features = .{ .avx, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, .v_dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse2, null, null, null },
-                        .dst_constraints = .{ .{ .float = .xword }, .any },
-                        .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
-                        .patterns = &.{
-                            .{ .src = .{ .to_mem, .none, .none } },
-                        },
-                        .call_frame = .{ .alignment = .@"16" },
-                        .extra_temps = .{
-                            .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                            .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
-                            .{ .type = .f128, .kind = .mem },
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                            .unused,
-                        },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
-                        .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                        .each = .{ .once = &.{
-                            .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
-                            .{ ._, ._dqa, .mov, .lea(.tmp1x), .dst0x, ._, ._ },
-                            .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                            .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
-                        } },
-                    }, .{
-                        .required_cc_abi = .win64,
-                        .required_features = .{ .sse, null, null, null },
                         .dst_constraints = .{ .{ .float = .xword }, .any },
                         .src_constraints = .{ .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } }, .any, .any },
                         .patterns = &.{
 @@ -169019,8 +168176,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                             .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
+                            .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
                             .{ .type = .usize, .kind = .{ .extern_func = "__multf3" } },
-                            .{ .type = .f128, .kind = .mem },
                             .unused,
                             .unused,
                             .unused,
 @@ -169028,15 +168185,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                             .unused,
                             .unused,
                         },
-                        .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                        .dst_temps = .{ .mem, .unused },
                         .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                         .each = .{ .once = &.{
                             .{ ._, ._, .mov, .tmp0d, .sia(-32, .src0, .add_unaligned_size), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .memad(.src0, .add_unaligned_size, -16), ._, ._ },
-                            .{ .@"0:", ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
+                            .{ .@"0:", ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                            .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                            .{ ._, ._, .lea, .tmp3p, .memi(.src0, .tmp0), ._, ._ },
-                            .{ ._, ._, .lea, .tmp1p, .mem(.tmp4), ._, ._ },
+                            .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                            .{ ._, ._ps, .mova, .lea(.tmp1x), .dst0x, ._, ._ },
+                            .{ ._, ._, .lea, .tmp2p, .mem(.dst0), ._, ._ },
                             .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                             .{ ._, ._nb, .j, .@"0b", ._, ._, ._ },
                         } },
 @@ -169093,7 +168250,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .each = .{ .once = &.{
                         .{ ._, ._, .bt, .src0d, .si(0), ._, ._ },
                         .{ ._, ._, .sbb, .tmp1b, .tmp1b, ._, ._ },
-                        .{ ._, ._, .lea, .tmp0q, .dst0b, ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
                         .{ ._, ._, .mov, .tmp2d, .sia(1, .dst0, .add_bit_size_sub_1_div_8_down_1), ._, ._ },
                         .{ ._, .@"rep _sb", .sto, ._, ._, ._, ._ },
                         .{ ._, ._, .@"and", .memad(.dst0b, .add_bit_size_sub_1_div_8_down_1, 0), .ua(.dst0, .bit_size_last_byte_mask), ._, ._ },
 @@ -170845,8 +170002,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .mem, .unused },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sa(.dst0, .add_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp2q, .mem(.src0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp2p, .mem(.src0), ._, ._ },
                         .{ ._, ._, .mov, .tmp3d, .sa(.src0, .add_size_div_8), ._, ._ },
                         .{ ._, .@"rep _sq", .mov, ._, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(1), ._, ._ },
 @@ -170875,8 +170032,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .dst_temps = .{ .mem, .unused },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sa(.dst0, .add_len), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1q, .mem(.dst0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.dst0), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp2q, .mem(.src0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp2p, .mem(.src0), ._, ._ },
                         .{ ._, ._, .mov, .tmp3d, .sa(.src0, .add_size_div_8), ._, ._ },
                         .{ ._, .@"rep _sq", .mov, ._, ._, ._, ._ },
                         .{ ._, ._c, .de, .tmp0d, ._, ._, ._ },
 @@ -172770,7 +171927,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -172784,6 +171940,7 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 3, .at = 3 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fmaf128" } },
                         .unused,
                         .unused,
 @@ -172791,15 +171948,15 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .unused,
                         .unused,
                         .unused,
-                        .unused,
                     },
-                    .dst_temps = .{ .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } }, .unused },
+                    .dst_temps = .{ .mem, .unused },
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
-                        .{ ._, ._, .lea, .tmp0p, .mem(.src0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp0p, .mem(.dst0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp1p, .mem(.src1), ._, ._ },
+                        .{ ._, ._, .lea, .tmp1p, .mem(.src0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .mem(.src2), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .mem(.src1), ._, ._ },
-                        .{ ._, ._, .call, .tmp3d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .mem(.src2), ._, ._ },
+                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
                     } },
                 }, .{
                     .required_cc_abi = .sysv64,
 @@ -172914,81 +172071,6 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     } },
                 }, .{
                     .required_cc_abi = .win64,
-                    .required_features = .{ .avx, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .to_mem } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fmaf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp3p, .memi(.src2, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                        .{ ._, .v_dqa, .mov, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse2, null, null, null },
-                    .src_constraints = .{
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                        .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
-                    },
-                    .patterns = &.{
-                        .{ .src = .{ .to_mem, .to_mem, .to_mem } },
-                    },
-                    .call_frame = .{ .alignment = .@"16" },
-                    .extra_temps = .{
-                        .{ .type = .u32, .kind = .{ .rc = .general_purpose } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
-                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
-                        .{ .type = .usize, .kind = .{ .extern_func = "fmaf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                        .unused,
-                    },
-                    .dst_temps = .{ .mem, .unused },
-                    .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
-                    .each = .{ .once = &.{
-                        .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp3p, .memi(.src2, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
-                        .{ ._, ._dqa, .mov, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
-                        .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
-                        .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
-                    } },
-                }, .{
-                    .required_cc_abi = .win64,
-                    .required_features = .{ .sse, null, null, null },
                     .src_constraints = .{
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
                         .{ .multiple_scalar_float = .{ .of = .xword, .is = .xword } },
 @@ -173003,8 +172085,8 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 1, .at = 1 } } },
                         .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 2, .at = 2 } } },
+                        .{ .type = .usize, .kind = .{ .param_gpr = .{ .cc = .ccc, .after = 3, .at = 3 } } },
                         .{ .type = .usize, .kind = .{ .extern_func = "fmaf128" } },
-                        .{ .type = .f128, .kind = .{ .ret_sse = .{ .cc = .ccc, .after = 0, .at = 0 } } },
                         .unused,
                         .unused,
                         .unused,
 @@ -173015,11 +172097,11 @@ fn genBody(cg: *CodeGen, body: []const Air.Inst.Index) InnerError!void {
                     .clobbers = .{ .eflags = true, .caller_preserved = .ccc },
                     .each = .{ .once = &.{
                         .{ ._, ._, .mov, .tmp0d, .sia(-16, .src0, .add_unaligned_size), ._, ._ },
-                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.src0, .tmp0), ._, ._ },
+                        .{ .@"0:", ._, .lea, .tmp1p, .memi(.dst0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp2p, .memi(.src1, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp2p, .memi(.src0, .tmp0), ._, ._ },
-                        .{ ._, ._, .lea, .tmp3p, .memi(.src2, .tmp0), ._, ._ },
+                        .{ ._, ._, .lea, .tmp3p, .memi(.src1, .tmp0), ._, ._ },
-                        .{ ._, ._, .call, .tmp4d, ._, ._, ._ },
+                        .{ ._, ._, .lea, .tmp4p, .memi(.src2, .tmp0), ._, ._ },
-                        .{ ._, ._ps, .mova, .memi(.dst0x, .tmp0), .tmp5x, ._, ._ },
+                        .{ ._, ._, .call, .tmp5d, ._, ._, ._ },
                         .{ ._, ._, .sub, .tmp0d, .si(16), ._, ._ },
                         .{ ._, ._ae, .j, .@"0b", ._, ._, ._ },
                     } },
 @@ -182472,12 +181554,13 @@ fn hasFeature(cg: *CodeGen, feature: std.Target.x86.Feature) bool {
             .x86_64 => true,
         },
         .false_deps_getmant,
-        .false_deps_lzcnt_tzcnt,
+        .false_deps_lzcnt,
         .false_deps_mulc,
         .false_deps_mullq,
         .false_deps_perm,
         .false_deps_popcnt,
         .false_deps_range,
+        .false_deps_tzcnt,
         .slow_3ops_lea,
         .slow_incdec,
         .slow_lea,
 @@ -192323,10 +191406,7 @@ const Select = struct {
                         const RefImm = switch (size) {
                             else => comptime unreachable,
                             .none => Imm,
-                            .byte, .word, .dword, .qword => @Int(
+                            .byte, .word, .dword, .qword => @Int(@typeInfo(Imm).int.signedness, size.bitSize(undefined)),
-                                @typeInfo(Imm).int.signedness,
-                                size.bitSize(undefined),
-                            ),
                         };
                         break :lhs @bitCast(@as(Imm, @intCast(@as(RefImm, switch (adjust) {
                             else => comptime unreachable,

src/codegen/x86_64/abi.zig+1-2

...	@@ -131,8 +131,7 @@ pub fn classifyWindows(init_ty: Type, zcu: Zcu, target: const std.Target, ctx:	...	@@ -131,8 +131,7 @@ pub fn classifyWindows(init_ty: Type, zcu: Zcu, target: const std.Target, ctx:
131	.float => switch (ty.floatBits(target)) {	131	.float => switch (ty.floatBits(target)) {
132	else => unreachable,	132	else => unreachable,
133	16, 32, 64 => if (target.cpu.has(.x86, .soft_float)) .integer else .sse,	133	16, 32, 64 => if (target.cpu.has(.x86, .soft_float)) .integer else .sse,
134	80 => .memory,	134	80, 128 => .memory,
135	128 => if (target.cpu.has(.x86, .soft_float)) .memory else .win_i128,
136	},	135	},
137	.vector => {	136	.vector => {
138	const len = ty.vectorLen(zcu);	137	const len = ty.vectorLen(zcu);

src/libs/libcxx.zig+3-2

src/libs/libtsan.zig+1

...	@@ -350,6 +350,7 @@ fn addCcArgs(target: const std.Target, args: std.array_list.Managed([]const u8	...	@@ -350,6 +350,7 @@ fn addCcArgs(target: const std.Target, args: std.array_list.Managed([]const u8
350	}	350	}
351		351
352	const tsan_sources = [_][]const u8{	352	const tsan_sources = [_][]const u8{
		353	"tsan_adaptive_delay.cpp",
353	"tsan_debugging.cpp",	354	"tsan_debugging.cpp",
354	"tsan_external.cpp",	355	"tsan_external.cpp",
355	"tsan_fd.cpp",	356	"tsan_fd.cpp",

src/libs/libunwind.zig+3

 @@ -124,6 +124,9 @@ pub fn buildStaticLib(comp: *Compilation, prog_node: std.Progress.Node) BuildErr
         if (!comp.config.any_non_single_threaded) {
             try cflags.append("-D_LIBUNWIND_HAS_NO_THREADS");
         }
+        if (target.os.tag == .haiku) {
+            try cflags.append("-D_LIBUNWIND_USE_HAIKU_BSD_LIB");
+        }
         if (target.cpu.arch.isArm() and target.abi.float() == .hard) {
             try cflags.append("-DCOMPILER_RT_ARMHF_TARGET");
         }

src/link/Dwarf.zig+3

...	@@ -4189,6 +4189,9 @@ fn updateConstInner(dwarf: *Dwarf, pt: Zcu.PerThread, debug_const_index: link.Co	...	@@ -4189,6 +4189,9 @@ fn updateConstInner(dwarf: *Dwarf, pt: Zcu.PerThread, debug_const_index: link.Co
4189	.riscv32_ilp32_v,	4189	.riscv32_ilp32_v,
4190	=> .LLVM_RISCVVectorCall,	4190	=> .LLVM_RISCVVectorCall,
4191		4191
		4192	.loongarch32_preserve_none => .LLVM_PreserveNone,
		4193	.loongarch64_preserve_none => .LLVM_PreserveNone,
		4194
4192	.m68k_rtd => .LLVM_M68kRTD,	4195	.m68k_rtd => .LLVM_M68kRTD,
4193		4196
4194	.sh_renesas => .GNU_renesas_sh,	4197	.sh_renesas => .GNU_renesas_sh,

src/link/Wasm.zig+3

...	@@ -3238,6 +3238,7 @@ pub const Feature = packed struct(u8) {	...	@@ -3238,6 +3238,7 @@ pub const Feature = packed struct(u8) {
3238	@"tail-call",	3238	@"tail-call",
3239	@"shared-mem",	3239	@"shared-mem",
3240	@"wide-arithmetic",	3240	@"wide-arithmetic",
		3241	@"relaxed-atomics",
3241		3242
3242	pub fn fromCpuFeature(feature: std.Target.wasm.Feature) Tag {	3243	pub fn fromCpuFeature(feature: std.Target.wasm.Feature) Tag {
3243	return switch (feature) {	3244	return switch (feature) {
...	@@ -3255,6 +3256,7 @@ pub const Feature = packed struct(u8) {	...	@@ -3255,6 +3256,7 @@ pub const Feature = packed struct(u8) {
3255	.nontrapping_bulk_memory_len0 => .@"nontrapping-bulk-memory-len0", // Zig extension.	3256	.nontrapping_bulk_memory_len0 => .@"nontrapping-bulk-memory-len0", // Zig extension.
3256	.nontrapping_fptoint => .@"nontrapping-fptoint",	3257	.nontrapping_fptoint => .@"nontrapping-fptoint",
3257	.reference_types => .@"reference-types",	3258	.reference_types => .@"reference-types",
		3259	.relaxed_atomics => .@"relaxed-atomics",
3258	.relaxed_simd => .@"relaxed-simd",	3260	.relaxed_simd => .@"relaxed-simd",
3259	.sign_ext => .@"sign-ext",	3261	.sign_ext => .@"sign-ext",
3260	.simd128 => .simd128,	3262	.simd128 => .simd128,
...	@@ -3280,6 +3282,7 @@ pub const Feature = packed struct(u8) {	...	@@ -3280,6 +3282,7 @@ pub const Feature = packed struct(u8) {
3280	.@"nontrapping-bulk-memory-len0" => .nontrapping_bulk_memory_len0, // Zig extension.	3282	.@"nontrapping-bulk-memory-len0" => .nontrapping_bulk_memory_len0, // Zig extension.
3281	.@"nontrapping-fptoint" => .nontrapping_fptoint,	3283	.@"nontrapping-fptoint" => .nontrapping_fptoint,
3282	.@"reference-types" => .reference_types,	3284	.@"reference-types" => .reference_types,
		3285	.@"relaxed-atomics" => .relaxed_atomics,
3283	.@"relaxed-simd" => .relaxed_simd,	3286	.@"relaxed-simd" => .relaxed_simd,
3284	.@"sign-ext" => .sign_ext,	3287	.@"sign-ext" => .sign_ext,
3285	.simd128 => .simd128,	3288	.simd128 => .simd128,

src/target.zig+3

 @@ -423,6 +423,9 @@ pub fn hasDebugInfo(target: *const std.Target) bool {
                 .ptx87,
                 .ptx88,
                 .ptx90,
+                .ptx91,
+                .ptx92,
+                .ptx93,
             }),
             .bpfel, .bpfeb => false,
             else => true,

src/zig_clang_cc1_main.cpp+14-21

 @@ -144,13 +144,13 @@ static int PrintSupportedExtensions(std::string TargetStr) {
   std::unique_ptr<llvm::TargetMachine> TheTargetMachine(
       TheTarget->createTargetMachine(Triple, "", "", Options, std::nullopt));
   const llvm::Triple &MachineTriple = TheTargetMachine->getTargetTriple();
-  const llvm::MCSubtargetInfo *MCInfo = TheTargetMachine->getMCSubtargetInfo();
+  const llvm::MCSubtargetInfo &MCInfo = TheTargetMachine->getMCSubtargetInfo();
   const llvm::ArrayRef<llvm::SubtargetFeatureKV> Features =
-    MCInfo->getAllProcessorFeatures();
+      MCInfo.getAllProcessorFeatures();
   llvm::StringMap<llvm::StringRef> DescMap;
   for (const llvm::SubtargetFeatureKV &feature : Features)
-    DescMap.insert({feature.Key, feature.Desc});
+    DescMap.insert({feature.key(), feature.desc()});
   if (MachineTriple.isRISCV())
     llvm::RISCVISAInfo::printSupportedExtensions(DescMap);
 @@ -187,23 +187,23 @@ static int PrintEnabledExtensions(const TargetOptions& TargetOpts) {
       TheTarget->createTargetMachine(Triple, TargetOpts.CPU, FeaturesStr,
                                      BackendOptions, std::nullopt));
   const llvm::Triple &MachineTriple = TheTargetMachine->getTargetTriple();
-  const llvm::MCSubtargetInfo *MCInfo = TheTargetMachine->getMCSubtargetInfo();
+  const llvm::MCSubtargetInfo &MCInfo = TheTargetMachine->getMCSubtargetInfo();
   // Extract the feature names that are enabled for the given target.
   // We do that by capturing the key from the set of SubtargetFeatureKV entries
   // provided by MCSubtargetInfo, which match the '-target-feature' values.
-  const std::vector<llvm::SubtargetFeatureKV> Features =
+  const std::vector<const llvm::SubtargetFeatureKV *> Features =
-    MCInfo->getEnabledProcessorFeatures();
+      MCInfo.getEnabledProcessorFeatures();
   std::set<llvm::StringRef> EnabledFeatureNames;
-  for (const llvm::SubtargetFeatureKV &feature : Features)
+  for (const llvm::SubtargetFeatureKV *feature : Features)
-    EnabledFeatureNames.insert(feature.Key);
+    EnabledFeatureNames.insert(feature->key());
   if (MachineTriple.isAArch64())
     llvm::AArch64::printEnabledExtensions(EnabledFeatureNames);
   else if (MachineTriple.isRISCV()) {
     llvm::StringMap<llvm::StringRef> DescMap;
-    for (const llvm::SubtargetFeatureKV &feature : Features)
+    for (const llvm::SubtargetFeatureKV *feature : Features)
-      DescMap.insert({feature.Key, feature.Desc});
+      DescMap.insert({feature->key(), feature->desc()});
     llvm::RISCVISAInfo::printEnabledExtensions(MachineTriple.isArch64Bit(),
                                                EnabledFeatureNames, DescMap);
   } else {
 @@ -289,20 +289,11 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
                                   static_cast<void*>(&Clang->getDiagnostics()));
   DiagsBuffer->FlushDiagnostics(Clang->getDiagnostics());
-  if (!Success) {
+  if (!Success)
-    Clang->getDiagnosticClient().finish();
     return 1;
-  }
   // Execute the frontend actions.
-  {
+  Success = ExecuteCompilerInvocation(Clang.get());
-    llvm::TimeTraceScope TimeScope("ExecuteCompiler");
-    bool TimePasses = Clang->getCodeGenOpts().TimePasses;
-    if (TimePasses)
-      Clang->createFrontendTimer();
-    llvm::TimeRegion Timer(TimePasses ? &Clang->getFrontendTimer() : nullptr);
-    Success = ExecuteCompilerInvocation(Clang.get());
-  }
   // If any timers were active but haven't been destroyed yet, print their
   // results now.  This happens in -disable-free mode.
 @@ -339,6 +330,8 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) {
   // When running with -disable-free, don't do any destruction or shutdown.
   if (Clang->getFrontendOpts().DisableFree) {
+    // DiagnosticConsumer must be always destroyed.
+    Clang->getDiagnosticClient().~DiagnosticConsumer();
     llvm::BuryPointer(std::move(Clang));
     return !Success;
   }

src/zig_clang_cc1as_main.cpp+12-4

src/zig_clang_driver.cpp+37-8

 @@ -55,6 +55,10 @@
 #include <optional>
 #include <set>
 #include <system_error>
+// zig patch: don't rely on LLVM_ON_UNIX that comes from the build system
+#if !defined(_WIN32)
+#include <signal.h>
+#endif
 using namespace clang;
 using namespace clang::driver;
 @@ -223,6 +227,7 @@ static int ExecuteCC1Tool(SmallVectorImpl<const char *> &ArgV,
     return cc1_main(ArrayRef(ArgV).slice(1), ArgV[0], GetExecutablePathVP);
   if (Tool == "-cc1as")
     return cc1as_main(ArrayRef(ArgV).slice(2), ArgV[0], GetExecutablePathVP);
+  // zig patch: no -cc1gen-reproducer
   // Reject unknown tools.
   llvm::errs()
       << "error: unknown integrated tool '" << Tool << "'. "
 @@ -230,11 +235,13 @@ static int ExecuteCC1Tool(SmallVectorImpl<const char *> &ArgV,
   return 1;
 }
+// zig patch: use custom entry point
 static int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContext) {
   noteBottomOfStack();
   llvm::setBugReportMsg("PLEASE submit a bug report to " BUG_REPORT_URL
-                        " and include the crash backtrace, preprocessed "
+                        " and include the crash backtrace and"
-                        "source, and associated run script.\n");
+                        " dumped files.\n");
+  // zig patch: fix argv offset
   size_t argv_offset = (strcmp(Argv[1], "-cc1") == 0 || strcmp(Argv[1], "-cc1as") == 0) ? 0 : 1;
   SmallVector<const char *, 256> Args(Argv + argv_offset, Argv + Argc);
 @@ -373,7 +380,8 @@ static int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContex
   if (!UseNewCC1Process) {
     TheDriver.CC1Main = ExecuteCC1WithContext;
     // Ensure the CC1Command actually catches cc1 crashes
-    llvm::CrashRecoveryContext::Enable();
+    llvm::CrashRecoveryContext::Enable(
+        /*NeedsPOSIXUtilitySignalHandling=*/true);
   }
   std::unique_ptr<Compilation> C(TheDriver.BuildCompilation(Args));
 @@ -402,6 +410,7 @@ static int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContex
   Driver::CommandStatus CommandStatus = Driver::CommandStatus::Ok;
   // Pretend the first command failed if ReproStatus is Always.
   const Command *FailingCommand = nullptr;
+  int CommandRes = 0;
   if (!C->getJobs().empty())
     FailingCommand = &*C->getJobs().begin();
   if (C && !C->containsError()) {
 @@ -409,7 +418,7 @@ static int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContex
     Res = TheDriver.ExecuteCompilation(*C, FailingCommands);
     for (const auto &P : FailingCommands) {
-      int CommandRes = P.first;
+      CommandRes = P.first;
       FailingCommand = P.second;
       if (!Res)
         Res = CommandRes;
 @@ -421,8 +430,8 @@ static int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContex
       IsCrash = CommandRes < 0 || CommandRes == 70;
 #ifdef _WIN32
       IsCrash |= CommandRes == 3;
-#endif
+// zig patch: don't rely on LLVM_ON_UNIX that comes from the build system
-#if LLVM_ON_UNIX
+#else
       // When running in integrated-cc1 mode, the CrashRecoveryContext returns
       // the same codes as if the program crashed. See section "Exit Status for
       // Commands":
 @@ -445,8 +454,6 @@ static int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContex
                                                   *C, *FailingCommand))
     Res = 1;
-  Diags.getClient()->finish();
   if (!UseNewCC1Process && IsCrash) {
     // When crashing in -fintegrated-cc1 mode, bury the timer pointers, because
     // the internal linked list might point to already released stack frames.
 @@ -464,6 +471,28 @@ static int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContex
   // propagated.
   if (Res < 0)
     Res = 1;
+// zig patch: don't rely on LLVM_ON_UNIX that comes from the build system
+#else
+  // On Unix, signals are represented by return codes of 128 plus the signal
+  // number. If the return code indicates it was from a signal handler, raise
+  // the signal so that the exit code includes the signal number, as required
+  // by POSIX. Return code 255 is excluded because some tools, such as
+  // llvm-ifs, exit with code 255 (-1) on failure.
+  if (CommandRes > 128 && CommandRes != 255) {
+    llvm::sys::unregisterHandlers();
+    // DiagnosticConsumer must be always destroyed.
+    Diags.getClient()->~DiagnosticConsumer();
+    raise(CommandRes - 128);
+  }
+  // When cc1 runs out-of-process (CLANG_SPAWN_CC1), ExecuteAndWait returns -2
+  // if the child was killed by a signal. The signal number is not preserved,
+  // so resignal with SIGABRT to ensure the driver exits via signal.
+  if (CommandRes == -2) {
+    llvm::sys::unregisterHandlers();
+    // DiagnosticConsumer must be always destroyed.
+    Diags.getClient()->~DiagnosticConsumer();
+    raise(SIGABRT);
+  }
 #endif
   // If we have multiple failing commands, we return the result of the first

src/zig_llvm-ar.cpp+33-8

 @@ -83,6 +83,7 @@ static void printArHelp(StringRef ToolName) {
     =darwin             -   darwin
     =bsd                -   bsd
     =bigarchive         -   big archive (AIX OS)
+    =zos                -   zos archive (z/OS OS)
     =coff               -   coff
   --plugin=<string>     - ignored for compatibility
   -h --help             - display this help and exit
 @@ -195,7 +196,16 @@ static SmallVector<const char *, 256> PositionalArgs;
 static bool MRI;
 namespace {
-enum Format { Default, GNU, COFF, BSD, DARWIN, BIGARCHIVE, Unknown };
+enum Format {
+  Default,
+  GNU,
+  COFF,
+  BSD,
+  DARWIN,
+  BIGARCHIVE,
+  ZOSARCHIVE,
+  Unknown
+};
 }
 static Format FormatType = Default;
 @@ -713,8 +723,11 @@ static void performReadOperation(ArchiveOperation Operation,
         });
         if (I == Members.end())
           continue;
-        if (CountParam && ++MemberCount[Name] != CountParam)
+        if (CountParam) {
-          continue;
+          std::string CountKey = normalizePath(*I);
+          if (++MemberCount[CountKey] != CountParam)
+            continue;
+        }
         Members.erase(I);
       }
 @@ -854,14 +867,19 @@ static InsertAction computeInsertAction(ArchiveOperation Operation,
   if (Operation == QuickAppend || Members.empty())
     return IA_AddOldMember;
-  auto MI = find_if(Members, [Name](StringRef Path) {
+  std::string CountKey;
+  auto MI = find_if(Members, [Name, &CountKey](StringRef Path) {
+    SmallString<128> MatchPath(Path);
     if (Thin && !sys::path::is_absolute(Path)) {
       Expected<std::string> PathOrErr =
           computeArchiveRelativePath(ArchiveName, Path);
-      return comparePaths(Name, PathOrErr ? *PathOrErr : Path);
+      if (PathOrErr)
-    } else {
+        MatchPath = *PathOrErr;
-      return comparePaths(Name, Path);
     }
+    if (!comparePaths(Name, MatchPath))
+      return false;
+    CountKey = normalizePath(MatchPath);
+    return true;
   });
   if (MI == Members.end())
 @@ -870,7 +888,7 @@ static InsertAction computeInsertAction(ArchiveOperation Operation,
   Pos = MI;
   if (Operation == Delete) {
-    if (CountParam && ++MemberCount[Name] != CountParam)
+    if (CountParam && ++MemberCount[CountKey] != CountParam)
       return IA_AddOldMember;
     return IA_Delete;
   }
 @@ -1071,6 +1089,11 @@ static void performWriteOperation(ArchiveOperation Operation,
       fail("only the gnu format has a thin mode");
     Kind = object::Archive::K_AIXBIG;
     break;
+  case ZOSARCHIVE:
+    if (Thin)
+      fail("only the gnu format has a thin mode");
+    Kind = object::Archive::K_ZOS;
+    break;
   case Unknown:
     llvm_unreachable("");
   }
 @@ -1389,6 +1412,7 @@ static int ar_main(int argc, char **argv) {
                        .Case("bsd", BSD)
                        .Case("bigarchive", BIGARCHIVE)
                        .Case("coff", COFF)
+                       .Case("zos", ZOSARCHIVE)
                        .Default(Unknown);
       if (FormatType == Unknown)
         fail(std::string("Invalid format ") + Match);
 @@ -1509,6 +1533,7 @@ static int ranlib_main(int argc, char **argv) {
   return 0;
 }
+// zig patch: use custom entry point
 static int llvm_ar_main(int argc, char **argv, const llvm::ToolContext &) {
   ToolName = argv[0];

src/zig_llvm.cpp+2-2

...	@@ -285,7 +285,7 @@ ZIG_EXTERN_C bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machi	...	@@ -285,7 +285,7 @@ ZIG_EXTERN_C bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machi
285	PipelineTuningOptions pipeline_opts;	285	PipelineTuningOptions pipeline_opts;
286	pipeline_opts.LoopUnrolling = !options->is_debug;	286	pipeline_opts.LoopUnrolling = !options->is_debug;
287	pipeline_opts.SLPVectorization = !options->is_debug;	287	pipeline_opts.SLPVectorization = !options->is_debug;
288	pipeline_opts.LoopVectorization = false; // https://github.com/llvm/llvm-project/issues/186922	288	pipeline_opts.LoopVectorization = !options->is_debug;
289	pipeline_opts.LoopInterleaving = !options->is_debug;	289	pipeline_opts.LoopInterleaving = !options->is_debug;
290	pipeline_opts.MergeFunctions = !options->is_debug;	290	pipeline_opts.MergeFunctions = !options->is_debug;
291		291
...	@@ -373,7 +373,7 @@ ZIG_EXTERN_C bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machi	...	@@ -373,7 +373,7 @@ ZIG_EXTERN_C bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machi
373	if (options->is_debug)	373	if (options->is_debug)
374	opt_level = OptimizationLevel::O0;	374	opt_level = OptimizationLevel::O0;
375	else if (options->is_small)	375	else if (options->is_small)
376	opt_level = OptimizationLevel::Oz;	376	opt_level = OptimizationLevel::O2;
377	else	377	else
378	opt_level = OptimizationLevel::O3;	378	opt_level = OptimizationLevel::O3;
379		379

stage1/zig.h-25

...	@@ -5874,27 +5874,12 @@ typedef __float128 zig_f128;	...	@@ -5874,27 +5874,12 @@ typedef __float128 zig_f128;
5874	#define zig_make_special_f128(sign, name, arg, repr) sign __builtin_##name##f128(arg)	5874	#define zig_make_special_f128(sign, name, arg, repr) sign __builtin_##name##f128(arg)
5875	#else	5875	#else
5876	#undef zig_has_f128	5876	#undef zig_has_f128
5877	#if defined(zig_x86_64) && defined(ZIG_TARGET_ABI_MSVC)
5878	#if defined(zig_msvc) && !defined(__clang__)
5879	#include <emmintrin.h>
5880	typedef __m128i zig_f128;
5881	#define zig_init_repr_f128(hi, lo) { .m128i_u64 = { lo, hi } }
5882	#define zig_lo_repr_f128(arg) (arg).m128i_u64[0]
5883	#define zig_hi_repr_f128(arg) (arg).m128i_u64[1]
5884	#else
5885	typedef __attribute__((__vector_size__(2 * sizeof(uint64_t)))) uint64_t zig_f128;
5886	#define zig_init_repr_f128(hi, lo) { lo, hi }
5887	#define zig_lo_repr_f128(arg) (arg)[0]
5888	#define zig_hi_repr_f128(arg) (arg)[1]
5889	#endif
5890	#else
5891	typedef zig_u128 zig_f128;	5877	typedef zig_u128 zig_f128;
5892	#define zig_init_repr_f128(hi, lo) zig_init_u128(hi, lo)	5878	#define zig_init_repr_f128(hi, lo) zig_init_u128(hi, lo)
5893	#define zig_make_repr_f128(hi, lo) zig_make_u128(hi, lo)	5879	#define zig_make_repr_f128(hi, lo) zig_make_u128(hi, lo)
5894	#define zig_lo_repr_f128(arg) zig_lo_u128(arg)	5880	#define zig_lo_repr_f128(arg) zig_lo_u128(arg)
5895	#define zig_hi_repr_f128(arg) zig_hi_u128(arg)	5881	#define zig_hi_repr_f128(arg) zig_hi_u128(arg)
5896	#endif	5882	#endif
5897	#endif
5898	#ifndef zig_has_f128	5883	#ifndef zig_has_f128
5899	#define zig_has_f128 0	5884	#define zig_has_f128 0
5900	#define zig_make_f128(fp, repr) repr	5885	#define zig_make_f128(fp, repr) repr
...	@@ -6182,16 +6167,6 @@ static inline zig_f128 zig_floatuntitf(zig_u128 arg) {	...	@@ -6182,16 +6167,6 @@ static inline zig_f128 zig_floatuntitf(zig_u128 arg) {
6182	extern zig_f128 __floatuntitf(zig_f128 arg);	6167	extern zig_f128 __floatuntitf(zig_f128 arg);
6183	return __floatuntitf(zig_f128_bitCast_u128(arg));	6168	return __floatuntitf(zig_f128_bitCast_u128(arg));
6184	}	6169	}
6185	#elif defined(zig_x86_64) && defined(zig_windows)
6186	zig_common_float_builtins(128)
6187	static inline zig_f128 zig_floattitf(zig_i128 arg) {
6188	extern zig_f128 __floattitf(zig_i128 arg);
6189	return __floattitf(arg);
6190	}
6191	static inline zig_f128 zig_floatuntitf(zig_u128 arg) {
6192	extern zig_f128 __floatuntitf(uint64_t arg_lo, uint64_t arg_hi);
6193	return __floatuntitf(zig_lo_u128(arg), zig_hi_u128(arg));
6194	}
6195	#else	6170	#else
6196	zig_float_builtins(128)	6171	zig_float_builtins(128)
6197	#endif	6172	#endif

test/behavior/floatop.zig-3

test/c_abi/cfuncs.c+1-1

...	@@ -16624,7 +16624,7 @@ struct ByRef __attribute__((sysv_abi)) c_explict_sys_v(struct ByRef in) {	...	@@ -16624,7 +16624,7 @@ struct ByRef __attribute__((sysv_abi)) c_explict_sys_v(struct ByRef in) {
16624	}	16624	}
16625	#endif	16625	#endif
16626		16626
16627	#if defined __x86_64__ \|\| defined __aarch64__	16627	#if defined __x86_64__ \|\| defined __aarch64__ \|\| defined __loongarch__
16628	int __attribute__((preserve_none)) c_preserve_none(int x) {	16628	int __attribute__((preserve_none)) c_preserve_none(int x) {
16629	return x + 1;	16629	return x + 1;
16630	}	16630	}

test/c_abi/main.zig+3

 @@ -18045,6 +18045,9 @@ const preserve_none_cc: ?std.lang.CallingConvention = if (builtin.zig_backend !=
 else switch (builtin.cpu.arch) {
     .x86_64 => .{ .x86_64_preserve_none = .{} },
     .aarch64, .aarch64_be => .{ .aarch64_preserve_none = .{} },
+    // Supported in LLVM but not yet wired up in Clang.
+    // .loongarch32 => .{ .loongarch32_preserve_none = .{} },
+    // .loongarch64 => .{ .loongarch64_preserve_none = .{} },
     else => null,
 };

test/libc.zig+4-4

test/llvm_targets.zig+1

...	@@ -231,6 +231,7 @@ const targets = [_]std.Target.Query{	...	@@ -231,6 +231,7 @@ const targets = [_]std.Target.Query{
231	.{ .cpu_arch = .riscv64, .os_tag = .fuchsia, .abi = .none },	231	.{ .cpu_arch = .riscv64, .os_tag = .fuchsia, .abi = .none },
232	.{ .cpu_arch = .riscv64, .os_tag = .haiku, .abi = .none },	232	.{ .cpu_arch = .riscv64, .os_tag = .haiku, .abi = .none },
233	.{ .cpu_arch = .riscv64, .os_tag = .hermit, .abi = .none },	233	.{ .cpu_arch = .riscv64, .os_tag = .hermit, .abi = .none },
		234	.{ .cpu_arch = .riscv64, .os_tag = .hurd, .abi = .gnu },
234	.{ .cpu_arch = .riscv64, .os_tag = .linux, .abi = .android },	235	.{ .cpu_arch = .riscv64, .os_tag = .linux, .abi = .android },
235	.{ .cpu_arch = .riscv64, .os_tag = .linux, .abi = .gnu },	236	.{ .cpu_arch = .riscv64, .os_tag = .linux, .abi = .gnu },
236	.{ .cpu_arch = .riscv64, .os_tag = .linux, .abi = .musl },	237	.{ .cpu_arch = .riscv64, .os_tag = .linux, .abi = .musl },

test/src/Libc.zig+3-2

test/tests.zig+12-9

 @@ -2377,13 +2377,17 @@ pub fn isNative(actual_target: *const std.Build.ResolvedTarget, host: *const std
             .@"16bit_mode",
             .@"32bit_mode",
             .@"64bit",
+            .false_deps_bls,
+            .false_deps_compress,
+            .false_deps_expand,
             .false_deps_getmant,
-            .false_deps_lzcnt_tzcnt,
+            .false_deps_lzcnt,
             .false_deps_mulc,
             .false_deps_mullq,
             .false_deps_perm,
             .false_deps_popcnt,
             .false_deps_range,
+            .false_deps_tzcnt,
             .fast_11bytenop,
             .fast_15bytenop,
             .fast_7bytenop,
 @@ -2411,10 +2415,12 @@ pub fn isNative(actual_target: *const std.Build.ResolvedTarget, host: *const std
             .prefer_legacy_setcc,
             .prefer_mask_registers,
             .prefer_movmsk_over_vtest,
+            .prefer_ndd_mem,
             .prefer_no_gather,
             .prefer_no_scatter,
             .slow_3ops_lea,
             .slow_incdec,
+            .slow_indirect_call,
             .slow_lea,
             .slow_pmaddwd,
             .slow_pmulld,
 @@ -2426,10 +2432,13 @@ pub fn isNative(actual_target: *const std.Build.ResolvedTarget, host: *const std
         }),
         .aarch64, .aarch64_be => std.Target.aarch64.featureSet(&.{
             .addr_lsl_slow_14,
+            .align_cmp_csel_pairs,
             .alu_lsl_fast,
             .avoid_ldapur,
             .disable_fast_inc_vl,
             .exynos_cheap_as_move,
+            .fast_ld1_single,
+            .fixed_load_latency_4,
             .fuse_address,
             .fuse_addsub_2reg_const1,
             .fuse_adrp_add,
 @@ -2438,7 +2447,9 @@ pub fn isNative(actual_target: *const std.Build.ResolvedTarget, host: *const std
             .fuse_crypto_eor,
             .fuse_csel,
             .fuse_cset,
+            .fuse_fcsel,
             .fuse_literals,
+            .has_limited_64bit_vector_mul_bandwidth,
             .predictable_select_expensive,
             .slow_misaligned_128store,
             .slow_paired_128,
 @@ -2908,14 +2919,6 @@ fn addOneModuleTest(
     });
     these_tests.linkage = test_target.linkage;
     these_tests.use_new_linker = test_target.new_linker;
-    // https://codeberg.org/ziglang/zig/issues/31701
-    if (!(mem.eql(u8, options.name, "compiler-rt") or mem.eql(u8, options.name, "libc"))) {
-        if (options.no_builtin) these_tests.root_module.no_builtin = true;
-    }
-    // https://codeberg.org/ziglang/zig/issues/31702
-    if (mem.eql(u8, options.name, "compiler-rt") or mem.eql(u8, options.name, "libc")) {
-        these_tests.root_module.stack_protector = false;
-    }
     // https://github.com/llvm/llvm-project/issues/195561
     if (target.cpu.arch.isPowerPC()) {
         these_tests.root_module.stack_protector = false;

tools/macos-headers.c+1

...	@@ -190,6 +190,7 @@	...	@@ -190,6 +190,7 @@
190	#include <libkern/OSTypes.h>	190	#include <libkern/OSTypes.h>
191	#include <MacTypes.h>	191	#include <MacTypes.h>
192	#include <os/lock.h>	192	#include <os/lock.h>
		193	#include <os/os_sync_wait_on_address.h>
193	#include <simd/simd.h>	194	#include <simd/simd.h>
194	#include <xpc/xpc.h>	195	#include <xpc/xpc.h>
195	#include <CommonCrypto/CommonCrypto.h>	196	#include <CommonCrypto/CommonCrypto.h>

tools/update_clang_options.zig+1-1

...	@@ -681,7 +681,7 @@ pub fn main(init: std.process.Init) !void {	...	@@ -681,7 +681,7 @@ pub fn main(init: std.process.Init) !void {
681	"--dump-json",	681	"--dump-json",
682	try std.fmt.allocPrint(arena, "{s}/clang/include/clang/Options/Options.td", .{llvm_src_root}),	682	try std.fmt.allocPrint(arena, "{s}/clang/include/clang/Options/Options.td", .{llvm_src_root}),
683	try std.fmt.allocPrint(arena, "-I={s}/llvm/include", .{llvm_src_root}),	683	try std.fmt.allocPrint(arena, "-I={s}/llvm/include", .{llvm_src_root}),
684	try std.fmt.allocPrint(arena, "-I={s}/clang/include/clang/Driver", .{llvm_src_root}),	684	try std.fmt.allocPrint(arena, "-I={s}/clang/include/clang/Options", .{llvm_src_root}),
685	};	685	};
686		686
687	const child_result = try std.process.run(arena, io, .{	687	const child_result = try std.process.run(arena, io, .{

tools/update_cpu_features.zig+46-99

...	@@ -131,6 +131,14 @@ const targets = [_]ArchTarget{	...	@@ -131,6 +131,14 @@ const targets = [_]ArchTarget{
131	.zig_name = "contextidr_el2",	131	.zig_name = "contextidr_el2",
132	.desc = "Enable RW operand Context ID Register (EL2)",	132	.desc = "Enable RW operand Context ID Register (EL2)",
133	},	133	},
		134	.{
		135	.llvm_name = "hip12",
		136	.flatten = true,
		137	},
		138	.{
		139	.llvm_name = "mca-streaming-sched",
		140	.omit = true,
		141	},
134	.{	142	.{
135	.llvm_name = "neoversee1",	143	.llvm_name = "neoversee1",
136	.flatten = true,	144	.flatten = true,
...	@@ -1481,6 +1489,42 @@ const targets = [_]ArchTarget{	...	@@ -1481,6 +1489,42 @@ const targets = [_]ArchTarget{
1481	.omit = true,	1489	.omit = true,
1482	},	1490	},
1483	},	1491	},
		1492	.extra_cpus = &.{
		1493	.{
		1494	.llvm_name = null,
		1495	.zig_name = "cell",
		1496	.features = &.{
		1497	"64bit_support",
		1498	"altivec",
		1499	"fres",
		1500	"frsqrte",
		1501	"fsqrt",
		1502	"mfocrf",
		1503	"stfiwx",
		1504	},
		1505	},
		1506	.{
		1507	.llvm_name = null,
		1508	.zig_name = "e500v2",
		1509	.features = &.{
		1510	"efpu2",
		1511	"isel",
		1512	"msync",
		1513	},
		1514	},
		1515	.{
		1516	.llvm_name = null,
		1517	.zig_name = "e6500",
		1518	.features = &.{
		1519	"64bit_support",
		1520	"altivec",
		1521	"booke",
		1522	"isel",
		1523	"mfocrf",
		1524	"stfiwx",
		1525	},
		1526	},
		1527	},
1484	.omit_cpus = &.{	1528	.omit_cpus = &.{
1485	"ppc32",	1529	"ppc32",
1486	},	1530	},
...	@@ -1553,103 +1597,6 @@ const targets = [_]ArchTarget{	...	@@ -1553,103 +1597,6 @@ const targets = [_]ArchTarget{
1553	.zig_name = "baseline_rv64",	1597	.zig_name = "baseline_rv64",
1554	.features = &.{ "64bit", "a", "c", "d", "f", "i", "m" },	1598	.features = &.{ "64bit", "a", "c", "d", "f", "i", "m" },
1555	},	1599	},
1556	.{
1557	.llvm_name = null,
1558	.zig_name = "spacemit_a100",
1559	.features = &.{
1560	"64bit",
1561	"a",
1562	"b",
1563	"c",
1564	"dlen_factor_2",
1565	"i",
1566	"m",
1567	"optimized_nf2_segment_load_store",
1568	"optimized_nf3_segment_load_store",
1569	"optimized_nf4_segment_load_store",
1570	"smepmp",
1571	"smnpm",
1572	"smstateen",
1573	"ssccptr",
1574	"sscofpmf",
1575	"sscounterenw",
1576	"ssnpm",
1577	"sspm",
1578	"sstc",
1579	"sstvala",
1580	"sstvecd",
1581	"ssu64xl",
1582	"supm",
1583	"svade",
1584	"svbare",
1585	"svinval",
1586	"svnapot",
1587	"svpbmt",
1588	"unaligned_scalar_mem",
1589	"v",
1590	"vxrm_pipeline_flush",
1591	"za64rs",
1592	"zawrs",
1593	"zbc",
1594	"zbkc",
1595	"zcb",
1596	"zcmop",
1597	"zfa",
1598	"zfh",
1599	"zic64b",
1600	"zicbom",
1601	"zicbop",
1602	"zicboz",
1603	"ziccamoa",
1604	"ziccif",
1605	"zicclsm",
1606	"ziccrse",
1607	"zicntr",
1608	"zicond",
1609	"zifencei",
1610	"zihintntl",
1611	"zihintpause",
1612	"zihpm",
1613	"zimop",
1614	"zkt",
1615	"zvbb",
1616	"zvfbfwma",
1617	"zvfh",
1618	"zvkng",
1619	"zvknha",
1620	"zvksc",
1621	"zvksg",
1622	"zvl1024b",
1623	},
1624	},
1625	.{
1626	.llvm_name = null,
1627	.zig_name = "spacemit_x100",
1628	.features = &.{
1629	"dlen_factor_2",
1630	"optimized_nf2_segment_load_store",
1631	"optimized_nf3_segment_load_store",
1632	"optimized_nf4_segment_load_store",
1633	"rva23s64",
1634	"smepmp",
1635	"smnpm",
1636	"smstateen",
1637	"sspm",
1638	"unaligned_scalar_mem",
1639	"vxrm_pipeline_flush",
1640	"xsmtvdot",
1641	"zbc",
1642	"zbkc",
1643	"zfh",
1644	"zvfbfwma",
1645	"zvfh",
1646	"zvkng",
1647	"zvknha",
1648	"zvksc",
1649	"zvksg",
1650	"zvl256b",
1651	},
1652	},
1653	},	1600	},
1654	},	1601	},
1655	.{	1602	.{
...	@@ -2450,7 +2397,7 @@ fn processOneTargetInner(io: Io, job: Job) !void {	...	@@ -2450,7 +2397,7 @@ fn processOneTargetInner(io: Io, job: Job) !void {
2450	for (all_features.items) \|feature\| {	2397	for (all_features.items) \|feature\| {
2451	if (feature.llvm_name) \|llvm_name\| {	2398	if (feature.llvm_name) \|llvm_name\| {
2452	try w.print(	2399	try w.print(
2453	\\ result[@intFromEnum(Feature.{f})] = .{{	2400	\\ result[@backingInt(Feature.{f})] = .{{
2454	\\ .llvm_name = "{f}",	2401	\\ .llvm_name = "{f}",
2455	\\ .description = "{f}",	2402	\\ .description = "{f}",
2456	\\ .dependencies = featureSet(&[_]Feature{{	2403	\\ .dependencies = featureSet(&[_]Feature{{
...	@@ -2463,7 +2410,7 @@ fn processOneTargetInner(io: Io, job: Job) !void {	...	@@ -2463,7 +2410,7 @@ fn processOneTargetInner(io: Io, job: Job) !void {
2463	);	2410	);
2464	} else {	2411	} else {
2465	try w.print(	2412	try w.print(
2466	\\ result[@intFromEnum(Feature.{f})] = .{{	2413	\\ result[@backingInt(Feature.{f})] = .{{
2467	\\ .llvm_name = null,	2414	\\ .llvm_name = null,
2468	\\ .description = "{f}",	2415	\\ .description = "{f}",
2469	\\ .dependencies = featureSet(&[_]Feature{{	2416	\\ .dependencies = featureSet(&[_]Feature{{

author	Alex Rønne Petersen <alex@alexrp.com> 2026-10-07 06:48:29+02:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2026-10-07 06:48:29+02:00
log	9fe22a29b34e274af4f1d67a08c7757d2d0bc1fa
tree	f07150b07bce601b2378cb6f1de41233f00b3eac
parent	6c78e9250de36f2e21e710940e6f8d0e8516556f
parent	0375ec45ab2036b4a971f09d9710c577c11da492
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

...	@@ -1810,10 +1810,9 @@ _mm256_or_si256(__m256i __a, __m256i __b)	...	@@ -1810,10 +1810,9 @@ _mm256_or_si256(__m256i __a, __m256i __b)
1810	/// \param __b	1810	/// \param __b
1811	/// A 256-bit integer vector.	1811	/// A 256-bit integer vector.
1812	/// \returns A 256-bit integer vector containing the result.	1812	/// \returns A 256-bit integer vector containing the result.
1813	static __inline__ __m256i __DEFAULT_FN_ATTRS256	1813	static __inline__ __m256i __DEFAULT_FN_ATTRS256_CONSTEXPR
1814	_mm256_sad_epu8(__m256i __a, __m256i __b)	1814	_mm256_sad_epu8(__m256i __a, __m256i __b) {
1815	{	1815	return __builtin_ia32_psadbw256((__v32qu)__a, (__v32qu)__b);
1816	return __builtin_ia32_psadbw256((__v32qi)__a, (__v32qi)__b);
1817	}	1816	}
1818		1817
1819	/// Shuffles 8-bit integers in the 256-bit integer vector \a __a according	1818	/// Shuffles 8-bit integers in the 256-bit integer vector \a __a according
...	@@ -3058,7 +3057,7 @@ _mm256_broadcastsi128_si256(__m128i __X) {	...	@@ -3058,7 +3057,7 @@ _mm256_broadcastsi128_si256(__m128i __X) {
3058	/// An immediate 8-bit integer operand, with bits [7:0] specifying the	3057	/// An immediate 8-bit integer operand, with bits [7:0] specifying the
3059	/// source for each element of the result. The position of the mask bit	3058	/// source for each element of the result. The position of the mask bit
3060	/// corresponds to the index of a copied value. When a mask bit is 0, the	3059	/// corresponds to the index of a copied value. When a mask bit is 0, the
3061	/// element is copied from \a V1; otherwise, it is is copied from \a V2.	3060	/// element is copied from \a V1; otherwise, it is copied from \a V2.
3062	/// \returns A 256-bit vector of [8 x i32] containing the result.	3061	/// \returns A 256-bit vector of [8 x i32] containing the result.
3063	#define _mm256_blend_epi32(V1, V2, M) \	3062	#define _mm256_blend_epi32(V1, V2, M) \
3064	((__m256i)__builtin_ia32_pblendd256((__v8si)(__m256i)(V1), \	3063	((__m256i)__builtin_ia32_pblendd256((__v8si)(__m256i)(V1), \

...	@@ -279,8 +279,8 @@ static __inline__ __m128d __DEFAULT_FN_ATTRS _mm_sqrt_pd(__m128d __a) {	...	@@ -279,8 +279,8 @@ static __inline__ __m128d __DEFAULT_FN_ATTRS _mm_sqrt_pd(__m128d __a) {
279	/// \returns A 128-bit vector of [2 x double] whose lower 64 bits contain the	279	/// \returns A 128-bit vector of [2 x double] whose lower 64 bits contain the
280	/// minimum value between both operands. The upper 64 bits are copied from	280	/// minimum value between both operands. The upper 64 bits are copied from
281	/// the upper 64 bits of the first source operand.	281	/// the upper 64 bits of the first source operand.
282	static __inline__ __m128d __DEFAULT_FN_ATTRS _mm_min_sd(__m128d __a,	282	static __inline__ __m128d __DEFAULT_FN_ATTRS_CONSTEXPR _mm_min_sd(__m128d __a,
283	__m128d __b) {	283	__m128d __b) {
284	return __builtin_ia32_minsd((__v2df)__a, (__v2df)__b);	284	return __builtin_ia32_minsd((__v2df)__a, (__v2df)__b);
285	}	285	}
286		286
...	@@ -325,8 +325,8 @@ static __inline__ __m128d __DEFAULT_FN_ATTRS_CONSTEXPR _mm_min_pd(__m128d __a,	...	@@ -325,8 +325,8 @@ static __inline__ __m128d __DEFAULT_FN_ATTRS_CONSTEXPR _mm_min_pd(__m128d __a,
325	/// \returns A 128-bit vector of [2 x double] whose lower 64 bits contain the	325	/// \returns A 128-bit vector of [2 x double] whose lower 64 bits contain the
326	/// maximum value between both operands. The upper 64 bits are copied from	326	/// maximum value between both operands. The upper 64 bits are copied from
327	/// the upper 64 bits of the first source operand.	327	/// the upper 64 bits of the first source operand.
328	static __inline__ __m128d __DEFAULT_FN_ATTRS _mm_max_sd(__m128d __a,	328	static __inline__ __m128d __DEFAULT_FN_ATTRS_CONSTEXPR _mm_max_sd(__m128d __a,
329	__m128d __b) {	329	__m128d __b) {
330	return __builtin_ia32_maxsd((__v2df)__a, (__v2df)__b);	330	return __builtin_ia32_maxsd((__v2df)__a, (__v2df)__b);
331	}	331	}
332		332
...	@@ -1343,7 +1343,7 @@ _mm_cvtepi32_pd(__m128i __a) {	...	@@ -1343,7 +1343,7 @@ _mm_cvtepi32_pd(__m128i __a) {
1343	/// \returns A 128-bit vector of [4 x i32] whose lower 64 bits contain the	1343	/// \returns A 128-bit vector of [4 x i32] whose lower 64 bits contain the
1344	/// converted values. The upper 64 bits are set to zero.	1344	/// converted values. The upper 64 bits are set to zero.
1345	static __inline__ __m128i __DEFAULT_FN_ATTRS _mm_cvtpd_epi32(__m128d __a) {	1345	static __inline__ __m128i __DEFAULT_FN_ATTRS _mm_cvtpd_epi32(__m128d __a) {
1346	return __builtin_ia32_cvtpd2dq((__v2df)__a);	1346	return (__m128i)__builtin_ia32_cvtpd2dq((__v2df)__a);
1347	}	1347	}
1348		1348
1349	/// Converts the low-order element of a 128-bit vector of [2 x double]	1349	/// Converts the low-order element of a 128-bit vector of [2 x double]
...	@@ -2481,9 +2481,9 @@ _mm_mul_epu32(__m128i __a, __m128i __b) {	...	@@ -2481,9 +2481,9 @@ _mm_mul_epu32(__m128i __a, __m128i __b) {
2481	/// A 128-bit integer vector containing one of the source operands.	2481	/// A 128-bit integer vector containing one of the source operands.
2482	/// \returns A [2 x i64] vector containing the sums of the sets of absolute	2482	/// \returns A [2 x i64] vector containing the sums of the sets of absolute
2483	/// differences between both operands.	2483	/// differences between both operands.
2484	static __inline__ __m128i __DEFAULT_FN_ATTRS _mm_sad_epu8(__m128i __a,	2484	static __inline__ __m128i __DEFAULT_FN_ATTRS_CONSTEXPR
2485	__m128i __b) {	2485	_mm_sad_epu8(__m128i __a, __m128i __b) {
2486	return __builtin_ia32_psadbw128((__v16qi)__a, (__v16qi)__b);	2486	return __builtin_ia32_psadbw128((__v16qu)__a, (__v16qu)__b);
2487	}	2487	}
2488		2488
2489	/// Subtracts the corresponding 8-bit integer values in the operands.	2489	/// Subtracts the corresponding 8-bit integer values in the operands.

...	@@ -10,10 +10,9 @@	...	@@ -10,10 +10,9 @@
10	#define _LIBCPP___ALGORITHM_RANGES_REMOVE_IF_H	10	#define _LIBCPP___ALGORITHM_RANGES_REMOVE_IF_H
11	#include <__config>	11	#include <__config>
12		12
13	#include <__algorithm/ranges_find_if.h>	13	#include <__algorithm/find_if.h>
14	#include <__functional/identity.h>	14	#include <__functional/identity.h>
15	#include <__functional/invoke.h>	15	#include <__functional/invoke.h>
16	#include <__functional/ranges_operations.h>
17	#include <__iterator/concepts.h>	16	#include <__iterator/concepts.h>
18	#include <__iterator/iter_move.h>	17	#include <__iterator/iter_move.h>
19	#include <__iterator/permutable.h>	18	#include <__iterator/permutable.h>
...	@@ -39,7 +38,7 @@ namespace ranges {	...	@@ -39,7 +38,7 @@ namespace ranges {
39	template <class _Iter, class _Sent, class _Proj, class _Pred>	38	template <class _Iter, class _Sent, class _Proj, class _Pred>
40	_LIBCPP_HIDE_FROM_ABI constexpr subrange<_Iter>	39	_LIBCPP_HIDE_FROM_ABI constexpr subrange<_Iter>
41	__remove_if_impl(_Iter __first, _Sent __last, _Pred& __pred, _Proj& __proj) {	40	__remove_if_impl(_Iter __first, _Sent __last, _Pred& __pred, _Proj& __proj) {
42	auto __new_end = ranges::__find_if_impl(__first, __last, __pred, __proj);	41	auto __new_end = std::__find_if(__first, __last, __pred, __proj);
43	if (__new_end == __last)	42	if (__new_end == __last)
44	return {__new_end, __new_end};	43	return {__new_end, __new_end};
45		44

...	@@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -25,7 +25,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
25	// instead.	25	// instead.
26	#if defined(_LIBCPP_ABI_ATOMIC_WAIT_NATIVE_BY_SIZE)	26	#if defined(_LIBCPP_ABI_ATOMIC_WAIT_NATIVE_BY_SIZE)
27		27
28	# ifdef __linux__	28	# if defined(__linux__) \|\| defined(__Fuchsia__)
29	using __cxx_contention_t _LIBCPP_NODEBUG = int32_t;	29	using __cxx_contention_t _LIBCPP_NODEBUG = int32_t;
30	# elif defined(__APPLE__)	30	# elif defined(__APPLE__)
31	using __cxx_contention_t _LIBCPP_NODEBUG = int64_t;	31	using __cxx_contention_t _LIBCPP_NODEBUG = int64_t;
...	@@ -37,15 +37,15 @@ using __cxx_contention_t _LIBCPP_NODEBUG = int32_t;	...	@@ -37,15 +37,15 @@ using __cxx_contention_t _LIBCPP_NODEBUG = int32_t;
37	using __cxx_contention_t _LIBCPP_NODEBUG = int64_t;	37	using __cxx_contention_t _LIBCPP_NODEBUG = int64_t;
38	# else	38	# else
39	using __cxx_contention_t _LIBCPP_NODEBUG = int64_t;	39	using __cxx_contention_t _LIBCPP_NODEBUG = int64_t;
40	# endif // __linux__	40	# endif // __linux__ \|\| __Fuchsia__
41		41
42	#else // _LIBCPP_ABI_ATOMIC_WAIT_NATIVE_BY_SIZE	42	#else // _LIBCPP_ABI_ATOMIC_WAIT_NATIVE_BY_SIZE
43		43
44	# if defined(__linux__) \|\| (defined(_AIX) && !defined(__64BIT__))	44	# if defined(__linux__) \|\| defined(__Fuchsia__) \|\| (defined(_AIX) && !defined(__64BIT__))
45	using __cxx_contention_t _LIBCPP_NODEBUG = int32_t;	45	using __cxx_contention_t _LIBCPP_NODEBUG = int32_t;
46	# else	46	# else
47	using __cxx_contention_t _LIBCPP_NODEBUG = int64_t;	47	using __cxx_contention_t _LIBCPP_NODEBUG = int64_t;
48	# endif // __linux__ \|\| (_AIX && !__64BIT__)	48	# endif // __linux__ \|\| __Fuchsia__ \|\| (_AIX && !__64BIT__)
49		49
50	#endif // _LIBCPP_ABI_ATOMIC_WAIT_NATIVE_BY_SIZE	50	#endif // _LIBCPP_ABI_ATOMIC_WAIT_NATIVE_BY_SIZE
51		51

...	@@ -59,13 +59,13 @@ public:	...	@@ -59,13 +59,13 @@ public:
59	__s_(chrono::duration_cast<chrono::seconds>(chrono::abs(__d) - hours() - minutes())),	59	__s_(chrono::duration_cast<chrono::seconds>(chrono::abs(__d) - hours() - minutes())),
60	__f_(chrono::duration_cast<precision>(chrono::abs(__d) - hours() - minutes() - seconds())) {}	60	__f_(chrono::duration_cast<precision>(chrono::abs(__d) - hours() - minutes() - seconds())) {}
61		61
62	_LIBCPP_HIDE_FROM_ABI constexpr bool is_negative() const noexcept { return __is_neg_; }	62	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr bool is_negative() const noexcept { return __is_neg_; }
63	_LIBCPP_HIDE_FROM_ABI constexpr chrono::hours hours() const noexcept { return __h_; }	63	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr chrono::hours hours() const noexcept { return __h_; }
64	_LIBCPP_HIDE_FROM_ABI constexpr chrono::minutes minutes() const noexcept { return __m_; }	64	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr chrono::minutes minutes() const noexcept { return __m_; }
65	_LIBCPP_HIDE_FROM_ABI constexpr chrono::seconds seconds() const noexcept { return __s_; }	65	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr chrono::seconds seconds() const noexcept { return __s_; }
66	_LIBCPP_HIDE_FROM_ABI constexpr precision subseconds() const noexcept { return __f_; }	66	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr precision subseconds() const noexcept { return __f_; }
67		67
68	_LIBCPP_HIDE_FROM_ABI constexpr precision to_duration() const noexcept {	68	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr precision to_duration() const noexcept {
69	auto __dur = __h_ + __m_ + __s_ + __f_;	69	auto __dur = __h_ + __m_ + __s_ + __f_;
70	return __is_neg_ ? -__dur : __dur;	70	return __is_neg_ ? -__dur : __dur;
71	}	71	}
...	@@ -81,14 +81,14 @@ private:	...	@@ -81,14 +81,14 @@ private:
81	};	81	};
82	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(hh_mm_ss);	82	_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(hh_mm_ss);
83		83
84	_LIBCPP_HIDE_FROM_ABI inline constexpr bool is_am(const hours& __h) noexcept {	84	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool is_am(const hours& __h) noexcept {
85	return __h >= hours(0) && __h < hours(12);	85	return __h >= hours(0) && __h < hours(12);
86	}	86	}
87	_LIBCPP_HIDE_FROM_ABI inline constexpr bool is_pm(const hours& __h) noexcept {	87	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool is_pm(const hours& __h) noexcept {
88	return __h >= hours(12) && __h < hours(24);	88	return __h >= hours(12) && __h < hours(24);
89	}	89	}
90		90
91	_LIBCPP_HIDE_FROM_ABI inline constexpr hours make12(const hours& __h) noexcept {	91	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr hours make12(const hours& __h) noexcept {
92	if (__h == hours(0))	92	if (__h == hours(0))
93	return hours(12);	93	return hours(12);
94	else if (__h <= hours(12))	94	else if (__h <= hours(12))
...	@@ -97,7 +97,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr hours make12(const hours& __h) noexcept {	...	@@ -97,7 +97,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr hours make12(const hours& __h) noexcept {
97	return __h - hours(12);	97	return __h - hours(12);
98	}	98	}
99		99
100	_LIBCPP_HIDE_FROM_ABI inline constexpr hours make24(const hours& __h, bool __is_pm) noexcept {	100	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr hours make24(const hours& __h, bool __is_pm) noexcept {
101	if (__is_pm)	101	if (__is_pm)
102	return __h == hours(12) ? __h : __h + hours(12);	102	return __h == hours(12) ? __h : __h + hours(12);
103	else	103	else

...	@@ -55,7 +55,7 @@ public:	...	@@ -55,7 +55,7 @@ public:
55	_LIBCPP_HIDE_FROM_ABI constexpr month& operator+=(const months& __m1) noexcept;	55	_LIBCPP_HIDE_FROM_ABI constexpr month& operator+=(const months& __m1) noexcept;
56	_LIBCPP_HIDE_FROM_ABI constexpr month& operator-=(const months& __m1) noexcept;	56	_LIBCPP_HIDE_FROM_ABI constexpr month& operator-=(const months& __m1) noexcept;
57	_LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator unsigned() const noexcept { return __m_; }	57	_LIBCPP_HIDE_FROM_ABI explicit inline constexpr operator unsigned() const noexcept { return __m_; }
58	_LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_ >= 1 && __m_ <= 12; }	58	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr bool ok() const noexcept { return __m_ >= 1 && __m_ <= 12; }
59	};	59	};
60		60
61	_LIBCPP_HIDE_FROM_ABI inline constexpr bool operator==(const month& __lhs, const month& __rhs) noexcept {	61	_LIBCPP_HIDE_FROM_ABI inline constexpr bool operator==(const month& __lhs, const month& __rhs) noexcept {
...	@@ -66,21 +66,21 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr strong_ordering operator<=>(const month&	...	@@ -66,21 +66,21 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr strong_ordering operator<=>(const month&
66	return static_cast<unsigned>(__lhs) <=> static_cast<unsigned>(__rhs);	66	return static_cast<unsigned>(__lhs) <=> static_cast<unsigned>(__rhs);
67	}	67	}
68		68
69	_LIBCPP_HIDE_FROM_ABI inline constexpr month operator+(const month& __lhs, const months& __rhs) noexcept {	69	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month operator+(const month& __lhs, const months& __rhs) noexcept {
70	auto const __mu = static_cast<long long>(static_cast<unsigned>(__lhs)) + (__rhs.count() - 1);	70	auto const __mu = static_cast<long long>(static_cast<unsigned>(__lhs)) + (__rhs.count() - 1);
71	auto const __yr = (__mu >= 0 ? __mu : __mu - 11) / 12;	71	auto const __yr = (__mu >= 0 ? __mu : __mu - 11) / 12;
72	return month{static_cast<unsigned>(__mu - __yr * 12 + 1)};	72	return month{static_cast<unsigned>(__mu - __yr * 12 + 1)};
73	}	73	}
74		74
75	_LIBCPP_HIDE_FROM_ABI inline constexpr month operator+(const months& __lhs, const month& __rhs) noexcept {	75	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month operator+(const months& __lhs, const month& __rhs) noexcept {
76	return __rhs + __lhs;	76	return __rhs + __lhs;
77	}	77	}
78		78
79	_LIBCPP_HIDE_FROM_ABI inline constexpr month operator-(const month& __lhs, const months& __rhs) noexcept {	79	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr month operator-(const month& __lhs, const months& __rhs) noexcept {
80	return __lhs + -__rhs;	80	return __lhs + -__rhs;
81	}	81	}
82		82
83	_LIBCPP_HIDE_FROM_ABI inline constexpr months operator-(const month& __lhs, const month& __rhs) noexcept {	83	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr months operator-(const month& __lhs, const month& __rhs) noexcept {
84	auto const __dm = static_cast<unsigned>(__lhs) - static_cast<unsigned>(__rhs);	84	auto const __dm = static_cast<unsigned>(__lhs) - static_cast<unsigned>(__rhs);
85	return months(__dm <= 11 ? __dm : __dm + 12);	85	return months(__dm <= 11 ? __dm : __dm + 12);
86	}	86	}
...	@@ -114,7 +114,7 @@ inline constexpr month December{12};	...	@@ -114,7 +114,7 @@ inline constexpr month December{12};
114		114
115	template <>	115	template <>
116	struct hash<chrono::month> {	116	struct hash<chrono::month> {
117	_LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month& __m) noexcept {	117	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static size_t operator()(const chrono::month& __m) noexcept {
118	return static_cast<unsigned>(__m);	118	return static_cast<unsigned>(__m);
119	}	119	}
120	};	120	};

...	@@ -23,7 +23,7 @@ _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD	...	@@ -23,7 +23,7 @@ _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
23		23
24	enum class byte : unsigned char {};	24	enum class byte : unsigned char {};
25		25
26	_LIBCPP_HIDE_FROM_ABI inline constexpr byte operator\|(byte __lhs, byte __rhs) noexcept {	26	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr byte operator\|(byte __lhs, byte __rhs) noexcept {
27	return static_cast<byte>(	27	return static_cast<byte>(
28	static_cast<unsigned char>(static_cast<unsigned int>(__lhs) \| static_cast<unsigned int>(__rhs)));	28	static_cast<unsigned char>(static_cast<unsigned int>(__lhs) \| static_cast<unsigned int>(__rhs)));
29	}	29	}
...	@@ -32,7 +32,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr byte& operator\|=(byte& __lhs, byte __rhs)	...	@@ -32,7 +32,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr byte& operator\|=(byte& __lhs, byte __rhs)
32	return __lhs = __lhs \| __rhs;	32	return __lhs = __lhs \| __rhs;
33	}	33	}
34		34
35	_LIBCPP_HIDE_FROM_ABI inline constexpr byte operator&(byte __lhs, byte __rhs) noexcept {	35	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr byte operator&(byte __lhs, byte __rhs) noexcept {
36	return static_cast<byte>(	36	return static_cast<byte>(
37	static_cast<unsigned char>(static_cast<unsigned int>(__lhs) & static_cast<unsigned int>(__rhs)));	37	static_cast<unsigned char>(static_cast<unsigned int>(__lhs) & static_cast<unsigned int>(__rhs)));
38	}	38	}
...	@@ -41,7 +41,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr byte& operator&=(byte& __lhs, byte __rhs)	...	@@ -41,7 +41,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr byte& operator&=(byte& __lhs, byte __rhs)
41	return __lhs = __lhs & __rhs;	41	return __lhs = __lhs & __rhs;
42	}	42	}
43		43
44	_LIBCPP_HIDE_FROM_ABI inline constexpr byte operator^(byte __lhs, byte __rhs) noexcept {	44	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr byte operator^(byte __lhs, byte __rhs) noexcept {
45	return static_cast<byte>(	45	return static_cast<byte>(
46	static_cast<unsigned char>(static_cast<unsigned int>(__lhs) ^ static_cast<unsigned int>(__rhs)));	46	static_cast<unsigned char>(static_cast<unsigned int>(__lhs) ^ static_cast<unsigned int>(__rhs)));
47	}	47	}
...	@@ -50,7 +50,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr byte& operator^=(byte& __lhs, byte __rhs)	...	@@ -50,7 +50,7 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr byte& operator^=(byte& __lhs, byte __rhs)
50	return __lhs = __lhs ^ __rhs;	50	return __lhs = __lhs ^ __rhs;
51	}	51	}
52		52
53	_LIBCPP_HIDE_FROM_ABI inline constexpr byte operator~(byte __b) noexcept {	53	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI inline constexpr byte operator~(byte __b) noexcept {
54	return static_cast<byte>(static_cast<unsigned char>(~static_cast<unsigned int>(__b)));	54	return static_cast<byte>(static_cast<unsigned char>(~static_cast<unsigned int>(__b)));
55	}	55	}
56		56
...	@@ -60,7 +60,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr byte& operator<<=(byte& __lhs, _Integer __shift)	...	@@ -60,7 +60,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr byte& operator<<=(byte& __lhs, _Integer __shift)
60	}	60	}
61		61
62	template <class _Integer, __enable_if_t<is_integral<_Integer>::value, int> = 0>	62	template <class _Integer, __enable_if_t<is_integral<_Integer>::value, int> = 0>
63	_LIBCPP_HIDE_FROM_ABI constexpr byte operator<<(byte __lhs, _Integer __shift) noexcept {	63	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr byte operator<<(byte __lhs, _Integer __shift) noexcept {
64	return static_cast<byte>(static_cast<unsigned char>(static_cast<unsigned int>(__lhs) << __shift));	64	return static_cast<byte>(static_cast<unsigned char>(static_cast<unsigned int>(__lhs) << __shift));
65	}	65	}
66		66
...	@@ -70,7 +70,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr byte& operator>>=(byte& __lhs, _Integer __shift)	...	@@ -70,7 +70,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr byte& operator>>=(byte& __lhs, _Integer __shift)
70	}	70	}
71		71
72	template <class _Integer, __enable_if_t<is_integral<_Integer>::value, int> = 0>	72	template <class _Integer, __enable_if_t<is_integral<_Integer>::value, int> = 0>
73	_LIBCPP_HIDE_FROM_ABI constexpr byte operator>>(byte __lhs, _Integer __shift) noexcept {	73	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr byte operator>>(byte __lhs, _Integer __shift) noexcept {
74	return static_cast<byte>(static_cast<unsigned char>(static_cast<unsigned int>(__lhs) >> __shift));	74	return static_cast<byte>(static_cast<unsigned char>(static_cast<unsigned int>(__lhs) >> __shift));
75	}	75	}
76		76

...	@@ -98,18 +98,18 @@ public:	...	@@ -98,18 +98,18 @@ public:
98	return *this;	98	return *this;
99	}	99	}
100		100
101	_LIBCPP_HIDE_FROM_ABI constexpr const _Iter& base() const& noexcept { return __current_; }	101	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _Iter& base() const& noexcept { return __current_; }
102		102
103	_LIBCPP_HIDE_FROM_ABI constexpr _Iter base() && { return std::move(__current_); }	103	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Iter base() && { return std::move(__current_); }
104		104
105	_LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Iter> count() const noexcept { return __count_; }	105	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr iter_difference_t<_Iter> count() const noexcept { return __count_; }
106		106
107	_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() {	107	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() {
108	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__count_ > 0, "Iterator is equal to or past end.");	108	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__count_ > 0, "Iterator is equal to or past end.");
109	return *__current_;	109	return *__current_;
110	}	110	}
111		111
112	_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const	112	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator*() const
113	requires __dereferenceable<const _Iter>	113	requires __dereferenceable<const _Iter>
114	{	114	{
115	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__count_ > 0, "Iterator is equal to or past end.");	115	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__count_ > 0, "Iterator is equal to or past end.");
...	@@ -169,13 +169,13 @@ public:	...	@@ -169,13 +169,13 @@ public:
169	return __tmp;	169	return __tmp;
170	}	170	}
171		171
172	_LIBCPP_HIDE_FROM_ABI constexpr counted_iterator operator+(iter_difference_t<_Iter> __n) const	172	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr counted_iterator operator+(iter_difference_t<_Iter> __n) const
173	requires random_access_iterator<_Iter>	173	requires random_access_iterator<_Iter>
174	{	174	{
175	return counted_iterator(__current_ + __n, __count_ - __n);	175	return counted_iterator(__current_ + __n, __count_ - __n);
176	}	176	}
177		177
178	_LIBCPP_HIDE_FROM_ABI friend constexpr counted_iterator	178	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr counted_iterator
179	operator+(iter_difference_t<_Iter> __n, const counted_iterator& __x)	179	operator+(iter_difference_t<_Iter> __n, const counted_iterator& __x)
180	requires random_access_iterator<_Iter>	180	requires random_access_iterator<_Iter>
181	{	181	{
...	@@ -191,24 +191,24 @@ public:	...	@@ -191,24 +191,24 @@ public:
191	return *this;	191	return *this;
192	}	192	}
193		193
194	_LIBCPP_HIDE_FROM_ABI constexpr counted_iterator operator-(iter_difference_t<_Iter> __n) const	194	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr counted_iterator operator-(iter_difference_t<_Iter> __n) const
195	requires random_access_iterator<_Iter>	195	requires random_access_iterator<_Iter>
196	{	196	{
197	return counted_iterator(__current_ - __n, __count_ + __n);	197	return counted_iterator(__current_ - __n, __count_ + __n);
198	}	198	}
199		199
200	template <common_with<_Iter> _I2>	200	template <common_with<_Iter> _I2>
201	_LIBCPP_HIDE_FROM_ABI friend constexpr iter_difference_t<_I2>	201	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr iter_difference_t<_I2>
202	operator-(const counted_iterator& __lhs, const counted_iterator<_I2>& __rhs) {	202	operator-(const counted_iterator& __lhs, const counted_iterator<_I2>& __rhs) {
203	return __rhs.__count_ - __lhs.__count_;	203	return __rhs.__count_ - __lhs.__count_;
204	}	204	}
205		205
206	_LIBCPP_HIDE_FROM_ABI friend constexpr iter_difference_t<_Iter>	206	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr iter_difference_t<_Iter>
207	operator-(const counted_iterator& __lhs, default_sentinel_t) {	207	operator-(const counted_iterator& __lhs, default_sentinel_t) {
208	return -__lhs.__count_;	208	return -__lhs.__count_;
209	}	209	}
210		210
211	_LIBCPP_HIDE_FROM_ABI friend constexpr iter_difference_t<_Iter>	211	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr iter_difference_t<_Iter>
212	operator-(default_sentinel_t, const counted_iterator& __rhs) {	212	operator-(default_sentinel_t, const counted_iterator& __rhs) {
213	return __rhs.__count_;	213	return __rhs.__count_;
214	}	214	}
...	@@ -226,7 +226,7 @@ public:	...	@@ -226,7 +226,7 @@ public:
226	return *this;	226	return *this;
227	}	227	}
228		228
229	_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](iter_difference_t<_Iter> __n) const	229	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator[](iter_difference_t<_Iter> __n) const
230	requires random_access_iterator<_Iter>	230	requires random_access_iterator<_Iter>
231	{	231	{
232	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__n < __count_, "Subscript argument must be less than size.");	232	_LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(__n < __count_, "Subscript argument must be less than size.");
...	@@ -249,7 +249,7 @@ public:	...	@@ -249,7 +249,7 @@ public:
249	return __rhs.__count_ <=> __lhs.__count_;	249	return __rhs.__count_ <=> __lhs.__count_;
250	}	250	}
251		251
252	_LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto)	252	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto)
253	iter_move(const counted_iterator& __i) noexcept(noexcept(ranges::iter_move(__i.__current_)))	253	iter_move(const counted_iterator& __i) noexcept(noexcept(ranges::iter_move(__i.__current_)))
254	requires input_iterator<_Iter>	254	requires input_iterator<_Iter>
255	{	255	{

...	@@ -41,7 +41,7 @@ template <class _ExecutionPolicy,	...	@@ -41,7 +41,7 @@ template <class _ExecutionPolicy,
41	class _BinaryOperation,	41	class _BinaryOperation,
42	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,	42	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
43	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>	43	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
44	_LIBCPP_HIDE_FROM_ABI _Tp reduce(	44	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _Tp reduce(
45	_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __last, _Tp __init, _BinaryOperation __op) {	45	_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __last, _Tp __init, _BinaryOperation __op) {
46	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator, "reduce requires ForwardIterators");	46	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator, "reduce requires ForwardIterators");
47	using _Implementation = __pstl::__dispatch<__pstl::__reduce, __pstl::__current_configuration, _RawPolicy>;	47	using _Implementation = __pstl::__dispatch<__pstl::__reduce, __pstl::__current_configuration, _RawPolicy>;
...	@@ -58,7 +58,7 @@ template <class _ExecutionPolicy,	...	@@ -58,7 +58,7 @@ template <class _ExecutionPolicy,
58	class _Tp,	58	class _Tp,
59	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,	59	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
60	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>	60	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
61	_LIBCPP_HIDE_FROM_ABI _Tp	61	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _Tp
62	reduce(_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __last, _Tp __init) {	62	reduce(_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __last, _Tp __init) {
63	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator, "reduce requires ForwardIterators");	63	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator, "reduce requires ForwardIterators");
64	using _Implementation = __pstl::__dispatch<__pstl::__reduce, __pstl::__current_configuration, _RawPolicy>;	64	using _Implementation = __pstl::__dispatch<__pstl::__reduce, __pstl::__current_configuration, _RawPolicy>;
...	@@ -70,7 +70,7 @@ template <class _ExecutionPolicy,	...	@@ -70,7 +70,7 @@ template <class _ExecutionPolicy,
70	class _ForwardIterator,	70	class _ForwardIterator,
71	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,	71	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
72	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>	72	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
73	_LIBCPP_HIDE_FROM_ABI __iterator_value_type<_ForwardIterator>	73	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI __iterator_value_type<_ForwardIterator>
74	reduce(_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __last) {	74	reduce(_ExecutionPolicy&& __policy, _ForwardIterator __first, _ForwardIterator __last) {
75	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator, "reduce requires ForwardIterators");	75	_LIBCPP_REQUIRE_CPP17_FORWARD_ITERATOR(_ForwardIterator, "reduce requires ForwardIterators");
76	using _Implementation = __pstl::__dispatch<__pstl::__reduce, __pstl::__current_configuration, _RawPolicy>;	76	using _Implementation = __pstl::__dispatch<__pstl::__reduce, __pstl::__current_configuration, _RawPolicy>;
...	@@ -90,7 +90,7 @@ template <class _ExecutionPolicy,	...	@@ -90,7 +90,7 @@ template <class _ExecutionPolicy,
90	class _BinaryOperation2,	90	class _BinaryOperation2,
91	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,	91	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
92	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>	92	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
93	_LIBCPP_HIDE_FROM_ABI _Tp transform_reduce(	93	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _Tp transform_reduce(
94	_ExecutionPolicy&& __policy,	94	_ExecutionPolicy&& __policy,
95	_ForwardIterator1 __first1,	95	_ForwardIterator1 __first1,
96	_ForwardIterator1 __last1,	96	_ForwardIterator1 __last1,
...	@@ -120,7 +120,7 @@ template <class _ExecutionPolicy,	...	@@ -120,7 +120,7 @@ template <class _ExecutionPolicy,
120	class _Tp,	120	class _Tp,
121	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,	121	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
122	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>	122	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
123	_LIBCPP_HIDE_FROM_ABI _Tp transform_reduce(	123	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _Tp transform_reduce(
124	_ExecutionPolicy&& __policy,	124	_ExecutionPolicy&& __policy,
125	_ForwardIterator1 __first1,	125	_ForwardIterator1 __first1,
126	_ForwardIterator1 __last1,	126	_ForwardIterator1 __last1,
...	@@ -147,7 +147,7 @@ template <class _ExecutionPolicy,	...	@@ -147,7 +147,7 @@ template <class _ExecutionPolicy,
147	class _UnaryOperation,	147	class _UnaryOperation,
148	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,	148	class _RawPolicy = __remove_cvref_t<_ExecutionPolicy>,
149	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>	149	enable_if_t<is_execution_policy_v<_RawPolicy>, int> = 0>
150	_LIBCPP_HIDE_FROM_ABI _Tp transform_reduce(	150	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _Tp transform_reduce(
151	_ExecutionPolicy&& __policy,	151	_ExecutionPolicy&& __policy,
152	_ForwardIterator __first,	152	_ForwardIterator __first,
153	_ForwardIterator __last,	153	_ForwardIterator __last,

...	@@ -29,7 +29,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD	...	@@ -29,7 +29,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
29	#if _LIBCPP_STD_VER >= 20	29	#if _LIBCPP_STD_VER >= 20
30		30
31	template <__signed_or_unsigned_integer _Tp>	31	template <__signed_or_unsigned_integer _Tp>
32	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __add_sat(_Tp __x, _Tp __y) noexcept {	32	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __saturating_add(_Tp __x, _Tp __y) noexcept {
33	# if defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 2101	33	# if defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 2101
34	return __builtin_elementwise_add_sat(__x, __y);	34	return __builtin_elementwise_add_sat(__x, __y);
35	# else	35	# else
...	@@ -51,7 +51,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __add_sat(_Tp __x, _Tp __y) noexcept {	...	@@ -51,7 +51,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __add_sat(_Tp __x, _Tp __y) noexcept {
51	}	51	}
52		52
53	template <__signed_or_unsigned_integer _Tp>	53	template <__signed_or_unsigned_integer _Tp>
54	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __sub_sat(_Tp __x, _Tp __y) noexcept {	54	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __saturating_sub(_Tp __x, _Tp __y) noexcept {
55	# if defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 2101	55	# if defined(_LIBCPP_CLANG_VER) && _LIBCPP_CLANG_VER >= 2101
56	return __builtin_elementwise_sub_sat(__x, __y);	56	return __builtin_elementwise_sub_sat(__x, __y);
57	# else	57	# else
...	@@ -74,7 +74,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __sub_sat(_Tp __x, _Tp __y) noexcept {	...	@@ -74,7 +74,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __sub_sat(_Tp __x, _Tp __y) noexcept {
74	}	74	}
75		75
76	template <__signed_or_unsigned_integer _Tp>	76	template <__signed_or_unsigned_integer _Tp>
77	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __mul_sat(_Tp __x, _Tp __y) noexcept {	77	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __saturating_mul(_Tp __x, _Tp __y) noexcept {
78	if (_Tp __mul; !__builtin_mul_overflow(__x, __y, std::addressof(__mul)))	78	if (_Tp __mul; !__builtin_mul_overflow(__x, __y, std::addressof(__mul)))
79	return __mul;	79	return __mul;
80	// Handle overflow	80	// Handle overflow
...	@@ -90,7 +90,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __mul_sat(_Tp __x, _Tp __y) noexcept {	...	@@ -90,7 +90,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __mul_sat(_Tp __x, _Tp __y) noexcept {
90	}	90	}
91		91
92	template <__signed_or_unsigned_integer _Tp>	92	template <__signed_or_unsigned_integer _Tp>
93	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __div_sat(_Tp __x, _Tp __y) noexcept {	93	_LIBCPP_HIDE_FROM_ABI constexpr _Tp __saturating_div(_Tp __x, _Tp __y) noexcept {
94	_LIBCPP_ASSERT_UNCATEGORIZED(__y != 0, "Division by 0 is undefined");	94	_LIBCPP_ASSERT_UNCATEGORIZED(__y != 0, "Division by 0 is undefined");
95	if constexpr (__unsigned_integer<_Tp>) {	95	if constexpr (__unsigned_integer<_Tp>) {
96	return __x / __y;	96	return __x / __y;
...	@@ -103,7 +103,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __div_sat(_Tp __x, _Tp __y) noexcept {	...	@@ -103,7 +103,7 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __div_sat(_Tp __x, _Tp __y) noexcept {
103	}	103	}
104		104
105	template <__signed_or_unsigned_integer _Rp, __signed_or_unsigned_integer _Tp>	105	template <__signed_or_unsigned_integer _Rp, __signed_or_unsigned_integer _Tp>
106	_LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturate_cast(_Tp __x) noexcept {	106	_LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturating_cast(_Tp __x) noexcept {
107	// Saturation is impossible edge case when ((min _Rp) < (min _Tp) && (max _Rp) > (max _Tp)) and it is expected to be	107	// Saturation is impossible edge case when ((min _Rp) < (min _Tp) && (max _Rp) > (max _Tp)) and it is expected to be
108	// optimized out by the compiler.	108	// optimized out by the compiler.
109		109
...	@@ -121,28 +121,28 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturate_cast(_Tp __x) noexcept {	...	@@ -121,28 +121,28 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Rp __saturate_cast(_Tp __x) noexcept {
121	#if _LIBCPP_STD_VER >= 26	121	#if _LIBCPP_STD_VER >= 26
122		122
123	template <__signed_or_unsigned_integer _Tp>	123	template <__signed_or_unsigned_integer _Tp>
124	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp add_sat(_Tp __x, _Tp __y) noexcept {	124	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp saturating_add(_Tp __x, _Tp __y) noexcept {
125	return std::__add_sat(__x, __y);	125	return std::__saturating_add(__x, __y);
126	}	126	}
127		127
128	template <__signed_or_unsigned_integer _Tp>	128	template <__signed_or_unsigned_integer _Tp>
129	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp sub_sat(_Tp __x, _Tp __y) noexcept {	129	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp saturating_sub(_Tp __x, _Tp __y) noexcept {
130	return std::__sub_sat(__x, __y);	130	return std::__saturating_sub(__x, __y);
131	}	131	}
132		132
133	template <__signed_or_unsigned_integer _Tp>	133	template <__signed_or_unsigned_integer _Tp>
134	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp mul_sat(_Tp __x, _Tp __y) noexcept {	134	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp saturating_mul(_Tp __x, _Tp __y) noexcept {
135	return std::__mul_sat(__x, __y);	135	return std::__saturating_mul(__x, __y);
136	}	136	}
137		137
138	template <__signed_or_unsigned_integer _Tp>	138	template <__signed_or_unsigned_integer _Tp>
139	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp div_sat(_Tp __x, _Tp __y) noexcept {	139	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Tp saturating_div(_Tp __x, _Tp __y) noexcept {
140	return std::__div_sat(__x, __y);	140	return std::__saturating_div(__x, __y);
141	}	141	}
142		142
143	template <__signed_or_unsigned_integer _Rp, __signed_or_unsigned_integer _Tp>	143	template <__signed_or_unsigned_integer _Rp, __signed_or_unsigned_integer _Tp>
144	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Rp saturate_cast(_Tp __x) noexcept {	144	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _Rp saturating_cast(_Tp __x) noexcept {
145	return std::__saturate_cast<_Rp>(__x);	145	return std::__saturating_cast<_Rp>(__x);
146	}	146	}
147		147
148	#endif // _LIBCPP_STD_VER >= 26	148	#endif // _LIBCPP_STD_VER >= 26

...	@@ -43,8 +43,8 @@ public:	...	@@ -43,8 +43,8 @@ public:
43		43
44	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __a = 0, result_type __b = 1) : __a_(__a), __b_(__b) {}	44	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __a = 0, result_type __b = 1) : __a_(__a), __b_(__b) {}
45		45
46	_LIBCPP_HIDE_FROM_ABI result_type a() const { return __a_; }	46	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type a() const { return __a_; }
47	_LIBCPP_HIDE_FROM_ABI result_type b() const { return __b_; }	47	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type b() const { return __b_; }
48		48
49	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	49	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
50	return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;	50	return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;
...	@@ -70,21 +70,21 @@ public:	...	@@ -70,21 +70,21 @@ public:
70		70
71	// generating functions	71	// generating functions
72	template <class _URNG>	72	template <class _URNG>
73	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	73	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
74	return (*this)(__g, __p_);	74	return (*this)(__g, __p_);
75	}	75	}
76	template <class _URNG>	76	template <class _URNG>
77	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	77	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
78		78
79	// property functions	79	// property functions
80	_LIBCPP_HIDE_FROM_ABI result_type a() const { return __p_.a(); }	80	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type a() const { return __p_.a(); }
81	_LIBCPP_HIDE_FROM_ABI result_type b() const { return __p_.b(); }	81	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type b() const { return __p_.b(); }
82		82
83	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	83	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
84	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	84	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
85		85
86	_LIBCPP_HIDE_FROM_ABI result_type min() const { return -numeric_limits<result_type>::infinity(); }	86	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return -numeric_limits<result_type>::infinity(); }
87	_LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }	87	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }
88		88
89	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const cauchy_distribution& __x, const cauchy_distribution& __y) {	89	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const cauchy_distribution& __x, const cauchy_distribution& __y) {
90	return __x.__p_ == __y.__p_;	90	return __x.__p_ == __y.__p_;

...	@@ -41,7 +41,7 @@ public:	...	@@ -41,7 +41,7 @@ public:
41		41
42	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __n = 1) : __n_(__n) {}	42	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __n = 1) : __n_(__n) {}
43		43
44	_LIBCPP_HIDE_FROM_ABI result_type n() const { return __n_; }	44	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type n() const { return __n_; }
45		45
46	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	46	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
47	return __x.__n_ == __y.__n_;	47	return __x.__n_ == __y.__n_;
...	@@ -65,22 +65,22 @@ public:	...	@@ -65,22 +65,22 @@ public:
65		65
66	// generating functions	66	// generating functions
67	template <class _URNG>	67	template <class _URNG>
68	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	68	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
69	return (*this)(__g, __p_);	69	return (*this)(__g, __p_);
70	}	70	}
71	template <class _URNG>	71	template <class _URNG>
72	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p) {	72	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p) {
73	return gamma_distribution<result_type>(__p.n() / 2, 2)(__g);	73	return gamma_distribution<result_type>(__p.n() / 2, 2)(__g);
74	}	74	}
75		75
76	// property functions	76	// property functions
77	_LIBCPP_HIDE_FROM_ABI result_type n() const { return __p_.n(); }	77	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type n() const { return __p_.n(); }
78		78
79	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	79	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
80	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	80	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
81		81
82	_LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }	82	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }
83	_LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }	83	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }
84		84
85	friend _LIBCPP_HIDE_FROM_ABI bool	85	friend _LIBCPP_HIDE_FROM_ABI bool
86	operator==(const chi_squared_distribution& __x, const chi_squared_distribution& __y) {	86	operator==(const chi_squared_distribution& __x, const chi_squared_distribution& __y) {

...	@@ -42,8 +42,8 @@ public:	...	@@ -42,8 +42,8 @@ public:
42		42
43	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __m = 1, result_type __n = 1) : __m_(__m), __n_(__n) {}	43	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __m = 1, result_type __n = 1) : __m_(__m), __n_(__n) {}
44		44
45	_LIBCPP_HIDE_FROM_ABI result_type m() const { return __m_; }	45	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type m() const { return __m_; }
46	_LIBCPP_HIDE_FROM_ABI result_type n() const { return __n_; }	46	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type n() const { return __n_; }
47		47
48	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	48	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
49	return __x.__m_ == __y.__m_ && __x.__n_ == __y.__n_;	49	return __x.__m_ == __y.__m_ && __x.__n_ == __y.__n_;
...	@@ -69,21 +69,21 @@ public:	...	@@ -69,21 +69,21 @@ public:
69		69
70	// generating functions	70	// generating functions
71	template <class _URNG>	71	template <class _URNG>
72	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	72	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
73	return (*this)(__g, __p_);	73	return (*this)(__g, __p_);
74	}	74	}
75	template <class _URNG>	75	template <class _URNG>
76	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	76	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
77		77
78	// property functions	78	// property functions
79	_LIBCPP_HIDE_FROM_ABI result_type m() const { return __p_.m(); }	79	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type m() const { return __p_.m(); }
80	_LIBCPP_HIDE_FROM_ABI result_type n() const { return __p_.n(); }	80	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type n() const { return __p_.n(); }
81		81
82	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	82	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
83	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	83	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
84		84
85	_LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }	85	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }
86	_LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }	86	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }
87		87
88	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const fisher_f_distribution& __x, const fisher_f_distribution& __y) {	88	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const fisher_f_distribution& __x, const fisher_f_distribution& __y) {
89	return __x.__p_ == __y.__p_;	89	return __x.__p_ == __y.__p_;

...	@@ -45,8 +45,8 @@ public:	...	@@ -45,8 +45,8 @@ public:
45	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __alpha = 1, result_type __beta = 1)	45	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __alpha = 1, result_type __beta = 1)
46	: __alpha_(__alpha), __beta_(__beta) {}	46	: __alpha_(__alpha), __beta_(__beta) {}
47		47
48	_LIBCPP_HIDE_FROM_ABI result_type alpha() const { return __alpha_; }	48	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type alpha() const { return __alpha_; }
49	_LIBCPP_HIDE_FROM_ABI result_type beta() const { return __beta_; }	49	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type beta() const { return __beta_; }
50		50
51	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	51	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
52	return __x.__alpha_ == __y.__alpha_ && __x.__beta_ == __y.__beta_;	52	return __x.__alpha_ == __y.__alpha_ && __x.__beta_ == __y.__beta_;
...	@@ -72,21 +72,21 @@ public:	...	@@ -72,21 +72,21 @@ public:
72		72
73	// generating functions	73	// generating functions
74	template <class _URNG>	74	template <class _URNG>
75	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	75	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
76	return (*this)(__g, __p_);	76	return (*this)(__g, __p_);
77	}	77	}
78	template <class _URNG>	78	template <class _URNG>
79	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	79	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
80		80
81	// property functions	81	// property functions
82	_LIBCPP_HIDE_FROM_ABI result_type alpha() const { return __p_.alpha(); }	82	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type alpha() const { return __p_.alpha(); }
83	_LIBCPP_HIDE_FROM_ABI result_type beta() const { return __p_.beta(); }	83	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type beta() const { return __p_.beta(); }
84		84
85	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	85	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
86	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	86	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
87		87
88	_LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }	88	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }
89	_LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }	89	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::infinity(); }
90		90
91	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const gamma_distribution& __x, const gamma_distribution& __y) {	91	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const gamma_distribution& __x, const gamma_distribution& __y) {
92	return __x.__p_ == __y.__p_;	92	return __x.__p_ == __y.__p_;

...	@@ -44,8 +44,8 @@ public:	...	@@ -44,8 +44,8 @@ public:
44		44
45	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __k = 1, double __p = 0.5) : __k_(__k), __p_(__p) {}	45	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __k = 1, double __p = 0.5) : __k_(__k), __p_(__p) {}
46		46
47	_LIBCPP_HIDE_FROM_ABI result_type k() const { return __k_; }	47	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type k() const { return __k_; }
48	_LIBCPP_HIDE_FROM_ABI double p() const { return __p_; }	48	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double p() const { return __p_; }
49		49
50	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	50	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
51	return __x.__k_ == __y.__k_ && __x.__p_ == __y.__p_;	51	return __x.__k_ == __y.__k_ && __x.__p_ == __y.__p_;
...	@@ -70,21 +70,21 @@ public:	...	@@ -70,21 +70,21 @@ public:
70		70
71	// generating functions	71	// generating functions
72	template <class _URNG>	72	template <class _URNG>
73	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	73	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
74	return (*this)(__g, __p_);	74	return (*this)(__g, __p_);
75	}	75	}
76	template <class _URNG>	76	template <class _URNG>
77	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	77	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
78		78
79	// property functions	79	// property functions
80	_LIBCPP_HIDE_FROM_ABI result_type k() const { return __p_.k(); }	80	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type k() const { return __p_.k(); }
81	_LIBCPP_HIDE_FROM_ABI double p() const { return __p_.p(); }	81	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double p() const { return __p_.p(); }
82		82
83	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	83	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
84	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	84	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
85		85
86	_LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }	86	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }
87	_LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::max(); }	87	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::max(); }
88		88
89	friend _LIBCPP_HIDE_FROM_ABI bool	89	friend _LIBCPP_HIDE_FROM_ABI bool
90	operator==(const negative_binomial_distribution& __x, const negative_binomial_distribution& __y) {	90	operator==(const negative_binomial_distribution& __x, const negative_binomial_distribution& __y) {

...	@@ -59,8 +59,8 @@ public:	...	@@ -59,8 +59,8 @@ public:
59	_LIBCPP_HIDE_FROM_ABI param_type(param_type const&) = default;	59	_LIBCPP_HIDE_FROM_ABI param_type(param_type const&) = default;
60	_LIBCPP_HIDE_FROM_ABI param_type& operator=(const param_type& __rhs);	60	_LIBCPP_HIDE_FROM_ABI param_type& operator=(const param_type& __rhs);
61		61
62	_LIBCPP_HIDE_FROM_ABI vector<result_type> intervals() const { return __b_; }	62	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<result_type> intervals() const { return __b_; }
63	_LIBCPP_HIDE_FROM_ABI vector<result_type> densities() const { return __densities_; }	63	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<result_type> densities() const { return __densities_; }
64		64
65	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	65	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
66	return __x.__densities_ == __y.__densities_ && __x.__b_ == __y.__b_;	66	return __x.__densities_ == __y.__densities_ && __x.__b_ == __y.__b_;
...	@@ -109,21 +109,21 @@ public:	...	@@ -109,21 +109,21 @@ public:
109		109
110	// generating functions	110	// generating functions
111	template <class _URNG>	111	template <class _URNG>
112	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	112	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
113	return (*this)(__g, __p_);	113	return (*this)(__g, __p_);
114	}	114	}
115	template <class _URNG>	115	template <class _URNG>
116	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	116	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
117		117
118	// property functions	118	// property functions
119	_LIBCPP_HIDE_FROM_ABI vector<result_type> intervals() const { return __p_.intervals(); }	119	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<result_type> intervals() const { return __p_.intervals(); }
120	_LIBCPP_HIDE_FROM_ABI vector<result_type> densities() const { return __p_.densities(); }	120	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<result_type> densities() const { return __p_.densities(); }
121		121
122	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	122	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
123	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	123	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
124		124
125	_LIBCPP_HIDE_FROM_ABI result_type min() const { return __p_.__b_.front(); }	125	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return __p_.__b_.front(); }
126	_LIBCPP_HIDE_FROM_ABI result_type max() const { return __p_.__b_.back(); }	126	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return __p_.__b_.back(); }
127		127
128	friend _LIBCPP_HIDE_FROM_ABI bool	128	friend _LIBCPP_HIDE_FROM_ABI bool
129	operator==(const piecewise_constant_distribution& __x, const piecewise_constant_distribution& __y) {	129	operator==(const piecewise_constant_distribution& __x, const piecewise_constant_distribution& __y) {

...	@@ -60,8 +60,8 @@ public:	...	@@ -60,8 +60,8 @@ public:
60	_LIBCPP_HIDE_FROM_ABI param_type(param_type const&) = default;	60	_LIBCPP_HIDE_FROM_ABI param_type(param_type const&) = default;
61	_LIBCPP_HIDE_FROM_ABI param_type& operator=(const param_type& __rhs);	61	_LIBCPP_HIDE_FROM_ABI param_type& operator=(const param_type& __rhs);
62		62
63	_LIBCPP_HIDE_FROM_ABI vector<result_type> intervals() const { return __b_; }	63	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<result_type> intervals() const { return __b_; }
64	_LIBCPP_HIDE_FROM_ABI vector<result_type> densities() const { return __densities_; }	64	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<result_type> densities() const { return __densities_; }
65		65
66	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	66	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
67	return __x.__densities_ == __y.__densities_ && __x.__b_ == __y.__b_;	67	return __x.__densities_ == __y.__densities_ && __x.__b_ == __y.__b_;
...	@@ -110,21 +110,21 @@ public:	...	@@ -110,21 +110,21 @@ public:
110		110
111	// generating functions	111	// generating functions
112	template <class _URNG>	112	template <class _URNG>
113	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	113	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
114	return (*this)(__g, __p_);	114	return (*this)(__g, __p_);
115	}	115	}
116	template <class _URNG>	116	template <class _URNG>
117	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	117	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
118		118
119	// property functions	119	// property functions
120	_LIBCPP_HIDE_FROM_ABI vector<result_type> intervals() const { return __p_.intervals(); }	120	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<result_type> intervals() const { return __p_.intervals(); }
121	_LIBCPP_HIDE_FROM_ABI vector<result_type> densities() const { return __p_.densities(); }	121	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI vector<result_type> densities() const { return __p_.densities(); }
122		122
123	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	123	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
124	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	124	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
125		125
126	_LIBCPP_HIDE_FROM_ABI result_type min() const { return __p_.__b_.front(); }	126	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return __p_.__b_.front(); }
127	_LIBCPP_HIDE_FROM_ABI result_type max() const { return __p_.__b_.back(); }	127	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return __p_.__b_.back(); }
128		128
129	friend _LIBCPP_HIDE_FROM_ABI bool	129	friend _LIBCPP_HIDE_FROM_ABI bool
130	operator==(const piecewise_linear_distribution& __x, const piecewise_linear_distribution& __y) {	130	operator==(const piecewise_linear_distribution& __x, const piecewise_linear_distribution& __y) {

...	@@ -53,7 +53,7 @@ public:	...	@@ -53,7 +53,7 @@ public:
53		53
54	_LIBCPP_HIDE_FROM_ABI explicit param_type(double __mean = 1.0);	54	_LIBCPP_HIDE_FROM_ABI explicit param_type(double __mean = 1.0);
55		55
56	_LIBCPP_HIDE_FROM_ABI double mean() const { return __mean_; }	56	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double mean() const { return __mean_; }
57		57
58	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {	58	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const param_type& __x, const param_type& __y) {
59	return __x.__mean_ == __y.__mean_;	59	return __x.__mean_ == __y.__mean_;
...	@@ -79,20 +79,20 @@ public:	...	@@ -79,20 +79,20 @@ public:
79		79
80	// generating functions	80	// generating functions
81	template <class _URNG>	81	template <class _URNG>
82	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	82	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
83	return (*this)(__g, __p_);	83	return (*this)(__g, __p_);
84	}	84	}
85	template <class _URNG>	85	template <class _URNG>
86	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	86	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
87		87
88	// property functions	88	// property functions
89	_LIBCPP_HIDE_FROM_ABI double mean() const { return __p_.mean(); }	89	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI double mean() const { return __p_.mean(); }
90		90
91	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	91	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
92	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	92	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
93		93
94	_LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }	94	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return 0; }
95	_LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::max(); }	95	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return numeric_limits<result_type>::max(); }
96		96
97	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const poisson_distribution& __x, const poisson_distribution& __y) {	97	friend _LIBCPP_HIDE_FROM_ABI bool operator==(const poisson_distribution& __x, const poisson_distribution& __y) {
98	return __x.__p_ == __y.__p_;	98	return __x.__p_ == __y.__p_;

...	@@ -151,8 +151,8 @@ public:	...	@@ -151,8 +151,8 @@ public:
151	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __a = 0, result_type __b = numeric_limits<result_type>::max())	151	_LIBCPP_HIDE_FROM_ABI explicit param_type(result_type __a = 0, result_type __b = numeric_limits<result_type>::max())
152	: __a_(__a), __b_(__b) {}	152	: __a_(__a), __b_(__b) {}
153		153
154	_LIBCPP_HIDE_FROM_ABI result_type a() const { return __a_; }	154	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type a() const { return __a_; }
155	_LIBCPP_HIDE_FROM_ABI result_type b() const { return __b_; }	155	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type b() const { return __b_; }
156		156
157	_LIBCPP_HIDE_FROM_ABI friend bool operator==(const param_type& __x, const param_type& __y) {	157	_LIBCPP_HIDE_FROM_ABI friend bool operator==(const param_type& __x, const param_type& __y) {
158	return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;	158	return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;
...	@@ -179,21 +179,21 @@ public:	...	@@ -179,21 +179,21 @@ public:
179		179
180	// generating functions	180	// generating functions
181	template <class _URNG>	181	template <class _URNG>
182	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {	182	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g) {
183	return (*this)(__g, __p_);	183	return (*this)(__g, __p_);
184	}	184	}
185	template <class _URNG>	185	template <class _URNG>
186	_LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);	186	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type operator()(_URNG& __g, const param_type& __p);
187		187
188	// property functions	188	// property functions
189	_LIBCPP_HIDE_FROM_ABI result_type a() const { return __p_.a(); }	189	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type a() const { return __p_.a(); }
190	_LIBCPP_HIDE_FROM_ABI result_type b() const { return __p_.b(); }	190	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type b() const { return __p_.b(); }
191		191
192	_LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }	192	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI param_type param() const { return __p_; }
193	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }	193	_LIBCPP_HIDE_FROM_ABI void param(const param_type& __p) { __p_ = __p; }
194		194
195	_LIBCPP_HIDE_FROM_ABI result_type min() const { return a(); }	195	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type min() const { return a(); }
196	_LIBCPP_HIDE_FROM_ABI result_type max() const { return b(); }	196	[[__nodiscard__]] _LIBCPP_HIDE_FROM_ABI result_type max() const { return b(); }
197		197
198	_LIBCPP_HIDE_FROM_ABI friend bool	198	_LIBCPP_HIDE_FROM_ABI friend bool
199	operator==(const uniform_int_distribution& __x, const uniform_int_distribution& __y) {	199	operator==(const uniform_int_distribution& __x, const uniform_int_distribution& __y) {

...	@@ -316,8 +316,8 @@ public:	...	@@ -316,8 +316,8 @@ public:
316		316
317	_LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(_Start __value) : __value_(std::move(__value)) {}	317	_LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(_Start __value) : __value_(std::move(__value)) {}
318		318
319	_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23	319	_LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(type_identity_t<_Start> __value,
320	iota_view(type_identity_t<_Start> __value, type_identity_t<_BoundSentinel> __bound_sentinel)	320	type_identity_t<_BoundSentinel> __bound_sentinel)
321	: __value_(std::move(__value)), __bound_sentinel_(std::move(__bound_sentinel)) {	321	: __value_(std::move(__value)), __bound_sentinel_(std::move(__bound_sentinel)) {
322	// Validate the precondition if possible.	322	// Validate the precondition if possible.
323	if constexpr (totally_ordered_with<_Start, _BoundSentinel>) {	323	if constexpr (totally_ordered_with<_Start, _BoundSentinel>) {
...	@@ -326,15 +326,15 @@ public:	...	@@ -326,15 +326,15 @@ public:
326	}	326	}
327	}	327	}
328		328
329	_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 iota_view(__iterator __first, __iterator __last)	329	_LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(__iterator __first, __iterator __last)
330	requires same_as<_Start, _BoundSentinel>	330	requires same_as<_Start, _BoundSentinel>
331	: iota_view(std::move(__first.__value_), std::move(__last.__value_)) {}	331	: iota_view(std::move(__first.__value_), std::move(__last.__value_)) {}
332		332
333	_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 iota_view(__iterator __first, _BoundSentinel __last)	333	_LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(__iterator __first, _BoundSentinel __last)
334	requires same_as<_BoundSentinel, unreachable_sentinel_t>	334	requires same_as<_BoundSentinel, unreachable_sentinel_t>
335	: iota_view(std::move(__first.__value_), std::move(__last)) {}	335	: iota_view(std::move(__first.__value_), std::move(__last)) {}
336		336
337	_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 iota_view(__iterator __first, __sentinel __last)	337	_LIBCPP_HIDE_FROM_ABI constexpr explicit iota_view(__iterator __first, __sentinel __last)
338	requires(!same_as<_Start, _BoundSentinel> && !same_as<_BoundSentinel, unreachable_sentinel_t>)	338	requires(!same_as<_Start, _BoundSentinel> && !same_as<_BoundSentinel, unreachable_sentinel_t>)
339	: iota_view(std::move(__first.__value_), std::move(__last.__bound_sentinel_)) {}	339	: iota_view(std::move(__first.__value_), std::move(__last.__bound_sentinel_)) {}
340		340
...	@@ -357,7 +357,7 @@ public:	...	@@ -357,7 +357,7 @@ public:
357		357
358	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const	358	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
359	requires(same_as<_Start, _BoundSentinel> && __advanceable<_Start>) \|\|	359	requires(same_as<_Start, _BoundSentinel> && __advanceable<_Start>) \|\|
360	(integral<_Start> && integral<_BoundSentinel>) \|\| sized_sentinel_for<_BoundSentinel, _Start>	360	(__integer_like<_Start> && __integer_like<_BoundSentinel>) \|\| sized_sentinel_for<_BoundSentinel, _Start>
361	{	361	{
362	if constexpr (__integer_like<_Start> && __integer_like<_BoundSentinel>) {	362	if constexpr (__integer_like<_Start> && __integer_like<_BoundSentinel>) {
363	return (__value_ < 0)	363	return (__value_ < 0)

Merge branch 'llvm23'

...	@@ -46,12 +46,12 @@ public:	...	@@ -46,12 +46,12 @@ public:
46	_LIBCPP_HIDE_FROM_ABI constexpr explicit basic_istream_view(basic_istream<_CharT, _Traits>& __stream)	46	_LIBCPP_HIDE_FROM_ABI constexpr explicit basic_istream_view(basic_istream<_CharT, _Traits>& __stream)
47	: __stream_(std::addressof(__stream)) {}	47	: __stream_(std::addressof(__stream)) {}
48		48
49	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() {	49	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() {
50	*__stream_ >> __value_;	50	*__stream_ >> __value_;
51	return __iterator{*this};	51	return __iterator{*this};
52	}	52	}
53		53
54	_LIBCPP_HIDE_FROM_ABI constexpr default_sentinel_t end() const noexcept { return default_sentinel; }	54	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr default_sentinel_t end() const noexcept { return default_sentinel; }
55		55
56	private:	56	private:
57	basic_istream<_CharT, _Traits>* __stream_;	57	basic_istream<_CharT, _Traits>* __stream_;
...	@@ -82,7 +82,7 @@ public:	...	@@ -82,7 +82,7 @@ public:
82		82
83	_LIBCPP_HIDE_FROM_ABI void operator++(int) { ++*this; }	83	_LIBCPP_HIDE_FROM_ABI void operator++(int) { ++*this; }
84		84
85	_LIBCPP_HIDE_FROM_ABI _Val& operator*() const { return __parent_->__value_; }	85	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI _Val& operator*() const { return __parent_->__value_; }
86		86
87	_LIBCPP_HIDE_FROM_ABI friend bool operator==(const __iterator& __x, default_sentinel_t) {	87	_LIBCPP_HIDE_FROM_ABI friend bool operator==(const __iterator& __x, default_sentinel_t) {
88	return !*__x.__get_parent_stream();	88	return !*__x.__get_parent_stream();
...	@@ -113,7 +113,7 @@ struct __fn {	...	@@ -113,7 +113,7 @@ struct __fn {
113	template <class _Up, class _UnCVRef = remove_cvref_t<_Up>>	113	template <class _Up, class _UnCVRef = remove_cvref_t<_Up>>
114	requires derived_from<_UnCVRef, basic_istream<typename _UnCVRef::char_type,	114	requires derived_from<_UnCVRef, basic_istream<typename _UnCVRef::char_type,
115	typename _UnCVRef::traits_type>>	115	typename _UnCVRef::traits_type>>
116	_LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Up&& __u) const	116	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Up&& __u) const
117	noexcept(noexcept(basic_istream_view<_Tp, typename _UnCVRef::char_type,	117	noexcept(noexcept(basic_istream_view<_Tp, typename _UnCVRef::char_type,
118	typename _UnCVRef::traits_type>(std::forward<_Up>(__u))))	118	typename _UnCVRef::traits_type>(std::forward<_Up>(__u))))
119	-> decltype( basic_istream_view<_Tp, typename _UnCVRef::char_type,	119	-> decltype( basic_istream_view<_Tp, typename _UnCVRef::char_type,

...	@@ -100,15 +100,15 @@ public:	...	@@ -100,15 +100,15 @@ public:
100		100
101	_LIBCPP_HIDE_FROM_ABI constexpr explicit join_view(_View __base) : __base_(std::move(__base)) {}	101	_LIBCPP_HIDE_FROM_ABI constexpr explicit join_view(_View __base) : __base_(std::move(__base)) {}
102		102
103	_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&	103	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
104	requires copy_constructible<_View>	104	requires copy_constructible<_View>
105	{	105	{
106	return __base_;	106	return __base_;
107	}	107	}
108		108
109	_LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }	109	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
110		110
111	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() {	111	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() {
112	if constexpr (forward_range<_View>) {	112	if constexpr (forward_range<_View>) {
113	constexpr bool __use_const = __simple_view<_View> && is_reference_v<range_reference_t<_View>>;	113	constexpr bool __use_const = __simple_view<_View> && is_reference_v<range_reference_t<_View>>;
114	return __iterator<__use_const>{*this, ranges::begin(__base_)};	114	return __iterator<__use_const>{*this, ranges::begin(__base_)};
...	@@ -119,14 +119,14 @@ public:	...	@@ -119,14 +119,14 @@ public:
119	}	119	}
120		120
121	template <class _V2 = _View>	121	template <class _V2 = _View>
122	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() const	122	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
123	requires forward_range<const _V2> && is_reference_v<range_reference_t<const _V2>> &&	123	requires forward_range<const _V2> && is_reference_v<range_reference_t<const _V2>> &&
124	input_range<range_reference_t<const _V2>>	124	input_range<range_reference_t<const _V2>>
125	{	125	{
126	return __iterator<true>{*this, ranges::begin(__base_)};	126	return __iterator<true>{*this, ranges::begin(__base_)};
127	}	127	}
128		128
129	_LIBCPP_HIDE_FROM_ABI constexpr auto end() {	129	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() {
130	if constexpr (forward_range<_View> && is_reference_v<_InnerRange> && forward_range<_InnerRange> &&	130	if constexpr (forward_range<_View> && is_reference_v<_InnerRange> && forward_range<_InnerRange> &&
131	common_range<_View> && common_range<_InnerRange>)	131	common_range<_View> && common_range<_InnerRange>)
132	return __iterator<__simple_view<_View>>{*this, ranges::end(__base_)};	132	return __iterator<__simple_view<_View>>{*this, ranges::end(__base_)};
...	@@ -135,7 +135,7 @@ public:	...	@@ -135,7 +135,7 @@ public:
135	}	135	}
136		136
137	template <class _V2 = _View>	137	template <class _V2 = _View>
138	_LIBCPP_HIDE_FROM_ABI constexpr auto end() const	138	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
139	requires forward_range<const _V2> && is_reference_v<range_reference_t<const _V2>> &&	139	requires forward_range<const _V2> && is_reference_v<range_reference_t<const _V2>> &&
140	input_range<range_reference_t<const _V2>>	140	input_range<range_reference_t<const _V2>>
141	{	141	{
...	@@ -276,7 +276,7 @@ public:	...	@@ -276,7 +276,7 @@ public:
276	requires _Const && convertible_to<iterator_t<_View>, _Outer> && convertible_to<iterator_t<_InnerRange>, _Inner>	276	requires _Const && convertible_to<iterator_t<_View>, _Outer> && convertible_to<iterator_t<_InnerRange>, _Inner>
277	: __outer_(std::move(__i.__outer_)), __inner_(std::move(__i.__inner_)), __parent_(__i.__parent_) {}	277	: __outer_(std::move(__i.__outer_)), __inner_(std::move(__i.__inner_)), __parent_(__i.__parent_) {}
278		278
279	_LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator() const { return *__inner_; }	279	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr decltype(auto) operator() const { return *__inner_; }
280		280
281	_LIBCPP_HIDE_FROM_ABI constexpr _Inner operator->() const	281	_LIBCPP_HIDE_FROM_ABI constexpr _Inner operator->() const
282	requires __has_arrow<_Inner> && copyable<_Inner>	282	requires __has_arrow<_Inner> && copyable<_Inner>
...	@@ -339,7 +339,7 @@ public:	...	@@ -339,7 +339,7 @@ public:
339	return __x.__outer_ == __y.__outer_ && __x.__inner_ == __y.__inner_;	339	return __x.__outer_ == __y.__outer_ && __x.__inner_ == __y.__inner_;
340	}	340	}
341		341
342	_LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto)	342	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr decltype(auto)
343	iter_move(const __iterator& __i) noexcept(noexcept(ranges::iter_move(*__i.__inner_))) {	343	iter_move(const __iterator& __i) noexcept(noexcept(ranges::iter_move(*__i.__inner_))) {
344	return ranges::iter_move(*__i.__inner_);	344	return ranges::iter_move(*__i.__inner_);
345	}	345	}

...	@@ -46,7 +46,7 @@ namespace ranges {	...	@@ -46,7 +46,7 @@ namespace ranges {
46		46
47	template <view _View, class _Pred>	47	template <view _View, class _Pred>
48	requires input_range<_View> && is_object_v<_Pred> && indirect_unary_predicate<const _Pred, iterator_t<_View>>	48	requires input_range<_View> && is_object_v<_Pred> && indirect_unary_predicate<const _Pred, iterator_t<_View>>
49	class _LIBCPP_ABI_LLVM18_NO_UNIQUE_ADDRESS take_while_view : public view_interface<take_while_view<_View, _Pred>> {	49	class _LIBCPP_LLVM18_NO_UNIQUE_ADDRESS_ABI_TAG take_while_view : public view_interface<take_while_view<_View, _Pred>> {
50	template <bool>	50	template <bool>
51	class __sentinel;	51	class __sentinel;
52		52
...	@@ -58,38 +58,38 @@ public:	...	@@ -58,38 +58,38 @@ public:
58	requires default_initializable<_View> && default_initializable<_Pred>	58	requires default_initializable<_View> && default_initializable<_Pred>
59	= default;	59	= default;
60		60
61	_LIBCPP_HIDE_FROM_ABI constexpr _LIBCPP_EXPLICIT_SINCE_CXX23 take_while_view(_View __base, _Pred __pred)	61	_LIBCPP_HIDE_FROM_ABI constexpr explicit take_while_view(_View __base, _Pred __pred)
62	: __base_(std::move(__base)), __pred_(std::in_place, std::move(__pred)) {}	62	: __base_(std::move(__base)), __pred_(std::in_place, std::move(__pred)) {}
63		63
64	_LIBCPP_HIDE_FROM_ABI constexpr _View base() const&	64	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() const&
65	requires copy_constructible<_View>	65	requires copy_constructible<_View>
66	{	66	{
67	return __base_;	67	return __base_;
68	}	68	}
69		69
70	_LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }	70	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr _View base() && { return std::move(__base_); }
71		71
72	_LIBCPP_HIDE_FROM_ABI constexpr const _Pred& pred() const { return *__pred_; }	72	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr const _Pred& pred() const { return *__pred_; }
73		73
74	_LIBCPP_HIDE_FROM_ABI constexpr auto begin()	74	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin()
75	requires(!__simple_view<_View>)	75	requires(!__simple_view<_View>)
76	{	76	{
77	return ranges::begin(__base_);	77	return ranges::begin(__base_);
78	}	78	}
79		79
80	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() const	80	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
81	requires range<const _View> && indirect_unary_predicate<const _Pred, iterator_t<const _View>>	81	requires range<const _View> && indirect_unary_predicate<const _Pred, iterator_t<const _View>>
82	{	82	{
83	return ranges::begin(__base_);	83	return ranges::begin(__base_);
84	}	84	}
85		85
86	_LIBCPP_HIDE_FROM_ABI constexpr auto end()	86	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end()
87	requires(!__simple_view<_View>)	87	requires(!__simple_view<_View>)
88	{	88	{
89	return __sentinel</_Const=/false>(ranges::end(__base_), std::addressof(*__pred_));	89	return __sentinel</_Const=/false>(ranges::end(__base_), std::addressof(*__pred_));
90	}	90	}
91		91
92	_LIBCPP_HIDE_FROM_ABI constexpr auto end() const	92	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
93	requires range<const _View> && indirect_unary_predicate<const _Pred, iterator_t<const _View>>	93	requires range<const _View> && indirect_unary_predicate<const _Pred, iterator_t<const _View>>
94	{	94	{
95	return __sentinel</_Const=/true>(ranges::end(__base_), std::addressof(*__pred_));	95	return __sentinel</_Const=/true>(ranges::end(__base_), std::addressof(*__pred_));
...	@@ -120,7 +120,7 @@ public:	...	@@ -120,7 +120,7 @@ public:
120	requires _Const && convertible_to<sentinel_t<_View>, sentinel_t<_Base>>	120	requires _Const && convertible_to<sentinel_t<_View>, sentinel_t<_Base>>
121	: __end_(std::move(__s.__end_)), __pred_(__s.__pred_) {}	121	: __end_(std::move(__s.__end_)), __pred_(__s.__pred_) {}
122		122
123	_LIBCPP_HIDE_FROM_ABI constexpr sentinel_t<_Base> base() const { return __end_; }	123	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr sentinel_t<_Base> base() const { return __end_; }
124		124
125	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const iterator_t<_Base>& __x, const __sentinel& __y) {	125	_LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const iterator_t<_Base>& __x, const __sentinel& __y) {
126	return __x == __y.__end_ \|\| !std::invoke(__y.__pred_, __x);	126	return __x == __y.__end_ \|\| !std::invoke(__y.__pred_, __x);

...	@@ -134,19 +134,19 @@ public:	...	@@ -134,19 +134,19 @@ public:
134		134
135	_LIBCPP_HIDE_FROM_ABI constexpr explicit zip_view(_Views... __views) : __views_(std::move(__views)...) {}	135	_LIBCPP_HIDE_FROM_ABI constexpr explicit zip_view(_Views... __views) : __views_(std::move(__views)...) {}
136		136
137	_LIBCPP_HIDE_FROM_ABI constexpr auto begin()	137	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin()
138	requires(!(__simple_view<_Views> && ...))	138	requires(!(__simple_view<_Views> && ...))
139	{	139	{
140	return __iterator<false>(std::__tuple_transform(ranges::begin, __views_));	140	return __iterator<false>(std::__tuple_transform(ranges::begin, __views_));
141	}	141	}
142		142
143	_LIBCPP_HIDE_FROM_ABI constexpr auto begin() const	143	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto begin() const
144	requires(range<const _Views> && ...)	144	requires(range<const _Views> && ...)
145	{	145	{
146	return __iterator<true>(std::__tuple_transform(ranges::begin, __views_));	146	return __iterator<true>(std::__tuple_transform(ranges::begin, __views_));
147	}	147	}
148		148
149	_LIBCPP_HIDE_FROM_ABI constexpr auto end()	149	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end()
150	requires(!(__simple_view<_Views> && ...))	150	requires(!(__simple_view<_Views> && ...))
151	{	151	{
152	if constexpr (!__zip_is_common<_Views...>) {	152	if constexpr (!__zip_is_common<_Views...>) {
...	@@ -158,7 +158,7 @@ public:	...	@@ -158,7 +158,7 @@ public:
158	}	158	}
159	}	159	}
160		160
161	_LIBCPP_HIDE_FROM_ABI constexpr auto end() const	161	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto end() const
162	requires(range<const _Views> && ...)	162	requires(range<const _Views> && ...)
163	{	163	{
164	if constexpr (!__zip_is_common<const _Views...>) {	164	if constexpr (!__zip_is_common<const _Views...>) {
...	@@ -170,7 +170,7 @@ public:	...	@@ -170,7 +170,7 @@ public:
170	}	170	}
171	}	171	}
172		172
173	_LIBCPP_HIDE_FROM_ABI constexpr auto size()	173	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size()
174	requires(sized_range<_Views> && ...)	174	requires(sized_range<_Views> && ...)
175	{	175	{
176	return std::apply(	176	return std::apply(
...	@@ -181,7 +181,7 @@ public:	...	@@ -181,7 +181,7 @@ public:
181	std::__tuple_transform(ranges::size, __views_));	181	std::__tuple_transform(ranges::size, __views_));
182	}	182	}
183		183
184	_LIBCPP_HIDE_FROM_ABI constexpr auto size() const	184	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto size() const
185	requires(sized_range<const _Views> && ...)	185	requires(sized_range<const _Views> && ...)
186	{	186	{
187	return std::apply(	187	return std::apply(
...	@@ -267,7 +267,7 @@ public:	...	@@ -267,7 +267,7 @@ public:
267	requires _Const && (convertible_to<iterator_t<_Views>, iterator_t<__maybe_const<_Const, _Views>>> && ...)	267	requires _Const && (convertible_to<iterator_t<_Views>, iterator_t<__maybe_const<_Const, _Views>>> && ...)
268	: __current_(std::move(__i.__current_)) {}	268	: __current_(std::move(__i.__current_)) {}
269		269
270	_LIBCPP_HIDE_FROM_ABI constexpr auto operator*() const {	270	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator*() const {
271	return std::__tuple_transform([](auto& __i) -> decltype(auto) { return *__i; }, __current_);	271	return std::__tuple_transform([](auto& __i) -> decltype(auto) { return *__i; }, __current_);
272	}	272	}
273		273
...	@@ -315,7 +315,7 @@ public:	...	@@ -315,7 +315,7 @@ public:
315	return *this;	315	return *this;
316	}	316	}
317		317
318	_LIBCPP_HIDE_FROM_ABI constexpr auto operator[](difference_type __n) const	318	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator[](difference_type __n) const
319	requires __zip_all_random_access<_Const, _Views...>	319	requires __zip_all_random_access<_Const, _Views...>
320	{	320	{
321	return std::__tuple_transform(	321	return std::__tuple_transform(
...	@@ -338,7 +338,7 @@ public:	...	@@ -338,7 +338,7 @@ public:
338	return __x.__current_ <=> __y.__current_;	338	return __x.__current_ <=> __y.__current_;
339	}	339	}
340		340
341	_LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n)	341	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(const __iterator& __i, difference_type __n)
342	requires __zip_all_random_access<_Const, _Views...>	342	requires __zip_all_random_access<_Const, _Views...>
343	{	343	{
344	auto __r = __i;	344	auto __r = __i;
...	@@ -346,13 +346,13 @@ public:	...	@@ -346,13 +346,13 @@ public:
346	return __r;	346	return __r;
347	}	347	}
348		348
349	_LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i)	349	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator+(difference_type __n, const __iterator& __i)
350	requires __zip_all_random_access<_Const, _Views...>	350	requires __zip_all_random_access<_Const, _Views...>
351	{	351	{
352	return __i + __n;	352	return __i + __n;
353	}	353	}
354		354
355	_LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n)	355	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr __iterator operator-(const __iterator& __i, difference_type __n)
356	requires __zip_all_random_access<_Const, _Views...>	356	requires __zip_all_random_access<_Const, _Views...>
357	{	357	{
358	auto __r = __i;	358	auto __r = __i;
...	@@ -360,7 +360,8 @@ public:	...	@@ -360,7 +360,8 @@ public:
360	return __r;	360	return __r;
361	}	361	}
362		362
363	_LIBCPP_HIDE_FROM_ABI friend constexpr difference_type operator-(const __iterator& __x, const __iterator& __y)	363	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr difference_type
		364	operator-(const __iterator& __x, const __iterator& __y)
364	requires(sized_sentinel_for<iterator_t<__maybe_const<_Const, _Views>>, iterator_t<__maybe_const<_Const, _Views>>> &&	365	requires(sized_sentinel_for<iterator_t<__maybe_const<_Const, _Views>>, iterator_t<__maybe_const<_Const, _Views>>> &&
365	...)	366	...)
366	{	367	{
...	@@ -374,7 +375,7 @@ public:	...	@@ -374,7 +375,7 @@ public:
374	__diffs);	375	__diffs);
375	}	376	}
376		377
377	_LIBCPP_HIDE_FROM_ABI friend constexpr auto iter_move(const __iterator& __i) noexcept(	378	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI friend constexpr auto iter_move(const __iterator& __i) noexcept(
378	(noexcept(ranges::iter_move(std::declval<const iterator_t<__maybe_const<_Const, _Views>>&>())) && ...) &&	379	(noexcept(ranges::iter_move(std::declval<const iterator_t<__maybe_const<_Const, _Views>>&>())) && ...) &&
379	(is_nothrow_move_constructible_v<range_rvalue_reference_t<__maybe_const<_Const, _Views>>> && ...)) {	380	(is_nothrow_move_constructible_v<range_rvalue_reference_t<__maybe_const<_Const, _Views>>> && ...)) {
380	return std::__tuple_transform(ranges::iter_move, __i.__current_);	381	return std::__tuple_transform(ranges::iter_move, __i.__current_);
...	@@ -426,6 +427,7 @@ public:	...	@@ -426,6 +427,7 @@ public:
426	requires(	427	requires(
427	sized_sentinel_for<sentinel_t<__maybe_const<_Const, _Views>>, iterator_t<__maybe_const<_OtherConst, _Views>>> &&	428	sized_sentinel_for<sentinel_t<__maybe_const<_Const, _Views>>, iterator_t<__maybe_const<_OtherConst, _Views>>> &&
428	...)	429	...)
		430	[[nodiscard]]
429	_LIBCPP_HIDE_FROM_ABI friend constexpr common_type_t<range_difference_t<__maybe_const<_OtherConst, _Views>>...>	431	_LIBCPP_HIDE_FROM_ABI friend constexpr common_type_t<range_difference_t<__maybe_const<_OtherConst, _Views>>...>
430	operator-(const __iterator<_OtherConst>& __x, const __sentinel& __y) {	432	operator-(const __iterator<_OtherConst>& __x, const __sentinel& __y) {
431	const auto __diffs = ranges::__tuple_zip_transform(minus<>(), __iter_current(__x), __y.__end_);	433	const auto __diffs = ranges::__tuple_zip_transform(minus<>(), __iter_current(__x), __y.__end_);
...	@@ -443,6 +445,7 @@ public:	...	@@ -443,6 +445,7 @@ public:
443	requires(	445	requires(
444	sized_sentinel_for<sentinel_t<__maybe_const<_Const, _Views>>, iterator_t<__maybe_const<_OtherConst, _Views>>> &&	446	sized_sentinel_for<sentinel_t<__maybe_const<_Const, _Views>>, iterator_t<__maybe_const<_OtherConst, _Views>>> &&
445	...)	447	...)
		448	[[nodiscard]]
446	_LIBCPP_HIDE_FROM_ABI friend constexpr common_type_t<range_difference_t<__maybe_const<_OtherConst, _Views>>...>	449	_LIBCPP_HIDE_FROM_ABI friend constexpr common_type_t<range_difference_t<__maybe_const<_OtherConst, _Views>>...>
447	operator-(const __sentinel& __y, const __iterator<_OtherConst>& __x) {	450	operator-(const __sentinel& __y, const __iterator<_OtherConst>& __x) {
448	return -(__x - __y);	451	return -(__x - __y);
...	@@ -456,10 +459,10 @@ namespace views {	...	@@ -456,10 +459,10 @@ namespace views {
456	namespace __zip {	459	namespace __zip {
457		460
458	struct __fn {	461	struct __fn {
459	_LIBCPP_HIDE_FROM_ABI static constexpr auto operator()() noexcept { return empty_view<tuple<>>{}; }	462	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto operator()() noexcept { return empty_view<tuple<>>{}; }
460		463
461	template <class... _Ranges>	464	template <class... _Ranges>
462	_LIBCPP_HIDE_FROM_ABI static constexpr auto	465	[[nodiscard]] _LIBCPP_HIDE_FROM_ABI static constexpr auto
463	operator()(_Ranges&&... __rs) noexcept(noexcept(zip_view<all_t<_Ranges&&>...>(std::forward<_Ranges>(__rs)...)))	466	operator()(_Ranges&&... __rs) noexcept(noexcept(zip_view<all_t<_Ranges&&>...>(std::forward<_Ranges>(__rs)...)))
464	-> decltype(zip_view<all_t<_Ranges&&>...>(std::forward<_Ranges>(__rs)...)) {	467	-> decltype(zip_view<all_t<_Ranges&&>...>(std::forward<_Ranges>(__rs)...)) {
465	return zip_view<all_t<_Ranges>...>(std::forward<_Ranges>(__rs)...);	468	return zip_view<all_t<_Ranges>...>(std::forward<_Ranges>(__rs)...);

...	@@ -10,7 +10,7 @@	...	@@ -10,7 +10,7 @@
10		10
11	#include "include/llvm-libc-macros/stdfix-macros.h"	11	#include "include/llvm-libc-macros/stdfix-macros.h"
12	#include "src/__support/CPP/type_traits/bool_constant.h"	12	#include "src/__support/CPP/type_traits/bool_constant.h"
13	#include "src/__support/CPP/type_traits/is_arithmetic.h"	13	#include "src/__support/CPP/type_traits/is_integral.h"
14	#include "src/__support/CPP/type_traits/is_same.h"	14	#include "src/__support/CPP/type_traits/is_same.h"
15	#include "src/__support/CPP/type_traits/remove_cv.h"	15	#include "src/__support/CPP/type_traits/remove_cv.h"
16	#include "src/__support/macros/attributes.h"	16	#include "src/__support/macros/attributes.h"
...	@@ -23,7 +23,7 @@ namespace cpp {	...	@@ -23,7 +23,7 @@ namespace cpp {
23		23
24	#ifndef LIBC_COMPILER_HAS_FIXED_POINT	24	#ifndef LIBC_COMPILER_HAS_FIXED_POINT
25	template <typename T>	25	template <typename T>
26	struct is_unsigned : bool_constant<(is_arithmetic_v<T> && (T(-1) > T(0)))> {	26	struct is_unsigned : bool_constant<(is_integral_v<T> && (T(-1) > T(0)))> {
27	LIBC_INLINE constexpr operator bool() const { return is_unsigned::value; }	27	LIBC_INLINE constexpr operator bool() const { return is_unsigned::value; }
28	LIBC_INLINE constexpr bool operator()() const { return is_unsigned::value; }	28	LIBC_INLINE constexpr bool operator()() const { return is_unsigned::value; }
29	};	29	};
...	@@ -37,7 +37,7 @@ private:	...	@@ -37,7 +37,7 @@ private:
37		37
38	public:	38	public:
39	LIBC_INLINE_VAR static constexpr bool value =	39	LIBC_INLINE_VAR static constexpr bool value =
40	(is_arithmetic_v<T> && (T(-1) > T(0))) \|\|	40	(is_integral_v<T> && (T(-1) > T(0))) \|\|
41	__is_unqualified_any_of<T, unsigned short fract, unsigned fract,	41	__is_unqualified_any_of<T, unsigned short fract, unsigned fract,
42	unsigned long fract, unsigned short accum,	42	unsigned long fract, unsigned short accum,
43	unsigned accum, unsigned long accum,	43	unsigned accum, unsigned long accum,

...	@@ -124,7 +124,7 @@ eisel_lemire(ExpandedFloat<T> init_num,	...	@@ -124,7 +124,7 @@ eisel_lemire(ExpandedFloat<T> init_num,
124	// Wider Approximation	124	// Wider Approximation
125	UInt128 final_approx;	125	UInt128 final_approx;
126	// The halfway constant is used to check if the bits that will be shifted away	126	// The halfway constant is used to check if the bits that will be shifted away
127	// intially are all 1. For doubles this is 64 (bitstype size) - 52 (final	127	// initially are all 1. For doubles this is 64 (bitstype size) - 52 (final
128	// mantissa size) - 3 (we shift away the last two bits separately for	128	// mantissa size) - 3 (we shift away the last two bits separately for
129	// accuracy, and the most significant bit is ignored.) = 9 bits. Similarly,	129	// accuracy, and the most significant bit is ignored.) = 9 bits. Similarly,
130	// it's 6 bits for floats in this case.	130	// it's 6 bits for floats in this case.
...	@@ -262,7 +262,7 @@ eisel_lemire<long double>(ExpandedFloat<long double> init_num,	...	@@ -262,7 +262,7 @@ eisel_lemire<long double>(ExpandedFloat<long double> init_num,
262	(final_approx_lower < approx_lower ? 1 : 0);	262	(final_approx_lower < approx_lower ? 1 : 0);
263		263
264	// The halfway constant is used to check if the bits that will be shifted away	264	// The halfway constant is used to check if the bits that will be shifted away
265	// intially are all 1. For 80 bit floats this is 128 (bitstype size) - 64	265	// initially are all 1. For 80 bit floats this is 128 (bitstype size) - 64
266	// (final mantissa size) - 3 (we shift away the last two bits separately for	266	// (final mantissa size) - 3 (we shift away the last two bits separately for
267	// accuracy, and the most significant bit is ignored.) = 61 bits. Similarly,	267	// accuracy, and the most significant bit is ignored.) = 61 bits. Similarly,
268	// it's 12 bits for 128 bit floats in this case.	268	// it's 12 bits for 128 bit floats in this case.
...	@@ -680,17 +680,15 @@ template <> LIBC_INLINE constexpr int32_t get_lower_bound<double>() {	...	@@ -680,17 +680,15 @@ template <> LIBC_INLINE constexpr int32_t get_lower_bound<double>() {
680	// accuracy.	680	// accuracy.
681	template <typename T, typename CharType>	681	template <typename T, typename CharType>
682	LIBC_INLINE FloatConvertReturn<T> decimal_exp_to_float(	682	LIBC_INLINE FloatConvertReturn<T> decimal_exp_to_float(
683	ExpandedFloat<T> init_num, bool truncated, RoundDirection round,	683	ExpandedFloat<T> init_num, [[maybe_unused]] bool truncated,
684	const CharType *__restrict numStart,	684	RoundDirection round, const CharType *__restrict numStart,
685	const size_t num_len = cpp::numeric_limits<size_t>::max()) {	685	const size_t num_len = cpp::numeric_limits<size_t>::max()) {
686	using FPBits = typename fputil::FPBits<T>;	686	using FPBits = typename fputil::FPBits<T>;
687	using StorageType = typename FPBits::StorageType;
688		687
689	StorageType mantissa = init_num.mantissa;
690	int32_t exp10 = init_num.exponent;	688	int32_t exp10 = init_num.exponent;
691		689
692	FloatConvertReturn<T> output;	690	FloatConvertReturn<T> output;
693	cpp::optional<ExpandedFloat<T>> opt_output;	691	[[maybe_unused]] cpp::optional<ExpandedFloat<T>> opt_output;
694		692
695	// If the exponent is too large and can't be represented in this size of	693	// If the exponent is too large and can't be represented in this size of
696	// float, return inf. These bounds are relatively loose, but are mostly	694	// float, return inf. These bounds are relatively loose, but are mostly
...	@@ -725,6 +723,8 @@ LIBC_INLINE FloatConvertReturn<T> decimal_exp_to_float(	...	@@ -725,6 +723,8 @@ LIBC_INLINE FloatConvertReturn<T> decimal_exp_to_float(
725		723
726	#ifndef LIBC_COPT_STRTOFLOAT_DISABLE_EISEL_LEMIRE	724	#ifndef LIBC_COPT_STRTOFLOAT_DISABLE_EISEL_LEMIRE
727	// Try Eisel-Lemire	725	// Try Eisel-Lemire
		726	using StorageType = typename FPBits::StorageType;
		727	StorageType mantissa = init_num.mantissa;
728	opt_output = eisel_lemire<T>(init_num, round);	728	opt_output = eisel_lemire<T>(init_num, round);
729	if (opt_output.has_value()) {	729	if (opt_output.has_value()) {
730	if (!truncated) {	730	if (!truncated) {
...	@@ -1093,7 +1093,7 @@ hexadecimal_string_to_float(const CharType *__restrict src,	...	@@ -1093,7 +1093,7 @@ hexadecimal_string_to_float(const CharType *__restrict src,
1093	}	1093	}
1094		1094
1095	template <typename T, typename CharType>	1095	template <typename T, typename CharType>
1096	LIBC_INLINE typename fputil::FPBits<T>::StorageType	1096	LIBC_INLINE constexpr typename fputil::FPBits<T>::StorageType
1097	nan_mantissa_from_ncharseq(const CharType *str, size_t len) {	1097	nan_mantissa_from_ncharseq(const CharType *str, size_t len) {
1098	using FPBits = typename fputil::FPBits<T>;	1098	using FPBits = typename fputil::FPBits<T>;
1099	using StorageType = typename FPBits::StorageType;	1099	using StorageType = typename FPBits::StorageType;
...	@@ -1129,7 +1129,9 @@ strtofloatingpoint(const CharType *__restrict src) {	...	@@ -1129,7 +1129,9 @@ strtofloatingpoint(const CharType *__restrict src) {
1129		1129
1130	size_t index = first_non_whitespace(src);	1130	size_t index = first_non_whitespace(src);
1131	int sign = get_sign(src + index);	1131	int sign = get_sign(src + index);
		1132	#ifndef LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
1132	bool is_positive = (sign >= 0);	1133	bool is_positive = (sign >= 0);
		1134	#endif
1133	index += (sign != 0);	1135	index += (sign != 0);
1134		1136
1135	if (sign < 0) {	1137	if (sign < 0) {
...	@@ -1146,6 +1148,7 @@ strtofloatingpoint(const CharType *__restrict src) {	...	@@ -1146,6 +1148,7 @@ strtofloatingpoint(const CharType *__restrict src) {
1146	}	1148	}
1147		1149
1148	RoundDirection round_direction = RoundDirection::Nearest;	1150	RoundDirection round_direction = RoundDirection::Nearest;
		1151	#ifndef LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
1149	switch (fputil::quick_get_round()) {	1152	switch (fputil::quick_get_round()) {
1150	case FE_TONEAREST:	1153	case FE_TONEAREST:
1151	round_direction = RoundDirection::Nearest;	1154	round_direction = RoundDirection::Nearest;
...	@@ -1160,6 +1163,7 @@ strtofloatingpoint(const CharType *__restrict src) {	...	@@ -1160,6 +1163,7 @@ strtofloatingpoint(const CharType *__restrict src) {
1160	round_direction = RoundDirection::Down;	1163	round_direction = RoundDirection::Down;
1161	break;	1164	break;
1162	}	1165	}
		1166	#endif // LIBC_MATH_HAS_ASSUME_ROUND_NEAREST_ONLY
1163		1167
1164	StrToNumResult<ExpandedFloat<T>> parse_result({0, 0});	1168	StrToNumResult<ExpandedFloat<T>> parse_result({0, 0});
1165	if (base == 16) {	1169	if (base == 16) {
...	@@ -1221,7 +1225,8 @@ strtofloatingpoint(const CharType *__restrict src) {	...	@@ -1221,7 +1225,8 @@ strtofloatingpoint(const CharType *__restrict src) {
1221	return {result.get_val(), static_cast<ptrdiff_t>(index), error};	1225	return {result.get_val(), static_cast<ptrdiff_t>(index), error};
1222	}	1226	}
1223		1227
1224	template <class T> LIBC_INLINE StrToNumResult<T> strtonan(const char *arg) {	1228	template <class T>
		1229	LIBC_INLINE constexpr StrToNumResult<T> strtonan(const char *arg) {
1225	using FPBits = typename fputil::FPBits<T>;	1230	using FPBits = typename fputil::FPBits<T>;
1226	using StorageType = typename FPBits::StorageType;	1231	using StorageType = typename FPBits::StorageType;
1227		1232

...	@@ -50,7 +50,7 @@ OVERRIDABLE_FUNCTION void* operator new(std::size_t size) _THROW_BAD_ALLOC {	...	@@ -50,7 +50,7 @@ OVERRIDABLE_FUNCTION void* operator new(std::size_t size) _THROW_BAD_ALLOC {
50	return p;	50	return p;
51	}	51	}
52		52
53	_LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept {	53	[[gnu::weak]] void* operator new(size_t size, const std::nothrow_t&) noexcept {
54	# if !_LIBCPP_HAS_EXCEPTIONS	54	# if !_LIBCPP_HAS_EXCEPTIONS
55	# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION	55	# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
56	_LIBCPP_ASSERT_SHIM(	56	_LIBCPP_ASSERT_SHIM(
...	@@ -76,7 +76,7 @@ _LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept {	...	@@ -76,7 +76,7 @@ _LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept {
76		76
77	OVERRIDABLE_FUNCTION void* operator new[](size_t size) _THROW_BAD_ALLOC { return ::operator new(size); }	77	OVERRIDABLE_FUNCTION void* operator new[](size_t size) _THROW_BAD_ALLOC { return ::operator new(size); }
78		78
79	_LIBCPP_WEAK void* operator new[](size_t size, const std::nothrow_t&) noexcept {	79	[[gnu::weak]] void* operator new[](size_t size, const std::nothrow_t&) noexcept {
80	# if !_LIBCPP_HAS_EXCEPTIONS	80	# if !_LIBCPP_HAS_EXCEPTIONS
81	# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION	81	# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
82	_LIBCPP_ASSERT_SHIM(	82	_LIBCPP_ASSERT_SHIM(
...	@@ -100,17 +100,17 @@ _LIBCPP_WEAK void* operator new[](size_t size, const std::nothrow_t&) noexcept {	...	@@ -100,17 +100,17 @@ _LIBCPP_WEAK void* operator new[](size_t size, const std::nothrow_t&) noexcept {
100	# endif	100	# endif
101	}	101	}
102		102
103	_LIBCPP_WEAK void operator delete(void* ptr) noexcept { std::free(ptr); }	103	[[gnu::weak]] void operator delete(void* ptr) noexcept { std::free(ptr); }
104		104
105	_LIBCPP_WEAK void operator delete(void* ptr, const std::nothrow_t&) noexcept { ::operator delete(ptr); }	105	[[gnu::weak]] void operator delete(void* ptr, const std::nothrow_t&) noexcept { ::operator delete(ptr); }
106		106
107	_LIBCPP_WEAK void operator delete(void* ptr, size_t) noexcept { ::operator delete(ptr); }	107	[[gnu::weak]] void operator delete(void* ptr, size_t) noexcept { ::operator delete(ptr); }
108		108
109	_LIBCPP_WEAK void operator delete[](void* ptr) noexcept { ::operator delete(ptr); }	109	[[gnu::weak]] void operator delete[](void* ptr) noexcept { ::operator delete(ptr); }
110		110
111	_LIBCPP_WEAK void operator delete[](void* ptr, const std::nothrow_t&) noexcept { ::operator delete[](ptr); }	111	[[gnu::weak]] void operator delete[](void* ptr, const std::nothrow_t&) noexcept { ::operator delete[](ptr); }
112		112
113	_LIBCPP_WEAK void operator delete[](void* ptr, size_t) noexcept { ::operator delete[](ptr); }	113	[[gnu::weak]] void operator delete[](void* ptr, size_t) noexcept { ::operator delete[](ptr); }
114		114
115	# if _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION	115	# if _LIBCPP_HAS_LIBRARY_ALIGNED_ALLOCATION
116		116
...	@@ -141,7 +141,7 @@ OVERRIDABLE_FUNCTION void* operator new(std::size_t size, std::align_val_t align	...	@@ -141,7 +141,7 @@ OVERRIDABLE_FUNCTION void* operator new(std::size_t size, std::align_val_t align
141	return p;	141	return p;
142	}	142	}
143		143
144	_LIBCPP_WEAK void* operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {	144	[[gnu::weak]] void* operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
145	# if !_LIBCPP_HAS_EXCEPTIONS	145	# if !_LIBCPP_HAS_EXCEPTIONS
146	# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION	146	# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
147	_LIBCPP_ASSERT_SHIM(	147	_LIBCPP_ASSERT_SHIM(
...	@@ -169,7 +169,7 @@ OVERRIDABLE_FUNCTION void* operator new[](size_t size, std::align_val_t alignmen	...	@@ -169,7 +169,7 @@ OVERRIDABLE_FUNCTION void* operator new[](size_t size, std::align_val_t alignmen
169	return ::operator new(size, alignment);	169	return ::operator new(size, alignment);
170	}	170	}
171		171
172	_LIBCPP_WEAK void* operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {	172	[[gnu::weak]] void* operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept {
173	# if !_LIBCPP_HAS_EXCEPTIONS	173	# if !_LIBCPP_HAS_EXCEPTIONS
174	# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION	174	# if _LIBCPP_CAN_DETECT_OVERRIDDEN_FUNCTION
175	_LIBCPP_ASSERT_SHIM(	175	_LIBCPP_ASSERT_SHIM(
...	@@ -193,25 +193,25 @@ _LIBCPP_WEAK void* operator new[](size_t size, std::align_val_t alignment, const	...	@@ -193,25 +193,25 @@ _LIBCPP_WEAK void* operator new[](size_t size, std::align_val_t alignment, const
193	# endif	193	# endif
194	}	194	}
195		195
196	_LIBCPP_WEAK void operator delete(void* ptr, std::align_val_t) noexcept { std::__libcpp_aligned_free(ptr); }	196	[[gnu::weak]] void operator delete(void* ptr, std::align_val_t) noexcept { std::__libcpp_aligned_free(ptr); }
197		197
198	_LIBCPP_WEAK void operator delete(void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept {	198	[[gnu::weak]] void operator delete(void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept {
199	::operator delete(ptr, alignment);	199	::operator delete(ptr, alignment);
200	}	200	}
201		201
202	_LIBCPP_WEAK void operator delete(void* ptr, size_t, std::align_val_t alignment) noexcept {	202	[[gnu::weak]] void operator delete(void* ptr, size_t, std::align_val_t alignment) noexcept {
203	::operator delete(ptr, alignment);	203	::operator delete(ptr, alignment);
204	}	204	}
205		205
206	_LIBCPP_WEAK void operator delete[](void* ptr, std::align_val_t alignment) noexcept {	206	[[gnu::weak]] void operator delete[](void* ptr, std::align_val_t alignment) noexcept {
207	::operator delete(ptr, alignment);	207	::operator delete(ptr, alignment);
208	}	208	}
209		209
210	_LIBCPP_WEAK void operator delete[](void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept {	210	[[gnu::weak]] void operator delete[](void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept {
211	::operator delete[](ptr, alignment);	211	::operator delete[](ptr, alignment);
212	}	212	}
213		213
214	_LIBCPP_WEAK void operator delete[](void* ptr, size_t, std::align_val_t alignment) noexcept {	214	[[gnu::weak]] void operator delete[](void* ptr, size_t, std::align_val_t alignment) noexcept {
215	::operator delete[](ptr, alignment);	215	::operator delete[](ptr, alignment);
216	}	216	}
217		217

...	@@ -201,6 +201,9 @@ SANITIZER_WEAK_IMPORT void *aligned_alloc(__sanitizer::usize __alignment,	...	@@ -201,6 +201,9 @@ SANITIZER_WEAK_IMPORT void *aligned_alloc(__sanitizer::usize __alignment,
201		201
202	#define SANITIZER_INTERCEPT_READ SI_POSIX	202	#define SANITIZER_INTERCEPT_READ SI_POSIX
203	#define SANITIZER_INTERCEPT_PREAD SI_POSIX	203	#define SANITIZER_INTERCEPT_PREAD SI_POSIX
		204	#define SANITIZER_INTERCEPT___READ_CHK SI_GLIBC
		205	#define SANITIZER_INTERCEPT___PREAD_CHK SI_GLIBC
		206	#define SANITIZER_INTERCEPT___PREAD64_CHK SI_GLIBC
204	#define SANITIZER_INTERCEPT_WRITE SI_POSIX	207	#define SANITIZER_INTERCEPT_WRITE SI_POSIX
205	#define SANITIZER_INTERCEPT_PWRITE SI_POSIX	208	#define SANITIZER_INTERCEPT_PWRITE SI_POSIX
206		209
...	@@ -393,6 +396,8 @@ SANITIZER_WEAK_IMPORT void *aligned_alloc(__sanitizer::usize __alignment,	...	@@ -393,6 +396,8 @@ SANITIZER_WEAK_IMPORT void *aligned_alloc(__sanitizer::usize __alignment,
393	#define SANITIZER_INTERCEPT_SHMCTL \	396	#define SANITIZER_INTERCEPT_SHMCTL \
394	(((SI_FREEBSD \|\| SI_LINUX_NOT_ANDROID) && SANITIZER_WORDSIZE == 64) \|\| \	397	(((SI_FREEBSD \|\| SI_LINUX_NOT_ANDROID) && SANITIZER_WORDSIZE == 64) \|\| \
395	SI_NETBSD \|\| SI_SOLARIS)	398	SI_NETBSD \|\| SI_SOLARIS)
		399	// shmat calls REAL(shmctl), so it requires shmctl interception.
		400	#define SANITIZER_INTERCEPT_SHMAT SANITIZER_INTERCEPT_SHMCTL
396	#define SANITIZER_INTERCEPT_RANDOM_R SI_GLIBC	401	#define SANITIZER_INTERCEPT_RANDOM_R SI_GLIBC
397	#define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX	402	#define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX
398	#define SANITIZER_INTERCEPT_PTHREAD_ATTR_GETINHERITSCHED \	403	#define SANITIZER_INTERCEPT_PTHREAD_ATTR_GETINHERITSCHED \
...	@@ -545,7 +550,7 @@ SANITIZER_WEAK_IMPORT void *aligned_alloc(__sanitizer::usize __alignment,	...	@@ -545,7 +550,7 @@ SANITIZER_WEAK_IMPORT void *aligned_alloc(__sanitizer::usize __alignment,
545	#define SANITIZER_INTERCEPT___LIBC_MEMALIGN SI_GLIBC	550	#define SANITIZER_INTERCEPT___LIBC_MEMALIGN SI_GLIBC
546	#define SANITIZER_INTERCEPT_PVALLOC (SI_GLIBC \|\| SI_ANDROID)	551	#define SANITIZER_INTERCEPT_PVALLOC (SI_GLIBC \|\| SI_ANDROID)
547	#define SANITIZER_INTERCEPT_CFREE (SI_GLIBC && !SANITIZER_RISCV64)	552	#define SANITIZER_INTERCEPT_CFREE (SI_GLIBC && !SANITIZER_RISCV64)
548	#define SANITIZER_INTERCEPT_REALLOCARRAY SI_POSIX	553	#define SANITIZER_INTERCEPT_REALLOCARRAY (SI_POSIX \|\| SI_FUCHSIA)
549	#define SANITIZER_INTERCEPT_ALIGNED_ALLOC \	554	#define SANITIZER_INTERCEPT_ALIGNED_ALLOC \
550	(!SI_MAC \|\| SI_MAC_SDK_10_15_AVAILABLE)	555	(!SI_MAC \|\| SI_MAC_SDK_10_15_AVAILABLE)
551	#define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_NETBSD)	556	#define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC && !SI_NETBSD)

...	@@ -34,6 +34,7 @@	...	@@ -34,6 +34,7 @@
34	#if SANITIZER_APPLE && !SANITIZER_GO	34	#if SANITIZER_APPLE && !SANITIZER_GO
35	# include "tsan_flags.h"	35	# include "tsan_flags.h"
36	#endif	36	#endif
		37	#include "tsan_adaptive_delay.h"
37	#include "tsan_interceptors.h"	38	#include "tsan_interceptors.h"
38	#include "tsan_interface.h"	39	#include "tsan_interface.h"
39	#include "tsan_mman.h"	40	#include "tsan_mman.h"
...	@@ -1065,6 +1066,9 @@ extern "C" void __tsan_thread_start_func(void arg) {	...	@@ -1065,6 +1066,9 @@ extern "C" void __tsan_thread_start_func(void arg) {
1065	ThreadStart(thr, p->tid, GetTid(), ThreadType::Regular);	1066	ThreadStart(thr, p->tid, GetTid(), ThreadType::Regular);
1066	p->started.Post();	1067	p->started.Post();
1067	}	1068	}
		1069
		1070	AdaptiveDelay::BeforeChildThreadRuns();
		1071
1068	void *res = callback(param);	1072	void *res = callback(param);
1069	// Prevent the callback from being tail called,	1073	// Prevent the callback from being tail called,
1070	// it mixes up stack traces.	1074	// it mixes up stack traces.
...	@@ -1128,6 +1132,7 @@ TSAN_INTERCEPTOR(int, pthread_create,	...	@@ -1128,6 +1132,7 @@ TSAN_INTERCEPTOR(int, pthread_create,
1128	}	1132	}
1129	if (attr == &myattr)	1133	if (attr == &myattr)
1130	pthread_attr_destroy(&myattr);	1134	pthread_attr_destroy(&myattr);
		1135	AdaptiveDelay::AfterThreadCreation();
1131	return res;	1136	return res;
1132	}	1137	}
1133		1138
...	@@ -1423,6 +1428,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_destroy, void *m) {	...	@@ -1423,6 +1428,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_destroy, void *m) {
1423	TSAN_INTERCEPTOR(int, pthread_mutex_lock, void *m) {	1428	TSAN_INTERCEPTOR(int, pthread_mutex_lock, void *m) {
1424	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_lock, m);	1429	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_lock, m);
1425	MutexPreLock(thr, pc, (uptr)m);	1430	MutexPreLock(thr, pc, (uptr)m);
		1431	AdaptiveDelay::SyncOp();
1426	int res = BLOCK_REAL(pthread_mutex_lock)(m);	1432	int res = BLOCK_REAL(pthread_mutex_lock)(m);
1427	if (res == errno_EOWNERDEAD)	1433	if (res == errno_EOWNERDEAD)
1428	MutexRepair(thr, pc, (uptr)m);	1434	MutexRepair(thr, pc, (uptr)m);
...	@@ -1435,6 +1441,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_lock, void *m) {	...	@@ -1435,6 +1441,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_lock, void *m) {
1435		1441
1436	TSAN_INTERCEPTOR(int, pthread_mutex_trylock, void *m) {	1442	TSAN_INTERCEPTOR(int, pthread_mutex_trylock, void *m) {
1437	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_trylock, m);	1443	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_trylock, m);
		1444	AdaptiveDelay::SyncOp();
1438	int res = REAL(pthread_mutex_trylock)(m);	1445	int res = REAL(pthread_mutex_trylock)(m);
1439	if (res == errno_EOWNERDEAD)	1446	if (res == errno_EOWNERDEAD)
1440	MutexRepair(thr, pc, (uptr)m);	1447	MutexRepair(thr, pc, (uptr)m);
...	@@ -1446,6 +1453,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_trylock, void *m) {	...	@@ -1446,6 +1453,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_trylock, void *m) {
1446	#if !SANITIZER_APPLE	1453	#if !SANITIZER_APPLE
1447	TSAN_INTERCEPTOR(int, pthread_mutex_timedlock, void m, void abstime) {	1454	TSAN_INTERCEPTOR(int, pthread_mutex_timedlock, void m, void abstime) {
1448	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_timedlock, m, abstime);	1455	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_timedlock, m, abstime);
		1456	AdaptiveDelay::SyncOp();
1449	int res = REAL(pthread_mutex_timedlock)(m, abstime);	1457	int res = REAL(pthread_mutex_timedlock)(m, abstime);
1450	if (res == 0) {	1458	if (res == 0) {
1451	MutexPostLock(thr, pc, (uptr)m, MutexFlagTryLock);	1459	MutexPostLock(thr, pc, (uptr)m, MutexFlagTryLock);
...	@@ -1458,6 +1466,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_unlock, void *m) {	...	@@ -1458,6 +1466,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_unlock, void *m) {
1458	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_unlock, m);	1466	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_unlock, m);
1459	MutexUnlock(thr, pc, (uptr)m);	1467	MutexUnlock(thr, pc, (uptr)m);
1460	int res = REAL(pthread_mutex_unlock)(m);	1468	int res = REAL(pthread_mutex_unlock)(m);
		1469	AdaptiveDelay::SyncOp();
1461	if (res == errno_EINVAL)	1470	if (res == errno_EINVAL)
1462	MutexInvalidAccess(thr, pc, (uptr)m);	1471	MutexInvalidAccess(thr, pc, (uptr)m);
1463	return res;	1472	return res;
...	@@ -1468,6 +1477,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_clocklock, void *m,	...	@@ -1468,6 +1477,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_clocklock, void *m,
1468	__sanitizer_clockid_t clock, void *abstime) {	1477	__sanitizer_clockid_t clock, void *abstime) {
1469	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_clocklock, m, clock, abstime);	1478	SCOPED_TSAN_INTERCEPTOR(pthread_mutex_clocklock, m, clock, abstime);
1470	MutexPreLock(thr, pc, (uptr)m);	1479	MutexPreLock(thr, pc, (uptr)m);
		1480	AdaptiveDelay::SyncOp();
1471	int res = BLOCK_REAL(pthread_mutex_clocklock)(m, clock, abstime);	1481	int res = BLOCK_REAL(pthread_mutex_clocklock)(m, clock, abstime);
1472	if (res == errno_EOWNERDEAD)	1482	if (res == errno_EOWNERDEAD)
1473	MutexRepair(thr, pc, (uptr)m);	1483	MutexRepair(thr, pc, (uptr)m);
...	@@ -1486,6 +1496,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_clocklock, void *m,	...	@@ -1486,6 +1496,7 @@ TSAN_INTERCEPTOR(int, pthread_mutex_clocklock, void *m,
1486	TSAN_INTERCEPTOR(int, __pthread_mutex_lock, void *m) {	1496	TSAN_INTERCEPTOR(int, __pthread_mutex_lock, void *m) {
1487	SCOPED_TSAN_INTERCEPTOR(__pthread_mutex_lock, m);	1497	SCOPED_TSAN_INTERCEPTOR(__pthread_mutex_lock, m);
1488	MutexPreLock(thr, pc, (uptr)m);	1498	MutexPreLock(thr, pc, (uptr)m);
		1499	AdaptiveDelay::SyncOp();
1489	int res = BLOCK_REAL(__pthread_mutex_lock)(m);	1500	int res = BLOCK_REAL(__pthread_mutex_lock)(m);
1490	if (res == errno_EOWNERDEAD)	1501	if (res == errno_EOWNERDEAD)
1491	MutexRepair(thr, pc, (uptr)m);	1502	MutexRepair(thr, pc, (uptr)m);
...	@@ -1500,6 +1511,7 @@ TSAN_INTERCEPTOR(int, __pthread_mutex_unlock, void *m) {	...	@@ -1500,6 +1511,7 @@ TSAN_INTERCEPTOR(int, __pthread_mutex_unlock, void *m) {
1500	SCOPED_TSAN_INTERCEPTOR(__pthread_mutex_unlock, m);	1511	SCOPED_TSAN_INTERCEPTOR(__pthread_mutex_unlock, m);
1501	MutexUnlock(thr, pc, (uptr)m);	1512	MutexUnlock(thr, pc, (uptr)m);
1502	int res = REAL(__pthread_mutex_unlock)(m);	1513	int res = REAL(__pthread_mutex_unlock)(m);
		1514	AdaptiveDelay::SyncOp();
1503	if (res == errno_EINVAL)	1515	if (res == errno_EINVAL)
1504	MutexInvalidAccess(thr, pc, (uptr)m);	1516	MutexInvalidAccess(thr, pc, (uptr)m);
1505	return res;	1517	return res;
...	@@ -1529,6 +1541,7 @@ TSAN_INTERCEPTOR(int, pthread_spin_destroy, void *m) {	...	@@ -1529,6 +1541,7 @@ TSAN_INTERCEPTOR(int, pthread_spin_destroy, void *m) {
1529	TSAN_INTERCEPTOR(int, pthread_spin_lock, void *m) {	1541	TSAN_INTERCEPTOR(int, pthread_spin_lock, void *m) {
1530	SCOPED_TSAN_INTERCEPTOR(pthread_spin_lock, m);	1542	SCOPED_TSAN_INTERCEPTOR(pthread_spin_lock, m);
1531	MutexPreLock(thr, pc, (uptr)m);	1543	MutexPreLock(thr, pc, (uptr)m);
		1544	AdaptiveDelay::SyncOp();
1532	int res = BLOCK_REAL(pthread_spin_lock)(m);	1545	int res = BLOCK_REAL(pthread_spin_lock)(m);
1533	if (res == 0) {	1546	if (res == 0) {
1534	MutexPostLock(thr, pc, (uptr)m);	1547	MutexPostLock(thr, pc, (uptr)m);
...	@@ -1538,6 +1551,7 @@ TSAN_INTERCEPTOR(int, pthread_spin_lock, void *m) {	...	@@ -1538,6 +1551,7 @@ TSAN_INTERCEPTOR(int, pthread_spin_lock, void *m) {
1538		1551
1539	TSAN_INTERCEPTOR(int, pthread_spin_trylock, void *m) {	1552	TSAN_INTERCEPTOR(int, pthread_spin_trylock, void *m) {
1540	SCOPED_TSAN_INTERCEPTOR(pthread_spin_trylock, m);	1553	SCOPED_TSAN_INTERCEPTOR(pthread_spin_trylock, m);
		1554	AdaptiveDelay::SyncOp();
1541	int res = REAL(pthread_spin_trylock)(m);	1555	int res = REAL(pthread_spin_trylock)(m);
1542	if (res == 0) {	1556	if (res == 0) {
1543	MutexPostLock(thr, pc, (uptr)m, MutexFlagTryLock);	1557	MutexPostLock(thr, pc, (uptr)m, MutexFlagTryLock);
...	@@ -1549,6 +1563,7 @@ TSAN_INTERCEPTOR(int, pthread_spin_unlock, void *m) {	...	@@ -1549,6 +1563,7 @@ TSAN_INTERCEPTOR(int, pthread_spin_unlock, void *m) {
1549	SCOPED_TSAN_INTERCEPTOR(pthread_spin_unlock, m);	1563	SCOPED_TSAN_INTERCEPTOR(pthread_spin_unlock, m);
1550	MutexUnlock(thr, pc, (uptr)m);	1564	MutexUnlock(thr, pc, (uptr)m);
1551	int res = REAL(pthread_spin_unlock)(m);	1565	int res = REAL(pthread_spin_unlock)(m);
		1566	AdaptiveDelay::SyncOp();
1552	return res;	1567	return res;
1553	}	1568	}
1554	#endif	1569	#endif
...	@@ -1574,6 +1589,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_destroy, void *m) {	...	@@ -1574,6 +1589,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_destroy, void *m) {
1574	TSAN_INTERCEPTOR(int, pthread_rwlock_rdlock, void *m) {	1589	TSAN_INTERCEPTOR(int, pthread_rwlock_rdlock, void *m) {
1575	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_rdlock, m);	1590	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_rdlock, m);
1576	MutexPreReadLock(thr, pc, (uptr)m);	1591	MutexPreReadLock(thr, pc, (uptr)m);
		1592	AdaptiveDelay::SyncOp();
1577	int res = REAL(pthread_rwlock_rdlock)(m);	1593	int res = REAL(pthread_rwlock_rdlock)(m);
1578	if (res == 0) {	1594	if (res == 0) {
1579	MutexPostReadLock(thr, pc, (uptr)m);	1595	MutexPostReadLock(thr, pc, (uptr)m);
...	@@ -1583,6 +1599,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_rdlock, void *m) {	...	@@ -1583,6 +1599,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_rdlock, void *m) {
1583		1599
1584	TSAN_INTERCEPTOR(int, pthread_rwlock_tryrdlock, void *m) {	1600	TSAN_INTERCEPTOR(int, pthread_rwlock_tryrdlock, void *m) {
1585	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_tryrdlock, m);	1601	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_tryrdlock, m);
		1602	AdaptiveDelay::SyncOp();
1586	int res = REAL(pthread_rwlock_tryrdlock)(m);	1603	int res = REAL(pthread_rwlock_tryrdlock)(m);
1587	if (res == 0) {	1604	if (res == 0) {
1588	MutexPostReadLock(thr, pc, (uptr)m, MutexFlagTryLock);	1605	MutexPostReadLock(thr, pc, (uptr)m, MutexFlagTryLock);
...	@@ -1593,6 +1610,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_tryrdlock, void *m) {	...	@@ -1593,6 +1610,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_tryrdlock, void *m) {
1593	#if !SANITIZER_APPLE	1610	#if !SANITIZER_APPLE
1594	TSAN_INTERCEPTOR(int, pthread_rwlock_timedrdlock, void m, void abstime) {	1611	TSAN_INTERCEPTOR(int, pthread_rwlock_timedrdlock, void m, void abstime) {
1595	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_timedrdlock, m, abstime);	1612	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_timedrdlock, m, abstime);
		1613	AdaptiveDelay::SyncOp();
1596	int res = REAL(pthread_rwlock_timedrdlock)(m, abstime);	1614	int res = REAL(pthread_rwlock_timedrdlock)(m, abstime);
1597	if (res == 0) {	1615	if (res == 0) {
1598	MutexPostReadLock(thr, pc, (uptr)m);	1616	MutexPostReadLock(thr, pc, (uptr)m);
...	@@ -1604,6 +1622,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_timedrdlock, void m, void abstime) {	...	@@ -1604,6 +1622,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_timedrdlock, void m, void abstime) {
1604	TSAN_INTERCEPTOR(int, pthread_rwlock_wrlock, void *m) {	1622	TSAN_INTERCEPTOR(int, pthread_rwlock_wrlock, void *m) {
1605	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_wrlock, m);	1623	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_wrlock, m);
1606	MutexPreLock(thr, pc, (uptr)m);	1624	MutexPreLock(thr, pc, (uptr)m);
		1625	AdaptiveDelay::SyncOp();
1607	int res = BLOCK_REAL(pthread_rwlock_wrlock)(m);	1626	int res = BLOCK_REAL(pthread_rwlock_wrlock)(m);
1608	if (res == 0) {	1627	if (res == 0) {
1609	MutexPostLock(thr, pc, (uptr)m);	1628	MutexPostLock(thr, pc, (uptr)m);
...	@@ -1613,6 +1632,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_wrlock, void *m) {	...	@@ -1613,6 +1632,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_wrlock, void *m) {
1613		1632
1614	TSAN_INTERCEPTOR(int, pthread_rwlock_trywrlock, void *m) {	1633	TSAN_INTERCEPTOR(int, pthread_rwlock_trywrlock, void *m) {
1615	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_trywrlock, m);	1634	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_trywrlock, m);
		1635	AdaptiveDelay::SyncOp();
1616	int res = REAL(pthread_rwlock_trywrlock)(m);	1636	int res = REAL(pthread_rwlock_trywrlock)(m);
1617	if (res == 0) {	1637	if (res == 0) {
1618	MutexPostLock(thr, pc, (uptr)m, MutexFlagTryLock);	1638	MutexPostLock(thr, pc, (uptr)m, MutexFlagTryLock);
...	@@ -1623,6 +1643,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_trywrlock, void *m) {	...	@@ -1623,6 +1643,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_trywrlock, void *m) {
1623	#if !SANITIZER_APPLE	1643	#if !SANITIZER_APPLE
1624	TSAN_INTERCEPTOR(int, pthread_rwlock_timedwrlock, void m, void abstime) {	1644	TSAN_INTERCEPTOR(int, pthread_rwlock_timedwrlock, void m, void abstime) {
1625	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_timedwrlock, m, abstime);	1645	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_timedwrlock, m, abstime);
		1646	AdaptiveDelay::SyncOp();
1626	int res = REAL(pthread_rwlock_timedwrlock)(m, abstime);	1647	int res = REAL(pthread_rwlock_timedwrlock)(m, abstime);
1627	if (res == 0) {	1648	if (res == 0) {
1628	MutexPostLock(thr, pc, (uptr)m, MutexFlagTryLock);	1649	MutexPostLock(thr, pc, (uptr)m, MutexFlagTryLock);
...	@@ -1635,6 +1656,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_unlock, void *m) {	...	@@ -1635,6 +1656,7 @@ TSAN_INTERCEPTOR(int, pthread_rwlock_unlock, void *m) {
1635	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_unlock, m);	1656	SCOPED_TSAN_INTERCEPTOR(pthread_rwlock_unlock, m);
1636	MutexReadOrWriteUnlock(thr, pc, (uptr)m);	1657	MutexReadOrWriteUnlock(thr, pc, (uptr)m);
1637	int res = REAL(pthread_rwlock_unlock)(m);	1658	int res = REAL(pthread_rwlock_unlock)(m);
		1659	AdaptiveDelay::SyncOp();
1638	return res;	1660	return res;
1639	}	1661	}
1640		1662
...	@@ -2574,9 +2596,9 @@ static void HandleRecvmsg(ThreadState *thr, uptr pc,	...	@@ -2574,9 +2596,9 @@ static void HandleRecvmsg(ThreadState *thr, uptr pc,
2574		2596
2575	#define COMMON_INTERCEPTOR_DLOPEN(filename, flag) \	2597	#define COMMON_INTERCEPTOR_DLOPEN(filename, flag) \
2576	({ \	2598	({ \
2577	CheckNoDeepBind(filename, flag); \	2599	OnDlOpen(filename, flag); \
2578	ThreadIgnoreBegin(thr, 0); \	2600	ThreadIgnoreBegin(thr, 0); \
2579	void *res = REAL(dlopen)(filename, flag); \	2601	void* res = REAL(dlopen)(filename, flag); \
2580	ThreadIgnoreEnd(thr); \	2602	ThreadIgnoreEnd(thr); \
2581	res; \	2603	res; \
2582	})	2604	})

...	@@ -2497,6 +2497,8 @@ test "polyPackT1 / polyUnpackT1 roundtrip" {	...	@@ -2497,6 +2497,8 @@ test "polyPackT1 / polyUnpackT1 roundtrip" {
2497	}	2497	}
2498		2498
2499	test "polyPackT0 / polyUnpackT0 roundtrip" {	2499	test "polyPackT0 / polyUnpackT0 roundtrip" {
		2500	if (builtin.zig_backend == .stage2_llvm and builtin.target.cpu.arch.isPowerpc64()) return error.SkipZigTest; // https://github.com/llvm/llvm-project/issues/229620
		2501
2500	// Create a test polynomial with coefficients in (Q-2^12, Q+2^12]	2502	// Create a test polynomial with coefficients in (Q-2^12, Q+2^12]
2501	// This is the range (-2^12, 2^12] represented as unsigned around Q	2503	// This is the range (-2^12, 2^12] represented as unsigned around Q
2502	const bound = 1 << 12; // 2^(D-1) where D=13	2504	const bound = 1 << 12; // 2^(D-1) where D=13
...	@@ -2846,6 +2848,8 @@ fn testKeyGenerationBasic(comptime MlDsa: type, seed: [32]u8) !void {	...	@@ -2846,6 +2848,8 @@ fn testKeyGenerationBasic(comptime MlDsa: type, seed: [32]u8) !void {
2846	}	2848	}
2847		2849
2848	test "Key generation basic - all variants" {	2850	test "Key generation basic - all variants" {
		2851	if (builtin.zig_backend == .stage2_llvm and builtin.target.cpu.arch.isPowerpc64()) return error.SkipZigTest; // https://github.com/llvm/llvm-project/issues/229620
		2852
2849	inline for (.{	2853	inline for (.{
2850	.{ .variant = MLDSA44, .seed_byte = 0x44 },	2854	.{ .variant = MLDSA44, .seed_byte = 0x44 },
2851	.{ .variant = MLDSA65, .seed_byte = 0x65 },	2855	.{ .variant = MLDSA65, .seed_byte = 0x65 },
...	@@ -2857,6 +2861,8 @@ test "Key generation basic - all variants" {	...	@@ -2857,6 +2861,8 @@ test "Key generation basic - all variants" {
2857	}	2861	}
2858		2862
2859	test "Key generation determinism" {	2863	test "Key generation determinism" {
		2864	if (builtin.zig_backend == .stage2_llvm and builtin.target.cpu.arch.isPowerpc64()) return error.SkipZigTest; // https://github.com/llvm/llvm-project/issues/229620
		2865
2860	const seed = [_]u8{ 0x12, 0x34, 0x56, 0x78 } ++ @as([28]u8, @splat(0xAB));	2866	const seed = [_]u8{ 0x12, 0x34, 0x56, 0x78 } ++ @as([28]u8, @splat(0xAB));
2861		2867
2862	// Generate two key pairs from the same seed	2868	// Generate two key pairs from the same seed