Skip to content

Commit 4dbfde6

Browse files
authored
[libc++] Remove a few GCC workarounds that aren't needed anymore (#156290)
1 parent c6286b3 commit 4dbfde6

File tree

3 files changed

+1
-10
lines changed

3 files changed

+1
-10
lines changed

libcxx/test/std/iterators/iterator.requirements/indirectcallable/indirectinvocable/indirect_result_t.compile.pass.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ static_assert(!has_indirect_result<int, int*>); // int isn't invocable
3434

3535
// Test ADL-proofing (P2538R1)
3636
#if TEST_STD_VER >= 26 || defined(_LIBCPP_VERSION)
37-
// TODO: Enable this on GCC once this bug is fixed: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111419
38-
#ifndef TEST_COMPILER_GCC
3937
struct Incomplete;
4038
template<class T> struct Holder { T t; };
4139
static_assert(std::same_as<std::indirect_result_t<int (&)(int), int*>, int>);
@@ -45,4 +43,3 @@ static_assert(std::same_as<std::indirect_result_t<int (&)(Holder<
4543
static_assert(std::same_as<std::indirect_result_t<Holder<Incomplete>&(&)(Holder<Incomplete>*), Holder<Incomplete>**>, Holder<Incomplete>&>);
4644
static_assert(std::same_as<std::indirect_result_t<Holder<Incomplete>*(&)(Holder<Incomplete>*), Holder<Incomplete>**>, Holder<Incomplete>*>);
4745
#endif
48-
#endif

libcxx/test/std/utilities/memory/specialized.algorithms/specialized.destroy/ranges_destroy_at.pass.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ struct VirtualCountedBase {
5252

5353
struct VirtualCountedDerived : VirtualCountedBase {
5454
constexpr VirtualCountedDerived(int& count_ref) : VirtualCountedBase(count_ref) {}
55-
56-
// Without a definition, GCC gives an error when the destructor is invoked in a constexpr context (see
57-
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93413).
58-
constexpr ~VirtualCountedDerived() override {}
55+
constexpr ~VirtualCountedDerived() override = default;
5956
};
6057

6158
constexpr bool test() {

libcxx/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,9 @@ int main(int, char**)
117117

118118
// Non-referencable function type
119119
static_assert((!std::is_convertible<ConstFunction, Function>::value), "");
120-
// TODO(LLVM-19): Re-enable this once we switch to GCC 14. This is https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109680
121-
#ifndef TEST_COMPILER_GCC
122120
static_assert((!std::is_convertible<ConstFunction, Function*>::value), "");
123121
static_assert((!std::is_convertible<ConstFunction, Function&>::value), "");
124122
static_assert((!std::is_convertible<ConstFunction, Function&&>::value), "");
125-
#endif
126123
static_assert((!std::is_convertible<Function*, ConstFunction>::value), "");
127124
static_assert((!std::is_convertible<Function&, ConstFunction>::value), "");
128125
static_assert((!std::is_convertible<ConstFunction, ConstFunction>::value), "");

0 commit comments

Comments
 (0)