Skip to content

Commit cba0a0a

Browse files
committed
Auto merge of rust-lang#130417 - workingjubilee:pull-in-backtrace-with-zstd, r=<try>
Support symbolicating zstd-compressed ELF sections This requires bumping backtrace to rust-lang/backtrace-rs@4f3acf7 which includes support for symbolicating from newer Android APK formats, as well as for using zstd-compressed ELF sections for debuginfo. It also requires compiling ruzstd, a zstd decompressor written in Rust. This can combine with rust-lld's support for zstd-compressed debuginfo for overall smaller debuginfo sections.
2 parents 04a3187 + 7cd48bd commit cba0a0a

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

library/Cargo.lock

+12
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,17 @@ dependencies = [
312312
"std",
313313
]
314314

315+
[[package]]
316+
name = "ruzstd"
317+
version = "0.7.2"
318+
source = "registry+https://github.com/rust-lang/crates.io-index"
319+
checksum = "99c3938e133aac070997ddc684d4b393777d293ba170f2988c8fd5ea2ad4ce21"
320+
dependencies = [
321+
"compiler_builtins",
322+
"rustc-std-workspace-alloc",
323+
"rustc-std-workspace-core",
324+
]
325+
315326
[[package]]
316327
name = "std"
317328
version = "0.0.0"
@@ -336,6 +347,7 @@ dependencies = [
336347
"rand",
337348
"rand_xorshift",
338349
"rustc-demangle",
350+
"ruzstd",
339351
"std_detect",
340352
"unwind",
341353
"wasi",

library/std/Cargo.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ rustc-demangle = { version = "0.1.24", features = ['rustc-dep-of-std'] }
3333
[target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies]
3434
miniz_oxide = { version = "0.7.0", optional = true, default-features = false }
3535
addr2line = { version = "0.22.0", optional = true, default-features = false }
36+
ruzstd = { version = "0.7.2", default-features = false }
3637

3738
[target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
3839
libc = { version = "0.2.156", default-features = false, features = [
@@ -48,6 +49,7 @@ object = { version = "0.36.0", default-features = false, optional = true, featur
4849
'unaligned',
4950
'archive',
5051
] }
52+
ruzstd = { version = "0.7.2", default-features = false, optional = true, features = [ "rustc-dep-of-std"] }
5153

5254
[target.'cfg(target_os = "aix")'.dependencies]
5355
object = { version = "0.36.0", default-features = false, optional = true, features = [
@@ -89,8 +91,9 @@ r-efi-alloc = { version = "1.0.0", features = ['rustc-dep-of-std'] }
8991
[features]
9092
backtrace = [
9193
'addr2line/rustc-dep-of-std',
92-
'object/rustc-dep-of-std',
9394
'miniz_oxide/rustc-dep-of-std',
95+
'object/rustc-dep-of-std',
96+
'ruzstd/rustc-dep-of-std',
9497
]
9598

9699
panic-unwind = ["panic_unwind"]

src/tools/tidy/src/deps.rs

+1
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ const PERMITTED_STDLIB_DEPENDENCIES: &[&str] = &[
481481
"rand_core",
482482
"rand_xorshift",
483483
"rustc-demangle",
484+
"ruzstd",
484485
"unicode-width",
485486
"unwinding",
486487
"wasi",

0 commit comments

Comments
 (0)