Improved fix

diff --git a/ext/opcache/Optimizer/sccp.c b/ext/opcache/Optimizer/sccp.c
index c6aeebc96d244d2974fda574ff6a39a4e09993ac..a91feafe19c36db1efaa05c3e646b785c94f5a7a 100644 (file)
--- 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 d50503d4c565d6eeb51ec27b52918539fda0161b..f55aa41428ce94066e5b1fb594a9d1fbb3e3fdee 100644 (file)
--- 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;