diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-01-30 17:50:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-30 17:50:11 +0100 |
| commit | c3b1f5428b7ed8b5e75e5ac8e4e26a46093a7965 (patch) | |
| tree | bbd2b341377200ed27718d7633ef843cf64f5084 | |
| parent | b3b9383f8d1324ca2fd34a34cdd026ba40c2e935 (diff) | |
| parent | f7cc20af8c7bf085d0fdc3ff20b4f3b857b7e9e2 (diff) | |
| download | rust-c3b1f5428b7ed8b5e75e5ac8e4e26a46093a7965.tar.gz rust-c3b1f5428b7ed8b5e75e5ac8e4e26a46093a7965.zip | |
Rollup merge of #107455 - tshepang:better-name, r=wesleywiser
use a more descriptive name I found it hard to distinguish between the two method names. Also, the comment just repeats the `expect` string.
| -rw-r--r-- | compiler/rustc_middle/src/mir/mono.rs | 9 | ||||
| -rw-r--r-- | compiler/rustc_monomorphize/src/partitioning/mod.rs | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/compiler/rustc_middle/src/mir/mono.rs b/compiler/rustc_middle/src/mir/mono.rs index 1e8d5f7eae8..7a05ee2ff37 100644 --- a/compiler/rustc_middle/src/mir/mono.rs +++ b/compiler/rustc_middle/src/mir/mono.rs @@ -318,16 +318,19 @@ impl<'tcx> CodegenUnit<'tcx> { base_n::encode(hash, base_n::CASE_INSENSITIVE) } - pub fn estimate_size(&mut self, tcx: TyCtxt<'tcx>) { + pub fn create_size_estimate(&mut self, tcx: TyCtxt<'tcx>) { // Estimate the size of a codegen unit as (approximately) the number of MIR // statements it corresponds to. self.size_estimate = Some(self.items.keys().map(|mi| mi.size_estimate(tcx)).sum()); } #[inline] + /// Should only be called if [`create_size_estimate`] has previously been called. + /// + /// [`create_size_estimate`]: Self::create_size_estimate pub fn size_estimate(&self) -> usize { - // Should only be called if `estimate_size` has previously been called. - self.size_estimate.expect("estimate_size must be called before getting a size_estimate") + self.size_estimate + .expect("create_size_estimate must be called before getting a size_estimate") } pub fn modify_size_estimate(&mut self, delta: usize) { diff --git a/compiler/rustc_monomorphize/src/partitioning/mod.rs b/compiler/rustc_monomorphize/src/partitioning/mod.rs index fd6bcad1898..615126e8b58 100644 --- a/compiler/rustc_monomorphize/src/partitioning/mod.rs +++ b/compiler/rustc_monomorphize/src/partitioning/mod.rs @@ -180,7 +180,7 @@ pub fn partition<'tcx>( partitioner.place_root_mono_items(cx, mono_items) }; - initial_partitioning.codegen_units.iter_mut().for_each(|cgu| cgu.estimate_size(tcx)); + initial_partitioning.codegen_units.iter_mut().for_each(|cgu| cgu.create_size_estimate(tcx)); debug_dump(tcx, "INITIAL PARTITIONING:", initial_partitioning.codegen_units.iter()); @@ -200,7 +200,7 @@ pub fn partition<'tcx>( partitioner.place_inlined_mono_items(cx, initial_partitioning) }; - post_inlining.codegen_units.iter_mut().for_each(|cgu| cgu.estimate_size(tcx)); + post_inlining.codegen_units.iter_mut().for_each(|cgu| cgu.create_size_estimate(tcx)); debug_dump(tcx, "POST INLINING:", post_inlining.codegen_units.iter()); |
