From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 9 Jun 2014 21:58:28 +0000 (+0400)
Subject: Optimized for fast path
X-Git-Tag: POST_PHPNG_MERGE~208
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb9b0baaa90baac0a7371e59a025aafd0af3b89d;p=php

Optimized for fast path
---

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 4d2d799441..ac4599282e 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;