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

Improve how we allocate swig_object_wrapper

Browse source 
Use zend_object_alloc() and put the zend_object member last so that
Zend can put object properties after it.
This commit is contained in:
Olly Betts 2021-03-26 17:15:34 +13:00
commit c03679acef
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/php/phprun.swg
View file

@ -59,9 +59,9 @@ static int default_error_code = E_ERROR;
and need freeing, or not */ and need freeing, or not */
typedef struct { typedef struct {
void * ptr; void * ptr;
zend_object std;
HashTable *extras; HashTable *extras;
int newobject; int newobject;
zend_object std;
} swig_object_wrapper; } swig_object_wrapper;
#define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a))

5
Source/Modules/php.cxx
View file

@ -170,9 +170,9 @@ static void print_creation_free_wrapper(int item_index) {
Printf(s_header, "/* Object Creation Method for class %s */\n",class_name); Printf(s_header, "/* Object Creation Method for class %s */\n",class_name);
Printf(s_header, "zend_object * %s_object_new(zend_class_entry *ce) {\n",class_name); Printf(s_header, "zend_object * %s_object_new(zend_class_entry *ce) {\n",class_name);
Printf(s_header, " swig_object_wrapper *obj = (swig_object_wrapper *)ecalloc(1,sizeof(swig_object_wrapper) + zend_object_properties_size(ce));\n"); Printf(s_header, " swig_object_wrapper *obj = (swig_object_wrapper*)zend_object_alloc(sizeof(swig_object_wrapper), ce);\n");
Printf(s_header, " zend_object_std_init(&obj->std, ce);\n"); Printf(s_header, " zend_object_std_init(&obj->std, ce);\n");
//Printf(s_header, " object_properties_init(&obj->std, ce);\n"); Printf(s_header, " object_properties_init(&obj->std, ce);\n");
Printf(s_header, " %s_object_handlers.offset = XtOffsetOf(swig_object_wrapper, std);\n",class_name); Printf(s_header, " %s_object_handlers.offset = XtOffsetOf(swig_object_wrapper, std);\n",class_name);
Printf(s_header, " %s_object_handlers.free_obj = %s_free_storage;\n",class_name,class_name); Printf(s_header, " %s_object_handlers.free_obj = %s_free_storage;\n",class_name,class_name);
Printf(s_header, " %s_object_handlers.dtor_obj = %s_destroy_object;\n",class_name,class_name); Printf(s_header, " %s_object_handlers.dtor_obj = %s_destroy_object;\n",class_name,class_name);
@ -180,7 +180,6 @@ static void print_creation_free_wrapper(int item_index) {
class_name = NULL; class_name = NULL;
class_type = NULL; class_type = NULL;
} }
static void SwigPHP_emit_all_creation_free_wrapper() { static void SwigPHP_emit_all_creation_free_wrapper() {