diff options
| author | Xinchen Hui <laruence@gmail.com> | 2018-01-04 13:45:11 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2018-01-04 13:45:11 +0800 |
| commit | 4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf (patch) | |
| tree | 3725689ea9e318ee1fc5ef34a6a83f62bc943802 /Zend/zend_execute.c | |
| parent | 76d0e3d514ba47ad29c06e97efc16fef41e8186b (diff) | |
| parent | 0e3dede07c6677ed5cc60ddad3f7552f83b45a4b (diff) | |
| download | php-git-4a4602c45c8dcd70538de3ebbe5c6829e5ca6fcf.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Happy new year (Update copyright to 2018)
Happy new year (Update copyright to 2018)
Revert "Enable ODBC tests on AppVeyor"
Enable ODBC tests on AppVeyor
Skip on Travis-CI
Extend skip section
2018
missing changelog entries + fix version and date
missing changelog entries
2018
Trailing whitespaces
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 4f89d4fb89..9b7cbf294d 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -576,7 +576,7 @@ static inline zval *_get_zval_ptr_ptr(int op_type, znode_op node, zend_free_op * } static zend_always_inline zval *_get_obj_zval_ptr_unused(EXECUTE_DATA_D) -{ +{ return &EX(This); } @@ -954,7 +954,7 @@ static ZEND_COLD void zend_verify_return_error( zend_verify_type_error_common( zf, arg_info, ce, value, - &fname, &fsep, &fclass, &need_msg, &need_kind, &need_or_null, &given_msg, &given_kind); + &fname, &fsep, &fclass, &need_msg, &need_kind, &need_or_null, &given_msg, &given_kind); zend_type_error("Return value of %s%s%s() must %s%s%s, %s%s returned", fclass, fsep, fname, need_msg, need_kind, need_or_null, given_msg, given_kind); @@ -970,7 +970,7 @@ static ZEND_COLD void zend_verify_internal_return_error( zend_verify_type_error_common( zf, arg_info, ce, value, - &fname, &fsep, &fclass, &need_msg, &need_kind, &need_or_null, &given_msg, &given_kind); + &fname, &fsep, &fclass, &need_msg, &need_kind, &need_or_null, &given_msg, &given_kind); zend_error_noreturn(E_CORE_ERROR, "Return value of %s%s%s() must %s%s%s, %s%s returned", fclass, fsep, fname, need_msg, need_kind, need_or_null, given_msg, given_kind); @@ -1018,7 +1018,7 @@ static zend_always_inline void zend_verify_return_type(zend_function *zf, zval * { zend_arg_info *ret_info = zf->common.arg_info - 1; zend_class_entry *ce = NULL; - + if (UNEXPECTED(!zend_check_type(ret_info->type, ret, &ce, cache_slot, NULL, NULL, 1))) { zend_verify_return_error(zf, ce, ret); } @@ -1409,7 +1409,7 @@ static zend_never_inline void zend_pre_incdec_overloaded_property(zval *object, if (Z_OBJ_HT_P(object)->read_property && Z_OBJ_HT_P(object)->write_property) { zval *z, *zptr, obj; - + ZVAL_OBJ(&obj, Z_OBJ_P(object)); Z_ADDREF(obj); zptr = z = Z_OBJ_HT(obj)->read_property(&obj, property, BP_VAR_R, cache_slot, &rv); @@ -1617,7 +1617,7 @@ str_index: switch (Z_TYPE_P(dim)) { case IS_UNDEF: zval_undefined_cv(EX(opline)->op2.var EXECUTE_DATA_CC); - /* break missing intentionally */ + /* break missing intentionally */ case IS_NULL: offset_key = ZSTR_EMPTY_ALLOC(); goto str_index; @@ -1996,7 +1996,7 @@ use_read_property: ZVAL_INDIRECT(result, ptr); } } else if (EXPECTED(Z_OBJ_HT_P(container)->read_property)) { - goto use_read_property; + goto use_read_property; } else { zend_error(E_WARNING, "This object doesn't support property references"); ZVAL_ERROR(result); @@ -2446,7 +2446,7 @@ static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t o zend_op *opline = EX(func)->op_array.opcodes + op_num; int level; int do_exit; - + if (UNEXPECTED(opline->opcode == ZEND_INIT_FCALL || opline->opcode == ZEND_INIT_FCALL_BY_NAME || opline->opcode == ZEND_INIT_NS_FCALL_BY_NAME || |