Fixed GOTO VM

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 2d8fe24fbc082bd0da7df3f5f3994c64fa1f14b0..823f5398b28f49dbcfe0640cc567368b0515e5d3 100644 (file)
--- 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 5927f7958017823cdc538f0b328b4728a4fbb3e0..81b6c3d8e6325b1c59f65d656373d789d6e6847b 100644 (file)
--- 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);