com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/opcache/Optimizer/block _pass.c ext/opcache/Optimizer/pass1_5.c
ext/opc ache/ZendAccelerator.c ext/opcache/zend_accelerator_mod ule.c

From: Date: Mon, 13 Jan 2014 13:29:14 +0000
Subject: com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/opcache/Optimizer/block _pass.c ext/opcache/Optimizer/pass1_5.c
ext/opc ache/ZendAccelerator.c ext/opcache/zend_accelerator_mod ule.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-75591@lists.php.net to get a copy of this message
Commit: 972a6bd0f7afc2dc4850996433c1fbef73f7ba45 Author: Anatol Belski <ab@php.net> Mon, 13 Jan 2014 14:29:14 +0100 Parents: e15f7decd12ebc25548255537f1a8983128954b0 e141592da6cdb15709e4aeaab5421c9a46564849 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=972a6bd0f7afc2dc4850996433c1fbef73f7ba45 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Conflicts: ext/opcache/Optimizer/pass1_5.c Changed paths: MM ext/opcache/Optimizer/block_pass.c MM ext/opcache/Optimizer/pass1_5.c MM ext/opcache/ZendAccelerator.c MM ext/opcache/zend_accelerator_module.c Diff: diff --cc ext/opcache/Optimizer/pass1_5.c index 88283f6,577d1b6..e9158dd --- a/ext/opcache/Optimizer/pass1_5.c +++ b/ext/opcache/Optimizer/pass1_5.c @@@ -433,7 -433,7 +433,7 @@@ if (ZEND_OPTIMIZER_PASS_1 & OPTIMIZATIO zval t; if (zend_get_persistent_constant(Z_STRVAL(ZEND_OP1_LITERAL(opline - 1)), - Z_STRSIZE(ZEND_OP1_LITERAL(opline - 1)), &t, 0 TSRMLS_CC)) { - Z_STRLEN(ZEND_OP1_LITERAL(opline - 1)), &t, 1 TSRMLS_CC)) { ++ Z_STRSIZE(ZEND_OP1_LITERAL(opline - 1)), &t, 1 TSRMLS_CC)) { if (replace_var_by_const(op_array, opline + 1, ZEND_RESULT(opline).var, &t TSRMLS_CC)) { literal_dtor(&ZEND_OP1_LITERAL(opline - 1)); MAKE_NOP((opline - 1));

« previous php.cvs (#75591) next »