nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #79272 - tmiasko:array-clone, r=jonas-schievink

Browse Source 
Support building clone shims for arrays with generic size

Fixes #79269.
This commit is contained in:
Dylan DPC 2020-11-21 19:44:20 +01:00 committed by GitHub
commit 68c9caa6f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/rustc_mir/src/shim.rs
View File

@ -308,10 +308,7 @@ fn build_clone_shim<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId, self_ty: Ty<'tcx>) -
match self_ty.kind() {
_ if is_copy => builder.copy_shim(),
ty::Array(ty, len) => {
let len = len.eval_usize(tcx, param_env);
builder.array_shim(dest, src, ty, len)
}
ty::Array(ty, len) => builder.array_shim(dest, src, ty, len),
ty::Closure(_, substs) => {
builder.tuple_like_shim(dest, src, substs.as_closure().upvar_tys())
}
@ -485,7 +482,13 @@ impl CloneShimBuilder<'tcx> {
}
}
fn array_shim(&mut self, dest: Place<'tcx>, src: Place<'tcx>, ty: Ty<'tcx>, len: u64) {
fn array_shim(
&mut self,
dest: Place<'tcx>,
src: Place<'tcx>,
ty: Ty<'tcx>,
len: &'tcx ty::Const<'tcx>,
) {
let tcx = self.tcx;
let span = self.span;
@ -503,7 +506,11 @@ impl CloneShimBuilder<'tcx> {
))),
self.make_statement(StatementKind::Assign(box (
end,
Rvalue::Use(Operand::Constant(self.make_usize(len))),
Rvalue::Use(Operand::Constant(box Constant {
span: self.span,
user_ty: None,
literal: len,
})),
))),
];
self.block(inits, TerminatorKind::Goto { target: BasicBlock::new(1) }, false);

13
src/test/ui/mir/mir-inlining/array-clone-with-generic-size.rs Normal file
View File

@ -0,0 +1,13 @@
// Checks that we can build a clone shim for array with generic size.
// Regression test for issue #79269.
//
// build-pass
// compile-flags: -Zmir-opt-level=2 -Zvalidate-mir
#![feature(min_const_generics)]
#[derive(Clone)]
struct Array<T, const N: usize>([T; N]);
fn main() {
let _ = Array([0u32, 1u32, 2u32]).clone();
}