Review feedback; Builder.createEndAccess()

atrick · atrick · commit 7dea051bf627 · 2024-03-05T17:08:13.000-08:00
diff --git a/SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceScopeFixup.swift b/SwiftCompilerSources/Sources/Optimizer/FunctionPasses/LifetimeDependenceScopeFixup.swift
@@ -119,7 +119,7 @@ private func extendAccessScope(beginAccess: BeginAccessInst, range: inout Instru
   // Create new end_access at the end of extended uses
   for end in range.ends {
     let endBuilder = Builder(after: end, context)
-    _ = endBuilder.createEndAccess(beginAccess: beginAccess)
+    endBuilder.createEndAccess(beginAccess: beginAccess)
   }
   // Delete original end_access instructions
   for endAccess in endAcceses {
diff --git a/SwiftCompilerSources/Sources/SIL/Builder.swift b/SwiftCompilerSources/Sources/SIL/Builder.swift
@@ -420,6 +420,7 @@ public struct Builder {
     return notifyNew(markDependence.getAs(MarkDependenceInst.self))
   }
     
+  @discardableResult
   public func createEndAccess(beginAccess: BeginAccessInst) -> EndAccessInst {
       let endAccess = bridged.createEndAccess(beginAccess.bridged)
       return notifyNew(endAccess.getAs(EndAccessInst.self))

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private func extendAccessScope(beginAccess: BeginAccessInst, range: inout Instru`
`119`	`119`	`// Create new end_access at the end of extended uses`
`120`	`120`	`for end in range.ends {`
`121`	`121`	`let endBuilder = Builder(after: end, context)`
`122`		`- _ = endBuilder.createEndAccess(beginAccess: beginAccess)`
	`122`	`+ endBuilder.createEndAccess(beginAccess: beginAccess)`
`123`	`123`	`}`
`124`	`124`	`// Delete original end_access instructions`
`125`	`125`	`for endAccess in endAcceses {`
Original file line number	Diff line number	Diff line change
`@@ -420,6 +420,7 @@ public struct Builder {`
`420`	`420`	`return notifyNew(markDependence.getAs(MarkDependenceInst.self))`
`421`	`421`	`}`
`422`	`422`
	`423`	`+ @discardableResult`
`423`	`424`	`public func createEndAccess(beginAccess: BeginAccessInst) -> EndAccessInst {`
`424`	`425`	`let endAccess = bridged.createEndAccess(beginAccess.bridged)`
`425`	`426`	`return notifyNew(endAccess.getAs(EndAccessInst.self))`