com php-src: cleanup: Zend/zend_vm_def.h Zend/zend_vm _execute.h

From: Date: Wed, 01 Jun 2016 15:07:05 +0000
Subject: com php-src: cleanup: Zend/zend_vm_def.h Zend/zend_vm _execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92266@lists.php.net to get a copy of this message
Commit: 6a32d44392185be1d36dbc2e8b6c640a5d0491ca Author: Dmitry Stogov <dmitry@zend.com> Wed, 1 Jun 2016 18:07:05 +0300 Parents: 430d5ef2818268054d45b47c6797722986a498e3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6a32d44392185be1d36dbc2e8b6c640a5d0491ca Log: cleanup 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 e7fe591..44fb729 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4529,35 +4529,32 @@ ZEND_VM_C_LABEL(send_again): if (iter->funcs->rewind) { iter->funcs->rewind(iter); - if (UNEXPECTED(EG(exception) != NULL)) { - ZEND_VM_C_GOTO(unpack_iter_dtor); - } } for (; iter->funcs->valid(iter) == SUCCESS; ++arg_num) { zval *arg, *top; if (UNEXPECTED(EG(exception) != NULL)) { - ZEND_VM_C_GOTO(unpack_iter_dtor); + break; } arg = iter->funcs->get_current_data(iter); if (UNEXPECTED(EG(exception) != NULL)) { - ZEND_VM_C_GOTO(unpack_iter_dtor); + break; } if (iter->funcs->get_current_key) { zval key; iter->funcs->get_current_key(iter, &key); if (UNEXPECTED(EG(exception) != NULL)) { - ZEND_VM_C_GOTO(unpack_iter_dtor); + break; } if (Z_TYPE(key) == IS_STRING) { zend_throw_error(NULL, "Cannot unpack Traversable with string keys"); zend_string_release(Z_STR(key)); - ZEND_VM_C_GOTO(unpack_iter_dtor); + break; } zval_dtor(&key); @@ -4585,12 +4582,8 @@ ZEND_VM_C_LABEL(send_again): ZEND_CALL_NUM_ARGS(EX(call))++; iter->funcs->move_forward(iter); - if (UNEXPECTED(EG(exception) != NULL)) { - ZEND_VM_C_GOTO(unpack_iter_dtor); - } } -ZEND_VM_C_LABEL(unpack_iter_dtor): zend_iterator_dtor(iter); } } else if (EXPECTED(Z_ISREF_P(args))) { @@ -4612,7 +4605,6 @@ ZEND_VM_HANDLER(119, ZEND_SEND_ARRAY, ANY, ANY) USE_OPLINE zend_free_op free_op1; zval *args; - SAVE_OPLINE(); SAVE_OPLINE(); args = GET_OP1_ZVAL_PTR(BP_VAR_R); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 7bd732a..67def76 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1301,35 +1301,32 @@ send_again: if (iter->funcs->rewind) { iter->funcs->rewind(iter); - if (UNEXPECTED(EG(exception) != NULL)) { - goto unpack_iter_dtor; - } } for (; iter->funcs->valid(iter) == SUCCESS; ++arg_num) { zval *arg, *top; if (UNEXPECTED(EG(exception) != NULL)) { - goto unpack_iter_dtor; + break; } arg = iter->funcs->get_current_data(iter); if (UNEXPECTED(EG(exception) != NULL)) { - goto unpack_iter_dtor; + break; } if (iter->funcs->get_current_key) { zval key; iter->funcs->get_current_key(iter, &key); if (UNEXPECTED(EG(exception) != NULL)) { - goto unpack_iter_dtor; + break; } if (Z_TYPE(key) == IS_STRING) { zend_throw_error(NULL, "Cannot unpack Traversable with string keys"); zend_string_release(Z_STR(key)); - goto unpack_iter_dtor; + break; } zval_dtor(&key); @@ -1357,12 +1354,8 @@ send_again: ZEND_CALL_NUM_ARGS(EX(call))++; iter->funcs->move_forward(iter); - if (UNEXPECTED(EG(exception) != NULL)) { - goto unpack_iter_dtor; - } } -unpack_iter_dtor: zend_iterator_dtor(iter); } } else if (EXPECTED(Z_ISREF_P(args))) { @@ -1384,7 +1377,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_ARRAY_SPEC_HANDLER(ZEND_O USE_OPLINE zend_free_op free_op1; zval *args; - SAVE_OPLINE(); SAVE_OPLINE(); args = get_zval_ptr(opline->op1_type, opline->op1, execute_data, &free_op1, BP_VAR_R);

« previous php.cvs (#92266) next »