[tests] stability wrt OCaml 3.12.1

src/plugins/e-acsl/literal_strings.ml

@@ -32,7 +32,7 @@ let is_empty () = Datatype.String.Hashtbl.length strings = 0
 
 let add = Datatype.String.Hashtbl.add strings
 let find = Datatype.String.Hashtbl.find strings
-let fold f = Datatype.String.Hashtbl.fold f strings
+let fold f = Datatype.String.Hashtbl.fold_sorted f strings
 
 (*
 Local Variables:

src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c

 /* Generated by Frama-C */
-char *__e_acsl_literal_string_2;
 char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_2;
 struct __anonstruct___mpz_struct_1 {
    int _mp_alloc ;
    int _mp_size ;
@@ -241,14 +241,14 @@ void *__e_acsl_memchr(void const *buf, int c, size_t n)
 
 void __e_acsl_memory_init(void)
 {
-  __e_acsl_literal_string_2 = "tata";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("tata"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __literal_string((void *)__e_acsl_literal_string_2);
   __e_acsl_literal_string = "toto";
   __store_block((void *)__e_acsl_literal_string,sizeof("toto"));
   __full_init((void *)__e_acsl_literal_string);
   __literal_string((void *)__e_acsl_literal_string);
+  __e_acsl_literal_string_2 = "tata";
+  __store_block((void *)__e_acsl_literal_string_2,sizeof("tata"));
+  __full_init((void *)__e_acsl_literal_string_2);
+  __literal_string((void *)__e_acsl_literal_string_2);
   return;
 }
 

src/plugins/e-acsl/tests/bts/oracle/gen_bts13902.c

 /* Generated by Frama-C */
-char *__e_acsl_literal_string_2;
 char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_2;
 struct __anonstruct___mpz_struct_1 {
    int _mp_alloc ;
    int _mp_size ;
@@ -386,14 +386,14 @@ void *__e_acsl_memchr(void const *buf, int c, size_t n)
 
 void __e_acsl_memory_init(void)
 {
-  __e_acsl_literal_string_2 = "tata";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("tata"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __literal_string((void *)__e_acsl_literal_string_2);
   __e_acsl_literal_string = "toto";
   __store_block((void *)__e_acsl_literal_string,sizeof("toto"));
   __full_init((void *)__e_acsl_literal_string);
   __literal_string((void *)__e_acsl_literal_string);
+  __e_acsl_literal_string_2 = "tata";
+  __store_block((void *)__e_acsl_literal_string_2,sizeof("tata"));
+  __full_init((void *)__e_acsl_literal_string_2);
+  __literal_string((void *)__e_acsl_literal_string_2);
   return;
 }
 

src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c

 /* Generated by Frama-C */
-char *__e_acsl_literal_string_2;
-char *__e_acsl_literal_string;
 char *__e_acsl_literal_string_3;
+char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_2;
 struct __anonstruct___mpz_struct_1 {
    int _mp_alloc ;
    int _mp_size ;
@@ -141,18 +141,18 @@ int f(void)
 
 void __e_acsl_memory_init(void)
 {
-  __e_acsl_literal_string_2 = "bar";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __literal_string((void *)__e_acsl_literal_string_2);
-  __e_acsl_literal_string = "foo";
-  __store_block((void *)__e_acsl_literal_string,sizeof("foo"));
-  __full_init((void *)__e_acsl_literal_string);
-  __literal_string((void *)__e_acsl_literal_string);
   __e_acsl_literal_string_3 = "toto";
   __store_block((void *)__e_acsl_literal_string_3,sizeof("toto"));
   __full_init((void *)__e_acsl_literal_string_3);
   __literal_string((void *)__e_acsl_literal_string_3);
+  __e_acsl_literal_string = "foo";
+  __store_block((void *)__e_acsl_literal_string,sizeof("foo"));
+  __full_init((void *)__e_acsl_literal_string);
+  __literal_string((void *)__e_acsl_literal_string);
+  __e_acsl_literal_string_2 = "bar";
+  __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
+  __full_init((void *)__e_acsl_literal_string_2);
+  __literal_string((void *)__e_acsl_literal_string_2);
   __store_block((void *)(& S),4U);
   __full_init((void *)(& S));
   S = (char *)__e_acsl_literal_string;

src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string.c

 /* Generated by Frama-C */
-char *__e_acsl_literal_string_4;
-char *__e_acsl_literal_string_2;
 char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_4;
 char *__e_acsl_literal_string_3;
+char *__e_acsl_literal_string_2;
 struct __anonstruct___mpz_struct_1 {
    int _mp_alloc ;
    int _mp_size ;
@@ -113,22 +113,22 @@ int G2 = 2;
 char *U = (char *)"baz";
 void __e_acsl_memory_init(void)
 {
-  __e_acsl_literal_string_4 = "foo2";
-  __store_block((void *)__e_acsl_literal_string_4,sizeof("foo2"));
-  __full_init((void *)__e_acsl_literal_string_4);
-  __literal_string((void *)__e_acsl_literal_string_4);
-  __e_acsl_literal_string_2 = "bar";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __literal_string((void *)__e_acsl_literal_string_2);
   __e_acsl_literal_string = "ss";
   __store_block((void *)__e_acsl_literal_string,sizeof("ss"));
   __full_init((void *)__e_acsl_literal_string);
   __literal_string((void *)__e_acsl_literal_string);
+  __e_acsl_literal_string_4 = "foo2";
+  __store_block((void *)__e_acsl_literal_string_4,sizeof("foo2"));
+  __full_init((void *)__e_acsl_literal_string_4);
+  __literal_string((void *)__e_acsl_literal_string_4);
   __e_acsl_literal_string_3 = "foo";
   __store_block((void *)__e_acsl_literal_string_3,sizeof("foo"));
   __full_init((void *)__e_acsl_literal_string_3);
   __literal_string((void *)__e_acsl_literal_string_3);
+  __e_acsl_literal_string_2 = "bar";
+  __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
+  __full_init((void *)__e_acsl_literal_string_2);
+  __literal_string((void *)__e_acsl_literal_string_2);
   __store_block((void *)(& S2),4U);
   __full_init((void *)(& S2));
   S2 = (char *)__e_acsl_literal_string_4;

src/plugins/e-acsl/tests/e-acsl-runtime/oracle/gen_literal_string2.c

 /* Generated by Frama-C */
-char *__e_acsl_literal_string_4;
-char *__e_acsl_literal_string_2;
 char *__e_acsl_literal_string;
+char *__e_acsl_literal_string_4;
 char *__e_acsl_literal_string_3;
+char *__e_acsl_literal_string_2;
 struct __anonstruct___mpz_struct_1 {
    int _mp_alloc ;
    int _mp_size ;
@@ -141,22 +141,22 @@ int G2 = 2;
 char *U = (char *)"baz";
 void __e_acsl_memory_init(void)
 {
-  __e_acsl_literal_string_4 = "foo2";
-  __store_block((void *)__e_acsl_literal_string_4,sizeof("foo2"));
-  __full_init((void *)__e_acsl_literal_string_4);
-  __literal_string((void *)__e_acsl_literal_string_4);
-  __e_acsl_literal_string_2 = "bar";
-  __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
-  __full_init((void *)__e_acsl_literal_string_2);
-  __literal_string((void *)__e_acsl_literal_string_2);
   __e_acsl_literal_string = "ss";
   __store_block((void *)__e_acsl_literal_string,sizeof("ss"));
   __full_init((void *)__e_acsl_literal_string);
   __literal_string((void *)__e_acsl_literal_string);
+  __e_acsl_literal_string_4 = "foo2";
+  __store_block((void *)__e_acsl_literal_string_4,sizeof("foo2"));
+  __full_init((void *)__e_acsl_literal_string_4);
+  __literal_string((void *)__e_acsl_literal_string_4);
   __e_acsl_literal_string_3 = "foo";
   __store_block((void *)__e_acsl_literal_string_3,sizeof("foo"));
   __full_init((void *)__e_acsl_literal_string_3);
   __literal_string((void *)__e_acsl_literal_string_3);
+  __e_acsl_literal_string_2 = "bar";
+  __store_block((void *)__e_acsl_literal_string_2,sizeof("bar"));
+  __full_init((void *)__e_acsl_literal_string_2);
+  __literal_string((void *)__e_acsl_literal_string_2);
   __store_block((void *)(& S2),4U);
   __full_init((void *)(& S2));
   S2 = (char *)__e_acsl_literal_string_4;