JIT for PRE/POST_INC/DEC_OBJ

Author: dstogov

ext/opcache/jit/zend_jit.c

@@ -2457,6 +2457,49 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 							goto jit_failure;
 						}
 						goto done;
+					case ZEND_PRE_INC_OBJ:
+					case ZEND_PRE_DEC_OBJ:
+					case ZEND_POST_INC_OBJ:
+					case ZEND_POST_DEC_OBJ:
+						if (opline->op2_type != IS_CONST
+						 || Z_TYPE_P(RT_CONSTANT(opline, opline->op2)) != IS_STRING
+						 || Z_STRVAL_P(RT_CONSTANT(opline, opline->op2))[0] == '\0') {
+							break;
+						}
+						if (PROFITABILITY_CHECKS && (!ssa->ops || !ssa->var_info)) {
+							break;
+						}
+						ce = NULL;
+						ce_is_instanceof = 0;
+						if (opline->op1_type == IS_UNUSED) {
+							op1_info = MAY_BE_OBJECT|MAY_BE_RC1|MAY_BE_RCN;
+							ce = op_array->scope;
+							ce_is_instanceof = (ce->ce_flags & ZEND_ACC_FINAL) != 0;
+							op1_addr = 0;
+						} else {
+							op1_info = OP1_INFO();
+							if (!(op1_info & MAY_BE_OBJECT)) {
+								break;
+							}
+							op1_addr = OP1_REG_ADDR();
+							if (ssa->var_info && ssa->ops) {
+								zend_ssa_op *ssa_op = &ssa->ops[opline - op_array->opcodes];
+								if (ssa_op->op1_use >= 0) {
+									zend_ssa_var_info *op1_ssa = ssa->var_info + ssa_op->op1_use;
+									if (op1_ssa->ce && !op1_ssa->ce->create_object) {
+										ce = op1_ssa->ce;
+										ce_is_instanceof = op1_ssa->is_instanceof;
+									}
+								}
+							}
+						}
+						if (!zend_jit_incdec_obj(&dasm_state, opline, op_array, ssa, ssa_op,
+								op1_info, op1_addr,
+								0, ce, ce_is_instanceof, 0, NULL,
+								zend_may_throw(opline, ssa_op, op_array, ssa))) {
+							goto jit_failure;
+						}
+						goto done;
 					case ZEND_ASSIGN_OBJ_OP:
 						if (opline->extended_value == ZEND_POW
 						 || opline->extended_value == ZEND_DIV) {

ext/opcache/jit/zend_jit_disasm_x86.c

@@ -456,6 +456,7 @@ static int zend_jit_disasm_init(void)
 	REGISTER_HELPER(zend_jit_invalid_array_access);
 	REGISTER_HELPER(zend_jit_invalid_property_read);
 	REGISTER_HELPER(zend_jit_invalid_property_write);
+	REGISTER_HELPER(zend_jit_invalid_property_incdec);
 	REGISTER_HELPER(zend_jit_invalid_property_assign);
 	REGISTER_HELPER(zend_jit_invalid_property_assign_op);
 	REGISTER_HELPER(zend_jit_prepare_assign_dim_ref);
@@ -472,6 +473,16 @@ static int zend_jit_disasm_init(void)
 	REGISTER_HELPER(zend_jit_assign_obj_op_helper);
 	REGISTER_HELPER(zend_jit_assign_to_typed_prop);
 	REGISTER_HELPER(zend_jit_assign_op_to_typed_prop);
+	REGISTER_HELPER(zend_jit_inc_typed_prop);
+	REGISTER_HELPER(zend_jit_dec_typed_prop);
+	REGISTER_HELPER(zend_jit_pre_inc_typed_prop);
+	REGISTER_HELPER(zend_jit_pre_dec_typed_prop);
+	REGISTER_HELPER(zend_jit_post_inc_typed_prop);
+	REGISTER_HELPER(zend_jit_post_dec_typed_prop);
+	REGISTER_HELPER(zend_jit_pre_inc_obj_helper);
+	REGISTER_HELPER(zend_jit_pre_dec_obj_helper);
+	REGISTER_HELPER(zend_jit_post_inc_obj_helper);
+	REGISTER_HELPER(zend_jit_post_dec_obj_helper);
 #undef  REGISTER_HELPER
 
 #ifndef _WIN32