com php-src: Removed useless code: Zend/zend_execute.c
| From: | Dmitry Stogov | Date: | Wed, 09 Apr 2014 13:55:40 +0000 |
| Subject: | com php-src: Removed useless code: Zend/zend_execute.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77456@lists.php.net to get a copy of this message | ||
Commit: 8732f5e5d7757664703d96407f2adaec2ec3c5dc
Author: Dmitry Stogov <dmitry@zend.com> Wed, 9 Apr 2014 17:55:40 +0400
Parents: 9b276c7a0c9f036484b56b87c6681e2b56f6b9f0
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8732f5e5d7757664703d96407f2adaec2ec3c5dc
Log:
Removed useless code
Changed paths:
M Zend/zend_execute.c
Diff:
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 6231473..f303860 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -654,6 +654,10 @@ static inline void zend_assign_to_object(zval *retval, zval *object_ptr, zval
*p
if (Z_TYPE_P(object) == IS_NULL ||
(Z_TYPE_P(object) == IS_BOOL && Z_LVAL_P(object) == 0) ||
(Z_TYPE_P(object) == IS_STRING && Z_STRLEN_P(object) == 0)) {
+//??? The following block may handle only non-interned empty string,
+//??? but it doesn't work anyway
+//??? see: Zend/tests/bug54265.phpt
+#if 0
if (Z_REFCOUNTED_P(object)) {
if (!Z_ISREF_P(object_ptr)) {
SEPARATE_ZVAL(object);
@@ -671,8 +675,9 @@ static inline void zend_assign_to_object(zval *retval, zval *object_ptr, zval *p
}
Z_DELREF_P(object);
} else {
+#endif
zend_error(E_WARNING, "Creating default object from empty value");
- }
+//??? }
zval_dtor(object);
object_init(object);
} else {