[m-dev.] for review: GCC back-end: RTTI fixes

[Fergus Henderson]

Estimated hours taken: 1

compiler/mlds_to_gcc.m:
	Apply Zoltan's recent change to the MR_NoTagFunctorDesc type.
	Fix a cut-and-paste error in the definition of the
	MR_DuFunctorDesc type, where I had accidentally cut-and-paste
	some fields from the MR_NoTagFunctorDesc type.

Workspace: /home/hg/fjh/gcc-cvs/gcc/mercury
Index: compiler/mlds_to_gcc.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mlds_to_gcc.m,v
retrieving revision 1.17.2.1
diff -u -d -r1.17.2.1 mlds_to_gcc.m
--- compiler/mlds_to_gcc.m	2001/01/14 04:10:21	1.17.2.1
+++ compiler/mlds_to_gcc.m	2001/01/15 14:30:03
@@ -1912,13 +1912,12 @@
 	% typedef struct {
 	%     MR_ConstString      MR_notag_functor_name;
 	%     MR_PseudoTypeInfo   MR_notag_functor_arg_type;
-	% XXX need to add the following field when I do a cvs update:
-	% /***MR_ConstString      MR_notag_functor_arg_name;***/
+	%     MR_ConstString      MR_notag_functor_arg_name;
 	% } MR_NotagFunctorDesc;
 	build_struct_type("MR_NotagFunctorDesc",
 		['MR_ConstString'	- "MR_notag_functor_name",
-		 'MR_PseudoTypeInfo'	- "MR_notag_functor_arg_type"],
-		 %%% 'MR_ConstString'	- "MR_notag_functor_arg_name"],
+		 'MR_PseudoTypeInfo'	- "MR_notag_functor_arg_type",
+		 'MR_ConstString'	- "MR_notag_functor_arg_name"],
 		GCC_Type).
 build_rtti_type(du_functor_desc(_), _, GCC_Type) -->
 	% typedef struct {
@@ -1938,9 +1937,7 @@
 	gcc__build_pointer_type(MR_DuExistInfo, MR_DuExistInfoPtr),
 	gcc__build_pointer_type('MR_ConstString', MR_ConstStringPtr),
 	build_struct_type("MR_DuFunctorDesc",
-		['MR_ConstString'	- "MR_notag_functor_name",
-		 'MR_PseudoTypeInfo'	- "MR_notag_functor_arg_type",
-		 'MR_ConstString'	- "MR_du_functor_name",
+		['MR_ConstString'	- "MR_du_functor_name",
 		 'MR_int_least16_t'	- "MR_du_functor_orig_arity",
 		 'MR_int_least16_t'	- "MR_du_functor_arg_type_contains_var",
 		 'MR_Sectag_Locn'	- "MR_du_functor_sectag_locn",

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