Skip to content

Commit ebfc34d

Browse files
cleanup for libcxx/test/support/container_test_types.h
1 parent ae13527 commit ebfc34d

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

libcxx/test/support/container_test_types.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -317,27 +317,8 @@ class ContainerTestAllocator
317317

318318
template <class Up, class ...Args>
319319
void construct(Up* p, Args&&... args) {
320-
#if TEST_STD_VER >= 26
321-
if(std::__libcpp_is_constant_evaluated()) {
322-
323-
// FIXME: This test relies on UB where std::__tree_node is not initialized
324-
// and only the "Container::value_type" is initialized
325-
// Need to figure out the right way to solve this without breaking both conditions
326-
// 1 of 2) Initializating tree_node in the __tree codebase (at constexpr time)
327-
// 2 of 2) Ensuring construct is only instantatiated for value_type
328-
329-
// as the test in map/map.access/index_rv_key.pass.cpp (and others)
330-
// rely on a static object (so can't be used at constpex time)
331-
// so it is avoided at this moment
332-
333-
} else
334-
#endif
335-
{
336320
static_assert((std::is_same<Up, AllowConstructT>::value),
337321
"Only allowed to construct Up");
338-
}
339-
340-
341322
assert(controller->check<Args&&...>());
342323
{
343324
InAllocatorConstructGuard g(controller);

0 commit comments

Comments
 (0)