summaryrefslogtreecommitdiff
path: root/Zend/zend_vm_execute.h
diff options
context:
space:
mode:
Diffstat (limited to 'Zend/zend_vm_execute.h')
-rw-r--r--Zend/zend_vm_execute.h166
1 files changed, 83 insertions, 83 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 180bcd18c3..7c9d9b7b4e 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -4580,7 +4580,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CONST_CONST_HANDLE
}
}
if (IS_CONST != IS_CONST && IS_CONST != IS_CV &&
- !IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
+ !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
size_t len = op1_str->len;
str = zend_string_realloc(op1_str, len + op2_str->len, 0);
@@ -6091,7 +6091,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -6104,7 +6104,7 @@ num_index:
goto num_index;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -6384,7 +6384,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -6397,7 +6397,7 @@ num_index_prop:
goto num_index_prop;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -7940,7 +7940,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -7953,7 +7953,7 @@ num_index:
goto num_index;
} else if (IS_UNUSED == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -8603,7 +8603,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CONST_CV_HANDLER(Z
}
}
if (IS_CONST != IS_CONST && IS_CONST != IS_CV &&
- !IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
+ !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
size_t len = op1_str->len;
str = zend_string_realloc(op1_str, len + op2_str->len, 0);
@@ -9824,7 +9824,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -9837,7 +9837,7 @@ num_index:
goto num_index;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -9930,7 +9930,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -9943,7 +9943,7 @@ num_index_prop:
goto num_index_prop;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -10478,7 +10478,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CONST_TMPVAR_HANDL
}
}
if (IS_CONST != IS_CONST && IS_CONST != IS_CV &&
- !IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
+ !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
size_t len = op1_str->len;
str = zend_string_realloc(op1_str, len + op2_str->len, 0);
@@ -11610,7 +11610,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -11623,7 +11623,7 @@ num_index:
goto num_index;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -11716,7 +11716,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -11729,7 +11729,7 @@ num_index_prop:
goto num_index_prop;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -13087,7 +13087,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -13100,7 +13100,7 @@ num_index:
goto num_index;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -13817,7 +13817,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -13830,7 +13830,7 @@ num_index:
goto num_index;
} else if (IS_UNUSED == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -14371,7 +14371,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -14384,7 +14384,7 @@ num_index:
goto num_index;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -14884,7 +14884,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -14897,7 +14897,7 @@ num_index:
goto num_index;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -17980,7 +17980,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -17993,7 +17993,7 @@ num_index:
goto num_index;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -18093,7 +18093,7 @@ num_index_dim:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_dim;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -18106,7 +18106,7 @@ num_index_dim:
goto num_index_dim;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else {
zend_error(E_WARNING, "Illegal offset type in unset");
@@ -19560,7 +19560,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -19573,7 +19573,7 @@ num_index:
goto num_index;
} else if (IS_UNUSED == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -21133,7 +21133,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -21146,7 +21146,7 @@ num_index:
goto num_index;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -21246,7 +21246,7 @@ num_index_dim:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_dim;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -21259,7 +21259,7 @@ num_index_dim:
goto num_index_dim;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else {
zend_error(E_WARNING, "Illegal offset type in unset");
@@ -22710,7 +22710,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -22723,7 +22723,7 @@ num_index:
goto num_index;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -22823,7 +22823,7 @@ num_index_dim:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_dim;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -22836,7 +22836,7 @@ num_index_dim:
goto num_index_dim;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else {
zend_error(E_WARNING, "Illegal offset type in unset");
@@ -24212,7 +24212,7 @@ num_index_dim:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_dim;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -24225,7 +24225,7 @@ num_index_dim:
goto num_index_dim;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else {
zend_error(E_WARNING, "Illegal offset type in unset");
@@ -24348,7 +24348,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -24361,7 +24361,7 @@ num_index_prop:
goto num_index_prop;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -26493,7 +26493,7 @@ num_index_dim:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_dim;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -26506,7 +26506,7 @@ num_index_dim:
goto num_index_dim;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else {
zend_error(E_WARNING, "Illegal offset type in unset");
@@ -26629,7 +26629,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -26642,7 +26642,7 @@ num_index_prop:
goto num_index_prop;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -27985,7 +27985,7 @@ num_index_dim:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_dim;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -27998,7 +27998,7 @@ num_index_dim:
goto num_index_dim;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else {
zend_error(E_WARNING, "Illegal offset type in unset");
@@ -28123,7 +28123,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -28136,7 +28136,7 @@ num_index_prop:
goto num_index_prop;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -30276,7 +30276,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_CONST_HANDLER(Z
}
}
if (IS_CV != IS_CONST && IS_CV != IS_CV &&
- !IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
+ !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
size_t len = op1_str->len;
str = zend_string_realloc(op1_str, len + op2_str->len, 0);
@@ -32377,7 +32377,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -32390,7 +32390,7 @@ num_index:
goto num_index;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -32572,7 +32572,7 @@ num_index_dim:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_dim;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -32585,7 +32585,7 @@ num_index_dim:
goto num_index_dim;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else {
zend_error(E_WARNING, "Illegal offset type in unset");
@@ -32813,7 +32813,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -32826,7 +32826,7 @@ num_index_prop:
goto num_index_prop;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -34944,7 +34944,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -34957,7 +34957,7 @@ num_index:
goto num_index;
} else if (IS_UNUSED == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -35584,7 +35584,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_CV_HANDLER(ZEND
}
}
if (IS_CV != IS_CONST && IS_CV != IS_CV &&
- !IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
+ !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
size_t len = op1_str->len;
str = zend_string_realloc(op1_str, len + op2_str->len, 0);
@@ -37513,7 +37513,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -37526,7 +37526,7 @@ num_index:
goto num_index;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -37626,7 +37626,7 @@ num_index_dim:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_dim;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -37639,7 +37639,7 @@ num_index_dim:
goto num_index_dim;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else {
zend_error(E_WARNING, "Illegal offset type in unset");
@@ -37762,7 +37762,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -37775,7 +37775,7 @@ num_index_prop:
goto num_index_prop;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -38315,7 +38315,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_TMPVAR_HANDLER(
}
}
if (IS_CV != IS_CONST && IS_CV != IS_CV &&
- !IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
+ !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
size_t len = op1_str->len;
str = zend_string_realloc(op1_str, len + op2_str->len, 0);
@@ -40120,7 +40120,7 @@ num_index:
offset = Z_REFVAL_P(offset);
goto add_again;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else if (Z_TYPE_P(offset) == IS_DOUBLE) {
hval = zend_dval_to_lval(Z_DVAL_P(offset));
@@ -40133,7 +40133,7 @@ num_index:
goto num_index;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index;
} else {
zend_error(E_WARNING, "Illegal offset type");
@@ -40233,7 +40233,7 @@ num_index_dim:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_dim;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -40246,7 +40246,7 @@ num_index_dim:
goto num_index_dim;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- key = STR_EMPTY_ALLOC();
+ key = ZSTR_EMPTY_ALLOC();
goto str_index_dim;
} else {
zend_error(E_WARNING, "Illegal offset type in unset");
@@ -40371,7 +40371,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -40384,7 +40384,7 @@ num_index_prop:
goto num_index_prop;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -41388,7 +41388,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_TMPVAR_CONST_HANDL
}
}
if ((IS_TMP_VAR|IS_VAR) != IS_CONST && (IS_TMP_VAR|IS_VAR) != IS_CV &&
- !IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
+ !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
size_t len = op1_str->len;
str = zend_string_realloc(op1_str, len + op2_str->len, 0);
@@ -42565,7 +42565,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -42578,7 +42578,7 @@ num_index_prop:
goto num_index_prop;
} else if (IS_CONST == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -43818,7 +43818,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_TMPVAR_CV_HANDLER(
}
}
if ((IS_TMP_VAR|IS_VAR) != IS_CONST && (IS_TMP_VAR|IS_VAR) != IS_CV &&
- !IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
+ !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
size_t len = op1_str->len;
str = zend_string_realloc(op1_str, len + op2_str->len, 0);
@@ -44574,7 +44574,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -44587,7 +44587,7 @@ num_index_prop:
goto num_index_prop;
} else if (IS_CV == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
@@ -44981,7 +44981,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_TMPVAR_TMPVAR_HAND
}
}
if ((IS_TMP_VAR|IS_VAR) != IS_CONST && (IS_TMP_VAR|IS_VAR) != IS_CV &&
- !IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
+ !ZSTR_IS_INTERNED(op1_str) && GC_REFCOUNT(op1_str) == 1) {
size_t len = op1_str->len;
str = zend_string_realloc(op1_str, len + op2_str->len, 0);
@@ -45739,7 +45739,7 @@ num_index_prop:
hval = zend_dval_to_lval(Z_DVAL_P(offset));
goto num_index_prop;
} else if (Z_TYPE_P(offset) == IS_NULL) {
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else if (Z_TYPE_P(offset) == IS_FALSE) {
hval = 0;
@@ -45752,7 +45752,7 @@ num_index_prop:
goto num_index_prop;
} else if ((IS_TMP_VAR|IS_VAR) == IS_CV && Z_TYPE_P(offset) == IS_UNDEF) {
GET_OP2_UNDEF_CV(offset, BP_VAR_R);
- str = STR_EMPTY_ALLOC();
+ str = ZSTR_EMPTY_ALLOC();
goto str_index_prop;
} else {
zend_error(E_WARNING, "Illegal offset type in isset or empty");
View Lorry Controller Status