[m-rev.] diff: revert assertion in var_locn.m

Peter Wang novalazy at gmail.com
Mon Feb 11 17:36:02 AEDT 2008


Estimated hours taken: 0.1
Branches: main

compiler/var_locn.m:
        Revert the change to abort if we see `construct_statically(_)' in
        `var_locn_assign_dynamic_cell_to_var'.
        It does not bootcheck with -O5 --intermodule-optimisation.

Index: compiler/var_locn.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/var_locn.m,v
retrieving revision 1.58
diff -u -r1.58 var_locn.m
--- compiler/var_locn.m 11 Feb 2008 03:56:12 -0000      1.58
+++ compiler/var_locn.m 11 Feb 2008 06:32:44 -0000
@@ -904,9 +904,12 @@
             MaybeRegionRval = no,
             LldsComment = "Allocating heap for "
         ;
+            % XXX  We should probably throw an exception if we find
+            % construct_statically here.
             HowToConstruct = construct_statically(_),
-            unexpected(this_file,
-                "var_locn_assign_dynamic_cell_to_var: construct_statically")
+            RegionVarCode = empty,
+            MaybeRegionRval = no,
+            LldsComment = "Allocating heap for "
         ),
         assign_all_cell_args(ModuleInfo, Vector, yes(Ptag), lval(Lval),
             StartOffset, ArgsCode, !VLI),


--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list