From 8698ea3c72f0a6b9501fe96881f16b481322bc5f Mon Sep 17 00:00:00 2001 From: Folkert Date: Sun, 23 Jan 2022 15:46:53 +0100 Subject: [PATCH] update mono tests --- compiler/test_mono/generated/closure_in_list.txt | 7 ++++--- .../generated/empty_list_of_function_type.txt | 16 ++++++++-------- compiler/test_mono/generated/factorial.txt | 8 ++++---- compiler/test_mono/generated/ir_int_add.txt | 8 ++++---- compiler/test_mono/generated/ir_plus.txt | 4 ++-- compiler/test_mono/generated/ir_round.txt | 4 ++-- compiler/test_mono/generated/ir_two_defs.txt | 4 ++-- compiler/test_mono/generated/ir_when_idiv.txt | 4 ++-- compiler/test_mono/generated/ir_when_just.txt | 4 ++-- .../generated/linked_list_length_twice.txt | 6 +++--- .../generated/list_cannot_update_inplace.txt | 4 ++-- compiler/test_mono/generated/list_len.txt | 4 ++-- .../generated/monomorphized_ints_aliased.txt | 8 ++++---- compiler/test_mono/generated/nested_closure.txt | 5 +++-- .../test_mono/generated/nested_pattern_match.txt | 4 ++-- compiler/test_mono/generated/optional_when.txt | 8 ++++---- compiler/test_mono/generated/quicksort_help.txt | 12 ++++++------ ...rd_optional_field_function_no_use_default.txt | 4 ++-- ...ecord_optional_field_function_use_default.txt | 4 ++-- .../record_optional_field_let_no_use_default.txt | 4 ++-- .../record_optional_field_let_use_default.txt | 4 ++-- .../generated/somehow_drops_definitions.txt | 12 ++++++------ .../test_mono/generated/specialize_closures.txt | 12 ++++++------ .../test_mono/generated/specialize_lowlevel.txt | 12 ++++++------ .../test_mono/generated/when_nested_maybe.txt | 4 ++-- compiler/test_mono/generated/when_on_record.txt | 4 ++-- .../test_mono/generated/when_on_two_values.txt | 4 ++-- 27 files changed, 88 insertions(+), 86 deletions(-) diff --git a/compiler/test_mono/generated/closure_in_list.txt b/compiler/test_mono/generated/closure_in_list.txt index b4de3287e0..7ac145a0d4 100644 --- a/compiler/test_mono/generated/closure_in_list.txt +++ b/compiler/test_mono/generated/closure_in_list.txt @@ -3,8 +3,9 @@ procedure List.7 (#Attr.2): ret Test.7; procedure Test.1 (Test.5): - let Test.11 : LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }) = Struct {Test.2}; - let Test.10 : Builtin(List(LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }))) = Array [Test.11]; + let Test.2 : Builtin(Int(I64)) = 41i64; + let Test.11 : LambdaSet(LambdaSet { set: [( Test.3, [Builtin(Int(I64))])], representation: Struct([Builtin(Int(I64))]) }) = Struct {Test.2}; + let Test.10 : Builtin(List(LambdaSet(LambdaSet { set: [( Test.3, [Builtin(Int(I64))])], representation: Struct([Builtin(Int(I64))]) }))) = Array [Test.11]; ret Test.10; procedure Test.3 (Test.9, #Attr.12): @@ -14,7 +15,7 @@ procedure Test.3 (Test.9, #Attr.12): procedure Test.0 (): let Test.8 : Struct([]) = Struct {}; - let Test.4 : Builtin(List(LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }))) = CallByName Test.1 Test.8; + let Test.4 : Builtin(List(LambdaSet(LambdaSet { set: [( Test.3, [Builtin(Int(I64))])], representation: Struct([Builtin(Int(I64))]) }))) = CallByName Test.1 Test.8; let Test.6 : Builtin(Int(U64)) = CallByName List.7 Test.4; dec Test.4; ret Test.6; diff --git a/compiler/test_mono/generated/empty_list_of_function_type.txt b/compiler/test_mono/generated/empty_list_of_function_type.txt index e24846c6b4..44c1c42994 100644 --- a/compiler/test_mono/generated/empty_list_of_function_type.txt +++ b/compiler/test_mono/generated/empty_list_of_function_type.txt @@ -2,12 +2,12 @@ procedure List.3 (#Attr.2, #Attr.3): let Test.20 : Builtin(Int(U64)) = lowlevel ListLen #Attr.2; let Test.17 : Builtin(Bool) = lowlevel NumLt #Attr.3 Test.20; if Test.17 then - let Test.19 : LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = lowlevel ListGetUnsafe #Attr.2 #Attr.3; - let Test.18 : Union(NonRecursive([[Struct([])], [LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) })]])) = Ok Test.19; + let Test.19 : LambdaSet(LambdaSet { set: [( Test.2, [])], representation: Struct([]) }) = lowlevel ListGetUnsafe #Attr.2 #Attr.3; + let Test.18 : Union(NonRecursive([[Struct([])], [LambdaSet(LambdaSet { set: [( Test.2, [])], representation: Struct([]) })]])) = Ok Test.19; ret Test.18; else let Test.16 : Struct([]) = Struct {}; - let Test.15 : Union(NonRecursive([[Struct([])], [LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) })]])) = Err Test.16; + let Test.15 : Union(NonRecursive([[Struct([])], [LambdaSet(LambdaSet { set: [( Test.2, [])], representation: Struct([]) })]])) = Err Test.16; ret Test.15; procedure Test.2 (Test.6): @@ -17,13 +17,13 @@ procedure Test.2 (Test.6): procedure Test.0 (): joinpoint Test.22 Test.3: let Test.14 : Builtin(Int(U64)) = 0i64; - let Test.7 : Union(NonRecursive([[Struct([])], [LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) })]])) = CallByName List.3 Test.3 Test.14; + let Test.7 : Union(NonRecursive([[Struct([])], [LambdaSet(LambdaSet { set: [( Test.2, [])], representation: Struct([]) })]])) = CallByName List.3 Test.3 Test.14; dec Test.3; let Test.11 : Builtin(Int(U8)) = 1i64; let Test.12 : Builtin(Int(U8)) = GetTagId Test.7; let Test.13 : Builtin(Bool) = lowlevel Eq Test.11 Test.12; if Test.13 then - let Test.5 : LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = UnionAtIndex (Id 1) (Index 0) Test.7; + let Test.5 : LambdaSet(LambdaSet { set: [( Test.2, [])], representation: Struct([]) }) = UnionAtIndex (Id 1) (Index 0) Test.7; let Test.9 : Builtin(Str) = "foo"; let Test.8 : Builtin(Str) = CallByName Test.2 Test.9; dec Test.9; @@ -34,9 +34,9 @@ procedure Test.0 (): in let Test.25 : Builtin(Bool) = false; if Test.25 then - let Test.1 : Builtin(List(LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }))) = Array []; + let Test.1 : Builtin(List(LambdaSet(LambdaSet { set: [( Test.2, [])], representation: Struct([]) }))) = Array []; jump Test.22 Test.1; else - let Test.23 : LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = Struct {}; - let Test.21 : Builtin(List(LambdaSet([( Test.2, [])]LambdaSet { set: Ok(()), representation: Struct([]) }))) = Array [Test.23]; + let Test.23 : LambdaSet(LambdaSet { set: [( Test.2, [])], representation: Struct([]) }) = Struct {}; + let Test.21 : Builtin(List(LambdaSet(LambdaSet { set: [( Test.2, [])], representation: Struct([]) }))) = Array [Test.23]; jump Test.22 Test.21; diff --git a/compiler/test_mono/generated/factorial.txt b/compiler/test_mono/generated/factorial.txt index 3d5b2a9508..d0c12615da 100644 --- a/compiler/test_mono/generated/factorial.txt +++ b/compiler/test_mono/generated/factorial.txt @@ -1,8 +1,8 @@ -procedure Num.25 (#Attr.2, #Attr.3): +procedure Num.23 (#Attr.2, #Attr.3): let Test.14 : Builtin(Int(I64)) = lowlevel NumSub #Attr.2 #Attr.3; ret Test.14; -procedure Num.26 (#Attr.2, #Attr.3): +procedure Num.24 (#Attr.2, #Attr.3): let Test.12 : Builtin(Int(I64)) = lowlevel NumMul #Attr.2 #Attr.3; ret Test.12; @@ -14,8 +14,8 @@ procedure Test.1 (Test.17, Test.18): ret Test.3; else let Test.13 : Builtin(Int(I64)) = 1i64; - let Test.10 : Builtin(Int(I64)) = CallByName Num.25 Test.2 Test.13; - let Test.11 : Builtin(Int(I64)) = CallByName Num.26 Test.2 Test.3; + let Test.10 : Builtin(Int(I64)) = CallByName Num.23 Test.2 Test.13; + let Test.11 : Builtin(Int(I64)) = CallByName Num.24 Test.2 Test.3; jump Test.7 Test.10 Test.11; in jump Test.7 Test.17 Test.18; diff --git a/compiler/test_mono/generated/ir_int_add.txt b/compiler/test_mono/generated/ir_int_add.txt index 2d49bd57c1..e4ef7ac607 100644 --- a/compiler/test_mono/generated/ir_int_add.txt +++ b/compiler/test_mono/generated/ir_int_add.txt @@ -2,18 +2,18 @@ procedure List.7 (#Attr.2): let Test.7 : Builtin(Int(U64)) = lowlevel ListLen #Attr.2; ret Test.7; -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.5 : Builtin(Int(U64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.5; procedure Test.0 (): let Test.10 : Builtin(Int(U64)) = 5i64; let Test.11 : Builtin(Int(U64)) = 4i64; - let Test.8 : Builtin(Int(U64)) = CallByName Num.24 Test.10 Test.11; + let Test.8 : Builtin(Int(U64)) = CallByName Num.22 Test.10 Test.11; let Test.9 : Builtin(Int(U64)) = 3i64; - let Test.3 : Builtin(Int(U64)) = CallByName Num.24 Test.8 Test.9; + let Test.3 : Builtin(Int(U64)) = CallByName Num.22 Test.8 Test.9; let Test.6 : Builtin(List(Builtin(Int(I64)))) = Array [1i64, 2i64]; let Test.4 : Builtin(Int(U64)) = CallByName List.7 Test.6; dec Test.6; - let Test.2 : Builtin(Int(U64)) = CallByName Num.24 Test.3 Test.4; + let Test.2 : Builtin(Int(U64)) = CallByName Num.22 Test.3 Test.4; ret Test.2; diff --git a/compiler/test_mono/generated/ir_plus.txt b/compiler/test_mono/generated/ir_plus.txt index c4143d76e4..b0c0e1a060 100644 --- a/compiler/test_mono/generated/ir_plus.txt +++ b/compiler/test_mono/generated/ir_plus.txt @@ -1,9 +1,9 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.4 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.4; procedure Test.0 (): let Test.2 : Builtin(Int(I64)) = 1i64; let Test.3 : Builtin(Int(I64)) = 2i64; - let Test.1 : Builtin(Int(I64)) = CallByName Num.24 Test.2 Test.3; + let Test.1 : Builtin(Int(I64)) = CallByName Num.22 Test.2 Test.3; ret Test.1; diff --git a/compiler/test_mono/generated/ir_round.txt b/compiler/test_mono/generated/ir_round.txt index 4fa406093e..7f16bbcd71 100644 --- a/compiler/test_mono/generated/ir_round.txt +++ b/compiler/test_mono/generated/ir_round.txt @@ -1,8 +1,8 @@ -procedure Num.47 (#Attr.2): +procedure Num.45 (#Attr.2): let Test.3 : Builtin(Int(I64)) = lowlevel NumRound #Attr.2; ret Test.3; procedure Test.0 (): let Test.2 : Builtin(Float(F64)) = 3.6f64; - let Test.1 : Builtin(Int(I64)) = CallByName Num.47 Test.2; + let Test.1 : Builtin(Int(I64)) = CallByName Num.45 Test.2; ret Test.1; diff --git a/compiler/test_mono/generated/ir_two_defs.txt b/compiler/test_mono/generated/ir_two_defs.txt index 66b9bd2728..b39fc79319 100644 --- a/compiler/test_mono/generated/ir_two_defs.txt +++ b/compiler/test_mono/generated/ir_two_defs.txt @@ -1,9 +1,9 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.6 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.6; procedure Test.0 (): let Test.4 : Builtin(Int(I64)) = 3i64; let Test.5 : Builtin(Int(I64)) = 4i64; - let Test.3 : Builtin(Int(I64)) = CallByName Num.24 Test.4 Test.5; + let Test.3 : Builtin(Int(I64)) = CallByName Num.22 Test.4 Test.5; ret Test.3; diff --git a/compiler/test_mono/generated/ir_when_idiv.txt b/compiler/test_mono/generated/ir_when_idiv.txt index 12893c9523..6b60e0547c 100644 --- a/compiler/test_mono/generated/ir_when_idiv.txt +++ b/compiler/test_mono/generated/ir_when_idiv.txt @@ -1,4 +1,4 @@ -procedure Num.42 (#Attr.2, #Attr.3): +procedure Num.40 (#Attr.2, #Attr.3): let Test.15 : Builtin(Int(I64)) = 0i64; let Test.12 : Builtin(Bool) = lowlevel NotEq #Attr.3 Test.15; if Test.12 then @@ -13,7 +13,7 @@ procedure Num.42 (#Attr.2, #Attr.3): procedure Test.0 (): let Test.8 : Builtin(Int(I64)) = 1000i64; let Test.9 : Builtin(Int(I64)) = 10i64; - let Test.2 : Union(NonRecursive([[Struct([])], [Builtin(Int(I64))]])) = CallByName Num.42 Test.8 Test.9; + let Test.2 : Union(NonRecursive([[Struct([])], [Builtin(Int(I64))]])) = CallByName Num.40 Test.8 Test.9; let Test.5 : Builtin(Int(U8)) = 1i64; let Test.6 : Builtin(Int(U8)) = GetTagId Test.2; let Test.7 : Builtin(Bool) = lowlevel Eq Test.5 Test.6; diff --git a/compiler/test_mono/generated/ir_when_just.txt b/compiler/test_mono/generated/ir_when_just.txt index 5019316f49..a2ab04d249 100644 --- a/compiler/test_mono/generated/ir_when_just.txt +++ b/compiler/test_mono/generated/ir_when_just.txt @@ -1,4 +1,4 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.6 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.6; @@ -11,7 +11,7 @@ procedure Test.0 (): if Test.10 then let Test.3 : Builtin(Int(I64)) = UnionAtIndex (Id 0) (Index 0) Test.1; let Test.5 : Builtin(Int(I64)) = 1i64; - let Test.4 : Builtin(Int(I64)) = CallByName Num.24 Test.3 Test.5; + let Test.4 : Builtin(Int(I64)) = CallByName Num.22 Test.3 Test.5; ret Test.4; else let Test.7 : Builtin(Int(I64)) = 1i64; diff --git a/compiler/test_mono/generated/linked_list_length_twice.txt b/compiler/test_mono/generated/linked_list_length_twice.txt index 793926eec5..c791ad1cd4 100644 --- a/compiler/test_mono/generated/linked_list_length_twice.txt +++ b/compiler/test_mono/generated/linked_list_length_twice.txt @@ -1,4 +1,4 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.10 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.10; @@ -13,7 +13,7 @@ procedure Test.3 (Test.5): let Test.6 : Union(NullableUnwrapped { nullable_id: true, other_fields: [Builtin(Int(I64)), RecursivePointer] }) = UnionAtIndex (Id 0) (Index 1) Test.5; let Test.14 : Builtin(Int(I64)) = 1i64; let Test.15 : Builtin(Int(I64)) = CallByName Test.3 Test.6; - let Test.13 : Builtin(Int(I64)) = CallByName Num.24 Test.14 Test.15; + let Test.13 : Builtin(Int(I64)) = CallByName Num.22 Test.14 Test.15; ret Test.13; procedure Test.0 (): @@ -21,5 +21,5 @@ procedure Test.0 (): let Test.8 : Builtin(Int(I64)) = CallByName Test.3 Test.2; let Test.9 : Builtin(Int(I64)) = CallByName Test.3 Test.2; dec Test.2; - let Test.7 : Builtin(Int(I64)) = CallByName Num.24 Test.8 Test.9; + let Test.7 : Builtin(Int(I64)) = CallByName Num.22 Test.8 Test.9; ret Test.7; diff --git a/compiler/test_mono/generated/list_cannot_update_inplace.txt b/compiler/test_mono/generated/list_cannot_update_inplace.txt index 113f7b74cb..c2087e2d74 100644 --- a/compiler/test_mono/generated/list_cannot_update_inplace.txt +++ b/compiler/test_mono/generated/list_cannot_update_inplace.txt @@ -11,7 +11,7 @@ procedure List.7 (#Attr.2): let Test.9 : Builtin(Int(U64)) = lowlevel ListLen #Attr.2; ret Test.9; -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.7 : Builtin(Int(U64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.7; @@ -33,5 +33,5 @@ procedure Test.0 (): let Test.8 : Builtin(List(Builtin(Int(I64)))) = CallByName Test.1; let Test.6 : Builtin(Int(U64)) = CallByName List.7 Test.8; dec Test.8; - let Test.4 : Builtin(Int(U64)) = CallByName Num.24 Test.5 Test.6; + let Test.4 : Builtin(Int(U64)) = CallByName Num.22 Test.5 Test.6; ret Test.4; diff --git a/compiler/test_mono/generated/list_len.txt b/compiler/test_mono/generated/list_len.txt index c210581d86..80b6093747 100644 --- a/compiler/test_mono/generated/list_len.txt +++ b/compiler/test_mono/generated/list_len.txt @@ -6,7 +6,7 @@ procedure List.7 (#Attr.2): let Test.8 : Builtin(Int(U64)) = lowlevel ListLen #Attr.2; ret Test.8; -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.6 : Builtin(Int(U64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.6; @@ -17,5 +17,5 @@ procedure Test.0 (): let Test.7 : Builtin(List(Builtin(Float(F64)))) = Array [1f64]; let Test.5 : Builtin(Int(U64)) = CallByName List.7 Test.7; dec Test.7; - let Test.3 : Builtin(Int(U64)) = CallByName Num.24 Test.4 Test.5; + let Test.3 : Builtin(Int(U64)) = CallByName Num.22 Test.4 Test.5; ret Test.3; diff --git a/compiler/test_mono/generated/monomorphized_ints_aliased.txt b/compiler/test_mono/generated/monomorphized_ints_aliased.txt index 3b9735dfa5..50bd650f9d 100644 --- a/compiler/test_mono/generated/monomorphized_ints_aliased.txt +++ b/compiler/test_mono/generated/monomorphized_ints_aliased.txt @@ -1,4 +1,4 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.12 : Builtin(Int(U64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.12; @@ -11,13 +11,13 @@ procedure Test.4 (Test.7, Test.8): ret Test.18; procedure Test.0 (): - let Test.4 : LambdaSet([( Test.4, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = Struct {}; - let Test.4 : LambdaSet([( Test.4, [])]LambdaSet { set: Ok(()), representation: Struct([]) }) = Struct {}; + let Test.4 : LambdaSet(LambdaSet { set: [( Test.4, [])], representation: Struct([]) }) = Struct {}; + let Test.4 : LambdaSet(LambdaSet { set: [( Test.4, [])], representation: Struct([]) }) = Struct {}; let Test.15 : Builtin(Int(U8)) = 100i64; let Test.16 : Builtin(Int(U32)) = 100i64; let Test.10 : Builtin(Int(U64)) = CallByName Test.4 Test.15 Test.16; let Test.13 : Builtin(Int(U32)) = 100i64; let Test.14 : Builtin(Int(U8)) = 100i64; let Test.11 : Builtin(Int(U64)) = CallByName Test.4 Test.13 Test.14; - let Test.9 : Builtin(Int(U64)) = CallByName Num.24 Test.10 Test.11; + let Test.9 : Builtin(Int(U64)) = CallByName Num.22 Test.10 Test.11; ret Test.9; diff --git a/compiler/test_mono/generated/nested_closure.txt b/compiler/test_mono/generated/nested_closure.txt index b7a572df71..af44f33389 100644 --- a/compiler/test_mono/generated/nested_closure.txt +++ b/compiler/test_mono/generated/nested_closure.txt @@ -1,5 +1,6 @@ procedure Test.1 (Test.5): - let Test.3 : LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }) = Struct {Test.2}; + let Test.2 : Builtin(Int(I64)) = 42i64; + let Test.3 : LambdaSet(LambdaSet { set: [( Test.3, [Builtin(Int(I64))])], representation: Struct([Builtin(Int(I64))]) }) = Struct {Test.2}; ret Test.3; procedure Test.3 (Test.9, #Attr.12): @@ -9,7 +10,7 @@ procedure Test.3 (Test.9, #Attr.12): procedure Test.0 (): let Test.8 : Struct([]) = Struct {}; - let Test.4 : LambdaSet([( Test.3, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Struct([Builtin(Int(I64))]) }) = CallByName Test.1 Test.8; + let Test.4 : LambdaSet(LambdaSet { set: [( Test.3, [Builtin(Int(I64))])], representation: Struct([Builtin(Int(I64))]) }) = CallByName Test.1 Test.8; let Test.7 : Struct([]) = Struct {}; let Test.6 : Builtin(Int(I64)) = CallByName Test.3 Test.7 Test.4; ret Test.6; diff --git a/compiler/test_mono/generated/nested_pattern_match.txt b/compiler/test_mono/generated/nested_pattern_match.txt index 157843e919..facbc46055 100644 --- a/compiler/test_mono/generated/nested_pattern_match.txt +++ b/compiler/test_mono/generated/nested_pattern_match.txt @@ -1,4 +1,4 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.8 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.8; @@ -22,7 +22,7 @@ procedure Test.0 (): let Test.10 : Union(NonRecursive([[Builtin(Int(I64))], []])) = UnionAtIndex (Id 0) (Index 0) Test.2; let Test.5 : Builtin(Int(I64)) = UnionAtIndex (Id 0) (Index 0) Test.10; let Test.7 : Builtin(Int(I64)) = 1i64; - let Test.6 : Builtin(Int(I64)) = CallByName Num.24 Test.5 Test.7; + let Test.6 : Builtin(Int(I64)) = CallByName Num.22 Test.5 Test.7; ret Test.6; else jump Test.16; diff --git a/compiler/test_mono/generated/optional_when.txt b/compiler/test_mono/generated/optional_when.txt index bca94afc2d..9c98133311 100644 --- a/compiler/test_mono/generated/optional_when.txt +++ b/compiler/test_mono/generated/optional_when.txt @@ -1,4 +1,4 @@ -procedure Num.26 (#Attr.2, #Attr.3): +procedure Num.24 (#Attr.2, #Attr.3): let Test.17 : Builtin(Int(I64)) = lowlevel NumMul #Attr.2 #Attr.3; ret Test.17; @@ -36,7 +36,7 @@ procedure Test.0 (): let Test.26 : Builtin(Bool) = false; let Test.19 : Struct([Builtin(Int(I64)), Builtin(Bool)]) = Struct {Test.25, Test.26}; let Test.2 : Builtin(Int(I64)) = CallByName Test.1 Test.19; - let Test.18 : Builtin(Int(I64)) = CallByName Num.26 Test.2 Test.3; - let Test.16 : Builtin(Int(I64)) = CallByName Num.26 Test.18 Test.4; - let Test.15 : Builtin(Int(I64)) = CallByName Num.26 Test.16 Test.5; + let Test.18 : Builtin(Int(I64)) = CallByName Num.24 Test.2 Test.3; + let Test.16 : Builtin(Int(I64)) = CallByName Num.24 Test.18 Test.4; + let Test.15 : Builtin(Int(I64)) = CallByName Num.24 Test.16 Test.5; ret Test.15; diff --git a/compiler/test_mono/generated/quicksort_help.txt b/compiler/test_mono/generated/quicksort_help.txt index 062a9e39ce..911b38e71c 100644 --- a/compiler/test_mono/generated/quicksort_help.txt +++ b/compiler/test_mono/generated/quicksort_help.txt @@ -1,18 +1,18 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.19 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.19; -procedure Num.25 (#Attr.2, #Attr.3): +procedure Num.23 (#Attr.2, #Attr.3): let Test.22 : Builtin(Int(I64)) = lowlevel NumSub #Attr.2 #Attr.3; ret Test.22; -procedure Num.27 (#Attr.2, #Attr.3): +procedure Num.25 (#Attr.2, #Attr.3): let Test.26 : Builtin(Bool) = lowlevel NumLt #Attr.2 #Attr.3; ret Test.26; procedure Test.1 (Test.27, Test.28, Test.29): joinpoint Test.12 Test.2 Test.3 Test.4: - let Test.14 : Builtin(Bool) = CallByName Num.27 Test.3 Test.4; + let Test.14 : Builtin(Bool) = CallByName Num.25 Test.3 Test.4; if Test.14 then dec Test.2; let Test.25 : Builtin(List(Union(NonRecursive([])))) = Array []; @@ -23,10 +23,10 @@ procedure Test.1 (Test.27, Test.28, Test.29): inc Test.6; dec Test.23; let Test.21 : Builtin(Int(I64)) = 1i64; - let Test.20 : Builtin(Int(I64)) = CallByName Num.25 Test.5 Test.21; + let Test.20 : Builtin(Int(I64)) = CallByName Num.23 Test.5 Test.21; let Test.16 : Builtin(List(Builtin(Int(I64)))) = CallByName Test.1 Test.6 Test.3 Test.20; let Test.18 : Builtin(Int(I64)) = 1i64; - let Test.17 : Builtin(Int(I64)) = CallByName Num.24 Test.5 Test.18; + let Test.17 : Builtin(Int(I64)) = CallByName Num.22 Test.5 Test.18; jump Test.12 Test.16 Test.17 Test.4; else ret Test.2; diff --git a/compiler/test_mono/generated/record_optional_field_function_no_use_default.txt b/compiler/test_mono/generated/record_optional_field_function_no_use_default.txt index e648f4a266..3c98d6876b 100644 --- a/compiler/test_mono/generated/record_optional_field_function_no_use_default.txt +++ b/compiler/test_mono/generated/record_optional_field_function_no_use_default.txt @@ -1,11 +1,11 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.8 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.8; procedure Test.1 (Test.4): let Test.2 : Builtin(Int(I64)) = StructAtIndex 0 Test.4; let Test.3 : Builtin(Int(I64)) = StructAtIndex 1 Test.4; - let Test.7 : Builtin(Int(I64)) = CallByName Num.24 Test.2 Test.3; + let Test.7 : Builtin(Int(I64)) = CallByName Num.22 Test.2 Test.3; ret Test.7; procedure Test.0 (): diff --git a/compiler/test_mono/generated/record_optional_field_function_use_default.txt b/compiler/test_mono/generated/record_optional_field_function_use_default.txt index 8b3ec11a1d..aee1aa3793 100644 --- a/compiler/test_mono/generated/record_optional_field_function_use_default.txt +++ b/compiler/test_mono/generated/record_optional_field_function_use_default.txt @@ -1,10 +1,10 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.9 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.9; procedure Test.1 (Test.4): let Test.8 : Builtin(Int(I64)) = 10i64; - let Test.7 : Builtin(Int(I64)) = CallByName Num.24 Test.8 Test.4; + let Test.7 : Builtin(Int(I64)) = CallByName Num.22 Test.8 Test.4; ret Test.7; procedure Test.0 (): diff --git a/compiler/test_mono/generated/record_optional_field_let_no_use_default.txt b/compiler/test_mono/generated/record_optional_field_let_no_use_default.txt index cb651b5ae9..255130f13b 100644 --- a/compiler/test_mono/generated/record_optional_field_let_no_use_default.txt +++ b/compiler/test_mono/generated/record_optional_field_let_no_use_default.txt @@ -1,11 +1,11 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.8 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.8; procedure Test.1 (Test.2): let Test.3 : Builtin(Int(I64)) = StructAtIndex 0 Test.2; let Test.4 : Builtin(Int(I64)) = StructAtIndex 1 Test.2; - let Test.7 : Builtin(Int(I64)) = CallByName Num.24 Test.3 Test.4; + let Test.7 : Builtin(Int(I64)) = CallByName Num.22 Test.3 Test.4; ret Test.7; procedure Test.0 (): diff --git a/compiler/test_mono/generated/record_optional_field_let_use_default.txt b/compiler/test_mono/generated/record_optional_field_let_use_default.txt index 1e42d1eb24..978c5b026d 100644 --- a/compiler/test_mono/generated/record_optional_field_let_use_default.txt +++ b/compiler/test_mono/generated/record_optional_field_let_use_default.txt @@ -1,10 +1,10 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.8 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.8; procedure Test.1 (Test.2): let Test.3 : Builtin(Int(I64)) = 10i64; - let Test.7 : Builtin(Int(I64)) = CallByName Num.24 Test.3 Test.2; + let Test.7 : Builtin(Int(I64)) = CallByName Num.22 Test.3 Test.2; ret Test.7; procedure Test.0 (): diff --git a/compiler/test_mono/generated/somehow_drops_definitions.txt b/compiler/test_mono/generated/somehow_drops_definitions.txt index 0c92ef232e..1dd4ed9c40 100644 --- a/compiler/test_mono/generated/somehow_drops_definitions.txt +++ b/compiler/test_mono/generated/somehow_drops_definitions.txt @@ -1,8 +1,8 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.27 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.27; -procedure Num.26 (#Attr.2, #Attr.3): +procedure Num.24 (#Attr.2, #Attr.3): let Test.22 : Builtin(Int(I64)) = lowlevel NumMul #Attr.2 #Attr.3; ret Test.22; @@ -16,12 +16,12 @@ procedure Test.2 (): procedure Test.3 (Test.6): let Test.26 : Builtin(Int(I64)) = CallByName Test.1; - let Test.25 : Builtin(Int(I64)) = CallByName Num.24 Test.6 Test.26; + let Test.25 : Builtin(Int(I64)) = CallByName Num.22 Test.6 Test.26; ret Test.25; procedure Test.4 (Test.7): let Test.21 : Builtin(Int(I64)) = CallByName Test.2; - let Test.20 : Builtin(Int(I64)) = CallByName Num.26 Test.7 Test.21; + let Test.20 : Builtin(Int(I64)) = CallByName Num.24 Test.7 Test.21; ret Test.20; procedure Test.5 (Test.8, Test.9): @@ -46,8 +46,8 @@ procedure Test.0 (): in let Test.24 : Builtin(Bool) = true; if Test.24 then - let Test.3 : LambdaSet([( Test.3, []), ( Test.4, [])]LambdaSet { set: Ok(()), representation: Builtin(Bool) }) = false; + let Test.3 : LambdaSet(LambdaSet { set: [( Test.3, []), ( Test.4, [])], representation: Builtin(Bool) }) = false; jump Test.19 Test.3; else - let Test.4 : LambdaSet([( Test.3, []), ( Test.4, [])]LambdaSet { set: Ok(()), representation: Builtin(Bool) }) = true; + let Test.4 : LambdaSet(LambdaSet { set: [( Test.3, []), ( Test.4, [])], representation: Builtin(Bool) }) = true; jump Test.19 Test.4; diff --git a/compiler/test_mono/generated/specialize_closures.txt b/compiler/test_mono/generated/specialize_closures.txt index 73d49133ce..772676526b 100644 --- a/compiler/test_mono/generated/specialize_closures.txt +++ b/compiler/test_mono/generated/specialize_closures.txt @@ -1,8 +1,8 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.28 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.28; -procedure Num.26 (#Attr.2, #Attr.3): +procedure Num.24 (#Attr.2, #Attr.3): let Test.25 : Builtin(Int(I64)) = lowlevel NumMul #Attr.2 #Attr.3; ret Test.25; @@ -23,14 +23,14 @@ procedure Test.1 (Test.2, Test.3): procedure Test.7 (Test.10, #Attr.12): let Test.4 : Builtin(Int(I64)) = UnionAtIndex (Id 0) (Index 0) #Attr.12; - let Test.27 : Builtin(Int(I64)) = CallByName Num.24 Test.10 Test.4; + let Test.27 : Builtin(Int(I64)) = CallByName Num.22 Test.10 Test.4; ret Test.27; procedure Test.8 (Test.11, #Attr.12): let Test.6 : Builtin(Bool) = UnionAtIndex (Id 1) (Index 1) #Attr.12; let Test.5 : Builtin(Int(I64)) = UnionAtIndex (Id 1) (Index 0) #Attr.12; if Test.6 then - let Test.24 : Builtin(Int(I64)) = CallByName Num.26 Test.11 Test.5; + let Test.24 : Builtin(Int(I64)) = CallByName Num.24 Test.11 Test.5; ret Test.24; else ret Test.11; @@ -46,8 +46,8 @@ procedure Test.0 (): in let Test.26 : Builtin(Bool) = true; if Test.26 then - let Test.7 : LambdaSet([( Test.7, [Builtin(Int(I64))]), ( Test.8, [Builtin(Int(I64)), Builtin(Bool)])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64)), Builtin(Bool)]])) }) = ClosureTag(Test.7) Test.4; + let Test.7 : LambdaSet(LambdaSet { set: [( Test.7, [Builtin(Int(I64))]), ( Test.8, [Builtin(Int(I64)), Builtin(Bool)])], representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64)), Builtin(Bool)]])) }) = ClosureTag(Test.7) Test.4; jump Test.22 Test.7; else - let Test.8 : LambdaSet([( Test.7, [Builtin(Int(I64))]), ( Test.8, [Builtin(Int(I64)), Builtin(Bool)])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64)), Builtin(Bool)]])) }) = ClosureTag(Test.8) Test.5 Test.6; + let Test.8 : LambdaSet(LambdaSet { set: [( Test.7, [Builtin(Int(I64))]), ( Test.8, [Builtin(Int(I64)), Builtin(Bool)])], representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64)), Builtin(Bool)]])) }) = ClosureTag(Test.8) Test.5 Test.6; jump Test.22 Test.8; diff --git a/compiler/test_mono/generated/specialize_lowlevel.txt b/compiler/test_mono/generated/specialize_lowlevel.txt index 3271b1fd41..4dba44f752 100644 --- a/compiler/test_mono/generated/specialize_lowlevel.txt +++ b/compiler/test_mono/generated/specialize_lowlevel.txt @@ -1,19 +1,19 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.24 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.24; -procedure Num.26 (#Attr.2, #Attr.3): +procedure Num.24 (#Attr.2, #Attr.3): let Test.21 : Builtin(Int(I64)) = lowlevel NumMul #Attr.2 #Attr.3; ret Test.21; procedure Test.6 (Test.8, #Attr.12): let Test.4 : Builtin(Int(I64)) = UnionAtIndex (Id 0) (Index 0) #Attr.12; - let Test.23 : Builtin(Int(I64)) = CallByName Num.24 Test.8 Test.4; + let Test.23 : Builtin(Int(I64)) = CallByName Num.22 Test.8 Test.4; ret Test.23; procedure Test.7 (Test.9, #Attr.12): let Test.5 : Builtin(Int(I64)) = UnionAtIndex (Id 1) (Index 0) #Attr.12; - let Test.20 : Builtin(Int(I64)) = CallByName Num.26 Test.9 Test.5; + let Test.20 : Builtin(Int(I64)) = CallByName Num.24 Test.9 Test.5; ret Test.20; procedure Test.0 (): @@ -37,8 +37,8 @@ procedure Test.0 (): in let Test.22 : Builtin(Bool) = true; if Test.22 then - let Test.6 : LambdaSet([( Test.6, [Builtin(Int(I64))]), ( Test.7, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64))]])) }) = ClosureTag(Test.6) Test.4; + let Test.6 : LambdaSet(LambdaSet { set: [( Test.6, [Builtin(Int(I64))]), ( Test.7, [Builtin(Int(I64))])], representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64))]])) }) = ClosureTag(Test.6) Test.4; jump Test.19 Test.6; else - let Test.7 : LambdaSet([( Test.6, [Builtin(Int(I64))]), ( Test.7, [Builtin(Int(I64))])]LambdaSet { set: Ok(()), representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64))]])) }) = ClosureTag(Test.7) Test.5; + let Test.7 : LambdaSet(LambdaSet { set: [( Test.6, [Builtin(Int(I64))]), ( Test.7, [Builtin(Int(I64))])], representation: Union(NonRecursive([[Builtin(Int(I64))], [Builtin(Int(I64))]])) }) = ClosureTag(Test.7) Test.5; jump Test.19 Test.7; diff --git a/compiler/test_mono/generated/when_nested_maybe.txt b/compiler/test_mono/generated/when_nested_maybe.txt index 157843e919..facbc46055 100644 --- a/compiler/test_mono/generated/when_nested_maybe.txt +++ b/compiler/test_mono/generated/when_nested_maybe.txt @@ -1,4 +1,4 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.8 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.8; @@ -22,7 +22,7 @@ procedure Test.0 (): let Test.10 : Union(NonRecursive([[Builtin(Int(I64))], []])) = UnionAtIndex (Id 0) (Index 0) Test.2; let Test.5 : Builtin(Int(I64)) = UnionAtIndex (Id 0) (Index 0) Test.10; let Test.7 : Builtin(Int(I64)) = 1i64; - let Test.6 : Builtin(Int(I64)) = CallByName Num.24 Test.5 Test.7; + let Test.6 : Builtin(Int(I64)) = CallByName Num.22 Test.5 Test.7; ret Test.6; else jump Test.16; diff --git a/compiler/test_mono/generated/when_on_record.txt b/compiler/test_mono/generated/when_on_record.txt index 7b96273077..b606928426 100644 --- a/compiler/test_mono/generated/when_on_record.txt +++ b/compiler/test_mono/generated/when_on_record.txt @@ -1,9 +1,9 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.5 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.5; procedure Test.0 (): let Test.6 : Builtin(Int(I64)) = 2i64; let Test.4 : Builtin(Int(I64)) = 3i64; - let Test.3 : Builtin(Int(I64)) = CallByName Num.24 Test.6 Test.4; + let Test.3 : Builtin(Int(I64)) = CallByName Num.22 Test.6 Test.4; ret Test.3; diff --git a/compiler/test_mono/generated/when_on_two_values.txt b/compiler/test_mono/generated/when_on_two_values.txt index 34a0d9dd5f..4af8530b49 100644 --- a/compiler/test_mono/generated/when_on_two_values.txt +++ b/compiler/test_mono/generated/when_on_two_values.txt @@ -1,4 +1,4 @@ -procedure Num.24 (#Attr.2, #Attr.3): +procedure Num.22 (#Attr.2, #Attr.3): let Test.7 : Builtin(Int(I64)) = lowlevel NumAdd #Attr.2 #Attr.3; ret Test.7; @@ -9,7 +9,7 @@ procedure Test.0 (): joinpoint Test.12: let Test.2 : Builtin(Int(I64)) = StructAtIndex 0 Test.4; let Test.3 : Builtin(Int(I64)) = StructAtIndex 1 Test.4; - let Test.6 : Builtin(Int(I64)) = CallByName Num.24 Test.2 Test.3; + let Test.6 : Builtin(Int(I64)) = CallByName Num.22 Test.2 Test.3; ret Test.6; in let Test.10 : Builtin(Int(I64)) = StructAtIndex 1 Test.4;