T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cranelift: Restrict br_table to i32 indices (#4510)

Browse Source 
* cranelift: Restrict `br_table` to `i32` indices

In #4498 it was proposed that we should only accept `i32` indices
to `br_table`. The rationale for this is that larger types lead the
users to a false sense of flexibility (since we don't support jump
tables larger than u32's), and narrower types are not well tested
paths that would be safer if we removed them.

* cranelift: Reduce directly from i128 to i32 in Switch
This commit is contained in:
Afonso Bordado
2022-07-23 00:32:40 +01:00
committed by GitHub
parent f1a0c40a53
commit af62037f62
10 changed files with 76 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cranelift/filetests/filetests/isa/aarch64/jumptable.clif
View File

@@ -2,30 +2,30 @@ test compile precise-output
set unwind_info=false
target aarch64
function %f(i64) -> i64 {
function %f(i32) -> i32 {
jt0 = jump_table [block1, block2, block3]
block0(v0: i64):
block0(v0: i32):
br_table v0, block4, jt0
block1:
v1 = iconst.i64 1
v1 = iconst.i32 1
jump block5(v1)
block2:
v2 = iconst.i64 2
v2 = iconst.i32 2
jump block5(v2)
block3:
v3 = iconst.i64 3
v3 = iconst.i32 3
jump block5(v3)
block4:
v4 = iconst.i64 4
v4 = iconst.i32 4
jump block5(v4)
block5(v5: i64):
v6 = iadd.i64 v0, v5
block5(v5: i32):
v6 = iadd.i32 v0, v5
return v6
}
@@ -54,6 +54,5 @@ block5(v5: i64):
; block8:
; b label9
; block9:
; add x0, x0, x5
; add w0, w0, w5
; ret

33
cranelift/filetests/filetests/isa/s390x/jumptable.clif
View File

@@ -1,59 +1,60 @@
test compile precise-output
target s390x
function %f(i64) -> i64 {
function %f(i32) -> i32 {
jt0 = jump_table [block1, block2, block3]
block0(v0: i64):
block0(v0: i32):
br_table v0, block4, jt0
block1:
v1 = iconst.i64 1
v1 = iconst.i32 1
jump block5(v1)
block2:
v2 = iconst.i64 2
v2 = iconst.i32 2
jump block5(v2)
block3:
v3 = iconst.i64 3
v3 = iconst.i32 3
jump block5(v3)
block4:
v4 = iconst.i64 4
v4 = iconst.i32 4
jump block5(v4)
block5(v5: i64):
v6 = iadd.i64 v0, v5
block5(v5: i32):
v6 = iadd.i32 v0, v5
return v6
}
; block0:
; clgfi %r2, 3
; llgfr %r3, %r2
; clgfi %r3, 3
; jghe label1
; sllg %r5, %r2, 2
; larl %r1, 14 ; agf %r1, 0(%r1, %r5) ; br %r1 ; jt_entries label3 label5 label7
; sllg %r3, %r3, 2
; larl %r1, 14 ; agf %r1, 0(%r1, %r3) ; br %r1 ; jt_entries label3 label5 label7
; block1:
; lghi %r4, 4
; lhi %r5, 4
; jg label2
; block2:
; jg label9
; block3:
; lghi %r4, 1
; lhi %r5, 1
; jg label4
; block4:
; jg label9
; block5:
; lghi %r4, 2
; lhi %r5, 2
; jg label6
; block6:
; jg label9
; block7:
; lghi %r4, 3
; lhi %r5, 3
; jg label8
; block8:
; jg label9
; block9:
; agr %r2, %r4
; ar %r2, %r5
; br %r14

4
cranelift/filetests/filetests/isa/x64/atomic-cas-bug.clif
View File

@@ -78,11 +78,11 @@ function u0:31(i64, i32, i32, i8, i8) -> i32, i32 system_v {
@0001 v8 = stack_load.i8 ss5
@0001 stack_store v8, ss3+1
@0001 v9 = stack_load.i8 ss3
@0001 v10 = uextend.i64 v9
@0001 v10 = uextend.i32 v9
@0005 jump block37
block37:
@0005 br_table.i64 v10, block36, jt0
@0005 br_table v10, block36, jt0
block2:
@0001 v11 = stack_load.i8 ss3+1

2
cranelift/filetests/filetests/licm/rewrite-jump-table.clif
View File

@@ -5,7 +5,7 @@ function %rewrite_jump_table() {
jt0 = jump_table [block1, block2]
block0:
v0 = iconst.i64 1
v0 = iconst.i32 1
br_table v0, block1, jt0
block1:

109
cranelift/filetests/filetests/runtests/br_table.clif
View File

@@ -4,79 +4,6 @@ target aarch64
target x86_64
target s390x
function %br_table_i8(i8) -> i8 {
jt0 = jump_table [block1, block2, block2, block3]
block0(v0: i8):
br_table v0, block4, jt0
block1:
v1 = iconst.i8 1
jump block5(v1)
block2:
v2 = iconst.i8 2
jump block5(v2)
block3:
v3 = iconst.i8 3
jump block5(v3)
block4:
v4 = iconst.i8 4
jump block5(v4)
block5(v5: i8):
v6 = iadd.i8 v0, v5
return v6
}
; run: %br_table_i8(0) == 1
; run: %br_table_i8(1) == 3
; run: %br_table_i8(2) == 4
; run: %br_table_i8(3) == 6
; run: %br_table_i8(4) == 8
; run: %br_table_i8(5) == 9
; run: %br_table_i8(6) == 10
; run: %br_table_i8(-1) == 3
function %br_table_i16(i16) -> i16 {
jt0 = jump_table [block1, block2, block2, block3]
block0(v0: i16):
br_table v0, block4, jt0
block1:
v1 = iconst.i16 1
jump block5(v1)
block2:
v2 = iconst.i16 2
jump block5(v2)
block3:
v3 = iconst.i16 3
jump block5(v3)
block4:
v4 = iconst.i16 4
jump block5(v4)
block5(v5: i16):
v6 = iadd.i16 v0, v5
return v6
}
; run: %br_table_i16(0) == 1
; run: %br_table_i16(1) == 3
; run: %br_table_i16(2) == 4
; run: %br_table_i16(3) == 6
; run: %br_table_i16(4) == 8
; run: %br_table_i16(5) == 9
; run: %br_table_i16(6) == 10
; run: %br_table_i16(-1) == 3
function %br_table_i32(i32) -> i32 {
jt0 = jump_table [block1, block2, block2, block3]
@@ -111,39 +38,3 @@ block5(v5: i32):
; run: %br_table_i32(5) == 9
; run: %br_table_i32(6) == 10
; run: %br_table_i32(-1) == 3
function %br_table_i64(i64) -> i64 {
jt0 = jump_table [block1, block2, block2, block3]
block0(v0: i64):
br_table v0, block4, jt0
block1:
v1 = iconst.i64 1
jump block5(v1)
block2:
v2 = iconst.i64 2
jump block5(v2)
block3:
v3 = iconst.i64 3
jump block5(v3)
block4:
v4 = iconst.i64 4
jump block5(v4)
block5(v5: i64):
v6 = iadd.i64 v0, v5
return v6
}
; run: %br_table_i64(0) == 1
; run: %br_table_i64(1) == 3
; run: %br_table_i64(2) == 4
; run: %br_table_i64(3) == 6
; run: %br_table_i64(4) == 8
; run: %br_table_i64(5) == 9
; run: %br_table_i64(6) == 10
; run: %br_table_i64(-1) == 3

12
cranelift/filetests/filetests/verifier/jump_table.clif
View File

@@ -1,19 +1,19 @@
test verifier
function %br_invalid_default(i64) {
function %br_invalid_default(i32) {
jt0 = jump_table [block1, block1]
block0(v0: i64):
br_table.i64 v0, block2, jt0 ; error: invalid block reference block2
block0(v0: i32):
br_table v0, block2, jt0 ; error: invalid block reference block2
block1:
return
}
function %br(i64) {
function %br(i32) {
jt0 = jump_table [block1, block2] ; error: invalid block reference block2
block0(v0: i64):
br_table.i64 v0, block1, jt0
block0(v0: i32):
br_table v0, block1, jt0
block1:
return
}