]> granicus.if.org Git - php/commitdiff
Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend)
authorXinchen Hui <laruence@php.net>
Mon, 30 Dec 2013 02:50:46 +0000 (10:50 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 30 Dec 2013 02:50:46 +0000 (10:50 +0800)
Use git blame -w to ingore the space changes

NEWS
ext/opcache/Optimizer/zend_optimizer.c
ext/opcache/Optimizer/zend_optimizer.h
ext/opcache/Optimizer/zend_optimizer_internal.h

diff --git a/NEWS b/NEWS
index aed16cce65f17eb2862c94045f5c15ac018a9ab3..615f539e6658b4a6e8436851b59744739f30bd75 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,8 @@ PHP                                                                        NEWS
   . Fixed bug #65486 (mysqli_poll() is broken on win x64). (Anatol)
 
 - OPCache:
+  . Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style 
+    ^M as lineend). (Laruence)
   . Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
     (Dmitry)
   . Fixed Issue #140: "opcache.enable_file_override" doesn't respect
index c9325301282e23fa1e1608b5d9fc596c72748b98..2c96c3b0ce529f342c9bbe8641d5564529c91f01 100644 (file)
-/*\r
-   +----------------------------------------------------------------------+\r
-   | Zend OPcache                                                         |\r
-   +----------------------------------------------------------------------+\r
-   | Copyright (c) 1998-2013 The PHP Group                                |\r
-   +----------------------------------------------------------------------+\r
-   | This source file is subject to version 3.01 of the PHP license,      |\r
-   | that is bundled with this package in the file LICENSE, and is        |\r
-   | available through the world-wide-web at the following url:           |\r
-   | http://www.php.net/license/3_01.txt                                  |\r
-   | If you did not receive a copy of the PHP license and are unable to   |\r
-   | obtain it through the world-wide-web, please send a note to          |\r
-   | license@php.net so we can mail you a copy immediately.               |\r
-   +----------------------------------------------------------------------+\r
-   | Authors: Andi Gutmans <andi@zend.com>                                |\r
-   |          Zeev Suraski <zeev@zend.com>                                |\r
-   |          Stanislav Malyshev <stas@zend.com>                          |\r
-   |          Dmitry Stogov <dmitry@zend.com>                             |\r
-   +----------------------------------------------------------------------+\r
-*/\r
-\r
-#include "php.h"\r
-#include "Optimizer/zend_optimizer.h"\r
-#include "Optimizer/zend_optimizer_internal.h"\r
-#include "zend_API.h"\r
-#include "zend_constants.h"\r
-#include "zend_execute.h"\r
-\r
-#define OPTIMIZATION_LEVEL \\r
-       ZCG(accel_directives).optimization_level\r
-\r
-#if ZEND_EXTENSION_API_NO >= PHP_5_5_X_API_NO\r
-static int zend_optimizer_lookup_cv(zend_op_array *op_array, char* name, int name_len)\r
-{\r
-       int i = 0;\r
-       ulong hash_value = zend_inline_hash_func(name, name_len+1);\r
-\r
-       while (i < op_array->last_var) {\r
-               if (op_array->vars[i].name == name ||\r
-                   (op_array->vars[i].hash_value == hash_value &&\r
-                    op_array->vars[i].name_len == name_len &&\r
-                    memcmp(op_array->vars[i].name, name, name_len) == 0)) {\r
-                       return i;\r
-               }\r
-               i++;\r
-       }\r
-       i = op_array->last_var;\r
-       op_array->last_var++;\r
-       op_array->vars = erealloc(op_array->vars, op_array->last_var * sizeof(zend_compiled_variable));\r
-       if (IS_INTERNED(name)) {\r
-               op_array->vars[i].name = name;\r
-       } else {\r
-               op_array->vars[i].name = estrndup(name, name_len);\r
-       }\r
-       op_array->vars[i].name_len = name_len;\r
-       op_array->vars[i].hash_value = hash_value;\r
-       return i;\r
-}\r
-#endif\r
-\r
-#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO\r
-int zend_optimizer_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC)\r
-{\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[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
-}\r
-\r
-# define LITERAL_LONG(op, val) do { \\r
-               zval _c; \\r
-               ZVAL_LONG(&_c, val); \\r
-               op.constant = zend_optimizer_add_literal(op_array, &_c TSRMLS_CC); \\r
-       } while (0)\r
-\r
-# define LITERAL_BOOL(op, val) do { \\r
-               zval _c; \\r
-               ZVAL_BOOL(&_c, val); \\r
-               op.constant = zend_optimizer_add_literal(op_array, &_c TSRMLS_CC); \\r
-       } while (0)\r
-\r
-# define literal_dtor(zv) do { \\r
-               zval_dtor(zv); \\r
-               Z_TYPE_P(zv) = IS_NULL; \\r
-       } while (0)\r
-\r
-#define COPY_NODE(target, src) do { \\r
-               target ## _type = src ## _type; \\r
-               target = src; \\r
-       } while (0)\r
-\r
-#else\r
-\r
-# define LITERAL_LONG(op, val) ZVAL_LONG(&op.u.constant, val)\r
-\r
-# define LITERAL_BOOL(op, val) ZVAL_BOOL(&op.u.constant, val)\r
-\r
-# define literal_dtor(zv) zval_dtor(zv)\r
-\r
-#define COPY_NODE(target, src) do { \\r
-               target = src; \\r
-       } while (0)\r
-\r
-#endif\r
-\r
-static void update_op1_const(zend_op_array *op_array,\r
-                             zend_op       *opline,\r
-                             zval          *val TSRMLS_DC)\r
-{\r
-       if (opline->opcode == ZEND_FREE) {\r
-               MAKE_NOP(opline);\r
-               zval_dtor(val);\r
-       } else {\r
-               ZEND_OP1_TYPE(opline) = IS_CONST;\r
-#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO\r
-               if (Z_TYPE_P(val) == IS_STRING) {\r
-                       switch (opline->opcode) {\r
-                               case ZEND_INIT_STATIC_METHOD_CALL:\r
-                               case ZEND_CATCH:\r
-                               case ZEND_FETCH_CONSTANT:\r
-                                       opline->op1.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);\r
-                                       Z_HASH_P(&ZEND_OP1_LITERAL(opline)) = zend_hash_func(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)) + 1);\r
-                                       op_array->literals[opline->op1.constant].cache_slot = op_array->last_cache_slot++;\r
-                                       zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val));\r
-                                       zend_optimizer_add_literal(op_array, val TSRMLS_CC);\r
-                                       op_array->literals[opline->op1.constant+1].hash_value = zend_hash_func(Z_STRVAL(op_array->literals[opline->op1.constant+1].constant), Z_STRLEN(op_array->literals[opline->op1.constant+1].constant) + 1);\r
-                                       break;\r
-                               case ZEND_DO_FCALL:\r
-                                       zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val));\r
-                                       opline->op1.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);\r
-                                       Z_HASH_P(&ZEND_OP1_LITERAL(opline)) = zend_hash_func(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)) + 1);\r
-                                       op_array->literals[opline->op1.constant].cache_slot = op_array->last_cache_slot++;\r
-                                       break;\r
-                               default:\r
-                                       opline->op1.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);\r
-                                       Z_HASH_P(&ZEND_OP1_LITERAL(opline)) = zend_hash_func(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)) + 1);\r
-                                       break;\r
-                       }\r
-               } else {\r
-                       opline->op1.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);\r
-               }\r
-#else\r
-               ZEND_OP1_LITERAL(opline) = *val;\r
-#endif\r
-       }\r
-}\r
-\r
-static void update_op2_const(zend_op_array *op_array,\r
-                             zend_op       *opline,\r
-                             zval          *val TSRMLS_DC)\r
-{\r
-       ZEND_OP2_TYPE(opline) = IS_CONST;\r
-#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO\r
-       opline->op2.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);\r
-       if (Z_TYPE_P(val) == IS_STRING) {\r
-               Z_HASH_P(&ZEND_OP2_LITERAL(opline)) = zend_hash_func(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)) + 1);\r
-               switch (opline->opcode) {\r
-                       case ZEND_FETCH_R:\r
-                       case ZEND_FETCH_W:\r
-                       case ZEND_FETCH_RW:\r
-                       case ZEND_FETCH_IS:\r
-                       case ZEND_FETCH_UNSET:\r
-                       case ZEND_FETCH_FUNC_ARG:\r
-                       case ZEND_FETCH_CLASS:\r
-                       case ZEND_INIT_FCALL_BY_NAME:\r
-                       /*case ZEND_INIT_NS_FCALL_BY_NAME:*/\r
-                       case ZEND_UNSET_VAR:\r
-                       case ZEND_ISSET_ISEMPTY_VAR:\r
-                       case ZEND_ADD_INTERFACE:\r
-                       case ZEND_ADD_TRAIT:\r
-                               op_array->literals[opline->op2.constant].cache_slot = op_array->last_cache_slot++;\r
-                               zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val));\r
-                               zend_optimizer_add_literal(op_array, val TSRMLS_CC);\r
-                               op_array->literals[opline->op2.constant+1].hash_value = zend_hash_func(Z_STRVAL(op_array->literals[opline->op2.constant+1].constant), Z_STRLEN(op_array->literals[opline->op2.constant+1].constant) + 1);\r
-                               break;\r
-                       case ZEND_INIT_METHOD_CALL:\r
-                       case ZEND_INIT_STATIC_METHOD_CALL:\r
-                               zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val));\r
-                               zend_optimizer_add_literal(op_array, val TSRMLS_CC);\r
-                               op_array->literals[opline->op2.constant+1].hash_value = zend_hash_func(Z_STRVAL(op_array->literals[opline->op2.constant+1].constant), Z_STRLEN(op_array->literals[opline->op2.constant+1].constant) + 1);\r
-                               /* break missing intentionally */                                               \r
-                       /*case ZEND_FETCH_CONSTANT:*/\r
-                       case ZEND_ASSIGN_OBJ:\r
-                       case ZEND_FETCH_OBJ_R:\r
-                       case ZEND_FETCH_OBJ_W:\r
-                       case ZEND_FETCH_OBJ_RW:\r
-                       case ZEND_FETCH_OBJ_IS:\r
-                       case ZEND_FETCH_OBJ_UNSET:\r
-                       case ZEND_FETCH_OBJ_FUNC_ARG:\r
-                       case ZEND_UNSET_OBJ:\r
-                       case ZEND_PRE_INC_OBJ:\r
-                       case ZEND_PRE_DEC_OBJ:\r
-                       case ZEND_POST_INC_OBJ:\r
-                       case ZEND_POST_DEC_OBJ:\r
-                       case ZEND_ISSET_ISEMPTY_PROP_OBJ:\r
-                               op_array->literals[opline->op2.constant].cache_slot = op_array->last_cache_slot;\r
-                               op_array->last_cache_slot += 2;\r
-                               break;\r
-                       case ZEND_ASSIGN_ADD:\r
-                       case ZEND_ASSIGN_SUB:\r
-                       case ZEND_ASSIGN_MUL:\r
-                       case ZEND_ASSIGN_DIV:\r
-                       case ZEND_ASSIGN_MOD:\r
-                       case ZEND_ASSIGN_SL:\r
-                       case ZEND_ASSIGN_SR:\r
-                       case ZEND_ASSIGN_CONCAT:\r
-                       case ZEND_ASSIGN_BW_OR:\r
-                       case ZEND_ASSIGN_BW_AND:\r
-                       case ZEND_ASSIGN_BW_XOR:\r
-                               if (opline->extended_value == ZEND_ASSIGN_OBJ) {\r
-                                       op_array->literals[opline->op2.constant].cache_slot = op_array->last_cache_slot;\r
-                                       op_array->last_cache_slot += 2;\r
-                               }\r
-                               break;\r
-#if ZEND_EXTENSION_API_NO >= PHP_5_4_X_API_NO\r
-                       case ZEND_OP_DATA:\r
-                               if ((opline-1)->opcode == ZEND_ASSIGN_DIM ||\r
-                                   ((opline-1)->extended_value == ZEND_ASSIGN_DIM &&\r
-                                    ((opline-1)->opcode == ZEND_ASSIGN_ADD ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_SUB ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_MUL ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_DIV ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_MOD ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_SL ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_SR ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_CONCAT ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_BW_OR ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_BW_AND ||\r
-                                    (opline-1)->opcode == ZEND_ASSIGN_BW_XOR))) {\r
-                                       goto check_numeric;\r
-                               }\r
-                               break;\r
-                       case ZEND_ISSET_ISEMPTY_DIM_OBJ:\r
-                       case ZEND_ADD_ARRAY_ELEMENT:\r
-                       case ZEND_INIT_ARRAY:\r
-                       case ZEND_UNSET_DIM:\r
-                       case ZEND_FETCH_DIM_R:\r
-                       case ZEND_FETCH_DIM_W:\r
-                       case ZEND_FETCH_DIM_RW:\r
-                       case ZEND_FETCH_DIM_IS:\r
-                       case ZEND_FETCH_DIM_FUNC_ARG:\r
-                       case ZEND_FETCH_DIM_UNSET:\r
-                       case ZEND_FETCH_DIM_TMP_VAR:\r
-check_numeric:\r
-                               {\r
-                                       ulong index;\r
-                                       int numeric = 0;\r
-\r
-                                       ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(val), Z_STRLEN_P(val)+1, index, numeric = 1);\r
-                                       if (numeric) {\r
-                                               zval_dtor(val);\r
-                                               ZVAL_LONG(val, index);\r
-                                               op_array->literals[opline->op2.constant].constant = *val;\r
-                               }\r
-                               }\r
-                               break;\r
-#endif\r
-                       default:\r
-                               break;\r
-               }\r
-       }\r
-#else\r
-       ZEND_OP2_LITERAL(opline) = *val;\r
-#endif\r
-}\r
-\r
-static void replace_tmp_by_const(zend_op_array *op_array,\r
-                                 zend_op       *opline,\r
-                                 zend_uint      var,\r
-                                 zval          *val\r
-                                 TSRMLS_DC)\r
-{\r
-       zend_op *end = op_array->opcodes + op_array->last;\r
-\r
-       while (opline < end) {\r
-               if (ZEND_OP1_TYPE(opline) == IS_TMP_VAR &&\r
-                       ZEND_OP1(opline).var == var) {\r
-\r
-                       update_op1_const(op_array, opline, val TSRMLS_CC);\r
-                       /* TMP_VAR my be used only once */\r
-                       break;\r
-               }\r
-\r
-               if (ZEND_OP2_TYPE(opline) == IS_TMP_VAR &&\r
-                       ZEND_OP2(opline).var == var) {\r
-\r
-                       update_op2_const(op_array, opline, val TSRMLS_CC);\r
-                       /* TMP_VAR my be used only once */\r
-                       break;\r
-               }\r
-               opline++;\r
-       }\r
-}\r
-\r
-#include "Optimizer/nop_removal.c"\r
-#include "Optimizer/block_pass.c"\r
-#include "Optimizer/optimize_temp_vars_5.c"\r
-\r
-void zend_optimizer(zend_op_array *op_array TSRMLS_DC)\r
-{\r
-       if (op_array->type == ZEND_EVAL_CODE ||\r
-           (op_array->fn_flags & ZEND_ACC_INTERACTIVE)) {\r
-               return;\r
-       }\r
-\r
-       /* pass 1\r
-        * - substitute persistent constants (true, false, null, etc)\r
-        * - perform compile-time evaluation of constant binary and unary operations\r
-        * - optimize series of ADD_STRING and/or ADD_CHAR\r
-        * - convert CAST(IS_BOOL,x) into BOOL(x)\r
-        * - convert INTI_FCALL_BY_NAME + DO_FCALL_BY_NAME into DO_FCALL\r
-        */\r
-#include "Optimizer/pass1_5.c"\r
-\r
-       /* pass 2:\r
-        * - convert non-numeric constants to numeric constants in numeric operators\r
-        * - optimize constant conditional JMPs\r
-        * - optimize static BRKs and CONTs\r
-        */\r
-#include "Optimizer/pass2.c"\r
-\r
-       /* pass 3:\r
-        * - optimize $i = $i+expr to $i+=expr\r
-        * - optimize series of JMPs\r
-        * - change $i++ to ++$i where possible\r
-        */\r
-#include "Optimizer/pass3.c"\r
-\r
-       /* pass 5:\r
-        * - CFG optimization\r
-        */\r
-#include "Optimizer/pass5.c"\r
-\r
-        /* pass 9:\r
-        * - Optimize temp variables usage\r
-        */\r
-#include "Optimizer/pass9.c"\r
-\r
-       /* pass 10:\r
-        * - remove NOPs\r
-        */\r
-#include "Optimizer/pass10.c"\r
-}\r
+/*
+   +----------------------------------------------------------------------+
+   | Zend OPcache                                                         |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   |          Stanislav Malyshev <stas@zend.com>                          |
+   |          Dmitry Stogov <dmitry@zend.com>                             |
+   +----------------------------------------------------------------------+
+*/
+
+#include "php.h"
+#include "Optimizer/zend_optimizer.h"
+#include "Optimizer/zend_optimizer_internal.h"
+#include "zend_API.h"
+#include "zend_constants.h"
+#include "zend_execute.h"
+
+#define OPTIMIZATION_LEVEL \
+       ZCG(accel_directives).optimization_level
+
+#if ZEND_EXTENSION_API_NO >= PHP_5_5_X_API_NO
+static int zend_optimizer_lookup_cv(zend_op_array *op_array, char* name, int name_len)
+{
+       int i = 0;
+       ulong hash_value = zend_inline_hash_func(name, name_len+1);
+
+       while (i < op_array->last_var) {
+               if (op_array->vars[i].name == name ||
+                   (op_array->vars[i].hash_value == hash_value &&
+                    op_array->vars[i].name_len == name_len &&
+                    memcmp(op_array->vars[i].name, name, name_len) == 0)) {
+                       return i;
+               }
+               i++;
+       }
+       i = op_array->last_var;
+       op_array->last_var++;
+       op_array->vars = erealloc(op_array->vars, op_array->last_var * sizeof(zend_compiled_variable));
+       if (IS_INTERNED(name)) {
+               op_array->vars[i].name = name;
+       } else {
+               op_array->vars[i].name = estrndup(name, name_len);
+       }
+       op_array->vars[i].name_len = name_len;
+       op_array->vars[i].hash_value = hash_value;
+       return i;
+}
+#endif
+
+#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
+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 (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[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;
+}
+
+# define LITERAL_LONG(op, val) do { \
+               zval _c; \
+               ZVAL_LONG(&_c, val); \
+               op.constant = zend_optimizer_add_literal(op_array, &_c TSRMLS_CC); \
+       } while (0)
+
+# define LITERAL_BOOL(op, val) do { \
+               zval _c; \
+               ZVAL_BOOL(&_c, val); \
+               op.constant = zend_optimizer_add_literal(op_array, &_c TSRMLS_CC); \
+       } while (0)
+
+# define literal_dtor(zv) do { \
+               zval_dtor(zv); \
+               Z_TYPE_P(zv) = IS_NULL; \
+       } while (0)
+
+#define COPY_NODE(target, src) do { \
+               target ## _type = src ## _type; \
+               target = src; \
+       } while (0)
+
+#else
+
+# define LITERAL_LONG(op, val) ZVAL_LONG(&op.u.constant, val)
+
+# define LITERAL_BOOL(op, val) ZVAL_BOOL(&op.u.constant, val)
+
+# define literal_dtor(zv) zval_dtor(zv)
+
+#define COPY_NODE(target, src) do { \
+               target = src; \
+       } while (0)
+
+#endif
+
+static void update_op1_const(zend_op_array *op_array,
+                             zend_op       *opline,
+                             zval          *val TSRMLS_DC)
+{
+       if (opline->opcode == ZEND_FREE) {
+               MAKE_NOP(opline);
+               zval_dtor(val);
+       } else {
+               ZEND_OP1_TYPE(opline) = IS_CONST;
+#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
+               if (Z_TYPE_P(val) == IS_STRING) {
+                       switch (opline->opcode) {
+                               case ZEND_INIT_STATIC_METHOD_CALL:
+                               case ZEND_CATCH:
+                               case ZEND_FETCH_CONSTANT:
+                                       opline->op1.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);
+                                       Z_HASH_P(&ZEND_OP1_LITERAL(opline)) = zend_hash_func(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)) + 1);
+                                       op_array->literals[opline->op1.constant].cache_slot = op_array->last_cache_slot++;
+                                       zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val));
+                                       zend_optimizer_add_literal(op_array, val TSRMLS_CC);
+                                       op_array->literals[opline->op1.constant+1].hash_value = zend_hash_func(Z_STRVAL(op_array->literals[opline->op1.constant+1].constant), Z_STRLEN(op_array->literals[opline->op1.constant+1].constant) + 1);
+                                       break;
+                               case ZEND_DO_FCALL:
+                                       zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val));
+                                       opline->op1.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);
+                                       Z_HASH_P(&ZEND_OP1_LITERAL(opline)) = zend_hash_func(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)) + 1);
+                                       op_array->literals[opline->op1.constant].cache_slot = op_array->last_cache_slot++;
+                                       break;
+                               default:
+                                       opline->op1.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);
+                                       Z_HASH_P(&ZEND_OP1_LITERAL(opline)) = zend_hash_func(Z_STRVAL(ZEND_OP1_LITERAL(opline)), Z_STRLEN(ZEND_OP1_LITERAL(opline)) + 1);
+                                       break;
+                       }
+               } else {
+                       opline->op1.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);
+               }
+#else
+               ZEND_OP1_LITERAL(opline) = *val;
+#endif
+       }
+}
+
+static void update_op2_const(zend_op_array *op_array,
+                             zend_op       *opline,
+                             zval          *val TSRMLS_DC)
+{
+       ZEND_OP2_TYPE(opline) = IS_CONST;
+#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
+       opline->op2.constant = zend_optimizer_add_literal(op_array, val TSRMLS_CC);
+       if (Z_TYPE_P(val) == IS_STRING) {
+               Z_HASH_P(&ZEND_OP2_LITERAL(opline)) = zend_hash_func(Z_STRVAL(ZEND_OP2_LITERAL(opline)), Z_STRLEN(ZEND_OP2_LITERAL(opline)) + 1);
+               switch (opline->opcode) {
+                       case ZEND_FETCH_R:
+                       case ZEND_FETCH_W:
+                       case ZEND_FETCH_RW:
+                       case ZEND_FETCH_IS:
+                       case ZEND_FETCH_UNSET:
+                       case ZEND_FETCH_FUNC_ARG:
+                       case ZEND_FETCH_CLASS:
+                       case ZEND_INIT_FCALL_BY_NAME:
+                       /*case ZEND_INIT_NS_FCALL_BY_NAME:*/
+                       case ZEND_UNSET_VAR:
+                       case ZEND_ISSET_ISEMPTY_VAR:
+                       case ZEND_ADD_INTERFACE:
+                       case ZEND_ADD_TRAIT:
+                               op_array->literals[opline->op2.constant].cache_slot = op_array->last_cache_slot++;
+                               zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val));
+                               zend_optimizer_add_literal(op_array, val TSRMLS_CC);
+                               op_array->literals[opline->op2.constant+1].hash_value = zend_hash_func(Z_STRVAL(op_array->literals[opline->op2.constant+1].constant), Z_STRLEN(op_array->literals[opline->op2.constant+1].constant) + 1);
+                               break;
+                       case ZEND_INIT_METHOD_CALL:
+                       case ZEND_INIT_STATIC_METHOD_CALL:
+                               zend_str_tolower(Z_STRVAL_P(val), Z_STRLEN_P(val));
+                               zend_optimizer_add_literal(op_array, val TSRMLS_CC);
+                               op_array->literals[opline->op2.constant+1].hash_value = zend_hash_func(Z_STRVAL(op_array->literals[opline->op2.constant+1].constant), Z_STRLEN(op_array->literals[opline->op2.constant+1].constant) + 1);
+                               /* break missing intentionally */                                               
+                       /*case ZEND_FETCH_CONSTANT:*/
+                       case ZEND_ASSIGN_OBJ:
+                       case ZEND_FETCH_OBJ_R:
+                       case ZEND_FETCH_OBJ_W:
+                       case ZEND_FETCH_OBJ_RW:
+                       case ZEND_FETCH_OBJ_IS:
+                       case ZEND_FETCH_OBJ_UNSET:
+                       case ZEND_FETCH_OBJ_FUNC_ARG:
+                       case ZEND_UNSET_OBJ:
+                       case ZEND_PRE_INC_OBJ:
+                       case ZEND_PRE_DEC_OBJ:
+                       case ZEND_POST_INC_OBJ:
+                       case ZEND_POST_DEC_OBJ:
+                       case ZEND_ISSET_ISEMPTY_PROP_OBJ:
+                               op_array->literals[opline->op2.constant].cache_slot = op_array->last_cache_slot;
+                               op_array->last_cache_slot += 2;
+                               break;
+                       case ZEND_ASSIGN_ADD:
+                       case ZEND_ASSIGN_SUB:
+                       case ZEND_ASSIGN_MUL:
+                       case ZEND_ASSIGN_DIV:
+                       case ZEND_ASSIGN_MOD:
+                       case ZEND_ASSIGN_SL:
+                       case ZEND_ASSIGN_SR:
+                       case ZEND_ASSIGN_CONCAT:
+                       case ZEND_ASSIGN_BW_OR:
+                       case ZEND_ASSIGN_BW_AND:
+                       case ZEND_ASSIGN_BW_XOR:
+                               if (opline->extended_value == ZEND_ASSIGN_OBJ) {
+                                       op_array->literals[opline->op2.constant].cache_slot = op_array->last_cache_slot;
+                                       op_array->last_cache_slot += 2;
+                               }
+                               break;
+#if ZEND_EXTENSION_API_NO >= PHP_5_4_X_API_NO
+                       case ZEND_OP_DATA:
+                               if ((opline-1)->opcode == ZEND_ASSIGN_DIM ||
+                                   ((opline-1)->extended_value == ZEND_ASSIGN_DIM &&
+                                    ((opline-1)->opcode == ZEND_ASSIGN_ADD ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_SUB ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_MUL ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_DIV ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_MOD ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_SL ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_SR ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_CONCAT ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_BW_OR ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_BW_AND ||
+                                    (opline-1)->opcode == ZEND_ASSIGN_BW_XOR))) {
+                                       goto check_numeric;
+                               }
+                               break;
+                       case ZEND_ISSET_ISEMPTY_DIM_OBJ:
+                       case ZEND_ADD_ARRAY_ELEMENT:
+                       case ZEND_INIT_ARRAY:
+                       case ZEND_UNSET_DIM:
+                       case ZEND_FETCH_DIM_R:
+                       case ZEND_FETCH_DIM_W:
+                       case ZEND_FETCH_DIM_RW:
+                       case ZEND_FETCH_DIM_IS:
+                       case ZEND_FETCH_DIM_FUNC_ARG:
+                       case ZEND_FETCH_DIM_UNSET:
+                       case ZEND_FETCH_DIM_TMP_VAR:
+check_numeric:
+                               {
+                                       ulong index;
+                                       int numeric = 0;
+
+                                       ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(val), Z_STRLEN_P(val)+1, index, numeric = 1);
+                                       if (numeric) {
+                                               zval_dtor(val);
+                                               ZVAL_LONG(val, index);
+                                               op_array->literals[opline->op2.constant].constant = *val;
+                               }
+                               }
+                               break;
+#endif
+                       default:
+                               break;
+               }
+       }
+#else
+       ZEND_OP2_LITERAL(opline) = *val;
+#endif
+}
+
+static void replace_tmp_by_const(zend_op_array *op_array,
+                                 zend_op       *opline,
+                                 zend_uint      var,
+                                 zval          *val
+                                 TSRMLS_DC)
+{
+       zend_op *end = op_array->opcodes + op_array->last;
+
+       while (opline < end) {
+               if (ZEND_OP1_TYPE(opline) == IS_TMP_VAR &&
+                       ZEND_OP1(opline).var == var) {
+
+                       update_op1_const(op_array, opline, val TSRMLS_CC);
+                       /* TMP_VAR my be used only once */
+                       break;
+               }
+
+               if (ZEND_OP2_TYPE(opline) == IS_TMP_VAR &&
+                       ZEND_OP2(opline).var == var) {
+
+                       update_op2_const(op_array, opline, val TSRMLS_CC);
+                       /* TMP_VAR my be used only once */
+                       break;
+               }
+               opline++;
+       }
+}
+
+#include "Optimizer/nop_removal.c"
+#include "Optimizer/block_pass.c"
+#include "Optimizer/optimize_temp_vars_5.c"
+
+void zend_optimizer(zend_op_array *op_array TSRMLS_DC)
+{
+       if (op_array->type == ZEND_EVAL_CODE ||
+           (op_array->fn_flags & ZEND_ACC_INTERACTIVE)) {
+               return;
+       }
+
+       /* pass 1
+        * - substitute persistent constants (true, false, null, etc)
+        * - perform compile-time evaluation of constant binary and unary operations
+        * - optimize series of ADD_STRING and/or ADD_CHAR
+        * - convert CAST(IS_BOOL,x) into BOOL(x)
+        * - convert INTI_FCALL_BY_NAME + DO_FCALL_BY_NAME into DO_FCALL
+        */
+#include "Optimizer/pass1_5.c"
+
+       /* pass 2:
+        * - convert non-numeric constants to numeric constants in numeric operators
+        * - optimize constant conditional JMPs
+        * - optimize static BRKs and CONTs
+        */
+#include "Optimizer/pass2.c"
+
+       /* pass 3:
+        * - optimize $i = $i+expr to $i+=expr
+        * - optimize series of JMPs
+        * - change $i++ to ++$i where possible
+        */
+#include "Optimizer/pass3.c"
+
+       /* pass 5:
+        * - CFG optimization
+        */
+#include "Optimizer/pass5.c"
+
+        /* pass 9:
+        * - Optimize temp variables usage
+        */
+#include "Optimizer/pass9.c"
+
+       /* pass 10:
+        * - remove NOPs
+        */
+#include "Optimizer/pass10.c"
+}
index 98275a20aae0e992a6d10aacd77f02ae7acda865..7f2b4f21fd88ac919334812651d72cba64bc6ce3 100644 (file)
@@ -1,49 +1,49 @@
-/*\r
-   +----------------------------------------------------------------------+\r
-   | Zend OPcache                                                         |\r
-   +----------------------------------------------------------------------+\r
-   | Copyright (c) 1998-2013 The PHP Group                                |\r
-   +----------------------------------------------------------------------+\r
-   | This source file is subject to version 3.01 of the PHP license,      |\r
-   | that is bundled with this package in the file LICENSE, and is        |\r
-   | available through the world-wide-web at the following url:           |\r
-   | http://www.php.net/license/3_01.txt                                  |\r
-   | If you did not receive a copy of the PHP license and are unable to   |\r
-   | obtain it through the world-wide-web, please send a note to          |\r
-   | license@php.net so we can mail you a copy immediately.               |\r
-   +----------------------------------------------------------------------+\r
-   | Authors: Andi Gutmans <andi@zend.com>                                |\r
-   |          Zeev Suraski <zeev@zend.com>                                |\r
-   |          Stanislav Malyshev <stas@zend.com>                          |\r
-   |          Dmitry Stogov <dmitry@zend.com>                             |\r
-   +----------------------------------------------------------------------+\r
-*/\r
-\r
-#ifndef ZEND_OPTIMIZER_H\r
-#define ZEND_OPTIMIZER_H\r
-\r
-#include "zend.h"\r
-#include "zend_compile.h"\r
-\r
-#define ZEND_OPTIMIZER_PASS_1          (1<<0)   /* CSE, STRING construction     */\r
-#define ZEND_OPTIMIZER_PASS_2          (1<<1)   /* Constant conversion and jumps */\r
-#define ZEND_OPTIMIZER_PASS_3          (1<<2)   /* ++, +=, series of jumps      */\r
-#define ZEND_OPTIMIZER_PASS_4          (1<<3)\r
-#define ZEND_OPTIMIZER_PASS_5          (1<<4)   /* CFG based optimization       */\r
-#define ZEND_OPTIMIZER_PASS_6          (1<<5)\r
-#define ZEND_OPTIMIZER_PASS_7          (1<<6)\r
-#define ZEND_OPTIMIZER_PASS_8          (1<<7)   \r
-#define ZEND_OPTIMIZER_PASS_9          (1<<8)   /* TMP VAR usage                */\r
-#define ZEND_OPTIMIZER_PASS_10         (1<<9)   /* NOP removal                 */\r
-#define ZEND_OPTIMIZER_PASS_11         (1<<10)\r
-#define ZEND_OPTIMIZER_PASS_12         (1<<11)\r
-#define ZEND_OPTIMIZER_PASS_13         (1<<12)\r
-#define ZEND_OPTIMIZER_PASS_14         (1<<13)\r
-\r
-#define ZEND_OPTIMIZER_ALL_PASSES      0xFFFFFFFF\r
-\r
-#define DEFAULT_OPTIMIZATION_LEVEL  "0xFFFFFFFF"\r
-\r
-void zend_optimizer(zend_op_array *op_array TSRMLS_DC);\r
-\r
-#endif\r
+/*
+   +----------------------------------------------------------------------+
+   | Zend OPcache                                                         |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   |          Stanislav Malyshev <stas@zend.com>                          |
+   |          Dmitry Stogov <dmitry@zend.com>                             |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef ZEND_OPTIMIZER_H
+#define ZEND_OPTIMIZER_H
+
+#include "zend.h"
+#include "zend_compile.h"
+
+#define ZEND_OPTIMIZER_PASS_1          (1<<0)   /* CSE, STRING construction     */
+#define ZEND_OPTIMIZER_PASS_2          (1<<1)   /* Constant conversion and jumps */
+#define ZEND_OPTIMIZER_PASS_3          (1<<2)   /* ++, +=, series of jumps      */
+#define ZEND_OPTIMIZER_PASS_4          (1<<3)
+#define ZEND_OPTIMIZER_PASS_5          (1<<4)   /* CFG based optimization       */
+#define ZEND_OPTIMIZER_PASS_6          (1<<5)
+#define ZEND_OPTIMIZER_PASS_7          (1<<6)
+#define ZEND_OPTIMIZER_PASS_8          (1<<7)   
+#define ZEND_OPTIMIZER_PASS_9          (1<<8)   /* TMP VAR usage                */
+#define ZEND_OPTIMIZER_PASS_10         (1<<9)   /* NOP removal                 */
+#define ZEND_OPTIMIZER_PASS_11         (1<<10)
+#define ZEND_OPTIMIZER_PASS_12         (1<<11)
+#define ZEND_OPTIMIZER_PASS_13         (1<<12)
+#define ZEND_OPTIMIZER_PASS_14         (1<<13)
+
+#define ZEND_OPTIMIZER_ALL_PASSES      0xFFFFFFFF
+
+#define DEFAULT_OPTIMIZATION_LEVEL  "0xFFFFFFFF"
+
+void zend_optimizer(zend_op_array *op_array TSRMLS_DC);
+
+#endif
index 616bdf74f6e6b15cc3df17caffc0a9de58e88ab3..657b480316896e411afdd759b9e653de5cfe987c 100644 (file)
@@ -1,86 +1,86 @@
-/*\r
-   +----------------------------------------------------------------------+\r
-   | Zend OPcache                                                         |\r
-   +----------------------------------------------------------------------+\r
-   | Copyright (c) 1998-2013 The PHP Group                                |\r
-   +----------------------------------------------------------------------+\r
-   | This source file is subject to version 3.01 of the PHP license,      |\r
-   | that is bundled with this package in the file LICENSE, and is        |\r
-   | available through the world-wide-web at the following url:           |\r
-   | http://www.php.net/license/3_01.txt                                  |\r
-   | If you did not receive a copy of the PHP license and are unable to   |\r
-   | obtain it through the world-wide-web, please send a note to          |\r
-   | license@php.net so we can mail you a copy immediately.               |\r
-   +----------------------------------------------------------------------+\r
-   | Authors: Andi Gutmans <andi@zend.com>                                |\r
-   |          Zeev Suraski <zeev@zend.com>                                |\r
-   |          Stanislav Malyshev <stas@zend.com>                          |\r
-   |          Dmitry Stogov <dmitry@zend.com>                             |\r
-   +----------------------------------------------------------------------+\r
-*/\r
-\r
-#ifndef ZEND_OPTIMIZER_INTERNAL_H\r
-#define ZEND_OPTIMIZER_INTERNAL_H\r
-\r
-#include "ZendAccelerator.h"\r
-\r
-#if ZEND_EXTENSION_API_NO > PHP_5_4_X_API_NO\r
-# define VAR_NUM(v) ((zend_uint)(EX_TMP_VAR_NUM(0, 0) - EX_TMP_VAR(0, v)))\r
-# define NUM_VAR(v) ((zend_uint)(zend_uintptr_t)EX_TMP_VAR_NUM(0, v))\r
-#elif ZEND_EXTENSION_API_NO > PHP_5_2_X_API_NO\r
-# define VAR_NUM(v) ((v)/ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)))\r
-# define NUM_VAR(v) ((v)*ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)))\r
-#else\r
-# define VAR_NUM(v) ((v)/(sizeof(temp_variable)))\r
-# define NUM_VAR(v) ((v)*(sizeof(temp_variable)))\r
-#endif\r
-\r
-#define INV_COND(op)       ((op) == ZEND_JMPZ    ? ZEND_JMPNZ    : ZEND_JMPZ)\r
-#define INV_EX_COND(op)    ((op) == ZEND_JMPZ_EX ? ZEND_JMPNZ    : ZEND_JMPZ)\r
-#define INV_COND_EX(op)    ((op) == ZEND_JMPZ    ? ZEND_JMPNZ_EX : ZEND_JMPZ_EX)\r
-#define INV_EX_COND_EX(op) ((op) == ZEND_JMPZ_EX ? ZEND_JMPNZ_EX : ZEND_JMPZ_EX)\r
-\r
-#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO\r
-# define MAKE_NOP(opline)      { opline->opcode = ZEND_NOP;  memset(&opline->result,0,sizeof(opline->result)); memset(&opline->op1,0,sizeof(opline->op1)); memset(&opline->op2,0,sizeof(opline->op2)); opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; opline->handler = zend_opcode_handlers[ZEND_NOP]; }\r
-# define RESULT_USED(op)       (((op->result_type & IS_VAR) && !(op->result_type & EXT_TYPE_UNUSED)) || op->result_type == IS_TMP_VAR)\r
-# define RESULT_UNUSED(op)     ((op->result_type & EXT_TYPE_UNUSED) != 0)\r
-# define SAME_VAR(op1, op2) ((((op1 ## _type & IS_VAR) && (op2 ## _type & IS_VAR)) || (op1 ## _type == IS_TMP_VAR && op2 ## _type == IS_TMP_VAR)) && op1.var == op2.var)\r
-#else\r
-# define MAKE_NOP(opline)      { opline->opcode = ZEND_NOP;  memset(&opline->result,0,sizeof(znode)); memset(&opline->op1,0,sizeof(znode)); memset(&opline->op2,0,sizeof(znode)); opline->result.op_type=opline->op1.op_type=opline->op2.op_type=IS_UNUSED; opline->handler = zend_opcode_handlers[ZEND_NOP]; }\r
-# define RESULT_USED(op)       ((op->result.op_type == IS_VAR && (op->result.u.EA.type & EXT_TYPE_UNUSED) == 0) || (op->result.op_type == IS_TMP_VAR))\r
-# define RESULT_UNUSED(op)     ((op->result.op_type == IS_VAR) && (op->result.u.EA.type == EXT_TYPE_UNUSED))\r
-# define SAME_VAR(op1, op2)    (((op1.op_type == IS_VAR && op2.op_type == IS_VAR) || (op1.op_type == IS_TMP_VAR && op2.op_type == IS_TMP_VAR)) && op1.u.var == op2.u.var)\r
-#endif\r
-\r
-typedef struct _zend_code_block zend_code_block;\r
-typedef struct _zend_block_source zend_block_source;\r
-\r
-struct _zend_code_block {\r
-       int                 access;\r
-       zend_op            *start_opline;\r
-       int                 start_opline_no;\r
-       int                 len;\r
-       zend_code_block    *op1_to;\r
-       zend_code_block    *op2_to;\r
-       zend_code_block    *ext_to;\r
-       zend_code_block    *follow_to;\r
-       zend_code_block    *next;\r
-       zend_block_source  *sources;\r
-       zend_bool           protected; /* don't merge this block with others */\r
-};\r
-\r
-typedef struct _zend_cfg {\r
-       zend_code_block    *blocks;\r
-       zend_code_block   **try;\r
-       zend_code_block   **catch;\r
-       zend_code_block   **loop_start;\r
-       zend_code_block   **loop_cont;\r
-       zend_code_block   **loop_brk;\r
-} zend_cfg;\r
-\r
-struct _zend_block_source {\r
-       zend_code_block    *from;\r
-       zend_block_source  *next;\r
-};\r
-\r
-#endif\r
+/*
+   +----------------------------------------------------------------------+
+   | Zend OPcache                                                         |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1998-2013 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Andi Gutmans <andi@zend.com>                                |
+   |          Zeev Suraski <zeev@zend.com>                                |
+   |          Stanislav Malyshev <stas@zend.com>                          |
+   |          Dmitry Stogov <dmitry@zend.com>                             |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef ZEND_OPTIMIZER_INTERNAL_H
+#define ZEND_OPTIMIZER_INTERNAL_H
+
+#include "ZendAccelerator.h"
+
+#if ZEND_EXTENSION_API_NO > PHP_5_4_X_API_NO
+# define VAR_NUM(v) ((zend_uint)(EX_TMP_VAR_NUM(0, 0) - EX_TMP_VAR(0, v)))
+# define NUM_VAR(v) ((zend_uint)(zend_uintptr_t)EX_TMP_VAR_NUM(0, v))
+#elif ZEND_EXTENSION_API_NO > PHP_5_2_X_API_NO
+# define VAR_NUM(v) ((v)/ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)))
+# define NUM_VAR(v) ((v)*ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)))
+#else
+# define VAR_NUM(v) ((v)/(sizeof(temp_variable)))
+# define NUM_VAR(v) ((v)*(sizeof(temp_variable)))
+#endif
+
+#define INV_COND(op)       ((op) == ZEND_JMPZ    ? ZEND_JMPNZ    : ZEND_JMPZ)
+#define INV_EX_COND(op)    ((op) == ZEND_JMPZ_EX ? ZEND_JMPNZ    : ZEND_JMPZ)
+#define INV_COND_EX(op)    ((op) == ZEND_JMPZ    ? ZEND_JMPNZ_EX : ZEND_JMPZ_EX)
+#define INV_EX_COND_EX(op) ((op) == ZEND_JMPZ_EX ? ZEND_JMPNZ_EX : ZEND_JMPZ_EX)
+
+#if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
+# define MAKE_NOP(opline)      { opline->opcode = ZEND_NOP;  memset(&opline->result,0,sizeof(opline->result)); memset(&opline->op1,0,sizeof(opline->op1)); memset(&opline->op2,0,sizeof(opline->op2)); opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; opline->handler = zend_opcode_handlers[ZEND_NOP]; }
+# define RESULT_USED(op)       (((op->result_type & IS_VAR) && !(op->result_type & EXT_TYPE_UNUSED)) || op->result_type == IS_TMP_VAR)
+# define RESULT_UNUSED(op)     ((op->result_type & EXT_TYPE_UNUSED) != 0)
+# define SAME_VAR(op1, op2) ((((op1 ## _type & IS_VAR) && (op2 ## _type & IS_VAR)) || (op1 ## _type == IS_TMP_VAR && op2 ## _type == IS_TMP_VAR)) && op1.var == op2.var)
+#else
+# define MAKE_NOP(opline)      { opline->opcode = ZEND_NOP;  memset(&opline->result,0,sizeof(znode)); memset(&opline->op1,0,sizeof(znode)); memset(&opline->op2,0,sizeof(znode)); opline->result.op_type=opline->op1.op_type=opline->op2.op_type=IS_UNUSED; opline->handler = zend_opcode_handlers[ZEND_NOP]; }
+# define RESULT_USED(op)       ((op->result.op_type == IS_VAR && (op->result.u.EA.type & EXT_TYPE_UNUSED) == 0) || (op->result.op_type == IS_TMP_VAR))
+# define RESULT_UNUSED(op)     ((op->result.op_type == IS_VAR) && (op->result.u.EA.type == EXT_TYPE_UNUSED))
+# define SAME_VAR(op1, op2)    (((op1.op_type == IS_VAR && op2.op_type == IS_VAR) || (op1.op_type == IS_TMP_VAR && op2.op_type == IS_TMP_VAR)) && op1.u.var == op2.u.var)
+#endif
+
+typedef struct _zend_code_block zend_code_block;
+typedef struct _zend_block_source zend_block_source;
+
+struct _zend_code_block {
+       int                 access;
+       zend_op            *start_opline;
+       int                 start_opline_no;
+       int                 len;
+       zend_code_block    *op1_to;
+       zend_code_block    *op2_to;
+       zend_code_block    *ext_to;
+       zend_code_block    *follow_to;
+       zend_code_block    *next;
+       zend_block_source  *sources;
+       zend_bool           protected; /* don't merge this block with others */
+};
+
+typedef struct _zend_cfg {
+       zend_code_block    *blocks;
+       zend_code_block   **try;
+       zend_code_block   **catch;
+       zend_code_block   **loop_start;
+       zend_code_block   **loop_cont;
+       zend_code_block   **loop_brk;
+} zend_cfg;
+
+struct _zend_block_source {
+       zend_code_block    *from;
+       zend_block_source  *next;
+};
+
+#endif