Micro-optimization

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 67858227b8caa373b0f851b20f28ff993fd7930a..98b315734efab308ac4af4f813a410d012128e1b 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3632,7 +3632,7 @@ ZEND_VM_HANDLER(129, ZEND_DO_ICALL, ANY, ANY, SPEC(RETVAL))
        ZEND_ASSERT(!Z_ISREF_P(ret));
 #endif
 
-       EG(current_execute_data) = call->prev_execute_data;
+       EG(current_execute_data) = execute_data;
        zend_vm_stack_free_args(call);
        zend_vm_stack_free_call_frame(call);
 
@@ -3733,7 +3733,7 @@ ZEND_VM_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL))
                }
 #endif
 
-               EG(current_execute_data) = call->prev_execute_data;
+               EG(current_execute_data) = execute_data;
                zend_vm_stack_free_args(call);
                zend_vm_stack_free_call_frame(call);
 
@@ -3830,7 +3830,7 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY, SPEC(RETVAL))
                }
 #endif
 
-               EG(current_execute_data) = call->prev_execute_data;
+               EG(current_execute_data) = execute_data;
                zend_vm_stack_free_args(call);
 
                if (!RETURN_VALUE_USED(opline)) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 0db61164c0cd305270dc3861b05ede6ee63a8e8c..f067e06e8099fbf9d5a53ff9a6327c0d863a791f 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -635,7 +635,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_ICALL_SPEC_RETVAL_UNUSED_HA
        ZEND_ASSERT(!Z_ISREF_P(ret));
 #endif
 
-       EG(current_execute_data) = call->prev_execute_data;
+       EG(current_execute_data) = execute_data;
        zend_vm_stack_free_args(call);
        zend_vm_stack_free_call_frame(call);
 
@@ -682,7 +682,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_ICALL_SPEC_RETVAL_USED_HAND
        ZEND_ASSERT(!Z_ISREF_P(ret));
 #endif
 
-       EG(current_execute_data) = call->prev_execute_data;
+       EG(current_execute_data) = execute_data;
        zend_vm_stack_free_args(call);
        zend_vm_stack_free_call_frame(call);
 
@@ -805,7 +805,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_RETVAL_U
                }
 #endif
 
-               EG(current_execute_data) = call->prev_execute_data;
+               EG(current_execute_data) = execute_data;
                zend_vm_stack_free_args(call);
                zend_vm_stack_free_call_frame(call);
 
@@ -884,7 +884,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_SPEC_RETVAL_U
                }
 #endif
 
-               EG(current_execute_data) = call->prev_execute_data;
+               EG(current_execute_data) = execute_data;
                zend_vm_stack_free_args(call);
                zend_vm_stack_free_call_frame(call);
 
@@ -981,7 +981,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_RETVAL_UNUSED_HA
                }
 #endif
 
-               EG(current_execute_data) = call->prev_execute_data;
+               EG(current_execute_data) = execute_data;
                zend_vm_stack_free_args(call);
 
                if (!0) {
@@ -1108,7 +1108,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_RETVAL_USED_HAND
                }
 #endif
 
-               EG(current_execute_data) = call->prev_execute_data;
+               EG(current_execute_data) = execute_data;
                zend_vm_stack_free_args(call);
 
                if (!1) {