bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use enum2<_> instead of enum<_> for Cpp-like debuginfo enum type names.

Browse source 
And add more comments about niche tag enum encoding.
This commit is contained in:
Michael Woerister 2022-07-07 15:01:43 +02:00
parent 622da5d834
commit 063ebfa570
10 changed files with 87 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
View file

@ -389,7 +389,7 @@ fn push_debuginfo_type_name<'tcx>(
// Name will be "{closure_env#0}<T1, T2, ...>", "{generator_env#0}<T1, T2, ...>", or
// "{async_fn_env#0}<T1, T2, ...>", etc.
// In the case of cpp-like debuginfo, the name additionally gets wrapped inside of
// an artificial `enum$<>` type, as defined in msvc_enum_fallback().
// an artificial `enum2$<>` type, as defined in msvc_enum_fallback().
if cpp_like_debuginfo && t.is_generator() {
let ty_and_layout = tcx.layout_of(ParamEnv::reveal_all().and(t)).unwrap();
msvc_enum_fallback(
@ -434,7 +434,7 @@ fn push_debuginfo_type_name<'tcx>(
visited: &mut FxHashSet<Ty<'tcx>>,
) {
debug_assert!(!wants_c_like_enum_debuginfo(ty_and_layout));
output.push_str("enum$<");
output.push_str("enum2$<");
push_inner(output, visited);
push_close_angle_bracket(true, output);
}