]> granicus.if.org Git - php/commitdiff
Initialize literals hash_value and cache_slot
authorDmitry Stogov <dmitry@zend.com>
Wed, 17 Apr 2013 17:19:56 +0000 (21:19 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 17 Apr 2013 17:19:56 +0000 (21:19 +0400)
ext/opcache/Optimizer/zend_optimizer.c

index b574ecc81f2da564781d891101a2d8abbddcfbcf..a6450ab5c49aba1b1a33b95c84fdf6b1e4e350ee 100644 (file)
@@ -33,20 +33,13 @@ int zend_optimizer_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC
 {\r
        int i = op_array->last_literal;\r
        op_array->last_literal++;\r
-#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO\r
-       {\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
-       }\r
-#else\r
-       if (i >= op_array->size_literal) {\r
-               op_array->size_literal += 16; /* FIXME */\r
-               op_array->literals = (zend_literal*)erealloc(op_array->literals, op_array->size_literal * sizeof(zend_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
-#endif\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