Skip to content

[libc++] Adds additional FTM input validation. #138462

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[libc++] Adds additional FTM input validation. #138462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
169 changes: 168 additions & 1 deletion libcxx/test/libcxx/feature_test_macro/invalid.sh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import json

sys.path.append(sys.argv[1])
from generate_feature_test_macro_components import FeatureTestMacros
from generate_feature_test_macro_components import FeatureTestMacros, DataNotSorted


def test(output, expected):
Expand Down Expand Up @@ -106,3 +106,170 @@ def test_error(data, type, message):
KeyError,
"'implemented'",
)

test_error(
[
{
"name": "abc",
"values": {
"c++17": {
"197001": [
{
"implemented": False,
},
],
},
},
"headers": [],
},
{
"name": "ghi",
"values": {
"c++17": {
"197001": [
{
"implemented": False,
},
],
},
},
"headers": [],
},
{ # This entry is in the wrong alphabetic order
"name": "def",
"values": {
"c++17": {
"197001": [
{
"implemented": False,
},
],
},
},
"headers": [],
},
{
"name": "jkl",
"values": {
"c++17": {
"197001": [
{
"implemented": False,
},
],
},
},
"headers": [],
},
],
DataNotSorted,
"""\
The ftm names are not sorted.
--- input data
+++ sorted data
@@ -1,4 +1,4 @@
abc
+def
ghi
-def
jkl
""",
)

test_error(
[
{
"name": "abc",
"values": {
"c++14": {
"197001": [
{
"implemented": False,
},
],
},
"c++23": {
"197001": [
{
"implemented": False,
},
],
},
# This entry is in the wrong alphabetic order
# Note we don't use C++98, but C++03 instead so alphabetic order
# works this century.
"c++20": {
"197001": [
{
"implemented": False,
},
],
},
},
"headers": [],
},
],
DataNotSorted,
"""\
The C++ standard version numbers of ftm 'abc' are not sorted.
--- input data
+++ sorted data
@@ -1,3 +1,3 @@
c++14
+c++20
c++23
-c++20
""",
)

test_error(
[
{
"name": "abc",
"values": {
"c++14": {
"197001": [
{
"implemented": False,
},
],
"197002": [
{
"implemented": False,
},
],
"197004": [
{
"implemented": False,
},
],
# This entry is in the wrong alphabetic order
"197003": [
{
"implemented": False,
},
],
"197005": [
{
"implemented": False,
},
],
},
},
"headers": [],
},
],
DataNotSorted,
"""\
The value of the fmt 'abc' in c++14 are not sorted.
--- input data
+++ sorted data
@@ -1,5 +1,5 @@
197001
197002
+197003
197004
-197003
197005
""",
)
23 changes: 23 additions & 0 deletions libcxx/utils/generate_feature_test_macro_components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import os
from builtins import range
from dataclasses import dataclass
from difflib import unified_diff
from functools import reduce
from typing import (
Any,
Expand Down Expand Up @@ -1987,6 +1988,25 @@ class VersionHeader:
condition: str = None


class DataNotSorted(Exception):
pass

def validate_sorted(name:str, data: List[str]) -> None:
sorted_data = sorted(data)
if data != sorted_data:
raise DataNotSorted(
f"The {name} are not sorted.\n"
+ "\n".join(
unified_diff(
data,
sorted_data,
"input data",
"sorted data",
lineterm="",
)
) + "\n"
)

def get_ftms(
data, std_dialects: List[Std], use_implemented_status: bool
) -> Dict[Ftm, Dict[Std, Optional[Value]]]:
Expand All @@ -1996,6 +2016,7 @@ def get_ftms(
last = None
entry = dict()
implemented = True
validate_sorted(f"C++ standard version numbers of ftm '{feature['name']}'", list(feature["values"].keys()))
for std in std_dialects:
if std not in feature["values"].keys():
if last == None:
Expand All @@ -2006,6 +2027,7 @@ def get_ftms(
if implemented:
values = feature["values"][std]
assert len(values) > 0, f"{feature['name']}[{std}] has no entries"
validate_sorted(f"value of the fmt '{feature['name']}' in {std}", list(values.keys()))
for value in values:
papers = list(values[value])
assert (
Expand All @@ -2024,6 +2046,7 @@ def get_ftms(
entry[std] = last
result[feature["name"]] = entry

validate_sorted("ftm names", list(result))
return result


Expand Down
Loading