Commit: 5a897009a83bba1a0f32982d7438d6967d1eddeb Author: Dmitry Stogov <dmi...@zend.com> Wed, 17 Apr 2013 21:19:56 +0400 Parents: 2d9cbf720d55c7dde8ff96a099cff60c3c6995cd Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5a897009a83bba1a0f32982d7438d6967d1eddeb Log: Initialize literals hash_value and cache_slot Changed paths: M ext/opcache/Optimizer/zend_optimizer.c Diff: diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index b574ecc..a6450ab 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -33,20 +33,13 @@ int zend_optimizer_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC { int i = op_array->last_literal; op_array->last_literal++; -#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO - { - if (i >= CG(context).literals_size) { - CG(context).literals_size += 16; /* FIXME */ - op_array->literals = (zend_literal*)erealloc(op_array->literals, CG(context).literals_size * sizeof(zend_literal)); - } - } -#else - if (i >= op_array->size_literal) { - op_array->size_literal += 16; /* FIXME */ - op_array->literals = (zend_literal*)erealloc(op_array->literals, op_array->size_literal * sizeof(zend_literal)); + if (i >= CG(context).literals_size) { + CG(context).literals_size += 16; /* FIXME */ + op_array->literals = (zend_literal*)erealloc(op_array->literals, CG(context).literals_size * sizeof(zend_literal)); } -#endif op_array->literals[i].constant = *zv; + op_array->literals[i].hash_value = 0; + op_array->literals[i].cache_slot = -1; Z_SET_REFCOUNT(op_array->literals[i].constant, 2); Z_SET_ISREF(op_array->literals[i].constant); return i; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
