diff options
| author | bors <bors@rust-lang.org> | 2024-12-19 11:25:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-19 11:25:43 +0000 |
| commit | 3bf62ccc1055a94dfa6a72650b10a71dcf232429 (patch) | |
| tree | 8f590d8d4e8b1fc9e7933b646bb9ad86ac46b4f2 /compiler/rustc_codegen_ssa/src/debuginfo | |
| parent | a4079b29bb097be91b5c57d1ef7820628798e0d7 (diff) | |
| parent | e2bc71866ecc24f3221a11417102b2dec9648125 (diff) | |
| download | rust-3bf62ccc1055a94dfa6a72650b10a71dcf232429.tar.gz rust-3bf62ccc1055a94dfa6a72650b10a71dcf232429.zip | |
Auto merge of #134499 - jieyouxu:rollup-zmaveur, r=jieyouxu
Rollup of 7 pull requests Successful merges: - #133702 (Variants::Single: do not use invalid VariantIdx for uninhabited enums) - #134427 (ci: remove duplicate task definition) - #134432 (Fix intra doc links not generated inside footnote definitions) - #134437 (reduce compiler `Assemble` complexity) - #134474 (Forbid overwriting types in typeck) - #134477 (move lint_unused_mut into sub-fn) - #134491 (Some destructor/drop related tweaks) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/debuginfo')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/debuginfo/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/debuginfo/mod.rs b/compiler/rustc_codegen_ssa/src/debuginfo/mod.rs index 88d36b19da4..7c62c03d574 100644 --- a/compiler/rustc_codegen_ssa/src/debuginfo/mod.rs +++ b/compiler/rustc_codegen_ssa/src/debuginfo/mod.rs @@ -65,8 +65,8 @@ fn tag_base_type_opt<'tcx>( }); match enum_type_and_layout.layout.variants() { - // A single-variant enum has no discriminant. - Variants::Single { .. } => None, + // A single-variant or no-variant enum has no discriminant. + Variants::Single { .. } | Variants::Empty => None, Variants::Multiple { tag_encoding: TagEncoding::Niche { .. }, tag, .. } => { // Niche tags are always normalized to unsized integers of the correct size. |