Commit: 0d73c20d8757b7db40350251f5accb5de6e390b1 Author: Dmitry Stogov <dmi...@zend.com> Mon, 25 Feb 2013 09:59:39 +0400 Parents: a1afc0a1398ee1d18dab76c5c97c0a6da98531f3 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0d73c20d8757b7db40350251f5accb5de6e390b1 Log: Fixed compilation, when compiling right into PHP (Ilia Alshanetsky) Changed paths: M Optimizer/block_pass.c M Optimizer/pass1_5.c M Optimizer/zend_optimizer.c Diff: diff --git a/Optimizer/block_pass.c b/Optimizer/block_pass.c index a65554c..acd149e 100644 --- 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 65e934e..a2287ea 100644 --- 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 b2b0c88..e46e5a2 100644 --- a/Optimizer/zend_optimizer.c +++ b/Optimizer/zend_optimizer.c @@ -29,7 +29,7 @@ ZCG(accel_directives).optimization_level #if ZEND_EXTENSION_API_NO > PHP_5_3_X_API_NO -int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC) +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++; @@ -55,13 +55,13 @@ int zend_add_literal(zend_op_array *op_array, const zval *zv TSRMLS_DC) # define LITERAL_LONG(op, val) do { \ zval _c; \ ZVAL_LONG(&_c, val); \ - op.constant = zend_add_literal(op_array, &_c TSRMLS_CC); \ + 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_add_literal(op_array, &_c TSRMLS_CC); \ + op.constant = zend_optimizer_add_literal(op_array, &_c TSRMLS_CC); \ } while (0) # define literal_dtor(zv) do { \ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
