Fix VariableScopeInstruction.endOperands for extend_lifetime.

atrick · atrick · commit 9f66949c6bb3 · 2025-02-07T17:06:21.000-08:00
Consider end_lifetime to be part of the endOperands set, which is used for
linear liveness, even though it does not end the lifetime.
diff --git a/SwiftCompilerSources/Sources/SIL/Instruction.swift b/SwiftCompilerSources/Sources/SIL/Instruction.swift
@@ -441,7 +441,7 @@ public enum VariableScopeInstruction {
   }
 
   public var endOperands: LazyFilterSequence<UseList> {
-    return scopeBegin.uses.endingLifetime
+    scopeBegin.uses.lazy.filter { $0.endsLifetime || $0.instruction is ExtendLifetimeInst }
   }
 
   // TODO: with SIL verification, we might be able to make varDecl non-Optional.

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ public enum VariableScopeInstruction {`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`public var endOperands: LazyFilterSequence<UseList> {`
`444`		`- return scopeBegin.uses.endingLifetime`
	`444`	`+ scopeBegin.uses.lazy.filter { $0.endsLifetime \|\| $0.instruction is ExtendLifetimeInst }`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`// TODO: with SIL verification, we might be able to make varDecl non-Optional.`