Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toolset update: VS 2022 17.11 Preview 2 #4725

Merged
merged 8 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem

# How To Build With The Visual Studio IDE

1. Install Visual Studio 2022 17.11 Preview 1 or later.
1. Install Visual Studio 2022 17.11 Preview 2 or later.
* Select "Windows 11 SDK (10.0.22621.0)" in the VS Installer.
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
This will ensure that you're using supported versions of CMake and Ninja.
Expand All @@ -156,7 +156,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem

# How To Build With A Native Tools Command Prompt

1. Install Visual Studio 2022 17.11 Preview 1 or later.
1. Install Visual Studio 2022 17.11 Preview 2 or later.
* Select "Windows 11 SDK (10.0.22621.0)" in the VS Installer.
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
This will ensure that you're using supported versions of CMake and Ninja.
Expand Down
2 changes: 1 addition & 1 deletion azure-devops/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

variables:
- name: poolName
value: 'StlBuild-2024-05-21T1719-Pool'
value: 'StlBuild-2024-06-11T1315-Pool'
readonly: true
- name: poolDemands
value: 'EnableSpotVM -equals false'
Expand Down
2 changes: 1 addition & 1 deletion azure-devops/provision-image.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ foreach ($workload in $VisualStudioWorkloads) {
$PowerShellUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.2/PowerShell-7.4.2-win-x64.msi'
$PowerShellArgs = @('/quiet', '/norestart')

$PythonUrl = 'https://www.python.org/ftp/python/3.12.3/python-3.12.3-amd64.exe'
$PythonUrl = 'https://www.python.org/ftp/python/3.12.4/python-3.12.4-amd64.exe'
$PythonArgs = @('/quiet', 'InstallAllUsers=1', 'PrependPath=1', 'CompileAll=1', 'Include_doc=0')

$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.4.0/local_installers/cuda_12.4.0_551.61_windows.exe'
Expand Down
3 changes: 0 additions & 3 deletions stl/inc/climits
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
#include <yvals_core.h>
#if _STL_COMPILER_PREPROCESSOR

#pragma warning(push) // TRANSITION, VSO-1985428
#pragma warning(disable : 4668) // 'MEOW' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
#include <limits.h>
#pragma warning(pop)

#endif // _STL_COMPILER_PREPROCESSOR
#endif // _CLIMITS_
2 changes: 1 addition & 1 deletion stl/inc/type_traits
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ _STL_DISABLE_CLANG_WARNINGS

_STD_BEGIN
template <class>
constexpr bool _Always_false = false; // TRANSITION, VSO-2016422 (EDG)
constexpr bool _Always_false = false; // TRANSITION, needed by CUDA 12.4 in classes; see CWG-2518, VSO-2016422 (EDG)

template <bool _First_value, class _First, class... _Rest>
struct _Conjunction { // handle false trait or last trait
Expand Down
3 changes: 1 addition & 2 deletions tests/libcxx/lit.site.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ lit_config.library_dirs = getattr(lit_config, 'library_dirs', dict())
lit_config.test_subdirs = getattr(lit_config, 'test_subdirs', dict())

lit_config.expected_results[config.name] = stl.test.file_parsing.parse_result_file('@LIBCXX_EXPECTED_RESULTS@')
# TRANSITION, VSO-1913897: '@STL_SOURCE_DIR@/tests/std/include' is a workaround
lit_config.include_dirs[config.name] = ['@STL_TESTED_HEADERS_DIR@', '@LIBCXX_SOURCE_DIR@/test/support', '@STL_SOURCE_DIR@/tests/std/include']
lit_config.include_dirs[config.name] = ['@STL_TESTED_HEADERS_DIR@', '@LIBCXX_SOURCE_DIR@/test/support']
lit_config.library_dirs[config.name] = ['@STL_LIBRARY_OUTPUT_DIRECTORY@', '@TOOLSET_LIB@']
lit_config.test_subdirs[config.name] = ['@LIBCXX_SOURCE_DIR@/test/std']

Expand Down
2 changes: 1 addition & 1 deletion tests/libcxx/usual_matrix.lst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

RUNALL_INCLUDE ..\universal_prefix.lst
RUNALL_CROSSLIST
* PM_CL="/EHsc /MTd /std:c++latest /permissive- /utf-8 /FImsvc_stdlib_force_include.h /FIvso1913897.hpp /wd4643 /D_STL_CALL_ABORT_INSTEAD_OF_INVALID_PARAMETER"
* PM_CL="/EHsc /MTd /std:c++latest /permissive- /utf-8 /FImsvc_stdlib_force_include.h /wd4643 /D_STL_CALL_ABORT_INSTEAD_OF_INVALID_PARAMETER"
RUNALL_CROSSLIST
PM_CL="/analyze:autolog- /Zc:preprocessor /wd6262"
ASAN PM_CL="-fsanitize=address /Zi" PM_LINK="/debug"
Expand Down
2 changes: 0 additions & 2 deletions tests/std/include/force_include.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
#include <stdio.h>
#include <stdlib.h>

#include "vso1913897.hpp"

struct TestEnvironmentPreparer {
TestEnvironmentPreparer() noexcept {
// avoid assertion dialog boxes; see GH-781
Expand Down
3 changes: 0 additions & 3 deletions tests/std/include/range_algorithm_support.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@

namespace ranges = std::ranges;

template <class>
constexpr bool always_false = false; // TRANSITION, VSO-2016422 (EDG)

template <class T>
constexpr T* nullptr_to = nullptr;

Expand Down
15 changes: 0 additions & 15 deletions tests/std/include/vso1913897.hpp

This file was deleted.

4 changes: 0 additions & 4 deletions tests/std/tests/GH_001277_num_get_bad_grouping/test.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef __EDG__ // TRANSITION, VSO-2064546

#include <cassert>
#include <cstddef>
#include <cstdint>
Expand Down Expand Up @@ -461,5 +459,3 @@ int main() {
test_nonending_unlimited_grouping<double>();
test_nonending_unlimited_grouping<long double>();
}

#endif // ^^^ no workaround ^^^
4 changes: 0 additions & 4 deletions tests/std/tests/LWG2381_num_get_floating_point/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
// * std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_float.pass.cpp
// * std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_double.pass.cpp

#ifndef __EDG__ // TRANSITION, VSO-2064546

#include <cassert>
#include <cmath>
#include <cstddef>
Expand Down Expand Up @@ -618,5 +616,3 @@ int main() {
test_double_from_char_cases<long double>();
#endif // _HAS_CXX17
}

#endif // ^^^ no workaround ^^^
Original file line number Diff line number Diff line change
Expand Up @@ -1716,7 +1716,7 @@ namespace std_iterator_tags_test {
namespace incomplete_test {
template <class T>
struct do_not_instantiate {
static_assert(always_false<T>);
static_assert(false);
};

using E = do_not_instantiate<void>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ namespace test_subrange {

template <class T>
struct illformed {
static_assert(always_false<T>);
static_assert(false);
};

template <class T>
Expand Down
5 changes: 1 addition & 4 deletions tests/std/tests/P0898R3_concepts/test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,12 @@ constexpr bool is_trait = false;
template <class T>
constexpr bool is_trait<T, std::void_t<typename T::type>> = true;

template <class>
constexpr bool always_false = false; // TRANSITION, VSO-2016422 (EDG)

struct IncompleteClass;
union IncompleteUnion;

template <class T>
struct DoNotInstantiate {
static_assert(always_false<T>);
static_assert(false);
};

struct Immobile {
Expand Down
4 changes: 0 additions & 4 deletions tests/tr1/tests/locale3/test.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef __EDG__ // TRANSITION, VSO-2064546

// test <locale>, part 3
#define TEST_NAME "<locale>, part 3"

Expand Down Expand Up @@ -555,5 +553,3 @@ void test_main() { // test basic workings of locale definitions
test_time_get();
test_time_put();
}

#endif // ^^^ no workaround ^^^
4 changes: 0 additions & 4 deletions tests/tr1/tests/locale4/test.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef __EDG__ // TRANSITION, VSO-2064546

// test <locale>, part 4
#define TEST_NAME "<locale>, part 4"

Expand Down Expand Up @@ -523,5 +521,3 @@ void test_main() { // test basic workings of locale definitions
test_time_get();
test_time_put();
}

#endif // ^^^ no workaround ^^^