Skip to content

Commit b772c31

Browse files
authored
Cranelift: update to regalloc2 0.11.3. (#10539)
* Cranelift: update to regalloc2 0.11.3. This pulls in a fix for a fuzzbug found after #10502 started generating more challenging constraints for regalloc. The fix in bytecodealliance/regalloc2#214 updates bundle-splitting logic to properly handle bundles with multiple live-ranges all covering one instruction. * Update test expectations after regalloc perturbation.
1 parent ac11636 commit b772c31

File tree

5 files changed

+77
-77
lines changed

5 files changed

+77
-77
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-arra
286286

287287
# Bytecode Alliance maintained dependencies:
288288
# ---------------------------
289-
regalloc2 = "0.11.2"
289+
regalloc2 = "0.11.3"
290290

291291
# cap-std family:
292292
target-lexicon = "0.13.0"

cranelift/filetests/filetests/isa/aarch64/return-call.clif

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -463,18 +463,18 @@ block2:
463463
; stp x19, x20, [sp, #-16]!
464464
; sub sp, sp, #16
465465
; block0:
466-
; movz x3, #10
467-
; str x3, [sp]
466+
; movz x14, #10
467+
; str x14, [sp]
468468
; movz x3, #15
469469
; movz x4, #20
470470
; movz x5, #25
471471
; movz x6, #30
472472
; movz x7, #35
473-
; movz x25, #40
474-
; movz x21, #45
475-
; movz x28, #50
476-
; movz x27, #55
477-
; movz x26, #60
473+
; movz x21, #40
474+
; movz x28, #45
475+
; movz x27, #50
476+
; movz x26, #55
477+
; movz x25, #60
478478
; movz x24, #65
479479
; movz x23, #70
480480
; movz x22, #75
@@ -493,11 +493,11 @@ block2:
493493
; cbnz x2, label2 ; b label1
494494
; block1:
495495
; movz x2, #140
496-
; str x25, [sp, #112]
497-
; str x21, [sp, #120]
498-
; str x28, [sp, #128]
499-
; str x27, [sp, #136]
500-
; str x26, [sp, #144]
496+
; str x21, [sp, #112]
497+
; str x28, [sp, #120]
498+
; str x27, [sp, #128]
499+
; str x26, [sp, #136]
500+
; str x25, [sp, #144]
501501
; str x24, [sp, #152]
502502
; str x23, [sp, #160]
503503
; str x22, [sp, #168]
@@ -519,11 +519,11 @@ block2:
519519
; return_call_ind x1 new_stack_arg_size:176 x2=x2 x3=x3 x4=x4 x5=x5 x6=x6 x7=x7
520520
; block2:
521521
; ldr x2, [sp]
522-
; str x25, [sp, #128]
523-
; str x21, [sp, #136]
524-
; str x28, [sp, #144]
525-
; str x27, [sp, #152]
526-
; str x26, [sp, #160]
522+
; str x21, [sp, #128]
523+
; str x28, [sp, #136]
524+
; str x27, [sp, #144]
525+
; str x26, [sp, #152]
526+
; str x25, [sp, #160]
527527
; str x24, [sp, #168]
528528
; str x23, [sp, #176]
529529
; str x22, [sp, #184]
@@ -557,18 +557,18 @@ block2:
557557
; stp x19, x20, [sp, #-0x10]!
558558
; sub sp, sp, #0x10
559559
; block1: ; offset 0x30
560-
; mov x3, #0xa
561-
; stur x3, [sp]
560+
; mov x14, #0xa
561+
; stur x14, [sp]
562562
; mov x3, #0xf
563563
; mov x4, #0x14
564564
; mov x5, #0x19
565565
; mov x6, #0x1e
566566
; mov x7, #0x23
567-
; mov x25, #0x28
568-
; mov x21, #0x2d
569-
; mov x28, #0x32
570-
; mov x27, #0x37
571-
; mov x26, #0x3c
567+
; mov x21, #0x28
568+
; mov x28, #0x2d
569+
; mov x27, #0x32
570+
; mov x26, #0x37
571+
; mov x25, #0x3c
572572
; mov x24, #0x41
573573
; mov x23, #0x46
574574
; mov x22, #0x4b
@@ -587,11 +587,11 @@ block2:
587587
; cbnz x2, #0x12c
588588
; block2: ; offset 0xa0
589589
; mov x2, #0x8c
590-
; stur x25, [sp, #0x70]
591-
; stur x21, [sp, #0x78]
592-
; stur x28, [sp, #0x80]
593-
; stur x27, [sp, #0x88]
594-
; stur x26, [sp, #0x90]
590+
; stur x21, [sp, #0x70]
591+
; stur x28, [sp, #0x78]
592+
; stur x27, [sp, #0x80]
593+
; stur x26, [sp, #0x88]
594+
; stur x25, [sp, #0x90]
595595
; stur x24, [sp, #0x98]
596596
; stur x23, [sp, #0xa0]
597597
; stur x22, [sp, #0xa8]
@@ -623,11 +623,11 @@ block2:
623623
; br x1
624624
; block3: ; offset 0x12c
625625
; ldur x2, [sp]
626-
; stur x25, [sp, #0x80]
627-
; stur x21, [sp, #0x88]
628-
; stur x28, [sp, #0x90]
629-
; stur x27, [sp, #0x98]
630-
; stur x26, [sp, #0xa0]
626+
; stur x21, [sp, #0x80]
627+
; stur x28, [sp, #0x88]
628+
; stur x27, [sp, #0x90]
629+
; stur x26, [sp, #0x98]
630+
; stur x25, [sp, #0xa0]
631631
; stur x24, [sp, #0xa8]
632632
; stur x23, [sp, #0xb0]
633633
; stur x22, [sp, #0xb8]

cranelift/filetests/filetests/isa/riscv64/return-call.clif

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -561,22 +561,22 @@ block2:
561561
; block0:
562562
; li a1,10
563563
; sd a1,16(slot)
564-
; li a2,15
565-
; sd a2,8(slot)
566-
; li a3,20
567-
; sd a3,0(slot)
564+
; li a1,15
565+
; sd a1,8(slot)
566+
; li a2,20
567+
; sd a2,0(slot)
568568
; li a3,25
569569
; li a4,30
570570
; li a5,35
571571
; li a6,40
572572
; li a7,45
573573
; li a2,50
574574
; li a1,55
575-
; li s1,60
576-
; li s5,65
577-
; li s4,70
578-
; li s3,75
579-
; li s2,80
575+
; li s5,60
576+
; li s4,65
577+
; li s3,70
578+
; li s2,75
579+
; li s1,80
580580
; li t4,85
581581
; li t3,90
582582
; li t2,95
@@ -593,11 +593,11 @@ block2:
593593
; li a0,140
594594
; sd a2,-160(incoming_arg)
595595
; sd a1,-152(incoming_arg)
596-
; sd s1,-144(incoming_arg)
597-
; sd s5,-136(incoming_arg)
598-
; sd s4,-128(incoming_arg)
599-
; sd s3,-120(incoming_arg)
600-
; sd s2,-112(incoming_arg)
596+
; sd s5,-144(incoming_arg)
597+
; sd s4,-136(incoming_arg)
598+
; sd s3,-128(incoming_arg)
599+
; sd s2,-120(incoming_arg)
600+
; sd s1,-112(incoming_arg)
601601
; sd t4,-104(incoming_arg)
602602
; sd t3,-96(incoming_arg)
603603
; sd t2,-88(incoming_arg)
@@ -619,11 +619,11 @@ block2:
619619
; ld a0,16(slot)
620620
; sd a2,-144(incoming_arg)
621621
; sd a1,-136(incoming_arg)
622-
; sd s1,-128(incoming_arg)
623-
; sd s5,-120(incoming_arg)
624-
; sd s4,-112(incoming_arg)
625-
; sd s3,-104(incoming_arg)
626-
; sd s2,-96(incoming_arg)
622+
; sd s5,-128(incoming_arg)
623+
; sd s4,-120(incoming_arg)
624+
; sd s3,-112(incoming_arg)
625+
; sd s2,-104(incoming_arg)
626+
; sd s1,-96(incoming_arg)
627627
; sd t4,-88(incoming_arg)
628628
; sd t3,-80(incoming_arg)
629629
; sd t2,-72(incoming_arg)
@@ -666,22 +666,22 @@ block2:
666666
; block1: ; offset 0x54
667667
; addi a1, zero, 0xa
668668
; sd a1, 0x10(sp)
669-
; addi a2, zero, 0xf
670-
; sd a2, 8(sp)
671-
; addi a3, zero, 0x14
672-
; sd a3, 0(sp)
669+
; addi a1, zero, 0xf
670+
; sd a1, 8(sp)
671+
; addi a2, zero, 0x14
672+
; sd a2, 0(sp)
673673
; addi a3, zero, 0x19
674674
; addi a4, zero, 0x1e
675675
; addi a5, zero, 0x23
676676
; addi a6, zero, 0x28
677677
; addi a7, zero, 0x2d
678678
; addi a2, zero, 0x32
679679
; addi a1, zero, 0x37
680-
; addi s1, zero, 0x3c
681-
; addi s5, zero, 0x41
682-
; addi s4, zero, 0x46
683-
; addi s3, zero, 0x4b
684-
; addi s2, zero, 0x50
680+
; addi s5, zero, 0x3c
681+
; addi s4, zero, 0x41
682+
; addi s3, zero, 0x46
683+
; addi s2, zero, 0x4b
684+
; addi s1, zero, 0x50
685685
; addi t4, zero, 0x55
686686
; addi t3, zero, 0x5a
687687
; addi t2, zero, 0x5f
@@ -698,11 +698,11 @@ block2:
698698
; addi a0, zero, 0x8c
699699
; sd a2, 0x90(sp)
700700
; sd a1, 0x98(sp)
701-
; sd s1, 0xa0(sp)
702-
; sd s5, 0xa8(sp)
703-
; sd s4, 0xb0(sp)
704-
; sd s3, 0xb8(sp)
705-
; sd s2, 0xc0(sp)
701+
; sd s5, 0xa0(sp)
702+
; sd s4, 0xa8(sp)
703+
; sd s3, 0xb0(sp)
704+
; sd s2, 0xb8(sp)
705+
; sd s1, 0xc0(sp)
706706
; sd t4, 0xc8(sp)
707707
; sd t3, 0xd0(sp)
708708
; sd t2, 0xd8(sp)
@@ -742,11 +742,11 @@ block2:
742742
; ld a0, 0x10(sp)
743743
; sd a2, 0xa0(sp)
744744
; sd a1, 0xa8(sp)
745-
; sd s1, 0xb0(sp)
746-
; sd s5, 0xb8(sp)
747-
; sd s4, 0xc0(sp)
748-
; sd s3, 0xc8(sp)
749-
; sd s2, 0xd0(sp)
745+
; sd s5, 0xb0(sp)
746+
; sd s4, 0xb8(sp)
747+
; sd s3, 0xc0(sp)
748+
; sd s2, 0xc8(sp)
749+
; sd s1, 0xd0(sp)
750750
; sd t4, 0xd8(sp)
751751
; sd t3, 0xe0(sp)
752752
; sd t2, 0xe8(sp)

supply-chain/imports.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,8 @@ user-login = "dtolnay"
933933
user-name = "David Tolnay"
934934

935935
[[publisher.regalloc2]]
936-
version = "0.11.2"
937-
when = "2025-04-01"
936+
version = "0.11.3"
937+
when = "2025-04-07"
938938
user-id = 3726
939939
user-login = "cfallin"
940940
user-name = "Chris Fallin"

0 commit comments

Comments
 (0)