Merge pull request #65944 from apple/egorzhdan/5.9-cxx-optional-nullable-value

egorzhdan · web-flow · commit 692371796713 · 2023-05-16T18:14:33.000+01:00
🍒[cxx-interop] Make `std.optional.value` nullable
diff --git a/stdlib/public/Cxx/CxxOptional.swift b/stdlib/public/Cxx/CxxOptional.swift
@@ -27,8 +27,9 @@ extension CxxOptional {
   }
 
   @inlinable
-  public var value: Wrapped {
+  public var value: Wrapped? {
     get {
+      guard hasValue else { return nil }
       return pointee
     }
   }
diff --git a/test/Interop/Cxx/stdlib/use-std-optional.swift b/test/Interop/Cxx/stdlib/use-std-optional.swift
@@ -29,10 +29,11 @@ StdOptionalTestSuite.test("std::optional => Swift.Optional") {
 StdOptionalTestSuite.test("std::optional hasValue/value") {
   let nonNilOpt = getNonNilOptional()
   expectTrue(nonNilOpt.hasValue)
-  expectEqual(123, nonNilOpt.value)
+  expectEqual(123, nonNilOpt.value!)
 
   let nilOpt = getNilOptional()
   expectFalse(nilOpt.hasValue)
+  expectNil(nilOpt.value)
 }
 
 runAllTests()

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,9 @@ extension CxxOptional {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@inlinable`
`30`		`- public var value: Wrapped {`
	`30`	`+ public var value: Wrapped? {`
`31`	`31`	`get {`
	`32`	`+ guard hasValue else { return nil }`
`32`	`33`	`return pointee`
`33`	`34`	`}`
`34`	`35`	`}`