Merge pull request #82187 from tshortli/warnings

tshortli · web-flow · commit 16a65362855e · 2025-06-11T18:43:01.000-07:00
Address some warnings
diff --git a/lib/IDE/SourceEntityWalker.cpp b/lib/IDE/SourceEntityWalker.cpp
@@ -861,8 +861,6 @@ bool SemaAnnotator::passCallAsFunctionReference(ValueDecl *D, SourceLoc Loc,
 
 bool SemaAnnotator::
 passReference(ValueDecl *D, Type Ty, DeclNameLoc Loc, ReferenceMetaData Data) {
-  SourceManager &SM = D->getASTContext().SourceMgr;
-  SourceLoc BaseStart = Loc.getBaseNameLoc(), BaseEnd = BaseStart;
   return passReference(D, Ty, Loc.getBaseNameLoc(), Loc.getSourceRange(), Data);
 }
 
diff --git a/stdlib/private/StdlibUnittest/CMakeLists.txt b/stdlib/private/StdlibUnittest/CMakeLists.txt
@@ -11,6 +11,9 @@ endif()
 
 set(swift_stdlib_unittest_compile_flags
   "-Xfrontend" "-disable-objc-attr-requires-foundation-module")
+
+list(APPEND swift_stdlib_unittest_compile_flags "-enable-experimental-feature" "Lifetimes")
+
 if (SWIFT_RUNTIME_ENABLE_LEAK_CHECKER)
   list(APPEND swift_stdlib_unittest_compile_flags "-DSWIFT_RUNTIME_ENABLE_LEAK_CHECKER")
 endif()
diff --git a/stdlib/private/StdlibUnittest/StdlibUnittest.swift b/stdlib/private/StdlibUnittest/StdlibUnittest.swift
@@ -752,7 +752,7 @@ public func expectNil<T>(_ value: T?,
 }
 
 @discardableResult
-@lifetime(copy value)
+@_lifetime(copy value)
 public func expectNotNil<T: ~Copyable & ~Escapable>(
   _ value: consuming T?,
   _ message: @autoclosure () -> String = "",

Original file line number	Diff line number	Diff line change
`@@ -861,8 +861,6 @@ bool SemaAnnotator::passCallAsFunctionReference(ValueDecl *D, SourceLoc Loc,`
`861`	`861`
`862`	`862`	`bool SemaAnnotator::`
`863`	`863`	`passReference(ValueDecl *D, Type Ty, DeclNameLoc Loc, ReferenceMetaData Data) {`
`864`		`- SourceManager &SM = D->getASTContext().SourceMgr;`
`865`		`- SourceLoc BaseStart = Loc.getBaseNameLoc(), BaseEnd = BaseStart;`
`866`	`864`	`return passReference(D, Ty, Loc.getBaseNameLoc(), Loc.getSourceRange(), Data);`
`867`	`865`	`}`
`868`	`866`
Original file line number	Diff line number	Diff line change
`@@ -752,7 +752,7 @@ public func expectNil<T>(_ value: T?,`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`@discardableResult`
`755`		`-@lifetime(copy value)`
	`755`	`+@_lifetime(copy value)`
`756`	`756`	`public func expectNotNil<T: ~Copyable & ~Escapable>(`
`757`	`757`	`_ value: consuming T?,`
`758`	`758`	`_ message: @autoclosure () -> String = "",`