Fix JIT

Author: Girgias

Zend/Optimizer/zend_inference.c

@@ -4842,7 +4842,7 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
 				return 0;
 			}
 		case ZEND_FETCH_IS:
-			return (t2 & (MAY_BE_ARRAY|MAY_BE_OBJECT));
+			return (t2 & (MAY_BE_ARRAY|MAY_BE_OBJECT|MAY_BE_STRING));
 		case ZEND_ISSET_ISEMPTY_DIM_OBJ:
 			return (t1 & MAY_BE_OBJECT) || (t2 & (MAY_BE_ARRAY|MAY_BE_OBJECT));
 		case ZEND_FETCH_DIM_IS:

ext/opcache/jit/zend_jit_helpers.c

@@ -740,6 +740,10 @@ static zend_string* ZEND_FASTCALL zend_jit_fetch_dim_str_r_helper(zend_string *s
 
 	if (UNEXPECTED(Z_TYPE_P(dim) != IS_LONG)) {
 		offset = zend_check_string_offset(dim/*, BP_VAR_R*/);
+		/* Invalid offset */
+		if (UNEXPECTED(EG(exception))) {
+			return NULL;
+		}
 	} else {
 		offset = Z_LVAL_P(dim);
 	}
@@ -750,32 +754,12 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_str_is_helper(zend_string *str, zva
 {
 	zend_long offset;
 
-try_string_offset:
 	if (UNEXPECTED(Z_TYPE_P(dim) != IS_LONG)) {
-		switch (Z_TYPE_P(dim)) {
-			/* case IS_LONG: */
-			case IS_STRING:
-				if (IS_LONG == is_numeric_string(Z_STRVAL_P(dim), Z_STRLEN_P(dim), NULL, NULL, false)) {
-					break;
-				}
-				ZVAL_NULL(result);
-				return;
-			case IS_UNDEF:
-				zend_jit_undefined_op_helper(EG(current_execute_data)->opline->op2.var);
-			case IS_DOUBLE:
-			case IS_NULL:
-			case IS_FALSE:
-			case IS_TRUE:
-				break;
-			case IS_REFERENCE:
-				dim = Z_REFVAL_P(dim);
-				goto try_string_offset;
-			default:
-				zend_jit_illegal_string_offset(dim);
-				break;
-		}
-
-		offset = zval_get_long_func(dim, /* is_strict */ false);
+		offset = zend_check_string_offset(dim/*, BP_VAR_R*/);
+        /* Invalid offset */
+        if (UNEXPECTED(EG(exception))) {
+        	return;
+        }
 	} else {
 		offset = Z_LVAL_P(dim);
 	}
@@ -1286,12 +1270,12 @@ static int ZEND_FASTCALL zend_jit_isset_dim_helper(zval *container, zval *offset
 			}
 		} else {
 			ZVAL_DEREF(offset);
-			if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
-					|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
-						&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, false))) {
-				lval = zval_get_long_ex(offset, /* is_strict */ true);
-				goto isset_str_offset;
-			}
+			lval = zend_check_string_offset(offset/*, BP_VAR_R*/);
+            /* Illegal offset */
+            if (UNEXPECTED(EG(exception) != NULL)) {
+            	return 0;
+            }
+			goto isset_str_offset;
 		}
 	}
 	return 0;