Skip to content

[libc++] Adds is_implemented function for new ftm generator. #134538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions libcxx/test/libcxx/feature_test_macro/implemented_ftms.sh.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@ def test_implementation(self):
"c++23": "201907L",
"c++26": "299900L",
},
"__cpp_lib_format": {
"c++20": None,
"c++23": None,
"c++26": None,
},
"__cpp_lib_format": {},
"__cpp_lib_parallel_algorithm": {
"c++17": "201603L",
"c++20": "201603L",
Expand All @@ -55,11 +51,7 @@ def test_implementation(self):
"c++23": "202102L",
"c++26": "202102L",
},
"__cpp_lib_missing_FTM_in_older_standard": {
"c++17": None,
"c++20": None,
"c++26": None,
},
"__cpp_lib_missing_FTM_in_older_standard": {},
}

self.assertEqual(self.ftm.implemented_ftms, expected)
Expand Down
39 changes: 39 additions & 0 deletions libcxx/test/libcxx/feature_test_macro/is_implemented.sh.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# ===----------------------------------------------------------------------===##
#
# 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
#
# ===----------------------------------------------------------------------===##

# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/test/libcxx/feature_test_macro/test_data.json

import sys
import unittest

UTILS = sys.argv[1]
TEST_DATA = sys.argv[2]
del sys.argv[1:3]

sys.path.append(UTILS)
from generate_feature_test_macro_components import FeatureTestMacros, Metadata


class Test(unittest.TestCase):
def setUp(self):
self.ftm = FeatureTestMacros(TEST_DATA)
self.maxDiff = None # This causes the diff to be printed when the test fails

def test_implementation(self):
# FTM not available in C++14.
self.assertEqual(self.ftm.is_implemented("__cpp_lib_any", "c++14"), False)
self.assertEqual(self.ftm.is_implemented("__cpp_lib_any", "c++17"), True)

self.assertEqual(self.ftm.is_implemented("__cpp_lib_format", "c++20"), False)

# FTM C++20 202106L, libc++ has 202102L
self.assertEqual(self.ftm.is_implemented("__cpp_lib_variant", "c++20"), False)


if __name__ == "__main__":
unittest.main()
17 changes: 15 additions & 2 deletions libcxx/utils/generate_feature_test_macro_components.py
Original file line number Diff line number Diff line change
Expand Up @@ -2010,7 +2010,8 @@ def get_ftms(
else:
break

entry[std] = last
if last:
entry[std] = last
result[feature["name"]] = entry

return result
Expand Down Expand Up @@ -2206,6 +2207,18 @@ def implemented_ftms(self) -> Dict[Ftm, Dict[Std, Optional[Value]]]:

return get_ftms(self.__data, self.std_dialects, True)

def is_implemented(self, ftm: Ftm, std: Std) -> bool:
"""Has the FTM `ftm` been implemented in the dialect `std`?"""

# When a paper for C++20 has not been implemented in libc++, then there will be no
# FTM entry in implemented_ftms for C++23 and later. Similarly, a paper like <format>
# has no entry in standard_ftms for e.g. C++11.
if not std in self.implemented_ftms[ftm].keys() or not std in self.standard_ftms[ftm].keys():
return False

return self.implemented_ftms[ftm][std] == self.standard_ftms[ftm][std]


@functools.cached_property
def ftm_metadata(self) -> Dict[Ftm, Metadata]:
"""Returns the metadata of the FTMs defined in the Standard.
Expand Down Expand Up @@ -2239,7 +2252,7 @@ def version_header_implementation(self) -> Dict[Std, Dict[Ftm, VersionHeader]]:
continue
last_value = value

implemented = self.implemented_ftms[ftm][std] == self.standard_ftms[ftm][std]
implemented = self.is_implemented(ftm, std)
entry = VersionHeader(
value,
implemented,
Expand Down
Loading