diff options
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2889de55f2..717b670176 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -4635,7 +4635,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_CONST_CONST_HAND result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } @@ -4703,7 +4703,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_NOT_EQUAL_SPEC_CONST_CONST_ result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) != 0); } } else { - result = (zendi_smart_strcmp(op1, op2) != 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) != 0); } @@ -5805,7 +5805,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CONST_CONST_HANDLER( result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } } else { @@ -8572,7 +8572,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_CONST_CV_HANDLER result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } @@ -8640,7 +8640,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_NOT_EQUAL_SPEC_CONST_CV_HAN result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) != 0); } } else { - result = (zendi_smart_strcmp(op1, op2) != 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) != 0); } @@ -9567,7 +9567,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CONST_CV_HANDLER(ZEN result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } } else { @@ -10377,7 +10377,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_CONST_TMPVAR_HAN result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } zval_ptr_dtor_nogc(free_op2); @@ -10445,7 +10445,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_NOT_EQUAL_SPEC_CONST_TMPVAR result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) != 0); } } else { - result = (zendi_smart_strcmp(op1, op2) != 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) != 0); } zval_ptr_dtor_nogc(free_op2); @@ -11326,7 +11326,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CONST_TMPVAR_HANDLER result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } zval_ptr_dtor_nogc(free_op2); } else { @@ -29972,7 +29972,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_CV_CONST_HANDLER result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } @@ -30040,7 +30040,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_NOT_EQUAL_SPEC_CV_CONST_HAN result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) != 0); } } else { - result = (zendi_smart_strcmp(op1, op2) != 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) != 0); } @@ -31820,7 +31820,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_CONST_HANDLER(ZEN result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } } else { @@ -35168,7 +35168,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_CV_CV_HANDLER(ZE result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } @@ -35236,7 +35236,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_NOT_EQUAL_SPEC_CV_CV_HANDLE result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) != 0); } } else { - result = (zendi_smart_strcmp(op1, op2) != 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) != 0); } @@ -36849,7 +36849,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_CV_HANDLER(ZEND_O result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } } else { @@ -37805,7 +37805,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_CV_TMPVAR_HANDLE result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } zval_ptr_dtor_nogc(free_op2); @@ -37873,7 +37873,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_NOT_EQUAL_SPEC_CV_TMPVAR_HA result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) != 0); } } else { - result = (zendi_smart_strcmp(op1, op2) != 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) != 0); } zval_ptr_dtor_nogc(free_op2); @@ -39407,7 +39407,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_CV_TMPVAR_HANDLER(ZE result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } zval_ptr_dtor_nogc(free_op2); } else { @@ -40811,7 +40811,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_TMPVAR_CONST_HAN result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } zval_ptr_dtor_nogc(free_op1); @@ -40879,7 +40879,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_NOT_EQUAL_SPEC_TMPVAR_CONST result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) != 0); } } else { - result = (zendi_smart_strcmp(op1, op2) != 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) != 0); } zval_ptr_dtor_nogc(free_op1); @@ -41635,7 +41635,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_CONST_HANDLER result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } } else { @@ -43151,7 +43151,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_TMPVAR_CV_HANDLE result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } zval_ptr_dtor_nogc(free_op1); @@ -43219,7 +43219,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_NOT_EQUAL_SPEC_TMPVAR_CV_HA result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) != 0); } } else { - result = (zendi_smart_strcmp(op1, op2) != 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) != 0); } zval_ptr_dtor_nogc(free_op1); @@ -43749,7 +43749,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_CV_HANDLER(ZE result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } } else { @@ -44288,7 +44288,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_EQUAL_SPEC_TMPVAR_TMPVAR_HA result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } zval_ptr_dtor_nogc(free_op1); zval_ptr_dtor_nogc(free_op2); @@ -44356,7 +44356,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_IS_NOT_EQUAL_SPEC_TMPVAR_TMPVA result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) != 0); } } else { - result = (zendi_smart_strcmp(op1, op2) != 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) != 0); } zval_ptr_dtor_nogc(free_op1); zval_ptr_dtor_nogc(free_op2); @@ -44888,7 +44888,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CASE_SPEC_TMPVAR_TMPVAR_HANDLE result = (memcmp(Z_STRVAL_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op1)) == 0); } } else { - result = (zendi_smart_strcmp(op1, op2) == 0); + result = (zendi_smart_strcmp(Z_STR_P(op1), Z_STR_P(op2)) == 0); } zval_ptr_dtor_nogc(free_op2); } else { |