Try to fix undeprecation/deprecation verification

Author: frederick-vs-ja

libcxx/test/libcxx/clang_modules_include.gen.py

@@ -17,7 +17,7 @@
 
 import sys
 sys.path.append(sys.argv[1])
-from libcxx.header_information import lit_header_restrictions, public_headers
+from libcxx.header_information import lit_header_restrictions, lit_header_undeprecations, public_headers
 
 for header in public_headers:
   print(f"""\
@@ -41,6 +41,7 @@
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
 {lit_header_restrictions.get(header, '')}
+{lit_header_undeprecations.get(header, '')}
 
 #include <{header}>
 """)

libcxx/test/libcxx/double_include.gen.py

@@ -15,12 +15,13 @@
 
 import sys
 sys.path.append(sys.argv[1])
-from libcxx.header_information import lit_header_restrictions, public_headers
+from libcxx.header_information import lit_header_restrictions, lit_header_undeprecations, public_headers
 
 for header in public_headers:
   print(f"""\
 //--- {header}.sh.cpp
 {lit_header_restrictions.get(header, '')}
+{lit_header_undeprecations.get(header, '')}
 
 // RUN: %{{cxx}} -c %s -o %t.first.o %{{flags}} %{{compile_flags}}
 // RUN: %{{cxx}} -c %s -o %t.second.o -DWITH_MAIN %{{flags}} %{{compile_flags}}

libcxx/test/libcxx/header_inclusions.gen.py

@@ -13,7 +13,7 @@
 
 import sys
 sys.path.append(sys.argv[1])
-from libcxx.header_information import lit_header_restrictions, public_headers, mandatory_inclusions
+from libcxx.header_information import lit_header_restrictions, lit_header_undeprecations, public_headers, mandatory_inclusions
 
 for header in public_headers:
   header_guard = lambda h: f"_LIBCPP_{h.upper().replace('.', '_').replace('/', '_')}"
@@ -37,6 +37,7 @@
   print(f"""\
 //--- {header}.compile.pass.cpp
 {lit_header_restrictions.get(header, '')}
+{lit_header_undeprecations.get(header, '')}
 
 #include <{header}>
 {checks}

libcxx/test/libcxx/libcpp_version.gen.py

@@ -12,12 +12,13 @@
 
 import sys
 sys.path.append(sys.argv[1])
-from libcxx.header_information import lit_header_restrictions, public_headers
+from libcxx.header_information import lit_header_restrictions, lit_header_undeprecations, public_headers
 
 for header in public_headers:
   print(f"""\
 //--- {header}.compile.pass.cpp
 {lit_header_restrictions.get(header, '')}
+{lit_header_undeprecations.get(header, '')}
 
 #include <{header}>
 

libcxx/test/libcxx/no_assert_include.gen.py

@@ -13,7 +13,7 @@
 
 import sys
 sys.path.append(sys.argv[1])
-from libcxx.header_information import lit_header_restrictions, public_headers
+from libcxx.header_information import lit_header_restrictions, lit_header_undeprecations, public_headers
 
 for header in public_headers:
   if header == 'cassert':
@@ -22,6 +22,7 @@
   print(f"""\
 //--- {header}.compile.pass.cpp
 {lit_header_restrictions.get(header, '')}
+{lit_header_undeprecations.get(header, '')}
 
 #include <{header}>
 

libcxx/test/libcxx/system_reserved_names.gen.py

@@ -14,13 +14,14 @@
 
 import sys
 sys.path.append(sys.argv[1])
-from libcxx.header_information import lit_header_restrictions, public_headers
+from libcxx.header_information import lit_header_restrictions, lit_header_undeprecations, public_headers
 
 for header in public_headers:
     print(
         f"""\
 //--- {header}.compile.pass.cpp
 {lit_header_restrictions.get(header, '')}
+{lit_header_undeprecations.get(header, '')}
 
 #define SYSTEM_RESERVED_NAME This name should not be used in libc++
 

libcxx/test/std/depr/depr.cpp.headers/ccomplex.verify.cpp

@@ -15,7 +15,11 @@
 #include "test_macros.h"
 
 #if TEST_STD_VER >= 20
-#  include <ccomplex> // expected-warning {{'__standard_header_ccomplex' is deprecated: removed in C++20}}
+// expected-warning {{'__standard_header_ccomplex' is deprecated: removed in C++20}}
+
+#  include <ccomplex>
 #else
-#  include <ccomplex> // expected-warning {{'__standard_header_ccomplex' is deprecated}}
+// expected-warning {{'__standard_header_ccomplex' is deprecated}}
+
+#  include <ccomplex>
 #endif

libcxx/test/std/depr/depr.cpp.headers/ciso646.verify.cpp

@@ -14,4 +14,6 @@
 
 #include "test_macros.h"
 
-#include <ciso646> // expected-warning {{'__standard_header_ciso646' is deprecated: removed in C++20}}
+// expected-warning {{'__standard_header_ciso646' is deprecated: removed in C++20}}
+
+#include <ciso646>

libcxx/test/std/depr/depr.cpp.headers/cstdalign.verify.cpp

@@ -15,7 +15,11 @@
 #include "test_macros.h"
 
 #if TEST_STD_VER >= 20
-#  include <cstdalign> // expected-warning {{'__standard_header_cstdalign' is deprecated: removed in C++20}}
+// expected-warning {{'__standard_header_cstdalign' is deprecated: removed in C++20}}
+
+#  include <cstdalign>
 #else
-#  include <cstdalign> // expected-warning {{'__standard_header_cstdalign' is deprecated}}
+// expected-warning {{'__standard_header_cstdalign' is deprecated}}
+
+#  include <cstdalign>
 #endif

libcxx/test/std/depr/depr.cpp.headers/cstdbool.verify.cpp

@@ -15,7 +15,11 @@
 #include "test_macros.h"
 
 #if TEST_STD_VER >= 20
-#  include <cstdbool> // expected-warning {{'__standard_header_cstdbool' is deprecated: removed in C++20}}
+// expected-warning {{'__standard_header_cstdbool' is deprecated: removed in C++20}}
+
+#  include <cstdbool>
 #else
-#  include <cstdbool> // expected-warning {{'__standard_header_cstdbool' is deprecated}}
+// expected-warning {{'__standard_header_cstdbool' is deprecated}}
+
+#  include <cstdbool>
 #endif

libcxx/test/std/depr/depr.cpp.headers/ctgmath.verify.cpp

@@ -15,7 +15,13 @@
 #include "test_macros.h"
 
 #if TEST_STD_VER >= 20
-#  include <ctgmath> // expected-warning {{'__standard_header_ctgmath' is deprecated: removed in C++20}}
+// expected-warning {{'__standard_header_ccomplex' is deprecated: removed in C++20}}
+// expected-warning {{'__standard_header_ctgmath' is deprecated: removed in C++20}}
+
+#  include <ctgmath>
 #else
-#  include <ctgmath> // expected-warning {{'__standard_header_ctgmath' is deprecated}}
+// expected-warning {{'__standard_header_ccomplex' is deprecated}}
+// expected-warning {{'__standard_header_ctgmath' is deprecated}}
+
+#  include <ctgmath>
 #endif

libcxx/utils/libcxx/header_information.py

@@ -70,6 +70,14 @@
     "wchar.h": "// UNSUPPORTED: no-wide-characters",
     "wctype.h": "// UNSUPPORTED: no-wide-characters",
 }
+# Undeprecate headers that are deprecated in C++17 and removed in C++20.
+lit_header_undeprecations = {
+    "ccomplex": "// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS",
+    "ciso646": "// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS",
+    "cstdalign": "// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS",
+    "cstdbool": "// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS",
+    "ctgmath": "// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS",
+}
 
 # This table was produced manually, by grepping the TeX source of the Standard's
 # library clauses for the string "#include". Each header's synopsis contains