php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-25 00:32:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source
This commit is contained in:
Xinchen Hui
2015-03-04 14:49:03 +08:00
parent fffd173b7a a29b64fc10
commit ec00a4de4e
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/opcache/Optimizer/optimize_func_calls.c
View File

@@ -109,10 +109,10 @@ void optimize_func_calls(zend_op_array *op_array, zend_optimizer_ctx *ctx)
case ZEND_FETCH_DIM_FUNC_ARG:
if (call_stack[call - 1].func) {
if (ARG_SHOULD_BE_SENT_BY_REF(call_stack[call - 1].func, (opline->extended_value & ZEND_FETCH_ARG_MASK))) {
opline->extended_value = 0;
opline->extended_value &= ZEND_FETCH_TYPE_MASK;
opline->opcode -= 9;
} else {
opline->extended_value = 0;
opline->extended_value &= ZEND_FETCH_TYPE_MASK;
opline->opcode -= 12;
}
}

20
ext/opcache/tests/bug69159.phpt Normal file
View File

@@ -0,0 +1,20 @@
--TEST--
Bug #69159 (Opcache causes problem when passing a variable variable to a function)
--INI--
opcache.enable=1
opcache.optimization_level=-1
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
$i = 1;
$x1 = "okey";
myFunction(${"x$i"});
function myFunction($x) {
var_dump($x);
}
?>
--EXPECT--
string(4) "okey"