Avoid useless copying

dstogov · dstogov · commit 0db8c974a5c4 · 2018-07-10T12:03:32.000+03:00
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
@@ -809,14 +809,14 @@ ZEND_API void zend_std_write_property(zval *object, zval *member, zval *value, v
 			}
 		}
 	} else if (EXPECTED(!IS_WRONG_PROPERTY_OFFSET(property_offset))) {
-		zval tmp;
-
 write_std_property:
 		if (Z_REFCOUNTED_P(value)) {
 			if (Z_ISREF_P(value)) {
 				/* if we assign referenced variable, we should separate it */
-				ZVAL_COPY(&tmp, Z_REFVAL_P(value));
-				value = &tmp;
+				value = Z_REFVAL_P(value);
+				if (Z_REFCOUNTED_P(value)) {
+					Z_ADDREF_P(value);
+				}
 			} else {
 				Z_ADDREF_P(value);
 			}

Original file line number	Diff line number	Diff line change
`@@ -809,14 +809,14 @@ ZEND_API void zend_std_write_property(zval object, zval member, zval *value, v`
`809`	`809`	`}`
`810`	`810`	`}`
`811`	`811`	`} else if (EXPECTED(!IS_WRONG_PROPERTY_OFFSET(property_offset))) {`
`812`		`- zval tmp;`
`813`		`-`
`814`	`812`	`write_std_property:`
`815`	`813`	`if (Z_REFCOUNTED_P(value)) {`
`816`	`814`	`if (Z_ISREF_P(value)) {`
`817`	`815`	`/* if we assign referenced variable, we should separate it */`
`818`		`- ZVAL_COPY(&tmp, Z_REFVAL_P(value));`
`819`		`- value = &tmp;`
	`816`	`+ value = Z_REFVAL_P(value);`
	`817`	`+ if (Z_REFCOUNTED_P(value)) {`
	`818`	`+ Z_ADDREF_P(value);`
	`819`	`+ }`
`820`	`820`	`} else {`
`821`	`821`	`Z_ADDREF_P(value);`
`822`	`822`	`}`