diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2013-11-01 16:16:58 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2013-11-01 16:16:58 +0100 |
| commit | b45043a1b71c29a0c7b8de9e4929dde08bd61216 (patch) | |
| tree | 07e97d65a100eef0cfc1bb998f649475380d612d /ext/reflection/php_reflection.c | |
| parent | b56c1ca95e16ea1c2a3ce251b91297d0a81a9070 (diff) | |
| download | php-git-b45043a1b71c29a0c7b8de9e4929dde08bd61216.tar.gz | |
converted several switches to ifs and made more opcache friendly
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index abebc216c3..bff5e66472 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2599,14 +2599,8 @@ ZEND_METHOD(reflection_parameter, getDefaultValue) *return_value = *precv->op2.zv; INIT_PZVAL(return_value); - switch (Z_TYPE_P(return_value) & IS_CONSTANT_TYPE_MASK) { - case IS_CONSTANT: - case IS_CONSTANT_ARRAY: - case IS_CONSTANT_AST: - break; - - default: - zval_copy_ctor(return_value); + if (!IS_CONSTANT_TYPE(Z_TYPE_P(return_value))) { + zval_copy_ctor(return_value); } zval_update_constant_ex(&return_value, (void*)0, param->fptr->common.scope TSRMLS_CC); } @@ -3419,11 +3413,8 @@ static void add_class_vars(zend_class_entry *ce, int statics, zval *return_value /* this is necessary to make it able to work with default array * properties, returned to user */ - switch (Z_TYPE_P(prop_copy) & IS_CONSTANT_TYPE_MASK) { - case IS_CONSTANT: - case IS_CONSTANT_ARRAY: - case IS_CONSTANT_AST: - zval_update_constant(&prop_copy, (void *) 1 TSRMLS_CC); + if (IS_CONSTANT_TYPE(Z_TYPE_P(prop_copy))) { + zval_update_constant(&prop_copy, (void *) 1 TSRMLS_CC); } add_assoc_zval(return_value, key, prop_copy); |