Revert "Microoptimization (avoid code duplication)"

dstogov · dstogov · commit 4ecdff2da829 · 2019-09-05T15:35:19.000+03:00
This reverts commit 25d97f5.
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -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();
 }
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -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 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 
 	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 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 
 	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 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_RETV
 	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 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_RETV
 	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();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4016,9 +4016,10 @@ ZEND_VM_HOT_HANDLER(129, ZEND_DO_ICALL, ANY, ANY, SPEC(RETVAL))`
`4016`	`4016`
`4017`	`4017`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`4018`	`4018`	`zend_rethrow_exception(execute_data);`
`4019`		`- } else {`
`4020`		`- ZEND_VM_SET_OPCODE(opline + 1);`
	`4019`	`+ HANDLE_EXCEPTION();`
`4021`	`4020`	`}`
	`4021`	`+`
	`4022`	`+ ZEND_VM_SET_OPCODE(opline + 1);`
`4022`	`4023`	`ZEND_VM_CONTINUE();`
`4023`	`4024`	`}`
`4024`	`4025`
`@@ -4123,9 +4124,9 @@ ZEND_VM_C_LABEL(fcall_end):`
`4123`	`4124`
`4124`	`4125`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`4125`	`4126`	`zend_rethrow_exception(execute_data);`
`4126`		`- } else {`
`4127`		`- ZEND_VM_SET_OPCODE(opline + 1);`
	`4127`	`+ HANDLE_EXCEPTION();`
`4128`	`4128`	`}`
	`4129`	`+ ZEND_VM_SET_OPCODE(opline + 1);`
`4129`	`4130`	`ZEND_VM_CONTINUE();`
`4130`	`4131`	`}`
`4131`	`4132`
`@@ -4234,9 +4235,10 @@ ZEND_VM_C_LABEL(fcall_end):`
`4234`	`4235`	`zend_vm_stack_free_call_frame(call);`
`4235`	`4236`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`4236`	`4237`	`zend_rethrow_exception(execute_data);`
`4237`		`- } else {`
`4238`		`- ZEND_VM_SET_OPCODE(opline + 1);`
	`4238`	`+ HANDLE_EXCEPTION();`
`4239`	`4239`	`}`
	`4240`	`+`
	`4241`	`+ ZEND_VM_SET_OPCODE(opline + 1);`
`4240`	`4242`	`ZEND_VM_CONTINUE();`
`4241`	`4243`	`}`
`4242`	`4244`
Original file line number	Diff line number	Diff line change
`@@ -1286,9 +1286,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_ICALL_SPEC_RETV`
`1286`	`1286`
`1287`	`1287`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`1288`	`1288`	`zend_rethrow_exception(execute_data);`
`1289`		`- } else {`
`1290`		`- ZEND_VM_SET_OPCODE(opline + 1);`
	`1289`	`+ HANDLE_EXCEPTION();`
`1291`	`1290`	`}`
	`1291`	`+`
	`1292`	`+ ZEND_VM_SET_OPCODE(opline + 1);`
`1292`	`1293`	`ZEND_VM_CONTINUE();`
`1293`	`1294`	`}`
`1294`	`1295`
`@@ -1330,9 +1331,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_ICALL_SPEC_RETV`
`1330`	`1331`
`1331`	`1332`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`1332`	`1333`	`zend_rethrow_exception(execute_data);`
`1333`		`- } else {`
`1334`		`- ZEND_VM_SET_OPCODE(opline + 1);`
	`1334`	`+ HANDLE_EXCEPTION();`
`1335`	`1335`	`}`
	`1336`	`+`
	`1337`	`+ ZEND_VM_SET_OPCODE(opline + 1);`
`1336`	`1338`	`ZEND_VM_CONTINUE();`
`1337`	`1339`	`}`
`1338`	`1340`
`@@ -1460,9 +1462,9 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S`
`1460`	`1462`
`1461`	`1463`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`1462`	`1464`	`zend_rethrow_exception(execute_data);`
`1463`		`- } else {`
`1464`		`- ZEND_VM_SET_OPCODE(opline + 1);`
	`1465`	`+ HANDLE_EXCEPTION();`
`1465`	`1466`	`}`
	`1467`	`+ ZEND_VM_SET_OPCODE(opline + 1);`
`1466`	`1468`	`ZEND_VM_CONTINUE();`
`1467`	`1469`	`}`
`1468`	`1470`
`@@ -1544,9 +1546,9 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S`
`1544`	`1546`
`1545`	`1547`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`1546`	`1548`	`zend_rethrow_exception(execute_data);`
`1547`		`- } else {`
`1548`		`- ZEND_VM_SET_OPCODE(opline + 1);`
	`1549`	`+ HANDLE_EXCEPTION();`
`1549`	`1550`	`}`
	`1551`	`+ ZEND_VM_SET_OPCODE(opline + 1);`
`1550`	`1552`	`ZEND_VM_CONTINUE();`
`1551`	`1553`	`}`
`1552`	`1554`
`@@ -1655,9 +1657,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_RETV`
`1655`	`1657`	`zend_vm_stack_free_call_frame(call);`
`1656`	`1658`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`1657`	`1659`	`zend_rethrow_exception(execute_data);`
`1658`		`- } else {`
`1659`		`- ZEND_VM_SET_OPCODE(opline + 1);`
	`1660`	`+ HANDLE_EXCEPTION();`
`1660`	`1661`	`}`
	`1662`	`+`
	`1663`	`+ ZEND_VM_SET_OPCODE(opline + 1);`
`1661`	`1664`	`ZEND_VM_CONTINUE();`
`1662`	`1665`	`}`
`1663`	`1666`
`@@ -1766,9 +1769,10 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_RETV`
`1766`	`1769`	`zend_vm_stack_free_call_frame(call);`
`1767`	`1770`	`if (UNEXPECTED(EG(exception) != NULL)) {`
`1768`	`1771`	`zend_rethrow_exception(execute_data);`
`1769`		`- } else {`
`1770`		`- ZEND_VM_SET_OPCODE(opline + 1);`
	`1772`	`+ HANDLE_EXCEPTION();`
`1771`	`1773`	`}`
	`1774`	`+`
	`1775`	`+ ZEND_VM_SET_OPCODE(opline + 1);`
`1772`	`1776`	`ZEND_VM_CONTINUE();`
`1773`	`1777`	`}`
`1774`	`1778`