Fixed GOTO VM

dstogov · dstogov · commit 23db95e3e5cf · 2019-09-26T01:17:54.000+03:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -4079,7 +4079,7 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL))
 					ret = &retval;
 					ZVAL_UNDEF(ret);
 				}
-				ZEND_VM_C_GOTO(fcall_end);
+				ZEND_VM_C_GOTO(fcall_by_name_end);
 			}
 		}
 
@@ -4093,7 +4093,7 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL))
 				ret = &retval;
 				ZVAL_UNDEF(ret);
 			}
-			ZEND_VM_C_GOTO(fcall_end);
+			ZEND_VM_C_GOTO(fcall_by_name_end);
 		}
 
 		ret = RETURN_VALUE_USED(opline) ? EX_VAR(opline->result.var) : &retval;
@@ -4112,7 +4112,7 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL))
 
 		EG(current_execute_data) = execute_data;
 
-ZEND_VM_C_LABEL(fcall_end):
+ZEND_VM_C_LABEL(fcall_by_name_end):
 		zend_vm_stack_free_args(call);
 		zend_vm_stack_free_call_frame(call);
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -1418,7 +1418,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 					ret = &retval;
 					ZVAL_UNDEF(ret);
 				}
-				goto fcall_end;
+				goto fcall_by_name_end;
 			}
 		}
 
@@ -1432,7 +1432,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 				ret = &retval;
 				ZVAL_UNDEF(ret);
 			}
-			goto fcall_end;
+			goto fcall_by_name_end;
 		}
 
 		ret = 0 ? EX_VAR(opline->result.var) : &retval;
@@ -1451,7 +1451,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 
 		EG(current_execute_data) = execute_data;
 
-fcall_end:
+fcall_by_name_end:
 		zend_vm_stack_free_args(call);
 		zend_vm_stack_free_call_frame(call);
 
@@ -1502,7 +1502,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 					ret = &retval;
 					ZVAL_UNDEF(ret);
 				}
-				goto fcall_end;
+				goto fcall_by_name_end;
 			}
 		}
 
@@ -1516,7 +1516,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 				ret = &retval;
 				ZVAL_UNDEF(ret);
 			}
-			goto fcall_end;
+			goto fcall_by_name_end;
 		}
 
 		ret = 1 ? EX_VAR(opline->result.var) : &retval;
@@ -1535,7 +1535,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S
 
 		EG(current_execute_data) = execute_data;
 
-fcall_end:
+fcall_by_name_end:
 		zend_vm_stack_free_args(call);
 		zend_vm_stack_free_call_frame(call);
 

Original file line number	Diff line number	Diff line change
`@@ -4079,7 +4079,7 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL))`
`4079`	`4079`	`ret = &retval;`
`4080`	`4080`	`ZVAL_UNDEF(ret);`
`4081`	`4081`	`}`
`4082`		`- ZEND_VM_C_GOTO(fcall_end);`
	`4082`	`+ ZEND_VM_C_GOTO(fcall_by_name_end);`
`4083`	`4083`	`}`
`4084`	`4084`	`}`
`4085`	`4085`
`@@ -4093,7 +4093,7 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL))`
`4093`	`4093`	`ret = &retval;`
`4094`	`4094`	`ZVAL_UNDEF(ret);`
`4095`	`4095`	`}`
`4096`		`- ZEND_VM_C_GOTO(fcall_end);`
	`4096`	`+ ZEND_VM_C_GOTO(fcall_by_name_end);`
`4097`	`4097`	`}`
`4098`	`4098`
`4099`	`4099`	`ret = RETURN_VALUE_USED(opline) ? EX_VAR(opline->result.var) : &retval;`
`@@ -4112,7 +4112,7 @@ ZEND_VM_HOT_HANDLER(131, ZEND_DO_FCALL_BY_NAME, ANY, ANY, SPEC(RETVAL))`
`4112`	`4112`
`4113`	`4113`	`EG(current_execute_data) = execute_data;`
`4114`	`4114`
`4115`		`-ZEND_VM_C_LABEL(fcall_end):`
	`4115`	`+ZEND_VM_C_LABEL(fcall_by_name_end):`
`4116`	`4116`	`zend_vm_stack_free_args(call);`
`4117`	`4117`	`zend_vm_stack_free_call_frame(call);`
`4118`	`4118`
Original file line number	Diff line number	Diff line change
`@@ -1418,7 +1418,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S`
`1418`	`1418`	`ret = &retval;`
`1419`	`1419`	`ZVAL_UNDEF(ret);`
`1420`	`1420`	`}`
`1421`		`- goto fcall_end;`
	`1421`	`+ goto fcall_by_name_end;`
`1422`	`1422`	`}`
`1423`	`1423`	`}`
`1424`	`1424`
`@@ -1432,7 +1432,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S`
`1432`	`1432`	`ret = &retval;`
`1433`	`1433`	`ZVAL_UNDEF(ret);`
`1434`	`1434`	`}`
`1435`		`- goto fcall_end;`
	`1435`	`+ goto fcall_by_name_end;`
`1436`	`1436`	`}`
`1437`	`1437`
`1438`	`1438`	`ret = 0 ? EX_VAR(opline->result.var) : &retval;`
`@@ -1451,7 +1451,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S`
`1451`	`1451`
`1452`	`1452`	`EG(current_execute_data) = execute_data;`
`1453`	`1453`
`1454`		`-fcall_end:`
	`1454`	`+fcall_by_name_end:`
`1455`	`1455`	`zend_vm_stack_free_args(call);`
`1456`	`1456`	`zend_vm_stack_free_call_frame(call);`
`1457`	`1457`
`@@ -1502,7 +1502,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S`
`1502`	`1502`	`ret = &retval;`
`1503`	`1503`	`ZVAL_UNDEF(ret);`
`1504`	`1504`	`}`
`1505`		`- goto fcall_end;`
	`1505`	`+ goto fcall_by_name_end;`
`1506`	`1506`	`}`
`1507`	`1507`	`}`
`1508`	`1508`
`@@ -1516,7 +1516,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S`
`1516`	`1516`	`ret = &retval;`
`1517`	`1517`	`ZVAL_UNDEF(ret);`
`1518`	`1518`	`}`
`1519`		`- goto fcall_end;`
	`1519`	`+ goto fcall_by_name_end;`
`1520`	`1520`	`}`
`1521`	`1521`
`1522`	`1522`	`ret = 1 ? EX_VAR(opline->result.var) : &retval;`
`@@ -1535,7 +1535,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_BY_NAME_S`
`1535`	`1535`
`1536`	`1536`	`EG(current_execute_data) = execute_data;`
`1537`	`1537`
`1538`		`-fcall_end:`
	`1538`	`+fcall_by_name_end:`
`1539`	`1539`	`zend_vm_stack_free_args(call);`
`1540`	`1540`	`zend_vm_stack_free_call_frame(call);`
`1541`	`1541`