]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorDmitry Stogov <dmitry@zend.com>
Tue, 28 May 2019 17:19:15 +0000 (20:19 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 28 May 2019 17:19:15 +0000 (20:19 +0300)
* PHP-7.4:
  Replace ZVAL_COPY() and ZVAL_COPY_VALUE() for IS_OBJECT by cheaper macros

22 files changed:
1  2 
Zend/zend_closures.c
Zend/zend_generators.c
Zend/zend_interfaces.c
ext/com_dotnet/com_saproxy.c
ext/date/php_date.c
ext/ffi/ffi.c
ext/intl/breakiterator/breakiterator_iterators.cpp
ext/intl/collator/collator_sort.c
ext/intl/common/common_enum.cpp
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/reflection/php_reflection.c
ext/simplexml/simplexml.c
ext/soap/soap.c
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/spl/spl_dllist.c
ext/spl/spl_fixedarray.c
ext/spl/spl_heap.c
ext/spl/spl_iterators.c
ext/standard/user_filters.c
ext/xml/xml.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc ext/ffi/ffi.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc ext/soap/soap.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc ext/xml/xml.c
index c109be343fffaefde9ad3b148b249b5ae3866e0b,f60f08bd57f3c0f455ecd90a65facc666638f127..23cbcb57727c9526aed13d076ba5a0875c014f05
@@@ -1240,10 -1188,20 +1240,11 @@@ PHP_FUNCTION(xml_set_object
                return;
        }
  
 -      if ((parser = (xml_parser *)zend_fetch_resource(Z_RES_P(pind), "XML Parser", le_xml_parser)) == NULL) {
 -              RETURN_FALSE;
 -      }
 -
 -      /* please leave this commented - or ask thies@thieso.net before doing it (again) */
 -      if (!Z_ISUNDEF(parser->object)) {
 -              zval_ptr_dtor(&parser->object);
 -      }
 -
 -      /* please leave this commented - or ask thies@thieso.net before doing it (again) */
 -      /* zval_add_ref(&parser->object); */
 +      parser = Z_XMLPARSER_P(pind);
  
-       ZVAL_COPY(&parser->object, mythis);
 +      zval_ptr_dtor(&parser->object);
+       Z_ADDREF_P(mythis);
+       ZVAL_OBJ(&parser->object, Z_OBJ_P(mythis));
  
        RETVAL_TRUE;
  }