From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 27 Nov 2017 04:03:37 +0000 (+0800)
Subject: Improved fix
X-Git-Tag: php-7.2.1RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d022272432488dfad4cb9a12c2a20369a48f8eb;p=php

Improved fix
---

diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c
index c6aeebc96d..a91feafe19 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 d50503d4c5..f55aa41428 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;