diff options
| author | bors <bors@rust-lang.org> | 2021-12-02 14:53:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-02 14:53:20 +0000 |
| commit | e5038e20999eef35260b070189883edc2a8a34b2 (patch) | |
| tree | 7009d9930f29eed3ec4e0b4492707b99ecfc9c6a /compiler/rustc_codegen_llvm/src | |
| parent | 18bb8c61a975fff6424cda831ace5b0404277145 (diff) | |
| parent | 822a05898838e4fea0b37748f4cd718693afe41b (diff) | |
| download | rust-e5038e20999eef35260b070189883edc2a8a34b2.tar.gz rust-e5038e20999eef35260b070189883edc2a8a34b2.zip | |
Auto merge of #91455 - matthiaskrgr:rollup-gix2hy6, r=matthiaskrgr
Rollup of 4 iffy pull requests Successful merges: - #89234 (Disallow non-c-like but "fieldless" ADTs from being casted to integer if they use arbitrary enum discriminant) - #91045 (Issue 90702 fix: Stop treating some crate loading failures as fatal errors) - #91394 (Bump stage0 compiler) - #91411 (Enable svh tests on msvc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs index cd29f2af016..10c7bb2eaea 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs @@ -1525,14 +1525,12 @@ fn generator_layout_and_saved_local_names( // Deref of the `Pin<&mut Self>` state argument. mir::ProjectionElem::Field(..), mir::ProjectionElem::Deref, - // Field of a variant of the state. mir::ProjectionElem::Downcast(_, variant), mir::ProjectionElem::Field(field, _), ] => { - let name = &mut generator_saved_local_names[ - generator_layout.variant_fields[variant][field] - ]; + let name = &mut generator_saved_local_names + [generator_layout.variant_fields[variant][field]]; if name.is_none() { name.replace(var.name); } |
