[m-rev.] diff: disable direct arg functors on 11.07 branch

[Julien Fischer]

Branches: 11.07

Disable the direct arg functor optimisation on the release branch.
(While there is a fix available, merging it on to the release branch at this
stage would be too disruptive.)

compiler/make_tags.m:
 	Disable the direct arg functor optimisation.

tests/invalid/Mmakefile:
 	Disable some tests related to direct arg functors.

Julien.

Index: compiler/make_tags.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/make_tags.m,v
retrieving revision 1.64.2.1
diff -u -r1.64.2.1 make_tags.m
--- compiler/make_tags.m	25 Jul 2011 12:38:14 -0000	1.64.2.1
+++ compiler/make_tags.m	22 Nov 2011 03:34:03 -0000
@@ -432,6 +432,10 @@
  %-----------------------------------------------------------------------------%

  post_process_type_defns(!HLDS, Specs) :-
+    Specs = [].
+% Direct arg functors do not work correctly on the 11.07 branch so they
+% are disabled here.  (See bug #230 for details.)
+/*
      module_info_get_globals(!.HLDS, Globals),
      globals.get_target(Globals, Target),
      (
@@ -466,6 +470,7 @@
          % Direct arg functors have not (yet) been implemented on these targets.
          Specs = []
      ).
+*/

  :- pred convert_direct_arg_functors(int::in,
      assoc_list(type_ctor, hlds_type_defn)::in, type_table::in, type_table::out,
Index: tests/invalid/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/invalid/Mmakefile,v
retrieving revision 1.246.2.1
diff -u -r1.246.2.1 Mmakefile
--- tests/invalid/Mmakefile	18 Nov 2011 04:15:41 -0000	1.246.2.1
+++ tests/invalid/Mmakefile	22 Nov 2011 04:32:35 -0000
@@ -252,8 +252,6 @@
  	user_eq_dummy \
  	uu_type \
  	vars_in_wrong_places \
-	where_direct_arg \
-	where_direct_arg2 \
  	with_type \
  	zinc2mer_lib


--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------