about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <eddyb@lyken.rs>2022-06-29 14:58:03 +0000
committerEduard-Mihai Burtescu <eddyb@lyken.rs>2022-06-29 14:58:14 +0000
commit900309ec8ae6b717d6dc04778b0e999430fcb4a1 (patch)
tree4de1e45ee471bba7b0c4960a04b51b5f97d8b55f
parent66c83ffca1512ed76f9445ec7f7280f768ef71c4 (diff)
downloadrust-900309ec8ae6b717d6dc04778b0e999430fcb4a1.tar.gz
rust-900309ec8ae6b717d6dc04778b0e999430fcb4a1.zip
rustc_codegen_ssa: use `project_index`, not `project_field`, for array literals.
-rw-r--r--compiler/rustc_codegen_ssa/src/mir/rvalue.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
index 81c1897694c..43603b0f9e7 100644
--- a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
+++ b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs
@@ -125,7 +125,12 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                     // Do not generate stores and GEPis for zero-sized fields.
                     if !op.layout.is_zst() {
                         let field_index = active_field_index.unwrap_or(i);
-                        let field = dest.project_field(&mut bx, field_index);
+                        let field = if let mir::AggregateKind::Array(_) = **kind {
+                            let llindex = bx.cx().const_usize(field_index as u64);
+                            dest.project_index(&mut bx, llindex)
+                        } else {
+                            dest.project_field(&mut bx, field_index)
+                        };
                         op.val.store(&mut bx, field);
                     }
                 }