Skip to content

Commit 874d1f0

Browse files
Toolset update: VS 2022 17.2 Preview 2 (#2611)
1 parent 4ad4c95 commit 874d1f0

File tree

9 files changed

+18
-28
lines changed

9 files changed

+18
-28
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
140140

141141
# How To Build With The Visual Studio IDE
142142

143-
1. Install Visual Studio 2022 17.1 Preview 5 or later.
143+
1. Install Visual Studio 2022 17.2 Preview 2 or later.
144144
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
145145
This will ensure that you're using supported versions of CMake and Ninja.
146146
* Otherwise, install [CMake][] 3.22 or later, and [Ninja][] 1.10.2 or later.
@@ -155,7 +155,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
155155

156156
# How To Build With A Native Tools Command Prompt
157157

158-
1. Install Visual Studio 2022 17.1 Preview 5 or later.
158+
1. Install Visual Studio 2022 17.2 Preview 2 or later.
159159
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
160160
This will ensure that you're using supported versions of CMake and Ninja.
161161
* Otherwise, install [CMake][] 3.22 or later, and [Ninja][] 1.10.2 or later.

azure-devops/cmake-configure-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
inputs:
2222
targetType: inline
2323
script: |
24-
$testParallelism = $env:NUMBER_OF_PROCESSORS - 2
24+
$testParallelism = $env:NUMBER_OF_PROCESSORS
2525
Write-Host "##vso[task.setvariable variable=testParallelism;]$testParallelism"
2626
- script: |
2727
if exist "$(${{ parameters.buildOutputLocationVar }})" (

azure-devops/provision-image.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ if ([string]::IsNullOrEmpty($AdminUserPassword)) {
9191
$PsExecPath = Join-Path $ExtractedPsToolsPath 'PsExec64.exe'
9292

9393
# https://github.com/PowerShell/PowerShell/releases/latest
94-
$PowerShellZipUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.1/PowerShell-7.2.1-win-x64.zip'
94+
$PowerShellZipUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.2/PowerShell-7.2.2-win-x64.zip'
9595
Write-Host "Downloading: $PowerShellZipUrl"
9696
$ExtractedPowerShellPath = DownloadAndExtractZip -Url $PowerShellZipUrl
9797
$PwshPath = Join-Path $ExtractedPowerShellPath 'pwsh.exe'
@@ -142,7 +142,7 @@ $Workloads = @(
142142
$ReleaseInPath = 'Preview'
143143
$Sku = 'Enterprise'
144144
$VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/pre/vs_enterprise.exe'
145-
$PythonUrl = 'https://www.python.org/ftp/python/3.10.2/python-3.10.2-amd64.exe'
145+
$PythonUrl = 'https://www.python.org/ftp/python/3.10.3/python-3.10.3-amd64.exe'
146146

147147
$CudaUrl = `
148148
'https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_426.00_win10.exe'

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ variables:
77
tmpDir: 'D:\Temp'
88
buildOutputLocation: 'D:\build'
99

10-
pool: 'StlBuild-2022-02-08-T1334'
10+
pool: 'StlBuild-2022-03-17-T1445'
1111

1212
stages:
1313
- stage: Code_Format

stl/inc/bit

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,12 @@ _NODISCARD constexpr _Ty rotl(const _Ty _Val, const int _Rotation) noexcept {
9898
return _rotl64(_Val, _Rotation);
9999
} else if constexpr (_Digits == 32) {
100100
return _rotl(_Val, _Rotation);
101+
} else if constexpr (_Digits == 16) {
102+
return _rotl16(_Val, static_cast<unsigned char>(_Rotation));
103+
} else {
104+
_STL_INTERNAL_STATIC_ASSERT(_Digits == 8);
105+
return _rotl8(_Val, static_cast<unsigned char>(_Rotation));
101106
}
102-
// TRANSITION: fallback to non-intrinsic case until <intrin0.h> changes
103107
}
104108

105109
const auto _Remainder = _Rotation % _Digits;
@@ -122,8 +126,12 @@ _NODISCARD constexpr _Ty rotr(const _Ty _Val, const int _Rotation) noexcept {
122126
return _rotr64(_Val, _Rotation);
123127
} else if constexpr (_Digits == 32) {
124128
return _rotr(_Val, _Rotation);
129+
} else if constexpr (_Digits == 16) {
130+
return _rotr16(_Val, static_cast<unsigned char>(_Rotation));
131+
} else {
132+
_STL_INTERNAL_STATIC_ASSERT(_Digits == 8);
133+
return _rotr8(_Val, static_cast<unsigned char>(_Rotation));
125134
}
126-
// TRANSITION: fallback to non-intrinsic case until <intrin0.h> changes
127135
}
128136

129137
const auto _Remainder = _Rotation % _Digits;

stl/inc/csignal

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,10 @@ _STL_DISABLE_CLANG_WARNINGS
1919
#undef new
2020

2121
_STD_BEGIN
22-
#ifndef _M_CEE_PURE
2322
using _CSTD sig_atomic_t;
2423
using _CSTD raise;
24+
#ifndef _M_CEE_PURE
2525
using _CSTD signal;
26-
27-
#else // _M_CEE_PURE
28-
using _CSTD sig_atomic_t;
29-
using _CSTD raise;
3026
#endif // _M_CEE_PURE
3127
_STD_END
3228

stl/inc/cstdio

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ _STD_BEGIN
3434
#pragma warning(push)
3535
#pragma warning(disable : 4995) // name was marked as #pragma deprecated
3636

37-
using _CSTD FILE;
3837
using _CSTD _Mbstatet;
3938

4039
using _CSTD size_t;

tests/std/tests/P1502R1_standard_library_header_units/custom_format.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,7 @@ def getBuildSteps(self, test, litConfig, shared):
8181
with open(os.path.join(outputDir, f'{hdr}.module.json')) as file:
8282
jsonObject = json.load(file)
8383
objFilenames.append(jsonObject['rules'][0]['primary-output'])
84-
# TRANSITION, VSO-1466711 fixed in VS 2022 17.2 Preview 2
85-
# os.path.basename(req['source-path']) should be req['logical-name']
86-
dep = [os.path.basename(req['source-path']) for req in jsonObject['rules'][0]['requires']]
87-
remainingDependencies[hdr] = dep
84+
remainingDependencies[hdr] = [req['logical-name'] for req in jsonObject['rules'][0]['requires']]
8885

8986
# Build header units in topologically sorted order.
9087
while len(remainingDependencies) > 0:

tests/std/tests/P1502R1_standard_library_header_units/test.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,11 @@ int main() {
285285
assert(!ep);
286286
}
287287

288-
#if !defined(TEST_TOPO_SORT) || defined(_MSVC_INTERNAL_TESTING) // TRANSITION, VSO-1471382 fixed in VS 2022 17.2p2
289288
{
290289
puts("Testing <execution>.");
291290
constexpr int arr[]{11, 0, 22, 0, 33, 0, 44, 0, 55};
292291
assert(count(execution::par, begin(arr), end(arr), 0) == 4);
293292
}
294-
#endif // ^^^ no workaround ^^^
295293

296294
{
297295
puts("Testing <filesystem>.");
@@ -321,7 +319,6 @@ int main() {
321319
assert(!f.is_open());
322320
}
323321

324-
#if !defined(TEST_TOPO_SORT) || defined(_MSVC_INTERNAL_TESTING) // TRANSITION, VSO-1471374 fixed in VS 2022 17.2p2
325322
{
326323
puts("Testing <functional>.");
327324
function<int(int, int)> f{multiplies{}};
@@ -332,7 +329,6 @@ int main() {
332329
assert(b(3) == 33);
333330
static_assert(b(3) == 33);
334331
}
335-
#endif // ^^^ no workaround ^^^
336332

337333
{
338334
puts("Testing <future>.");
@@ -865,7 +861,6 @@ int main() {
865861
assert(this_thread::get_id() != thread::id{});
866862
}
867863

868-
#if !defined(TEST_TOPO_SORT) || defined(_MSVC_INTERNAL_TESTING) // TRANSITION, VSO-1471374 fixed in VS 2022 17.2p2
869864
{
870865
puts("Testing <tuple>.");
871866
constexpr tuple<int, char, double> t{1729, 'c', 1.25};
@@ -876,7 +871,6 @@ int main() {
876871
static_assert(get<char>(t) == 'c');
877872
static_assert(get<double>(t) == 1.25);
878873
}
879-
#endif // ^^^ no workaround ^^^
880874

881875
{
882876
puts("Testing <type_traits>.");
@@ -958,14 +952,10 @@ int main() {
958952
{
959953
puts("Testing <variant>.");
960954
constexpr const char* cats = "CATS";
961-
#if 0 // TRANSITION, DevCom-1162647 (constexpr variant stores wrong pointer)
962955
constexpr variant<int, const char*, double> var{in_place_type<const char*>, cats};
963956
static_assert(var.index() == 1);
964957
static_assert(holds_alternative<const char*>(var));
965958
static_assert(get<const char*>(var) == cats);
966-
#else // ^^^ no workaround / workaround vvv
967-
const variant<int, const char*, double> var{in_place_type<const char*>, cats};
968-
#endif // ^^^ workaround ^^^
969959
assert(var.index() == 1);
970960
assert(holds_alternative<const char*>(var));
971961
assert(get<const char*>(var) == cats);

0 commit comments

Comments
 (0)