Skip to content

[interp] Don't cprop between vt vars of different sizes #54734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2021
Merged

[interp] Don't cprop between vt vars of different sizes #54734

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8508,17 +8508,30 @@ interp_cprop (TransformData *td)
} else if (opcode == MINT_LDOBJ_VT) {
InterpInst *ldloca = local_defs [sregs [0]].ins;
if (ldloca != NULL && ldloca->opcode == MINT_LDLOCA_S) {
int ldsize = ins->data [0];
int local = ldloca->sregs [0];
// Replace LDLOCA + LDOBJ_VT with MOV_VT
ins->opcode = MINT_MOV_VT;
local_ref_count [sregs [0]]--;
sregs [0] = local;

if (ldsize == td->locals [local].size) {
// Replace LDLOCA + LDOBJ_VT with MOV_VT
ins->opcode = MINT_MOV_VT;
sregs [0] = local;
needs_retry = TRUE;
} else {
// This loads just a part of the local valuetype
ins = interp_insert_ins (td, ins, MINT_MOV_OFF);
interp_ins_set_dreg (ins, ins->prev->dreg);
interp_ins_set_sreg (ins, local);
ins->data [0] = 0;
ins->data [1] = MINT_TYPE_VT;
ins->data [2] = ldsize;

interp_clear_ins (ins->prev);
}
if (td->verbose_level) {
g_print ("Replace ldloca/ldobj_vt pair :\n\t");
dump_interp_inst (ins);
}
needs_retry = TRUE;
}
} else if (MINT_IS_STFLD (opcode) && ins->data [0] == 0) {
InterpInst *ldloca = local_defs [sregs [0]].ins;
Expand Down