Merge pull request #77147 from xedin/fixup-issue-desribed-in-77001

xedin · web-flow · commit 4a29db51e19d · 2024-10-22T14:00:53.000-07:00
[Tests] NFC: Update lifetime tests to avoid overloading on borrowing/…
diff --git a/test/SILOptimizer/lifetime_dependence/lifetime_dependence_scope_fixup.swift b/test/SILOptimizer/lifetime_dependence/lifetime_dependence_scope_fixup.swift
@@ -32,7 +32,9 @@ struct View : ~Escapable {
     self.ptr = k.ptr
     self.c = k.c
   }
-  init(_ k: consuming View) {
+  // This overload requires a separate label because overloading
+  // on borrowing/consuming attributes is not allowed
+  init(consumingView k: consuming View) {
     self.ptr = k.ptr
     self.c = k.c
   }
@@ -65,7 +67,7 @@ func consume(_ o : consuming MutableView) {}
 
 @lifetime(x)
 func getConsumingView(_ x: consuming View) -> View {
-  return View(x)
+  return View(consumingView: x)
 }
 
 @lifetime(borrow x)

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,9 @@ struct View : ~Escapable {`
`32`	`32`	`self.ptr = k.ptr`
`33`	`33`	`self.c = k.c`
`34`	`34`	`}`
`35`		`- init(_ k: consuming View) {`
	`35`	`+ // This overload requires a separate label because overloading`
	`36`	`+ // on borrowing/consuming attributes is not allowed`
	`37`	`+ init(consumingView k: consuming View) {`
`36`	`38`	`self.ptr = k.ptr`
`37`	`39`	`self.c = k.c`
`38`	`40`	`}`
`@@ -65,7 +67,7 @@ func consume(_ o : consuming MutableView) {}`
`65`	`67`
`66`	`68`	`@lifetime(x)`
`67`	`69`	`func getConsumingView(_ x: consuming View) -> View {`
`68`		`- return View(x)`
	`70`	`+ return View(consumingView: x)`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`@lifetime(borrow x)`