From 4f9c29f9ddea4297d3b2dab5c84d9a802d9f094d Mon Sep 17 00:00:00 2001 From: Vlad Brezae Date: Wed, 18 Sep 2024 14:49:26 +0300 Subject: [PATCH] [mono][interp] Remove mono_basic_block_split --- src/mono/mono/mini/interp/transform.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/mono/mono/mini/interp/transform.c b/src/mono/mono/mini/interp/transform.c index 22c5518a82c04..51f8ecf63cabc 100644 --- a/src/mono/mono/mini/interp/transform.c +++ b/src/mono/mono/mini/interp/transform.c @@ -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; @@ -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; @@ -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++) { @@ -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) @@ -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;