Microoptimization (avoid code duplication)

dstogov · dstogov · commit 25d97f5eeeaf · 2019-09-05T13:44:46.000+03:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -4016,10 +4016,9 @@ ZEND_VM_HOT_HANDLER(129, ZEND_DO_ICALL, ANY, ANY, SPEC(RETVAL))
 
 	if (UNEXPECTED(EG(exception) != NULL)) {
 		zend_rethrow_exception(execute_data);
-		HANDLE_EXCEPTION();
+	} else {
+		ZEND_VM_SET_OPCODE(opline + 1);
 	}
-
-	ZEND_VM_SET_OPCODE(opline + 1);
 	ZEND_VM_CONTINUE();
 }
 
@@ -4124,9 +4123,9 @@ ZEND_VM_C_LABEL(fcall_end):
 
 	if (UNEXPECTED(EG(exception) != NULL)) {
 		zend_rethrow_exception(execute_data);
-		HANDLE_EXCEPTION();
+	} else {
+		ZEND_VM_SET_OPCODE(opline + 1);
 	}
-	ZEND_VM_SET_OPCODE(opline + 1);
 	ZEND_VM_CONTINUE();
 }
 
@@ -4235,10 +4234,9 @@ ZEND_VM_C_LABEL(fcall_end):
 	zend_vm_stack_free_call_frame(call);
 	if (UNEXPECTED(EG(exception) != NULL)) {
 		zend_rethrow_exception(execute_data);
-		HANDLE_EXCEPTION();
+	} else {
+		ZEND_VM_SET_OPCODE(opline + 1);
 	}
-
-	ZEND_VM_SET_OPCODE(opline + 1);
 	ZEND_VM_CONTINUE();
 }
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -1286,10 +1286,9 @@ 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);
-		HANDLE_EXCEPTION();
+	} else {
+		ZEND_VM_SET_OPCODE(opline + 1);
 	}
-
-	ZEND_VM_SET_OPCODE(opline + 1);
 	ZEND_VM_CONTINUE();
 }
 
@@ -1331,10 +1330,9 @@ 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);
-		HANDLE_EXCEPTION();
+	} else {
+		ZEND_VM_SET_OPCODE(opline + 1);
 	}
-
-	ZEND_VM_SET_OPCODE(opline + 1);
 	ZEND_VM_CONTINUE();
 }
 
@@ -1462,9 +1460,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);
-		HANDLE_EXCEPTION();
+	} else {
+		ZEND_VM_SET_OPCODE(opline + 1);
 	}
-	ZEND_VM_SET_OPCODE(opline + 1);
 	ZEND_VM_CONTINUE();
 }
 
@@ -1546,9 +1544,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);
-		HANDLE_EXCEPTION();
+	} else {
+		ZEND_VM_SET_OPCODE(opline + 1);
 	}
-	ZEND_VM_SET_OPCODE(opline + 1);
 	ZEND_VM_CONTINUE();
 }
 
@@ -1657,10 +1655,9 @@ 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);
-		HANDLE_EXCEPTION();
+	} else {
+		ZEND_VM_SET_OPCODE(opline + 1);
 	}
-
-	ZEND_VM_SET_OPCODE(opline + 1);
 	ZEND_VM_CONTINUE();
 }
 
@@ -1769,10 +1766,9 @@ 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);
-		HANDLE_EXCEPTION();
+	} else {
+		ZEND_VM_SET_OPCODE(opline + 1);
 	}
-
-	ZEND_VM_SET_OPCODE(opline + 1);
 	ZEND_VM_CONTINUE();
 }
 

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