luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-09-02 02:47:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue with wrapping new objects into tl::Variants which are returned directly. For these objects, ownership needs to be transferred to the script.

Browse Source
This commit is contained in:
Matthias Koefferlein
2020-12-27 17:09:06 +01:00
parent 992be87812
commit 4ec00fb129
10 changed files with 222 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rba/rba/rbaMarshal.cc
+15 -9
View File
@@ -556,11 +556,12 @@ struct reader<gsi::StringType>
}
};
static VALUE object_from_variant (const tl::Variant &var, Proxy *self, const gsi::ArgType &atype)
static VALUE object_from_variant (tl::Variant &var, Proxy *self, const gsi::ArgType &atype)
{
if (var.is_user()) {
bool pass_obj = atype.pass_obj() || (! atype.is_cptr() && ! atype.is_ptr () && ! atype.is_cref () && ! atype.is_ref ());
bool is_direct = (! atype.is_cptr() && ! atype.is_ptr () && ! atype.is_cref () && ! atype.is_ref ());
bool pass_obj = atype.pass_obj() || is_direct;
bool is_const = atype.is_cptr() || atype.is_cref();
bool prefer_copy = false;
bool can_destroy = false;
@@ -568,6 +569,9 @@ static VALUE object_from_variant (const tl::Variant &var, Proxy *self, const gsi
// TODO: ugly const_cast, but there is no "const shared reference" ...
gsi::Proxy *holder = dynamic_cast<gsi::Proxy *>(const_cast<tl::Object *>(var.to_object ()));
void *obj = var.to_user ();
const gsi::ClassBase *cls = var.user_cls ()->gsi_cls ();
if (pass_obj) {
if (holder) {
@@ -589,19 +593,20 @@ static VALUE object_from_variant (const tl::Variant &var, Proxy *self, const gsi
// If the object was not owned before, it is not owned after (bears risk of invalid
// pointers, but it's probably rarely the case. Non-managed objects are usually copied
// between the ownership spaces.
if (var.user_is_ref()) {
// If the variant holds the user object, we can take it from it and claim ownership.
if (var.user_is_ref ()) {
prefer_copy = false; // unsafe
pass_obj = false;
} else {
prefer_copy = true; // safe
obj = var.user_take ();
can_destroy = true;
}
pass_obj = false;
}
}
return object_to_ruby ((void *) var.to_user (), self, var.user_cls ()->gsi_cls (), pass_obj, is_const, prefer_copy, can_destroy);
return object_to_ruby (obj, self, cls, pass_obj, is_const, prefer_copy, can_destroy);
} else {
return c2ruby<tl::Variant> (var);
@@ -623,9 +628,10 @@ struct reader<gsi::VariantType>
gsi::VariantAdaptorImpl<tl::Variant> *aa = dynamic_cast<gsi::VariantAdaptorImpl<tl::Variant> *> (a.get ());
if (aa) {
// A small optimization that saves one variant copy
*ret = object_from_variant (aa->var_ref (), self, atype);
*ret = object_from_variant (aa->var_ref_nc (), self, atype);
} else {
*ret = object_from_variant (a->var (), self, atype);
tl::Variant v = a->var ();
*ret = object_from_variant (v, self, atype);
}
}
}