archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make EG(This) and EG(scope) available to internal methods

Browse source
This commit is contained in:
Zeev Suraski 2003-02-16 19:10:27 +00:00
parent 004947221e
commit f079bb65ff
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Zend/zend_execute.c
View file

@ -2587,6 +2587,11 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
EX_T(EX(opline)->result.u.var).var.ptr_ptr = &EX_T(EX(opline)->result.u.var).var.ptr; EX_T(EX(opline)->result.u.var).var.ptr_ptr = &EX_T(EX(opline)->result.u.var).var.ptr;
current_this = EG(This);
EG(This) = EX(object);
current_scope = EG(scope);
EG(scope) = EX(calling_scope);
if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) { if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
ALLOC_ZVAL(EX_T(EX(opline)->result.u.var).var.ptr); ALLOC_ZVAL(EX_T(EX(opline)->result.u.var).var.ptr);
INIT_ZVAL(*(EX_T(EX(opline)->result.u.var).var.ptr)); INIT_ZVAL(*(EX_T(EX(opline)->result.u.var).var.ptr));
@ -2607,11 +2612,6 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
} else if (EX(function_state).function->type == ZEND_USER_FUNCTION) { } else if (EX(function_state).function->type == ZEND_USER_FUNCTION) {
HashTable *calling_symbol_table; HashTable *calling_symbol_table;
current_this = EG(This);
EG(This) = EX(object);
current_scope = EG(scope);
EG(scope) = EX(calling_scope);
EX_T(EX(opline)->result.u.var).var.ptr = NULL; EX_T(EX(opline)->result.u.var).var.ptr = NULL;
if (EG(symtable_cache_ptr)>=EG(symtable_cache)) { if (EG(symtable_cache_ptr)>=EG(symtable_cache)) {
/*printf("Cache hit! Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/ /*printf("Cache hit! Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/
@ -2649,11 +2649,6 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
zend_hash_clean(*EG(symtable_cache_ptr)); zend_hash_clean(*EG(symtable_cache_ptr));
} }
EG(active_symbol_table) = calling_symbol_table; EG(active_symbol_table) = calling_symbol_table;
if (EG(This)) {
zval_ptr_dtor(&EG(This));
}
EG(This) = current_this;
EG(scope) = current_scope;
} else { /* ZEND_OVERLOADED_FUNCTION */ } else { /* ZEND_OVERLOADED_FUNCTION */
ALLOC_ZVAL(EX_T(EX(opline)->result.u.var).var.ptr); ALLOC_ZVAL(EX_T(EX(opline)->result.u.var).var.ptr);
INIT_ZVAL(*(EX_T(EX(opline)->result.u.var).var.ptr)); INIT_ZVAL(*(EX_T(EX(opline)->result.u.var).var.ptr));
@ -2670,6 +2665,11 @@ int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS)
zval_ptr_dtor(&EX_T(EX(opline)->result.u.var).var.ptr); zval_ptr_dtor(&EX_T(EX(opline)->result.u.var).var.ptr);
} }
} }
if (EG(This)) {
zval_ptr_dtor(&EG(This));
}
EG(This) = current_this;
EG(scope) = current_scope;
zend_ptr_stack_n_pop(&EG(arg_types_stack), 3, &EX(calling_scope), &EX(object), &EX(fbc)); zend_ptr_stack_n_pop(&EG(arg_types_stack), 3, &EX(calling_scope), &EX(object), &EX(fbc));
if(EG(active_namespace) != active_namespace) { if(EG(active_namespace) != active_namespace) {