com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/opcache/Optimizer/zend_func_info.c ext/zend_test/ test.c

From: Date: Fri, 25 Oct 2019 10:50:12 +0000
Subject: com php-src: Merge branch 'PHP-7.2' into PHP-7.3: NEWS ext/opcache/Optimizer/zend_func_info.c ext/zend_test/ test.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-109062@lists.php.net to get a copy of this message
Commit: 74699533e54a2b2e6093834652138b6d3a71e5b8 Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 25 Oct 2019 12:50:12 +0200 Parents: 813305b67f3022da3efb071114b7cc1e47ace005 52499938142351d20a46c2b941e957ab0d618109 Branches: PHP-7.3 PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74699533e54a2b2e6093834652138b6d3a71e5b8 Log: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: Fixed bug #78747 Bugs: https://bugs.php.net/78747 Changed paths: MM NEWS MM ext/opcache/Optimizer/zend_func_info.c MM ext/zend_test/test.c Diff: diff --cc ext/opcache/Optimizer/zend_func_info.c index 57b4eb5fb6b,af9cfa83350..3eea2c197ef --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@@ -1688,15 -1211,11 +1688,14 @@@ int zend_func_info_rid = -1 uint32_t zend_get_func_info(const zend_call_info *call_info, const zend_ssa *ssa) { uint32_t ret = 0; + const zend_function *callee_func = call_info->callee_func; - if (call_info->callee_func->type == ZEND_INTERNAL_FUNCTION) { + if (callee_func->type == ZEND_INTERNAL_FUNCTION) { + zval *zv; func_info_t *info; - zv = zend_hash_find_ex(&func_info, Z_STR_P(CRT_CONSTANT_EX(call_info->caller_op_array, call_info->caller_init_opline, call_info->caller_init_opline->op2, ssa->rt_constants)), 1); - if (zv) { - if (!call_info->callee_func->common.scope && (info = zend_hash_find_ptr(&func_info, Z_STR_P(CRT_CONSTANT_EX(call_info->caller_op_array, call_info->caller_init_opline->op2, ssa->rt_constants)))) != NULL) { ++ if (!call_info->callee_func->common.scope && (zv = zend_hash_find_ex(&func_info, Z_STR_P(CRT_CONSTANT_EX(call_info->caller_op_array, call_info->caller_init_opline, call_info->caller_init_opline->op2, ssa->rt_constants)), 1))) { + info = Z_PTR_P(zv); if (UNEXPECTED(zend_optimizer_is_disabled_func(info->name, info->name_len))) { ret = MAY_BE_NULL; } else if (info->info_func) { diff --cc ext/zend_test/test.c index 31455daab86,4a7fe540fb4..87dcc902204 --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@@ -183,7 -183,12 +192,12 @@@ static ZEND_METHOD(_ZendTestTrait, test } /* }}} */ + static const zend_function_entry zend_test_class_methods[] = { + ZEND_ME(_ZendTestClass, is_object, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) + ZEND_FE_END + }; + -static zend_function_entry zend_test_trait_methods[] = { +static const zend_function_entry zend_test_trait_methods[] = { ZEND_ME(_ZendTestTrait, testMethod, NULL, ZEND_ACC_PUBLIC) ZEND_FE_END };

« previous php.cvs (#109062) next »