try fix circleci

Author: alexandre-daubois

ext/opcache/jit/zend_jit_helpers.c

@@ -500,16 +500,33 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_r_helper(zend_array *ht, zval *dim,
 			}
 			ZEND_FALLTHROUGH;
 		case IS_NULL:
-			retval = zend_hash_find(ht, ZSTR_EMPTY_ALLOC());
-			if (!retval) {
-				ZVAL_NULL(result);
-			} else {
-				ZVAL_COPY_DEREF(result, retval);
+			/* The array may be destroyed while throwing the notice.
+			 * Temporarily increase the refcount to detect this situation. */
+			if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE)) {
+				GC_ADDREF(ht);
 			}
-
+			execute_data = EG(current_execute_data);
+			opline = EX(opline);
 			zend_error(E_DEPRECATED, "Using null as an array offset is deprecated, use an empty string instead");
-
-			return;
+			if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE) && !GC_DELREF(ht)) {
+				zend_array_destroy(ht);
+				if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
+					if (EG(exception)) {
+						ZVAL_UNDEF(EX_VAR(opline->result.var));
+					} else {
+						ZVAL_NULL(EX_VAR(opline->result.var));
+					}
+				}
+				return;
+			}
+			if (EG(exception)) {
+				if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
+					ZVAL_UNDEF(EX_VAR(opline->result.var));
+				}
+				return;
+			}
+			offset_key = ZSTR_EMPTY_ALLOC();
+			goto str_index;
 		case IS_DOUBLE:
 			hval = zend_dval_to_lval(Z_DVAL_P(dim));
 			if (!zend_is_long_compatible(Z_DVAL_P(dim), hval)) {
@@ -650,16 +667,33 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_is_helper(zend_array *ht, zval *dim
 			}
 			ZEND_FALLTHROUGH;
 		case IS_NULL:
-			retval = zend_hash_find(ht, ZSTR_EMPTY_ALLOC());
-			if (!retval) {
-				ZVAL_NULL(result);
-			} else {
-				ZVAL_COPY_DEREF(result, retval);
+			/* The array may be destroyed while throwing the notice.
+			 * Temporarily increase the refcount to detect this situation. */
+			if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE)) {
+				GC_ADDREF(ht);
 			}
-
+			execute_data = EG(current_execute_data);
+			opline = EX(opline);
 			zend_error(E_DEPRECATED, "Using null as an array offset is deprecated, use an empty string instead");
-
-			return;
+			if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE) && !GC_DELREF(ht)) {
+				zend_array_destroy(ht);
+				if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
+					if (EG(exception)) {
+						ZVAL_UNDEF(EX_VAR(opline->result.var));
+					} else {
+						ZVAL_NULL(EX_VAR(opline->result.var));
+					}
+				}
+				return;
+			}
+			if (EG(exception)) {
+				if (opline->result_type & (IS_VAR | IS_TMP_VAR)) {
+					ZVAL_UNDEF(EX_VAR(opline->result.var));
+				}
+				return;
+			}
+			offset_key = ZSTR_EMPTY_ALLOC();
+			goto str_index;
 		case IS_DOUBLE:
 			hval = zend_dval_to_lval(Z_DVAL_P(dim));
 			if (!zend_is_long_compatible(Z_DVAL_P(dim), hval)) {
@@ -785,17 +819,22 @@ static int ZEND_FASTCALL zend_jit_fetch_dim_isset_helper(zend_array *ht, zval *d
 				return 0;
 			}
 			ZEND_FALLTHROUGH;
-		case IS_NULL: {
-			int result = 0;
-			retval = zend_hash_find(ht, ZSTR_EMPTY_ALLOC());
-			if (retval) {
-				result = Z_TYPE_P(retval) > IS_NULL;
+		case IS_NULL:
+			/* The array may be destroyed while throwing the notice.
+			 * Temporarily increase the refcount to detect this situation. */
+			if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE)) {
+				GC_ADDREF(ht);
 			}
-
 			zend_error(E_DEPRECATED, "Using null as an array offset is deprecated, use an empty string instead");
-
-			return result;
-		}
+			if (!(GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE) && !GC_DELREF(ht)) {
+				zend_array_destroy(ht);
+				return 0;
+			}
+			if (EG(exception)) {
+				return 0;
+			}
+			offset_key = ZSTR_EMPTY_ALLOC();
+			goto str_index;
 		case IS_DOUBLE:
 			hval = zend_dval_to_lval(Z_DVAL_P(dim));
 			if (!zend_is_long_compatible(Z_DVAL_P(dim), hval)) {