diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 1e3d9984832d..3159bfaa59ca 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -8440,9 +8440,8 @@ ZEND_VM_HANDLER(142, ZEND_DECLARE_LAMBDA_FUNCTION, UNUSED, NUM, NUM|CACHE_SLOT) } func = (zend_function *) EX(func)->op_array.dynamic_func_defs[opline->op2.num]; - if (Z_TYPE(EX(This)) == IS_OBJECT - && EXPECTED(!(func->common.fn_flags & ZEND_ACC_STATIC)) - && EXPECTED(!(EX(func)->common.fn_flags & ZEND_ACC_STATIC))) { + if (Z_TYPE(EX(This)) == IS_OBJECT && !(func->common.fn_flags & ZEND_ACC_STATIC)) { + ZEND_ASSERT(!(EX(func)->common.fn_flags & ZEND_ACC_STATIC)); object = Z_OBJ(EX(This)); } else { object = NULL; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index b1d7d3d80823..e814db080bff 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -32947,9 +32947,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_FUNC_CCONV ZEND_DECLARE_LAMBD } func = (zend_function *) EX(func)->op_array.dynamic_func_defs[opline->op2.num]; - if (Z_TYPE(EX(This)) == IS_OBJECT - && EXPECTED(!(func->common.fn_flags & ZEND_ACC_STATIC)) - && EXPECTED(!(EX(func)->common.fn_flags & ZEND_ACC_STATIC))) { + if (Z_TYPE(EX(This)) == IS_OBJECT && !(func->common.fn_flags & ZEND_ACC_STATIC)) { + ZEND_ASSERT(!(EX(func)->common.fn_flags & ZEND_ACC_STATIC)); object = Z_OBJ(EX(This)); } else { object = NULL; @@ -85619,9 +85618,8 @@ static ZEND_OPCODE_HANDLER_RET ZEND_OPCODE_HANDLER_CCONV ZEND_DECLARE_LAMBDA_FUN } func = (zend_function *) EX(func)->op_array.dynamic_func_defs[opline->op2.num]; - if (Z_TYPE(EX(This)) == IS_OBJECT - && EXPECTED(!(func->common.fn_flags & ZEND_ACC_STATIC)) - && EXPECTED(!(EX(func)->common.fn_flags & ZEND_ACC_STATIC))) { + if (Z_TYPE(EX(This)) == IS_OBJECT && !(func->common.fn_flags & ZEND_ACC_STATIC)) { + ZEND_ASSERT(!(EX(func)->common.fn_flags & ZEND_ACC_STATIC)); object = Z_OBJ(EX(This)); } else { object = NULL;