Skip to content

Support custom converter types and instances in ctypes argtypes #9685

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

Open
alok-108 wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Support custom converter types and instances in ctypes argtypes #9685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
32f565f
Support custom converter types and instances in ctypes argtypes
alok-108 Nov 4, 2026
0340cfd
Address code review feedback on ctypes argtypes conversion
alok-108 Nov 4, 2026
5edc515
Cache validated argtype converters at assignment
alok-108 Nov 4, 2026
b9c5669
Snapshot argtypes with converters and decouple callback validation
alok-108 Nov 4, 2026
fc770b9
Cache class-level argtypes converters and guard against stale updates
alok-108 Nov 4, 2026
24c3a37
Harmonize lock acquisition order in extract_call_info and deduplicate…
alok-108 Nov 4, 2026
5b9453a
Cache class-level argtypes converters during prototype type creation
alok-108 Nov 5, 2026
05893e9
Merge branch 'upstream/main' into fix-ctypes-custom-converter-argtypes
alok-108 Nov 5, 2026
3d2f09a
Merge remote-tracking branch 'upstream/main' into fix-ctypes-custom-c…
alok-108 Nov 5, 2026
fe9418e
Fix clippy warnings and make ctypes snippet test platform-independent
alok-108 Nov 5, 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
11 changes: 10 additions & 1 deletion crates/vm/src/stdlib/_ctypes/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ pub struct StgInfo {

// Cached pointer type (non-inheritable via descriptor)
pub pointer_type: Option<PyObjectRef>,

// Cached converters snapshot for PyCFuncPtrType (types tuple, converters tuple)
pub converters: Option<PyObjectRef>,
}

// StgInfo is stored in type_data which requires Send + Sync.
Expand All @@ -135,6 +138,7 @@ impl core::fmt::Debug for StgInfo {
.field("paramfunc", &self.paramfunc)
.field("big_endian", &self.big_endian)
.field("field_layouts", &self.field_layouts.len())
.field("converters", &self.converters.is_some())
.finish()
}
}
Expand All @@ -157,6 +161,7 @@ impl Default for StgInfo {
big_endian: cfg!(target_endian = "big"), // native endian by default
field_layouts: Vec::new(),
pointer_type: None,
converters: None,
}
}
}
Expand All @@ -167,12 +172,14 @@ unsafe impl Traverse for StgInfo {
self.proto.traverse(tracer);
self.element_type.traverse(tracer);
self.pointer_type.traverse(tracer);
self.converters.traverse(tracer);
}

fn clear(&mut self, out: &mut Vec<PyObjectRef>) {
out.extend(self.proto.take().map(Into::into));
out.extend(self.element_type.take().map(Into::into));
out.extend(self.pointer_type.take());
out.extend(self.converters.take());
}
}

Expand All @@ -194,6 +201,7 @@ impl StgInfo {
big_endian: cfg!(target_endian = "big"), // native endian by default
field_layouts: Vec::new(),
pointer_type: None,
converters: None,
}
}

Expand Down Expand Up @@ -247,6 +255,7 @@ impl StgInfo {
big_endian: cfg!(target_endian = "big"), // native endian by default
field_layouts: Vec::new(),
pointer_type: None,
converters: None,
}
}

Expand Down Expand Up @@ -3067,7 +3076,7 @@ impl PyCData {

pub(super) fn into_view(self, cls: PyTypeRef, vm: &VirtualMachine) -> PyResult {
if cls.fast_issubclass(super::function::PyCFuncPtr::static_type()) {
super::function::PyCFuncPtr::from_cdata(self)
super::function::PyCFuncPtr::from_cdata(self, &cls)
.into_ref_with_type(vm, cls)
.map(Into::into)
} else {
Expand Down
Loading
Loading