Skip to content

Commit 27a06a5

Browse files
volsavolsa
committed
chore: Fix rebase
1 parent ec0b5e3 commit 27a06a5

11 files changed

+191
-116
lines changed

‎src/codegen/tests/debug_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ fn dbg_declare_has_valid_metadata_references_for_methods() {
357357
target datalayout = "[filtered]"
358358
target triple = "[filtered]"
359359
360-
%__vtable_fb = type { %fb*, void (%fb*)* }
360+
%__vtable_fb = type { void (%fb*)*, void (%fb*)* }
361361
%fb = type { i32* }
362362
363363
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]

‎src/codegen/tests/initialization_test/complex_initializers.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ fn init_functions_generated_for_function_blocks() {
275275
target datalayout = "[filtered]"
276276
target triple = "[filtered]"
277277
278-
%__vtable_foo = type { %foo* }
278+
%__vtable_foo = type { void (%foo*)* }
279279
%foo = type { i32*, [81 x i8]* }
280280
281281
@s = global [81 x i8] zeroinitializer
@@ -412,9 +412,9 @@ fn nested_initializer_pous() {
412412
%bar = type { i32*, %baz }
413413
%baz = type { i32*, [81 x i8]* }
414414
%sideProg = type { [81 x i8]*, %foo }
415-
%__vtable_foo = type { %foo* }
416-
%__vtable_bar = type { %bar* }
417-
%__vtable_baz = type { %baz* }
415+
%__vtable_foo = type { void (%foo*)* }
416+
%__vtable_bar = type { void (%bar*)* }
417+
%__vtable_baz = type { void (%baz*)* }
418418
419419
@str = global [81 x i8] c"hello\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00"
420420
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -702,7 +702,7 @@ fn local_address() {
702702
target datalayout = "[filtered]"
703703
target triple = "[filtered]"
704704
705-
%__vtable_foo = type { %foo* }
705+
%__vtable_foo = type { void (%foo*)* }
706706
%foo = type { i32*, i16, i16* }
707707
708708
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -798,7 +798,7 @@ fn user_init_called_for_variables_on_stack() {
798798
target datalayout = "[filtered]"
799799
target triple = "[filtered]"
800800
801-
%__vtable_foo = type { %foo*, void (%foo*)* }
801+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
802802
%foo = type { i32*, i16, i16* }
803803
804804
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1103,7 +1103,7 @@ fn stateful_pous_methods_and_structs_get_init_functions() {
11031103
11041104
%myStruct = type { i32 }
11051105
%prog = type {}
1106-
%__vtable_foo = type { %foo*, void (%foo*)* }
1106+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
11071107
%foo = type { i32* }
11081108
%__vtable_cl = type { void (%cl*)* }
11091109
%cl = type { i32* }
@@ -1294,7 +1294,7 @@ fn global_instance() {
12941294
12951295
%prog = type {}
12961296
%foo = type { i32*, [81 x i8]* }
1297-
%__vtable_foo = type { %foo* }
1297+
%__vtable_foo = type { void (%foo*)* }
12981298
12991299
@ps = global [81 x i8] zeroinitializer
13001300
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1418,7 +1418,7 @@ fn aliased_types() {
14181418
14191419
%prog = type { %foo }
14201420
%foo = type { i32*, [81 x i8]* }
1421-
%__vtable_foo = type { %foo* }
1421+
%__vtable_foo = type { void (%foo*)* }
14221422
14231423
@ps = global [81 x i8] zeroinitializer
14241424
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1614,7 +1614,7 @@ fn var_config_aliased_variables_initialized() {
16141614
16151615
%prog = type { %FB, %FB }
16161616
%FB = type { i32*, i32* }
1617-
%__vtable_FB = type { %FB* }
1617+
%__vtable_FB = type { void (%FB*)* }
16181618
16191619
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
16201620
@prog_instance = global %prog zeroinitializer
@@ -1748,7 +1748,7 @@ fn var_external_blocks_are_ignored_in_init_functions() {
17481748
target datalayout = "[filtered]"
17491749
target triple = "[filtered]"
17501750
1751-
%__vtable_foo = type { %foo* }
1751+
%__vtable_foo = type { void (%foo*)* }
17521752
%foo = type { i32* }
17531753
17541754
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1836,7 +1836,7 @@ fn ref_to_local_member() {
18361836
target datalayout = "[filtered]"
18371837
target triple = "[filtered]"
18381838
1839-
%__vtable_foo = type { %foo* }
1839+
%__vtable_foo = type { void (%foo*)* }
18401840
%foo = type { i32*, [81 x i8], [81 x i8]*, [81 x i8]*, [81 x i8]* }
18411841
18421842
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1939,7 +1939,7 @@ fn ref_to_local_member_shadows_global() {
19391939
target datalayout = "[filtered]"
19401940
target triple = "[filtered]"
19411941
1942-
%__vtable_foo = type { %foo* }
1942+
%__vtable_foo = type { void (%foo*)* }
19431943
%foo = type { i32*, [81 x i8], [81 x i8]*, [81 x i8]*, [81 x i8]* }
19441944
19451945
@s = global [81 x i8] zeroinitializer
@@ -2041,7 +2041,7 @@ fn temporary_variable_ref_to_local_member() {
20412041
target datalayout = "[filtered]"
20422042
target triple = "[filtered]"
20432043
2044-
%__vtable_foo = type { %foo* }
2044+
%__vtable_foo = type { void (%foo*)* }
20452045
%foo = type { i32*, [81 x i8] }
20462046
20472047
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -2189,7 +2189,7 @@ fn initializing_method_variables_with_refs() {
21892189
target datalayout = "[filtered]"
21902190
target triple = "[filtered]"
21912191
2192-
%__vtable_foo = type { %foo*, void (%foo*)* }
2192+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
21932193
%foo = type { i32* }
21942194
21952195
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -2288,7 +2288,7 @@ fn initializing_method_variables_with_refs_referencing_parent_pou_variable() {
22882288
target datalayout = "[filtered]"
22892289
target triple = "[filtered]"
22902290
2291-
%__vtable_foo = type { %foo*, void (%foo*)* }
2291+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
22922292
%foo = type { i32*, i32 }
22932293
22942294
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -2387,7 +2387,7 @@ fn initializing_method_variables_with_refs_referencing_global_variable() {
23872387
target datalayout = "[filtered]"
23882388
target triple = "[filtered]"
23892389
2390-
%__vtable_foo = type { %foo*, void (%foo*)* }
2390+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
23912391
%foo = type { i32* }
23922392
23932393
@x = global i32 0
@@ -2486,7 +2486,7 @@ fn initializing_method_variables_with_refs_shadowing() {
24862486
target datalayout = "[filtered]"
24872487
target triple = "[filtered]"
24882488
2489-
%__vtable_foo = type { %foo*, void (%foo*)* }
2489+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
24902490
%foo = type { i32* }
24912491
24922492
@x = global i32 0
@@ -2583,7 +2583,7 @@ fn initializing_method_variables_with_alias() {
25832583
target datalayout = "[filtered]"
25842584
target triple = "[filtered]"
25852585
2586-
%__vtable_foo = type { %foo*, void (%foo*)* }
2586+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
25872587
%foo = type { i32* }
25882588
25892589
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -2679,7 +2679,7 @@ fn initializing_method_variables_with_reference_to() {
26792679
target datalayout = "[filtered]"
26802680
target triple = "[filtered]"
26812681
2682-
%__vtable_foo = type { %foo*, void (%foo*)* }
2682+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
26832683
%foo = type { i32* }
26842684
26852685
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -2782,9 +2782,9 @@ fn methods_call_init_functions_for_their_members() {
27822782
target datalayout = "[filtered]"
27832783
target triple = "[filtered]"
27842784
2785-
%__vtable_foo = type { %foo* }
2785+
%__vtable_foo = type { void (%foo*)* }
27862786
%foo = type { i32*, i32, i32* }
2787-
%__vtable_bar = type { %bar*, void (%bar*)* }
2787+
%__vtable_bar = type { void (%bar*)*, void (%bar*)* }
27882788
%bar = type { i32* }
27892789
27902790
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -2948,7 +2948,7 @@ fn user_fb_init_is_added_and_called_if_it_exists() {
29482948
29492949
%prog = type { %foo }
29502950
%foo = type { i32*, i16, i16 }
2951-
%__vtable_foo = type { %foo*, void (%foo*)* }
2951+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
29522952
29532953
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
29542954
@prog_instance = global %prog zeroinitializer
@@ -3099,7 +3099,7 @@ fn user_fb_init_in_global_struct() {
30993099
%prog = type { %bar }
31003100
%bar = type { %foo }
31013101
%foo = type { i32*, i16, i16 }
3102-
%__vtable_foo = type { %foo*, void (%foo*)* }
3102+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
31033103
31043104
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
31053105
@prog_instance = global %prog zeroinitializer
@@ -3263,7 +3263,7 @@ fn user_init_called_when_declared_as_external() {
32633263
32643264
%prog = type { %foo }
32653265
%foo = type { i32*, i16, i16 }
3266-
%__vtable_foo = type { %foo*, void (%foo*)* }
3266+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
32673267
32683268
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
32693269
@prog_instance = global %prog zeroinitializer

‎src/codegen/tests/oop_tests.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ fn members_from_base_class_are_available_in_subclasses() {
2525
target datalayout = "[filtered]"
2626
target triple = "[filtered]"
2727
28-
%__vtable_foo = type { %foo* }
28+
%__vtable_foo = type { void (%foo*)* }
2929
%foo = type { i32*, i16, [81 x i8], [11 x [81 x i8]] }
30-
%__vtable_bar = type { %bar* }
30+
%__vtable_bar = type { void (%bar*)* }
3131
%bar = type { %foo }
3232
3333
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -166,11 +166,11 @@ fn write_to_parent_variable_qualified_access() {
166166
target datalayout = "[filtered]"
167167
target triple = "[filtered]"
168168
169-
%__vtable_fb = type { %fb* }
169+
%__vtable_fb = type { void (%fb*)* }
170170
%fb = type { i32*, i16, i16 }
171-
%__vtable_fb2 = type { %fb2* }
171+
%__vtable_fb2 = type { void (%fb2*)* }
172172
%fb2 = type { %fb }
173-
%__vtable_foo = type { %foo* }
173+
%__vtable_foo = type { void (%foo*)* }
174174
%foo = type { i32*, %fb2 }
175175
176176
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -366,9 +366,9 @@ fn write_to_parent_variable_in_instance() {
366366
target datalayout = "[filtered]"
367367
target triple = "[filtered]"
368368
369-
%__vtable_foo = type { %foo*, void (%foo*)* }
369+
%__vtable_foo = type { void (%foo*)*, void (%foo*)* }
370370
%foo = type { i32*, [81 x i8] }
371-
%__vtable_bar = type { %bar*, void (%foo*)* }
371+
%__vtable_bar = type { void (%bar*)*, void (%foo*)* }
372372
%bar = type { %foo }
373373
374374
@utf08_literal_0 = private unnamed_addr constant [6 x i8] c"hello\00"
@@ -568,11 +568,11 @@ fn array_in_parent_generated() {
568568
target datalayout = "[filtered]"
569569
target triple = "[filtered]"
570570
571-
%__vtable_grandparent = type { %grandparent* }
571+
%__vtable_grandparent = type { void (%grandparent*)* }
572572
%grandparent = type { i32*, [6 x i16], i16 }
573-
%__vtable_parent = type { %parent* }
573+
%__vtable_parent = type { void (%parent*)* }
574574
%parent = type { %grandparent, [11 x i16], i16 }
575-
%__vtable_child = type { %child* }
575+
%__vtable_child = type { void (%child*)* }
576576
%child = type { %parent, [11 x i16] }
577577
578578
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -806,11 +806,11 @@ fn complex_array_access_generated() {
806806
target datalayout = "[filtered]"
807807
target triple = "[filtered]"
808808
809-
%__vtable_grandparent = type { %grandparent* }
809+
%__vtable_grandparent = type { void (%grandparent*)* }
810810
%grandparent = type { i32*, [6 x i16], i16 }
811-
%__vtable_parent = type { %parent* }
811+
%__vtable_parent = type { void (%parent*)* }
812812
%parent = type { %grandparent, [11 x i16], i16 }
813-
%__vtable_child = type { %child* }
813+
%__vtable_child = type { void (%child*)* }
814814
%child = type { %parent, [11 x i16] }
815815
816816
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1069,7 +1069,7 @@ fn this_in_method_call_chain() {
10691069
target datalayout = "[filtered]"
10701070
target triple = "[filtered]"
10711071
1072-
%__vtable_FB_Test = type { %FB_Test*, void (%FB_Test*)*, void (%FB_Test*)* }
1072+
%__vtable_FB_Test = type { void (%FB_Test*)*, void (%FB_Test*)*, void (%FB_Test*)* }
10731073
%FB_Test = type { i32* }
10741074
10751075
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1178,7 +1178,7 @@ fn this_in_method_and_body_in_function_block() {
11781178
target datalayout = "[filtered]"
11791179
target triple = "[filtered]"
11801180
1181-
%__vtable_FB_Test = type { %FB_Test*, i16 (%FB_Test*)* }
1181+
%__vtable_FB_Test = type { void (%FB_Test*)*, i16 (%FB_Test*)* }
11821182
%FB_Test = type { i32*, i16 }
11831183
11841184
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1296,10 +1296,10 @@ fn pass_this_to_method() {
12961296
target datalayout = "[filtered]"
12971297
target triple = "[filtered]"
12981298
1299-
%__vtable_FB_Test = type { %FB_Test*, void (%FB_Test*)* }
1299+
%__vtable_FB_Test = type { void (%FB_Test*)*, void (%FB_Test*)* }
13001300
%FB_Test = type { i32*, i16 }
13011301
%FB_Test2 = type { i32* }
1302-
%__vtable_FB_Test2 = type { %FB_Test2*, i16 (%FB_Test2*, %FB_Test*)* }
1302+
%__vtable_FB_Test2 = type { void (%FB_Test2*)*, i16 (%FB_Test2*, %FB_Test*)* }
13031303
13041304
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
13051305
@____vtable_FB_Test__init = unnamed_addr constant %__vtable_FB_Test zeroinitializer
@@ -1471,7 +1471,7 @@ fn this_with_shadowed_variable() {
14711471
target datalayout = "[filtered]"
14721472
target triple = "[filtered]"
14731473
1474-
%__vtable_FB_Test = type { %FB_Test*, void (%FB_Test*)* }
1474+
%__vtable_FB_Test = type { void (%FB_Test*)*, void (%FB_Test*)* }
14751475
%FB_Test = type { i32*, i16 }
14761476
14771477
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1576,7 +1576,7 @@ fn this_calling_function_and_passing_this() {
15761576
target datalayout = "[filtered]"
15771577
target triple = "[filtered]"
15781578
1579-
%__vtable_FB_Test = type { %FB_Test* }
1579+
%__vtable_FB_Test = type { void (%FB_Test*)* }
15801580
%FB_Test = type { i32*, i16 }
15811581
15821582
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1679,7 +1679,7 @@ fn this_in_property_and_calling_method() {
16791679
target datalayout = "[filtered]"
16801680
target triple = "[filtered]"
16811681
1682-
%__vtable_FB_Test = type { %FB_Test*, i16 (%FB_Test*)*, i16 (%FB_Test*)*, void (%FB_Test*, i16)* }
1682+
%__vtable_FB_Test = type { void (%FB_Test*)*, i16 (%FB_Test*)*, i16 (%FB_Test*)*, void (%FB_Test*, i16)* }
16831683
%FB_Test = type { i32*, i16 }
16841684
16851685
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1827,7 +1827,7 @@ fn this_with_self_pointer() {
18271827
target datalayout = "[filtered]"
18281828
target triple = "[filtered]"
18291829
1830-
%__vtable_FB_Test = type { %FB_Test*, void (%FB_Test*)* }
1830+
%__vtable_FB_Test = type { void (%FB_Test*)*, void (%FB_Test*)* }
18311831
%FB_Test = type { i32*, %FB_Test* }
18321832
18331833
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -1923,7 +1923,7 @@ fn this_in_variable_initialization() {
19231923
target datalayout = "[filtered]"
19241924
target triple = "[filtered]"
19251925
1926-
%__vtable_FB = type { %FB* }
1926+
%__vtable_FB = type { void (%FB*)* }
19271927
%FB = type { i32*, i16, %FB*, i16 }
19281928
19291929
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -2000,7 +2000,7 @@ fn this_in_action_in_functionblock() {
20002000
target datalayout = "[filtered]"
20012001
target triple = "[filtered]"
20022002
2003-
%__vtable_fb = type { %fb* }
2003+
%__vtable_fb = type { void (%fb*)* }
20042004
%fb = type { i32* }
20052005
20062006
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]
@@ -2083,7 +2083,7 @@ fn this_calling_functionblock_body_from_method() {
20832083
target datalayout = "[filtered]"
20842084
target triple = "[filtered]"
20852085
2086-
%__vtable_fb = type { %fb*, i16 (%fb*)* }
2086+
%__vtable_fb = type { void (%fb*)*, i16 (%fb*)* }
20872087
%fb = type { i32* }
20882088
20892089
@llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 0, void ()* @__init___Test, i8* null }]

0 commit comments

Comments
 (0)