cleanup

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 3d4dcdb2c138b156839b0175dd67f28bf821000f..55c24f31e98b4a04694ea13a50888684d0b69ed6 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2535,8 +2535,10 @@ static zend_never_inline void ZEND_FASTCALL init_func_run_time_cache(zend_op_arr
 }
 /* }}} */
 
-static zend_always_inline zend_function* ZEND_FASTCALL init_func_run_time_cache_i(zend_op_array *op_array, zval *zv) /* {{{ */
+static zend_always_inline zend_function* ZEND_FASTCALL init_func_run_time_cache_i(zval *zv) /* {{{ */
 {
+       zend_op_array *op_array = Z_PTR_P(zv);
+
        ZEND_ASSERT(op_array->run_time_cache == NULL);
        if (op_array->fn_flags & ZEND_ACC_IMMUTABLE) {
                zend_op_array *new_op_array = zend_arena_alloc(&CG(arena), sizeof(zend_op_array) + op_array->cache_size);
@@ -2555,9 +2557,9 @@ static zend_always_inline zend_function* ZEND_FASTCALL init_func_run_time_cache_
 }
 /* }}} */
 
-static zend_never_inline zend_function* ZEND_FASTCALL init_func_run_time_cache_ex(zend_op_array *op_array, zval *zv) /* {{{ */
+static zend_never_inline zend_function* init_func_run_time_cache_ex(zval *zv) /* {{{ */
 {
-       return init_func_run_time_cache_i(op_array, zv);
+       return init_func_run_time_cache_i(zv);
 }
 /* }}} */
 
@@ -2569,7 +2571,7 @@ ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function(zend_string *name) /*
                zend_function *fbc = Z_FUNC_P(zv);
 
                if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
-                       fbc = (zend_function*)init_func_run_time_cache_i(&fbc->op_array, zv);
+                       fbc = (zend_function*)init_func_run_time_cache_i(zv);
                }
                return fbc;
        }
@@ -2584,7 +2586,7 @@ ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function_str(const char *name,
                zend_function *fbc = Z_FUNC_P(zv);
 
                if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
-                       fbc = (zend_function*)init_func_run_time_cache_i(&fbc->op_array, zv);
+                       fbc = (zend_function*)init_func_run_time_cache_i(zv);
                }
                return fbc;
        }
@@ -3002,7 +3004,7 @@ static zend_never_inline zend_execute_data *zend_init_dynamic_call_string(zend_s
 
                fbc = Z_FUNC_P(func);
                if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
-                       fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
+                       fbc = init_func_run_time_cache_ex(func);
                }
                called_scope = NULL;
        }

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index d85bf9974a423d2ac8b82f6c379d611357ec1611..7495425cf2ec7550f9fe4e87eaa3327e08e87854 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3258,7 +3258,7 @@ ZEND_VM_HOT_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST, NUM|CACHE_SLOT)
                }
                fbc = Z_FUNC_P(func);
                if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
-                       fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
+                       fbc = init_func_run_time_cache_ex(func);
                }
                CACHE_PTR(opline->result.num, fbc);
        }
@@ -3422,7 +3422,7 @@ ZEND_VM_HOT_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST, NUM|CACHE_SLOT)
                }
                fbc = Z_FUNC_P(func);
                if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
-                       fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
+                       fbc = init_func_run_time_cache_ex(func);
                }
                CACHE_PTR(opline->result.num, fbc);
        }
@@ -3453,7 +3453,7 @@ ZEND_VM_HOT_HANDLER(61, ZEND_INIT_FCALL, NUM, CONST, NUM|CACHE_SLOT)
                }
                fbc = Z_FUNC_P(func);
                if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
-                       fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
+                       fbc = init_func_run_time_cache_ex(func);
                }
                CACHE_PTR(opline->result.num, fbc);
        }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index aa89f097eb82136fc559188b8e471a8ed41572c3..b54d505f14ef0e653c695d4bac94c7c7604bd97b 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2088,7 +2088,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME
                }
                fbc = Z_FUNC_P(func);
                if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
-                       fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
+                       fbc = init_func_run_time_cache_ex(func);
                }
                CACHE_PTR(opline->result.num, fbc);
        }
@@ -2177,7 +2177,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_NS_FCALL_BY_N
                }
                fbc = Z_FUNC_P(func);
                if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
-                       fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
+                       fbc = init_func_run_time_cache_ex(func);
                }
                CACHE_PTR(opline->result.num, fbc);
        }
@@ -2208,7 +2208,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_FCALL_SPEC_CO
                }
                fbc = Z_FUNC_P(func);
                if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!fbc->op_array.run_time_cache)) {
-                       fbc = init_func_run_time_cache_ex(&fbc->op_array, func);
+                       fbc = init_func_run_time_cache_ex(func);
                }
                CACHE_PTR(opline->result.num, fbc);
        }