[libcxx-commits] [libcxx] 19246b0 - [libc++] Remove the __libcpp_version file

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2022-03-31T09:34:41-04:00
New Revision: 19246b0779a255d870284d32e5a7487af4f233f6

URL: https://github.com/llvm/llvm-project/commit/19246b0779a255d870284d32e5a7487af4f233f6
DIFF: https://github.com/llvm/llvm-project/commit/19246b0779a255d870284d32e5a7487af4f233f6.diff

LOG: [libc++] Remove the __libcpp_version file

It seems to have been added back in 761e42fa3dd72 for Clang to use it,
however it seems to have never been used for that purpose, so it is
probably fine to remove it.

Differential Revision: https://reviews.llvm.org/D122330

Added: 
    

Modified: 
    libcxx/docs/Contributing.rst
    libcxx/include/CMakeLists.txt
    libcxx/test/libcxx/lint/lint_headers.sh.py
    libcxx/utils/generate_assertion_tests.py
    libcxx/utils/generate_private_header_tests.py
    libcxx/utils/graph_header_deps.py

Removed: 
    libcxx/include/__libcpp_version
    libcxx/test/libcxx/libcpp_version.pass.cpp


################################################################################
diff  --git a/libcxx/docs/Contributing.rst b/libcxx/docs/Contributing.rst
index d2bb76eb46dd4..b812b958e6a0a 100644
--- a/libcxx/docs/Contributing.rst
+++ b/libcxx/docs/Contributing.rst
@@ -67,10 +67,9 @@ Post-release check list
 After branching for an LLVM release:
 
 1. Update ``_LIBCPP_VERSION`` in ``libcxx/include/__config``
-2. Update the ``libcxx/include/__libcpp_version`` file
-3. Update the version number in ``libcxx/docs/conf.py``
-4. Update ``_LIBCPPABI_VERSION`` in ``libcxxabi/include/cxxabi.h``
-5. Update ``_LIBUNWIND_VERSION`` in ``libunwind/include/__libunwind_config.h``
+2. Update the version number in ``libcxx/docs/conf.py``
+3. Update ``_LIBCPPABI_VERSION`` in ``libcxxabi/include/cxxabi.h``
+4. Update ``_LIBUNWIND_VERSION`` in ``libunwind/include/__libunwind_config.h``
 
 Exporting new symbols from the library
 ======================================

diff  --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index c4ee88945478f..c26470e6b9849 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -267,7 +267,6 @@ set(files
   __iterator/sortable.h
   __iterator/unreachable_sentinel.h
   __iterator/wrap_iter.h
-  __libcpp_version
   __locale
   __mbstate_t.h
   __memory/addressof.h

diff  --git a/libcxx/include/__libcpp_version b/libcxx/include/__libcpp_version
deleted file mode 100644
index 9e7036918f284..0000000000000
--- a/libcxx/include/__libcpp_version
+++ /dev/null
@@ -1 +0,0 @@
-15000

diff  --git a/libcxx/test/libcxx/libcpp_version.pass.cpp b/libcxx/test/libcxx/libcpp_version.pass.cpp
deleted file mode 100644
index 8444d1eb4a387..0000000000000
--- a/libcxx/test/libcxx/libcpp_version.pass.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// 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 the __libcpp_version file matches the value of _LIBCPP_VERSION
-
-#include <__config>
-
-#ifndef _LIBCPP_VERSION
-#error _LIBCPP_VERSION must be defined
-#endif
-
-static const int libcpp_version =
-#include <__libcpp_version>
-;
-
-static_assert(_LIBCPP_VERSION == libcpp_version,
-              "_LIBCPP_VERSION doesn't match __libcpp_version");
-
-int main(int, char**) {
-
-
-  return 0;
-}

diff  --git a/libcxx/test/libcxx/lint/lint_headers.sh.py b/libcxx/test/libcxx/lint/lint_headers.sh.py
index 94adac3b163e3..9075044dc7df9 100644
--- a/libcxx/test/libcxx/lint/lint_headers.sh.py
+++ b/libcxx/test/libcxx/lint/lint_headers.sh.py
@@ -14,7 +14,6 @@ def exclude_from_consideration(path):
         path.endswith('.modulemap') or
         os.path.basename(path) == '__config' or
         os.path.basename(path) == '__config_site.in' or
-        os.path.basename(path) == '__libcpp_version' or
         not os.path.isfile(path)
     )
 

diff  --git a/libcxx/utils/generate_assertion_tests.py b/libcxx/utils/generate_assertion_tests.py
index 7ef30bc146a1e..7f9888e7d8d37 100755
--- a/libcxx/utils/generate_assertion_tests.py
+++ b/libcxx/utils/generate_assertion_tests.py
@@ -56,7 +56,7 @@
 private_headers_still_public_in_modules = [
     '__assert', '__bsd_locale_defaults.h', '__bsd_locale_fallbacks.h', '__config',
     '__config_site.in', '__debug', '__hash_table',
-    '__libcpp_version', '__threading_support', '__tree', '__undef_macros'
+    '__threading_support', '__tree', '__undef_macros'
 ]
 
 def find_script(file):

diff  --git a/libcxx/utils/generate_private_header_tests.py b/libcxx/utils/generate_private_header_tests.py
index 810657ea4f418..32b08ca0ebc66 100755
--- a/libcxx/utils/generate_private_header_tests.py
+++ b/libcxx/utils/generate_private_header_tests.py
@@ -54,7 +54,7 @@ def is_still_public(path):
     return not rp.startswith('__support') and rp not in [
         "__assert", "__bsd_locale_defaults.h", "__bsd_locale_fallbacks.h", "__config",
         "__config_site.in", "__debug", "__hash_table",
-        "__libcpp_version", "__threading_support", "__tree", "__undef_macros"
+        "__threading_support", "__tree", "__undef_macros"
     ]
 
 

diff  --git a/libcxx/utils/graph_header_deps.py b/libcxx/utils/graph_header_deps.py
index 8c19165ab493e..1fe0fcc6d19d9 100755
--- a/libcxx/utils/graph_header_deps.py
+++ b/libcxx/utils/graph_header_deps.py
@@ -14,7 +14,7 @@
 
 
 def is_config_header(h):
-    return os.path.basename(h) in ['__config', '__libcpp_version', '__undef_macros', 'version']
+    return os.path.basename(h) in ['__config', '__undef_macros', 'version']
 
 
 def is_experimental_header(h):