[m-rev.] diff: major improvements to tabling (part 2 of 2)

[Julien Fischer]

On Tue, 20 Jul 2004, Zoltan Somogyi wrote:

> Index: runtime/mercury_context.c
> ===================================================================
> RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_context.c,v
> retrieving revision 1.37
> diff -u -b -r1.37 mercury_context.c
> --- runtime/mercury_context.c	7 Jul 2004 07:11:09 -0000	1.37
> +++ runtime/mercury_context.c	18 Jul 2004 11:42:54 -0000
> @@ -26,6 +26,9 @@
>  #include "mercury_engine.h"		/* for `MR_memdebug' */
>  #include "mercury_reg_workarounds.h"	/* for `MR_fd*' stuff */
>
> +static	void	MR_init_context_maybe_generator(MR_Context *c,
> +			MR_Generator *gen);
> +
>  MR_Context	*MR_runqueue_head;
>  MR_Context	*MR_runqueue_tail;
...
> @@ -170,11 +196,19 @@
>  	c->MR_ctxt_ticket_high_water = 1;
>  #endif
>
> +#ifndef	MR_CONSERVATIVE_GC
> +	if (is_generator) {
> +		MR_fatal_error("MR_init_context_maybe_generator: "
> +			"generator and no conservative gc");
> +	}
> +
>  	c->MR_ctxt_hp = NULL;
> +	c->MR_ctxt_min_hp_rec = NULL;
> +#endif
>  }
>
This change has killed compilation of the runtime in grades that don't use
conservative garbage collection.  is_generator doesn't seem to
be declared anywhere.

../scripts/mgnuc --grade hlc.agc      --no-mercury-stdlib-dir --c-debug --no-ansi   --  -I../boehm_gc -I../boehm_gc/include -I../mps_gc/code  -DMERCURY_BOOTSTRAP_H -DMERCURY_CONF_BOOTSTRAP_H     -c mercury_context.c -o mercury_context.o
mercury_context.c: In function `MR_init_context':
mercury_context.c:200: `is_generator' undeclared (first use in this function)
mercury_context.c:200: (Each undeclared identifier is reported only once
mercury_context.c:200: for each function it appears in.)
gmake[1]: *** [mercury_context.o] Error 1
gmake[1]: Leaving directory `/home/earth/juliensf/ws35/runtime'
Cleaning up from apparent failed install in `./trace'...

Julien.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------