Removed support for break/continue $var syntax

diff --git a/NEWS b/NEWS
index b936b88270c45ce735d3f196cb872fbe55dcc083..2c3d7504dfe4b9934b4b5eab142bbdc40b3b2ccb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP                                                                        NEWS
 - Upgraded bundled PCRE to version 8.10. (Ilia)
 
 - Removed legacy features:
+  . break/continue $var syntax. (Dmitry)
   . Safe mode and all related ini options. (Kalle)
   . register_globals and register_long_arrays ini options. (Kalle)
   . import_request_variables(). (Kalle)

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 5abb81e8fd61b24b4156adb679d418c96f35bdf3..9d61c004d6f4e31500528f10206eae47642d7de6 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4302,6 +4302,11 @@ void zend_do_brk_cont(zend_uchar op, const znode *expr TSRMLS_DC) /* {{{ */
        opline->op1.opline_num = CG(context).current_brk_cont;
        SET_UNUSED(opline->op1);
        if (expr) {
+               if (expr->op_type != IS_CONST) {
+                       zend_error(E_COMPILE_ERROR, "'%s' operator with non-constant operand is no longer supported", op == ZEND_BRK ? "break" : "continue");
+               } else if (Z_TYPE(expr->u.constant) != IS_LONG || Z_LVAL(expr->u.constant) < 1) {
+                       zend_error(E_COMPILE_ERROR, "'%s' operator accepts only positive numbers", op == ZEND_BRK ? "break" : "continue");
+               }
                SET_NODE(opline->op2, expr);
        } else {
                LITERAL_LONG(opline->op2, 1);

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 245304764bdcba475cdc459f24b3890d37db8be9..d30f030f58ea5baef9f261277a59dc46485bf6d2 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1362,21 +1362,12 @@ static void zend_fetch_property_address(temp_variable *result, zval **container_
        }
 }
 
-static inline zend_brk_cont_element* zend_brk_cont(zval *nest_levels_zval, int array_offset, const zend_op_array *op_array, const temp_variable *Ts TSRMLS_DC)
+static inline zend_brk_cont_element* zend_brk_cont(int nest_levels, int array_offset, const zend_op_array *op_array, const temp_variable *Ts TSRMLS_DC)
 {
        zval tmp;
-       int nest_levels, original_nest_levels;
+       int original_nest_levels = nest_levels;
        zend_brk_cont_element *jmp_to;
 
-       if (nest_levels_zval->type != IS_LONG) {
-               tmp = *nest_levels_zval;
-               zval_copy_ctor(&tmp);
-               convert_to_long(&tmp);
-               nest_levels = tmp.value.lval;
-       } else {
-               nest_levels = nest_levels_zval->value.lval;
-       }
-       original_nest_levels = nest_levels;
        do {
                if (array_offset==-1) {
                        zend_error_noreturn(E_ERROR, "Cannot break/continue %d level%s", original_nest_levels, (original_nest_levels == 1) ? "" : "s");

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 0bebfa2ed7d52d375be264fd72cb5acb82b0c770..005c92b53278f6d013b654899d3ad9440dd2d240 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3171,27 +3171,25 @@ ZEND_VM_HANDLER(52, ZEND_BOOL, CONST|TMP|VAR|CV, ANY)
        ZEND_VM_NEXT_OPCODE();
 }
 
-ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONST|TMP|VAR|CV)
+ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONST)
 {
        USE_OPLINE
-       zend_free_op free_op2;
        zend_brk_cont_element *el;
 
        SAVE_OPLINE();
-       el = zend_brk_cont(GET_OP2_ZVAL_PTR(BP_VAR_R), opline->op1.opline_num,
+       el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
                           EX(op_array), EX_Ts() TSRMLS_CC);
        FREE_OP2();
        ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
 }
 
-ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CONST|TMP|VAR|CV)
+ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CONST)
 {
        USE_OPLINE
-       zend_free_op free_op2;
        zend_brk_cont_element *el;
 
        SAVE_OPLINE();
-       el = zend_brk_cont(GET_OP2_ZVAL_PTR(BP_VAR_R), opline->op1.opline_num,
+       el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
                           EX(op_array), EX_Ts() TSRMLS_CC);
        FREE_OP2();
        ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
@@ -3204,7 +3202,7 @@ ZEND_VM_HANDLER(100, ZEND_GOTO, ANY, CONST)
        zend_brk_cont_element *el;
 
        SAVE_OPLINE();
-       el = zend_brk_cont(opline->op2.zv, opline->extended_value,
+       el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->extended_value,
                           EX(op_array), EX_Ts() TSRMLS_CC);
 
        brk_opline = EX(op_array)->opcodes + el->brk;

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index b517154e1e504132103e73d820d591dd4a99e955..b6a1179b25d105619514483b74a7405c42f9651b 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1304,11 +1304,10 @@ static int ZEND_FASTCALL  ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_
 static int ZEND_FASTCALL  ZEND_BRK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
        zend_brk_cont_element *el;
 
        SAVE_OPLINE();
-       el = zend_brk_cont(opline->op2.zv, opline->op1.opline_num,
+       el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
                           EX(op_array), EX_Ts() TSRMLS_CC);
 
        ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
@@ -1317,11 +1316,10 @@ static int ZEND_FASTCALL  ZEND_BRK_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 static int ZEND_FASTCALL  ZEND_CONT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
-
        zend_brk_cont_element *el;
 
        SAVE_OPLINE();
-       el = zend_brk_cont(opline->op2.zv, opline->op1.opline_num,
+       el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
                           EX(op_array), EX_Ts() TSRMLS_CC);
 
        ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
@@ -1334,7 +1332,7 @@ static int ZEND_FASTCALL  ZEND_GOTO_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_brk_cont_element *el;
 
        SAVE_OPLINE();
-       el = zend_brk_cont(opline->op2.zv, opline->extended_value,
+       el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->extended_value,
                           EX(op_array), EX_Ts() TSRMLS_CC);
 
        brk_opline = EX(op_array)->opcodes + el->brk;
@@ -1477,32 +1475,6 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H
 }
 
 
-static int ZEND_FASTCALL  ZEND_BRK_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       USE_OPLINE
-       zend_free_op free_op2;
-       zend_brk_cont_element *el;
-
-       SAVE_OPLINE();
-       el = zend_brk_cont(_get_zval_ptr_tmp(opline->op2.var, EX_Ts(), &free_op2 TSRMLS_CC), opline->op1.opline_num,
-                          EX(op_array), EX_Ts() TSRMLS_CC);
-       zval_dtor(free_op2.var);
-       ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
-}
-
-static int ZEND_FASTCALL  ZEND_CONT_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       USE_OPLINE
-       zend_free_op free_op2;
-       zend_brk_cont_element *el;
-
-       SAVE_OPLINE();
-       el = zend_brk_cont(_get_zval_ptr_tmp(opline->op2.var, EX_Ts(), &free_op2 TSRMLS_CC), opline->op1.opline_num,
-                          EX(op_array), EX_Ts() TSRMLS_CC);
-       zval_dtor(free_op2.var);
-       ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
-}
-
 static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
@@ -1599,32 +1571,6 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H
 }
 
 
-static int ZEND_FASTCALL  ZEND_BRK_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       USE_OPLINE
-       zend_free_op free_op2;
-       zend_brk_cont_element *el;
-
-       SAVE_OPLINE();
-       el = zend_brk_cont(_get_zval_ptr_var(opline->op2.var, EX_Ts(), &free_op2 TSRMLS_CC), opline->op1.opline_num,
-                          EX(op_array), EX_Ts() TSRMLS_CC);
-       if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
-}
-
-static int ZEND_FASTCALL  ZEND_CONT_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       USE_OPLINE
-       zend_free_op free_op2;
-       zend_brk_cont_element *el;
-
-       SAVE_OPLINE();
-       el = zend_brk_cont(_get_zval_ptr_var(opline->op2.var, EX_Ts(), &free_op2 TSRMLS_CC), opline->op1.opline_num,
-                          EX(op_array), EX_Ts() TSRMLS_CC);
-       if (free_op2.var) {zval_ptr_dtor(&free_op2.var);};
-       ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
-}
-
 static int ZEND_FASTCALL  ZEND_FETCH_CLASS_SPEC_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
@@ -1754,32 +1700,6 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA
 }
 
 
-static int ZEND_FASTCALL  ZEND_BRK_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       USE_OPLINE
-
-       zend_brk_cont_element *el;
-
-       SAVE_OPLINE();
-       el = zend_brk_cont(_get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op2.var TSRMLS_CC), opline->op1.opline_num,
-                          EX(op_array), EX_Ts() TSRMLS_CC);
-
-       ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
-}
-
-static int ZEND_FASTCALL  ZEND_CONT_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
-{
-       USE_OPLINE
-
-       zend_brk_cont_element *el;
-
-       SAVE_OPLINE();
-       el = zend_brk_cont(_get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op2.var TSRMLS_CC), opline->op1.opline_num,
-                          EX(op_array), EX_Ts() TSRMLS_CC);
-
-       ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
-}
-
 static int ZEND_FASTCALL  ZEND_BW_NOT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        USE_OPLINE
@@ -36791,55 +36711,55 @@ void zend_init_opcodes_handlers(void)
        ZEND_NULL_HANDLER,
        ZEND_NULL_HANDLER,
        ZEND_BRK_SPEC_CONST_HANDLER,
-       ZEND_BRK_SPEC_TMP_HANDLER,
-       ZEND_BRK_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_BRK_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_BRK_SPEC_CONST_HANDLER,
-       ZEND_BRK_SPEC_TMP_HANDLER,
-       ZEND_BRK_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_BRK_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_BRK_SPEC_CONST_HANDLER,
-       ZEND_BRK_SPEC_TMP_HANDLER,
-       ZEND_BRK_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_BRK_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_BRK_SPEC_CONST_HANDLER,
-       ZEND_BRK_SPEC_TMP_HANDLER,
-       ZEND_BRK_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_BRK_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_BRK_SPEC_CONST_HANDLER,
-       ZEND_BRK_SPEC_TMP_HANDLER,
-       ZEND_BRK_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_BRK_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_CONT_SPEC_CONST_HANDLER,
-       ZEND_CONT_SPEC_TMP_HANDLER,
-       ZEND_CONT_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_CONT_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_CONT_SPEC_CONST_HANDLER,
-       ZEND_CONT_SPEC_TMP_HANDLER,
-       ZEND_CONT_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_CONT_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_CONT_SPEC_CONST_HANDLER,
-       ZEND_CONT_SPEC_TMP_HANDLER,
-       ZEND_CONT_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_CONT_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_CONT_SPEC_CONST_HANDLER,
-       ZEND_CONT_SPEC_TMP_HANDLER,
-       ZEND_CONT_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_CONT_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_CONT_SPEC_CONST_HANDLER,
-       ZEND_CONT_SPEC_TMP_HANDLER,
-       ZEND_CONT_SPEC_VAR_HANDLER,
        ZEND_NULL_HANDLER,
-       ZEND_CONT_SPEC_CV_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
+       ZEND_NULL_HANDLER,
        ZEND_BOOL_SPEC_CONST_HANDLER,
        ZEND_BOOL_SPEC_CONST_HANDLER,
        ZEND_BOOL_SPEC_CONST_HANDLER,