mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unnest a variable in prep for the next commit which needs access to the place

Browse Source
This commit is contained in:
Oli Scherer 2022-12-15 14:39:25 +00:00
parent 8006510ab0
commit 8d00f762dd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_mir_build/src/build/matches/test.rs
View File

@ -387,11 +387,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
make_target_blocks: impl FnOnce(&mut Self) -> Vec<BasicBlock>, make_target_blocks: impl FnOnce(&mut Self) -> Vec<BasicBlock>,
source_info: SourceInfo, source_info: SourceInfo,
value: ConstantKind<'tcx>, value: ConstantKind<'tcx>,
place: Place<'tcx>, mut val: Place<'tcx>,
mut ty: Ty<'tcx>, mut ty: Ty<'tcx>,
) { ) {
let mut expect = self.literal_operand(source_info.span, value); let mut expect = self.literal_operand(source_info.span, value);
let mut val = Operand::Copy(place);
// If we're using `b"..."` as a pattern, we need to insert an // If we're using `b"..."` as a pattern, we need to insert an
// unsizing coercion, as the byte string has the type `&[u8; N]`. // unsizing coercion, as the byte string has the type `&[u8; N]`.
@ -421,9 +420,13 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
block, block,
source_info, source_info,
temp, temp,
Rvalue::Cast(CastKind::Pointer(PointerCast::Unsize), val, ty), Rvalue::Cast(
CastKind::Pointer(PointerCast::Unsize),
Operand::Copy(val),
ty,
),
); );
val = Operand::Move(temp); val = temp;
} }
if opt_ref_test_ty.is_some() { if opt_ref_test_ty.is_some() {
let slice = self.temp(ty, source_info.span); let slice = self.temp(ty, source_info.span);
@ -463,7 +466,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
literal: method, literal: method,
})), })),
args: vec![val, expect], args: vec![Operand::Copy(val), expect],
destination: eq_result, destination: eq_result,
target: Some(eq_block), target: Some(eq_block),
unwind: UnwindAction::Continue, unwind: UnwindAction::Continue,