CFG construction: Avoid code duplication

These code for those two cases is the same nowadays, so merge them.

diff --git a/ext/opcache/Optimizer/zend_cfg.c b/ext/opcache/Optimizer/zend_cfg.c
index 759e5a42204c182408aa0204cb748f422d768cea..d762d35d5272d34292fb5123d2538ca8f2a14c4e 100644 (file)
--- a/ext/opcache/Optimizer/zend_cfg.c
+++ b/ext/opcache/Optimizer/zend_cfg.c
@@ -413,21 +413,14 @@ int zend_build_cfg(zend_arena **arena, const zend_op_array *op_array, uint32_t b
                                BB_START(i + 1);
                                break;
                        }
-                       case ZEND_UNSET_VAR:
-                       case ZEND_ISSET_ISEMPTY_VAR:
-                               if (opline->extended_value & ZEND_FETCH_LOCAL) {
-                                       flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
-                               } else if ((opline->extended_value & (ZEND_FETCH_GLOBAL | ZEND_FETCH_GLOBAL_LOCK)) &&
-                                          !op_array->function_name) {
-                                       flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
-                               }
-                               break;
                        case ZEND_FETCH_R:
                        case ZEND_FETCH_W:
                        case ZEND_FETCH_RW:
                        case ZEND_FETCH_FUNC_ARG:
                        case ZEND_FETCH_IS:
                        case ZEND_FETCH_UNSET:
+                       case ZEND_UNSET_VAR:
+                       case ZEND_ISSET_ISEMPTY_VAR:
                                if (opline->extended_value & ZEND_FETCH_LOCAL) {
                                        flags |= ZEND_FUNC_INDIRECT_VAR_ACCESS;
                                } else if ((opline->extended_value & (ZEND_FETCH_GLOBAL | ZEND_FETCH_GLOBAL_LOCK)) &&