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

Mass rename Ebb and relatives to Block (#1365)

Browse Source 
* Manually rename BasicBlock to BlockPredecessor

BasicBlock is a pair of (Ebb, Inst) that is used to represent the
basic block subcomponent of an Ebb that is a predecessor to an Ebb.

Eventually we will be able to remove this struct, but for now it
makes sense to give it a non-conflicting name so that we can start
to transition Ebb to represent a basic block.

I have not updated any comments that refer to BasicBlock, as
eventually we will remove BlockPredecessor and replace with Block,
which is a basic block, so the comments will become correct.

* Manually rename SSABuilder block types to avoid conflict

SSABuilder has its own Block and BlockData types. These along with
associated identifier will cause conflicts in a later commit, so
they are renamed to be more verbose here.

* Automatically rename 'Ebb' to 'Block' in *.rs

* Automatically rename 'EBB' to 'block' in *.rs

* Automatically rename 'ebb' to 'block' in *.rs

* Automatically rename 'extended basic block' to 'basic block' in *.rs

* Automatically rename 'an basic block' to 'a basic block' in *.rs

* Manually update comment for `Block`

`Block`'s wikipedia article required an update.

* Automatically rename 'an `Block`' to 'a `Block`' in *.rs

* Automatically rename 'extended_basic_block' to 'basic_block' in *.rs

* Automatically rename 'ebb' to 'block' in *.clif

* Manually rename clif constant that contains 'ebb' as substring to avoid conflict

* Automatically rename filecheck uses of 'EBB' to 'BB'

'regex: EBB' -> 'regex: BB'
'$EBB' -> '$BB'

* Automatically rename 'EBB' 'Ebb' to 'block' in *.clif

* Automatically rename 'an block' to 'a block' in *.clif

* Fix broken testcase when function name length increases

Test function names are limited to 16 characters. This causes
the new longer name to be truncated and fail a filecheck test. An
outdated comment was also fixed.
This commit is contained in:
Ryan Hunt
2020-02-07 10:46:47 -06:00
committed by GitHub
parent a136d1cb00
commit 832666c45e
370 changed files with 8090 additions and 7988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cranelift/filetests/filetests/safepoint/call.clif
View File

@@ -7,15 +7,15 @@ function %direct() -> r64 {
fn1 = %one() -> r64
fn2 = %two() -> i32, r64
ebb0:
block0:
call fn0()
v1 = call fn1()
v2, v3 = call fn2()
brz v2, ebb2
jump ebb1
ebb1:
brz v2, block2
jump block1
block1:
return v1
ebb2:
block2:
v4 = call fn1()
return v3
}
@@ -30,7 +30,7 @@ ebb2:
; nextln: fn1 = %one sig1
; nextln: fn2 = %two sig2
; nextln:
; nextln: ebb0:
; nextln: block0:
; nextln: v5 = func_addr.i64 fn0
; nextln: call_indirect sig0, v5()
; nextln: v6 = func_addr.i64 fn1
@@ -40,15 +40,15 @@ ebb2:
; nextln: safepoint v1
; nextln: v2, v10 = call_indirect sig2, v7()
; nextln: v3 = spill v10
; nextln: brz v2, ebb2
; nextln: jump ebb1
; nextln: brz v2, block2
; nextln: jump block1
; nextln:
; nextln: ebb1:
; nextln: block1:
; nextln: v11 = fill.r64 v1
; nextln: regmove v11, %r15 -> %rax
; nextln: return v11
; nextln:
; nextln: ebb2:
; nextln: block2:
; nextln: v8 = func_addr.i64 fn1
; nextln: safepoint v3
; nextln: v4 = call_indirect sig1, v8()