Attempt to optimize typed property assign

Author: ndossche

Zend/Optimizer/dfa_pass.c

@@ -1700,6 +1700,35 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 		}
 	}
 
+	for (uint32_t i = 0; i < op_array->last; i++) {
+		zend_op *opline = &op_array->opcodes[i];
+		if (opline->opcode == ZEND_ASSIGN_OBJ && opline->op2_type == IS_CONST) {
+			const zend_property_info *zend_fetch_prop_info(const zend_op_array *op_array, zend_ssa *ssa, const zend_op *opline, const zend_ssa_op *ssa_op);
+
+			zend_ssa_op *ssa_op = &ssa->ops[i];
+
+			//if (opline->op1_type != IS_UNUSED && (ssa->var_info[ssa_op->op1_use].type & (MAY_BE_ANY | MAY_BE_REF)) != MAY_BE_OBJECT) {
+			//	continue;
+			//}
+
+			uint32_t value_type_mask = ssa->var_info[(ssa_op + 1)->op1_use].type;
+			value_type_mask &= MAY_BE_ANY | MAY_BE_REF;
+			//fprintf(stderr, "found assign obj (type %x)\n", value_type_mask);
+			const zend_property_info *prop_info = zend_fetch_prop_info(op_array, ssa, opline, ssa_op);
+			if (prop_info
+			 && ZEND_TYPE_IS_ONLY_MASK(prop_info->type)
+			 && IS_VALID_PROPERTY_OFFSET(prop_info->offset)
+			 && !(prop_info->flags & ZEND_ACC_READONLY /* TODO: other flags? */)
+			 && ZEND_TYPE_PURE_MASK(prop_info->type) == value_type_mask
+			 && ((value_type_mask - 1) & value_type_mask) == 0) {
+				if (ZEND_TYPE_PURE_MASK(prop_info->type) == value_type_mask && ((value_type_mask-1)&value_type_mask)==0) {
+					// TODO: __set & friends
+					opline->extended_value |= 1;
+				}
+			}
+		}
+	}
+
 	if (ctx->debug_level & ZEND_DUMP_AFTER_DFA_PASS) {
 		zend_dump_op_array(op_array, ZEND_DUMP_SSA, "after dfa pass", ssa);
 	}

Zend/Optimizer/zend_inference.c

@@ -2426,7 +2426,7 @@ static const zend_property_info *lookup_prop_info(const zend_class_entry *ce, ze
 	return NULL;
 }
 
-static const zend_property_info *zend_fetch_prop_info(const zend_op_array *op_array, zend_ssa *ssa, const zend_op *opline, const zend_ssa_op *ssa_op)
+const zend_property_info *zend_fetch_prop_info(const zend_op_array *op_array, zend_ssa *ssa, const zend_op *opline, const zend_ssa_op *ssa_op)
 {
 	const zend_property_info *prop_info = NULL;
 	if (opline->op2_type == IS_CONST) {

Zend/zend_vm_def.h

@@ -2515,6 +2515,67 @@ ZEND_VM_C_LABEL(exit_assign_obj):
 	ZEND_VM_NEXT_OPCODE_EX(1, 2);
 }
 
+ZEND_VM_TYPE_SPEC_HANDLER(ZEND_ASSIGN_OBJ, (op->extended_value & 1) != 0, ZEND_ASSIGN_OBJ_CORRECTLY_TYPED, UNUSED|VAR|THIS|CV, CONST, CACHE_SLOT, SPEC(OP_DATA=CONST|TMP|VAR|CV))
+{
+	USE_OPLINE
+	zval *object, *value;
+	zend_object *zobj;
+	zend_string *name;
+	zend_refcounted *garbage = NULL;
+
+	SAVE_OPLINE();
+	object = GET_OP1_OBJ_ZVAL_PTR_PTR_UNDEF(BP_VAR_W);
+	value = GET_OP_DATA_ZVAL_PTR(BP_VAR_R);
+
+	// TODO: get rid of this?
+	if (OP1_TYPE != IS_UNUSED && UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
+		if (Z_ISREF_P(object) && Z_TYPE_P(Z_REFVAL_P(object)) == IS_OBJECT) {
+			object = Z_REFVAL_P(object);
+			ZEND_VM_C_GOTO(assign_object);
+		}
+		zend_throw_non_object_error(object, GET_OP2_ZVAL_PTR(BP_VAR_R) OPLINE_CC EXECUTE_DATA_CC);
+		value = &EG(uninitialized_zval);
+		ZEND_VM_C_GOTO(free_and_exit_assign_obj);
+	}
+
+ZEND_VM_C_LABEL(assign_object):
+	zobj = Z_OBJ_P(object);
+	if (EXPECTED(zobj->ce == CACHED_PTR(opline->extended_value & ~1))) {
+		void **cache_slot = CACHE_ADDR(opline->extended_value & ~1);
+		uintptr_t prop_offset = (uintptr_t)CACHED_PTR_EX(cache_slot + 1);
+		zval *property_val = OBJ_PROP(zobj, prop_offset);
+
+		ZEND_ASSERT(IS_VALID_PROPERTY_OFFSET(prop_offset));
+
+		if (Z_TYPE_P(property_val) != IS_UNDEF) {
+			value = zend_assign_to_variable_ex(property_val, value, OP_DATA_TYPE, EX_USES_STRICT_TYPES(), &garbage);
+			if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
+				ZVAL_COPY(EX_VAR(opline->result.var), value);
+			}
+			ZEND_VM_C_GOTO(exit_assign_obj);
+		}
+	}
+	name = Z_STR_P(GET_OP2_ZVAL_PTR(BP_VAR_R));
+
+	ZEND_ASSERT(!Z_ISREF_P(value));
+
+	value = zobj->handlers->write_property(zobj, name, value, (OP2_TYPE == IS_CONST) ? CACHE_ADDR(opline->extended_value & ~1) : NULL);
+
+ZEND_VM_C_LABEL(free_and_exit_assign_obj):
+	if (UNEXPECTED(RETURN_VALUE_USED(opline)) && value) {
+		ZVAL_COPY_DEREF(EX_VAR(opline->result.var), value);
+	}
+	FREE_OP_DATA();
+ZEND_VM_C_LABEL(exit_assign_obj):
+	if (garbage) {
+		GC_DTOR_NO_REF(garbage);
+	}
+	FREE_OP2();
+	FREE_OP1();
+	/* assign_obj has two opcodes! */
+	ZEND_VM_NEXT_OPCODE_EX(1, 2);
+}
+
 /* No specialization for op_types (CONST|TMPVAR|CV, UNUSED|CONST|VAR) */
 ZEND_VM_HANDLER(25, ZEND_ASSIGN_STATIC_PROP, ANY, ANY, CACHE_SLOT, SPEC(OP_DATA=CONST|TMP|VAR|CV))
 {