diff options
| author | bors <bors@rust-lang.org> | 2021-12-23 19:43:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-23 19:43:04 +0000 |
| commit | c09a9529c51cde41c1101e56049d418edb07bf71 (patch) | |
| tree | 0ccbb239ed96ad77fa9487d16b5931ee788213db /compiler/rustc_codegen_ssa/src | |
| parent | 77497c74f9268ccf91d7b4c17f23bf07117d7433 (diff) | |
| parent | 996fb28298157ebccdff0cb2718289de3d775ad3 (diff) | |
| download | rust-c09a9529c51cde41c1101e56049d418edb07bf71.tar.gz rust-c09a9529c51cde41c1101e56049d418edb07bf71.zip | |
Auto merge of #92232 - matthiaskrgr:rollup-eqdac7z, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #90625 (Add `UnwindSafe` to `Once`) - #92121 (disable test with self-referential generator on Miri) - #92166 (Fixed a small typo in ui test comments) - #92203 (Store a `DefId` instead of an `AdtDef` in `AggregateKind::Adt`) - #92231 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/rvalue.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs index f087b9f7815..6f960ca44cd 100644 --- a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs +++ b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs @@ -112,9 +112,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { mir::Rvalue::Aggregate(ref kind, ref operands) => { let (dest, active_field_index) = match **kind { - mir::AggregateKind::Adt(adt_def, variant_index, _, _, active_field_index) => { + mir::AggregateKind::Adt(adt_did, variant_index, _, _, active_field_index) => { dest.codegen_set_discr(&mut bx, variant_index); - if adt_def.is_enum() { + if bx.tcx().adt_def(adt_did).is_enum() { (dest.project_downcast(&mut bx, variant_index), active_field_index) } else { (dest, active_field_index) |