com php-src: Intern string constant values: Zend/zend_constan ts.c ext/opcache/ZendAccelerator.c

From: Date: Thu, 07 Dec 2017 09:27:16 +0000
Subject: com php-src: Intern string constant values: Zend/zend_constan ts.c ext/opcache/ZendAccelerator.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-100517@lists.php.net to get a copy of this message
Commit: fd453aa1d13847f8b2176af293f5a420b94b5d6a Author: Dmitry Stogov <dmitry@zend.com> Thu, 7 Dec 2017 12:27:16 +0300 Parents: 3f6b46f331b6a0c3d6a92678473f9a8657899bcb Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fd453aa1d13847f8b2176af293f5a420b94b5d6a Log: Intern string constant values Changed paths: M Zend/zend_constants.c M ext/opcache/ZendAccelerator.c Diff: diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 1eda6da..3fa547b 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -187,7 +187,7 @@ ZEND_API void zend_register_stringl_constant(const char *name, size_t name_len, { zend_constant c; - ZVAL_NEW_STR(&c.value, zend_string_init(strval, strlen, flags & CONST_PERSISTENT)); + ZVAL_STR(&c.value, zend_string_init_interned(strval, strlen, flags & CONST_PERSISTENT)); c.flags = flags; c.name = zend_string_init_interned(name, name_len, flags & CONST_PERSISTENT); c.module_number = module_number; diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 9094f1a..6f42db9 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -640,6 +640,9 @@ static void accel_copy_permanent_strings(zend_new_interned_string_func_t new_int if (c->name) { c->name = new_interned_string(c->name); } + if (Z_TYPE(c->value) == IS_STRING) { + ZVAL_STR(&c->value, new_interned_string(Z_STR(c->value))); + } } ZEND_HASH_FOREACH_END(); /* auto globals hash keys and names */

« previous php.cvs (#100517) next »