com php-src: Improved fix: ext/opcache/Optimizer/sccp.c ext/opcache/Optimizer/zend_optimizer.c

Commit: 9d022272432488dfad4cb9a12c2a20369a48f8eb Author: Xinchen Hui <laruence@gmail.com> Mon, 27 Nov 2017 12:03:37 +0800 Parents: c412b8b3844b1881a952e1340dba23288a943f96 Branches: PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9d022272432488dfad4cb9a12c2a20369a48f8eb Log: Improved fix Changed paths: M ext/opcache/Optimizer/sccp.c M ext/opcache/Optimizer/zend_optimizer.c Diff: diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c index c6aeebc..a91feaf 100644 --- a/ext/opcache/Optimizer/sccp.c +++ b/ext/opcache/Optimizer/sccp.c @@ -194,6 +194,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: diff --git a/ext/opcache/Optimizer/zend_optimizer.c b/ext/opcache/Optimizer/zend_optimizer.c index d50503d..f55aa41 100644 --- a/ext/opcache/Optimizer/zend_optimizer.c +++ b/ext/opcache/Optimizer/zend_optimizer.c @@ -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;