Skip to content

Use with_mut/with for Ptr::write/Ptr::read #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nunoplopes merged 2 commits into from
Jul 27, 2026
Merged

Use with_mut/with for Ptr::write/Ptr::read #292

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e84f92d
Use with_mut/with for Ptr::write/Ptr::read
lucic71 Jul 26, 2026
e6f3f98
Add assert(self.offset == 0) in with_mut
lucic71 Jul 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 4 additions & 41 deletions libcc2rs/src/rc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,26 +368,7 @@ impl<T> Ptr<T> {
where
T: ByteRepr,
{
match &self.kind {
PtrKind::Null => panic!("ub: null pointer"),
PtrKind::StackSingle(weak) | PtrKind::HeapSingle(weak) => {
let rc = weak.upgrade().expect("ub: dangling pointer");
*rc.borrow_mut() = value;
}
PtrKind::Vec(weak) => {
let rc = weak.upgrade().expect("ub: dangling pointer");
rc.borrow_mut()[self.offset] = value;
}
PtrKind::StackArray(weak) | PtrKind::HeapArray(weak) => {
let rc = weak.upgrade().expect("ub: dangling pointer");
rc.borrow_mut()[self.offset] = value;
}
PtrKind::Reinterpreted(data) => {
let mut buf = vec![0u8; T::byte_size()];
value.to_bytes(&mut buf);
data.alloc.write_bytes(self.offset, &buf);
}
}
self.with_mut(|v| *v = value);
}

pub fn to_strong(&self) -> Value<T> {
Expand Down Expand Up @@ -448,6 +429,7 @@ impl<T> Ptr<T> {
match &self.kind {
PtrKind::Null => panic!("ub: null pointer"),
PtrKind::StackSingle(weak) | PtrKind::HeapSingle(weak) => {
assert_eq!(self.offset, 0, "ub: invalid offset");
let rc = weak.upgrade().expect("ub: dangling pointer");
let mut borrow = rc.borrow_mut();
f(&mut *borrow)
Expand Down Expand Up @@ -481,6 +463,7 @@ impl<T> Ptr<T> {
match &self.kind {
PtrKind::Null => panic!("ub: null pointer"),
PtrKind::StackSingle(weak) | PtrKind::HeapSingle(weak) => {
assert_eq!(self.offset, 0, "ub: invalid offset");
let rc = weak.upgrade().expect("ub: dangling pointer");
let borrow = rc.borrow();
f(&*borrow)
Expand All @@ -507,27 +490,7 @@ impl<T> Ptr<T> {

impl<T: Clone + ByteRepr> Ptr<T> {
pub fn read(&self) -> T {
match self.kind {
PtrKind::Null => panic!("ub: null pointer"),
PtrKind::StackSingle(ref weak) | PtrKind::HeapSingle(ref weak) => {
assert_eq!(self.offset, 0, "ub: invalid offset");
weak.upgrade()
.expect("ub: dangling pointer")
.borrow()
.clone()
}
PtrKind::Vec(ref weak) => {
weak.upgrade().expect("ub: dangling pointer").borrow()[self.offset].clone()
}
PtrKind::StackArray(ref weak) | PtrKind::HeapArray(ref weak) => {
weak.upgrade().expect("ub: dangling pointer").borrow()[self.offset].clone()
}
PtrKind::Reinterpreted(ref data) => {
let mut buf = vec![0u8; T::byte_size()];
data.alloc.read_bytes(self.offset, &mut buf);
T::from_bytes(&buf)
}
}
self.with(|v| v.clone())
}
}

Expand Down
Loading