Skip to content

[47.0.0] A few more minor backports #13864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexcrichton wants to merge 2 commits into
base: release-47.0.0
Choose a base branch
from
Open

[47.0.0] A few more minor backports #13864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bf6fa3
Fix precedence in `AliasRegionKey` module bits assert (#13832)
fitzgen Jul 6, 2026
a49a4f0
winch(x64): Avoid undefined behavior on ctz/clz (#13829)
saulecabrera Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/cranelift/src/alias_region.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ impl AliasRegionKey {
AliasRegionKey::PublicMemory => Self::IMPORTED_MEMORY_KIND,
AliasRegionKey::DefinedMemory { module, index } => {
debug_assert_eq!(
module.as_u32() & !Self::MODULE_MASK >> Self::MODULE_OFFSET,
module.as_u32() & !(Self::MODULE_MASK >> Self::MODULE_OFFSET),
0
);
debug_assert_eq!(index.as_u32() & !Self::INDEX_MASK, 0);
Expand All @@ -220,7 +220,7 @@ impl AliasRegionKey {
AliasRegionKey::PublicTable => Self::IMPORTED_TABLE_KIND,
AliasRegionKey::DefinedTable { module, index } => {
debug_assert_eq!(
module.as_u32() & !Self::MODULE_MASK >> Self::MODULE_OFFSET,
module.as_u32() & !(Self::MODULE_MASK >> Self::MODULE_OFFSET),
0
);
debug_assert_eq!(index.as_u32() & !Self::INDEX_MASK, 0);
Expand All @@ -229,7 +229,7 @@ impl AliasRegionKey {
AliasRegionKey::PublicGlobal => Self::IMPORTED_GLOBAL_KIND,
AliasRegionKey::DefinedGlobal { module, index } => {
debug_assert_eq!(
module.as_u32() & !Self::MODULE_MASK >> Self::MODULE_OFFSET,
module.as_u32() & !(Self::MODULE_MASK >> Self::MODULE_OFFSET),
0
);
debug_assert_eq!(index.as_u32() & !Self::INDEX_MASK, 0);
Expand Down
11 changes: 5 additions & 6 deletions tests/disas/winch/x64/i32_clz/no_lzcnt_const.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,18 @@
;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x54
;; ja 0x51
;; 1c: movq %rdi, %r14
;; subq $0x10, %rsp
;; movq %rdi, 8(%rsp)
;; movq %rsi, (%rsp)
;; movl $1, %eax
;; bsrl %eax, %eax
;; movl $0, %r11d
;; setne %r11b
;; movl $0xffffffff, %r11d
;; cmovel %r11d, %eax
;; negl %eax
;; addl $0x20, %eax
;; subl %r11d, %eax
;; addl $0x1f, %eax
;; addq $0x10, %rsp
;; popq %rbp
;; retq
;; 54: ud2
;; 51: ud2
11 changes: 5 additions & 6 deletions tests/disas/winch/x64/i32_clz/no_lzcnt_local.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x66
;; ja 0x63
;; 1c: movq %rdi, %r14
;; subq $0x20, %rsp
;; movq %rdi, 0x18(%rsp)
Expand All @@ -29,12 +29,11 @@
;; movl %eax, 0xc(%rsp)
;; movl 0xc(%rsp), %eax
;; bsrl %eax, %eax
;; movl $0, %r11d
;; setne %r11b
;; movl $0xffffffff, %r11d
;; cmovel %r11d, %eax
;; negl %eax
;; addl $0x20, %eax
;; subl %r11d, %eax
;; addl $0x1f, %eax
;; addq $0x20, %rsp
;; popq %rbp
;; retq
;; 66: ud2
;; 63: ud2
11 changes: 5 additions & 6 deletions tests/disas/winch/x64/i32_clz/no_lzcnt_param.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,19 @@
;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
;; ja 0x55
;; 1c: movq %rdi, %r14
;; subq $0x20, %rsp
;; movq %rdi, 0x18(%rsp)
;; movq %rsi, 0x10(%rsp)
;; movl %edx, 0xc(%rsp)
;; movl 0xc(%rsp), %eax
;; bsrl %eax, %eax
;; movl $0, %r11d
;; setne %r11b
;; movl $0xffffffff, %r11d
;; cmovel %r11d, %eax
;; negl %eax
;; addl $0x20, %eax
;; subl %r11d, %eax
;; addl $0x1f, %eax
;; addq $0x20, %rsp
;; popq %rbp
;; retq
;; 58: ud2
;; 55: ud2
10 changes: 4 additions & 6 deletions tests/disas/winch/x64/i32_ctz/no_bmi1_const.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,16 @@
;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x51
;; ja 0x4a
;; 1c: movq %rdi, %r14
;; subq $0x10, %rsp
;; movq %rdi, 8(%rsp)
;; movq %rsi, (%rsp)
;; movl $1, %eax
;; bsfl %eax, %eax
;; movl $0, %r11d
;; sete %r11b
;; shll $5, %r11d
;; addl %r11d, %eax
;; movl $0x20, %r11d
;; cmovel %r11d, %eax
;; addq $0x10, %rsp
;; popq %rbp
;; retq
;; 51: ud2
;; 4a: ud2
10 changes: 4 additions & 6 deletions tests/disas/winch/x64/i32_ctz/no_bmi1_local.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x63
;; ja 0x5c
;; 1c: movq %rdi, %r14
;; subq $0x20, %rsp
;; movq %rdi, 0x18(%rsp)
Expand All @@ -29,11 +29,9 @@
;; movl %eax, 0xc(%rsp)
;; movl 0xc(%rsp), %eax
;; bsfl %eax, %eax
;; movl $0, %r11d
;; sete %r11b
;; shll $5, %r11d
;; addl %r11d, %eax
;; movl $0x20, %r11d
;; cmovel %r11d, %eax
;; addq $0x20, %rsp
;; popq %rbp
;; retq
;; 63: ud2
;; 5c: ud2
10 changes: 4 additions & 6 deletions tests/disas/winch/x64/i32_ctz/no_bmi1_param.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,17 @@
;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x55
;; ja 0x4e
;; 1c: movq %rdi, %r14
;; subq $0x20, %rsp
;; movq %rdi, 0x18(%rsp)
;; movq %rsi, 0x10(%rsp)
;; movl %edx, 0xc(%rsp)
;; movl 0xc(%rsp), %eax
;; bsfl %eax, %eax
;; movl $0, %r11d
;; sete %r11b
;; shll $5, %r11d
;; addl %r11d, %eax
;; movl $0x20, %r11d
;; cmovel %r11d, %eax
;; addq $0x20, %rsp
;; popq %rbp
;; retq
;; 55: ud2
;; 4e: ud2
11 changes: 5 additions & 6 deletions tests/disas/winch/x64/i64_clz/no_lzcnt_const.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,18 @@
;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x57
;; ja 0x55
;; 1c: movq %rdi, %r14
;; subq $0x10, %rsp
;; movq %rdi, 8(%rsp)
;; movq %rsi, (%rsp)
;; movl $1, %eax
;; bsrq %rax, %rax
;; movl $0, %r11d
;; setne %r11b
;; movq $18446744073709551615, %r11
;; cmoveq %r11, %rax
;; negq %rax
;; addq $0x40, %rax
;; subq %r11, %rax
;; addq $0x3f, %rax
;; addq $0x10, %rsp
;; popq %rbp
;; retq
;; 57: ud2
;; 55: ud2
11 changes: 5 additions & 6 deletions tests/disas/winch/x64/i64_clz/no_lzcnt_local.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x6b
;; ja 0x69
;; 1c: movq %rdi, %r14
;; subq $0x20, %rsp
;; movq %rdi, 0x18(%rsp)
Expand All @@ -29,12 +29,11 @@
;; movq %rax, 8(%rsp)
;; movq 8(%rsp), %rax
;; bsrq %rax, %rax
;; movl $0, %r11d
;; setne %r11b
;; movq $18446744073709551615, %r11
;; cmoveq %r11, %rax
;; negq %rax
;; addq $0x40, %rax
;; subq %r11, %rax
;; addq $0x3f, %rax
;; addq $0x20, %rsp
;; popq %rbp
;; retq
;; 6b: ud2
;; 69: ud2
11 changes: 5 additions & 6 deletions tests/disas/winch/x64/i64_clz/no_lzcnt_param.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,19 @@
;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x5d
;; ja 0x5b
;; 1c: movq %rdi, %r14
;; subq $0x20, %rsp
;; movq %rdi, 0x18(%rsp)
;; movq %rsi, 0x10(%rsp)
;; movq %rdx, 8(%rsp)
;; movq 8(%rsp), %rax
;; bsrq %rax, %rax
;; movl $0, %r11d
;; setne %r11b
;; movq $18446744073709551615, %r11
;; cmoveq %r11, %rax
;; negq %rax
;; addq $0x40, %rax
;; subq %r11, %rax
;; addq $0x3f, %rax
;; addq $0x20, %rsp
;; popq %rbp
;; retq
;; 5d: ud2
;; 5b: ud2
10 changes: 4 additions & 6 deletions tests/disas/winch/x64/i64_ctz/no_bmi1_const.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,16 @@
;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0x52
;; ja 0x4b
;; 1c: movq %rdi, %r14
;; subq $0x10, %rsp
;; movq %rdi, 8(%rsp)
;; movq %rsi, (%rsp)
;; movl $1, %eax
;; bsfq %rax, %rax
;; movl $0, %r11d
;; sete %r11b
;; shlq $6, %r11
;; addq %r11, %rax
;; movl $0x40, %r11d
;; cmoveq %r11, %rax
;; addq $0x10, %rsp
;; popq %rbp
;; retq
;; 52: ud2
;; 4b: ud2
10 changes: 4 additions & 6 deletions tests/disas/winch/x64/i64_ctz/no_bmi1_local.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x66
;; ja 0x5f
;; 1c: movq %rdi, %r14
;; subq $0x20, %rsp
;; movq %rdi, 0x18(%rsp)
Expand All @@ -29,11 +29,9 @@
;; movq %rax, 8(%rsp)
;; movq 8(%rsp), %rax
;; bsfq %rax, %rax
;; movl $0, %r11d
;; sete %r11b
;; shlq $6, %r11
;; addq %r11, %rax
;; movl $0x40, %r11d
;; cmoveq %r11, %rax
;; addq $0x20, %rsp
;; popq %rbp
;; retq
;; 66: ud2
;; 5f: ud2
10 changes: 4 additions & 6 deletions tests/disas/winch/x64/i64_ctz/no_bmi1_param.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,17 @@
;; movq 0x18(%r11), %r11
;; addq $0x20, %r11
;; cmpq %rsp, %r11
;; ja 0x58
;; ja 0x51
;; 1c: movq %rdi, %r14
;; subq $0x20, %rsp
;; movq %rdi, 0x18(%rsp)
;; movq %rsi, 0x10(%rsp)
;; movq %rdx, 8(%rsp)
;; movq 8(%rsp), %rax
;; bsfq %rax, %rax
;; movl $0, %r11d
;; sete %r11b
;; shlq $6, %r11
;; addq %r11, %rax
;; movl $0x40, %r11d
;; cmoveq %r11, %rax
;; addq $0x20, %rsp
;; popq %rbp
;; retq
;; 58: ud2
;; 51: ud2
10 changes: 4 additions & 6 deletions tests/disas/winch/x64/loop/as_unary_operand.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
;; movq 0x18(%r11), %r11
;; addq $0x10, %r11
;; cmpq %rsp, %r11
;; ja 0xa1
;; ja 0x9a
;; 5c: movq %rdi, %r14
;; subq $0x10, %rsp
;; movq %rdi, 8(%rsp)
Expand All @@ -41,11 +41,9 @@
;; movq 8(%rsp), %r14
;; movl $0xd, %eax
;; bsfl %eax, %eax
;; movl $0, %r11d
;; sete %r11b
;; shll $5, %r11d
;; addl %r11d, %eax
;; movl $0x20, %r11d
;; cmovel %r11d, %eax
;; addq $0x10, %rsp
;; popq %rbp
;; retq
;; a1: ud2
;; 9a: ud2
Loading
Loading