Merge pull request #64136 from eeckstein/fix-warning

swift-ci · web-flow · commit 75995f042a8f · 2023-03-06T04:28:06.000-08:00
fix an llvm::Optional deprecation warning
diff --git a/lib/Basic/Program.cpp b/lib/Basic/Program.cpp
@@ -100,7 +100,7 @@ swift::ExecuteWithPipe(llvm::StringRef program,
   llvm::BumpPtrAllocator Alloc;
   const char **argv = toNullTerminatedCStringArray(args, Alloc);
   const char **envp = nullptr;
-  if (env.hasValue()) {
+  if (env.has_value()) {
     envp = toNullTerminatedCStringArray(*env, Alloc);
   }
   const char *progCStr = args[0] == program

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ swift::ExecuteWithPipe(llvm::StringRef program,`
`100`	`100`	`llvm::BumpPtrAllocator Alloc;`
`101`	`101`	`const char **argv = toNullTerminatedCStringArray(args, Alloc);`
`102`	`102`	`const char **envp = nullptr;`
`103`		`- if (env.hasValue()) {`
	`103`	`+ if (env.has_value()) {`
`104`	`104`	`envp = toNullTerminatedCStringArray(*env, Alloc);`
`105`	`105`	`}`
`106`	`106`	`const char *progCStr = args[0] == program`