Improove debug capabilities

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 153218204c97b3bbdce9937f1e855061bb779eb6..165f374f837febe333172edaa701e02b6fd2e9f5 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -51,12 +51,13 @@ void shutdown_executor(TSRMLS_D);
 ZEND_API void execute(zend_op_array *op_array TSRMLS_DC);
 ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC);
 ZEND_API int zend_is_true(zval *op);
-static inline void safe_free_zval_ptr(zval *p)
+#define safe_free_zval_ptr(p) safe_free_zval_ptr_rel(p ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+static inline void safe_free_zval_ptr_rel(zval *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
        TSRMLS_FETCH();
 
        if (p!=EG(uninitialized_zval_ptr)) {
-               FREE_ZVAL(p);
+               FREE_ZVAL_REL(p);
        }
 }
 ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC);

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 127708b4fccb6eb1006c807268ae9878d267f41a..52f0d9e3ef7fed6749b6e014f78e5dfd8eaaf271 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -357,7 +357,7 @@ ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC)
        (*zval_ptr)->refcount--;
        if ((*zval_ptr)->refcount==0) {
                zval_dtor(*zval_ptr);
-               safe_free_zval_ptr(*zval_ptr);
+               safe_free_zval_ptr_rel(*zval_ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC);
        } else if ((*zval_ptr)->refcount == 1) {
                (*zval_ptr)->is_ref = 0;
        }