Skip to content

Commit 78d5940

Browse files
authored
Update gimli/object/addr2line crates (#11198)
* Update gimli/object/addr2line crates Keeping up-to-date on their major version tracks * Update backtrace and allow duplicates for now
1 parent e611217 commit 78d5940

File tree

8 files changed

+90
-36
lines changed

8 files changed

+90
-36
lines changed

Cargo.lock

Lines changed: 54 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@ wasm-compose = "0.235.0"
345345
arbitrary = "1.4.0"
346346
mutatis = "0.3.2"
347347
cc = "1.0"
348-
object = { version = "0.36.5", default-features = false, features = ['read_core', 'elf'] }
349-
gimli = { version = "0.31.0", default-features = false, features = ['read'] }
350-
addr2line = { version = "0.24.1", default-features = false }
348+
object = { version = "0.37.0", default-features = false, features = ['read_core', 'elf'] }
349+
gimli = { version = "0.32.0", default-features = false, features = ['read'] }
350+
addr2line = { version = "0.25.0", default-features = false }
351351
anyhow = { version = "1.0.93", default-features = false }
352352
windows-sys = "0.60.0"
353353
env_logger = "0.11.5"

cranelift/filetests/src/test_unwind.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -561,9 +561,6 @@ mod systemv {
561561
Nop => {
562562
writeln!(w, " DW_CFA_nop")?;
563563
}
564-
_ => {
565-
writeln!(w, " DW_CFA_<unknown>")?;
566-
}
567564
},
568565
}
569566
}

crates/cranelift/src/debug/transform/line_program.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ where
7575
out_encoding,
7676
line_encoding,
7777
out_comp_dir,
78+
None,
7879
out_comp_name,
7980
None,
8081
);

crates/cranelift/src/debug/transform/simulate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ fn generate_line_info(
4747
out_encoding,
4848
line_encoding,
4949
out_comp_dir,
50+
None,
5051
out_comp_name,
5152
None,
5253
);

deny.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ skip-tree = [
5252
# criterion is on old version, will update on next release.
5353
{ name = "itertools" },
5454

55+
# backtrace currently using an older version of gimli/addr2line
56+
{ name = "backtrace" },
57+
5558
# right now terminal_size pulls in an older version of io-lifetimes
5659
{ name = "io-lifetimes" },
5760

supply-chain/audits.toml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,12 @@ criteria = "safe-to-deploy"
975975
delta = "0.22.0 -> 0.24.1"
976976
notes = "Lots of internal code refactorings and code movement. Nothing out of place however."
977977

978+
[[audits.addr2line]]
979+
who = "Alex Crichton <[email protected]>"
980+
criteria = "safe-to-deploy"
981+
delta = "0.24.1 -> 0.25.0"
982+
notes = "All minor changes, even a net reduction of `unsafe`."
983+
978984
[[audits.adler]]
979985
who = "Alex Crichton <[email protected]>"
980986
criteria = "safe-to-deploy"
@@ -2034,6 +2040,12 @@ criteria = "safe-to-deploy"
20342040
delta = "0.31.0 -> 0.31.1"
20352041
notes = "No fundmanetally new `unsafe` code, some small refactoring of existing code. Lots of changes in tests, not as many changes in the rest of the crate. More dwarf!"
20362042

2043+
[[audits.gimli]]
2044+
who = "Alex Crichton <[email protected]>"
2045+
criteria = "safe-to-deploy"
2046+
delta = "0.31.1 -> 0.32.0"
2047+
notes = "Ever more DWARF to parse, but also no new `unsafe` and everything looks like gimli."
2048+
20372049
[[audits.glob]]
20382050
who = "Jamey Sharp <[email protected]>"
20392051
criteria = "safe-to-deploy"
@@ -2662,6 +2674,12 @@ criteria = "safe-to-deploy"
26622674
delta = "0.36.0 -> 0.36.5"
26632675
notes = "No new unsafe code, lots of new relocations/objects support, everything looks nominal"
26642676

2677+
[[audits.object]]
2678+
who = "Alex Crichton <[email protected]>"
2679+
criteria = "safe-to-deploy"
2680+
delta = "0.36.5 -> 0.37.1"
2681+
notes = "New object file formats, new formatting, new other minor changes, no new `unsafe`."
2682+
26652683
[[audits.once_cell]]
26662684
who = "Chris Fallin <[email protected]>"
26672685
criteria = "safe-to-deploy"
@@ -4375,6 +4393,12 @@ user-id = 2915 # Amanieu d'Antras (Amanieu)
43754393
start = "2023-06-29"
43764394
end = "2024-07-14"
43774395

4396+
[[trusted.backtrace]]
4397+
criteria = "safe-to-deploy"
4398+
user-id = 55123 # rust-lang-owner
4399+
start = "2025-05-06"
4400+
end = "2026-07-08"
4401+
43784402
[[trusted.bstr]]
43794403
criteria = "safe-to-deploy"
43804404
user-id = 189 # Andrew Gallant (BurntSushi)

supply-chain/imports.lock

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -650,11 +650,10 @@ user-login = "dtolnay"
650650
user-name = "David Tolnay"
651651

652652
[[publisher.backtrace]]
653-
version = "0.3.74"
654-
when = "2024-09-08"
655-
user-id = 539
656-
user-login = "cuviper"
657-
user-name = "Josh Stone"
653+
version = "0.3.75"
654+
when = "2025-05-06"
655+
user-id = 55123
656+
user-login = "rust-lang-owner"
658657

659658
[[publisher.bstr]]
660659
version = "1.6.0"

0 commit comments

Comments
 (0)