Merge pull request #1299 from Unity-Technologies/unity-master-precise-array-marking-stack-limit

joncham · web-flow · commit 4e508761449e · 2020-05-27T14:22:06.000-04:00
Avoid exceeding the mark stack limit (case 1235202)
diff --git a/external/bdwgc b/external/bdwgc
@@ -1 +1 @@
-Subproject commit 876a56777d9fb8ca559c8889c586cc88eb120d75
+Subproject commit 44c4c0a38e0d954e9653185fd4e76ceb71e95828
diff --git a/mono/metadata/boehm-gc.c b/mono/metadata/boehm-gc.c
@@ -160,7 +160,7 @@ static mse * GC_gcj_vector_proc (word * addr, mse * mark_stack_ptr,
 	/* end at last element or max chunk size */
 	word *actual_end = actual_start + length * words_per_element;
 
-	return GC_gcj_vector_mark_proc (mark_stack_ptr, element_desc, start, actual_end, words_per_element);
+	return GC_gcj_vector_mark_proc (mark_stack_ptr, mark_stack_limit, element_desc, start, actual_end, words_per_element);
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ static mse * GC_gcj_vector_proc (word * addr, mse * mark_stack_ptr,`
`160`	`160`	`/* end at last element or max chunk size */`
`161`	`161`	`word actual_end = actual_start + length words_per_element;`
`162`	`162`
`163`		`- return GC_gcj_vector_mark_proc (mark_stack_ptr, element_desc, start, actual_end, words_per_element);`
	`163`	`+ return GC_gcj_vector_mark_proc (mark_stack_ptr, mark_stack_limit, element_desc, start, actual_end, words_per_element);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`#endif`