Skip to content

Commit 6742144

Browse files
alexv-smirnovalexv-smirnov
committed
Merge branch 'rightlib' into merge-libs-250215-0050
2 parents 952ca0f + 784038d commit 6742144

File tree

97 files changed

+616
-953
lines changed

Some content is hidden

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

97 files changed

+616
-953
lines changed

‎build/conf/linkers/ld.conf

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -369,23 +369,9 @@ _LD_LINK_FAT_PREFIX=$GENERATE_MF && $GENERATE_VCS_C_INFO_NODEP && $YMAKE_PYTHON
369369
_LD_LINK_FAT_SRCS_GLOBALS_WA=$_LD_SRCS_GLOBALS
370370
_LD_LINK_FAT_SRCS_GLOBALS_NO_WA=${rootrel;ext=.a:SRCS_GLOBAL} ${rootrel;ext=.o:SRCS_GLOBAL}
371371

372-
macro _FAT_OBJECT_ARGS_BASE(Flag, Lib) {
373-
.CMD=$Flag=$Lib
374-
}
375-
376-
# FIXME: pre=lib here is weird legacy
377-
_FAT_OBJECT_ARGS=--obj=${output;pre=lib;suf=.o:REALPRJNAME}
372+
_FAT_OBJECT_ARGS=--globals-lib=${output;pre=$MODULE_PREFIX;suf=.globals.a:REALPRJNAME}
378373
_LD_LINK_FAT_SRCS_GLOBALS=$_LD_LINK_FAT_SRCS_GLOBALS_WA
379374

380-
macro PACK_GLOBALS_IN_LIBRARY() {
381-
SET(_FAT_OBJECT_ARGS $_FAT_OBJECT_ARGS_BASE(--globals-lib, \${output;pre=$MODULE_PREFIX;suf=.globals.a:REALPRJNAME}))
382-
}
383-
384-
when ($OS_ANDROID == "yes") {
385-
_FAT_OBJECT_ARGS=
386-
_LD_LINK_FAT_SRCS_GLOBALS=$_LD_LINK_FAT_SRCS_GLOBALS_NO_WA
387-
}
388-
389375
_LD_LINK_FAT_SUFFIX1=$_LD_ARCH_FLAG \
390376
-Ya,input $AUTO_INPUT $VCS_C_OBJ \
391377
-Ya,global_srcs
@@ -410,13 +396,6 @@ LINK_RECURSIVE_LIBRARY=\
410396
$_LD_LINK_FAT_SRCS_GLOBALS_NO_WA \
411397
$_LD_LINK_FAT_SUFFIX2
412398

413-
LIBRT=-lrt
414-
LIBRESOLV=
415-
when ($OS_LINUX || $OS_DARWIN || $OS_ANDROID) {
416-
LIBRESOLV=-lresolv
417-
}
418-
PROFFLAG=-pg
419-
420399
_THINLTO_CACHE_FLAGS=
421400
macro THINLTO_CACHE(file) {
422401
DEFAULT(THINLTO_CACHE use)

‎build/conf/linkers/msvc_linker.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,6 @@ LINK_EXEC_DYN_LIB_CMDLINE=\
244244

245245
LINK_EXEC_DYN_LIB=$LINK_EXEC_DYN_LIB_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE)
246246

247-
macro PACK_GLOBALS_IN_LIBRARY() {
248-
ENABLE(UNUSED_MACRO)
249-
}
250-
251247
LINK_GLOBAL_FAT_OBJECT=\
252248
${TOOLCHAIN_ENV} \
253249
${cwd:ARCADIA_BUILD_ROOT} \

‎build/conf/opensource.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
EXPORT_CMAKE=no
22
EXPORT_GRADLE=no
33
_SEM_IGNORED=IGNORED
4-
# TODO Remove
5-
IGNORED=IGNORED
64

75
when ($OPENSOURCE == "yes" || $OPENSOURCE_PROJECT == "ymake" || $OPENSOURCE_PROJECT == "ya") {
86
YA_OPENSOURCE=yes

‎build/conf/project_specific/yql_udf.conf

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,6 @@ module YQL_UDF_TEST: PY3TEST_BIN {
5050
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
5151
}
5252

53-
module YQL_UDF_TEST_CONTRIB: PY3TEST_BIN {
54-
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
55-
56-
PEERDIR(yql/essentials/tests/common/udf_test)
57-
58-
DEPENDS(yql/essentials/tools/astdiff)
59-
DEPENDS(yql/tools/yqlrun)
60-
DEPENDS(yql/essentials/tools/udf_resolver)
61-
DATA(arcadia/yql/essentials/mount)
62-
DATA(arcadia/yql/essentials/cfg/udf_test)
63-
ENV(YQL_ASTDIFF_PATH="yql/essentials/tools/astdiff/astdiff")
64-
ENV(YQL_CONFIG_DIR="yql/essentials/cfg/udf_test")
65-
ENV(YQL_YQLRUN_PATH="yql/tools/yqlrun/yqlrun")
66-
ENV(YQL_SQL2YQL_PATH="yql/essentials/tools/sql2yql/sql2yql")
67-
ENV(YQL_UDFRESOLVER_PATH="yql/essentials/tools/udf_resolver/udf_resolver")
68-
}
69-
7053
### @usage: _ADD_YQL_UDF_DEPS()
7154
###
7255
### Add all needed PEERDIRs to a YQL_UDF.

‎build/plugins/lib/nots/typescript/tests/test_ts_config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def create_empty_ts_config(self, path):
246246
def create_ts_config_with_data_once(self, path):
247247
cfg = TsConfig(path=path)
248248

249-
if path == "/foo/./base-tsconfig.json":
249+
if path == "/foo/base-tsconfig.json":
250250
cfg.data = {"extends": "./extends/recursive/tsconfig.json"}
251251
else:
252252
cfg.data = {}
@@ -269,7 +269,7 @@ def test_extends_single_with_dot(self, monkeypatch):
269269

270270
paths = cfg_main.inline_extend({})
271271

272-
assert paths == ["./extends/tsconfig.json"]
272+
assert paths == ["/foo/extends/tsconfig.json"]
273273

274274
def test_extends_single_without_dot(self, monkeypatch):
275275
monkeypatch.setattr(TsConfig, "load", self.create_empty_ts_config)
@@ -279,7 +279,7 @@ def test_extends_single_without_dot(self, monkeypatch):
279279

280280
paths = cfg_main.inline_extend({"extends": "dir/extends"})
281281

282-
assert paths == ["dir/extends/tsconfig.json"]
282+
assert paths == ["/foo/dir/extends/tsconfig.json"]
283283

284284
def test_extends_array(self, monkeypatch):
285285
monkeypatch.setattr(TsConfig, "load", self.create_empty_ts_config)
@@ -289,7 +289,7 @@ def test_extends_array(self, monkeypatch):
289289

290290
paths = cfg_main.inline_extend({"extends": "dir/extends"})
291291

292-
assert paths == ["dir/extends/tsconfig1.json", "dir/extends/tsconfig2.json"]
292+
assert paths == ["/foo/dir/extends/tsconfig1.json", "/foo/dir/extends/tsconfig2.json"]
293293

294294
def test_extends_empty_array(self):
295295
cfg_main = TsConfig(path="/foo/tsconfig.json")
@@ -307,4 +307,4 @@ def test_recursive_extend(self, monkeypatch):
307307

308308
paths = cfg_main.inline_extend({})
309309

310-
assert paths == ["./base-tsconfig.json", "./extends/recursive/tsconfig.json"]
310+
assert paths == ["/foo/base-tsconfig.json", "/foo/extends/recursive/tsconfig.json"]

‎build/plugins/lib/nots/typescript/ts_config.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ def extend_one(self, dep_paths, ext_value):
118118

119119
if ext_value.startswith("."):
120120
base_config_path = ext_value
121-
122121
else:
123122
dep_name = utils.extract_package_name_from_path(ext_value)
124123
# the rest part is the ext config path
@@ -134,15 +133,15 @@ def extend_one(self, dep_paths, ext_value):
134133
base_config_path = os.path.join(dep_path, file_path)
135134

136135
rel_path = os.path.dirname(base_config_path)
137-
tsconfig_curdir_path = os.path.join(os.path.dirname(self.path), base_config_path)
138-
if os.path.isdir(tsconfig_curdir_path):
136+
base_config_path = os.path.normpath(os.path.join(os.path.dirname(self.path), base_config_path))
137+
if os.path.isdir(base_config_path):
139138
base_config_path = os.path.join(base_config_path, DEFAULT_TS_CONFIG_FILE)
140139

141140
# processing the base file recursively
142-
base_config = TsConfig.load(os.path.join(os.path.dirname(self.path), base_config_path))
141+
base_config = TsConfig.load(base_config_path)
143142
paths = [base_config_path] + base_config.inline_extend(dep_paths)
144-
145143
self.merge(rel_path, base_config)
144+
146145
return paths
147146

148147
def inline_extend(self, dep_paths):

‎build/plugins/nots.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from enum import auto, StrEnum
33
from typing import Any, Literal, TYPE_CHECKING
44

5-
65
# noinspection PyUnresolvedReferences
76
import ymake
87

@@ -466,7 +465,7 @@ def on_ts_configure(unit: NotsUnitType) -> None:
466465

467466
tsconfig = TsConfig.load(abs_tsconfig_path)
468467
config_files = tsconfig.inline_extend(dep_paths)
469-
config_files = _resolve_module_files(unit, mod_dir, config_files)
468+
config_files = [rootrel_arc_src(path, unit) for path in config_files]
470469

471470
use_tsconfig_outdir = unit.get("TS_CONFIG_USE_OUTDIR") == "yes"
472471
tsconfig.validate(use_tsconfig_outdir)
@@ -714,19 +713,6 @@ def _setup_stylelint(unit: NotsUnitType) -> None:
714713
unit.set(["TEST_RECIPES_VALUE", recipes_value])
715714

716715

717-
def _resolve_module_files(unit: NotsUnitType, mod_dir: str, file_paths: list[str]) -> list[str]:
718-
mod_dir_with_sep_len = len(mod_dir) + 1
719-
resolved_files = []
720-
721-
for path in file_paths:
722-
resolved = rootrel_arc_src(path, unit)
723-
if resolved.startswith(mod_dir):
724-
resolved = resolved[mod_dir_with_sep_len:]
725-
resolved_files.append(resolved)
726-
727-
return resolved_files
728-
729-
730716
def _set_resource_vars(
731717
unit: NotsUnitType, erm_json: 'ErmJsonLite', tool: str, version: 'Version', nodejs_major: int = None
732718
) -> None:

‎contrib/libs/backtrace/.yandex_meta/override.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
pkgs: attrs: with pkgs; with attrs; rec {
2-
version = "2024-11-29";
2+
version = "2025-01-30";
33

44
src = fetchFromGitHub {
55
owner = "ianlancetaylor";
66
repo = "libbacktrace";
7-
rev = "1db85642e3fca189cf4e076f840a45d6934b2456";
8-
hash = "sha256-hRZqnro0fXFrcyMiC7k5Ztm0qckRV23UbzpmCThQ3Y4=";
7+
rev = "78af4ffa26e15532847c1ba854ece7b3bacc6b1a";
8+
hash = "sha256-yx++/urCnaBt2QQsevSXjZ1aAHfBEznk5Dq3JscPyiQ=";
99
};
1010

1111
patches = [];

‎contrib/libs/backtrace/elf.c

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,10 @@ elf_fetch_bits (const unsigned char **ppin, const unsigned char *pinend,
11471147
next = __builtin_bswap32 (next);
11481148
#endif
11491149
#else
1150-
next = pin[0] | (pin[1] << 8) | (pin[2] << 16) | (pin[3] << 24);
1150+
next = ((uint32_t)pin[0]
1151+
| ((uint32_t)pin[1] << 8)
1152+
| ((uint32_t)pin[2] << 16)
1153+
| ((uint32_t)pin[3] << 24));
11511154
#endif
11521155

11531156
val |= (uint64_t)next << bits;
@@ -1198,7 +1201,10 @@ elf_fetch_bits_backward (const unsigned char **ppin,
11981201
next = __builtin_bswap32 (next);
11991202
#endif
12001203
#else
1201-
next = pin[0] | (pin[1] << 8) | (pin[2] << 16) | (pin[3] << 24);
1204+
next = ((uint32_t)pin[0]
1205+
| ((uint32_t)pin[1] << 8)
1206+
| ((uint32_t)pin[2] << 16)
1207+
| ((uint32_t)pin[3] << 24));
12021208
#endif
12031209

12041210
val <<= 32;
@@ -5872,10 +5878,10 @@ elf_uncompress_lzma_block (const unsigned char *compressed,
58725878
/* The byte at compressed[off] is ignored for some
58735879
reason. */
58745880

5875-
code = ((compressed[off + 1] << 24)
5876-
+ (compressed[off + 2] << 16)
5877-
+ (compressed[off + 3] << 8)
5878-
+ compressed[off + 4]);
5881+
code = ((uint32_t)(compressed[off + 1] << 24)
5882+
+ ((uint32_t)compressed[off + 2] << 16)
5883+
+ ((uint32_t)compressed[off + 3] << 8)
5884+
+ (uint32_t)compressed[off + 4]);
58795885
off += 5;
58805886

58815887
/* This is the main LZMA decode loop. */
@@ -6198,10 +6204,10 @@ elf_uncompress_lzma_block (const unsigned char *compressed,
61986204
return 0;
61996205
}
62006206
computed_crc = elf_crc32 (0, uncompressed, uncompressed_offset);
6201-
stream_crc = (compressed[off]
6202-
| (compressed[off + 1] << 8)
6203-
| (compressed[off + 2] << 16)
6204-
| (compressed[off + 3] << 24));
6207+
stream_crc = ((uint32_t)compressed[off]
6208+
| ((uint32_t)compressed[off + 1] << 8)
6209+
| ((uint32_t)compressed[off + 2] << 16)
6210+
| ((uint32_t)compressed[off + 3] << 24));
62056211
if (computed_crc != stream_crc)
62066212
{
62076213
elf_uncompress_failed ();
@@ -6336,10 +6342,10 @@ elf_uncompress_lzma (struct backtrace_state *state,
63366342

63376343
/* Before that is the size of the index field, which precedes the
63386344
footer. */
6339-
index_size = (compressed[offset - 4]
6340-
| (compressed[offset - 3] << 8)
6341-
| (compressed[offset - 2] << 16)
6342-
| (compressed[offset - 1] << 24));
6345+
index_size = ((size_t)compressed[offset - 4]
6346+
| ((size_t)compressed[offset - 3] << 8)
6347+
| ((size_t)compressed[offset - 2] << 16)
6348+
| ((size_t)compressed[offset - 1] << 24));
63436349
index_size = (index_size + 1) * 4;
63446350
offset -= 4;
63456351

‎contrib/libs/backtrace/ya.make

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ LICENSE(BSD-3-Clause)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9-
VERSION(2024-11-29)
9+
VERSION(2025-01-30)
1010

11-
ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/1db85642e3fca189cf4e076f840a45d6934b2456.tar.gz)
11+
ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/78af4ffa26e15532847c1ba854ece7b3bacc6b1a.tar.gz)
1212

1313
ADDINCL(
1414
contrib/libs/backtrace

0 commit comments

Comments
 (0)