Skip to content

Commit 7f87332

Browse files
committed
Remove JIT variant
1 parent 5c73b46 commit 7f87332

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

ext/opcache/jit/zend_jit_helpers.c

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@ static ZEND_COLD void undef_result_after_exception(void) {
2727
}
2828
}
2929

30-
ZEND_API ZEND_COLD void zend_jit_illegal_container_offset(const char *container, const zval *offset)
31-
{
32-
zend_type_error("Cannot access offset of type %s on %s", zend_get_type_by_const(Z_TYPE_P(offset)), container);
33-
}
34-
3530
static ZEND_COLD void zend_jit_illegal_empty_or_isset_offset(const zval *offset)
3631
{
3732
zend_type_error("Cannot access offset of type %s in isset or empty", zend_get_type_by_const(Z_TYPE_P(offset)));
@@ -488,7 +483,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_r_helper(zend_array *ht, zval *dim,
488483
hval = 1;
489484
goto num_index;
490485
default:
491-
zend_jit_illegal_container_offset("array", dim);
486+
zend_illegal_container_offset("array", dim);
492487
undef_result_after_exception();
493488
return;
494489
}
@@ -630,7 +625,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_is_helper(zend_array *ht, zval *dim
630625
hval = 1;
631626
goto num_index;
632627
default:
633-
zend_jit_illegal_container_offset("array", dim);
628+
zend_illegal_container_offset("array", dim);
634629
undef_result_after_exception();
635630
return;
636631
}
@@ -868,7 +863,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_rw_helper(zend_array *ht, zval *di
868863
hval = 1;
869864
goto num_index;
870865
default:
871-
zend_jit_illegal_container_offset("array", dim);
866+
zend_illegal_container_offset("array", dim);
872867
undef_result_after_exception();
873868
return NULL;
874869
}
@@ -1001,7 +996,7 @@ static zval* ZEND_FASTCALL zend_jit_fetch_dim_w_helper(zend_array *ht, zval *dim
1001996
hval = 1;
1002997
goto num_index;
1003998
default:
1004-
zend_jit_illegal_container_offset("array", dim);
999+
zend_illegal_container_offset("array", dim);
10051000
undef_result_after_exception();
10061001
if (EG(opline_before_exception)
10071002
&& (EG(opline_before_exception)+1)->opcode == ZEND_OP_DATA
@@ -1044,7 +1039,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim/*, int typ
10441039
}
10451040
return offset;
10461041
}
1047-
zend_jit_illegal_container_offset("string", dim);
1042+
zend_illegal_container_offset("string", dim);
10481043
return 0;
10491044
}
10501045
case IS_UNDEF:
@@ -1060,7 +1055,7 @@ static zend_never_inline zend_long zend_check_string_offset(zval *dim/*, int typ
10601055
dim = Z_REFVAL_P(dim);
10611056
goto try_again;
10621057
default:
1063-
zend_jit_illegal_container_offset("string", dim);
1058+
zend_illegal_container_offset("string", dim);
10641059
return 0;
10651060
}
10661061

@@ -1135,7 +1130,7 @@ static void ZEND_FASTCALL zend_jit_fetch_dim_str_is_helper(zend_string *str, zva
11351130
dim = Z_REFVAL_P(dim);
11361131
goto try_string_offset;
11371132
default:
1138-
zend_jit_illegal_container_offset("string", dim);
1133+
zend_illegal_container_offset("string", dim);
11391134
break;
11401135
}
11411136

0 commit comments

Comments
 (0)