Factor out object cast

Author: ndossche

Zend/zend_ast.c

@@ -754,21 +754,8 @@ ZEND_API zend_result ZEND_FASTCALL zend_ast_evaluate_inner(
 						}
 						break;
 					case IS_OBJECT:
-						/* Adapted from VM */
-						ZVAL_OBJ(result, zend_objects_new(zend_standard_class_def));
-						if (Z_TYPE(op1) == IS_ARRAY) {
-							HashTable *ht = zend_symtable_to_proptable(Z_ARR(op1));
-							if (GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE) {
-								/* TODO: try not to duplicate immutable arrays as well ??? */
-								ht = zend_array_dup(ht);
-							}
-							Z_OBJ_P(result)->properties = ht;
-							zval_ptr_dtor_nogc(&op1);
-						} else if (Z_TYPE(op1) != IS_NULL) {
-							HashTable *ht = zend_new_array(1);
-							Z_OBJ_P(result)->properties = ht;
-							zend_hash_add_new(ht, ZSTR_KNOWN(ZEND_STR_SCALAR), &op1);
-						}
+						zend_cast_zval_to_object(result, &op1, IS_VAR);
+						Z_TRY_DELREF(op1);
 						break;
 					EMPTY_SWITCH_DEFAULT_CASE();
 				}

Zend/zend_execute.h

@@ -219,6 +219,28 @@ static zend_always_inline void zend_safe_assign_to_variable_noref(zval *variable
 	}
 }
 
+static zend_always_inline void zend_cast_zval_to_object(zval *result, zval *expr, uint8_t op1_type) {
+	HashTable *ht;
+
+	ZVAL_OBJ(result, zend_objects_new(zend_standard_class_def));
+	if (Z_TYPE_P(expr) == IS_ARRAY) {
+		ht = zend_symtable_to_proptable(Z_ARR_P(expr));
+		if (GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE) {
+			/* TODO: try not to duplicate immutable arrays as well ??? */
+			ht = zend_array_dup(ht);
+		}
+		Z_OBJ_P(result)->properties = ht;
+	} else if (Z_TYPE_P(expr) != IS_NULL) {
+		Z_OBJ_P(result)->properties = ht = zend_new_array(1);
+		expr = zend_hash_add_new(ht, ZSTR_KNOWN(ZEND_STR_SCALAR), expr);
+		if (op1_type == IS_CONST) {
+			if (UNEXPECTED(Z_OPT_REFCOUNTED_P(expr))) Z_ADDREF_P(expr);
+		} else {
+			if (Z_OPT_REFCOUNTED_P(expr)) Z_ADDREF_P(expr);
+		}
+	}
+}
+
 ZEND_API zend_result ZEND_FASTCALL zval_update_constant(zval *pp);
 ZEND_API zend_result ZEND_FASTCALL zval_update_constant_ex(zval *pp, zend_class_entry *scope);
 ZEND_API zend_result ZEND_FASTCALL zval_update_constant_with_ctx(zval *pp, zend_class_entry *scope, zend_ast_evaluate_ctx *ctx);

Zend/zend_vm_def.h

@@ -6460,7 +6460,6 @@ ZEND_VM_COLD_CONST_HANDLER(51, ZEND_CAST, CONST|TMP|VAR|CV, ANY, TYPE)
 	USE_OPLINE
 	zval *expr;
 	zval *result = EX_VAR(opline->result.var);
-	HashTable *ht;
 
 	SAVE_OPLINE();
 	expr = GET_OP1_ZVAL_PTR(BP_VAR_R);
@@ -6524,23 +6523,7 @@ ZEND_VM_COLD_CONST_HANDLER(51, ZEND_CAST, CONST|TMP|VAR|CV, ANY, TYPE)
 				}
 			} else {
 				ZEND_ASSERT(opline->extended_value == IS_OBJECT);
-				ZVAL_OBJ(result, zend_objects_new(zend_standard_class_def));
-				if (Z_TYPE_P(expr) == IS_ARRAY) {
-					ht = zend_symtable_to_proptable(Z_ARR_P(expr));
-					if (GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE) {
-						/* TODO: try not to duplicate immutable arrays as well ??? */
-						ht = zend_array_dup(ht);
-					}
-					Z_OBJ_P(result)->properties = ht;
-				} else if (Z_TYPE_P(expr) != IS_NULL) {
-					Z_OBJ_P(result)->properties = ht = zend_new_array(1);
-					expr = zend_hash_add_new(ht, ZSTR_KNOWN(ZEND_STR_SCALAR), expr);
-					if (OP1_TYPE == IS_CONST) {
-						if (UNEXPECTED(Z_OPT_REFCOUNTED_P(expr))) Z_ADDREF_P(expr);
-					} else {
-						if (Z_OPT_REFCOUNTED_P(expr)) Z_ADDREF_P(expr);
-					}
-				}
+				zend_cast_zval_to_object(result, expr, OP1_TYPE);
 			}
 	}