[m-rev.] trivial diff: fix compilation of library in nogc grades

Julien Fischer juliensf at cs.mu.OZ.AU
Tue Sep 20 13:46:09 AEST 2005


Estimated hours taken: 0.1
Branches: main

library/exception.m:
	Update the field names in the zone structure.
	(This was breaking compilation of the library in nogc grades).

Index: exception.m
===================================================================
RCS file: /home/mercury1/repository/mercury/library/exception.m,v
retrieving revision 1.99
diff -u -r1.99 exception.m
--- exception.m	13 Sep 2005 08:25:35 -0000	1.99
+++ exception.m	20 Sep 2005 03:42:00 -0000
@@ -2334,12 +2334,12 @@
 	** is transient, before/after calling MR_deep_copy().
 	*/
 	assert(MR_EXCEPTION_STRUCT->MR_excp_heap_ptr <=
-		MR_EXCEPTION_STRUCT->MR_excp_heap_zone->top);
+		MR_EXCEPTION_STRUCT->MR_excp_heap_zone->MR_zone_top);
 	MR_save_transient_registers();
 	exception = MR_deep_copy(exception,
 		(MR_TypeInfo) &mercury_data_std_util__type_ctor_info_univ_0,
 		MR_EXCEPTION_STRUCT->MR_excp_heap_ptr,
-		MR_EXCEPTION_STRUCT->MR_excp_heap_zone->top);
+		MR_EXCEPTION_STRUCT->MR_excp_heap_zone->MR_zone_top);
 	MR_restore_transient_registers();

 	/* switch back to the ordinary heap */
@@ -2351,12 +2351,12 @@

 	/* MR_deep_copy the exception back to the ordinary heap */
 	assert(MR_EXCEPTION_STRUCT->MR_excp_solns_heap_ptr <=
-		MR_ENGINE(MR_eng_solutions_heap_zone)->top);
+		MR_ENGINE(MR_eng_solutions_heap_zone)->MR_zone_top);
 	MR_save_transient_registers();
 	exception = MR_deep_copy(exception,
 		(MR_TypeInfo) &mercury_data_std_util__type_ctor_info_univ_0,
 		saved_solns_heap_ptr,
-		MR_ENGINE(MR_eng_solutions_heap_zone)->top);
+		MR_ENGINE(MR_eng_solutions_heap_zone)->MR_zone_top);
 	MR_restore_transient_registers();

 	/* reset the solutions heap */

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list