diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 03:56:42 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 03:56:42 +0300 |
| commit | 53d20140fbe4a5fa4339a7429280b4a964f5791d (patch) | |
| tree | edcf7a29796363bedafce3c086f78ac869662340 /Zend/zend_API.c | |
| parent | ea09a9fa325fe21ebc81c41a63ab8c2f377d7f75 (diff) | |
| download | php-git-53d20140fbe4a5fa4339a7429280b4a964f5791d.tar.gz | |
Fixed performance degradation introduced with lateast EnfineException related changes.
Restore original errors order in executor.
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 6744ea0a76..bc7c0ffc46 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1280,7 +1280,7 @@ ZEND_API void object_properties_load(zend_object *object, HashTable *properties) * calling zend_merge_properties(). */ ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *class_type, HashTable *properties ZEND_FILE_LINE_DC) /* {{{ */ { - if (class_type->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) { + if (UNEXPECTED(class_type->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))) { if (class_type->ce_flags & ZEND_ACC_INTERFACE) { zend_error(E_EXCEPTION | E_ERROR, "Cannot instantiate interface %s", class_type->name->val); } else if (class_type->ce_flags & ZEND_ACC_TRAIT) { |