com php-src: Optimized for fast path: Zend/zend_object_hand lers.c
| From: | Dmitry Stogov | Date: | Mon, 09 Jun 2014 21:58:28 +0000 |
| Subject: | com php-src: Optimized for fast path: Zend/zend_object_hand lers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78782@lists.php.net to get a copy of this message | ||
Commit: eb9b0baaa90baac0a7371e59a025aafd0af3b89d
Author: Dmitry Stogov <dmitry@zend.com> Tue, 10 Jun 2014 01:58:28 +0400
Parents: 15ba03fc80d88481b68ad6aaa8d6b6070b26a1ba
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eb9b0baaa90baac0a7371e59a025aafd0af3b89d
Log:
Optimized for fast path
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 4d2d799..ac45992 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -299,9 +299,9 @@ static zend_always_inline struct _zend_property_info *zend_get_property_info_qui
zend_property_info *scope_property_info;
zend_bool denied_access = 0;
- if (cache_slot != -1 && ce == CACHED_PTR_EX(EG(active_op_array), cache_slot)) {
+ if (cache_slot != -1 && EXPECTED(ce == CACHED_PTR_EX(EG(active_op_array), cache_slot))) {
property_info = CACHED_PTR_EX(EG(active_op_array), cache_slot + 1);
- if (!property_info) {
+ if (UNEXPECTED(!property_info)) {
EG(std_property_info).flags = ZEND_ACC_PUBLIC;
EG(std_property_info).name = member;
EG(std_property_info).ce = ce;