[m-rev.] for review: fix deep profiling runtime compilation failure

[Julien Fischer]

Actually, ignore this, I've backed it out because it's incorrect.  The
proc_layouts for the bitmap special preds should be in the bitmap module.
It's just that there are references to them being generated somewhere
in the runtime.

Julien.

On Thu, 15 Feb 2007, Julien Fischer wrote:

>
> For post-commit review by Simon or Zoltan.
>
> Estimated hours taken: 0.5
> Branches: main
>
> Fix a runtime compilation failure in .profdeep grades caused by
> missing proc_layouts.
>
> runtime/mercury_builtin_types_proc_layouts.h:
> runtime/mercury_builtin_types.c:
> 	Define proc_layouts for the type bitmap.bitmap/0.
>
> 	Fix some formatting.
>
> Julien.
>
> Index: mercury_builtin_types.c
> ===================================================================
> RCS file: 
> /home/mercury/mercury1/repository/mercury/runtime/mercury_builtin_types.c,v
> retrieving revision 1.19
> diff -u -r1.19 mercury_builtin_types.c
> --- mercury_builtin_types.c	5 Jan 2007 02:19:42 -0000	1.19
> +++ mercury_builtin_types.c	15 Feb 2007 06:35:55 -0000
> @@ -803,7 +803,7 @@
> MR_UNIFY_COMPARE_REP_DEFNS(builtin, user_by_rtti, 0)
> MR_UNIFY_COMPARE_REP_DEFNS(builtin, dummy, 0)
>
> -  #ifdef MR_DEEP_PROFILING
> +#ifdef MR_DEEP_PROFILING
>
> /*
> ** The generic unify, compare and compare_rep predicates do different things
> @@ -878,8 +878,9 @@
> MR_DEFINE_PROC_STATIC_LAYOUTS(type_desc, type_desc, 0);
> MR_DEFINE_PROC_STATIC_LAYOUTS(builtin, user_by_rtti, 0);
> MR_DEFINE_PROC_STATIC_LAYOUTS(builtin, dummy, 0);
> +MR_DEFINE_PROC_STATIC_LAYOUTS(bitmap, bitmap, 0);
>
> -#endif
> +#endif /* MR_DEEP_PROFILING */
>
> MR_BEGIN_MODULE(mercury_builtin_types)
>     MR_UNIFY_COMPARE_REP_LABELS(builtin, int, 0)
> @@ -1727,7 +1728,8 @@
>     MR_WRITE_OUT_PROC_STATIC_LAYOUTS(fp, type_desc, type_desc, 0);
>     MR_WRITE_OUT_PROC_STATIC_LAYOUTS(fp, builtin, user_by_rtti, 0);
>     MR_WRITE_OUT_PROC_STATIC_LAYOUTS(fp, builtin, dummy, 0); + 
> MR_WRITE_OUT_PROC_STATIC_LAYOUTS(fp, bitmap, bitmap, 0);
> }
> -#endif
> +#endif /* MR_DEEP_PROFILING */
>
> /*---------------------------------------------------------------------------*/
> Index: mercury_builtin_types_proc_layouts.h
> ===================================================================
> RCS file: 
> /home/mercury/mercury1/repository/mercury/runtime/mercury_builtin_types_proc_layouts.h,v
> retrieving revision 1.4
> diff -u -r1.4 mercury_builtin_types_proc_layouts.h
> --- mercury_builtin_types_proc_layouts.h	6 Oct 2005 08:14:13 -0000 
> 1.4
> +++ mercury_builtin_types_proc_layouts.h	15 Feb 2007 06:25:13 -0000
> @@ -66,6 +66,7 @@
> MR_DECLARE_UCI_PROC_STATIC_LAYOUTS(type_desc, type_desc, 0);
> MR_DECLARE_UCI_PROC_STATIC_LAYOUTS(builtin, user_by_rtti, 0);
> MR_DECLARE_UCI_PROC_STATIC_LAYOUTS(builtin, dummy, 0);
> +MR_DECLARE_UCI_PROC_STATIC_LAYOUTS(bitmap, bitmap, 0);
>
> #endif
>
>
> --------------------------------------------------------------------------
> 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
> --------------------------------------------------------------------------
>
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------