Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
297 changes: 47 additions & 250 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions compiler/rustc_codegen_gcc/Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ dependencies = [

[[package]]
name = "object"
version = "0.37.1"
version = "0.39.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03fd943161069e1768b4b3d050890ba48730e590f57e56d4aa04e7e090e61b4a"
checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b"
dependencies = [
"memchr",
]
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_gcc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ master = ["gccjit/master"]
default = ["master"]

[dependencies]
object = { version = "0.37.0", default-features = false, features = ["std", "read"] }
object = { version = "0.39.0", default-features = false, features = ["std", "read"] }
tempfile = "3.20"
gccjit = { version = "3.3.0", features = ["dlopen"] }
#gccjit = { git = "https://github.com/rust-lang/gccjit.rs", branch = "error-dlopen", features = ["dlopen"] }
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_codegen_llvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ test = false
bitflags = "2.4.1"
# To avoid duplicate dependencies, this should match the version of gimli used
# by `rustc_codegen_ssa` via its `thorin-dwp` dependency.
gimli = "0.33"
gimli = "0.34"
itertools = "0.15"
libc = "0.2"
libloading = { version = "0.9.0" }
measureme = "12.0.1"
object = { version = "0.38.1", default-features = false, features = ["std", "read"] }
object = { version = "0.39.1", default-features = false, features = ["std", "read"] }
rustc-demangle = "0.1.28"
rustc_abi = { path = "../rustc_abi" }
rustc_ast = { path = "../rustc_ast" }
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_codegen_ssa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ rustc_trait_selection = { path = "../rustc_trait_selection" }
serde_json = "1.0.59"
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
tempfile = "3.2"
thorin-dwp = "0.10"
thorin-dwp = "0.11"
tracing = "0.1"
wasm-encoder = "0.219"
wasm-encoder = "0.247"
# tidy-alphabetical-end

[target.'cfg(unix)'.dependencies]
Expand All @@ -48,7 +48,7 @@ libc = "0.2.50"
# tidy-alphabetical-end

[dependencies.object]
version = "0.38.1"
version = "0.39.1"
default-features = false
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]

Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_codegen_ssa/src/back/link/raw_dylib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -477,13 +477,13 @@ fn create_elf_raw_dylib_stub(sess: &Session, soname: &str, symbols: &[DllImport]
// the DT_SONAME will be used by the linker to populate DT_NEEDED
// which the loader uses to find the library.
stub.write_align_dynamic();
stub.write_dynamic_string(elf::DT_SONAME, soname);
stub.write_dynamic_string(elf::DT_SONAME, soname).unwrap();

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the failures here are:

Returns an error for 32-bit ELF overflows.

(https://docs.rs/object/latest/object/write/elf/struct.Encoder.html#method.dynamic)

Not sure if those can happen for user reasons, but I guess either way this is just an ICE so seems OK.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The DT_ tags are definitely in u32 range. If this soname offset or verdef_count are out of range, the whole file is probably too big for 32-bit. Either way, the old version of object just casted as u32, which would be silent corruption, so I guess an ICE is better.

// LSB section "2.7. Symbol Versioning" requires `DT_VERDEFNUM` to be reliable.
if verdef_count > 1 {
stub.write_dynamic(elf::DT_VERDEFNUM, verdef_count as u64);
stub.write_dynamic(elf::DT_VERDEFNUM, verdef_count as u64).unwrap();
}
// DT_NULL terminates the .dynamic table.
stub.write_dynamic(elf::DT_NULL, 0);
stub.write_dynamic(elf::DT_NULL, 0).unwrap();

stub_buf
}
2 changes: 1 addition & 1 deletion compiler/rustc_metadata/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2024"
[dependencies]
# tidy-alphabetical-start
bitflags = "2.4.1"
libloading = "0.8.0"
libloading = "0.9.0"
odht = { version = "0.3.1", features = ["nightly"] }
rustc_abi = { path = "../rustc_abi" }
rustc_ast = { path = "../rustc_ast" }
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_metadata/src/host_dylib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fn attempt_load_dylib(path: &Path) -> Result<libloading::Library, libloading::Er
.map(|lib| lib.into());
}

unsafe { libloading::Library::new(&path) }
unsafe { libloading::Library::new(path) }
}

// On Windows the compiler would sometimes intermittently fail to open the
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_target/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2024"
# tidy-alphabetical-start
arrayvec = { version = "0.7", default-features = false }
bitflags = "2.4.1"
object = { version = "0.38.1", default-features = false, features = ["elf", "macho"] }
object = { version = "0.39.1", default-features = false, features = ["elf", "macho"] }
rustc_abi = { path = "../rustc_abi" }
rustc_data_structures = { path = "../rustc_data_structures" }
rustc_error_messages = { path = "../rustc_error_messages" }
Expand Down
4 changes: 2 additions & 2 deletions src/bootstrap/Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -491,9 +491,9 @@ dependencies = [

[[package]]
name = "object"
version = "0.38.1"
version = "0.39.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "271638cd5fa9cca89c4c304675ca658efc4e64a66c716b7cfe1afb4b9611dbbc"
checksum = "2e5a6c098c7a3b6547378093f5cc30bc54fd361ce711e05293a5cc589562739b"
dependencies = [
"memchr",
]
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ clap_complete = "4.4"
home = "0.5"
ignore = "0.4"
libc = "0.2"
object = { version = "0.38.1", default-features = false, features = ["archive", "coff", "read_core", "std", "unaligned"] }
object = { version = "0.39.1", default-features = false, features = ["archive", "coff", "read_core", "std", "unaligned"] }
opener = "0.8"
semver = "1.0"
serde = "1.0"
Expand Down
19 changes: 1 addition & 18 deletions src/bootstrap/src/utils/proc_macro_deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
/// See <https://github.com/rust-lang/rust/issues/134863>
pub static CRATES: &[&str] = &[
// tidy-alphabetical-start
"anyhow",
"allocator_api2",
"askama_derive",
"askama_parser",
"basic_toml",
"bitflags",
"block_buffer",
"bumpalo",
"cfg_if",
Expand All @@ -27,32 +26,24 @@ pub static CRATES: &[&str] = &[
"glob",
"hashbrown",
"heck",
"id_arena",
"ident_case",
"indexmap",
"intl_memoizer",
"intl_pluralrules",
"itoa",
"leb128fmt",
"libc",
"log",
"memchr",
"minimal_lexical",
"nom",
"pest",
"pest_generator",
"pest_meta",
"prettyplease",
"proc_macro2",
"quote",
"rustc_hash",
"ryu",
"self_cell",
"semver",
"serde",
"serde_core",
"serde_derive_internals",
"serde_json",
"sha2",
"smallvec",
"stable_deref_trait",
Expand All @@ -68,18 +59,10 @@ pub static CRATES: &[&str] = &[
"unic_langid_impl",
"unic_langid_macros",
"unicode_ident",
"unicode_xid",
"version_check",
"wasm_bindgen_macro_support",
"wasm_bindgen_shared",
"wasm_encoder",
"wasm_metadata",
"wasmparser",
"winnow",
"wit_bindgen_core",
"wit_bindgen_rust",
"wit_component",
"wit_parser",
"yoke",
"zerofrom",
"zerovec",
Expand Down
6 changes: 3 additions & 3 deletions src/tools/run-make-support/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ edition = "2024"

# tidy-alphabetical-start
bstr = "1.12"
gimli = "0.33"
gimli = "0.34"
libc = "0.2"
object = { version = "0.38.1", features = ["wasm"] }
object = { version = "0.39.1", features = ["wasm"] }
regex = "1.11"
serde_json = "1.0"
similar = "2.7"
tempfile = "3"
wasmparser = { version = "0.243", default-features = false, features = ["std", "features", "validate"] }
wasmparser = { version = "0.247", default-features = false, features = ["std", "features", "validate"] }
# tidy-alphabetical-end

# Shared with bootstrap and compiletest
Expand Down
3 changes: 2 additions & 1 deletion src/tools/tidy/src/deps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"jiff-tzdb-platform",
"jobserver",
"lazy_static",
"leb128",
"leb128fmt",
"libc",
"libloading",
"linux-raw-sys",
Expand Down Expand Up @@ -432,6 +432,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"scoped-tls",
"scopeguard",
"self_cell",
"semver",
"serde",
"serde_core",
"serde_derive",
Expand Down
4 changes: 2 additions & 2 deletions tests/run-make/wasm-import-module/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ fn main() {
for payload in wasmparser::Parser::new(0).parse_all(&file) {
let payload = payload.unwrap();
if let wasmparser::Payload::ImportSection(s) = payload {
for i in s {
let i = i.unwrap();
for i in s.into_iter().flat_map(Result::unwrap) {
let (_, i) = i.unwrap();

@Mark-Simulacrum Mark-Simulacrum Aug 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this wants https://docs.rs/wasmparser/latest/wasmparser/type.ImportSectionReader.html#method.into_imports? Not quite sure what the flat_map is flattening - is that an iterator or an option? Not sure if we're on latest wasmparser...

View changes since the review

imports.entry(i.module).or_insert(Vec::new()).push((i.name, i.ty));
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/run-make/wasm-spurious-import/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ fn main() {
for payload in wasmparser::Parser::new(0).parse_all(&file) {
let payload = payload.unwrap();
if let wasmparser::Payload::ImportSection(s) = payload {
for i in s {
let i = i.unwrap();
for i in s.into_iter().flat_map(Result::unwrap) {
let (_, i) = i.unwrap();
imports.entry(i.module).or_insert(Vec::new()).push((i.name, i.ty));
}
}
Expand Down
4 changes: 2 additions & 2 deletions tests/run-make/wasm-symbols-different-module/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ fn test(file: &str, args: &[&str], expected_imports: &[(&str, &[&str])]) {
for payload in wasmparser::Parser::new(0).parse_all(&file) {
let payload = payload.unwrap();
if let wasmparser::Payload::ImportSection(s) = payload {
for i in s {
let i = i.unwrap();
for i in s.into_iter().flat_map(Result::unwrap) {
let (_, i) = i.unwrap();
imports.entry(i.module).or_insert(HashSet::new()).insert(i.name);
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/codegen/duplicated-path-in-error.gnu.stderr
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
error: couldn't load codegen backend /non-existing-one.so: cannot open shared object file: No such file or directory
error: couldn't load codegen backend /non-existing-one.so: dlopen failed: /non-existing-one.so: cannot open shared object file: No such file or directory

Loading