Skip to content

Commit 72bf0d3

Browse files
greenhatgreenhat
committed
remove demangling on expected artifacts;
1 parent 30cb7dd commit 72bf0d3

File tree

7 files changed

+110
-113
lines changed

7 files changed

+110
-113
lines changed

‎tests/integration/expected/components/add_wasm_component.hir

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ block1:
1818

1919
pub fn miden:add-package/[email protected]#add(i32, i32) -> i32 {
2020
block0(v0: i32, v1: i32):
21-
call module0::wit_bindgen::rt::run_ctors_once();
21+
call module0::_ZN11wit_bindgen2rt14run_ctors_once17hb100d6aec5317c3eE();
2222
v3 = add.wrapping v1, v0 : i32;
2323
br block1(v3);
2424

@@ -29,7 +29,7 @@ block1(v2: i32):
2929
pub fn __rust_alloc(i32, i32) -> i32 {
3030
block0(v0: i32, v1: i32):
3131
v3 = const.i32 1048576 : i32;
32-
v4 = call module0::<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc(v3, v1, v0) : i32;
32+
v4 = call module0::_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE(v3, v1, v0) : i32;
3333
br block1(v4);
3434

3535
block1(v2: i32):
@@ -40,7 +40,7 @@ pub fn __rust_realloc(i32, i32, i32, i32) -> i32 {
4040
block0(v0: i32, v1: i32, v2: i32, v3: i32):
4141
v5 = const.i32 0 : i32;
4242
v6 = const.i32 1048576 : i32;
43-
v7 = call module0::<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc(v6, v2, v3) : i32;
43+
v7 = call module0::_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE(v6, v2, v3) : i32;
4444
v8 = eq v7, 0 : i1;
4545
v9 = cast v8 : i32;
4646
v10 = neq v9, 0 : i1;
@@ -65,11 +65,11 @@ block3:
6565
v20 = inttoptr v19 : *mut u8;
6666
memcpy v20, v18, v16;
6767
v21 = const.i32 1048576 : i32;
68-
call module0::<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::dealloc(v21, v0, v2, v1);
68+
call module0::_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$7dealloc17h229d057945549805E(v21, v0, v2, v1);
6969
br block2(v7);
7070
}
7171

72-
pub fn wee_alloc::alloc_first_fit(i32, i32, i32) -> i32 {
72+
pub fn _ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE(i32, i32, i32) -> i32 {
7373
block0(v0: i32, v1: i32, v2: i32):
7474
v4 = const.i32 0 : i32;
7575
v5 = cast v2 : u32;
@@ -436,7 +436,7 @@ block33:
436436
br block5;
437437
}
438438

439-
pub fn <wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc(i32, i32, i32) -> i32 {
439+
pub fn _ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE(i32, i32, i32) -> i32 {
440440
block0(v0: i32, v1: i32, v2: i32):
441441
v4 = const.i32 0 : i32;
442442
v5 = global.load (@__stack_pointer) as *mut i8 : i32;
@@ -474,7 +474,7 @@ block3:
474474
v22 = cast v21 : i32;
475475
v23 = const.i32 12 : i32;
476476
v24 = add.wrapping v7, v23 : i32;
477-
v25 = call module0::wee_alloc::alloc_first_fit(v22, v1, v24) : i32;
477+
v25 = call module0::_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE(v22, v1, v24) : i32;
478478
v26 = neq v25, 0 : i1;
479479
condbr v26, block5(v0, v7, v25), block6;
480480

@@ -549,15 +549,15 @@ block7:
549549
store v75, v54;
550550
v76 = const.i32 12 : i32;
551551
v77 = add.wrapping v7, v76 : i32;
552-
v78 = call module0::wee_alloc::alloc_first_fit(v22, v1, v77) : i32;
552+
v78 = call module0::_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE(v22, v1, v77) : i32;
553553
br block5(v0, v7, v78);
554554

555555
block8:
556556
v52 = const.i32 0 : i32;
557557
br block5(v0, v7, v52);
558558
}
559559

560-
pub fn <wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::dealloc(i32, i32, i32, i32) {
560+
pub fn _ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$7dealloc17h229d057945549805E(i32, i32, i32, i32) {
561561
block0(v0: i32, v1: i32, v2: i32, v3: i32):
562562
v4 = const.i32 0 : i32;
563563
v5 = eq v1, 0 : i1;
@@ -766,7 +766,7 @@ block20:
766766
br block7(v150, v159);
767767
}
768768

769-
pub fn wit_bindgen::rt::run_ctors_once() {
769+
pub fn _ZN11wit_bindgen2rt14run_ctors_once17hb100d6aec5317c3eE() {
770770
block0:
771771
v0 = const.i32 0 : i32;
772772
v1 = cast v0 : u32;

‎tests/integration/expected/components/add_wasm_component.wat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
(type (;4;) (func (param i32 i32 i32 i32)))
88
(func $__wasm_call_ctors (;0;) (type 0))
99
(func $miden:add-package/[email protected]#add (;1;) (type 1) (param i32 i32) (result i32)
10-
call $wit_bindgen::rt::run_ctors_once
10+
call $_ZN11wit_bindgen2rt14run_ctors_once17hb100d6aec5317c3eE
1111
local.get 1
1212
local.get 0
1313
i32.add
@@ -16,15 +16,15 @@
1616
i32.const 1048576
1717
local.get 1
1818
local.get 0
19-
call $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc
19+
call $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE
2020
)
2121
(func $__rust_realloc (;3;) (type 2) (param i32 i32 i32 i32) (result i32)
2222
(local i32)
2323
block ;; label = @1
2424
i32.const 1048576
2525
local.get 2
2626
local.get 3
27-
call $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc
27+
call $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE
2828
local.tee 4
2929
i32.eqz
3030
br_if 0 (;@1;)
@@ -41,11 +41,11 @@
4141
local.get 0
4242
local.get 2
4343
local.get 1
44-
call $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::dealloc
44+
call $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$7dealloc17h229d057945549805E
4545
end
4646
local.get 4
4747
)
48-
(func $wee_alloc::alloc_first_fit (;4;) (type 3) (param i32 i32 i32) (result i32)
48+
(func $_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE (;4;) (type 3) (param i32 i32 i32) (result i32)
4949
(local i32 i32 i32 i32 i32 i32 i32)
5050
block ;; label = @1
5151
local.get 2
@@ -346,7 +346,7 @@
346346
end
347347
i32.const 0
348348
)
349-
(func $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc (;5;) (type 3) (param i32 i32 i32) (result i32)
349+
(func $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE (;5;) (type 3) (param i32 i32 i32) (result i32)
350350
(local i32 i32 i32)
351351
global.get $__stack_pointer
352352
i32.const 16
@@ -377,7 +377,7 @@
377377
local.get 3
378378
i32.const 12
379379
i32.add
380-
call $wee_alloc::alloc_first_fit
380+
call $_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE
381381
local.tee 2
382382
br_if 0 (;@2;)
383383
block ;; label = @3
@@ -436,7 +436,7 @@
436436
local.get 3
437437
i32.const 12
438438
i32.add
439-
call $wee_alloc::alloc_first_fit
439+
call $_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE
440440
local.set 2
441441
end
442442
local.get 0
@@ -450,7 +450,7 @@
450450
global.set $__stack_pointer
451451
local.get 2
452452
)
453-
(func $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::dealloc (;6;) (type 4) (param i32 i32 i32 i32)
453+
(func $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$7dealloc17h229d057945549805E (;6;) (type 4) (param i32 i32 i32 i32)
454454
(local i32 i32 i32 i32 i32 i32 i32)
455455
block ;; label = @1
456456
local.get 1
@@ -616,7 +616,7 @@
616616
i32.store
617617
end
618618
)
619-
(func $wit_bindgen::rt::run_ctors_once (;7;) (type 0)
619+
(func $_ZN11wit_bindgen2rt14run_ctors_once17hb100d6aec5317c3eE (;7;) (type 0)
620620
block ;; label = @1
621621
i32.const 0
622622
i32.load8_u offset=1048581

‎tests/integration/expected/components/inc_wasm_component.hir

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
component
22

3-
import "call" miden:add-package/[email protected]::add fn(u32, u32) -> u32 mast#0x0000000000000000000000000000000000000000000000000000000000000000 lower module0::inc_wasm_component::bindings::miden::add_package::add_interface::add::wit_import
3+
import "call" miden:add-package/[email protected]::add fn(u32, u32) -> u32 mast#0x0000000000000000000000000000000000000000000000000000000000000000 lower module0::_ZN18inc_wasm_component8bindings5miden11add_package13add_interface3add10wit_import17h394516ecbf0ecc39E
44

55
// ====================================================================
66
module module0
@@ -19,9 +19,9 @@ block1:
1919

2020
pub fn inc(i32) -> i32 {
2121
block0(v0: i32):
22-
call module0::wit_bindgen::rt::run_ctors_once();
22+
call module0::_ZN11wit_bindgen2rt14run_ctors_once17hb100d6aec5317c3eE();
2323
v2 = const.i32 1 : i32;
24-
v3 = call module0::inc_wasm_component::bindings::miden::add_package::add_interface::add::wit_import(v0, v2) : i32;
24+
v3 = call module0::_ZN18inc_wasm_component8bindings5miden11add_package13add_interface3add10wit_import17h394516ecbf0ecc39E(v0, v2) : i32;
2525
br block1(v3);
2626

2727
block1(v1: i32):
@@ -31,7 +31,7 @@ block1(v1: i32):
3131
pub fn __rust_alloc(i32, i32) -> i32 {
3232
block0(v0: i32, v1: i32):
3333
v3 = const.i32 1048576 : i32;
34-
v4 = call module0::<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc(v3, v1, v0) : i32;
34+
v4 = call module0::_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE(v3, v1, v0) : i32;
3535
br block1(v4);
3636

3737
block1(v2: i32):
@@ -42,7 +42,7 @@ pub fn __rust_realloc(i32, i32, i32, i32) -> i32 {
4242
block0(v0: i32, v1: i32, v2: i32, v3: i32):
4343
v5 = const.i32 0 : i32;
4444
v6 = const.i32 1048576 : i32;
45-
v7 = call module0::<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc(v6, v2, v3) : i32;
45+
v7 = call module0::_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE(v6, v2, v3) : i32;
4646
v8 = eq v7, 0 : i1;
4747
v9 = cast v8 : i32;
4848
v10 = neq v9, 0 : i1;
@@ -67,11 +67,11 @@ block3:
6767
v20 = inttoptr v19 : *mut u8;
6868
memcpy v20, v18, v16;
6969
v21 = const.i32 1048576 : i32;
70-
call module0::<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::dealloc(v21, v0, v2, v1);
70+
call module0::_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$7dealloc17h229d057945549805E(v21, v0, v2, v1);
7171
br block2(v7);
7272
}
7373

74-
pub fn wee_alloc::alloc_first_fit(i32, i32, i32) -> i32 {
74+
pub fn _ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE(i32, i32, i32) -> i32 {
7575
block0(v0: i32, v1: i32, v2: i32):
7676
v4 = const.i32 0 : i32;
7777
v5 = cast v2 : u32;
@@ -438,7 +438,7 @@ block33:
438438
br block5;
439439
}
440440

441-
pub fn <wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc(i32, i32, i32) -> i32 {
441+
pub fn _ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE(i32, i32, i32) -> i32 {
442442
block0(v0: i32, v1: i32, v2: i32):
443443
v4 = const.i32 0 : i32;
444444
v5 = global.load (@__stack_pointer) as *mut i8 : i32;
@@ -476,7 +476,7 @@ block3:
476476
v22 = cast v21 : i32;
477477
v23 = const.i32 12 : i32;
478478
v24 = add.wrapping v7, v23 : i32;
479-
v25 = call module0::wee_alloc::alloc_first_fit(v22, v1, v24) : i32;
479+
v25 = call module0::_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE(v22, v1, v24) : i32;
480480
v26 = neq v25, 0 : i1;
481481
condbr v26, block5(v0, v7, v25), block6;
482482

@@ -551,15 +551,15 @@ block7:
551551
store v75, v54;
552552
v76 = const.i32 12 : i32;
553553
v77 = add.wrapping v7, v76 : i32;
554-
v78 = call module0::wee_alloc::alloc_first_fit(v22, v1, v77) : i32;
554+
v78 = call module0::_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE(v22, v1, v77) : i32;
555555
br block5(v0, v7, v78);
556556

557557
block8:
558558
v52 = const.i32 0 : i32;
559559
br block5(v0, v7, v52);
560560
}
561561

562-
pub fn <wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::dealloc(i32, i32, i32, i32) {
562+
pub fn _ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$7dealloc17h229d057945549805E(i32, i32, i32, i32) {
563563
block0(v0: i32, v1: i32, v2: i32, v3: i32):
564564
v4 = const.i32 0 : i32;
565565
v5 = eq v1, 0 : i1;
@@ -768,7 +768,7 @@ block20:
768768
br block7(v150, v159);
769769
}
770770

771-
pub fn wit_bindgen::rt::run_ctors_once() {
771+
pub fn _ZN11wit_bindgen2rt14run_ctors_once17hb100d6aec5317c3eE() {
772772
block0:
773773
v0 = const.i32 0 : i32;
774774
v1 = cast v0 : u32;

‎tests/integration/expected/components/inc_wasm_component.wat

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@
1313
(type (;3;) (func (param i32 i32 i32 i32) (result i32)))
1414
(type (;4;) (func (param i32 i32 i32) (result i32)))
1515
(type (;5;) (func (param i32 i32 i32 i32)))
16-
(import "miden:add-package/[email protected]" "add" (func $inc_wasm_component::bindings::miden::add_package::add_interface::add::wit_import (;0;) (type 0)))
16+
(import "miden:add-package/[email protected]" "add" (func $_ZN18inc_wasm_component8bindings5miden11add_package13add_interface3add10wit_import17h394516ecbf0ecc39E (;0;) (type 0)))
1717
(func $__wasm_call_ctors (;1;) (type 1))
1818
(func $inc (;2;) (type 2) (param i32) (result i32)
19-
call $wit_bindgen::rt::run_ctors_once
19+
call $_ZN11wit_bindgen2rt14run_ctors_once17hb100d6aec5317c3eE
2020
local.get 0
2121
i32.const 1
22-
call $inc_wasm_component::bindings::miden::add_package::add_interface::add::wit_import
22+
call $_ZN18inc_wasm_component8bindings5miden11add_package13add_interface3add10wit_import17h394516ecbf0ecc39E
2323
)
2424
(func $__rust_alloc (;3;) (type 0) (param i32 i32) (result i32)
2525
i32.const 1048576
2626
local.get 1
2727
local.get 0
28-
call $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc
28+
call $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE
2929
)
3030
(func $__rust_realloc (;4;) (type 3) (param i32 i32 i32 i32) (result i32)
3131
(local i32)
3232
block ;; label = @1
3333
i32.const 1048576
3434
local.get 2
3535
local.get 3
36-
call $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc
36+
call $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE
3737
local.tee 4
3838
i32.eqz
3939
br_if 0 (;@1;)
@@ -50,11 +50,11 @@
5050
local.get 0
5151
local.get 2
5252
local.get 1
53-
call $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::dealloc
53+
call $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$7dealloc17h229d057945549805E
5454
end
5555
local.get 4
5656
)
57-
(func $wee_alloc::alloc_first_fit (;5;) (type 4) (param i32 i32 i32) (result i32)
57+
(func $_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE (;5;) (type 4) (param i32 i32 i32) (result i32)
5858
(local i32 i32 i32 i32 i32 i32 i32)
5959
block ;; label = @1
6060
local.get 2
@@ -355,7 +355,7 @@
355355
end
356356
i32.const 0
357357
)
358-
(func $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::alloc (;6;) (type 4) (param i32 i32 i32) (result i32)
358+
(func $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$5alloc17ha9251d4e7e8e539eE (;6;) (type 4) (param i32 i32 i32) (result i32)
359359
(local i32 i32 i32)
360360
global.get $__stack_pointer
361361
i32.const 16
@@ -386,7 +386,7 @@
386386
local.get 3
387387
i32.const 12
388388
i32.add
389-
call $wee_alloc::alloc_first_fit
389+
call $_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE
390390
local.tee 2
391391
br_if 0 (;@2;)
392392
block ;; label = @3
@@ -445,7 +445,7 @@
445445
local.get 3
446446
i32.const 12
447447
i32.add
448-
call $wee_alloc::alloc_first_fit
448+
call $_ZN9wee_alloc15alloc_first_fit17ha275c8f9c3f4182fE
449449
local.set 2
450450
end
451451
local.get 0
@@ -459,7 +459,7 @@
459459
global.set $__stack_pointer
460460
local.get 2
461461
)
462-
(func $<wee_alloc::WeeAlloc as core::alloc::global::GlobalAlloc>::dealloc (;7;) (type 5) (param i32 i32 i32 i32)
462+
(func $_ZN72_$LT$wee_alloc..WeeAlloc$u20$as$u20$core..alloc..global..GlobalAlloc$GT$7dealloc17h229d057945549805E (;7;) (type 5) (param i32 i32 i32 i32)
463463
(local i32 i32 i32 i32 i32 i32 i32)
464464
block ;; label = @1
465465
local.get 1
@@ -625,7 +625,7 @@
625625
i32.store
626626
end
627627
)
628-
(func $wit_bindgen::rt::run_ctors_once (;8;) (type 1)
628+
(func $_ZN11wit_bindgen2rt14run_ctors_once17hb100d6aec5317c3eE (;8;) (type 1)
629629
block ;; label = @1
630630
i32.const 0
631631
i32.load8_u offset=1048581

0 commit comments

Comments
 (0)