[libc++] Adjust tests using ext/* headers that undefine __DEPRECATED

[john.brawn]

Summary

Several tests undefined DEPRECATED to avoid warnings as they're testing the deprecated ext/hash_map. A better way to do this is to use -Wno-deprecated so it isn't defined in the first place. This prevents these tests from failing when we give a warning when undefining the DEPRECATED macro, as D144654 will do.

For the generated tests however just remove the testing of these header files, so we don't disable the warning when testing the other header files.

[philnik]

This also disables other warnings though. I think it would be better to just not include the <ext/*> stuff in these tests anymore. They're pretty much unmaintained anyways.

[john.brawn]

Changed to removing testing of the ext/* headers.

[Mordante]

I really would like a better rationale for removing these test. Since the are not very actively maintained I really dislike the idea to remove regression tests.

libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp

45

Why not silence this warning for this test instead of removing the tests.
The ext headers may not get a lot of attention, but removing tests may cause accidental regressions not being detected.

[philnik]

In D145691#4189834, @Mordante wrote:

I really would like a better rationale for removing these test. Since the are not very actively maintained I really dislike the idea to remove regression tests.

I only meant removing them from the generated tests, since they are mostly just annoying there. The other tests can just get an // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated.

[john.brawn]

Remove only the generated tests, use -Wno-deprecated elsewhere.

[john.brawn]

Ping.

[philnik]

LGTM. I'll leave final approval to @Mordante.

[john.brawn]

Ping.

[john.brawn]

Ping.

[john.brawn]

Rebased, as some other commits have modified the same tests.

[ldionne]

LGTM. I have no love for these headers and I appreciate the cleanup. I have a small suggestion though.

libcxx/test/libcxx/extensions/hash/specializations.pass.cpp

0

This comment is not desirable anymore.

libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp

 #endif
 """.format(**vars))
 
 END-SCRIPT
 */
 
 #include <__config>
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
 int main(int, char**) { return 0; }
 
 // DO NOT MANUALLY EDIT ANYTHING BETWEEN THE MARKERS BELOW
 // GENERATED-MARKER
 // RUN: %{build} -DTEST_0
 #if defined(TEST_0)
 #   include <algorithm>
     using HandlerType = decltype(std::__libcpp_verbose_abort);

 #endif
 
 // RUN: %{build} -DTEST_137
 #if defined(TEST_137) && __cplusplus >= 201103L
 #   include <experimental/vector>
     using HandlerType = decltype(std::__libcpp_verbose_abort);
 #endif
 
-// RUN: %{build} -DTEST_138
-#if defined(TEST_138)
-#   include <ext/hash_map>
-    using HandlerType = decltype(std::__libcpp_verbose_abort);
-#endif
-
-// RUN: %{build} -DTEST_139
-#if defined(TEST_139)
-#   include <ext/hash_set>
-    using HandlerType = decltype(std::__libcpp_verbose_abort);
-#endif
-
 // GENERATED-MARKER

libcxx/test/libcxx/clang_tidy.sh.cpp

 
 // The GCC compiler flags are not always compatible with clang-tidy.
 // UNSUPPORTED: gcc
 
 // TODO: run clang-tidy with modules enabled once they are supported
 // RUN: %{clang-tidy} %s --warnings-as-errors=* -header-filter=.* --checks='-*,libcpp-*' --load=%{test-tools}/clang_tidy_checks/libcxx-tidy.plugin -- %{compile_flags} -fno-modules
 // RUN: %{clang-tidy} %s --warnings-as-errors=* -header-filter=.* --config-file=%S/../../.clang-tidy -- -Wweak-vtables %{compile_flags} -fno-modules
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 
 for header in public_headers:
   print("{}#{}include <{}>{}".format(
     '#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '',
     3 * ' ' if header in header_restrictions else '',
     header,

 #   include <experimental/unordered_set>
 #endif
 #if __cplusplus >= 201103L
 #   include <experimental/utility>
 #endif
 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER

libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp

-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
-#include <ext/hash_map>
-#include <cassert>
-
-#include "test_macros.h"
-#include "count_new.h"
-
-void test_default_does_not_allocate() {
-  DisableAllocationGuard g;
-  ((void)g);
-  {
-    __gnu_cxx::hash_map<int, int> h;
-    assert(h.bucket_count() == 0);
-  }
-  {
-    __gnu_cxx::hash_multimap<int, int> h;
-    assert(h.bucket_count() == 0);
-  }
-}
-
-int main(int, char**) {
-  test_default_does_not_allocate();
-  return 0;
-}

libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp

-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// Poison the std:: names we might use inside __gnu_cxx to ensure they're
-// properly qualified.
-struct allocator;
-struct pair;
-struct equal_to;
-struct unique_ptr;
-
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
-#include <ext/hash_map>
-
-#include "test_macros.h"
-
-
-namespace __gnu_cxx {
-template class hash_map<int, int>;
-}
-
-int main(int, char**) {
-  typedef __gnu_cxx::hash_map<int, int> Map;
-  Map m;
-  Map m2(m);
-  ((void)m2);
-
-  return 0;
-}

libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp

-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// Prevent <ext/hash_set> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
-#include <ext/hash_set>
-#include <cassert>
-
-#include "test_macros.h"
-#include "count_new.h"
-
-void test_default_does_not_allocate() {
-  DisableAllocationGuard g;
-  ((void)g);
-  {
-    __gnu_cxx::hash_set<int> h;
-    assert(h.bucket_count() == 0);
-  }
-  {
-    __gnu_cxx::hash_multiset<int> h;
-    assert(h.bucket_count() == 0);
-  }
-}
-
-int main(int, char**) {
-  test_default_does_not_allocate();
-  return 0;
-}

libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp

-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// Poison the std:: names we might use inside __gnu_cxx to ensure they're
-// properly qualified.
-struct allocator;
-struct pair;
-struct equal_to;
-struct unique_ptr;
-
-// Prevent <ext/hash_set> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
-
-#include <ext/hash_set>
-
-#include "test_macros.h"
-
-namespace __gnu_cxx {
-template class hash_set<int>;
-}
-
-int main(int, char**) {
-  typedef __gnu_cxx::hash_set<int> Set;
-  Set s;
-  Set s2(s);
-  ((void)s2);
-
-  return 0;
-}

libcxx/test/libcxx/double_include.sh.cpp

 // RUN: %{cxx} -c %s -o %t.first.o %{flags} %{compile_flags}
 // RUN: %{cxx} -c %s -o %t.second.o -DWITH_MAIN %{flags} %{compile_flags}
 // RUN: %{cxx} -o %t.exe %t.first.o %t.second.o %{flags} %{link_flags}
 // RUN: %{run}
 
 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 
 for header in public_headers:
   print("{}#{}include <{}>{}".format(
     '#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '',
     3 * ' ' if header in header_restrictions else '',
     header,

 #   include <experimental/unordered_set>
 #endif
 #if __cplusplus >= 201103L
 #   include <experimental/utility>
 #endif
 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER
 
 #if defined(WITH_MAIN)
 int main(int, char**) { return 0; }
 #endif

libcxx/test/libcxx/extensions/hash/specializations.compile.fail.cpp

-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <assert.h>
-#include <ext/hash_map>
-#include <string>
-
-int main(int, char**)
-{
-    assert(__gnu_cxx::hash<std::string>()(std::string()) == 0);  // error
-
-  return 0;
-}

libcxx/test/libcxx/extensions/hash/specializations.pass.cpp

-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-
-// NOTE: Undefined __DEPRECATED to prevent this test from failing with -Werror
-#undef __DEPRECATED
-#include <assert.h>
-#include <ext/hash_map>
-#include <string>
-
-#include "test_macros.h"
-
-int main(int, char**)
-{
-    char str[] = "test";
-    assert(__gnu_cxx::hash<const char *>()("test") ==
-           std::hash<std::string>()("test"));
-    assert(__gnu_cxx::hash<char *>()(str) == std::hash<std::string>()("test"));
-    assert(__gnu_cxx::hash<char>()(42) == 42);
-    assert(__gnu_cxx::hash<signed char>()(42) == 42);
-    assert(__gnu_cxx::hash<unsigned char>()(42) == 42);
-    assert(__gnu_cxx::hash<short>()(42) == 42);
-    assert(__gnu_cxx::hash<unsigned short>()(42) == 42);
-    assert(__gnu_cxx::hash<int>()(42) == 42);
-    assert(__gnu_cxx::hash<unsigned int>()(42) == 42);
-    assert(__gnu_cxx::hash<long>()(42) == 42);
-    assert(__gnu_cxx::hash<unsigned long>()(42) == 42);
-
-  return 0;
-}

libcxx/test/libcxx/extensions/hash_map/const_iterator.compile.fail.cpp

-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <ext/hash_map>
-
-int main(int, char**)
-{
-    __gnu_cxx::hash_map<int, int> m;
-    m[1] = 1;
-    const __gnu_cxx::hash_map<int, int> &cm = m;
-    cm.find(1)->second = 2;  // error
-
-  return 0;
-}

libcxx/test/libcxx/min_max_macros.compile.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // Test that headers are not tripped up by the surrounding code defining the
 // min() and max() macros.
 
 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 #define TEST_MACROS() static_assert(min() == true && max() == true, "")
 #define min() true
 #define max() true
 
 /*
 BEGIN-SCRIPT
 
 for header in public_headers:

 #if __cplusplus >= 201103L
 #   include <experimental/utility>
 TEST_MACROS();
 #endif
 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 TEST_MACROS();
 #endif
-#include <ext/hash_map>
-TEST_MACROS();
-#include <ext/hash_set>
-TEST_MACROS();
 // GENERATED-MARKER

libcxx/test/libcxx/modules_include.sh.cpp

 
 // The Windows headers don't appear to be compatible with modules
 // UNSUPPORTED: windows
 // UNSUPPORTED: buildhost=windows
 
 // The Android headers don't appear to be compatible with modules yet
 // XFAIL: LIBCXX-ANDROID-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 #include <__config>
 
 /*
 BEGIN-SCRIPT
 
 for i, header in enumerate(public_headers):
   print("// {}: echo '%{{cxx}} %s %{{flags}} %{{compile_flags}} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_{} &' >> %t.sh".format('RUN', i))
   print("// {}: echo 'TEST_{}=$!' >> %t.sh".format('RUN', i))

 #include <experimental/utility>
 #endif
 // RUN: echo '%{cxx} %s %{flags} %{compile_flags} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_137 &' >> %t.sh
 // RUN: echo 'TEST_137=$!' >> %t.sh
 // RUN: echo "wait $TEST_121" >> %t.sh
 #if defined(TEST_137) && __cplusplus >= 201103L
 #include <experimental/vector>
 #endif
-// RUN: echo '%{cxx} %s %{flags} %{compile_flags} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_138 &' >> %t.sh
-// RUN: echo 'TEST_138=$!' >> %t.sh
 // RUN: echo "wait $TEST_122" >> %t.sh
-#if defined(TEST_138)
-#include <ext/hash_map>
-#endif
-// RUN: echo '%{cxx} %s %{flags} %{compile_flags} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_139 &' >> %t.sh
-// RUN: echo 'TEST_139=$!' >> %t.sh
 // RUN: echo "wait $TEST_123" >> %t.sh
-#if defined(TEST_139)
-#include <ext/hash_set>
-#endif
 // RUN: echo "wait $TEST_124" >> %t.sh
 // RUN: echo "wait $TEST_125" >> %t.sh
 // RUN: echo "wait $TEST_126" >> %t.sh
 // RUN: echo "wait $TEST_127" >> %t.sh
 // RUN: echo "wait $TEST_128" >> %t.sh
 // RUN: echo "wait $TEST_129" >> %t.sh
 // RUN: echo "wait $TEST_130" >> %t.sh
 // RUN: echo "wait $TEST_131" >> %t.sh
 // RUN: echo "wait $TEST_132" >> %t.sh
 // RUN: echo "wait $TEST_133" >> %t.sh
 // RUN: echo "wait $TEST_134" >> %t.sh
 // RUN: echo "wait $TEST_135" >> %t.sh
 // RUN: echo "wait $TEST_136" >> %t.sh
 // RUN: echo "wait $TEST_137" >> %t.sh
-// RUN: echo "wait $TEST_138" >> %t.sh
-// RUN: echo "wait $TEST_139" >> %t.sh
 // RUN: bash %t.sh
 // GENERATED-MARKER

libcxx/test/libcxx/nasty_macros.compile.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // Test that headers are not tripped up by the surrounding code defining various
 // alphabetic macros.
 
 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 #define NASTY_MACRO This should not be expanded!!!
 
 // libc++ does not use single-letter names as a matter of principle.
 // But Windows' own <wchar.h>, <math.h>, and <exception> use many of these
 // (at least C,E,F,I,M,N,P,S,X,Y,Z) as uglified function parameter names,
 // so don't define these on Windows.
 //
 #ifndef _WIN32

 #   include <experimental/unordered_set>
 #endif
 #if __cplusplus >= 201103L
 #   include <experimental/utility>
 #endif
 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER

libcxx/test/libcxx/no_assert_include.compile.pass.cpp

 //===----------------------------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 // Ensure that none of the standard C++ headers implicitly include cassert or
 // assert.h (because assert() is implemented as a macro).
 
 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 
 for header in public_headers:
   if header == 'cassert':
     continue
   print("{}#{}include <{}>{}".format(
     '#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '',

 #   include <experimental/unordered_set>
 #endif
 #if __cplusplus >= 201103L
 #   include <experimental/utility>
 #endif
 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER
 
 #ifdef assert
 #error "Do not include cassert or assert.h in standard header files"
 #endif

libcxx/test/libcxx/transitive_includes.sh.cpp

 // This test doesn't work on AIX, but it should. Needs investigation.
 // XFAIL: buildhost=aix
 
 // This test is not supported when we remove the transitive includes provided for backwards
 // compatibility. When we bulk-remove them, we'll adjust the includes that are expected by
 // this test instead.
 // UNSUPPORTED: transitive-includes-disabled
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 
 import re
 
 # To re-generate the list of expected headers, temporarily set this to True, re-generate
 # the file and run this test.
 # Note that this needs to be done for all supported language versions of libc++:

 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_136 2> %t/header.experimental_utility
 #if defined(TEST_136)
 #include <experimental/utility>
 #endif
 // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_137 2> %t/header.experimental_vector
 #if defined(TEST_137)
 #include <experimental/vector>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_138 2> %t/header.ext_hash_map
-#if defined(TEST_138)
-#include <ext/hash_map>
-#endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_139 2> %t/header.ext_hash_set
-#if defined(TEST_139)
-#include <ext/hash_set>
-#endif
 // RUN: %{python} %S/transitive_includes_to_csv.py %t > %t/transitive_includes.csv
 // RUN: diff -w %S/transitive_includes/%{cxx_std}.csv %t/transitive_includes.csv
 // GENERATED-MARKER

libcxx/utils/generate_header_tests.py

 def main():
     monorepo_root = pathlib.Path(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
     include = pathlib.Path(os.path.join(monorepo_root, 'libcxx', 'include'))
     test = pathlib.Path(os.path.join(monorepo_root, 'libcxx', 'test'))
     assert(monorepo_root.exists())
 
     toplevel_headers     = sorted(str(p.relative_to(include)) for p in include.glob('[a-z]*') if is_header(p))
     experimental_headers = sorted(str(p.relative_to(include)) for p in include.glob('experimental/[a-z]*') if is_header(p))
-    extended_headers     = sorted(str(p.relative_to(include)) for p in include.glob('ext/[a-z]*') if is_header(p))
-    public_headers       = toplevel_headers + experimental_headers + extended_headers
+    public_headers       = toplevel_headers + experimental_headers
     private_headers      = sorted(str(p.relative_to(include)) for p in include.rglob('*') if is_header(p) and str(p.relative_to(include)).startswith('__'))
     variables = {
         'toplevel_headers': toplevel_headers,
         'experimental_headers': experimental_headers,
-        'extended_headers': extended_headers,
         'public_headers': public_headers,
         'private_headers': private_headers,
         'header_restrictions': header_restrictions,
         'private_headers_still_public_in_modules': private_headers_still_public_in_modules
     }
 
     produce(test.joinpath('libcxx/assertions/headers_declare_verbose_abort.sh.cpp'), variables)
     produce(test.joinpath('libcxx/clang_tidy.sh.cpp'), variables)