From 08e7b52ddcac6e588ea7f20a043c78c281d4faa3 Mon Sep 17 00:00:00 2001 From: Richard Feldman Date: Thu, 10 Aug 2023 23:34:23 -0400 Subject: [PATCH] Update mono tests --- .../generated/capture_void_layout_task.txt | 14 ++-- ...lambda_set_productive_nullable_wrapped.txt | 28 ++++---- .../encode_derived_nested_record_string.txt | 68 +++++++++---------- ...encode_derived_record_one_field_string.txt | 26 +++---- ...ncode_derived_record_two_field_strings.txt | 26 +++---- .../generated/encode_derived_string.txt | 4 +- .../encode_derived_tag_one_field_string.txt | 4 +- ...encode_derived_tag_two_payloads_string.txt | 4 +- ..._return_joinpoints_in_union_lambda_set.txt | 4 +- .../test_mono/generated/issue_4749.txt | 22 +++--- ..._4772_weakened_monomorphic_destructure.txt | 14 ++-- ...ist_map_take_capturing_or_noncapturing.txt | 2 +- .../generated/pattern_as_toplevel.txt | 2 +- ...function_and_union_with_inference_hole.txt | 4 +- ..._set_resolved_only_upon_specialization.txt | 8 +-- .../generated/recursively_build_effect.txt | 18 ++--- .../generated/specialize_after_match.txt | 24 +++---- ...not_duplicate_identical_concrete_types.txt | 4 +- 18 files changed, 138 insertions(+), 138 deletions(-) diff --git a/crates/compiler/test_mono/generated/capture_void_layout_task.txt b/crates/compiler/test_mono/generated/capture_void_layout_task.txt index bad0f8684c..a84c395f9e 100644 --- a/crates/compiler/test_mono/generated/capture_void_layout_task.txt +++ b/crates/compiler/test_mono/generated/capture_void_layout_task.txt @@ -45,8 +45,8 @@ procedure Num.22 (#Attr.2, #Attr.3): procedure Test.10 (Test.66, #Attr.12): let Test.9 : {} = UnionAtIndex (Id 0) (Index 0) #Attr.12; - let #Derived_gen.18 : Int1 = lowlevel RefCountIsUnique #Attr.12; - if #Derived_gen.18 then + let #Derived_gen.20 : Int1 = lowlevel RefCountIsUnique #Attr.12; + if #Derived_gen.20 then free #Attr.12; ret Test.9; else @@ -60,7 +60,7 @@ procedure Test.10 (Test.66, #Attr.12): procedure Test.14 (Test.45, #Attr.12): let Test.13 : {{}, []} = UnionAtIndex (Id 1) (Index 1) #Attr.12; let Test.12 : [C {}, C *self {{}, []}] = UnionAtIndex (Id 1) (Index 0) #Attr.12; - joinpoint #Derived_gen.19: + joinpoint #Derived_gen.18: let Test.50 : {} = Struct {}; let Test.51 : U8 = GetTagId Test.12; joinpoint Test.52 Test.15: @@ -87,14 +87,14 @@ procedure Test.14 (Test.45, #Attr.12): jump Test.52 Test.53; in - let #Derived_gen.20 : Int1 = lowlevel RefCountIsUnique #Attr.12; - if #Derived_gen.20 then + let #Derived_gen.19 : Int1 = lowlevel RefCountIsUnique #Attr.12; + if #Derived_gen.19 then free #Attr.12; - jump #Derived_gen.19; + jump #Derived_gen.18; else inc Test.12; decref #Attr.12; - jump #Derived_gen.19; + jump #Derived_gen.18; procedure Test.20 (Test.21, Test.18): let Test.23 : [C {}, C []] = CallByName Test.32 Test.21 Test.18; diff --git a/crates/compiler/test_mono/generated/compose_recursive_lambda_set_productive_nullable_wrapped.txt b/crates/compiler/test_mono/generated/compose_recursive_lambda_set_productive_nullable_wrapped.txt index cbd51527e7..0e96162fcb 100644 --- a/crates/compiler/test_mono/generated/compose_recursive_lambda_set_productive_nullable_wrapped.txt +++ b/crates/compiler/test_mono/generated/compose_recursive_lambda_set_productive_nullable_wrapped.txt @@ -18,7 +18,7 @@ procedure List.66 (#Attr.2, #Attr.3): let List.537 : Int1 = lowlevel ListGetUnsafe #Attr.2 #Attr.3; ret List.537; -procedure List.80 (#Derived_gen.3, #Derived_gen.4, #Derived_gen.5, #Derived_gen.6, #Derived_gen.7): +procedure List.80 (#Derived_gen.0, #Derived_gen.1, #Derived_gen.2, #Derived_gen.3, #Derived_gen.4): joinpoint List.527 List.439 List.440 List.441 List.442 List.443: let List.529 : Int1 = CallByName Num.22 List.442 List.443; if List.529 then @@ -31,7 +31,7 @@ procedure List.80 (#Derived_gen.3, #Derived_gen.4, #Derived_gen.5, #Derived_gen. dec List.439; ret List.440; in - jump List.527 #Derived_gen.3 #Derived_gen.4 #Derived_gen.5 #Derived_gen.6 #Derived_gen.7; + jump List.527 #Derived_gen.0 #Derived_gen.1 #Derived_gen.2 #Derived_gen.3 #Derived_gen.4; procedure List.93 (List.436, List.437, List.438): let List.525 : U64 = 0i64; @@ -54,11 +54,11 @@ procedure Str.3 (#Attr.2, #Attr.3): procedure Test.1 (Test.5): ret Test.5; -procedure Test.11 (#Derived_gen.10, #Derived_gen.11): +procedure Test.11 (#Derived_gen.8, #Derived_gen.9): joinpoint Test.27 Test.12 #Attr.12: let Test.8 : Int1 = UnionAtIndex (Id 2) (Index 1) #Attr.12; let Test.7 : [, C *self Int1, C *self Int1] = UnionAtIndex (Id 2) (Index 0) #Attr.12; - joinpoint #Derived_gen.14: + joinpoint #Derived_gen.12: joinpoint Test.31 Test.29: let Test.30 : U8 = GetTagId Test.7; switch Test.30: @@ -85,16 +85,16 @@ procedure Test.11 (#Derived_gen.10, #Derived_gen.11): jump Test.31 Test.32; in - let #Derived_gen.15 : Int1 = lowlevel RefCountIsUnique #Attr.12; - if #Derived_gen.15 then + let #Derived_gen.13 : Int1 = lowlevel RefCountIsUnique #Attr.12; + if #Derived_gen.13 then free #Attr.12; - jump #Derived_gen.14; + jump #Derived_gen.12; else inc Test.7; decref #Attr.12; - jump #Derived_gen.14; + jump #Derived_gen.12; in - jump Test.27 #Derived_gen.10 #Derived_gen.11; + jump Test.27 #Derived_gen.8 #Derived_gen.9; procedure Test.2 (Test.13): ret Test.13; @@ -125,7 +125,7 @@ procedure Test.6 (Test.7, Test.8, Test.5): procedure Test.9 (Test.10, #Attr.12): let Test.8 : Int1 = UnionAtIndex (Id 1) (Index 1) #Attr.12; let Test.7 : [, C *self Int1, C *self Int1] = UnionAtIndex (Id 1) (Index 0) #Attr.12; - joinpoint #Derived_gen.12: + joinpoint #Derived_gen.14: let Test.37 : U8 = GetTagId Test.7; joinpoint Test.38 Test.36: switch Test.8: @@ -153,14 +153,14 @@ procedure Test.9 (Test.10, #Attr.12): jump Test.38 Test.39; in - let #Derived_gen.13 : Int1 = lowlevel RefCountIsUnique #Attr.12; - if #Derived_gen.13 then + let #Derived_gen.15 : Int1 = lowlevel RefCountIsUnique #Attr.12; + if #Derived_gen.15 then free #Attr.12; - jump #Derived_gen.12; + jump #Derived_gen.14; else inc Test.7; decref #Attr.12; - jump #Derived_gen.12; + jump #Derived_gen.14; procedure Test.0 (): let Test.41 : Int1 = false; diff --git a/crates/compiler/test_mono/generated/encode_derived_nested_record_string.txt b/crates/compiler/test_mono/generated/encode_derived_nested_record_string.txt index da00523cb6..b838ca257f 100644 --- a/crates/compiler/test_mono/generated/encode_derived_nested_record_string.txt +++ b/crates/compiler/test_mono/generated/encode_derived_nested_record_string.txt @@ -235,7 +235,23 @@ procedure List.8 (#Attr.2, #Attr.3): let List.668 : List U8 = lowlevel ListConcat #Attr.2 #Attr.3; ret List.668; -procedure List.80 (#Derived_gen.30, #Derived_gen.31, #Derived_gen.32, #Derived_gen.33, #Derived_gen.34): +procedure List.80 (#Derived_gen.20, #Derived_gen.21, #Derived_gen.22, #Derived_gen.23, #Derived_gen.24): + joinpoint List.556 List.439 List.440 List.441 List.442 List.443: + let List.558 : Int1 = CallByName Num.22 List.442 List.443; + if List.558 then + let List.565 : {Str, Str} = CallByName List.66 List.439 List.442; + inc List.565; + let List.559 : {List U8, U64} = CallByName List.145 List.440 List.565 List.441; + let List.562 : U64 = 1i64; + let List.561 : U64 = CallByName Num.19 List.442 List.562; + jump List.556 List.439 List.559 List.441 List.561 List.443; + else + dec List.439; + ret List.440; + in + jump List.556 #Derived_gen.20 #Derived_gen.21 #Derived_gen.22 #Derived_gen.23 #Derived_gen.24; + +procedure List.80 (#Derived_gen.28, #Derived_gen.29, #Derived_gen.30, #Derived_gen.31, #Derived_gen.32): joinpoint List.715 List.439 List.440 List.441 List.442 List.443: let List.717 : Int1 = CallByName Num.22 List.442 List.443; if List.717 then @@ -259,9 +275,9 @@ procedure List.80 (#Derived_gen.30, #Derived_gen.31, #Derived_gen.32, #Derived_g let List.716 : [C {U64, Int1}, C {U64, Int1}] = TagId(1) List.440; ret List.716; in - jump List.715 #Derived_gen.30 #Derived_gen.31 #Derived_gen.32 #Derived_gen.33 #Derived_gen.34; + jump List.715 #Derived_gen.28 #Derived_gen.29 #Derived_gen.30 #Derived_gen.31 #Derived_gen.32; -procedure List.80 (#Derived_gen.36, #Derived_gen.37, #Derived_gen.38, #Derived_gen.39, #Derived_gen.40): +procedure List.80 (#Derived_gen.43, #Derived_gen.44, #Derived_gen.45, #Derived_gen.46, #Derived_gen.47): joinpoint List.644 List.439 List.440 List.441 List.442 List.443: let List.646 : Int1 = CallByName Num.22 List.442 List.443; if List.646 then @@ -274,9 +290,9 @@ procedure List.80 (#Derived_gen.36, #Derived_gen.37, #Derived_gen.38, #Derived_g dec List.439; ret List.440; in - jump List.644 #Derived_gen.36 #Derived_gen.37 #Derived_gen.38 #Derived_gen.39 #Derived_gen.40; + jump List.644 #Derived_gen.43 #Derived_gen.44 #Derived_gen.45 #Derived_gen.46 #Derived_gen.47; -procedure List.80 (#Derived_gen.41, #Derived_gen.42, #Derived_gen.43, #Derived_gen.44, #Derived_gen.45): +procedure List.80 (#Derived_gen.48, #Derived_gen.49, #Derived_gen.50, #Derived_gen.51, #Derived_gen.52): joinpoint List.624 List.439 List.440 List.441 List.442 List.443: let List.626 : Int1 = CallByName Num.22 List.442 List.443; if List.626 then @@ -290,23 +306,7 @@ procedure List.80 (#Derived_gen.41, #Derived_gen.42, #Derived_gen.43, #Derived_g dec List.439; ret List.440; in - jump List.624 #Derived_gen.41 #Derived_gen.42 #Derived_gen.43 #Derived_gen.44 #Derived_gen.45; - -procedure List.80 (#Derived_gen.52, #Derived_gen.53, #Derived_gen.54, #Derived_gen.55, #Derived_gen.56): - joinpoint List.556 List.439 List.440 List.441 List.442 List.443: - let List.558 : Int1 = CallByName Num.22 List.442 List.443; - if List.558 then - let List.565 : {Str, Str} = CallByName List.66 List.439 List.442; - inc List.565; - let List.559 : {List U8, U64} = CallByName List.145 List.440 List.565 List.441; - let List.562 : U64 = 1i64; - let List.561 : U64 = CallByName Num.19 List.442 List.562; - jump List.556 List.439 List.559 List.441 List.561 List.443; - else - dec List.439; - ret List.440; - in - jump List.556 #Derived_gen.52 #Derived_gen.53 #Derived_gen.54 #Derived_gen.55 #Derived_gen.56; + jump List.624 #Derived_gen.48 #Derived_gen.49 #Derived_gen.50 #Derived_gen.51 #Derived_gen.52; procedure List.93 (List.436, List.437, List.438): let List.554 : U64 = 0i64; @@ -388,8 +388,8 @@ procedure Str.9 (Str.79): else let Str.291 : U8 = StructAtIndex 3 Str.80; let Str.292 : U64 = StructAtIndex 0 Str.80; - let #Derived_gen.57 : Str = StructAtIndex 1 Str.80; - dec #Derived_gen.57; + let #Derived_gen.58 : Str = StructAtIndex 1 Str.80; + dec #Derived_gen.58; let Str.290 : {U64, U8} = Struct {Str.292, Str.291}; let Str.289 : [C {U64, U8}, C Str] = TagId(0) Str.290; ret Str.289; @@ -1019,8 +1019,8 @@ procedure TotallyNotJson.102 (TotallyNotJson.852): else let TotallyNotJson.1691 : Str = "Z"; let TotallyNotJson.1692 : Int1 = lowlevel Eq TotallyNotJson.1691 TotallyNotJson.852; - dec TotallyNotJson.852; dec TotallyNotJson.1691; + dec TotallyNotJson.852; if TotallyNotJson.1692 then let TotallyNotJson.1689 : Int1 = CallByName Bool.2; ret TotallyNotJson.1689; @@ -1331,14 +1331,14 @@ procedure TotallyNotJson.82 (TotallyNotJson.802, TotallyNotJson.803): procedure TotallyNotJson.832 (TotallyNotJson.1493): let TotallyNotJson.1845 : List Str = StructAtIndex 1 TotallyNotJson.1493; - let #Derived_gen.58 : List Str = StructAtIndex 0 TotallyNotJson.1493; - dec #Derived_gen.58; + let #Derived_gen.59 : List Str = StructAtIndex 0 TotallyNotJson.1493; + dec #Derived_gen.59; ret TotallyNotJson.1845; procedure TotallyNotJson.840 (TotallyNotJson.1214): let TotallyNotJson.1566 : List Str = StructAtIndex 1 TotallyNotJson.1214; - let #Derived_gen.59 : List Str = StructAtIndex 0 TotallyNotJson.1214; - dec #Derived_gen.59; + let #Derived_gen.57 : List Str = StructAtIndex 0 TotallyNotJson.1214; + dec #Derived_gen.57; ret TotallyNotJson.1566; procedure TotallyNotJson.87 (TotallyNotJson.809): @@ -1389,11 +1389,11 @@ procedure TotallyNotJson.95 (TotallyNotJson.829): let TotallyNotJson.1840 : List Str = CallByName TotallyNotJson.832 TotallyNotJson.1842; let TotallyNotJson.1841 : Str = ""; let TotallyNotJson.1839 : Str = CallByName Str.4 TotallyNotJson.1840 TotallyNotJson.1841; - dec TotallyNotJson.1840; dec TotallyNotJson.1841; + dec TotallyNotJson.1840; ret TotallyNotJson.1839; -procedure TotallyNotJson.96 (#Derived_gen.29): +procedure TotallyNotJson.96 (#Derived_gen.56): joinpoint TotallyNotJson.1847 TotallyNotJson.1168: let TotallyNotJson.834 : List Str = StructAtIndex 0 TotallyNotJson.1168; let TotallyNotJson.833 : List Str = StructAtIndex 1 TotallyNotJson.1168; @@ -1429,7 +1429,7 @@ procedure TotallyNotJson.96 (#Derived_gen.29): let TotallyNotJson.1848 : {List Str, List Str} = Struct {TotallyNotJson.834, TotallyNotJson.833}; ret TotallyNotJson.1848; in - jump TotallyNotJson.1847 #Derived_gen.29; + jump TotallyNotJson.1847 #Derived_gen.56; procedure TotallyNotJson.97 (TotallyNotJson.837): let TotallyNotJson.838 : List Str = CallByName Str.55 TotallyNotJson.837; @@ -1446,7 +1446,7 @@ procedure TotallyNotJson.97 (TotallyNotJson.837): dec TotallyNotJson.1562; ret TotallyNotJson.1560; -procedure TotallyNotJson.98 (#Derived_gen.35): +procedure TotallyNotJson.98 (#Derived_gen.36): joinpoint TotallyNotJson.1568 TotallyNotJson.1169: let TotallyNotJson.842 : List Str = StructAtIndex 0 TotallyNotJson.1169; let TotallyNotJson.841 : List Str = StructAtIndex 1 TotallyNotJson.1169; @@ -1482,7 +1482,7 @@ procedure TotallyNotJson.98 (#Derived_gen.35): let TotallyNotJson.1569 : {List Str, List Str} = Struct {TotallyNotJson.842, TotallyNotJson.841}; ret TotallyNotJson.1569; in - jump TotallyNotJson.1568 #Derived_gen.35; + jump TotallyNotJson.1568 #Derived_gen.36; procedure Test.0 (): let Test.12 : Str = "bar"; diff --git a/crates/compiler/test_mono/generated/encode_derived_record_one_field_string.txt b/crates/compiler/test_mono/generated/encode_derived_record_one_field_string.txt index 81f7d70c33..b321fb63dc 100644 --- a/crates/compiler/test_mono/generated/encode_derived_record_one_field_string.txt +++ b/crates/compiler/test_mono/generated/encode_derived_record_one_field_string.txt @@ -192,7 +192,7 @@ procedure List.8 (#Attr.2, #Attr.3): let List.600 : List U8 = lowlevel ListConcat #Attr.2 #Attr.3; ret List.600; -procedure List.80 (#Derived_gen.10, #Derived_gen.11, #Derived_gen.12, #Derived_gen.13, #Derived_gen.14): +procedure List.80 (#Derived_gen.11, #Derived_gen.12, #Derived_gen.13, #Derived_gen.14, #Derived_gen.15): joinpoint List.647 List.439 List.440 List.441 List.442 List.443: let List.649 : Int1 = CallByName Num.22 List.442 List.443; if List.649 then @@ -216,9 +216,9 @@ procedure List.80 (#Derived_gen.10, #Derived_gen.11, #Derived_gen.12, #Derived_g let List.648 : [C {U64, Int1}, C {U64, Int1}] = TagId(1) List.440; ret List.648; in - jump List.647 #Derived_gen.10 #Derived_gen.11 #Derived_gen.12 #Derived_gen.13 #Derived_gen.14; + jump List.647 #Derived_gen.11 #Derived_gen.12 #Derived_gen.13 #Derived_gen.14 #Derived_gen.15; -procedure List.80 (#Derived_gen.18, #Derived_gen.19, #Derived_gen.20, #Derived_gen.21, #Derived_gen.22): +procedure List.80 (#Derived_gen.16, #Derived_gen.17, #Derived_gen.18, #Derived_gen.19, #Derived_gen.20): joinpoint List.576 List.439 List.440 List.441 List.442 List.443: let List.578 : Int1 = CallByName Num.22 List.442 List.443; if List.578 then @@ -231,7 +231,7 @@ procedure List.80 (#Derived_gen.18, #Derived_gen.19, #Derived_gen.20, #Derived_g dec List.439; ret List.440; in - jump List.576 #Derived_gen.18 #Derived_gen.19 #Derived_gen.20 #Derived_gen.21 #Derived_gen.22; + jump List.576 #Derived_gen.16 #Derived_gen.17 #Derived_gen.18 #Derived_gen.19 #Derived_gen.20; procedure List.80 (#Derived_gen.31, #Derived_gen.32, #Derived_gen.33, #Derived_gen.34, #Derived_gen.35): joinpoint List.556 List.439 List.440 List.441 List.442 List.443: @@ -1215,14 +1215,14 @@ procedure TotallyNotJson.82 (TotallyNotJson.802, TotallyNotJson.803): procedure TotallyNotJson.832 (TotallyNotJson.1493): let TotallyNotJson.1494 : List Str = StructAtIndex 1 TotallyNotJson.1493; - let #Derived_gen.38 : List Str = StructAtIndex 0 TotallyNotJson.1493; - dec #Derived_gen.38; + let #Derived_gen.37 : List Str = StructAtIndex 0 TotallyNotJson.1493; + dec #Derived_gen.37; ret TotallyNotJson.1494; procedure TotallyNotJson.840 (TotallyNotJson.1214): let TotallyNotJson.1215 : List Str = StructAtIndex 1 TotallyNotJson.1214; - let #Derived_gen.37 : List Str = StructAtIndex 0 TotallyNotJson.1214; - dec #Derived_gen.37; + let #Derived_gen.38 : List Str = StructAtIndex 0 TotallyNotJson.1214; + dec #Derived_gen.38; ret TotallyNotJson.1215; procedure TotallyNotJson.87 (TotallyNotJson.809): @@ -1255,8 +1255,8 @@ procedure TotallyNotJson.94 (TotallyNotJson.824): let TotallyNotJson.1400 : List Str = CallByName List.13 TotallyNotJson.828 TotallyNotJson.827; let TotallyNotJson.1401 : Str = ""; let TotallyNotJson.1399 : Str = CallByName Str.4 TotallyNotJson.1400 TotallyNotJson.1401; - dec TotallyNotJson.1400; dec TotallyNotJson.1401; + dec TotallyNotJson.1400; ret TotallyNotJson.1399; else dec TotallyNotJson.825; @@ -1277,7 +1277,7 @@ procedure TotallyNotJson.95 (TotallyNotJson.829): dec TotallyNotJson.1489; ret TotallyNotJson.1488; -procedure TotallyNotJson.96 (#Derived_gen.26): +procedure TotallyNotJson.96 (#Derived_gen.30): joinpoint TotallyNotJson.1496 TotallyNotJson.1168: let TotallyNotJson.834 : List Str = StructAtIndex 0 TotallyNotJson.1168; let TotallyNotJson.833 : List Str = StructAtIndex 1 TotallyNotJson.1168; @@ -1313,7 +1313,7 @@ procedure TotallyNotJson.96 (#Derived_gen.26): let TotallyNotJson.1497 : {List Str, List Str} = Struct {TotallyNotJson.834, TotallyNotJson.833}; ret TotallyNotJson.1497; in - jump TotallyNotJson.1496 #Derived_gen.26; + jump TotallyNotJson.1496 #Derived_gen.30; procedure TotallyNotJson.97 (TotallyNotJson.837): let TotallyNotJson.838 : List Str = CallByName Str.55 TotallyNotJson.837; @@ -1330,7 +1330,7 @@ procedure TotallyNotJson.97 (TotallyNotJson.837): dec TotallyNotJson.1210; ret TotallyNotJson.1209; -procedure TotallyNotJson.98 (#Derived_gen.30): +procedure TotallyNotJson.98 (#Derived_gen.10): joinpoint TotallyNotJson.1217 TotallyNotJson.1169: let TotallyNotJson.842 : List Str = StructAtIndex 0 TotallyNotJson.1169; let TotallyNotJson.841 : List Str = StructAtIndex 1 TotallyNotJson.1169; @@ -1366,7 +1366,7 @@ procedure TotallyNotJson.98 (#Derived_gen.30): let TotallyNotJson.1218 : {List Str, List Str} = Struct {TotallyNotJson.842, TotallyNotJson.841}; ret TotallyNotJson.1218; in - jump TotallyNotJson.1217 #Derived_gen.30; + jump TotallyNotJson.1217 #Derived_gen.10; procedure Test.0 (): let Test.11 : Str = "foo"; diff --git a/crates/compiler/test_mono/generated/encode_derived_record_two_field_strings.txt b/crates/compiler/test_mono/generated/encode_derived_record_two_field_strings.txt index 810705ef6f..25f3b04045 100644 --- a/crates/compiler/test_mono/generated/encode_derived_record_two_field_strings.txt +++ b/crates/compiler/test_mono/generated/encode_derived_record_two_field_strings.txt @@ -199,7 +199,7 @@ procedure List.8 (#Attr.2, #Attr.3): let List.600 : List U8 = lowlevel ListConcat #Attr.2 #Attr.3; ret List.600; -procedure List.80 (#Derived_gen.14, #Derived_gen.15, #Derived_gen.16, #Derived_gen.17, #Derived_gen.18): +procedure List.80 (#Derived_gen.15, #Derived_gen.16, #Derived_gen.17, #Derived_gen.18, #Derived_gen.19): joinpoint List.647 List.439 List.440 List.441 List.442 List.443: let List.649 : Int1 = CallByName Num.22 List.442 List.443; if List.649 then @@ -223,9 +223,9 @@ procedure List.80 (#Derived_gen.14, #Derived_gen.15, #Derived_gen.16, #Derived_g let List.648 : [C {U64, Int1}, C {U64, Int1}] = TagId(1) List.440; ret List.648; in - jump List.647 #Derived_gen.14 #Derived_gen.15 #Derived_gen.16 #Derived_gen.17 #Derived_gen.18; + jump List.647 #Derived_gen.15 #Derived_gen.16 #Derived_gen.17 #Derived_gen.18 #Derived_gen.19; -procedure List.80 (#Derived_gen.22, #Derived_gen.23, #Derived_gen.24, #Derived_gen.25, #Derived_gen.26): +procedure List.80 (#Derived_gen.20, #Derived_gen.21, #Derived_gen.22, #Derived_gen.23, #Derived_gen.24): joinpoint List.576 List.439 List.440 List.441 List.442 List.443: let List.578 : Int1 = CallByName Num.22 List.442 List.443; if List.578 then @@ -238,7 +238,7 @@ procedure List.80 (#Derived_gen.22, #Derived_gen.23, #Derived_gen.24, #Derived_g dec List.439; ret List.440; in - jump List.576 #Derived_gen.22 #Derived_gen.23 #Derived_gen.24 #Derived_gen.25 #Derived_gen.26; + jump List.576 #Derived_gen.20 #Derived_gen.21 #Derived_gen.22 #Derived_gen.23 #Derived_gen.24; procedure List.80 (#Derived_gen.35, #Derived_gen.36, #Derived_gen.37, #Derived_gen.38, #Derived_gen.39): joinpoint List.556 List.439 List.440 List.441 List.442 List.443: @@ -1222,14 +1222,14 @@ procedure TotallyNotJson.82 (TotallyNotJson.802, TotallyNotJson.803): procedure TotallyNotJson.832 (TotallyNotJson.1493): let TotallyNotJson.1494 : List Str = StructAtIndex 1 TotallyNotJson.1493; - let #Derived_gen.42 : List Str = StructAtIndex 0 TotallyNotJson.1493; - dec #Derived_gen.42; + let #Derived_gen.41 : List Str = StructAtIndex 0 TotallyNotJson.1493; + dec #Derived_gen.41; ret TotallyNotJson.1494; procedure TotallyNotJson.840 (TotallyNotJson.1214): let TotallyNotJson.1215 : List Str = StructAtIndex 1 TotallyNotJson.1214; - let #Derived_gen.41 : List Str = StructAtIndex 0 TotallyNotJson.1214; - dec #Derived_gen.41; + let #Derived_gen.42 : List Str = StructAtIndex 0 TotallyNotJson.1214; + dec #Derived_gen.42; ret TotallyNotJson.1215; procedure TotallyNotJson.87 (TotallyNotJson.809): @@ -1262,8 +1262,8 @@ procedure TotallyNotJson.94 (TotallyNotJson.824): let TotallyNotJson.1400 : List Str = CallByName List.13 TotallyNotJson.828 TotallyNotJson.827; let TotallyNotJson.1401 : Str = ""; let TotallyNotJson.1399 : Str = CallByName Str.4 TotallyNotJson.1400 TotallyNotJson.1401; - dec TotallyNotJson.1400; dec TotallyNotJson.1401; + dec TotallyNotJson.1400; ret TotallyNotJson.1399; else dec TotallyNotJson.825; @@ -1284,7 +1284,7 @@ procedure TotallyNotJson.95 (TotallyNotJson.829): dec TotallyNotJson.1489; ret TotallyNotJson.1488; -procedure TotallyNotJson.96 (#Derived_gen.30): +procedure TotallyNotJson.96 (#Derived_gen.34): joinpoint TotallyNotJson.1496 TotallyNotJson.1168: let TotallyNotJson.834 : List Str = StructAtIndex 0 TotallyNotJson.1168; let TotallyNotJson.833 : List Str = StructAtIndex 1 TotallyNotJson.1168; @@ -1320,7 +1320,7 @@ procedure TotallyNotJson.96 (#Derived_gen.30): let TotallyNotJson.1497 : {List Str, List Str} = Struct {TotallyNotJson.834, TotallyNotJson.833}; ret TotallyNotJson.1497; in - jump TotallyNotJson.1496 #Derived_gen.30; + jump TotallyNotJson.1496 #Derived_gen.34; procedure TotallyNotJson.97 (TotallyNotJson.837): let TotallyNotJson.838 : List Str = CallByName Str.55 TotallyNotJson.837; @@ -1337,7 +1337,7 @@ procedure TotallyNotJson.97 (TotallyNotJson.837): dec TotallyNotJson.1210; ret TotallyNotJson.1209; -procedure TotallyNotJson.98 (#Derived_gen.34): +procedure TotallyNotJson.98 (#Derived_gen.14): joinpoint TotallyNotJson.1217 TotallyNotJson.1169: let TotallyNotJson.842 : List Str = StructAtIndex 0 TotallyNotJson.1169; let TotallyNotJson.841 : List Str = StructAtIndex 1 TotallyNotJson.1169; @@ -1373,7 +1373,7 @@ procedure TotallyNotJson.98 (#Derived_gen.34): let TotallyNotJson.1218 : {List Str, List Str} = Struct {TotallyNotJson.842, TotallyNotJson.841}; ret TotallyNotJson.1218; in - jump TotallyNotJson.1217 #Derived_gen.34; + jump TotallyNotJson.1217 #Derived_gen.14; procedure Test.0 (): let Test.11 : Str = "foo"; diff --git a/crates/compiler/test_mono/generated/encode_derived_string.txt b/crates/compiler/test_mono/generated/encode_derived_string.txt index 3d42e396c8..be6f580b91 100644 --- a/crates/compiler/test_mono/generated/encode_derived_string.txt +++ b/crates/compiler/test_mono/generated/encode_derived_string.txt @@ -88,7 +88,7 @@ procedure List.8 (#Attr.2, #Attr.3): let List.529 : List U8 = lowlevel ListConcat #Attr.2 #Attr.3; ret List.529; -procedure List.80 (#Derived_gen.0, #Derived_gen.1, #Derived_gen.2, #Derived_gen.3, #Derived_gen.4): +procedure List.80 (#Derived_gen.3, #Derived_gen.4, #Derived_gen.5, #Derived_gen.6, #Derived_gen.7): joinpoint List.540 List.439 List.440 List.441 List.442 List.443: let List.542 : Int1 = CallByName Num.22 List.442 List.443; if List.542 then @@ -101,7 +101,7 @@ procedure List.80 (#Derived_gen.0, #Derived_gen.1, #Derived_gen.2, #Derived_gen. dec List.439; ret List.440; in - jump List.540 #Derived_gen.0 #Derived_gen.1 #Derived_gen.2 #Derived_gen.3 #Derived_gen.4; + jump List.540 #Derived_gen.3 #Derived_gen.4 #Derived_gen.5 #Derived_gen.6 #Derived_gen.7; procedure List.80 (#Derived_gen.8, #Derived_gen.9, #Derived_gen.10, #Derived_gen.11, #Derived_gen.12): joinpoint List.578 List.439 List.440 List.441 List.442 List.443: diff --git a/crates/compiler/test_mono/generated/encode_derived_tag_one_field_string.txt b/crates/compiler/test_mono/generated/encode_derived_tag_one_field_string.txt index d89fbb2e38..6a54186716 100644 --- a/crates/compiler/test_mono/generated/encode_derived_tag_one_field_string.txt +++ b/crates/compiler/test_mono/generated/encode_derived_tag_one_field_string.txt @@ -173,7 +173,7 @@ procedure List.80 (#Derived_gen.16, #Derived_gen.17, #Derived_gen.18, #Derived_g in jump List.627 #Derived_gen.16 #Derived_gen.17 #Derived_gen.18 #Derived_gen.19 #Derived_gen.20; -procedure List.80 (#Derived_gen.24, #Derived_gen.25, #Derived_gen.26, #Derived_gen.27, #Derived_gen.28): +procedure List.80 (#Derived_gen.21, #Derived_gen.22, #Derived_gen.23, #Derived_gen.24, #Derived_gen.25): joinpoint List.574 List.439 List.440 List.441 List.442 List.443: let List.576 : Int1 = CallByName Num.22 List.442 List.443; if List.576 then @@ -186,7 +186,7 @@ procedure List.80 (#Derived_gen.24, #Derived_gen.25, #Derived_gen.26, #Derived_g dec List.439; ret List.440; in - jump List.574 #Derived_gen.24 #Derived_gen.25 #Derived_gen.26 #Derived_gen.27 #Derived_gen.28; + jump List.574 #Derived_gen.21 #Derived_gen.22 #Derived_gen.23 #Derived_gen.24 #Derived_gen.25; procedure List.80 (#Derived_gen.29, #Derived_gen.30, #Derived_gen.31, #Derived_gen.32, #Derived_gen.33): joinpoint List.554 List.439 List.440 List.441 List.442 List.443: diff --git a/crates/compiler/test_mono/generated/encode_derived_tag_two_payloads_string.txt b/crates/compiler/test_mono/generated/encode_derived_tag_two_payloads_string.txt index 93524dfb6b..cddc9bc474 100644 --- a/crates/compiler/test_mono/generated/encode_derived_tag_two_payloads_string.txt +++ b/crates/compiler/test_mono/generated/encode_derived_tag_two_payloads_string.txt @@ -150,7 +150,7 @@ procedure List.8 (#Attr.2, #Attr.3): let List.599 : List U8 = lowlevel ListConcat #Attr.2 #Attr.3; ret List.599; -procedure List.80 (#Derived_gen.11, #Derived_gen.12, #Derived_gen.13, #Derived_gen.14, #Derived_gen.15): +procedure List.80 (#Derived_gen.14, #Derived_gen.15, #Derived_gen.16, #Derived_gen.17, #Derived_gen.18): joinpoint List.627 List.439 List.440 List.441 List.442 List.443: let List.629 : Int1 = CallByName Num.22 List.442 List.443; if List.629 then @@ -174,7 +174,7 @@ procedure List.80 (#Derived_gen.11, #Derived_gen.12, #Derived_gen.13, #Derived_g let List.628 : [C {U64, Int1}, C {U64, Int1}] = TagId(1) List.440; ret List.628; in - jump List.627 #Derived_gen.11 #Derived_gen.12 #Derived_gen.13 #Derived_gen.14 #Derived_gen.15; + jump List.627 #Derived_gen.14 #Derived_gen.15 #Derived_gen.16 #Derived_gen.17 #Derived_gen.18; procedure List.80 (#Derived_gen.19, #Derived_gen.20, #Derived_gen.21, #Derived_gen.22, #Derived_gen.23): joinpoint List.554 List.439 List.440 List.441 List.442 List.443: diff --git a/crates/compiler/test_mono/generated/inline_return_joinpoints_in_union_lambda_set.txt b/crates/compiler/test_mono/generated/inline_return_joinpoints_in_union_lambda_set.txt index 6ab49274c5..750e2fa29d 100644 --- a/crates/compiler/test_mono/generated/inline_return_joinpoints_in_union_lambda_set.txt +++ b/crates/compiler/test_mono/generated/inline_return_joinpoints_in_union_lambda_set.txt @@ -17,7 +17,7 @@ procedure Test.4 (Test.5, #Attr.12): let Test.16 : I64 = CallByName Num.19 Test.5 Test.1; ret Test.16; -procedure Test.0 (#Derived_gen.0): +procedure Test.0 (#Derived_gen.2): joinpoint Test.7 Test.1: let Test.20 : I64 = 1i64; let Test.9 : I64 = CallByName Num.19 Test.1 Test.20; @@ -33,4 +33,4 @@ procedure Test.0 (#Derived_gen.0): ret Test.8; in - jump Test.7 #Derived_gen.0; + jump Test.7 #Derived_gen.2; diff --git a/crates/compiler/test_mono/generated/issue_4749.txt b/crates/compiler/test_mono/generated/issue_4749.txt index 61797ec653..962d50a255 100644 --- a/crates/compiler/test_mono/generated/issue_4749.txt +++ b/crates/compiler/test_mono/generated/issue_4749.txt @@ -163,7 +163,7 @@ procedure List.8 (#Attr.2, #Attr.3): let List.547 : List U8 = lowlevel ListConcat #Attr.2 #Attr.3; ret List.547; -procedure List.80 (#Derived_gen.0, #Derived_gen.1, #Derived_gen.2, #Derived_gen.3, #Derived_gen.4): +procedure List.80 (#Derived_gen.1, #Derived_gen.2, #Derived_gen.3, #Derived_gen.4, #Derived_gen.5): joinpoint List.599 List.439 List.440 List.441 List.442 List.443: let List.601 : Int1 = CallByName Num.22 List.442 List.443; if List.601 then @@ -187,7 +187,7 @@ procedure List.80 (#Derived_gen.0, #Derived_gen.1, #Derived_gen.2, #Derived_gen. let List.600 : [C [C U64, C U64, C U64, C , C , C U64, C U64, C U64, C U64], C [C U64, C U64, C U64, C , C , C U64, C U64, C U64, C U64]] = TagId(1) List.440; ret List.600; in - jump List.599 #Derived_gen.0 #Derived_gen.1 #Derived_gen.2 #Derived_gen.3 #Derived_gen.4; + jump List.599 #Derived_gen.1 #Derived_gen.2 #Derived_gen.3 #Derived_gen.4 #Derived_gen.5; procedure List.93 (List.436, List.437, List.438): let List.597 : U64 = 0i64; @@ -247,8 +247,8 @@ procedure Str.9 (Str.79): else let Str.291 : U8 = StructAtIndex 3 Str.80; let Str.292 : U64 = StructAtIndex 0 Str.80; - let #Derived_gen.6 : Str = StructAtIndex 1 Str.80; - dec #Derived_gen.6; + let #Derived_gen.7 : Str = StructAtIndex 1 Str.80; + dec #Derived_gen.7; let Str.290 : {U64, U8} = Struct {Str.292, Str.291}; let Str.289 : [C {U64, U8}, C Str] = TagId(0) Str.290; ret Str.289; @@ -263,8 +263,8 @@ procedure Test.3 (): let Test.5 : Int1 = CallByName Bool.11 Test.1 Test.6; dec Test.7; expect Test.5; - dec Test.0; dec Test.1; + dec Test.0; let Test.4 : {} = Struct {}; ret Test.4; @@ -281,8 +281,8 @@ procedure TotallyNotJson.525 (TotallyNotJson.526, TotallyNotJson.1175): inc TotallyNotJson.529; let TotallyNotJson.1323 : Int1 = CallByName List.1 TotallyNotJson.529; if TotallyNotJson.1323 then - dec TotallyNotJson.529; dec TotallyNotJson.530; + dec TotallyNotJson.529; let TotallyNotJson.1326 : {} = Struct {}; let TotallyNotJson.1325 : [C {}, C Str] = TagId(0) TotallyNotJson.1326; let TotallyNotJson.1324 : {List U8, [C {}, C Str]} = Struct {TotallyNotJson.526, TotallyNotJson.1325}; @@ -309,8 +309,8 @@ procedure TotallyNotJson.525 (TotallyNotJson.526, TotallyNotJson.1175): let TotallyNotJson.1181 : {List U8, [C {}, C Str]} = Struct {TotallyNotJson.530, TotallyNotJson.1182}; ret TotallyNotJson.1181; else - dec TotallyNotJson.533; dec TotallyNotJson.530; + dec TotallyNotJson.533; let TotallyNotJson.1185 : {} = Struct {}; let TotallyNotJson.1184 : [C {}, C Str] = TagId(0) TotallyNotJson.1185; let TotallyNotJson.1183 : {List U8, [C {}, C Str]} = Struct {TotallyNotJson.526, TotallyNotJson.1184}; @@ -365,8 +365,8 @@ procedure TotallyNotJson.534 (TotallyNotJson.535): procedure TotallyNotJson.536 (TotallyNotJson.1192): let TotallyNotJson.1193 : List U8 = StructAtIndex 1 TotallyNotJson.1192; - let #Derived_gen.7 : List U8 = StructAtIndex 0 TotallyNotJson.1192; - dec #Derived_gen.7; + let #Derived_gen.6 : List U8 = StructAtIndex 0 TotallyNotJson.1192; + dec #Derived_gen.6; ret TotallyNotJson.1193; procedure TotallyNotJson.60 (): @@ -733,7 +733,7 @@ procedure TotallyNotJson.69 (): let TotallyNotJson.1247 : List U8 = CallByName TotallyNotJson.68 TotallyNotJson.1248 TotallyNotJson.1249 TotallyNotJson.1250 TotallyNotJson.1251; ret TotallyNotJson.1247; -procedure TotallyNotJson.70 (#Derived_gen.5): +procedure TotallyNotJson.70 (#Derived_gen.0): joinpoint TotallyNotJson.1198 TotallyNotJson.1166: let TotallyNotJson.600 : List U8 = StructAtIndex 0 TotallyNotJson.1166; inc 4 TotallyNotJson.600; @@ -834,4 +834,4 @@ procedure TotallyNotJson.70 (#Derived_gen.5): let TotallyNotJson.1276 : {List U8, List U8} = Struct {TotallyNotJson.600, TotallyNotJson.601}; ret TotallyNotJson.1276; in - jump TotallyNotJson.1198 #Derived_gen.5; + jump TotallyNotJson.1198 #Derived_gen.0; diff --git a/crates/compiler/test_mono/generated/issue_4772_weakened_monomorphic_destructure.txt b/crates/compiler/test_mono/generated/issue_4772_weakened_monomorphic_destructure.txt index 368ce7bef1..0329be3c40 100644 --- a/crates/compiler/test_mono/generated/issue_4772_weakened_monomorphic_destructure.txt +++ b/crates/compiler/test_mono/generated/issue_4772_weakened_monomorphic_destructure.txt @@ -248,8 +248,8 @@ procedure Str.9 (Str.79): else let Str.301 : U8 = StructAtIndex 3 Str.80; let Str.302 : U64 = StructAtIndex 0 Str.80; - let #Derived_gen.7 : Str = StructAtIndex 1 Str.80; - dec #Derived_gen.7; + let #Derived_gen.6 : Str = StructAtIndex 1 Str.80; + dec #Derived_gen.6; let Str.300 : {U64, U8} = Struct {Str.302, Str.301}; let Str.299 : [C {U64, U8}, C Str] = TagId(0) Str.300; ret Str.299; @@ -281,8 +281,8 @@ procedure Test.0 (): let Test.22 : [C Str, C {List U8, I64}] = TagId(0) Test.24; ret Test.22; else - dec Test.1; dec Test.2; + dec Test.1; let Test.30 : Str = "not a number"; let Test.28 : [C Str, C {List U8, I64}] = TagId(0) Test.30; ret Test.28; @@ -313,8 +313,8 @@ procedure TotallyNotJson.525 (TotallyNotJson.526, TotallyNotJson.1175): inc TotallyNotJson.529; let TotallyNotJson.1323 : Int1 = CallByName List.1 TotallyNotJson.529; if TotallyNotJson.1323 then - dec TotallyNotJson.529; dec TotallyNotJson.530; + dec TotallyNotJson.529; let TotallyNotJson.1326 : {} = Struct {}; let TotallyNotJson.1325 : [C {}, C Str] = TagId(0) TotallyNotJson.1326; let TotallyNotJson.1324 : {List U8, [C {}, C Str]} = Struct {TotallyNotJson.526, TotallyNotJson.1325}; @@ -341,8 +341,8 @@ procedure TotallyNotJson.525 (TotallyNotJson.526, TotallyNotJson.1175): let TotallyNotJson.1181 : {List U8, [C {}, C Str]} = Struct {TotallyNotJson.530, TotallyNotJson.1182}; ret TotallyNotJson.1181; else - dec TotallyNotJson.533; dec TotallyNotJson.530; + dec TotallyNotJson.533; let TotallyNotJson.1185 : {} = Struct {}; let TotallyNotJson.1184 : [C {}, C Str] = TagId(0) TotallyNotJson.1185; let TotallyNotJson.1183 : {List U8, [C {}, C Str]} = Struct {TotallyNotJson.526, TotallyNotJson.1184}; @@ -397,8 +397,8 @@ procedure TotallyNotJson.534 (TotallyNotJson.535): procedure TotallyNotJson.536 (TotallyNotJson.1192): let TotallyNotJson.1193 : List U8 = StructAtIndex 1 TotallyNotJson.1192; - let #Derived_gen.6 : List U8 = StructAtIndex 0 TotallyNotJson.1192; - dec #Derived_gen.6; + let #Derived_gen.7 : List U8 = StructAtIndex 0 TotallyNotJson.1192; + dec #Derived_gen.7; ret TotallyNotJson.1193; procedure TotallyNotJson.60 (): diff --git a/crates/compiler/test_mono/generated/list_map_take_capturing_or_noncapturing.txt b/crates/compiler/test_mono/generated/list_map_take_capturing_or_noncapturing.txt index 6054fd9062..f99e41aaf1 100644 --- a/crates/compiler/test_mono/generated/list_map_take_capturing_or_noncapturing.txt +++ b/crates/compiler/test_mono/generated/list_map_take_capturing_or_noncapturing.txt @@ -57,8 +57,8 @@ procedure Test.0 (): else let Test.20 : Str = "B"; let Test.21 : Int1 = lowlevel Eq Test.20 Test.12; - dec Test.20; dec Test.12; + dec Test.20; if Test.21 then let Test.16 : [C U8, C U8, C ] = TagId(1) Test.2; jump Test.13 Test.16; diff --git a/crates/compiler/test_mono/generated/pattern_as_toplevel.txt b/crates/compiler/test_mono/generated/pattern_as_toplevel.txt index 4a70501f51..a124668cf0 100644 --- a/crates/compiler/test_mono/generated/pattern_as_toplevel.txt +++ b/crates/compiler/test_mono/generated/pattern_as_toplevel.txt @@ -20,9 +20,9 @@ procedure Test.0 (): if Test.13 then let Test.6 : {I64, Str} = CallByName Test.1; let Test.5 : Int1 = CallByName Bool.11 Test.6 Test.4; - dec Test.6; let #Derived_gen.0 : Str = StructAtIndex 1 Test.4; dec #Derived_gen.0; + dec Test.6; ret Test.5; else let #Derived_gen.1 : Str = StructAtIndex 1 Test.4; diff --git a/crates/compiler/test_mono/generated/recursive_function_and_union_with_inference_hole.txt b/crates/compiler/test_mono/generated/recursive_function_and_union_with_inference_hole.txt index 2e772fba51..32b2274361 100644 --- a/crates/compiler/test_mono/generated/recursive_function_and_union_with_inference_hole.txt +++ b/crates/compiler/test_mono/generated/recursive_function_and_union_with_inference_hole.txt @@ -6,10 +6,10 @@ procedure List.5 (#Attr.2, #Attr.3): procedure Test.2 (Test.5): let Test.6 : List [C List *self] = UnionAtIndex (Id 0) (Index 0) Test.5; inc Test.6; - let #Derived_gen.2 : [C List *self] = Reset { symbol: Test.5, id: UpdateModeId { id: 1 } }; + let #Derived_gen.1 : [C List *self] = Reset { symbol: Test.5, id: UpdateModeId { id: 0 } }; let Test.15 : {} = Struct {}; let Test.7 : List [C List *self] = CallByName List.5 Test.6 Test.15; - let Test.14 : [C List *self] = Reuse #Derived_gen.2 UpdateModeId { id: 1 } TagId(0) Test.7; + let Test.14 : [C List *self] = Reuse #Derived_gen.1 UpdateModeId { id: 0 } TagId(0) Test.7; ret Test.14; procedure Test.0 (): diff --git a/crates/compiler/test_mono/generated/recursive_lambda_set_resolved_only_upon_specialization.txt b/crates/compiler/test_mono/generated/recursive_lambda_set_resolved_only_upon_specialization.txt index a6ad8acc15..4dd159615f 100644 --- a/crates/compiler/test_mono/generated/recursive_lambda_set_resolved_only_upon_specialization.txt +++ b/crates/compiler/test_mono/generated/recursive_lambda_set_resolved_only_upon_specialization.txt @@ -10,7 +10,7 @@ procedure Num.21 (#Attr.2, #Attr.3): let Num.292 : U8 = lowlevel NumMul #Attr.2 #Attr.3; ret Num.292; -procedure Test.1 (#Derived_gen.0, #Derived_gen.1): +procedure Test.1 (#Derived_gen.2, #Derived_gen.3): joinpoint Test.11 Test.2 Test.3: let Test.24 : U8 = 0i64; let Test.20 : Int1 = CallByName Bool.11 Test.2 Test.24; @@ -33,9 +33,9 @@ procedure Test.1 (#Derived_gen.0, #Derived_gen.1): let Test.14 : [, C *self U8] = TagId(0) Test.3 Test.2; jump Test.11 Test.13 Test.14; in - jump Test.11 #Derived_gen.0 #Derived_gen.1; + jump Test.11 #Derived_gen.2 #Derived_gen.3; -procedure Test.4 (#Derived_gen.2, #Derived_gen.3): +procedure Test.4 (#Derived_gen.0, #Derived_gen.1): joinpoint Test.15 Test.5 #Attr.12: let Test.2 : U8 = UnionAtIndex (Id 0) (Index 1) #Attr.12; let Test.3 : [, C *self U8] = UnionAtIndex (Id 0) (Index 0) #Attr.12; @@ -61,7 +61,7 @@ procedure Test.4 (#Derived_gen.2, #Derived_gen.3): decref #Attr.12; jump #Derived_gen.4; in - jump Test.15 #Derived_gen.2 #Derived_gen.3; + jump Test.15 #Derived_gen.0 #Derived_gen.1; procedure Test.6 (Test.7): ret Test.7; diff --git a/crates/compiler/test_mono/generated/recursively_build_effect.txt b/crates/compiler/test_mono/generated/recursively_build_effect.txt index cac652954a..7d1b9ea289 100644 --- a/crates/compiler/test_mono/generated/recursively_build_effect.txt +++ b/crates/compiler/test_mono/generated/recursively_build_effect.txt @@ -8,8 +8,8 @@ procedure Str.3 (#Attr.2, #Attr.3): procedure Test.11 (Test.29, #Attr.12): let Test.10 : {} = UnionAtIndex (Id 0) (Index 0) #Attr.12; - let #Derived_gen.9 : Int1 = lowlevel RefCountIsUnique #Attr.12; - if #Derived_gen.9 then + let #Derived_gen.11 : Int1 = lowlevel RefCountIsUnique #Attr.12; + if #Derived_gen.11 then free #Attr.12; ret Test.10; else @@ -19,11 +19,11 @@ procedure Test.11 (Test.29, #Attr.12): procedure Test.11 (Test.29, Test.10): ret Test.10; -procedure Test.14 (#Derived_gen.7, #Derived_gen.8): +procedure Test.14 (#Derived_gen.0, #Derived_gen.1): joinpoint Test.37 Test.36 #Attr.12: let Test.12 : {} = UnionAtIndex (Id 1) (Index 1) #Attr.12; let Test.13 : I64 = UnionAtIndex (Id 1) (Index 0) #Attr.12; - joinpoint #Derived_gen.10: + joinpoint #Derived_gen.9: let Test.43 : {} = Struct {}; let Test.42 : {} = CallByName Test.11 Test.43 Test.12; let Test.38 : [C {}, C I64 {}] = CallByName Test.9 Test.42 Test.13; @@ -38,15 +38,15 @@ procedure Test.14 (#Derived_gen.7, #Derived_gen.8): jump Test.37 Test.40 Test.38; in - let #Derived_gen.11 : Int1 = lowlevel RefCountIsUnique #Attr.12; - if #Derived_gen.11 then + let #Derived_gen.10 : Int1 = lowlevel RefCountIsUnique #Attr.12; + if #Derived_gen.10 then free #Attr.12; - jump #Derived_gen.10; + jump #Derived_gen.9; else decref #Attr.12; - jump #Derived_gen.10; + jump #Derived_gen.9; in - jump Test.37 #Derived_gen.7 #Derived_gen.8; + jump Test.37 #Derived_gen.0 #Derived_gen.1; procedure Test.2 (): let Test.6 : Str = "Hello"; diff --git a/crates/compiler/test_mono/generated/specialize_after_match.txt b/crates/compiler/test_mono/generated/specialize_after_match.txt index dfb63f7e7d..58d5048463 100644 --- a/crates/compiler/test_mono/generated/specialize_after_match.txt +++ b/crates/compiler/test_mono/generated/specialize_after_match.txt @@ -23,7 +23,7 @@ procedure Test.2 (Test.9, Test.10): let Test.29 : U64 = CallByName Test.3 Test.9; ret Test.29; else - joinpoint #Derived_gen.4: + joinpoint #Derived_gen.1: let Test.13 : Str = UnionAtIndex (Id 0) (Index 0) Test.10; let Test.14 : [, C Str *self] = UnionAtIndex (Id 0) (Index 1) Test.10; let Test.33 : U64 = CallByName Test.3 Test.12; @@ -36,15 +36,15 @@ procedure Test.2 (Test.9, Test.10): else ret Test.16; in - let #Derived_gen.5 : Int1 = lowlevel RefCountIsUnique Test.9; - if #Derived_gen.5 then + let #Derived_gen.2 : Int1 = lowlevel RefCountIsUnique Test.9; + if #Derived_gen.2 then dec Test.11; free Test.9; - jump #Derived_gen.4; + jump #Derived_gen.1; else inc Test.12; decref Test.9; - jump #Derived_gen.4; + jump #Derived_gen.1; procedure Test.3 (Test.17): let Test.26 : U8 = 1i64; @@ -55,22 +55,22 @@ procedure Test.3 (Test.17): ret Test.22; else let Test.18 : [, C Str *self] = UnionAtIndex (Id 0) (Index 1) Test.17; - joinpoint #Derived_gen.1: + joinpoint #Derived_gen.3: let Test.24 : U64 = 1i64; let Test.25 : U64 = CallByName Test.3 Test.18; let Test.23 : U64 = CallByName Num.19 Test.24 Test.25; ret Test.23; in - let #Derived_gen.3 : Int1 = lowlevel RefCountIsUnique Test.17; - if #Derived_gen.3 then - let #Derived_gen.2 : Str = UnionAtIndex (Id 0) (Index 0) Test.17; - dec #Derived_gen.2; + let #Derived_gen.5 : Int1 = lowlevel RefCountIsUnique Test.17; + if #Derived_gen.5 then + let #Derived_gen.4 : Str = UnionAtIndex (Id 0) (Index 0) Test.17; + dec #Derived_gen.4; free Test.17; - jump #Derived_gen.1; + jump #Derived_gen.3; else inc Test.18; decref Test.17; - jump #Derived_gen.1; + jump #Derived_gen.3; procedure Test.0 (): let Test.5 : [, C Str *self] = TagId(1) ; diff --git a/crates/compiler/test_mono/generated/unspecialized_lambda_set_unification_does_not_duplicate_identical_concrete_types.txt b/crates/compiler/test_mono/generated/unspecialized_lambda_set_unification_does_not_duplicate_identical_concrete_types.txt index ebeec28457..2777a240c6 100644 --- a/crates/compiler/test_mono/generated/unspecialized_lambda_set_unification_does_not_duplicate_identical_concrete_types.txt +++ b/crates/compiler/test_mono/generated/unspecialized_lambda_set_unification_does_not_duplicate_identical_concrete_types.txt @@ -136,7 +136,7 @@ procedure List.8 (#Attr.2, #Attr.3): let List.598 : List U8 = lowlevel ListConcat #Attr.2 #Attr.3; ret List.598; -procedure List.80 (#Derived_gen.19, #Derived_gen.20, #Derived_gen.21, #Derived_gen.22, #Derived_gen.23): +procedure List.80 (#Derived_gen.16, #Derived_gen.17, #Derived_gen.18, #Derived_gen.19, #Derived_gen.20): joinpoint List.553 List.439 List.440 List.441 List.442 List.443: let List.555 : Int1 = CallByName Num.22 List.442 List.443; if List.555 then @@ -150,7 +150,7 @@ procedure List.80 (#Derived_gen.19, #Derived_gen.20, #Derived_gen.21, #Derived_g dec List.439; ret List.440; in - jump List.553 #Derived_gen.19 #Derived_gen.20 #Derived_gen.21 #Derived_gen.22 #Derived_gen.23; + jump List.553 #Derived_gen.16 #Derived_gen.17 #Derived_gen.18 #Derived_gen.19 #Derived_gen.20; procedure List.80 (#Derived_gen.3, #Derived_gen.4, #Derived_gen.5, #Derived_gen.6, #Derived_gen.7): joinpoint List.573 List.439 List.440 List.441 List.442 List.443: