rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #98964 - RalfJung:typo, r=Dylan-DPC

Browse Source 
fix typo in function name

I don't know what I was doing when I named that function...
follow-up to #98888
r? `@oli-obk`
This commit is contained in:
Dylan DPC
2022-07-06 14:49:11 +05:30
committed by GitHub
parent df1f415305 4687afa480
commit 56667b5a07
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_const_eval/src/interpret/machine.rs
View File

@@ -145,7 +145,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
} }
/// Whether CheckedBinOp MIR statements should actually check for overflow. /// Whether CheckedBinOp MIR statements should actually check for overflow.
fn check_binop_checks_overflow(_ecx: &InterpCx<'mir, 'tcx, Self>) -> bool; fn checked_binop_checks_overflow(_ecx: &InterpCx<'mir, 'tcx, Self>) -> bool;
/// Entry point for obtaining the MIR of anything that should get evaluated. /// Entry point for obtaining the MIR of anything that should get evaluated.
/// So not just functions and shims, but also const/static initializers, anonymous /// So not just functions and shims, but also const/static initializers, anonymous
@@ -472,7 +472,7 @@ pub macro compile_time_machine(<$mir: lifetime, $tcx: lifetime>) {
} }
#[inline(always)] #[inline(always)]
fn check_binop_checks_overflow(_ecx: &InterpCx<$mir, $tcx, Self>) -> bool { fn checked_binop_checks_overflow(_ecx: &InterpCx<$mir, $tcx, Self>) -> bool {
true true
} }

2
compiler/rustc_const_eval/src/interpret/operator.rs
View File

@@ -33,7 +33,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
// As per https://github.com/rust-lang/rust/pull/98738, we always return `false` in the 2nd // As per https://github.com/rust-lang/rust/pull/98738, we always return `false` in the 2nd
// component when overflow checking is disabled. // component when overflow checking is disabled.
let overflowed = let overflowed =
overflowed && (force_overflow_checks || M::check_binop_checks_overflow(self)); overflowed && (force_overflow_checks || M::checked_binop_checks_overflow(self));
// Write the result to `dest`. // Write the result to `dest`.
if let Abi::ScalarPair(..) = dest.layout.abi { if let Abi::ScalarPair(..) = dest.layout.abi {
// We can use the optimized path and avoid `place_field` (which might do // We can use the optimized path and avoid `place_field` (which might do