Skip to content

Commit 3345865

Browse files
authored
[mono][sgen] Add option to disable tarjan gc bridge optimization (#121243)
This option is also currently causing crashes in the gc bridge.
1 parent 6d0ac32 commit 3345865

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/mono/mono/metadata/sgen-bridge.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,8 @@ sgen_bridge_handle_gc_param (const char *opt)
713713

714714
if (!strcmp (opt, "bridge-require-precise-merge")) {
715715
bridge_processor_config.scc_precise_merge = TRUE;
716+
} else if (!strcmp (opt, "disable-non-bridge-scc")) {
717+
bridge_processor_config.disable_non_bridge_scc = TRUE;
716718
} else {
717719
return FALSE;
718720
}

src/mono/mono/metadata/sgen-tarjan-bridge.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,9 +944,9 @@ dump_color_table (const char *why, gboolean do_index)
944944
int i = 0, j;
945945
printf ("colors%s:\n", why);
946946

947-
for (cur = root_color_bucket; cur; cur = cur->next, ++i) {
947+
for (cur = root_color_bucket; cur; cur = cur->next) {
948948
ColorData *cd;
949-
for (cd = &cur->data [0]; cd < cur->next_data; ++cd) {
949+
for (cd = &cur->data [0]; cd < cur->next_data; ++cd, ++i) {
950950
if (do_index)
951951
printf ("\t%d(%d):", i, cd->api_index);
952952
else

0 commit comments

Comments
 (0)