From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 31 May 2019 09:22:08 +0000 (+0300)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4a3b49eab1fd2ab2e3e47157c06c3dce0b9ba44;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Better hot/cold code splitting
---

b4a3b49eab1fd2ab2e3e47157c06c3dce0b9ba44
diff --cc Zend/zend_weakrefs.c
index f9918d1af3,b73a5963aa..1072fcfc3d
--- a/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");
  }