From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 25 Sep 2019 22:17:54 +0000 (+0300)
Subject: Fixed GOTO VM
X-Git-Tag: php-7.4.0RC3~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23db95e3e5cf0a8e147a7b2b377bde3f13fc8a29;p=php

Fixed GOTO VM
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 2d8fe24fbc..823f5398b2 100644
--- 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
index 5927f79580..81b6c3d8e6 100644
--- 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);