diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-10-20 11:31:41 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-10-20 11:31:41 +0000 |
| commit | ad1f706fdaa0a028c98f07a3573cc271446ade93 (patch) | |
| tree | 2be80b32167a66e517d633a41856bc92219e0c20 | |
| parent | a8c338aa65c1fc48b53e67c95a9dd33b07d60486 (diff) | |
| download | php-git-ad1f706fdaa0a028c98f07a3573cc271446ade93.tar.gz | |
Removed unnecesary local variable
| -rw-r--r-- | Zend/zend_vm_def.h | 5 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 97810986fc..5ac7c59464 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1860,8 +1860,6 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY) EX_T(opline->result.u.var).var.fcall_returned_reference = return_reference; } } else if (EX(function_state).function->type == ZEND_USER_FUNCTION) { - HashTable *calling_symbol_table; - EX_T(opline->result.u.var).var.ptr = NULL; if (EG(symtable_cache_ptr)>=EG(symtable_cache)) { /*printf("Cache hit! Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/ @@ -1871,7 +1869,6 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY) zend_hash_init(EX(function_state).function_symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0); /*printf("Cache miss! Initialized %x\n", function_state.function_symbol_table);*/ } - calling_symbol_table = EG(active_symbol_table); EG(active_symbol_table) = EX(function_state).function_symbol_table; original_return_value = EG(return_value_ptr_ptr); EG(return_value_ptr_ptr) = EX_T(opline->result.u.var).var.ptr_ptr; @@ -1901,7 +1898,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY) zend_hash_clean(EX(function_state).function_symbol_table); *(++EG(symtable_cache_ptr)) = EX(function_state).function_symbol_table; } - EG(active_symbol_table) = calling_symbol_table; + EG(active_symbol_table) = EX(symbol_table); } else { /* ZEND_OVERLOADED_FUNCTION */ ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); INIT_ZVAL(*(EX_T(opline->result.u.var).var.ptr)); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 4d60dc2769..06ed990348 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -205,8 +205,6 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS) EX_T(opline->result.u.var).var.fcall_returned_reference = return_reference; } } else if (EX(function_state).function->type == ZEND_USER_FUNCTION) { - HashTable *calling_symbol_table; - EX_T(opline->result.u.var).var.ptr = NULL; if (EG(symtable_cache_ptr)>=EG(symtable_cache)) { /*printf("Cache hit! Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/ @@ -216,7 +214,6 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS) zend_hash_init(EX(function_state).function_symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0); /*printf("Cache miss! Initialized %x\n", function_state.function_symbol_table);*/ } - calling_symbol_table = EG(active_symbol_table); EG(active_symbol_table) = EX(function_state).function_symbol_table; original_return_value = EG(return_value_ptr_ptr); EG(return_value_ptr_ptr) = EX_T(opline->result.u.var).var.ptr_ptr; @@ -246,7 +243,7 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS) zend_hash_clean(EX(function_state).function_symbol_table); *(++EG(symtable_cache_ptr)) = EX(function_state).function_symbol_table; } - EG(active_symbol_table) = calling_symbol_table; + EG(active_symbol_table) = EX(symbol_table); } else { /* ZEND_OVERLOADED_FUNCTION */ ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); INIT_ZVAL(*(EX_T(opline->result.u.var).var.ptr)); |