diff options
| author | bors <bors@rust-lang.org> | 2021-08-25 02:17:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-25 02:17:41 +0000 |
| commit | e5484cec0e3f60b2a0010505cd355639f75a2973 (patch) | |
| tree | 25a26fad7e088f2c98dc4a268f8ce0351ea469d9 /compiler/rustc_codegen_ssa/src/mir | |
| parent | faa0a10406319264e81086fe88fd426cbfa09021 (diff) | |
| parent | f17e384a43dd8ca0aefb36bfcd8a69d9ad7f12cf (diff) | |
| download | rust-e5484cec0e3f60b2a0010505cd355639f75a2973.tar.gz rust-e5484cec0e3f60b2a0010505cd355639f75a2973.zip | |
Auto merge of #88242 - bonega:allocation_range, r=oli-obk
Use custom wrap-around type instead of RangeInclusive Two reasons: 1. More memory is allocated than necessary for `valid_range` in `Scalar`. The range is not used as an iterator and `exhausted` is never used. 2. `contains`, `count` etc. methods in `RangeInclusive` are doing very unhelpful(and dangerous!) things when used as a wrap-around range. - In general this PR wants to limit potentially confusing methods, that have a low probability of working. Doing a local perf run, every metric shows improvement except for instructions. Max-rss seem to have a very consistent improvement. Sorry - newbie here, probably doing something wrong.
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/mir')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/rvalue.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs index 65869483025..02e2db54e74 100644 --- a/compiler/rustc_codegen_ssa/src/mir/rvalue.rs +++ b/compiler/rustc_codegen_ssa/src/mir/rvalue.rs @@ -310,15 +310,15 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { let er = scalar.valid_range_exclusive(bx.cx()); if er.end != er.start - && scalar.valid_range.end() >= scalar.valid_range.start() + && scalar.valid_range.end >= scalar.valid_range.start { // We want `table[e as usize ± k]` to not // have bound checks, and this is the most // convenient place to put the `assume`s. - if *scalar.valid_range.start() > 0 { + if scalar.valid_range.start > 0 { let enum_value_lower_bound = bx .cx() - .const_uint_big(ll_t_in, *scalar.valid_range.start()); + .const_uint_big(ll_t_in, scalar.valid_range.start); let cmp_start = bx.icmp( IntPredicate::IntUGE, llval, @@ -328,7 +328,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { } let enum_value_upper_bound = - bx.cx().const_uint_big(ll_t_in, *scalar.valid_range.end()); + bx.cx().const_uint_big(ll_t_in, scalar.valid_range.end); let cmp_end = bx.icmp( IntPredicate::IntULE, llval, |