Use inlined version of zval_ptr_dytor() in var_destroy() loop

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 612c34aaebfaa62c174a903597e7d55e0d413a62..b480bb2ee351ba39ac807651e32fd085f58c028a 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -233,14 +233,14 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
                                }
                        }
 
-                       zval_ptr_dtor(zv);
+                       i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);
                }
                next = var_dtor_hash->next;
                efree_size(var_dtor_hash, sizeof(var_dtor_entries));
                var_dtor_hash = next;
        }
 
-       zval_ptr_dtor(&wakeup_name);
+       zval_ptr_dtor_nogc(&wakeup_name);
 }
 
 /* }}} */

diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index b75c0d2d101114f2a34c89ce0cddb55b4e0446e7..6b5f3ef4e06d6e3e6973500c521a9142c869605a 100644 (file)
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -231,14 +231,14 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
                                }
                        }
 
-                       zval_ptr_dtor(zv);
+                       i_zval_ptr_dtor(zv ZEND_FILE_LINE_CC);
                }
                next = var_dtor_hash->next;
                efree_size(var_dtor_hash, sizeof(var_dtor_entries));
                var_dtor_hash = next;
        }
 
-       zval_ptr_dtor(&wakeup_name);
+       zval_ptr_dtor_nogc(&wakeup_name);
 }
 
 /* }}} */