[m-rev.] diff: fix IL back-end breakage

Fergus Henderson fjh at cs.mu.OZ.AU
Fri Jul 13 09:58:27 AEST 2001


Estimated hours taken: 5
Branches: main

compiler/ml_code_gen.m:
	Back out part of Tyson's earlier change (-r1.90) that was not
	documented in the log message, since it breaks the IL back-end;
	`cd library; mmc --grade ilc ops.m' fails.

Workspace: /home/mars/fjh/ws2/mercury
Index: compiler/ml_code_gen.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/ml_code_gen.m,v
retrieving revision 1.92
diff -u -d -r1.92 ml_code_gen.m
--- compiler/ml_code_gen.m	2001/07/12 15:44:50	1.92
+++ compiler/ml_code_gen.m	2001/07/12 22:56:37
@@ -1612,7 +1612,7 @@
 				atomic(new_object(CommitRefLval, no,
 					mlds__commit_type, no, no, [], [])),
 					MLDS_Context),
-			DoCommitBody = ml_gen_block([CommitRefDecl], 
+			DoCommitBody = ml_gen_block([], 
 				[NewCommitObject,
 				DoCommitStatement],
 				Context)
@@ -1644,13 +1644,8 @@
 				[SetSuccessTrue]), Context)) },
 		{ TryCommitStatement = mlds__statement(TryCommitStmt,
 			MLDS_Context) },
-		{ Target = il ->
-			CommitFuncLocalDecls = [SuccessFunc |
-				GoalStaticDecls]
-		;
-			CommitFuncLocalDecls = [CommitRefDecl, SuccessFunc |
-				GoalStaticDecls]
-		},
+		{ CommitFuncLocalDecls = [CommitRefDecl, SuccessFunc |
+			GoalStaticDecls] },
 		maybe_put_commit_in_own_func(CommitFuncLocalDecls,
 			[TryCommitStatement], Context,
 			CommitFuncDecls, MLDS_Statements),

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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