com php-src: Removed duplicate code: Zend/zend_vm_def.h Zend/zend_vm_execute.h
| From: | Bob Weinand | Date: | Wed, 25 May 2016 09:54:13 +0000 |
| Subject: | com php-src: Removed duplicate code: Zend/zend_vm_def.h Zend/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95531@lists.php.net to get a copy of this message | ||
Commit: a53b8ace1b61aab3031da02a4cdef37c96eb5fe5
Author: Dmitry Stogov <dmitry@zend.com> Wed, 25 May 2016 12:54:13 +0300
Parents: d46695d524fde219b84ce0186faadfa8bd88427a
Branches: typed_ref_properties
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a53b8ace1b61aab3031da02a4cdef37c96eb5fe5
Log:
Removed duplicate code
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index f97c1ac..29e3cf3 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5888,6 +5888,7 @@ ZEND_VM_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, JMP_ADDR)
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} else if (OP1_TYPE != IS_CONST && EXPECTED(Z_TYPE_P(array_ptr) == IS_OBJECT)) {
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(array_ptr)))) {
+ZEND_VM_C_LABEL(fe_reset_rw_typed):
zend_throw_exception_ex(
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
@@ -5940,16 +5941,7 @@ ZEND_VM_HANDLER(125, ZEND_FE_RESET_RW, CONST|TMP|VAR|CV, JMP_ADDR)
zend_bool is_empty;
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(ce))) {
- zend_throw_exception_ex(
- zend_ce_type_error, 0,
- "Typed properties exist in %s: foreach by reference is disallowed",
- ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
- if (OP1_TYPE == IS_VAR) {
- FREE_OP1_VAR_PTR();
- } else {
- FREE_OP1();
- }
- HANDLE_EXCEPTION();
+ ZEND_VM_C_GOTO(fe_reset_rw_typed);
}
iter = ce->get_iterator(ce, array_ptr, 1);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 016b2f9..839dc42f4 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -3561,6 +3561,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_CONST_HANDLER
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} else if (IS_CONST != IS_CONST && EXPECTED(Z_TYPE_P(array_ptr) == IS_OBJECT)) {
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(array_ptr)))) {
+fe_reset_rw_typed:
zend_throw_exception_ex(
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
@@ -3612,16 +3613,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_CONST_HANDLER
zend_bool is_empty;
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(ce))) {
- zend_throw_exception_ex(
- zend_ce_type_error, 0,
- "Typed properties exist in %s: foreach by reference is disallowed",
- ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
- if (IS_CONST == IS_VAR) {
-
- } else {
-
- }
- HANDLE_EXCEPTION();
+ goto fe_reset_rw_typed;
}
iter = ce->get_iterator(ce, array_ptr, 1);
@@ -12685,6 +12677,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_TMP_HANDLER(Z
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} else if (IS_TMP_VAR != IS_CONST && EXPECTED(Z_TYPE_P(array_ptr) == IS_OBJECT)) {
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(array_ptr)))) {
+fe_reset_rw_typed:
zend_throw_exception_ex(
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
@@ -12736,16 +12729,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_TMP_HANDLER(Z
zend_bool is_empty;
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(ce))) {
- zend_throw_exception_ex(
- zend_ce_type_error, 0,
- "Typed properties exist in %s: foreach by reference is disallowed",
- ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
- if (IS_TMP_VAR == IS_VAR) {
-
- } else {
- zval_ptr_dtor_nogc(free_op1);
- }
- HANDLE_EXCEPTION();
+ goto fe_reset_rw_typed;
}
iter = ce->get_iterator(ce, array_ptr, 1);
@@ -16233,6 +16217,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_VAR_HANDLER(Z
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} else if (IS_VAR != IS_CONST && EXPECTED(Z_TYPE_P(array_ptr) == IS_OBJECT)) {
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(array_ptr)))) {
+fe_reset_rw_typed:
zend_throw_exception_ex(
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
@@ -16285,16 +16270,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_VAR_HANDLER(Z
zend_bool is_empty;
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(ce))) {
- zend_throw_exception_ex(
- zend_ce_type_error, 0,
- "Typed properties exist in %s: foreach by reference is disallowed",
- ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
- if (IS_VAR == IS_VAR) {
- if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
- } else {
- zval_ptr_dtor_nogc(free_op1);
- }
- HANDLE_EXCEPTION();
+ goto fe_reset_rw_typed;
}
iter = ce->get_iterator(ce, array_ptr, 1);
@@ -38687,6 +38663,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_CV_HANDLER(ZE
ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
} else if (IS_CV != IS_CONST && EXPECTED(Z_TYPE_P(array_ptr) == IS_OBJECT)) {
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(Z_OBJCE_P(array_ptr)))) {
+fe_reset_rw_typed:
zend_throw_exception_ex(
zend_ce_type_error, 0,
"Typed properties exist in %s: foreach by reference is disallowed",
@@ -38738,16 +38715,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL
ZEND_FE_RESET_RW_SPEC_CV_HANDLER(ZE
zend_bool is_empty;
if (UNEXPECTED(ZEND_CLASS_HAS_TYPE_HINTS(ce))) {
- zend_throw_exception_ex(
- zend_ce_type_error, 0,
- "Typed properties exist in %s: foreach by reference is disallowed",
- ZSTR_VAL(Z_OBJCE_P(array_ptr)->name));
- if (IS_CV == IS_VAR) {
-
- } else {
-
- }
- HANDLE_EXCEPTION();
+ goto fe_reset_rw_typed;
}
iter = ce->get_iterator(ce, array_ptr, 1);