diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:01:25 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-02 22:01:25 +0400 |
| commit | 412ad4b25417d261c0a8c43f788d5c110593d891 (patch) | |
| tree | 43a257a7d074bf976c02d0d35da80fde24f54705 /Zend/zend_object_handlers.c | |
| parent | 0b1cfdf390632a0bf0b27516399b09813500c299 (diff) | |
| download | php-git-412ad4b25417d261c0a8c43f788d5c110593d891.tar.gz | |
Uinified call frame handling for user and internal functions.
Now EG(current_execute_data) always point to the call frame of the currently executed function.
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index e38fbfc640..8a43e054e9 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -905,7 +905,7 @@ static void zend_std_unset_dimension(zval *object, zval *offset TSRMLS_DC) /* {{ ZEND_API void zend_std_call_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{ */ { - zend_internal_function *func = (zend_internal_function *)EG(current_execute_data)->call->func; + zend_internal_function *func = (zend_internal_function *)EG(current_execute_data)->func; zval method_name, method_args; zval method_result; zend_class_entry *ce = Z_OBJCE_P(getThis()); @@ -1123,7 +1123,7 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr, zend_str ZEND_API void zend_std_callstatic_user_call(INTERNAL_FUNCTION_PARAMETERS) /* {{{ */ { - zend_internal_function *func = (zend_internal_function *)EG(current_execute_data)->call->func; + zend_internal_function *func = (zend_internal_function *)EG(current_execute_data)->func; zval method_name, method_args; zval method_result; zend_class_entry *ce = EG(scope); |