Attachment #189410 for bug #267453

View | Details | Raw Unified | Return to bug 267453
Collapse All | Expand All




#ifdef CAPTURE_JUST_VALID_VM_STACK
	    rb_gc_mark_locations(cont->vm_stack,
				 cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);
#else
	    rb_gc_mark_localtion(cont->vm_stack,
				 cont->vm_stack, cont->saved_thread.stack_size);
#endif

    cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);
    MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);
    MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen);
#else
    cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
    MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
#endif

	MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);
	MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen,
	       cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen);
#else
	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
#endif
    }

Return to bug 267453

Lines 87-93 Link Here

(-)cont.c (-3 / +3 lines)
87	#ifdef CAPTURE_JUST_VALID_VM_STACK	87	#ifdef CAPTURE_JUST_VALID_VM_STACK
88	rb_gc_mark_locations(cont->vm_stack,	88	rb_gc_mark_locations(cont->vm_stack,
89	cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);	89	cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);
90	#elif	90	#else
91	rb_gc_mark_localtion(cont->vm_stack,	91	rb_gc_mark_localtion(cont->vm_stack,
92	cont->vm_stack, cont->saved_thread.stack_size);	92	cont->vm_stack, cont->saved_thread.stack_size);
93	#endif	93	#endif
Lines 267-273 Link Here
267	cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);	267	cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);
268	MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);	268	MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);
269	MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen);	269	MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen);
270	#elif	270	#else
271	cont->vm_stack = ALLOC_N(VALUE, th->stack_size);	271	cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
272	MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);	272	MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
273	#endif	273	#endif
Lines 314-320 Link Here
314	MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);	314	MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);
315	MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen,	315	MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen,
316	cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen);	316	cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen);
317	#elif	317	#else
318	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);	318	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
319	#endif	319	#endif
320	}	320	}