Skip to content

Commit

Permalink
refactor: lock::observing: extract fn addr from ref. conv. to `us…
Browse files Browse the repository at this point in the history
…ize`
  • Loading branch information
ErichDonGubler committed Sep 5, 2024
1 parent 63a24d3 commit ec21000
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions wgpu-core/src/lock/observing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -369,16 +369,16 @@ impl ObservationLog {
self.write_location(new_location);
self.write_action(&Action::Acquisition {
older_rank: older_lock.rank.bit.number(),
older_location: std::ptr::from_ref(older_lock.location) as usize,
older_location: addr(older_lock.location),
newer_rank: new_rank.bit.number(),
newer_location: std::ptr::from_ref(new_location) as usize,
newer_location: addr(new_location),
});
}

fn write_location(&mut self, location: &'static Location<'static>) {
if self.locations_seen.insert(location) {
self.write_action(&Action::Location {
address: std::ptr::from_ref(location) as usize,
address: addr(location),
file: location.file(),
line: location.line(),
column: location.column(),
Expand Down Expand Up @@ -473,3 +473,8 @@ impl LockRankSet {
self.bits().trailing_zeros()
}
}

/// Convenience for `std::ptr::from_ref(t) as usize`.
fn addr<T>(t: &T) -> usize {
std::ptr::from_ref(t) as usize
}

0 comments on commit ec21000

Please sign in to comment.