Removed unnecesary local variable

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 09e3d159a8cdae7b43a6e574dec4f09c11f496c1..f674880c4455612dcc128aa20a84f7b8d69e8bf3 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1892,8 +1892,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]);*/
@@ -1903,7 +1901,6 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
                        zend_u_hash_init(EX(function_state).function_symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
                        /*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;
@@ -1933,7 +1930,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 6abe2d6b2ee5c3e9524654ed27136da9a9320df9..8a811bc11626d9383a19a37dd78293fb83c74e90 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -214,8 +214,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]);*/
@@ -225,7 +223,6 @@ static int zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
                        zend_u_hash_init(EX(function_state).function_symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
                        /*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;
@@ -255,7 +252,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));