Merge branch 'PHP-7.2'

* PHP-7.2: Improved fix
UziTech · Nov 27, 2017 · 3475197 · 3475197
2 parents dcdd4ab + 9d02227
commit 3475197
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c
@@ -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:

diff --git 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;