php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 12:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Microoptimization (avoid code duplication)"

Browse Source 
This reverts commit 25d97f5eee.
This commit is contained in:
Dmitry Stogov
2019-09-05 15:35:19 +03:00
parent 25d97f5eee
commit 4ecdff2da8
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Zend/zend_vm_def.h
View File

@@ -4016,9 +4016,10 @@ ZEND_VM_HOT_HANDLER(129, ZEND_DO_ICALL, ANY, ANY, SPEC(RETVAL))
if (UNEXPECTED(EG(exception) != NULL)) {
zend_rethrow_exception(execute_data);
} else {
ZEND_VM_SET_OPCODE(opline + 1);
HANDLE_EXCEPTION();
}
ZEND_VM_SET_OPCODE(opline + 1);
ZEND_VM_CONTINUE();
}
@@ -4123,9 +4124,9 @@ ZEND_VM_C_LABEL(fcall_end):
if (UNEXPECTED(EG(exception) != NULL)) {
zend_rethrow_exception(execute_data);
} else {
ZEND_VM_SET_OPCODE(opline + 1);
HANDLE_EXCEPTION();
}
ZEND_VM_SET_OPCODE(opline + 1);
ZEND_VM_CONTINUE();
}
@@ -4234,9 +4235,10 @@ ZEND_VM_C_LABEL(fcall_end):
zend_vm_stack_free_call_frame(call);
if (UNEXPECTED(EG(exception) != NULL)) {
zend_rethrow_exception(execute_data);
} else {
ZEND_VM_SET_OPCODE(opline + 1);
HANDLE_EXCEPTION();
}
ZEND_VM_SET_OPCODE(opline + 1);
ZEND_VM_CONTINUE();
}

28
Zend/zend_vm_execute.h
View File

@@ -1286,9 +1286,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_ICALL_SPEC_RETV
if (UNEXPECTED(EG(exception) != NULL)) {
zend_rethrow_exception(execute_data);
} else {
ZEND_VM_SET_OPCODE(opline + 1);
HANDLE_EXCEPTION();
}
ZEND_VM_SET_OPCODE(opline + 1);
ZEND_VM_CONTINUE();
}
@@ -1330,9 +1331,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_ICALL_SPEC_RETV
if (UNEXPECTED(EG(exception) != NULL)) {
zend_rethrow_exception(execute_data);
} else {
ZEND_VM_SET_OPCODE(opline + 1);
HANDLE_EXCEPTION();
}
ZEND_VM_SET_OPCODE(opline + 1);
ZEND_VM_CONTINUE();
}
@@ -1460,9 +1462,9 @@ fcall_end:
if (UNEXPECTED(EG(exception) != NULL)) {
zend_rethrow_exception(execute_data);
} else {
ZEND_VM_SET_OPCODE(opline + 1);
HANDLE_EXCEPTION();
}
ZEND_VM_SET_OPCODE(opline + 1);
ZEND_VM_CONTINUE();
}
@@ -1544,9 +1546,9 @@ fcall_end:
if (UNEXPECTED(EG(exception) != NULL)) {
zend_rethrow_exception(execute_data);
} else {
ZEND_VM_SET_OPCODE(opline + 1);
HANDLE_EXCEPTION();
}
ZEND_VM_SET_OPCODE(opline + 1);
ZEND_VM_CONTINUE();
}
@@ -1655,9 +1657,10 @@ fcall_end:
zend_vm_stack_free_call_frame(call);
if (UNEXPECTED(EG(exception) != NULL)) {
zend_rethrow_exception(execute_data);
} else {
ZEND_VM_SET_OPCODE(opline + 1);
HANDLE_EXCEPTION();
}
ZEND_VM_SET_OPCODE(opline + 1);
ZEND_VM_CONTINUE();
}
@@ -1766,9 +1769,10 @@ fcall_end:
zend_vm_stack_free_call_frame(call);
if (UNEXPECTED(EG(exception) != NULL)) {
zend_rethrow_exception(execute_data);
} else {
ZEND_VM_SET_OPCODE(opline + 1);
HANDLE_EXCEPTION();
}
ZEND_VM_SET_OPCODE(opline + 1);
ZEND_VM_CONTINUE();
}