Skip to content

Remove workarounds for several compiler bugs #1327

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.

Sign up for GitHub

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

Merged
CaseyCarter merged 4 commits into from
Oct 9, 2020
Merged

Remove workarounds for several compiler bugs #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c164937
Remove workarounds for several compiler bugs
CaseyCarter Sep 29, 2020
d5bc677
Merge branch 'main' into workarounds
CaseyCarter Oct 3, 2020
552855d
Restore VSO-1174090 workarounds which are now VSO-1225825 workarounds
CaseyCarter Oct 7, 2020
22c99da
Add empty line
CaseyCarter Oct 8, 2020
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
9 changes: 0 additions & 9 deletions stl/inc/functional
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,20 +747,11 @@ struct _Invoker_ret { // selected for _Rx being cv void

template <class _Rx>
struct _Invoker_ret<_Rx, false> { // selected for all _Rx other than cv void and _Unforced
#ifdef __EDG__ // TRANSITION, VSO-1132186
template <class _Fx, class... _Valtys,
template <class> class _Is_nothrow = _Select_invoke_traits<_Fx, _Valtys...>::template _Is_nothrow_invocable_r>
static _CONSTEXPR20 _Rx _Call(_Fx&& _Func, _Valtys&&... _Vals) noexcept(_Is_nothrow<_Rx>::value) {
// INVOKE, implicitly converted to _Rx
return _STD invoke(static_cast<_Fx&&>(_Func), static_cast<_Valtys&&>(_Vals)...);
}
#else // ^^^ workaround / no workaround vvv
template <class _Fx, class... _Valtys>
static _CONSTEXPR20 _Rx _Call(_Fx&& _Func, _Valtys&&... _Vals) noexcept(_Select_invoke_traits<_Fx,
_Valtys...>::template _Is_nothrow_invocable_r<_Rx>::value) { // INVOKE, implicitly converted to _Rx
return _STD invoke(static_cast<_Fx&&>(_Func), static_cast<_Valtys&&>(_Vals)...);
}
#endif // TRANSITION, VSO-1132186
};

template <>
Expand Down
21 changes: 11 additions & 10 deletions stl/inc/iterator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,12 +557,12 @@ public:
}
}

#if 0 // TRANSITION, VSO-1174090
#if 0 // TRANSITION, VSO-1225825
// clang-format off
_Variantish(const _Variantish&) requires is_trivially_copy_constructible_v<_It>
&& is_trivially_copy_constructible_v<_Se> = default;
// clang-format on
#endif // TRANSITION, VSO-1174090
#endif // TRANSITION, VSO-1225825

_Variantish(const _Variantish& _That) noexcept(
noexcept(is_nothrow_copy_constructible_v<_It>&& is_nothrow_copy_constructible_v<_Se>))
Expand All @@ -579,12 +579,12 @@ public:
}
}

#if 0 // TRANSITION, VSO-1174090
#if 0 // TRANSITION, VSO-1225825
// clang-format off
_Variantish(_Variantish&&) requires is_trivially_move_constructible_v<_It>
&& is_trivially_move_constructible_v<_Se> = default;
// clang-format on
#endif // TRANSITION, VSO-1174090
#endif // TRANSITION, VSO-1225825

_Variantish(_Variantish&& _That) noexcept(
is_nothrow_move_constructible_v<_It>&& is_nothrow_move_constructible_v<_Se>)
Expand All @@ -601,16 +601,17 @@ public:
}
}

#if 0 // TRANSITION, VSO-1174090
#if 0 // TRANSITION, VSO-1225825
// clang-format off
~_Variantish() requires is_trivially_destructible_v<_It> && is_trivially_destructible_v<_Se> = default;
// clang-format on
#endif // TRANSITION, VSO-1174090
#endif // TRANSITION, VSO-1225825

~_Variantish() {
_Raw_clear();
}

#if 0 // TRANSITION, VSO-1174090
#if 0 // TRANSITION, VSO-1225825
// clang-format off
_Variantish& operator=(const _Variantish&) requires is_trivially_destructible_v<_It>
&& is_trivially_destructible_v<_Se>
Expand All @@ -619,7 +620,7 @@ public:
&& is_trivially_copy_assignable_v<_It>
&& is_trivially_copy_assignable_v<_Se> = default;
// clang-format on
#endif // TRANSITION, VSO-1174090
#endif // TRANSITION, VSO-1225825

_Variantish& operator=(const _Variantish& _That) noexcept(
is_nothrow_copy_constructible_v<_It>&& is_nothrow_copy_constructible_v<_Se>&&
Expand Down Expand Up @@ -657,7 +658,7 @@ public:
return *this;
}

#if 0 // TRANSITION, VSO-1174090
#if 0 // TRANSITION, VSO-1225825
// clang-format off
_Variantish& operator=(_Variantish&&) requires is_trivially_destructible_v<_It>
&& is_trivially_destructible_v<_Se>
Expand All @@ -666,7 +667,7 @@ public:
&& is_trivially_move_assignable_v<_It>
&& is_trivially_move_assignable_v<_Se> = default;
// clang-format on
#endif // TRANSITION, VSO-1174090
#endif // TRANSITION, VSO-1225825

_Variantish& operator=(_Variantish&& _That) noexcept(
is_nothrow_move_constructible_v<_It>&& is_nothrow_move_constructible_v<_Se>&&
Expand Down
8 changes: 4 additions & 4 deletions stl/inc/ranges
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#include <span>
#include <string_view>

#if 1 // TRANSITION, VSO-1174090
#if 1 // TRANSITION, VSO-1225825
#include <optional>
#endif // TRANSITION, VSO-1174090
#endif // TRANSITION, VSO-1225825

#pragma pack(push, _CRT_PACKING)
#pragma warning(push, _STL_WARNING_LEVEL)
Expand Down Expand Up @@ -244,7 +244,7 @@ namespace ranges {
using _Cached_position_t = conditional_t<_Enable, _Cached_position<_Rng, _Derived>, view_interface<_Derived>>;

// CLASS TEMPLATE ranges::_Semiregular_box
#if 0 // TRANSITION, VSO-1174090
#if 0 // TRANSITION, VSO-1225825
template <_Copy_constructible_object _Ty>
class _Semiregular_box {
public:
Expand Down Expand Up @@ -531,7 +531,7 @@ namespace ranges {
private:
/* [[no_unique_address]] */ _Ty _Val = _Ty();
};
#endif // TRANSITION, VSO-1174090
#endif // TRANSITION, VSO-1225825

// CLASS TEMPLATE ranges::empty_view
// clang-format off
Expand Down
4 changes: 2 additions & 2 deletions stl/inc/utility
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ _NODISCARD constexpr bool cmp_greater_equal(const _Ty1 _Left, const _Ty2 _Right)

// FUNCTION TEMPLATE in_range
template <class _Ty>
_NODISCARD constexpr _Ty _Min_limit() noexcept { // same as (numeric_limits<_Ty>::min)(), less throughput cost
_NODISCARD _CONSTEVAL _Ty _Min_limit() noexcept { // same as (numeric_limits<_Ty>::min)(), less throughput cost
static_assert(_Is_standard_integer<_Ty>); // doesn't attempt to handle all types
if constexpr (is_signed_v<_Ty>) {
constexpr auto _Unsigned_max = static_cast<make_unsigned_t<_Ty>>(-1);
Expand All @@ -708,7 +708,7 @@ _NODISCARD constexpr _Ty _Min_limit() noexcept { // same as (numeric_limits<_Ty>
}

template <class _Ty>
_NODISCARD constexpr _Ty _Max_limit() noexcept { // same as (numeric_limits<_Ty>::max)(), less throughput cost
_NODISCARD _CONSTEVAL _Ty _Max_limit() noexcept { // same as (numeric_limits<_Ty>::max)(), less throughput cost
static_assert(_Is_standard_integer<_Ty>); // doesn't attempt to handle all types
if constexpr (is_signed_v<_Ty>) {
constexpr auto _Unsigned_max = static_cast<make_unsigned_t<_Ty>>(-1);
Expand Down
18 changes: 4 additions & 14 deletions stl/inc/xutility
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,21 +474,11 @@ concept _Cpp17_input_iterator = _Cpp17_iterator<_It>
requires signed_integral<typename incrementable_traits<_It>::difference_type>;
};

#if 1 // TRANSITION, VSO-1002863
template <class _Ty>
using _Member_iterator_category = typename _Ty::iterator_category;
#endif // TRANSITION, VSO-1002863

template <class _It>
requires (!_Has_iter_types<_It> && _Cpp17_iterator<_It> && !_Cpp17_input_iterator<_It>
// Implements the proposed resolution of LWG-3283:
#if 1 // TRANSITION, VSO-1002863
&& (!requires { typename _It::iterator_category; }
|| derived_from<_Member_iterator_category<_It>, output_iterator_tag>))
#else // ^^^ workaround / no workaround vvv
&& (!requires { typename _It::iterator_category; }
|| derived_from<typename _It::iterator_category, output_iterator_tag>))
#endif // TRANSITION, VSO-1002863
struct _Iterator_traits_base<_It> {
using iterator_category = output_iterator_tag;
using difference_type =
Expand Down Expand Up @@ -1494,20 +1484,20 @@ _INLINE_VAR constexpr bool
template <class _Iter, class _UIter>
constexpr void _Seek_wrapped(_Iter& _It, _UIter&& _UIt) {
if constexpr (_Wrapped_seekable_v<_Iter, _UIter>) {
_It._Seek_to(static_cast<_UIter&&>(_UIt));
_It._Seek_to(_STD forward<_UIter>(_UIt));
} else {
_It = static_cast<_UIter&&>(_UIt);
_It = _STD forward<_UIter>(_UIt);
}
}
#else // ^^^ _HAS_IF_CONSTEXPR / !_HAS_IF_CONSTEXPR vvv
template <class _Iter, class _UIter, enable_if_t<_Wrapped_seekable_v<_Iter, _UIter>, int> = 0>
constexpr void _Seek_wrapped(_Iter& _It, _UIter&& _UIt) {
_It._Seek_to(static_cast<_UIter&&>(_UIt));
_It._Seek_to(_STD forward<_UIter>(_UIt));
}

template <class _Iter, class _UIter, enable_if_t<!_Wrapped_seekable_v<_Iter, _UIter>, int> = 0>
constexpr void _Seek_wrapped(_Iter& _It, _UIter&& _UIt) {
_It = static_cast<_UIter&&>(_UIt);
_It = _STD forward<_UIter>(_UIt);
}

template <class _Ty>
Expand Down
2 changes: 0 additions & 2 deletions tests/std/tests/P0088R3_variant/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6485,7 +6485,6 @@ namespace msvc {

namespace derived_variant {
void run_test() {
#ifndef __EDG__ // TRANSITION, VSO-1178211
// Extension: std::visit accepts types derived from a specialization of variant.
{
struct my_variant : std::variant<int, char, double> {
Expand Down Expand Up @@ -6538,7 +6537,6 @@ namespace msvc {
} catch (std::bad_variant_access&) {
}
}
#endif // TRANSITION, VSO-1178211
}
} // namespace derived_variant

Expand Down
2 changes: 0 additions & 2 deletions tests/std/tests/P0896R4_P1614R2_comparisons/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,7 @@ constexpr void ordering_test_cases() {
test_strongly_ordered(13U, u8'x');
#endif // __cpp_char8_t
test_strongly_ordered(13U, u'x');
#if defined(__clang__) || defined(__EDG__) // TRANSITION, VSO-1062618
test_strongly_ordered(13U, U'x');
#endif // TRANSITION, VSO-1062618

test_strongly_ordered(scoped{13}, scoped{42});
test_strongly_ordered(unscoped{13}, unscoped{42});
Expand Down
60 changes: 20 additions & 40 deletions tests/std/tests/P0896R4_ranges_alg_heap/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,11 @@ struct make_and_sort_heap_test {

ASSERT(!is_heap(wrapped, less{}, get_first));

#if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-938163
if constexpr (!ranges::contiguous_range<Range>)
#endif // TRANSITION, VSO-938163
{
make_heap(wrapped, less{}, get_first);
ASSERT(is_heap(wrapped, less{}, get_first));

sort_heap(wrapped, less{}, get_first);
ASSERT(is_sorted(wrapped, less{}, get_first));
}
make_heap(wrapped, less{}, get_first);
ASSERT(is_heap(wrapped, less{}, get_first));

sort_heap(wrapped, less{}, get_first);
ASSERT(is_sorted(wrapped, less{}, get_first));
}

{
Expand All @@ -126,16 +121,11 @@ struct make_and_sort_heap_test {

ASSERT(!is_heap(wrapped.begin(), wrapped.end(), less{}, get_first));

#if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-938163
if constexpr (!ranges::contiguous_range<Range>)
#endif // TRANSITION, VSO-938163
{
make_heap(wrapped.begin(), wrapped.end(), less{}, get_first);
ASSERT(is_heap(wrapped.begin(), wrapped.end(), less{}, get_first));
make_heap(wrapped.begin(), wrapped.end(), less{}, get_first);
ASSERT(is_heap(wrapped.begin(), wrapped.end(), less{}, get_first));

sort_heap(wrapped.begin(), wrapped.end(), less{}, get_first);
ASSERT(is_sorted(wrapped.begin(), wrapped.end(), less{}, get_first));
}
sort_heap(wrapped.begin(), wrapped.end(), less{}, get_first);
ASSERT(is_sorted(wrapped.begin(), wrapped.end(), less{}, get_first));
}
}
};
Expand Down Expand Up @@ -192,34 +182,24 @@ struct push_and_pop_heap_test {
auto buff = initial_values;
const Range wrapped{buff};

#if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-938163
if constexpr (!ranges::contiguous_range<Range>)
#endif // TRANSITION, VSO-938163
{
pop_heap(wrapped, less{}, get_first);
ASSERT(equal(wrapped, expectedPopped));
pop_heap(wrapped, less{}, get_first);
ASSERT(equal(wrapped, expectedPopped));

push_heap(wrapped, less{}, get_first);
ASSERT(equal(wrapped, expectedPushed));
}
push_heap(wrapped, less{}, get_first);
ASSERT(equal(wrapped, expectedPushed));
}

{
auto buff = initial_values;
const Range wrapped{buff};

#if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-938163
if constexpr (!ranges::contiguous_range<Range>)
#endif // TRANSITION, VSO-938163
{
pop_heap(wrapped.begin(), wrapped.end(), less{}, get_first);
ASSERT(is_heap(expectedPopped.begin(), expectedPopped.end() - 1, less{}, get_first));
ASSERT(equal(wrapped.begin(), wrapped.end(), expectedPopped.begin(), expectedPopped.end()));

push_heap(wrapped.begin(), wrapped.end(), less{}, get_first);
ASSERT(is_heap(expectedPushed, less{}, get_first));
ASSERT(equal(wrapped.begin(), wrapped.end(), expectedPushed.begin(), expectedPushed.end()));
}
pop_heap(wrapped.begin(), wrapped.end(), less{}, get_first);
ASSERT(is_heap(expectedPopped.begin(), expectedPopped.end() - 1, less{}, get_first));
ASSERT(equal(wrapped.begin(), wrapped.end(), expectedPopped.begin(), expectedPopped.end()));

push_heap(wrapped.begin(), wrapped.end(), less{}, get_first);
ASSERT(is_heap(expectedPushed, less{}, get_first));
ASSERT(equal(wrapped.begin(), wrapped.end(), expectedPushed.begin(), expectedPushed.end()));
}
}
};
Expand Down
48 changes: 21 additions & 27 deletions tests/std/tests/P0896R4_ranges_alg_move/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,36 +37,30 @@ struct instantiator {

template <ranges::input_range Read, indirectly_writable<ranges::range_rvalue_reference_t<Read>> Write>
static constexpr void call() {
#if !defined(__clang__) && !defined(__EDG__) // TRANSITION, VSO-938163
#pragma warning(suppress : 4127) // conditional expression is constant
if (!ranges::contiguous_range<Read> || !is_constant_evaluated())
#endif // TRANSITION, VSO-938163
using ranges::move, ranges::move_result, ranges::equal, ranges::iterator_t;
{
using ranges::move, ranges::move_result, ranges::equal, ranges::iterator_t;
{
int_wrapper input[3] = {13, 55, 12345};
int_wrapper output[3] = {-2, -2, -2};
Read wrapped_input{input};
int_wrapper input[3] = {13, 55, 12345};
int_wrapper output[3] = {-2, -2, -2};
Read wrapped_input{input};

auto result = move(wrapped_input, Write{output});
STATIC_ASSERT(same_as<decltype(result), move_result<iterator_t<Read>, Write>>);
assert(result.in == wrapped_input.end());
assert(result.out.peek() == output + 3);
assert(equal(output, expected_output));
assert(equal(input, expected_input));
}
{
int_wrapper input[3] = {13, 55, 12345};
int_wrapper output[3] = {-2, -2, -2};
Read wrapped_input{input};
auto result = move(wrapped_input, Write{output});
STATIC_ASSERT(same_as<decltype(result), move_result<iterator_t<Read>, Write>>);
assert(result.in == wrapped_input.end());
assert(result.out.peek() == output + 3);
assert(equal(output, expected_output));
assert(equal(input, expected_input));
}
{
int_wrapper input[3] = {13, 55, 12345};
int_wrapper output[3] = {-2, -2, -2};
Read wrapped_input{input};

auto result = move(wrapped_input.begin(), wrapped_input.end(), Write{output});
STATIC_ASSERT(same_as<decltype(result), move_result<iterator_t<Read>, Write>>);
assert(result.in == wrapped_input.end());
assert(result.out.peek() == output + 3);
assert(equal(output, expected_output));
assert(equal(input, expected_input));
}
auto result = move(wrapped_input.begin(), wrapped_input.end(), Write{output});
STATIC_ASSERT(same_as<decltype(result), move_result<iterator_t<Read>, Write>>);
assert(result.in == wrapped_input.end());
assert(result.out.peek() == output + 3);
assert(equal(output, expected_output));
assert(equal(input, expected_input));
}
}
};
Expand Down
Loading