Skip to content

[cpyrt] Restore support for non-const void*& arguments #71

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
aaronj0 merged 1 commit into from
Sep 3, 2026
Merged

[cpyrt] Restore support for non-const void*& arguments #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/cpyrt/Converters.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4271,11 +4271,13 @@ static struct InitConvFactories_t {
gf["const std::wstring &"] = gf["std::wstring"];
gf["const " WSTRING1 " &"] = gf["std::wstring"];
gf["const " WSTRING2 " &"] = gf["std::wstring"];
// VoidPtrRefConverter should only be used for const references to pointers
gf["const void*&"] = (cf_t) + [](cdims_t) {
// void*& is exempt from the T*& ban: the callee updates the proxy's
// held pointer through the opaque handle
gf["void*&"] = (cf_t) + [](cdims_t) {
static VoidPtrRefConverter c{};
return &c;
};
gf["const void*&"] = gf["void*&"];
gf["void**"] =
(cf_t) + [](cdims_t d) { return new VoidPtrPtrConverter{d}; };
gf["void ptr"] = gf["void**"];
Expand Down
16 changes: 16 additions & 0 deletions test/test_conversions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,19 @@ def test05_bool_conversions(self):
assert ns.Test1()
assert ns.Test2(True)
assert not ns.Test2(False)

def test07_mutable_voidp_reference(self):
"""An object can be passed through a non-const void*& argument"""

import cppjit

cppjit.cppdef("""\
namespace VoidPtrRef {
struct Obj { int v = 5; };
bool is_same(void*& p, Obj* o) { return p == (void*)o; }
}""")

ns = cppjit.gbl.VoidPtrRef
o = ns.Obj()

assert ns.is_same(o, o)
Loading