Merge pull request #25135 from porglezomp-misc/fix/stdlib-unittest-over-release

FIx an overrelease in StdlibUnittest's getSystemVersionPlistProperty

Author: shahmishal

stdlib/private/StdlibUnittest/CMakeLists.txt

@@ -29,7 +29,6 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
   StringConvertible.swift
   TestHelpers.swift
   TypeIndexed.swift
-  GetOSVersion.mm
 
   SWIFT_MODULE_DEPENDS SwiftPrivate SwiftPrivateThreadExtras SwiftPrivateLibcExtras
   SWIFT_MODULE_DEPENDS_IOS Darwin Foundation

stdlib/private/StdlibUnittest/GetOSVersion.mm

@@ -16,6 +16,7 @@ import SwiftPrivateThreadExtras
 import SwiftPrivateLibcExtras
 
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
+import Foundation
 import Darwin
 #elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
 import Glibc
@@ -1714,13 +1715,8 @@ public final class TestSuite {
 }
 
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
-@_silgen_name("getSystemVersionPlistProperty")
-func _getSystemVersionPlistPropertyImpl(
-  _ propertyName: UnsafePointer<CChar>) -> UnsafePointer<CChar>?
-
 func _getSystemVersionPlistProperty(_ propertyName: String) -> String? {
-  let cs = _getSystemVersionPlistPropertyImpl(propertyName)
-  return cs.map(String.init(cString:))
+  return NSDictionary(contentsOfFile: "/System/Library/CoreServices/SystemVersion.plist")?[propertyName] as? String
 }
 #endif
 

stdlib/private/StdlibUnittest/StdlibUnittest.swift

@@ -0,0 +1,14 @@
+// RUN: %target-run-simple-swift
+// REQUIRES: executable_test
+// REQUIRES: foundation
+
+import Foundation
+import StdlibUnittest
+
+var Suite = TestSuite("Overrelease")
+
+Suite.test("doesntfail").xfail(.never).code { }
+
+autoreleasepool {
+    runAllTests()
+}