Merge branch 'PHP-7.4'

* PHP-7.4:
  Mark "cold" functions

diff --cc Zend/zend_API.c
Simple merge

diff --cc Zend/zend_API.h
Simple merge

diff --cc Zend/zend_closures.c
index 6151ce09dc166987e5db7001d21c1ed6662ef88b,e8688a6fd1ac0707dc75a9a14f3316f6d49cefc8..0b0c7b82aa600d3d8032b014b43d599487131389
--- 1/Zend/zend_closures.c
--- 2/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@@ -408,28 -412,28 +408,28 @@@ static zend_function *zend_closure_get_
  }
  /* }}} */
  
- static zval *zend_closure_read_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv) /* {{{ */
 -static ZEND_COLD zval *zend_closure_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv) /* {{{ */
++static ZEND_COLD zval *zend_closure_read_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv) /* {{{ */
  {
        ZEND_CLOSURE_PROPERTY_ERROR();
        return &EG(uninitialized_zval);
  }
  /* }}} */
  
- static zval *zend_closure_write_property(zend_object *object, zend_string *member, zval *value, void **cache_slot) /* {{{ */
 -static ZEND_COLD zval *zend_closure_write_property(zval *object, zval *member, zval *value, void **cache_slot) /* {{{ */
++static ZEND_COLD zval *zend_closure_write_property(zend_object *object, zend_string *member, zval *value, void **cache_slot) /* {{{ */
  {
        ZEND_CLOSURE_PROPERTY_ERROR();
        return value;
  }
  /* }}} */
  
- static zval *zend_closure_get_property_ptr_ptr(zend_object *object, zend_string *member, int type, void **cache_slot) /* {{{ */
 -static ZEND_COLD zval *zend_closure_get_property_ptr_ptr(zval *object, zval *member, int type, void **cache_slot) /* {{{ */
++static ZEND_COLD zval *zend_closure_get_property_ptr_ptr(zend_object *object, zend_string *member, int type, void **cache_slot) /* {{{ */
  {
        ZEND_CLOSURE_PROPERTY_ERROR();
        return NULL;
  }
  /* }}} */
  
- static int zend_closure_has_property(zend_object *object, zend_string *member, int has_set_exists, void **cache_slot) /* {{{ */
 -static ZEND_COLD int zend_closure_has_property(zval *object, zval *member, int has_set_exists, void **cache_slot) /* {{{ */
++static ZEND_COLD int zend_closure_has_property(zend_object *object, zend_string *member, int has_set_exists, void **cache_slot) /* {{{ */
  {
        if (has_set_exists != ZEND_PROPERTY_EXISTS) {
                ZEND_CLOSURE_PROPERTY_ERROR();
@@@ -438,7 -442,7 +438,7 @@@
  }
  /* }}} */
  
- static void zend_closure_unset_property(zend_object *object, zend_string *member, void **cache_slot) /* {{{ */
 -static ZEND_COLD void zend_closure_unset_property(zval *object, zval *member, void **cache_slot) /* {{{ */
++static ZEND_COLD void zend_closure_unset_property(zend_object *object, zend_string *member, void **cache_slot) /* {{{ */
  {
        ZEND_CLOSURE_PROPERTY_ERROR();
  }

diff --cc Zend/zend_execute.h
Simple merge

diff --cc Zend/zend_execute_API.c
Simple merge

diff --cc Zend/zend_object_handlers.c
Simple merge