Skip to content

Commit 2678281

Browse files
committed
Promote failing tests
1 parent e2c59c1 commit 2678281

File tree

3 files changed

+59
-61
lines changed

3 files changed

+59
-61
lines changed

tests/test-dirs/function-recovery.t

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<def>
2121
pattern (test.ml[2,79+6]..test.ml[2,79+13])
2222
Tpat_var \"problem/275\"
23-
value_mode meet(local,once,nonportable)(modevar#0[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
23+
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
2424
expression (test.ml[2,79+16]..test.ml[2,79+24])
2525
Texp_variant \"Problem\"
2626
None
@@ -35,7 +35,7 @@
3535
None
3636
expression (test.ml[3,104+11]..test.ml[3,104+28])
3737
Texp_function
38-
alloc_mode id(modevar#d[global,many,portable .. local,once,nonportable]);id(modevar#e[aliased,contended .. unique,uncontended])
38+
alloc_mode id(modevar#d[global,many,portable,unyielding .. local,once,nonportable,yielding]);id(modevar#e[aliased,contended .. unique,uncontended])
3939
[]
4040
Tfunction_body
4141
expression (test.ml[3,104+11]..test.ml[3,104+28])
@@ -69,12 +69,12 @@
6969
<def>
7070
pattern (type.ml[1,0+4]..type.ml[1,0+5])
7171
Tpat_var \"f/275\"
72-
value_mode meet(local,once,nonportable)(modevar#0[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
72+
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
7373
expression (type.ml[1,0+8]..type.ml[1,0+61])
7474
extra
7575
Texp_newtype t
7676
Texp_function
77-
alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable .. global,many,nonportable]);id(modevar#3[aliased,contended .. unique,uncontended])
77+
alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable,unyielding .. global,many,nonportable,unyielding]);id(modevar#3[aliased,contended .. unique,uncontended])
7878
[
7979
Nolabel
8080
Param_pat
@@ -89,7 +89,7 @@
8989
[]
9090
]
9191
Tpat_var \"foo/278\"
92-
value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable .. local,once,nonportable]);join(aliased,contended)(modevar#5[aliased,contended .. unique,uncontended])
92+
value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding .. local,once,nonportable,yielding]);join(aliased,contended)(modevar#5[aliased,contended .. unique,uncontended])
9393
]
9494
Tfunction_body
9595
expression (type.ml[1,0+39]..type.ml[1,0+61])
@@ -193,7 +193,7 @@
193193
"attrs": [],
194194
"kind": "pattern (test.ml[1,0+4]..test.ml[1,0+5])
195195
Tpat_var \"f/275\"
196-
value_mode meet(local,once,nonportable)(modevar#0[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
196+
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
197197
",
198198
"children": []
199199
},
@@ -225,7 +225,7 @@
225225
"attrs": [],
226226
"kind": "pattern (test.ml[1,0+6]..test.ml[1,0+9])
227227
Tpat_var \"x/277\"
228-
value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable .. local,once,nonportable]);join(aliased,contended)(modevar#5[aliased,contended .. unique,uncontended])
228+
value_mode map_comonadic(local_to_regional)(modevar#4[global,many,portable,unyielding .. local,once,nonportable,yielding]);join(aliased,contended)(modevar#5[aliased,contended .. unique,uncontended])
229229
",
230230
"children": []
231231
},
@@ -456,7 +456,7 @@
456456
[
457457
pattern (test.ml[4,57+9]..test.ml[4,57+12])
458458
Tpat_var \"_aa/278\"
459-
value_mode global,many,portable;unique,uncontended
459+
value_mode global,many,portable,unyielding;unique,uncontended
460460
]
461461
None
462462
",
@@ -475,7 +475,7 @@
475475
"attrs": [],
476476
"kind": "pattern (test.ml[4,57+9]..test.ml[4,57+12])
477477
Tpat_var \"_aa/278\"
478-
value_mode global,many,portable;unique,uncontended
478+
value_mode global,many,portable,unyielding;unique,uncontended
479479
",
480480
"children": []
481481
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ We try several places in the identifier to check the result stability
372372
<def>
373373
pattern (under.ml[1,0+4]..under.ml[1,0+6])
374374
Tpat_var \"aa/275\"
375-
value_mode meet(local,once,nonportable)(modevar#0[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
375+
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
376376
expression (under.ml[1,0+9]..under.ml[1,0+12])
377377
Texp_constant Const_float 4.2
378378
]
@@ -382,16 +382,16 @@ We try several places in the identifier to check the result stability
382382
<def>
383383
pattern (under.ml[2,13+4]..under.ml[2,13+5])
384384
Tpat_var \"f/276\"
385-
value_mode meet(local,once,nonportable)(modevar#3[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#4[aliased,uncontended .. unique,uncontended])
385+
value_mode meet(local,once,nonportable,yielding)(modevar#3[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#4[aliased,uncontended .. unique,uncontended])
386386
expression (under.ml[2,13+6]..under.ml[5,70+17]) ghost
387387
Texp_function
388-
alloc_mode map_comonadic(regional_to_global)(modevar#5[global,many,portable .. global,many,nonportable]);id(modevar#6[aliased,contended .. unique,uncontended])
388+
alloc_mode map_comonadic(regional_to_global)(modevar#5[global,many,portable,unyielding .. global,many,nonportable,unyielding]);id(modevar#6[aliased,contended .. unique,uncontended])
389389
[
390390
Nolabel
391391
Param_pat
392392
pattern (under.ml[2,13+6]..under.ml[2,13+9])
393393
Tpat_var \"x/278\"
394-
value_mode map_comonadic(local_to_regional)(modevar#7[global,many,portable .. local,once,nonportable]);join(aliased,contended)(modevar#8[aliased,contended .. unique,uncontended])
394+
value_mode map_comonadic(local_to_regional)(modevar#7[global,many,portable,unyielding .. local,once,nonportable,yielding]);join(aliased,contended)(modevar#8[aliased,contended .. unique,uncontended])
395395
]
396396
Tfunction_body
397397
expression (under.ml[2,13+18]..under.ml[5,70+17])

tests/test-dirs/typing-recovery.t

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@
9494
<def>
9595
pattern (test.ml[2,15+4]..test.ml[2,15+5])
9696
Tpat_var \"f/278\"
97-
value_mode meet(local,once,nonportable)(modevar#0[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
97+
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
9898
expression (test.ml[2,15+6]..test.ml[6,69+12]) ghost
9999
Texp_function
100-
alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable .. global,many,nonportable]);id(modevar#3[aliased,contended .. unique,uncontended])
100+
alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable,unyielding .. global,many,nonportable,unyielding]);id(modevar#3[aliased,contended .. unique,uncontended])
101101
[
102102
Nolabel
103103
Param_pat
@@ -108,7 +108,7 @@
108108
Ttyp_constr \"t/275\"
109109
[]
110110
Tpat_var \"x/280\"
111-
value_mode global,many,portable;unique,uncontended
111+
value_mode global,many,portable,unyielding;unique,uncontended
112112
]
113113
Tfunction_body
114114
expression (test.ml[3,31+2]..test.ml[6,69+12])
@@ -254,10 +254,10 @@
254254
<def>
255255
pattern (test2.ml[2,15+4]..test2.ml[2,15+5])
256256
Tpat_var \"f/278\"
257-
value_mode meet(local,once,nonportable)(modevar#0[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
257+
value_mode meet(local,once,nonportable,yielding)(modevar#0[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#1[aliased,uncontended .. unique,uncontended])
258258
expression (test2.ml[2,15+6]..test2.ml[2,15+24]) ghost
259259
Texp_function
260-
alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable .. global,many,nonportable]);id(modevar#3[aliased,contended .. unique,uncontended])
260+
alloc_mode map_comonadic(regional_to_global)(modevar#2[global,many,portable,unyielding .. global,many,nonportable,unyielding]);id(modevar#3[aliased,contended .. unique,uncontended])
261261
[
262262
Nolabel
263263
Param_pat
@@ -284,11 +284,9 @@
284284
]
285285
extra
286286
Texp_constraint
287-
Some
288-
core_type (test2.ml[2,15+16]..test2.ml[2,15+19])
289-
Ttyp_constr \"int/1!\"
290-
[]
291-
alloc_const_option_mode None,None,None,None,None
287+
core_type (test2.ml[2,15+16]..test2.ml[2,15+19])
288+
Ttyp_constr \"int/1!\"
289+
[]
292290
Texp_ident \"*type-error*/280\"
293291
]
294292
]
@@ -563,15 +561,15 @@ make sure we also handle that correctly in structures:
563561
Ttyp_constr \"int/1!\"
564562
[]
565563
Tpat_var \"foo1/275\"
566-
value_mode global,many,portable;unique,uncontended
564+
value_mode global,many,portable,unyielding;unique,uncontended
567565
expression (test_ct.ml[1,0+17]..test_ct.ml[1,0+18])
568566
extra
567+
Texp_mode
568+
alloc_const_option_mode None,None,None,None,None,None
569569
Texp_constraint
570-
Some
571-
core_type (test_ct.ml[1,0+11]..test_ct.ml[1,0+14])
572-
Ttyp_constr \"int/1!\"
573-
[]
574-
alloc_const_option_mode None,None,None,None,None
570+
core_type (test_ct.ml[1,0+11]..test_ct.ml[1,0+14])
571+
Ttyp_constr \"int/1!\"
572+
[]
575573
Texp_constant Const_int 3
576574
]
577575
structure_item (test_ct.ml[3,20+0]..test_ct.ml[3,20+28])
@@ -594,26 +592,26 @@ make sure we also handle that correctly in structures:
594592
None
595593
]
596594
Tpat_var \"foo2/276\"
597-
value_mode meet(local,once,nonportable)(modevar#3[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#4[aliased,uncontended .. unique,uncontended])
595+
value_mode meet(local,once,nonportable,yielding)(modevar#3[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#4[aliased,uncontended .. unique,uncontended])
598596
expression (test_ct.ml[3,20+24]..test_ct.ml[3,20+28])
599597
extra
598+
Texp_mode
599+
alloc_const_option_mode None,None,None,None,None,None
600600
Texp_constraint
601-
Some
602-
core_type (test_ct.ml[3,20+11]..test_ct.ml[3,20+21])
603-
Ttyp_tuple
604-
[
605-
Label: None
606-
core_type (test_ct.ml[3,20+11]..test_ct.ml[3,20+14])
607-
Ttyp_constr \"int/1!\"
608-
[]
609-
Label: None
610-
core_type (test_ct.ml[3,20+17]..test_ct.ml[3,20+21])
611-
Ttyp_var _
612-
None
613-
]
614-
alloc_const_option_mode None,None,None,None,None
601+
core_type (test_ct.ml[3,20+11]..test_ct.ml[3,20+21])
602+
Ttyp_tuple
603+
[
604+
Label: None
605+
core_type (test_ct.ml[3,20+11]..test_ct.ml[3,20+14])
606+
Ttyp_constr \"int/1!\"
607+
[]
608+
Label: None
609+
core_type (test_ct.ml[3,20+17]..test_ct.ml[3,20+21])
610+
Ttyp_var _
611+
None
612+
]
615613
Texp_tuple
616-
alloc_mode meet(local,once,nonportable,map_comonadic(regional_to_global)(modevar#3[global,many,portable .. global,many,nonportable]));unique,uncontended
614+
alloc_mode meet(local,once,nonportable,yielding,map_comonadic(regional_to_global)(modevar#3[global,many,portable,unyielding .. global,many,nonportable,unyielding]));unique,uncontended
617615
[
618616
Label: None
619617
expression (test_ct.ml[3,20+24]..test_ct.ml[3,20+25])
@@ -643,26 +641,26 @@ make sure we also handle that correctly in structures:
643641
[]
644642
]
645643
Tpat_var \"foo3/277\"
646-
value_mode meet(local,once,nonportable)(modevar#6[global,many,portable .. global,many,nonportable]);join(aliased,contended)(modevar#7[aliased,uncontended .. unique,uncontended])
644+
value_mode meet(local,once,nonportable,yielding)(modevar#6[global,many,portable,unyielding .. global,many,nonportable,unyielding]);join(aliased,contended)(modevar#7[aliased,uncontended .. unique,uncontended])
647645
expression (test_ct.ml[5,50+23]..test_ct.ml[5,50+27])
648646
extra
647+
Texp_mode
648+
alloc_const_option_mode None,None,None,None,None,None
649649
Texp_constraint
650-
Some
651-
core_type (test_ct.ml[5,50+11]..test_ct.ml[5,50+20])
652-
Ttyp_tuple
653-
[
654-
Label: None
655-
core_type (test_ct.ml[5,50+11]..test_ct.ml[5,50+14])
656-
Ttyp_constr \"int/1!\"
657-
[]
658-
Label: None
659-
core_type (test_ct.ml[5,50+17]..test_ct.ml[5,50+20])
660-
Ttyp_constr \"int/1!\"
661-
[]
662-
]
663-
alloc_const_option_mode None,None,None,None,None
650+
core_type (test_ct.ml[5,50+11]..test_ct.ml[5,50+20])
651+
Ttyp_tuple
652+
[
653+
Label: None
654+
core_type (test_ct.ml[5,50+11]..test_ct.ml[5,50+14])
655+
Ttyp_constr \"int/1!\"
656+
[]
657+
Label: None
658+
core_type (test_ct.ml[5,50+17]..test_ct.ml[5,50+20])
659+
Ttyp_constr \"int/1!\"
660+
[]
661+
]
664662
Texp_tuple
665-
alloc_mode meet(local,once,nonportable,map_comonadic(regional_to_global)(modevar#6[global,many,portable .. global,many,nonportable]));unique,uncontended
663+
alloc_mode meet(local,once,nonportable,yielding,map_comonadic(regional_to_global)(modevar#6[global,many,portable,unyielding .. global,many,nonportable,unyielding]));unique,uncontended
666664
[
667665
Label: None
668666
expression (test_ct.ml[5,50+23]..test_ct.ml[5,50+24])

0 commit comments

Comments
 (0)