averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Swift SIL: rename parent accessors to parentX, e.g. Instruction.parentBlock

Browse Source 
It makes it easier to read
This commit is contained in:
Erik Eckstein
2022-12-23 13:43:45 +01:00
parent 0812484a4a
commit 6c35258f83
22 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SwiftCompilerSources/Sources/SIL/Argument.swift
View File

@@ -18,16 +18,15 @@ import SILBridging
/// Maps to both, SILPhiArgument and SILFunctionArgument.
public class Argument : Value, Hashable {
public var definingInstruction: Instruction? { nil }
public var definingBlock: BasicBlock { block }
public var block: BasicBlock {
public var parentBlock: BasicBlock {
return SILArgument_getParent(bridged).block
}
var bridged: BridgedArgument { BridgedArgument(obj: SwiftObject(self)) }
public var index: Int {
return block.arguments.firstIndex(of: self)!
return parentBlock.arguments.firstIndex(of: self)!
}
public static func ==(lhs: Argument, rhs: Argument) -> Bool {
@@ -47,7 +46,7 @@ final public class FunctionArgument : Argument {
final public class BlockArgument : Argument {
public var isPhiArgument: Bool {
block.predecessors.allSatisfy {
parentBlock.predecessors.allSatisfy {
let term = $0.terminator
return term is BranchInst || term is CondBranchInst
}
@@ -56,16 +55,16 @@ final public class BlockArgument : Argument {
public var incomingPhiOperands: LazyMapSequence<PredecessorList, Operand> {
assert(isPhiArgument)
let idx = index
return block.predecessors.lazy.map {
return parentBlock.predecessors.lazy.map {
switch $0.terminator {
case let br as BranchInst:
return br.operands[idx]
case let condBr as CondBranchInst:
if condBr.trueBlock == self.block {
assert(condBr.falseBlock != self.block)
if condBr.trueBlock == self.parentBlock {
assert(condBr.falseBlock != self.parentBlock)
return condBr.trueOperands[idx]
} else {
assert(condBr.falseBlock == self.block)
assert(condBr.falseBlock == self.parentBlock)
return condBr.falseOperands[idx]
}
default: