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

LifetimeDependenceScopeFixup: extend store_borrow scopes

Browse Source 
This is require to handle '@'_addressable arguments on the caller side.
This commit is contained in:
Andrew Trick
2025-03-03 15:58:42 -08:00
parent 7b83c09fe9
commit 1b51aa8829
2 changed files with 117 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceScopeFixup.swift
View File

@@ -249,7 +249,7 @@ private struct ScopeExtension {
private extension LifetimeDependence.Scope {
/// The instruction that introduces an extendable scope. This returns a non-nil scope introducer for
/// Extendable.nestedScopes.
/// ScopeExtension.nestedScopes.
var extendableBegin: Instruction? {
switch self {
case let .access(beginAccess):
@@ -258,6 +258,17 @@ private extension LifetimeDependence.Scope {
return beginBorrow.value.definingInstruction!
case let .yield(yieldedValue):
return yieldedValue.definingInstruction!
case let .initialized(initializer):
switch initializer {
case let .store(initializingStore: store, initialAddress: _):
if let sb = store as? StoreBorrowInst {
return sb
}
return nil
case .argument, .yield:
// TODO: extend indirectly yielded scopes.
return nil
}
default:
return nil
}
@@ -277,17 +288,8 @@ private extension LifetimeDependence.Scope {
let accessExtension = gatherAccessExtension(beginAccess: beginAccess, innerScopes: &innerScopes)
return SingleInlineArray(element: accessExtension)
case let .borrowed(beginBorrow):
let borrowedValue = beginBorrow.baseOperand!.value
let enclosingScope = LifetimeDependence.Scope(base: borrowedValue, context)
innerScopes.push(self)
var innerBorrowScopes = innerScopes
innerBorrowScopes.push(enclosingScope)
if let extensions = enclosingScope.gatherExtensions(innerScopes: innerBorrowScopes, context) {
return extensions
}
// This is the outermost scope to be extended because gatherExtensions did not find an enclosing scope.
return SingleInlineArray(element: getOuterExtension(owner: enclosingScope.parentValue, nestedScopes: innerScopes,
context))
return gatherBorrowExtension(borrowedValue: beginBorrow.baseOperand!.value, innerScopes: &innerScopes, context)
case let .yield(yieldedValue):
innerScopes.push(self)
var extensions = SingleInlineArray<ScopeExtension>()
@@ -300,6 +302,17 @@ private extension LifetimeDependence.Scope {
extensions.append(contentsOf: gatherOperandExtension(on: operand, innerScopes: innerScopes, context))
}
return extensions
case let .initialized(initializer):
switch initializer {
case let .store(initializingStore: store, initialAddress: _):
if let sb = store as? StoreBorrowInst {
return gatherBorrowExtension(borrowedValue: sb.source, innerScopes: &innerScopes, context)
}
return nil
case .argument, .yield:
// TODO: extend indirectly yielded scopes.
return nil
}
default:
return nil
}
@@ -360,6 +373,23 @@ private extension LifetimeDependence.Scope {
}
return ScopeExtension(owner: outerBeginAccess, nestedScopes: innerScopes, dependsOnArg: nil)
}
func gatherBorrowExtension(borrowedValue: Value,
innerScopes: inout SingleInlineArray<LifetimeDependence.Scope>,
_ context: FunctionPassContext)
-> SingleInlineArray<ScopeExtension> {
let enclosingScope = LifetimeDependence.Scope(base: borrowedValue, context)
innerScopes.push(self)
var innerBorrowScopes = innerScopes
innerBorrowScopes.push(enclosingScope)
if let extensions = enclosingScope.gatherExtensions(innerScopes: innerBorrowScopes, context) {
return extensions
}
// This is the outermost scope to be extended because gatherExtensions did not find an enclosing scope.
return SingleInlineArray(element: getOuterExtension(owner: enclosingScope.parentValue, nestedScopes: innerScopes,
context))
}
}
/// Compute the range of the a scope owner. Nested scopes must stay within this range.
@@ -584,6 +614,17 @@ private extension LifetimeDependence.Scope {
case let .yield(yieldedValue):
let beginApply = yieldedValue.definingInstruction as! BeginApplyInst
return beginApply.createEnd(builder, context)
case let .initialized(initializer):
switch initializer {
case let .store(initializingStore: store, initialAddress: _):
if let sb = store as? StoreBorrowInst {
return builder.createEndBorrow(of: sb)
}
return nil
case .argument, .yield:
// TODO: extend indirectly yielded scopes.
return nil
}
default:
return nil
}