]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.5-opcache
authorDmitry Stogov <dmitry@zend.com>
Wed, 17 Apr 2013 17:32:08 +0000 (21:32 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 17 Apr 2013 17:32:08 +0000 (21:32 +0400)
* 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

1  2 
ext/opcache/Optimizer/zend_optimizer.c

index 92f5f4a0541f9f69eaec04eeb60926860b681973,a6450ab5c49aba1b1a33b95c84fdf6b1e4e350ee..b2148e1da785522e7c178ddcfaf2f53fce392123
@@@ -64,8 -33,13 +64,10 @@@ int zend_optimizer_add_literal(zend_op_
  {\r
        int i = op_array->last_literal;\r
        op_array->last_literal++;\r
 -      if (i >= CG(context).literals_size) {\r
 -              CG(context).literals_size += 16; /* FIXME */\r
 -              op_array->literals = (zend_literal*)erealloc(op_array->literals, CG(context).literals_size * sizeof(zend_literal));\r
 -      }\r
 +      op_array->literals = (zend_literal*)erealloc(op_array->literals, op_array->last_literal * sizeof(zend_literal));\r
        op_array->literals[i].constant = *zv;\r
+       op_array->literals[i].hash_value = 0;\r
+       op_array->literals[i].cache_slot = -1;\r
        Z_SET_REFCOUNT(op_array->literals[i].constant, 2);\r
        Z_SET_ISREF(op_array->literals[i].constant);\r
        return i;\r