Skip to content

Commit 20495d6

Browse files
alexv-smirnovalexv-smirnov
committed
Merge branch 'rightlib' into merge-libs-250116-0020
2 parents f322990 + 96a6bd3 commit 20495d6

File tree

147 files changed

+2894
-3826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+2894
-3826
lines changed

‎build/conf/compilers/gnu_compiler.conf

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,6 @@ when ($OS_EMSCRIPTEN == "yes") {
101101
CFLAGS+=-D__EMSCRIPTEN__
102102
}
103103

104-
when ($ARCH_WASM64 == "yes") {
105-
CFLAGS+=-D_LIBCPP_HAS_MUSL_LIBC
106-
}
107-
108-
when ($ARCH_WASM32 == "yes") {
109-
CFLAGS+=-D_musl_
110-
}
111-
112104
CFLAGS+=$_C_FLAGS $DEBUG_INFO_FLAGS $_C_FOPTIONS $C_WARNING_OPTS $GCC_PREPROCESSOR_OPTS $USER_CFLAGS $USER_CFLAGS_GLOBAL
113105
CXXFLAGS+=$CFLAGS $_STD_CXX $CXX_WARNING_OPTS $USER_CXXFLAGS $USER_CXXFLAGS_GLOBAL
114106
CONLYFLAGS+=$USER_CONLYFLAGS $USER_CONLYFLAGS_GLOBAL

‎build/conf/settings.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ YMAKE_USE_NEW_UIDS=yes
1919
PIC_NO_PIE=no
2020
FAIL_PY2=no
2121
MAIN_OUTPUT_AS_EXTRA=yes
22+
USE_REACHABILITY_TO_REPORT_CONF_ERRORS = yes
2223

2324
when ($YMAKE_USE_OLD_UIDS == "yes") {
2425
YMAKE_USE_NEW_UIDS=no

‎build/config/tests/cpp_style/config18.clang-format

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
Language: Cpp
2+
AccessModifierOffset: -4
3+
ConstructorInitializerIndentWidth: 4
4+
AlignEscapedNewlinesLeft: false
5+
AlignEscapedNewlines: Left
6+
AlignTrailingComments:
7+
Kind: Always
8+
OverEmptyLines: 0
9+
AllowAllParametersOfDeclarationOnNextLine: true
10+
AllowShortBlocksOnASingleLine: false
11+
AllowShortIfStatementsOnASingleLine: false
12+
AllowShortLoopsOnASingleLine: false
13+
AllowShortFunctionsOnASingleLine: None
14+
AlwaysBreakTemplateDeclarations: true
15+
AlwaysBreakBeforeMultilineStrings: false
16+
BreakBeforeBinaryOperators: false
17+
BreakBeforeTernaryOperators: true
18+
BreakConstructorInitializersBeforeComma: true
19+
BinPackParameters: true
20+
ColumnLimit: 0
21+
ConstructorInitializerAllOnOneLineOrOnePerLine: false
22+
DerivePointerAlignment: false
23+
ExperimentalAutoDetectBinPacking: false
24+
IndentCaseLabels: true
25+
IndentWrappedFunctionNames: false
26+
IndentFunctionDeclarationAfterType: false
27+
MaxEmptyLinesToKeep: 1
28+
KeepEmptyLinesAtTheStartOfBlocks: false
29+
NamespaceIndentation: All
30+
FixNamespaceComments: true
31+
ShortNamespaceLines: 0
32+
ObjCSpaceAfterProperty: false
33+
ObjCSpaceBeforeProtocolList: true
34+
PackConstructorInitializers: Never
35+
PenaltyBreakBeforeFirstCallParameter: 19
36+
PenaltyBreakComment: 300
37+
PenaltyBreakString: 1000
38+
PenaltyBreakFirstLessLess: 120
39+
PenaltyExcessCharacter: 1000000
40+
PenaltyReturnTypeOnItsOwnLine: 60
41+
PointerAlignment: Left
42+
SpacesBeforeTrailingComments: 1
43+
SpacesInSquareBrackets: false
44+
Cpp11BracedListStyle: true
45+
Standard: c++20
46+
IndentWidth: 4
47+
TabWidth: 4
48+
UseTab: Never
49+
BreakBeforeBraces: Attach
50+
InsertBraces: true
51+
52+
# NB: BraceWrapping has no effect unless BreakBeforeBraces is set to Custom
53+
BraceWrapping:
54+
AfterClass: false
55+
AfterControlStatement: false
56+
AfterEnum: false
57+
AfterFunction: false
58+
AfterNamespace: false
59+
AfterObjCDeclaration: false
60+
AfterStruct: false
61+
AfterUnion: false
62+
BeforeCatch: false
63+
BeforeElse: false
64+
IndentBraces: true
65+
66+
SpacesInParentheses: false
67+
SpacesInAngles: false
68+
SpaceInEmptyParentheses: false
69+
SpacesInCStyleCastParentheses: false
70+
SpacesInContainerLiterals: true
71+
SpaceBeforeAssignmentOperators: true
72+
ContinuationIndentWidth: 4
73+
CommentPragmas: '^ IWYU pragma:'
74+
ForEachMacros: [
75+
foreach,
76+
Q_FOREACH,
77+
BOOST_FOREACH,
78+
# Is not a foreach, but correct formatting is achieved
79+
Y_DEFER
80+
]
81+
IfMacros: [
82+
with_lock # Is not an if, but correct formatting is achieved
83+
]
84+
SpaceBeforeParens: ControlStatements
85+
DisableFormat: false
86+
SortIncludes: false
87+
IndentPPDirectives: BeforeHash
88+
89+
SpaceBeforeInheritanceColon: false
90+
NamespaceMacros: [Y_UNIT_TEST_SUITE]
91+
AttributeMacros: [Y_PRINTF_FORMAT, Y_NO_SANITIZE, Y_FORCE_INLINE, Y_NO_INLINE, Y_WARN_UNUSED_RESULT, Y_HIDDEN, Y_PUBLIC, Y_PURE_FUNCTION]
92+
IndentExternBlock: Indent
93+
TypenameMacros: [Y_THREAD, Y_STATIC_THREAD, Y_POD_THREAD, Y_POD_STATIC_THREAD]
94+
StatementAttributeLikeMacros: [ythrow]
95+
SpacesInLineCommentPrefix:
96+
Minimum: 1
97+
Maximum: 1

‎build/config/tests/cpp_style/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ LIBRARY()
22

33
RESOURCE_FILES(
44
config.clang-format
5+
config18.clang-format
56
)
67

78
END()

‎build/mapping.conf.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,8 @@
482482
"7750425697": "https://devtools-registry.s3.yandex.net/7750425697",
483483
"7808687279": "https://devtools-registry.s3.yandex.net/7808687279",
484484
"7808709138": "https://devtools-registry.s3.yandex.net/7808709138",
485+
"7827427680": "https://devtools-registry.s3.yandex.net/7827427680",
486+
"7827481464": "https://devtools-registry.s3.yandex.net/7827481464",
485487
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
486488
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
487489
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -1645,6 +1647,8 @@
16451647
"7750425697": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
16461648
"7808687279": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
16471649
"7808709138": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1650+
"7827427680": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1651+
"7827481464": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
16481652
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
16491653
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
16501654
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",

‎build/platform/test_tool/host.ya.make.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808708280)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827478825)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808707972)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827476769)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808709138)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827481464)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808707633)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827475180)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808708809)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827480238)
1111

1212
ENDIF()

‎build/platform/test_tool/host_os.ya.make.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808686430)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827425105)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808685838)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827423650)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808687279)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827427680)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808685532)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827422227)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7808686875)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7827426459)
1111

1212
ENDIF()

‎build/scripts/make_java_srclists.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@ def main():
2424
parser = argparse.ArgumentParser()
2525
parser.add_argument('--moddir')
2626
parser.add_argument('--java')
27-
parser.add_argument('--groovy')
2827
parser.add_argument('--kotlin')
2928
parser.add_argument('--coverage')
3029
parser.add_argument('--source-root')
3130
args, remaining_args = parser.parse_known_args(args)
3231

3332
java = []
3433
kotlin = []
35-
groovy = []
3634
coverage = []
3735

3836
cur_resources_list_file = None
@@ -74,8 +72,6 @@ def main():
7472
kotlin.append(src)
7573
if args.coverage and args.source_root:
7674
add_rel_src_to_coverage(coverage, src, args.source_root)
77-
elif args.groovy and src.endswith(".groovy"):
78-
groovy.append(src)
7975
else:
8076
if src == '--resources':
8177
if cur_resources_list_file is not None:
@@ -118,9 +114,6 @@ def main():
118114
if args.kotlin:
119115
with open(args.kotlin, 'w') as f:
120116
writelines(f, kotlin)
121-
if args.groovy:
122-
with open(args.groovy, 'w') as f:
123-
writelines(f, groovy)
124117
if args.coverage:
125118
jcov.write_coverage_sources(args.coverage, args.source_root, coverage)
126119

‎build/sysincl/stl-to-libcxx.yml

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,34 @@
5050

5151
# Though these are headers provided by libcxx, we do not want to allow them to be included.
5252
# We are using non-existent filename to generate error instead, as there is no specific syntax for this case.
53-
- includes:
54-
- ext/hash_map: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_MAP
55-
- ext/hash_set: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_SET
56-
- experimental/any: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_ANY
57-
- experimental/chrono: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_CHRONO
58-
- experimental/coroutine: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_COROUTINE
59-
- experimental/filesystem: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_FILESYSTEM
60-
- experimental/numeric: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_NUMERIC
61-
- experimental/memory: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_MEMORY
62-
- experimental/optional: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_OPTIONAL
63-
- experimental/ratio: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_RATIO
64-
- experimental/source_location: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SOURCE_LOCATION
65-
- experimental/string_view: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_STRING_VIEW
66-
- experimental/system_error: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SYSTEM_ERROR
67-
- experimental/tuple: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_TUPLE
68-
53+
# GENERATED BY YM2
54+
- source_filter: "^(?!(contrib/libs/cxxsupp/libcxx)).*"
55+
includes:
56+
- ext/__hash: DO_NOT_INCLUDE_NON_STANDARD_EXT___HASH
57+
- ext/hash_map: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_MAP
58+
- ext/hash_set: DO_NOT_INCLUDE_NON_STANDARD_EXT_HASH_SET
59+
- experimental/__config: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___CONFIG
60+
- experimental/__memory: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___MEMORY
61+
- experimental/__simd/abi_tag.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_ABI_TAG_H
62+
- experimental/__simd/aligned_tag.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_ALIGNED_TAG_H
63+
- experimental/__simd/declaration.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_DECLARATION_H
64+
- experimental/__simd/internal_declaration.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_INTERNAL_DECLARATION_H
65+
- experimental/__simd/reference.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_REFERENCE_H
66+
- experimental/__simd/scalar.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_SCALAR_H
67+
- experimental/__simd/simd.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_SIMD_H
68+
- experimental/__simd/simd_mask.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_SIMD_MASK_H
69+
- experimental/__simd/traits.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_TRAITS_H
70+
- experimental/__simd/utility.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_UTILITY_H
71+
- experimental/__simd/vec_ext.h: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL___SIMD_VEC_EXT_H
72+
- experimental/iterator: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_ITERATOR
73+
- experimental/memory: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_MEMORY
74+
#TODO: ban this header too
75+
# - experimental/propagate_const: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_PROPAGATE_CONST
76+
- experimental/simd: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_SIMD
77+
- experimental/type_traits: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_TYPE_TRAITS
78+
- experimental/utility: DO_NOT_INCLUDE_NON_STANDARD_EXPERIMENTAL_UTILITY
6979

7080
# This includes all headers needed to resolve includes in c-headers from libcxx listed above
71-
# GENERATED BY YM2
7281
- includes:
7382
- algorithm: contrib/libs/cxxsupp/libcxx/include/algorithm
7483
- any: contrib/libs/cxxsupp/libcxx/include/any

‎build/ymake.core.conf

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ _TOOL_PROTOC_GEN_GO_GRPC_V2=vendor/google.golang.org/grpc/cmd/protoc-gen-go-grpc
112112
_TOOL_RESCOMPILER=tools/rescompiler
113113
_TOOL_RESCOMPRESSOR=tools/rescompressor
114114
_TOOL_RORESCOMPILER=tools/rorescompiler
115+
TOOL_CPPYNDEXER=
115116

116117
when ($DISABLE_SEPARATE_AUX_CPP != "yes") {
117118
SEPARATE_AUX_CPP=yes
@@ -257,8 +258,15 @@ otherwise {
257258

258259
# tag:codenav
259260
when ($CODENAVIGATION && $NOCODENAVIGATION != "yes") {
261+
when ($TOOL_CPPYNDEXER == "") {
262+
_TOOL_CPPYNDEXER_REAL=$CPPYNDEXER_RESOURCE_GLOBAL/yndexer
263+
}
264+
otherwise {
265+
_TOOL_CPPYNDEXER_REAL=$TOOL_CPPYNDEXER
266+
}
267+
260268
PY_PROGRAM_LINK_EXE=$LINK_EXE && ${hide;kv:"pyndex $TARGET"}
261-
YNDEXER_ARGS=$YMAKE_PYTHON ${input:"build/scripts/yndexer.py"} $CPPYNDEXER_RESOURCE_GLOBAL/yndexer 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC}
269+
YNDEXER_ARGS=$YMAKE_PYTHON ${input:"build/scripts/yndexer.py"} $_TOOL_CPPYNDEXER_REAL 1500 $(SOURCE_ROOT) $ARCADIA_BUILD_ROOT ${input:SRC}
262270
YNDEXER_OUTPUT=${noauto;output;suf=${OBJ_CROSS_SUF}${COMPILE_OUT_SUFFIX}.ydx.pb2:SRC}
263271
}
264272
otherwise {
@@ -764,6 +772,9 @@ module _BASE_UNIT: _BARE_UNIT {
764772
when ($OS_EMSCRIPTEN == "yes") {
765773
when ($NOLIBC != "yes") {
766774
PEERDIR+=contrib/restricted/emscripten/include
775+
PEERDIR+=contrib/restricted/emscripten/system/lib/c
776+
PEERDIR+=contrib/restricted/emscripten/system/lib/dlmalloc
777+
PEERDIR+=contrib/restricted/emscripten/system/lib/standalonewasm
767778
}
768779
}
769780

0 commit comments

Comments
 (0)