synchronize with frama-c/frama-c!1860

src/plugins/e-acsl/tests/temporal/oracle/gen_t_global_init.c

@@ -83,6 +83,14 @@ void __e_acsl_globals_init(void)
   __e_acsl_full_init((void *)(& extra_lbits));
   __e_acsl_store_block((void *)(strings),(size_t)32);
   __e_acsl_full_init((void *)(& strings));
+  __e_acsl_temporal_store_nblock((void *)(& strings[0][0]),
+                                 (void *)__gen_e_acsl_literal_string_4);
+  __e_acsl_temporal_store_nblock((void *)(& strings[0][1]),
+                                 (void *)__gen_e_acsl_literal_string_3);
+  __e_acsl_temporal_store_nblock((void *)(& strings[1][0]),
+                                 (void *)__gen_e_acsl_literal_string_2);
+  __e_acsl_temporal_store_nblock((void *)(& strings[1][1]),
+                                 (void *)__gen_e_acsl_literal_string);
   __e_acsl_temporal_store_nblock((void *)(& descs2[0].desc.extra_bits),
                                  (void *)(extra_lbits));
   __e_acsl_temporal_store_nblock((void *)(& descs2[1].desc.extra_bits),
@@ -95,14 +103,6 @@ void __e_acsl_globals_init(void)
                                  (void *)(extra_lbits));
   __e_acsl_temporal_store_nblock((void *)(& l_desc.extra_bits),
                                  (void *)(extra_lbits));
-  __e_acsl_temporal_store_nblock((void *)(& strings[0][0]),
-                                 (void *)__gen_e_acsl_literal_string_4);
-  __e_acsl_temporal_store_nblock((void *)(& strings[0][1]),
-                                 (void *)__gen_e_acsl_literal_string_3);
-  __e_acsl_temporal_store_nblock((void *)(& strings[1][0]),
-                                 (void *)__gen_e_acsl_literal_string_2);
-  __e_acsl_temporal_store_nblock((void *)(& strings[1][1]),
-                                 (void *)__gen_e_acsl_literal_string);
   return;
 }
 

src/plugins/e-acsl/tests/temporal/oracle/gen_t_local_init.c

@@ -84,13 +84,6 @@ void __e_acsl_globals_init(void)
   __e_acsl_full_init((void *)(& Str));
   __e_acsl_store_block((void *)(Strings),(size_t)32);
   __e_acsl_full_init((void *)(& Strings));
-  __e_acsl_temporal_store_nblock((void *)(Str),
-                                 (void *)__gen_e_acsl_literal_string_5);
-  __e_acsl_temporal_store_nblock((void *)(& Str[1]),
-                                 (void *)__gen_e_acsl_literal_string_6);
-  __e_acsl_temporal_store_nblock((void *)(& Str[2]),
-                                 (void *)__gen_e_acsl_literal_string_7);
-  __e_acsl_temporal_store_nblock((void *)(& Str[3]),(void *)0);
   __e_acsl_temporal_store_nblock((void *)(& Strings[0][0]),
                                  (void *)__gen_e_acsl_literal_string);
   __e_acsl_temporal_store_nblock((void *)(& Strings[0][1]),
@@ -99,6 +92,13 @@ void __e_acsl_globals_init(void)
                                  (void *)__gen_e_acsl_literal_string_3);
   __e_acsl_temporal_store_nblock((void *)(& Strings[1][1]),
                                  (void *)__gen_e_acsl_literal_string_4);
+  __e_acsl_temporal_store_nblock((void *)(Str),
+                                 (void *)__gen_e_acsl_literal_string_5);
+  __e_acsl_temporal_store_nblock((void *)(& Str[1]),
+                                 (void *)__gen_e_acsl_literal_string_6);
+  __e_acsl_temporal_store_nblock((void *)(& Str[2]),
+                                 (void *)__gen_e_acsl_literal_string_7);
+  __e_acsl_temporal_store_nblock((void *)(& Str[3]),(void *)0);
   return;
 }