Skip to content
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

Jump to bottom

[mono][interp] Remove mono_basic_block_split #107980

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −10
Draft

[mono][interp] Remove mono_basic_block_split #107980

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
11 changes: 1 addition & 10 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 @@ -5168,7 +5168,6 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
guint32 token;
int in_offset;
const unsigned char *end;
MonoSimpleBasicBlock *bb = NULL, *original_bb = NULL;
gboolean sym_seq_points = FALSE;
MonoBitSet *seq_point_locs = NULL;
MonoBitSet *il_targets = NULL;
Expand All @@ -5195,10 +5194,6 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
gboolean generate_enc_seq_points_without_debug_info = FALSE;
InterpBasicBlock *exit_bb = NULL;

original_bb = bb = mono_basic_block_split (method, error, header);
goto_if_nok (error, exit);
g_assert (bb);

td->il_code = header->code;
td->in_start = td->ip = header->code;
end = td->ip + header->code_size;
Expand Down Expand Up @@ -5445,9 +5440,6 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
td->offset_to_bb [in_offset] = td->cbb;
td->in_start = td->ip;

if (in_offset == bb->end)
bb = bb->next;

/* Checks that a jump target isn't in the middle of opcode offset */
int op_size = mono_opcode_size (td->ip, end);
for (int i = 1; i < op_size; i++) {
Expand All @@ -5456,7 +5448,7 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
goto exit;
}
}
if (bb->dead || td->cbb->dead) {
if (td->cbb->dead) {
g_assert (op_size > 0); /* The BB formation pass must catch all bad ops */

if (td->verbose_level > 1)
Expand Down Expand Up @@ -8683,7 +8675,6 @@ generate_code (TransformData *td, MonoMethod *method, MonoMethodHeader *header,
g_free (arg_locals);
g_free (local_locals);
mono_bitset_free (il_targets);
mono_basic_block_free (original_bb);
td->dont_inline = g_list_remove (td->dont_inline, method);

return ret;
Expand Down
Loading