Fixed compilation, when compiling right into PHP (Ilia Alshanetsky)

diff --git a/Optimizer/block_pass.c b/Optimizer/block_pass.c
index a65554c4ab79ea9a8850ad550a918409355dfe45..acd149eeef1cd379a1182dcc38aa0328905640c4 100644 (file)
--- a/Optimizer/block_pass.c
+++ b/Optimizer/block_pass.c
@@ -630,7 +630,7 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array,
                                                literal_dtor(arg);
                                                MAKE_NOP(sv);
                                                MAKE_NOP(fcall);
-                                               ZEND_OP1_LITERAL(opline) = zend_add_literal(op_array, &c TSRMLS_CC);
+                                               ZEND_OP1_LITERAL(opline) = zend_optimizer_add_literal(op_array, &c TSRMLS_CC);
                                                /* no copy ctor - get already copied it */
                                                ZEND_OP1_TYPE(opline) = IS_CONST;
                                        }

diff --git a/Optimizer/pass1_5.c b/Optimizer/pass1_5.c
index 65e934efcdfa6a67ce1ba7b2483354fc43911e2d..a2287ea3f94d058aba55f3e0d2796c81864a5155 100644 (file)
--- a/Optimizer/pass1_5.c
+++ b/Optimizer/pass1_5.c
@@ -71,7 +71,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) {
                                                } else {
                                                        ZEND_OP1_TYPE(tmp_opline) = IS_CONST;
 #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
-                                                       tmp_opline->op1.constant = zend_add_literal(op_array, &result TSRMLS_CC);
+                                                       tmp_opline->op1.constant = zend_optimizer_add_literal(op_array, &result TSRMLS_CC);
                                                        if (Z_TYPE(result) == IS_STRING) {
                                                                Z_HASH_P(&ZEND_OP1_LITERAL(tmp_opline)) = zend_hash_func(Z_STRVAL(ZEND_OP1_LITERAL(tmp_opline)), Z_STRLEN(ZEND_OP1_LITERAL(tmp_opline)) + 1);
                                                                if (tmp_opline->opcode == ZEND_INIT_STATIC_METHOD_CALL ||
@@ -92,7 +92,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) {
                                                ZEND_OP2(tmp_opline).var == tv) {
                                                ZEND_OP2_TYPE(tmp_opline) = IS_CONST;
 #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
-                                               tmp_opline->op2.constant = zend_add_literal(op_array, &result TSRMLS_CC);
+                                               tmp_opline->op2.constant = zend_optimizer_add_literal(op_array, &result TSRMLS_CC);
                                                if (Z_TYPE(result) == IS_STRING) {
                                                        Z_HASH_P(&ZEND_OP2_LITERAL(tmp_opline)) = zend_hash_func(Z_STRVAL(ZEND_OP2_LITERAL(tmp_opline)), Z_STRLEN(ZEND_OP2_LITERAL(tmp_opline)) + 1);
                                                        if (tmp_opline->opcode == ZEND_FETCH_R ||
@@ -224,7 +224,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) {
                                                } else {
                                                        ZEND_OP1_TYPE(tmp_opline) = IS_CONST;
 #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
-                                                       tmp_opline->op1.constant = zend_add_literal(op_array, &result TSRMLS_CC);
+                                                       tmp_opline->op1.constant = zend_optimizer_add_literal(op_array, &result TSRMLS_CC);
 #else
                                                        ZEND_OP1_LITERAL(tmp_opline) = result;
 #endif
@@ -235,7 +235,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) {
                                                ZEND_OP2(tmp_opline).var == tv) {
                                                ZEND_OP2_TYPE(tmp_opline) = IS_CONST;
 #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
-                                               tmp_opline->op2.constant = zend_add_literal(op_array, &result TSRMLS_CC);
+                                               tmp_opline->op2.constant = zend_optimizer_add_literal(op_array, &result TSRMLS_CC);
 #else
                                                ZEND_OP2_LITERAL(tmp_opline) = result;
 #endif
@@ -334,7 +334,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) {
                                        literal_dtor(&ZEND_OP2_LITERAL(opline));
                                        ZEND_OP1_TYPE(opline) = IS_CONST;
 #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
-                                       opline->op1.constant = zend_add_literal(op_array, &offset TSRMLS_CC);
+                                       opline->op1.constant = zend_optimizer_add_literal(op_array, &offset TSRMLS_CC);
 #else
                                        ZEND_OP1_LITERAL(opline) = offset;
 #endif
@@ -358,7 +358,7 @@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATION_LEVEL) {
                                literal_dtor(&ZEND_OP2_LITERAL(opline));
                                ZEND_OP1_TYPE(opline) = IS_CONST;
 #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO
-                               opline->op1.constant = zend_add_literal(op_array, &c TSRMLS_CC);
+                               opline->op1.constant = zend_optimizer_add_literal(op_array, &c TSRMLS_CC);
 #else
                                ZEND_OP1_LITERAL(opline) = c;
 #endif

diff --git a/Optimizer/zend_optimizer.c b/Optimizer/zend_optimizer.c
index b2b0c8878c7d2efb8e0166e526c9732a48102977..e46e5a2ececb6a8358835a3533c5f787aba91ddc 100644 (file)
--- a/Optimizer/zend_optimizer.c
+++ b/Optimizer/zend_optimizer.c
@@ -29,7 +29,7 @@
        ZCG(accel_directives).optimization_level\r
 \r
 #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO\r
-int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC)\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
@@ -55,13 +55,13 @@ int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC)
 # define LITERAL_LONG(op, val) do { \\r
                zval _c; \\r
                ZVAL_LONG(&_c, val); \\r
-               op.constant = zend_add_literal(op_array, &_c TSRMLS_CC); \\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_add_literal(op_array, &_c TSRMLS_CC); \\r
+               op.constant = zend_optimizer_add_literal(op_array, &_c TSRMLS_CC); \\r
        } while (0)\r
 \r
 # define literal_dtor(zv) do { \\r