jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for final destructors in director classes

Browse source 
A class marked as a director with a final destructor should not be a
wrapped as a director class. Fix seg faults in this case.
This commit is contained in:
William S Fulton 2019-03-02 19:57:33 +00:00
commit 3b07cba740
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Examples/test-suite/cpp11_final_directors.i
View file

@ -1,9 +1,13 @@
%module(directors="1") cpp11_final_directors %module(directors="1") cpp11_final_directors
%director Derived; %director Derived;
// Check SWIG will not wrap these classes as directors where the destructors are final
%director BaseFinalDestructor; %director BaseFinalDestructor;
%director BaseFinalDestructor2;
%warnfilter(SWIGWARN_LANG_DIRECTOR_FINAL) BaseFinalDestructor::~BaseFinalDestructor; %warnfilter(SWIGWARN_LANG_DIRECTOR_FINAL) BaseFinalDestructor::~BaseFinalDestructor;
%warnfilter(SWIGWARN_LANG_DIRECTOR_FINAL) BaseFinalDestructor2::~BaseFinalDestructor2;
%inline %{ %inline %{
struct Base { struct Base {
@ -21,4 +25,9 @@ struct BaseFinalDestructor {
virtual void basefinalmeth() final {} virtual void basefinalmeth() final {}
virtual ~BaseFinalDestructor() final {} virtual ~BaseFinalDestructor() final {}
}; };
struct BaseFinalDestructor2 {
virtual void basefinalmeth() {}
virtual ~BaseFinalDestructor2() final {}
};
%} %}

3
Source/Modules/lang.cxx
View file

@ -1894,6 +1894,8 @@ int Language::unrollVirtualMethods(Node *n, Node *parent, List *vm, int default_
} }
if (!checkAttribute(nn, "storage", "virtual")) if (!checkAttribute(nn, "storage", "virtual"))
continue; continue;
if (GetFlag(nn, "final"))
continue;
/* we need to add methods(cdecl) and destructor (to check for throw decl) */ /* we need to add methods(cdecl) and destructor (to check for throw decl) */
int is_destructor = (Cmp(nodeType, "destructor") == 0); int is_destructor = (Cmp(nodeType, "destructor") == 0);
if ((Cmp(nodeType, "cdecl") == 0) || is_destructor) { if ((Cmp(nodeType, "cdecl") == 0) || is_destructor) {
@ -2203,6 +2205,7 @@ int Language::classDirector(Node *n) {
SWIG_WARN_NODE_BEGIN(ni); SWIG_WARN_NODE_BEGIN(ni);
Swig_warning(WARN_LANG_DIRECTOR_FINAL, input_file, line_number, "Destructor of director base class %s is marked as final.\n", classtype); Swig_warning(WARN_LANG_DIRECTOR_FINAL, input_file, line_number, "Destructor of director base class %s is marked as final.\n", classtype);
SWIG_WARN_NODE_END(ni); SWIG_WARN_NODE_END(ni);
SetFlag(n, "feature:nodirector");
Delete(vtable); Delete(vtable);
Delete(using_protected_members_code); Delete(using_protected_members_code);
return SWIG_OK; return SWIG_OK;