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

Eliminate per-class dtor function

Browse source 
These are all the same, and the NULL check performed is done inside
zend_objects_destroy_object() anyway, so we can just set the dtor
to zend_objects_destroy_object (which is what in-tree PHP extensions
do.)
This commit is contained in:
Olly Betts 2021-04-02 07:58:08 +13:00
commit a1abc692d3
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Modules/php.cxx
View file

@ -133,11 +133,6 @@ static void print_creation_free_wrapper(Node *n) {
Printf(s, "/* class object handlers for %s */\n",class_name);
Printf(s, "zend_object_handlers %s_object_handlers;\n\n",class_name);
Printf(s, "/* dtor Method for class %s */\n",class_name);
Printf(s, "void %s_destroy_object(zend_object *object) {\n",class_name);
Printf(s, " if(!object)\n\t return;\n");
Printf(s, " zend_objects_destroy_object(object);\n}\n\n\n");
Printf(s, "/* Garbage Collection Method for class %s */\n",class_name);
Printf(s, "void %s_free_storage(zend_object *object) {\n",class_name);
Printf(s, " swig_object_wrapper *obj = 0;\n\n");
@ -159,7 +154,7 @@ static void print_creation_free_wrapper(Node *n) {
Printf(s, " object_properties_init(&obj->std, ce);\n");
Printf(s, " %s_object_handlers.offset = XtOffsetOf(swig_object_wrapper, std);\n",class_name);
Printf(s, " %s_object_handlers.free_obj = %s_free_storage;\n",class_name,class_name);
Printf(s, " %s_object_handlers.dtor_obj = %s_destroy_object;\n",class_name,class_name);
Printf(s, " %s_object_handlers.dtor_obj = zend_objects_destroy_object;\n",class_name);
Printf(s, " obj->std.handlers = &%s_object_handlers;\n obj->newobject = 1;\n return &obj->std;\n}\n\n\n",class_name);
}