diff options
| author | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2021-02-15 00:00:00 +0000 | 
|---|---|---|
| committer | Tomasz Miąsko <tomasz.miasko@gmail.com> | 2021-02-16 23:52:05 +0100 | 
| commit | d06a2a368df2d15cd4e9c3e1c3e8c86727307502 (patch) | |
| tree | 2d0f2397b7229f5eb8156ea5d7a1524dc688db3d /compiler/rustc_mir/src/const_eval/eval_queries.rs | |
| parent | 5888556efe102f855f273cd1a7b343fe08d8fc76 (diff) | |
| download | rust-d06a2a368df2d15cd4e9c3e1c3e8c86727307502.tar.gz rust-d06a2a368df2d15cd4e9c3e1c3e8c86727307502.zip  | |
Pass MPlaceTy by reference not value
Diffstat (limited to 'compiler/rustc_mir/src/const_eval/eval_queries.rs')
| -rw-r--r-- | compiler/rustc_mir/src/const_eval/eval_queries.rs | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_mir/src/const_eval/eval_queries.rs b/compiler/rustc_mir/src/const_eval/eval_queries.rs index 9a2e659678d..e9a0742d493 100644 --- a/compiler/rustc_mir/src/const_eval/eval_queries.rs +++ b/compiler/rustc_mir/src/const_eval/eval_queries.rs @@ -72,7 +72,7 @@ fn eval_body_using_ecx<'mir, 'tcx>( None => InternKind::Constant, } }; - intern_const_alloc_recursive(ecx, intern_kind, ret)?; + intern_const_alloc_recursive(ecx, intern_kind, &ret)?; debug!("eval_body_using_ecx done: {:?}", *ret); Ok(ret) @@ -137,7 +137,7 @@ pub(super) fn op_to_const<'tcx>( op.try_as_mplace(ecx) }; - let to_const_value = |mplace: MPlaceTy<'_>| match mplace.ptr { + let to_const_value = |mplace: &MPlaceTy<'_>| match mplace.ptr { Scalar::Ptr(ptr) => { let alloc = ecx.tcx.global_alloc(ptr.alloc_id).unwrap_memory(); ConstValue::ByRef { alloc, offset: ptr.offset } @@ -155,12 +155,12 @@ pub(super) fn op_to_const<'tcx>( } }; match immediate { - Ok(mplace) => to_const_value(mplace), + Ok(ref mplace) => to_const_value(mplace), // see comment on `let try_as_immediate` above Err(imm) => match *imm { Immediate::Scalar(x) => match x { ScalarMaybeUninit::Scalar(s) => ConstValue::Scalar(s), - ScalarMaybeUninit::Uninit => to_const_value(op.assert_mem_place(ecx)), + ScalarMaybeUninit::Uninit => to_const_value(&op.assert_mem_place(ecx)), }, Immediate::ScalarPair(a, b) => { let (data, start) = match a.check_init().unwrap() {  | 
