Commit: 36d343c0c44da754957cfcb9b9544acdf0a9e229 Author: Dmitry Stogov <dmi...@zend.com> Wed, 17 Apr 2013 21:32:08 +0400 Parents: e16f24327dd756f81997bf714e0dc28f63a1dc0c 5a897009a83bba1a0f32982d7438d6967d1eddeb Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=36d343c0c44da754957cfcb9b9544acdf0a9e229 Log: Merge branch 'PHP-5.5' into PHP-5.5-opcache * PHP-5.5: Initialize literals hash_value and cache_slot Added curl config test for windows updated lib versions updated lib versions fixed EOL updated lib versions allow lcov 1.10 allow lcov 1.10 Conflicts: ext/opcache/Optimizer/zend_optimizer.c Changed paths: MM ext/opcache/Optimizer/zend_optimizer.c Diff: diff --cc ext/opcache/Optimizer/zend_optimizer.c index 92f5f4a,a6450ab..b2148e1 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@@ -64,8 -33,13 +64,10 @@@ int zend_optimizer_add_literal(zend_op_ { int i = op_array->last_literal; op_array->last_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)); - } + op_array->literals = (zend_literal*)erealloc(op_array->literals, op_array->last_literal * sizeof(zend_literal)); 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
