Make sure we update the original xconst if we mutate it

tannergooding · tannergooding · commit b35b1e362f39 · 2024-07-23T13:45:57.000-07:00
diff --git a/src/mono/mono/mini/simd-intrinsics.c b/src/mono/mono/mini/simd-intrinsics.c
@@ -1154,7 +1154,7 @@ emit_vector_insert_element (
 {
 	int op = type_to_insert_op (type);
 
-	if (is_zero_inited && is_zero_const (element)) {
+	if (((is_zero_inited) || (ins->opcode == OP_XZERO)) && is_zero_const (element)) {
 		// element already set to zero
 		return ins;
 	}
@@ -1228,6 +1228,7 @@ emit_vector_insert_element (
 				}
 			}
 			if (ins->opcode == OP_XCONST) {
+				memcpy (ins->inst_p0, cns_vec, 16);
 				return ins;
 			}
 			return emit_xconst_v128 (cfg, vklass, cns_vec);

Original file line number	Diff line number	Diff line change
`@@ -1154,7 +1154,7 @@ emit_vector_insert_element (`
`1154`	`1154`	`{`
`1155`	`1155`	`int op = type_to_insert_op (type);`
`1156`	`1156`
`1157`		`- if (is_zero_inited && is_zero_const (element)) {`
	`1157`	`+ if (((is_zero_inited) \|\| (ins->opcode == OP_XZERO)) && is_zero_const (element)) {`
`1158`	`1158`	`// element already set to zero`
`1159`	`1159`	`return ins;`
`1160`	`1160`	`}`
`@@ -1228,6 +1228,7 @@ emit_vector_insert_element (`
`1228`	`1228`	`}`
`1229`	`1229`	`}`
`1230`	`1230`	`if (ins->opcode == OP_XCONST) {`
	`1231`	`+ memcpy (ins->inst_p0, cns_vec, 16);`
`1231`	`1232`	`return ins;`
`1232`	`1233`	`}`
`1233`	`1234`	`return emit_xconst_v128 (cfg, vklass, cns_vec);`