Merge branch 'PHP-7.2'

* PHP-7.2:
  Improved fix
This commit is contained in:
Xinchen Hui 2017-11-27 12:03:48 +08:00
commit 3475197551
2 changed files with 1 additions and 2 deletions

View File

@ -241,6 +241,7 @@ static zend_bool can_replace_op1(
case ZEND_MAKE_REF:
case ZEND_UNSET_CV:
case ZEND_ISSET_ISEMPTY_CV:
case ZEND_INSTANCEOF:
return 0;
case ZEND_INIT_ARRAY:
case ZEND_ADD_ARRAY_ELEMENT:

View File

@ -306,8 +306,6 @@ 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;