Fix ApplySite.originalParameter(of:).

atrick · atrick · commit b1601a958ba6 · 2024-02-12T09:57:14.000-08:00
diff --git a/SwiftCompilerSources/Sources/SIL/ApplySite.swift b/SwiftCompilerSources/Sources/SIL/ApplySite.swift
@@ -69,10 +69,11 @@ public struct ApplyOperandConventions : Collection {
     guard let argIdx = calleeArgumentIndex(of: operand) else {
       return nil
     }
-    guard argIdx >= calleeArgumentConventions.firstParameterIndex else {
+    let firstParamIdx = calleeArgumentConventions.firstParameterIndex
+    guard argIdx >= firstParamIdx else {
       return nil
     }
-    return calleeArgumentConventions.originalParameters[argIdx]
+    return calleeArgumentConventions.originalParameters[argIdx - firstParamIdx]
   }
 
   public var firstParameterOperandIndex: Int {

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,11 @@ public struct ApplyOperandConventions : Collection {`
`69`	`69`	`guard let argIdx = calleeArgumentIndex(of: operand) else {`
`70`	`70`	`return nil`
`71`	`71`	`}`
`72`		`- guard argIdx >= calleeArgumentConventions.firstParameterIndex else {`
	`72`	`+ let firstParamIdx = calleeArgumentConventions.firstParameterIndex`
	`73`	`+ guard argIdx >= firstParamIdx else {`
`73`	`74`	`return nil`
`74`	`75`	`}`
`75`		`- return calleeArgumentConventions.originalParameters[argIdx]`
	`76`	`+ return calleeArgumentConventions.originalParameters[argIdx - firstParamIdx]`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`public var firstParameterOperandIndex: Int {`