Merge branch 'PHP-7.4'

* PHP-7.4:
  Better hot/cold code splitting

diff --cc Zend/zend.c
Simple merge

diff --cc Zend/zend_API.c
Simple merge

diff --cc Zend/zend_API.h
Simple merge

diff --cc Zend/zend_compile.h
Simple merge

diff --cc Zend/zend_execute_API.c
Simple merge

diff --cc Zend/zend_weakrefs.c
index f9918d1af3234af8a3ea80e04fe84ff57c4e07d5,b73a5963aa387af6a1a47bc72a5266bcafbfac80..1072fcfc3dae3e2c47efe62bca50f727bcf9e278
--- 1/Zend/zend_weakrefs.c
--- 2/Zend/zend_weakrefs.c
+++ b/Zend/zend_weakrefs.c
@@@ -112,13 -112,13 +112,13 @@@ static void zend_weakref_free(zend_obje
  #define zend_weakref_unsupported(thing) \
        zend_throw_error(NULL, "WeakReference objects do not support " thing);
  
- static zval* zend_weakref_no_write(zend_object *object, zend_string *member, zval *value, void **rtc) {
 -static ZEND_COLD zval* zend_weakref_no_write(zval *object, zval *member, zval *value, void **rtc) {
++static ZEND_COLD zval* zend_weakref_no_write(zend_object *object, zend_string *member, zval *value, void **rtc) {
        zend_weakref_unsupported("properties");
  
        return &EG(uninitialized_zval);
  }
  
- static zval* zend_weakref_no_read(zend_object *object, zend_string *member, int type, void **rtc, zval *rv) {
 -static ZEND_COLD zval* zend_weakref_no_read(zval *object, zval *member, int type, void **rtc, zval *rv) {
++static ZEND_COLD zval* zend_weakref_no_read(zend_object *object, zend_string *member, int type, void **rtc, zval *rv) {
        if (!EG(exception)) {
                zend_weakref_unsupported("properties");
        }
@@@ -126,19 -126,19 +126,19 @@@
        return &EG(uninitialized_zval);
  }
  
- static zval *zend_weakref_no_read_ptr(zend_object *object, zend_string *member, int type, void **rtc) {
 -static ZEND_COLD zval *zend_weakref_no_read_ptr(zval *object, zval *member, int type, void **rtc) {
++static ZEND_COLD zval *zend_weakref_no_read_ptr(zend_object *object, zend_string *member, int type, void **rtc) {
        zend_weakref_unsupported("property references");
        return NULL;
  }
  
- static int zend_weakref_no_isset(zend_object *object, zend_string *member, int hse, void **rtc) {
 -static ZEND_COLD int zend_weakref_no_isset(zval *object, zval *member, int hse, void **rtc) {
++static ZEND_COLD int zend_weakref_no_isset(zend_object *object, zend_string *member, int hse, void **rtc) {
        if (hse != 2) {
                zend_weakref_unsupported("properties");
        }
        return 0;
  }
  
- static void zend_weakref_no_unset(zend_object *object, zend_string *member, void **rtc) {
 -static ZEND_COLD void zend_weakref_no_unset(zval *object, zval *member, void **rtc) {
++static ZEND_COLD void zend_weakref_no_unset(zend_object *object, zend_string *member, void **rtc) {
        zend_weakref_unsupported("properties");
  }
  

diff --cc ext/opcache/ZendAccelerator.c
Simple merge