com php-src: Drop now superflous check for VIA_TRAMPOLINE: ext/reflection/php_reflection.c
| From: | Nikita Popov | Date: | Tue, 16 Jun 2015 15:51:18 +0000 |
| Subject: | com php-src: Drop now superflous check for VIA_TRAMPOLINE: ext/reflection/php_reflection.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87296@lists.php.net to get a copy of this message | ||
Commit: 44b7489fefe1f377a2b5aacca5461fede3298cea
Author: Nikita Popov <nikic@php.net> Tue, 16 Jun 2015 17:51:18 +0200
Parents: 52e9a772a33fe3fac17f99257c3c5cc767801f66
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=44b7489fefe1f377a2b5aacca5461fede3298cea
Log:
Drop now superflous check for VIA_TRAMPOLINE
This is not handled by USE_ARG_INFO.
Changed paths:
M ext/reflection/php_reflection.c
Diff:
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 4a2d7cc..2252233 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2998,9 +2998,7 @@ ZEND_METHOD(reflection_type, __toString)
case IS_OBJECT:
if (param->fptr->type == ZEND_INTERNAL_FUNCTION &&
!(param->fptr->common.fn_flags & ZEND_ACC_USER_ARG_INFO)) {
- if (!(param->fptr->internal_function.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) {
- RETURN_STRING(((zend_internal_arg_info*)param->arg_info)->class_name);
- }
+ RETURN_STRING(((zend_internal_arg_info*)param->arg_info)->class_name);
}
RETURN_STR_COPY(param->arg_info->class_name);
case IS_STRING: RETURN_STRINGL("string", sizeof("string") - 1);