Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75556 (Invalid opcode 138/1/1)
This commit is contained in:
Xinchen Hui 2017-11-25 00:54:28 +08:00
commit a84c7050fd
2 changed files with 28 additions and 0 deletions

View File

@ -306,6 +306,8 @@ int zend_optimizer_update_op1_const(zend_op_array *op_array,
/* This would require a non-local change.
* zend_optimizer_replace_by_const() supports this. */
return 0;
case ZEND_INSTANCEOF:
return 0;
case ZEND_CASE:
case ZEND_FETCH_LIST:
return 0;

View File

@ -0,0 +1,26 @@
--TEST--
Bug #75556 (Invalid opcode 138/1/1)
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.optimization_level=-1
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
function createFromFormat($format, $date, ?\DateTimeZone $tz = null): ?\DateTimeInterface
{
if ($tz !== null
|| ($tz instanceof \DateTimeZone && !in_array($tz->getName(), ['UTC', 'Z'], true))
) {
$msg = 'Date objects must have UTC as their timezone';
throw new \UnexpectedValueException($msg);
}
return null;
}
var_dump(createFromFormat('m/d/Y', '12/07/2017', null));
?>
--EXPECT--
NULL