From 3f06655fa82deb213082d2c2c7c87e797cd67370 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 12 Jul 2017 02:04:30 +0300 Subject: [PATCH] Fix push_complex_descriptor to avoid unlimited global mark stack growth Global mark stack should not grow in parallel marker mode (as fixed-size local_mark_stack is used instead). * typd_mlc.c [PARALLEL_MARK] (GC_array_mark_proc): Do not set GC_mark_stack_too_small if GC_parallel (and new_mark_stack_ptr is null); add comment. --- typd_mlc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/typd_mlc.c b/typd_mlc.c index ecee04f..5e36d7f 100644 --- a/typd_mlc.c +++ b/typd_mlc.c @@ -503,7 +503,13 @@ STATIC mse * GC_array_mark_proc(word * addr, mse * mark_stack_ptr, /* and request a mark stack expansion. */ /* This cannot cause a mark stack overflow, since it replaces */ /* the original array entry. */ - GC_mark_stack_too_small = TRUE; +# ifdef PARALLEL_MARK + /* We are using a local_mark_stack in parallel mode. */ + if (!GC_parallel) +# endif + { + GC_mark_stack_too_small = TRUE; + } new_mark_stack_ptr = orig_mark_stack_ptr + 1; new_mark_stack_ptr -> mse_start = (ptr_t)addr; new_mark_stack_ptr -> mse_descr.w = sz | GC_DS_LENGTH; -- 2.7.4