luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

An issue with MSVC2017 builds fixed 

On MSVC2017 builds, a crash is observed in the RBA basic
tests. There is no obvious reason, but empirically, the
instantation of a std::vector<VALUE> caused this problem.
Compiler bug or strange interaction with Ruby's GC?
This commit is contained in:
Matthias Köfferlein 2020-09-19 21:00:31 +02:00
parent 4c127b4644
commit ccfec5fe88
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rba/rba/rba.cc
View File

@ -1001,16 +1001,29 @@ method_adaptor (int mid, int argc, VALUE *argv, VALUE self, bool ctor)
static ID id_to_enum = rb_intern ("to_enum");
VALUE method_sym = ID2SYM (rb_intern (meth->primary_name ().c_str ()));
VALUE method_sym = ID2SYM (rb_intern2 (meth->primary_name ().c_str (), (long) meth->primary_name ().size ()));
if (argc == 0) {
ret = rba_funcall2_checked (self, id_to_enum, 1, &method_sym);
} else {
#if 0
// this solution does not work on MSVC2017 for unknown reasons and
// makes the application segfault even without being called
std::vector<VALUE> new_args;
new_args.reserve (size_t (argc + 1));
new_args.push_back (method_sym);
new_args.insert (new_args.end (), argv, argv + argc);
ret = rba_funcall2_checked (self, id_to_enum, argc + 1, new_args.begin ().operator-> ());
#else
VALUE new_args[16];
tl_assert (argc + 1 <= sizeof(new_args) / sizeof(new_args[0]));
VALUE *a = &new_args[0];
*a++ = method_sym;
for (int i = 0; i < argc; ++i) {
*a++ = argv[i];
}
ret = rba_funcall2_checked (self, id_to_enum, argc + 1, &new_args[0]);
#endif
}
} else {