diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-01-13 11:37:46 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-01-13 11:37:46 +0300 |
| commit | 141d1ba9801f742dc5d9ccd06e02b94284c4deb7 (patch) | |
| tree | cc9d1730b73a2b147d14857bb967e6d55df5af90 /ext/opcache/Optimizer/zend_optimizer.c | |
| parent | 28391c30ca008013267592ab2a2eebce3da3f3b0 (diff) | |
| download | php-git-141d1ba9801f742dc5d9ccd06e02b94284c4deb7.tar.gz | |
Introduced "zend_type" - an abstraction for type-hinting representation.
Diffstat (limited to 'ext/opcache/Optimizer/zend_optimizer.c')
| -rw-r--r-- | ext/opcache/Optimizer/zend_optimizer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index a30f18479a..ee659fa2f2 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -506,9 +506,9 @@ int zend_optimizer_replace_by_const(zend_op_array *op_array, } case ZEND_VERIFY_RETURN_TYPE: { zend_arg_info *ret_info = op_array->arg_info - 1; - if (ret_info->class_name - || ret_info->type_hint == IS_CALLABLE - || !ZEND_SAME_FAKE_TYPE(ret_info->type_hint, Z_TYPE_P(val)) + if (ZEND_TYPE_IS_CLASS(ret_info->type) + || ZEND_TYPE_CODE(ret_info->type) == IS_CALLABLE + || !ZEND_SAME_FAKE_TYPE(ZEND_TYPE_CODE(ret_info->type), Z_TYPE_P(val)) || (op_array->fn_flags & ZEND_ACC_RETURN_REFERENCE)) { zval_dtor(val); return 0; |