mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #99340 - GoldsteinE:fix-localdefid-debug-ice, r=lcnr

Browse Source 
Fix ICE in Definitions::create_def

`Debug` implementation for `LocalDefId` uses global `Definitions`. Normally it’s ok, but we can’t do it while holding a mutable reference to `Definitions`, since it causes ICE or deadlock (depending on whether `parallel_compiler` is enabled).

This PR effectively copies the `Debug` implementation into the problematic method. I don’t particularly love this solution (since it creates code duplication), but I don’t see any other options.

This issue was discovered when running `rustdoc` with `RUSTDOC_LOG=trace` on the following file:
```rust
pub struct SomeStruct;

fn asdf() {
    impl SomeStruct {
        pub fn qwop(&self) {
            println!("hidden function");
        }
    }
}
```

I’m not sure how to create a test for this behavior.
This commit is contained in:
Matthias Krüger 2022-08-01 16:49:27 +02:00 committed by GitHub
commit 58042bffac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_hir/src/definitions.rs
View File

@ -338,7 +338,12 @@ impl Definitions {
/// Adds a definition with a parent definition. /// Adds a definition with a parent definition.
pub fn create_def(&mut self, parent: LocalDefId, data: DefPathData) -> LocalDefId { pub fn create_def(&mut self, parent: LocalDefId, data: DefPathData) -> LocalDefId {
debug!("create_def(parent={:?}, data={:?})", parent, data); // We can't use `Debug` implementation for `LocalDefId` here, since it tries to acquire a
// reference to `Definitions` and we're already holding a mutable reference.
debug!(
"create_def(parent={}, data={data:?})",
self.def_path(parent).to_string_no_crate_verbose(),
);
// The root node must be created with `create_root_def()`. // The root node must be created with `create_root_def()`.
assert!(data != DefPathData::CrateRoot); assert!(data != DefPathData::CrateRoot);

4
compiler/rustc_middle/src/ty/context.rs
View File

@ -1459,11 +1459,11 @@ impl<'tcx> TyCtxt<'tcx> {
}; };
format!( format!(
"{}[{}]{}", "{}[{:04x}]{}",
crate_name, crate_name,
// Don't print the whole stable crate id. That's just // Don't print the whole stable crate id. That's just
// annoying in debug output. // annoying in debug output.
&(format!("{:08x}", stable_crate_id.to_u64()))[..4], stable_crate_id.to_u64() >> 8 * 6,
self.def_path(def_id).to_string_no_crate_verbose() self.def_path(def_id).to_string_no_crate_verbose()
) )
} }