[m-rev.] diff: workaround failure of hard_coded/impl_def_literal with --intermod-opt

[Julien Fischer]

Branches: main, 11.07

tests/hard_coded/Mercury.options:
 	Disable intermodule optimization for the impl_def_literal
 	test case; its use causes an abort in the STM transformation.

tests/hard_coded/Mmakefile:
 	Put a list of tests in order.

Julien.

Index: tests/hard_coded/Mercury.options
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/hard_coded/Mercury.options,v
retrieving revision 1.51
diff -u -r1.51 Mercury.options
--- tests/hard_coded/Mercury.options	16 Jun 2011 06:42:18 -0000	1.51
+++ tests/hard_coded/Mercury.options	4 Jul 2011 03:46:27 -0000
@@ -24,6 +24,13 @@
  MCFLAGS-direct_arg_intermod1 =  --intermodule-optimization
  MCFLAGS-direct_arg_intermod2 =  --intermodule-optimization
  MCFLAGS-direct_arg_intermod3 =  --intermodule-optimization
+
+# --intermodule-optimization causes impl_def_literal to abort during
+# the STM transformation (bug #136).  Its use here is disabled until
+# that is fixed.
+MCFLAGS-impl_def_literal = --no-intermodule-optimization
+MCFLAGS-impl_def_literal.sub = --no-intermodule-optimization
+
  MCFLAGS-lp		=	--intermodule-optimization -O3
  MCFLAGS-elim_local_var_char =   --eliminate-local-vars
  MCFLAGS-float_consistency =	--optimize-constant-propagation
Index: tests/hard_coded/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/hard_coded/Mmakefile,v
retrieving revision 1.406
diff -u -r1.406 Mmakefile
--- tests/hard_coded/Mmakefile	16 Jun 2011 06:42:18 -0000	1.406
+++ tests/hard_coded/Mmakefile	4 Jul 2011 03:27:45 -0000
@@ -577,10 +577,10 @@
  		dir_test \
  		final_excp \
  		init_excp \
+		io_globals_deadlock \
  		map_merge_test \
  		mutable_excp \
  		null_char \
-		io_globals_deadlock \
  		test_array2d \
  		test_injection \
  		tl_backjump_test \

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