aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2024-07-27 08:03:39 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2024-07-27 08:14:31 +0300
commitdd3740bc9af7fa735444c348d70607a1bd135661 (patch)
treee9ba406bb8741928c46e5edcf70bcc936caa978f
parentfe1a7ca8bcac9c41fe972d15f5aebce436b681de (diff)
downloadydb-dd3740bc9af7fa735444c348d70607a1bd135661.tar.gz
Update contrib/libs/backtrace to 2024-07-12
f527c96e178fd2bc8253fc60f8b0a7af7aa8cda3
-rw-r--r--contrib/libs/backtrace/atomic.c2
-rw-r--r--contrib/libs/backtrace/backtrace-supported.h2
-rw-r--r--contrib/libs/backtrace/backtrace.c2
-rw-r--r--contrib/libs/backtrace/backtrace.h2
-rw-r--r--contrib/libs/backtrace/dwarf.c2
-rw-r--r--contrib/libs/backtrace/elf.c37
-rw-r--r--contrib/libs/backtrace/fileline.c2
-rw-r--r--contrib/libs/backtrace/internal.h2
-rw-r--r--contrib/libs/backtrace/macho.c16
-rw-r--r--contrib/libs/backtrace/mmap.c2
-rw-r--r--contrib/libs/backtrace/mmapio.c2
-rw-r--r--contrib/libs/backtrace/posix.c2
-rw-r--r--contrib/libs/backtrace/print.c2
-rw-r--r--contrib/libs/backtrace/simple.c2
-rw-r--r--contrib/libs/backtrace/sort.c2
-rw-r--r--contrib/libs/backtrace/state.c2
-rw-r--r--contrib/libs/backtrace/ya.make4
17 files changed, 44 insertions, 41 deletions
diff --git a/contrib/libs/backtrace/atomic.c b/contrib/libs/backtrace/atomic.c
index fcac485b23..21785a19e8 100644
--- a/contrib/libs/backtrace/atomic.c
+++ b/contrib/libs/backtrace/atomic.c
@@ -1,5 +1,5 @@
/* atomic.c -- Support for atomic functions if not present.
- Copyright (C) 2013-2021 Free Software Foundation, Inc.
+ Copyright (C) 2013-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/backtrace-supported.h b/contrib/libs/backtrace/backtrace-supported.h
index 1ece38888f..39482feb9e 100644
--- a/contrib/libs/backtrace/backtrace-supported.h
+++ b/contrib/libs/backtrace/backtrace-supported.h
@@ -1,5 +1,5 @@
/* backtrace-supported.h.in -- Whether stack backtrace is supported.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/backtrace.c b/contrib/libs/backtrace/backtrace.c
index 7b62900852..3e6b81e9a3 100644
--- a/contrib/libs/backtrace/backtrace.c
+++ b/contrib/libs/backtrace/backtrace.c
@@ -1,5 +1,5 @@
/* backtrace.c -- Entry point for stack backtrace library.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/backtrace.h b/contrib/libs/backtrace/backtrace.h
index 69cea4ca1e..de92a3afb3 100644
--- a/contrib/libs/backtrace/backtrace.h
+++ b/contrib/libs/backtrace/backtrace.h
@@ -1,5 +1,5 @@
/* backtrace.h -- Public header file for stack backtrace library.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/dwarf.c b/contrib/libs/backtrace/dwarf.c
index 07bf335e8c..54bff64b0d 100644
--- a/contrib/libs/backtrace/dwarf.c
+++ b/contrib/libs/backtrace/dwarf.c
@@ -1,5 +1,5 @@
/* dwarf.c -- Get file/line information from DWARF for backtraces.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/elf.c b/contrib/libs/backtrace/elf.c
index 6635ea0185..81fcf4e000 100644
--- a/contrib/libs/backtrace/elf.c
+++ b/contrib/libs/backtrace/elf.c
@@ -1,5 +1,5 @@
/* elf.c -- Get debug data from an ELF file for backtraces.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
@@ -5687,10 +5687,10 @@ elf_uncompress_lzma_block (const unsigned char *compressed,
/* Block header CRC. */
computed_crc = elf_crc32 (0, compressed + block_header_offset,
block_header_size - 4);
- stream_crc = (compressed[off]
- | (compressed[off + 1] << 8)
- | (compressed[off + 2] << 16)
- | (compressed[off + 3] << 24));
+ stream_crc = ((uint32_t)compressed[off]
+ | ((uint32_t)compressed[off + 1] << 8)
+ | ((uint32_t)compressed[off + 2] << 16)
+ | ((uint32_t)compressed[off + 3] << 24));
if (unlikely (computed_crc != stream_crc))
{
elf_uncompress_failed ();
@@ -6300,10 +6300,10 @@ elf_uncompress_lzma (struct backtrace_state *state,
/* Next comes a CRC of the stream flags. */
computed_crc = elf_crc32 (0, compressed + 6, 2);
- stream_crc = (compressed[8]
- | (compressed[9] << 8)
- | (compressed[10] << 16)
- | (compressed[11] << 24));
+ stream_crc = ((uint32_t)compressed[8]
+ | ((uint32_t)compressed[9] << 8)
+ | ((uint32_t)compressed[10] << 16)
+ | ((uint32_t)compressed[11] << 24));
if (unlikely (computed_crc != stream_crc))
{
elf_uncompress_failed ();
@@ -6344,10 +6344,10 @@ elf_uncompress_lzma (struct backtrace_state *state,
/* Before that is a footer CRC. */
computed_crc = elf_crc32 (0, compressed + offset, 6);
- stream_crc = (compressed[offset - 4]
- | (compressed[offset - 3] << 8)
- | (compressed[offset - 2] << 16)
- | (compressed[offset - 1] << 24));
+ stream_crc = ((uint32_t)compressed[offset - 4]
+ | ((uint32_t)compressed[offset - 3] << 8)
+ | ((uint32_t)compressed[offset - 2] << 16)
+ | ((uint32_t)compressed[offset - 1] << 24));
if (unlikely (computed_crc != stream_crc))
{
elf_uncompress_failed ();
@@ -6403,10 +6403,10 @@ elf_uncompress_lzma (struct backtrace_state *state,
/* Next is a CRC of the index. */
computed_crc = elf_crc32 (0, compressed + index_offset,
offset - index_offset);
- stream_crc = (compressed[offset]
- | (compressed[offset + 1] << 8)
- | (compressed[offset + 2] << 16)
- | (compressed[offset + 3] << 24));
+ stream_crc = ((uint32_t)compressed[offset]
+ | ((uint32_t)compressed[offset + 1] << 8)
+ | ((uint32_t)compressed[offset + 2] << 16)
+ | ((uint32_t)compressed[offset + 3] << 24));
if (unlikely (computed_crc != stream_crc))
{
elf_uncompress_failed ();
@@ -6841,7 +6841,8 @@ elf_add (struct backtrace_state *state, const char *filename, int descriptor,
}
}
- if (!gnu_debugdata_view_valid
+ if (!debuginfo
+ && !gnu_debugdata_view_valid
&& strcmp (name, ".gnu_debugdata") == 0)
{
if (!elf_get_view (state, descriptor, memory, memory_size,
diff --git a/contrib/libs/backtrace/fileline.c b/contrib/libs/backtrace/fileline.c
index e16fc0ee3d..68e80c6d27 100644
--- a/contrib/libs/backtrace/fileline.c
+++ b/contrib/libs/backtrace/fileline.c
@@ -1,5 +1,5 @@
/* fileline.c -- Get file and line number information in a backtrace.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/internal.h b/contrib/libs/backtrace/internal.h
index c6fc717e81..4fa0af8cb6 100644
--- a/contrib/libs/backtrace/internal.h
+++ b/contrib/libs/backtrace/internal.h
@@ -1,5 +1,5 @@
/* internal.h -- Internal header file for stack backtrace library.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/macho.c b/contrib/libs/backtrace/macho.c
index acb07254ad..8f768f14a5 100644
--- a/contrib/libs/backtrace/macho.c
+++ b/contrib/libs/backtrace/macho.c
@@ -1,5 +1,5 @@
/* elf.c -- Get debug data from a Mach-O file for backtraces.
- Copyright (C) 2020-2021 Free Software Foundation, Inc.
+ Copyright (C) 2020-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
@@ -271,12 +271,14 @@ struct macho_nlist_64
/* Value found in nlist n_type field. */
-#define MACH_O_N_EXT 0x01 /* Extern symbol */
+#define MACH_O_N_STAB 0xe0 /* Stabs debugging symbol */
+#define MACH_O_N_TYPE 0x0e /* Mask for type bits */
+
+/* Values found after masking with MACH_O_N_TYPE. */
+#define MACH_O_N_UNDF 0x00 /* Undefined symbol */
#define MACH_O_N_ABS 0x02 /* Absolute symbol */
-#define MACH_O_N_SECT 0x0e /* Defined in section */
+#define MACH_O_N_SECT 0x0e /* Defined in section from n_sect field */
-#define MACH_O_N_TYPE 0x0e /* Mask for type bits */
-#define MACH_O_N_STAB 0xe0 /* Stabs debugging symbol */
/* Information we keep for a Mach-O symbol. */
@@ -492,10 +494,10 @@ macho_defined_symbol (uint8_t type)
{
if ((type & MACH_O_N_STAB) != 0)
return 0;
- if ((type & MACH_O_N_EXT) != 0)
- return 0;
switch (type & MACH_O_N_TYPE)
{
+ case MACH_O_N_UNDF:
+ return 0;
case MACH_O_N_ABS:
return 1;
case MACH_O_N_SECT:
diff --git a/contrib/libs/backtrace/mmap.c b/contrib/libs/backtrace/mmap.c
index d7313be73f..322ed94566 100644
--- a/contrib/libs/backtrace/mmap.c
+++ b/contrib/libs/backtrace/mmap.c
@@ -1,5 +1,5 @@
/* mmap.c -- Memory allocation with mmap.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/mmapio.c b/contrib/libs/backtrace/mmapio.c
index 7f6fa8d274..b780c3d07d 100644
--- a/contrib/libs/backtrace/mmapio.c
+++ b/contrib/libs/backtrace/mmapio.c
@@ -1,5 +1,5 @@
/* mmapio.c -- File views using mmap.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/posix.c b/contrib/libs/backtrace/posix.c
index 924631d2e6..79f4950f84 100644
--- a/contrib/libs/backtrace/posix.c
+++ b/contrib/libs/backtrace/posix.c
@@ -1,5 +1,5 @@
/* posix.c -- POSIX file I/O routines for the backtrace library.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/print.c b/contrib/libs/backtrace/print.c
index 93d0d3abb4..3e61f02ebb 100644
--- a/contrib/libs/backtrace/print.c
+++ b/contrib/libs/backtrace/print.c
@@ -1,5 +1,5 @@
/* print.c -- Print the current backtrace.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/simple.c b/contrib/libs/backtrace/simple.c
index 785e726e6b..fd3fac688f 100644
--- a/contrib/libs/backtrace/simple.c
+++ b/contrib/libs/backtrace/simple.c
@@ -1,5 +1,5 @@
/* simple.c -- The backtrace_simple function.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/sort.c b/contrib/libs/backtrace/sort.c
index a60a980e65..fedfe21cbd 100644
--- a/contrib/libs/backtrace/sort.c
+++ b/contrib/libs/backtrace/sort.c
@@ -1,5 +1,5 @@
/* sort.c -- Sort without allocating memory
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/state.c b/contrib/libs/backtrace/state.c
index 0f368a2390..b564a18b54 100644
--- a/contrib/libs/backtrace/state.c
+++ b/contrib/libs/backtrace/state.c
@@ -1,5 +1,5 @@
/* state.c -- Create the backtrace state.
- Copyright (C) 2012-2021 Free Software Foundation, Inc.
+ Copyright (C) 2012-2024 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/libs/backtrace/ya.make b/contrib/libs/backtrace/ya.make
index fa6c20e4ca..65e49d05d9 100644
--- a/contrib/libs/backtrace/ya.make
+++ b/contrib/libs/backtrace/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSD-3-Clause)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(2024-07-11)
+VERSION(2024-07-12)
-ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/d4bdca038e8685af3043683a881af37489fc1827.tar.gz)
+ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/febbb9bff98b39ee596aa15d1f58e4bba442cd6a.tar.gz)
ADDINCL(
contrib/libs/backtrace