bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #86251 - Smittyvb:thir-tree-again, r=oli-obk

Browse source 
Support -Z unpretty=thir-tree again

Currently `-Z unpretty=thir-tree` is broken after some THIR refactorings. This re-implements it, making it easier to debug THIR-related issues.

We have to do analyzes before getting the THIR, since trying to create THIR from invalid HIR can ICE. But doing those analyzes requires the THIR to be built and stolen. We work around this by creating a separate query to construct the THIR tree string representation.

Closes https://github.com/rust-lang/project-thir-unsafeck/issues/8, fixes #85552.
This commit is contained in:
bors 2021-07-28 09:01:11 +00:00
commit eba3228b2a
8 changed files with 88 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/query/mod.rs
View file

@ -230,6 +230,12 @@ rustc_queries! {
desc { |tcx| "building THIR for `{}`", tcx.def_path_str(key.did.to_def_id()) }
}
/// Create a THIR tree for debugging.
query thir_tree(key: ty::WithOptConstParam<LocalDefId>) -> String {
no_hash
desc { |tcx| "constructing THIR tree for `{}`", tcx.def_path_str(key.did.to_def_id()) }
}
/// Set of all the `DefId`s in this crate that have MIR associated with
/// them. This includes all the body owners, but also things like struct
/// constructors.