Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 24d2ac0

Browse files
committedJul 15, 2024
Auto merge of rust-lang#127777 - matthiaskrgr:rollup-qp2vkan, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#124921 (offset_from: always allow pointers to point to the same address) - rust-lang#127407 (Make parse error suggestions verbose and fix spans) - rust-lang#127684 (consolidate miri-unleashed tests for mutable refs into one file) - rust-lang#127729 (Stop using the `gen` identifier in the compiler) - rust-lang#127736 (Add myself to the review rotation) - rust-lang#127758 (coverage: Restrict `ExpressionUsed` simplification to `Code` mappings) r? `@ghost` `@rustbot` modify labels: rollup
2 parents eb72697 + e5d65e4 commit 24d2ac0

File tree

199 files changed

+3635
-1359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+3635
-1359
lines changed
 

‎compiler/rustc_mir_dataflow/src/framework/mod.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -402,15 +402,15 @@ where
402402
/// building up a `GenKillSet` and then throwing it away.
403403
pub trait GenKill<T> {
404404
/// Inserts `elem` into the state vector.
405-
fn gen(&mut self, elem: T);
405+
fn gen_(&mut self, elem: T);
406406

407407
/// Removes `elem` from the state vector.
408408
fn kill(&mut self, elem: T);
409409

410410
/// Calls `gen` for each element in `elems`.
411411
fn gen_all(&mut self, elems: impl IntoIterator<Item = T>) {
412412
for elem in elems {
413-
self.gen(elem);
413+
self.gen_(elem);
414414
}
415415
}
416416

@@ -424,44 +424,44 @@ pub trait GenKill<T> {
424424

425425
/// Stores a transfer function for a gen/kill problem.
426426
///
427-
/// Calling `gen`/`kill` on a `GenKillSet` will "build up" a transfer function so that it can be
428-
/// applied multiple times efficiently. When there are multiple calls to `gen` and/or `kill` for
427+
/// Calling `gen_`/`kill` on a `GenKillSet` will "build up" a transfer function so that it can be
428+
/// applied multiple times efficiently. When there are multiple calls to `gen_` and/or `kill` for
429429
/// the same element, the most recent one takes precedence.
430430
#[derive(Clone)]
431431
pub struct GenKillSet<T> {
432-
gen: HybridBitSet<T>,
432+
gen_: HybridBitSet<T>,
433433
kill: HybridBitSet<T>,
434434
}
435435

436436
impl<T: Idx> GenKillSet<T> {
437437
/// Creates a new transfer function that will leave the dataflow state unchanged.
438438
pub fn identity(universe: usize) -> Self {
439439
GenKillSet {
440-
gen: HybridBitSet::new_empty(universe),
440+
gen_: HybridBitSet::new_empty(universe),
441441
kill: HybridBitSet::new_empty(universe),
442442
}
443443
}
444444

445445
pub fn apply(&self, state: &mut impl BitSetExt<T>) {
446-
state.union(&self.gen);
446+
state.union(&self.gen_);
447447
state.subtract(&self.kill);
448448
}
449449
}
450450

451451
impl<T: Idx> GenKill<T> for GenKillSet<T> {
452-
fn gen(&mut self, elem: T) {
453-
self.gen.insert(elem);
452+
fn gen_(&mut self, elem: T) {
453+
self.gen_.insert(elem);
454454
self.kill.remove(elem);
455455
}
456456

457457
fn kill(&mut self, elem: T) {
458458
self.kill.insert(elem);
459-
self.gen.remove(elem);
459+
self.gen_.remove(elem);
460460
}
461461
}
462462

463463
impl<T: Idx> GenKill<T> for BitSet<T> {
464-
fn gen(&mut self, elem: T) {
464+
fn gen_(&mut self, elem: T) {
465465
self.insert(elem);
466466
}
467467

@@ -471,7 +471,7 @@ impl<T: Idx> GenKill<T> for BitSet<T> {
471471
}
472472

473473
impl<T: Idx> GenKill<T> for ChunkedBitSet<T> {
474-
fn gen(&mut self, elem: T) {
474+
fn gen_(&mut self, elem: T) {
475475
self.insert(elem);
476476
}
477477

@@ -481,11 +481,11 @@ impl<T: Idx> GenKill<T> for ChunkedBitSet<T> {
481481
}
482482

483483
impl<T, S: GenKill<T>> GenKill<T> for MaybeReachable<S> {
484-
fn gen(&mut self, elem: T) {
484+
fn gen_(&mut self, elem: T) {
485485
match self {
486486
// If the state is not reachable, adding an element does nothing.
487487
MaybeReachable::Unreachable => {}
488-
MaybeReachable::Reachable(set) => set.gen(elem),
488+
MaybeReachable::Reachable(set) => set.gen_(elem),
489489
}
490490
}
491491

@@ -499,7 +499,7 @@ impl<T, S: GenKill<T>> GenKill<T> for MaybeReachable<S> {
499499
}
500500

501501
impl<T: Idx> GenKill<T> for lattice::Dual<BitSet<T>> {
502-
fn gen(&mut self, elem: T) {
502+
fn gen_(&mut self, elem: T) {
503503
self.0.insert(elem);
504504
}
505505

‎compiler/rustc_mir_dataflow/src/impls/borrowed_locals.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ where
9797
Rvalue::AddressOf(_, borrowed_place)
9898
| Rvalue::Ref(_, BorrowKind::Mut { .. } | BorrowKind::Shared, borrowed_place) => {
9999
if !borrowed_place.is_indirect() {
100-
self.trans.gen(borrowed_place.local);
100+
self.trans.gen_(borrowed_place.local);
101101
}
102102
}
103103

@@ -131,7 +131,7 @@ where
131131
//
132132
// [#61069]: https://github.com/rust-lang/rust/pull/61069
133133
if !dropped_place.is_indirect() {
134-
self.trans.gen(dropped_place.local);
134+
self.trans.gen_(dropped_place.local);
135135
}
136136
}
137137

@@ -159,8 +159,8 @@ pub fn borrowed_locals(body: &Body<'_>) -> BitSet<Local> {
159159

160160
impl GenKill<Local> for Borrowed {
161161
#[inline]
162-
fn gen(&mut self, elem: Local) {
163-
self.0.gen(elem)
162+
fn gen_(&mut self, elem: Local) {
163+
self.0.gen_(elem)
164164
}
165165
#[inline]
166166
fn kill(&mut self, _: Local) {
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.