[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] com php-src: Merge branch 'PHP-7.4': Zend/zend.c =?UTF-8?Q?Zend/zend=5FAP?= =?UTF-8?Q?I=2E
From:       Dmitry Stogov <dmitry () php ! net>
Date:       2019-05-31 9:22:08
Message-ID: php-mail-127e7be38a914b2fe48cdcba1c703c9f339214902 () git ! php ! net
[Download RAW message or body]

Commit:    b4a3b49eab1fd2ab2e3e47157c06c3dce0b9ba44
Author:    Dmitry Stogov <dmitry@zend.com>         Fri, 31 May 2019 12:22:08 +0300
Parents:   0f337e901b15cc8f5ac3a794afdf46c34cbdd3c8 \
                1df9f238fed314255b858e3996c35be8cdff917f
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=b4a3b49eab1fd2ab2e3e47157c06c3dce0b9ba44


Log:
Merge branch 'PHP-7.4'

* PHP-7.4:
  Better hot/cold code splitting

Changed paths:
  MM  Zend/zend.c
  MM  Zend/zend_API.c
  MM  Zend/zend_API.h
  MM  Zend/zend_compile.h
  MM  Zend/zend_execute_API.c
  MM  Zend/zend_weakrefs.c
  MM  ext/opcache/ZendAccelerator.c


Diff:
diff --cc Zend/zend_weakrefs.c
index f9918d1,b73a596..1072fcf
--- 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");
  }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]