diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-10-02 11:43:52 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-10-02 12:37:39 +0200 |
| commit | 6c61286da4f2d71e659da70842168d71835292f9 (patch) | |
| tree | d984584e4d7477dba6be9e509bb6a6a5457508e9 /Zend/zend_compile.c | |
| parent | 1287c48082adab66b07d8590390330278a4e0c9c (diff) | |
| download | php-git-6c61286da4f2d71e659da70842168d71835292f9.tar.gz | |
Do not include zend_verify_return_type in executable ops (phpdbg)
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ce3815c864..98af0a7c74 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2042,6 +2042,7 @@ static void zend_emit_return_type_check(znode *expr, zend_arg_info *return_info) void zend_emit_final_return(zval *zv) /* {{{ */ { znode zn; + zend_op *ret; zend_bool returns_reference = (CG(active_op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0; if (CG(active_op_array)->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) { @@ -2055,7 +2056,8 @@ void zend_emit_final_return(zval *zv) /* {{{ */ ZVAL_NULL(&zn.u.constant); } - zend_emit_op(NULL, returns_reference ? ZEND_RETURN_BY_REF : ZEND_RETURN, &zn, NULL); + ret = zend_emit_op(NULL, returns_reference ? ZEND_RETURN_BY_REF : ZEND_RETURN, &zn, NULL); + ret->extended_value = -1; } /* }}} */ |