Promote some tests

Author: liam923

tests/test-dirs/function-recovery.t

@@ -20,7 +20,7 @@
                 <def>
                   pattern (test.ml[2,79+6]..test.ml[2,79+13])
                     Tpat_var \"problem/280\"
-                    value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);imply(unique,uncontended)(modevar#1[aliased,contended .. unique,uncontended])
+                    value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
                   expression (test.ml[2,79+16]..test.ml[2,79+24])
                     Texp_variant \"Problem\"
                     None
@@ -35,7 +35,7 @@
                     None
                   expression (test.ml[3,104+11]..test.ml[3,104+28])
                     Texp_function
-                    alloc_mode id(modevar#f[global,many,portable,unyielding .. local,once,nonportable,yielding]);id(modevar#10[aliased,contended .. unique,uncontended])
+                    alloc_mode id(modevar#f[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);id(modevar#10[aliased,contended,immutable .. unique,uncontended,read_write])
                     []
                     Tfunction_body
                       expression (test.ml[3,104+11]..test.ml[3,104+28])
@@ -69,12 +69,12 @@
         <def>
           pattern (type.ml[1,0+4]..type.ml[1,0+5])
             Tpat_var \"f/280\"
-            value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);imply(unique,uncontended)(modevar#1[aliased,contended .. unique,uncontended])
+            value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (type.ml[1,0+8]..type.ml[1,0+61])
             extra
               Texp_newtype  t
             Texp_function
-            alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable,unyielding .. global,many,nonportable,unyielding]);id(modevar#3[aliased,contended .. unique,uncontended])
+            alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);id(modevar#3[aliased,contended,immutable .. unique,uncontended,read_write])
             [
               Nolabel
               Param_pat
@@ -89,7 +89,7 @@
                           []
                       ]
                   Tpat_var \"foo/283\"
-                  value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding .. local,once,nonportable,yielding]);imply(unique,uncontended)(modevar#5[aliased,contended .. unique,uncontended])
+                  value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#5[aliased,contended,immutable .. unique,uncontended,read_write])
             ]
             Tfunction_body
               expression (type.ml[1,0+39]..type.ml[1,0+61])
@@ -193,7 +193,7 @@
                     "attrs": [],
                     "kind": "pattern (test.ml[1,0+4]..test.ml[1,0+5])
     Tpat_var \"f/280\"
-    value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);imply(unique,uncontended)(modevar#1[aliased,contended .. unique,uncontended])
+    value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
   ",
                     "children": []
                   },
@@ -225,7 +225,7 @@
                         "attrs": [],
                         "kind": "pattern (test.ml[1,0+6]..test.ml[1,0+9])
     Tpat_var \"x/282\"
-    value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding .. local,once,nonportable,yielding]);imply(unique,uncontended)(modevar#5[aliased,contended .. unique,uncontended])
+    value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#5[aliased,contended,immutable .. unique,uncontended,read_write])
   ",
                         "children": []
                       },
@@ -456,7 +456,7 @@
     [
       pattern (test.ml[4,57+9]..test.ml[4,57+12])
         Tpat_var \"_aa/283\"
-        value_mode global,many,portable,unyielding;unique,uncontended
+        value_mode global,many,portable,unyielding,stateless;unique,uncontended,read_write
     ]
     None
   ",
@@ -475,7 +475,7 @@
                                         "attrs": [],
                                         "kind": "pattern (test.ml[4,57+9]..test.ml[4,57+12])
     Tpat_var \"_aa/283\"
-    value_mode global,many,portable,unyielding;unique,uncontended
+    value_mode global,many,portable,unyielding,stateless;unique,uncontended,read_write
   ",
                                         "children": []
                                       }

tests/test-dirs/hidden-deps/dash-h.t

@@ -90,7 +90,7 @@ the type)
           "line": 4,
           "col": 12
         },
-        "type": "sig type t = int val x : int @@ portable type s = Baz end",
+        "type": "sig type t = int val x : int @@ stateless type s = Baz end",
         "tail": "no"
       },
       {

tests/test-dirs/type-enclosing/issue1335.t

@@ -89,7 +89,7 @@ provide better result.
           "line": 1,
           "col": 25
         },
-        "type": "type t1 = [ `A of [ `A of 'a | `B ] as 'a | `B ]",
+        "type": "type t1 : immutable_data with t1 = [ `A of [ `A of 'a | `B ] as 'a | `B ]",
         "tail": "no"
       }
     ],

tests/test-dirs/type-enclosing/underscore-ids.t

@@ -372,7 +372,7 @@ We try several places in the identifier to check the result stability
         <def>
           pattern (under.ml[1,0+4]..under.ml[1,0+6])
             Tpat_var \"aa/280\"
-            value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);imply(unique,uncontended)(modevar#1[aliased,contended .. unique,uncontended])
+            value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (under.ml[1,0+9]..under.ml[1,0+12])
             Texp_constant Const_float 4.2
       ]
@@ -382,16 +382,16 @@ We try several places in the identifier to check the result stability
         <def>
           pattern (under.ml[2,13+4]..under.ml[2,13+5])
             Tpat_var \"f/281\"
-            value_mode meet(local,once,nonportable,yielding)(modevar#5[global,many,portable,unyielding .. global,many,nonportable,unyielding]);imply(unique,uncontended)(modevar#6[aliased,contended .. unique,uncontended])
+            value_mode meet(local,once,nonportable,yielding,stateful)(modevar#5[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#6[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (under.ml[2,13+6]..under.ml[5,70+17]) ghost
             Texp_function
-            alloc_mode map_comonadic(regional_to_global)(modevar#7[global,many,portable,unyielding .. global,many,nonportable,unyielding]);id(modevar#8[aliased,contended .. unique,uncontended])
+            alloc_mode map_comonadic(regional_to_global)(modevar#7[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);id(modevar#8[aliased,contended,immutable .. unique,uncontended,read_write])
             [
               Nolabel
               Param_pat
                 pattern (under.ml[2,13+6]..under.ml[2,13+9])
                   Tpat_var \"x/283\"
-                  value_mode map_comonadic(local_to_regional)(modevar#9[global,many,portable,unyielding .. local,once,nonportable,yielding]);imply(unique,uncontended)(modevar#a[aliased,contended .. unique,uncontended])
+                  value_mode map_comonadic(local_to_regional)(modevar#9[global,many,portable,unyielding,stateless .. local,once,nonportable,yielding,stateful]);imply(unique,uncontended,read_write)(modevar#a[aliased,contended,immutable .. unique,uncontended,read_write])
             ]
             Tfunction_body
               expression (under.ml[2,13+18]..under.ml[5,70+17])

tests/test-dirs/typing-recovery.t

@@ -94,10 +94,10 @@
         <def>
           pattern (test.ml[2,15+4]..test.ml[2,15+5])
             Tpat_var \"f/283\"
-            value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);imply(unique,uncontended)(modevar#1[aliased,contended .. unique,uncontended])
+            value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (test.ml[2,15+6]..test.ml[6,69+12]) ghost
             Texp_function
-            alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable,unyielding .. global,many,nonportable,unyielding]);id(modevar#3[aliased,contended .. unique,uncontended])
+            alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);id(modevar#3[aliased,contended,immutable .. unique,uncontended,read_write])
             [
               Nolabel
               Param_pat
@@ -108,7 +108,7 @@
                       Ttyp_constr \"t/280\"
                       []
                   Tpat_var \"x/285\"
-                  value_mode global,many,portable,unyielding;unique,uncontended
+                  value_mode global,many,portable,unyielding,stateless;unique,uncontended,read_write
             ]
             Tfunction_body
               expression (test.ml[3,31+2]..test.ml[6,69+12])
@@ -254,10 +254,10 @@
         <def>
           pattern (test2.ml[2,15+4]..test2.ml[2,15+5])
             Tpat_var \"f/283\"
-            value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);imply(unique,uncontended)(modevar#1[aliased,contended .. unique,uncontended])
+            value_mode meet(local,once,nonportable,yielding,stateful)(modevar#0[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#1[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (test2.ml[2,15+6]..test2.ml[2,15+24]) ghost
             Texp_function
-            alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable,unyielding .. global,many,nonportable,unyielding]);id(modevar#3[aliased,contended .. unique,uncontended])
+            alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);id(modevar#3[aliased,contended,immutable .. unique,uncontended,read_write])
             [
               Nolabel
               Param_pat
@@ -561,11 +561,11 @@ make sure we also handle that correctly in structures:
                 Ttyp_constr \"int/1!\"
                 []
             Tpat_var \"foo1/280\"
-            value_mode global,many,portable,unyielding;unique,uncontended
+            value_mode global,many,portable,unyielding,stateless;unique,uncontended,read_write
           expression (test_ct.ml[1,0+17]..test_ct.ml[1,0+18])
             extra
               Texp_mode
-              alloc_const_option_mode None,None,None,None,None,None
+              alloc_const_option_mode None,None,None,None,None,None,None,None
               Texp_constraint
               core_type (test_ct.ml[1,0+11]..test_ct.ml[1,0+14])
                 Ttyp_constr \"int/1!\"
@@ -592,11 +592,11 @@ make sure we also handle that correctly in structures:
                     None
                 ]
             Tpat_var \"foo2/281\"
-            value_mode meet(local,once,nonportable,yielding)(modevar#5[global,many,portable,unyielding .. global,many,nonportable,unyielding]);imply(unique,uncontended)(modevar#6[aliased,contended .. unique,uncontended])
+            value_mode meet(local,once,nonportable,yielding,stateful)(modevar#5[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]);imply(unique,uncontended,read_write)(modevar#6[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (test_ct.ml[3,20+24]..test_ct.ml[3,20+28])
             extra
               Texp_mode
-              alloc_const_option_mode None,None,None,None,None,None
+              alloc_const_option_mode None,None,None,None,None,None,None,None
               Texp_constraint
               core_type (test_ct.ml[3,20+11]..test_ct.ml[3,20+21])
                 Ttyp_tuple
@@ -611,7 +611,7 @@ make sure we also handle that correctly in structures:
                     None
                 ]
             Texp_tuple
-            alloc_mode meet(local,once,nonportable,yielding,map_comonadic(regional_to_global)(modevar#5[global,many,portable,unyielding .. global,many,nonportable,unyielding]));unique,uncontended
+            alloc_mode meet(local,once,nonportable,yielding,stateful,map_comonadic(regional_to_global)(modevar#5[global,many,portable,unyielding,stateless .. global,many,nonportable,unyielding,stateful]));unique,uncontended,read_write
             [
               Label: None
                 expression (test_ct.ml[3,20+24]..test_ct.ml[3,20+25])
@@ -641,11 +641,11 @@ make sure we also handle that correctly in structures:
                     []
                 ]
             Tpat_var \"foo3/282\"
-            value_mode global,many,portable,unyielding;imply(unique,contended)(modevar#b[aliased,contended .. unique,uncontended])
+            value_mode global,many,portable,unyielding,stateless;imply(unique,contended,immutable)(modevar#b[aliased,contended,immutable .. unique,uncontended,read_write])
           expression (test_ct.ml[5,50+23]..test_ct.ml[5,50+27])
             extra
               Texp_mode
-              alloc_const_option_mode None,None,None,None,None,None
+              alloc_const_option_mode None,None,None,None,None,None,None,None
               Texp_constraint
               core_type (test_ct.ml[5,50+11]..test_ct.ml[5,50+20])
                 Ttyp_tuple
@@ -660,7 +660,7 @@ make sure we also handle that correctly in structures:
                     []
                 ]
             Texp_tuple
-            alloc_mode global,once,nonportable,yielding;unique,contended
+            alloc_mode global,once,nonportable,yielding,stateful;unique,contended,immutable
             [
               Label: None
                 expression (test_ct.ml[5,50+23]..test_ct.ml[5,50+24])