Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src: (79 commits)
  disabled functions must not have return type
  Fix conditional compilation
  These macros should not expect any argument
  Avoid cold code duplication
  Restore the execute bit for run-tests.php
  Replace ZVAL_COPY() and ZVAL_COPY_VALUE() for IS_OBJECT by cheaper macros
  Respect optimization_level when running JIT inference
  Fix type inference of SEND_UNPACK with empty array
  SCCP: Fix handling of ASSIGN_OBJ_REF
  Avoid usage of internal get/set object handlers. They are going to be removed in PHP-8. Scalar FFI values now should be accessed through special "cdata" property.
  SCCP: Don't perform partial object propagation for typed props
  JIT: Fix SWITCH_LONG/STRING codegen with exact type
  Revert accidental changes
  hebrev/hebrevc: Don't return false for empty string
  Update MAY_BE_NULL info for more ext/standard functions
  Avoid double copying
  Update MAY_BE_NULL for parts of ext/standard
  Update MAY_BE_NULL func_info for Zend functions
  Fixed register allocation
  Remove FUNC_MAY_WARN
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index c109be343f..23cbcb5772 100644
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -1243,7 +1243,8 @@ PHP_FUNCTION(xml_set_object)
 	parser = Z_XMLPARSER_P(pind);
 
 	zval_ptr_dtor(&parser->object);
-	ZVAL_COPY(&parser->object, mythis);
+	Z_ADDREF_P(mythis);
+	ZVAL_OBJ(&parser->object, Z_OBJ_P(mythis));
 
 	RETVAL_TRUE;
 }