[m-dev.] diff: update alias branch

[Simon Taylor]

Estimated hours taken: 2

Merge changes into the alias branch up to trunk_snapshot_20000114121859.

compiler/table_gen.m:
	Run recompute_instmap_delta after the transformation,
	because the instmap_deltas produced by the transformation
	for if-then-elses are incorrect -- they are computed as
	for a conjunction `(Cond, Then, Else)'.
	This causes tests/tabling/fib_string.m to fail.

Index: compiler/table_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/table_gen.m,v
retrieving revision 1.1.6.14
diff -u -u -r1.1.6.14 table_gen.m
--- table_gen.m	1999/12/22 02:38:12	1.1.6.14
+++ table_gen.m	2000/01/17 03:39:03
@@ -275,55 +274,59 @@
 	% and save in the module info
 	proc_info_set_goal(ProcInfo1, Goal, ProcInfo2),
 	proc_info_set_varset(ProcInfo2, VarSet, ProcInfo3),
-	proc_info_set_vartypes(ProcInfo3, VarTypes, ProcInfo),
+	proc_info_set_vartypes(ProcInfo3, VarTypes, ProcInfo4),
+
+	% Some of the instmap_deltas generated in this module
+	% are pretty dodgy (especially those for if-then-elses), so
+	% recompute them here.
+	recompute_instmap_delta_proc(ProcInfo4, ProcInfo, Module1, Module2),
 
 	pred_info_procedures(PredInfo1, ProcTable1),
 	map__det_update(ProcTable1, ProcId, ProcInfo, ProcTable),
 	pred_info_set_procedures(PredInfo1, ProcTable, PredInfo),
-	module_info_preds(Module1, PredTable1),
+	module_info_preds(Module2, PredTable1),
 	map__det_update(PredTable1, PredId, PredInfo, PredTable),
-	module_info_set_preds(Module1, PredTable, Module).
+	module_info_set_preds(Module2, PredTable, Module).
 

--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------