[runtime] Clean up symbol exports in libc functions. (#13202)

Author: Greg Parker

docs/StandardLibraryProgrammersManual.md

@@ -137,16 +137,17 @@ This attribute specifies the name that a declaration will have at link time. It
 Rather than hard-code Swift mangling into C code, `@_silgen_name` is used to provide a stable and known symbol name for linking. Note that C code still must understand and use the Swift calling convention (available in swift-clang) for such Swift functions (if they use Swift's CC). Example:
 
 ```swift
-@_silgen_name("_swift_stdlib_destroyTLS")
+@_silgen_name("_destroyTLS")
 internal func _destroyTLS(_ ptr: UnsafeMutableRawPointer?) {
   // ... implementation ...
 }
 ```
 
 ```C++
-__attribute__((__swiftcall__)) extern "C" void _swift_stdlib_destroyTLS(void *);
+SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERNAL
+void _destroyTLS(void *);
 
-// ... C code can now call _swift_stdlib_destroyTLS on a void * ...
+// ... C code can now call _destroyTLS on a void * ...
 ```
 
 ##### Using `@_silgen_name` to call C from Swift

stdlib/private/SwiftPrivate/IO.swift

@@ -57,7 +57,7 @@ public struct _FDInputStream {
       let fd = self.fd
       let addr = _buffer.baseAddress! + self._bufferUsed
       let size = bufferFree
-      return _swift_stdlib_read(fd, addr, size)
+      return _stdlib_read(fd, addr, size)
     }
     if readResult == 0 {
       isEOF = true
@@ -73,7 +73,7 @@ public struct _FDInputStream {
     if isClosed {
       return
     }
-    let result = _swift_stdlib_close(fd)
+    let result = _stdlib_close(fd)
     if result < 0 {
       fatalError("close() returned an error")
     }
@@ -106,7 +106,7 @@ public struct _FDOutputStream : TextOutputStream {
       var writtenBytes = 0
       let bufferSize = utf8CStr.count - 1
       while writtenBytes != bufferSize {
-        let result = _swift_stdlib_write(
+        let result = _stdlib_write(
           self.fd, UnsafeRawPointer(utf8CStr.baseAddress! + Int(writtenBytes)),
           bufferSize - writtenBytes)
         if result < 0 {
@@ -121,7 +121,7 @@ public struct _FDOutputStream : TextOutputStream {
     if isClosed {
       return
     }
-    let result = _swift_stdlib_close(fd)
+    let result = _stdlib_close(fd)
     if result < 0 {
       fatalError("close() returned an error")
     }

stdlib/private/SwiftPrivate/PRNG.swift

@@ -13,17 +13,17 @@
 import SwiftShims
 
 public func rand32() -> UInt32 {
-  return _swift_stdlib_cxx11_mt19937()
+  return _stdlib_cxx11_mt19937()
 }
 
 public func rand32(exclusiveUpperBound limit: UInt32) -> UInt32 {
-  return _swift_stdlib_cxx11_mt19937_uniform(limit)
+  return _stdlib_cxx11_mt19937_uniform(limit)
 }
 
 public func rand64() -> UInt64 {
   return
-    (UInt64(_swift_stdlib_cxx11_mt19937()) << 32) |
-    UInt64(_swift_stdlib_cxx11_mt19937())
+    (UInt64(_stdlib_cxx11_mt19937()) << 32) |
+    UInt64(_stdlib_cxx11_mt19937())
 }
 
 public func randInt() -> Int {

stdlib/private/SwiftPrivateLibcExtras/Subprocess.c

@@ -20,50 +20,39 @@
 #define availability(...)
 #include <spawn.h>
 #include <sys/types.h>
-#if defined(__APPLE__)
-// NOTE: forward declare this rather than including crt_externs.h as not all
-// SDKs provide it
-extern char ***_NSGetEnviron(void);
-#endif // defined(__APPLE__)
 
 SWIFT_CC(swift)
-int swift_posix_spawn_file_actions_init(
+int _stdlib_posix_spawn_file_actions_init(
     posix_spawn_file_actions_t *file_actions) {
   return posix_spawn_file_actions_init(file_actions);
 }
 
 SWIFT_CC(swift)
-int swift_posix_spawn_file_actions_destroy(
+int _stdlib_posix_spawn_file_actions_destroy(
     posix_spawn_file_actions_t *file_actions) {
   return posix_spawn_file_actions_destroy(file_actions);
 }
 
 SWIFT_CC(swift)
-int swift_posix_spawn_file_actions_addclose(
+int _stdlib_posix_spawn_file_actions_addclose(
     posix_spawn_file_actions_t *file_actions, int filedes) {
   return posix_spawn_file_actions_addclose(file_actions, filedes);
 }
 
 SWIFT_CC(swift)
-int swift_posix_spawn_file_actions_adddup2(
+int _stdlib_posix_spawn_file_actions_adddup2(
     posix_spawn_file_actions_t *file_actions, int filedes, int newfiledes) {
   return posix_spawn_file_actions_adddup2(file_actions, filedes, newfiledes);
 }
 
 SWIFT_CC(swift)
-int swift_posix_spawn(pid_t *__restrict pid, const char * __restrict path,
+int _stdlib_posix_spawn(pid_t *__restrict pid, const char * __restrict path,
                       const posix_spawn_file_actions_t *file_actions,
                       const posix_spawnattr_t *__restrict attrp,
                       char *const argv[__restrict],
                       char *const envp[__restrict]) {
   return posix_spawn(pid, path, file_actions, attrp, argv, envp);
 }
 
-#if defined(__APPLE__)
-SWIFT_CC(swift)
-char ***swift_SwiftPrivateLibcExtras_NSGetEnviron(void) {
-  return _NSGetEnviron();
-}
-#endif // defined(__APPLE__)
 #endif // !defined(__ANDROID__) && !defined(__HAIKU__) && (!defined(_WIN32) || defined(__CGYWIN__))
 

stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift

@@ -23,43 +23,43 @@ import Glibc
 // posix_spawn is not available on Android.
 // posix_spawn is not available on Haiku.
 #if !os(Android) && !os(Haiku)
-// swift_posix_spawn isn't available in the public watchOS SDK, we sneak by the
+// posix_spawn isn't available in the public watchOS SDK, we sneak by the
 // unavailable attribute declaration here of the APIs that we need.
 
 // FIXME: Come up with a better way to deal with APIs that are pointers on some
 // platforms but not others.
 #if os(Linux)
-typealias swift_posix_spawn_file_actions_t = posix_spawn_file_actions_t
+typealias _stdlib_posix_spawn_file_actions_t = posix_spawn_file_actions_t
 #else
-typealias swift_posix_spawn_file_actions_t = posix_spawn_file_actions_t?
+typealias _stdlib_posix_spawn_file_actions_t = posix_spawn_file_actions_t?
 #endif
 
-@_silgen_name("swift_posix_spawn_file_actions_init")
-func swift_posix_spawn_file_actions_init(
-  _ file_actions: UnsafeMutablePointer<swift_posix_spawn_file_actions_t>
+@_silgen_name("_stdlib_posix_spawn_file_actions_init")
+internal func _stdlib_posix_spawn_file_actions_init(
+  _ file_actions: UnsafeMutablePointer<_stdlib_posix_spawn_file_actions_t>
 ) -> CInt
 
-@_silgen_name("swift_posix_spawn_file_actions_destroy")
-func swift_posix_spawn_file_actions_destroy(
-  _ file_actions: UnsafeMutablePointer<swift_posix_spawn_file_actions_t>
+@_silgen_name("_stdlib_posix_spawn_file_actions_destroy")
+internal func _stdlib_posix_spawn_file_actions_destroy(
+  _ file_actions: UnsafeMutablePointer<_stdlib_posix_spawn_file_actions_t>
 ) -> CInt
 
-@_silgen_name("swift_posix_spawn_file_actions_addclose")
-func swift_posix_spawn_file_actions_addclose(
-  _ file_actions: UnsafeMutablePointer<swift_posix_spawn_file_actions_t>,
+@_silgen_name("_stdlib_posix_spawn_file_actions_addclose")
+internal func _stdlib_posix_spawn_file_actions_addclose(
+  _ file_actions: UnsafeMutablePointer<_stdlib_posix_spawn_file_actions_t>,
   _ filedes: CInt) -> CInt
 
-@_silgen_name("swift_posix_spawn_file_actions_adddup2")
-func swift_posix_spawn_file_actions_adddup2(
-  _ file_actions: UnsafeMutablePointer<swift_posix_spawn_file_actions_t>,
+@_silgen_name("_stdlib_posix_spawn_file_actions_adddup2")
+internal func _stdlib_posix_spawn_file_actions_adddup2(
+  _ file_actions: UnsafeMutablePointer<_stdlib_posix_spawn_file_actions_t>,
   _ filedes: CInt,
   _ newfiledes: CInt) -> CInt
 
-@_silgen_name("swift_posix_spawn")
-func swift_posix_spawn(
+@_silgen_name("_stdlib_posix_spawn")
+internal func _stdlib_posix_spawn(
   _ pid: UnsafeMutablePointer<pid_t>?,
   _ file: UnsafePointer<Int8>,
-  _ file_actions: UnsafePointer<swift_posix_spawn_file_actions_t>?,
+  _ file_actions: UnsafePointer<_stdlib_posix_spawn_file_actions_t>?,
   _ attrp: UnsafePointer<posix_spawnattr_t>?,
   _ argv: UnsafePointer<UnsafeMutablePointer<Int8>?>,
   _ envp: UnsafePointer<UnsafeMutablePointer<Int8>?>?) -> CInt
@@ -113,7 +113,7 @@ public func spawnChild(_ args: [String])
     // code after this block will never be executed, and the parent write pipe
     // will be closed.
     withArrayOfCStrings([CommandLine.arguments[0]] + args) {
-      execve(CommandLine.arguments[0], $0, _getEnviron())
+      execve(CommandLine.arguments[0], $0, environ)
     }
 
     // If execve() encountered an error, we write the errno encountered to the
@@ -142,44 +142,44 @@ public func spawnChild(_ args: [String])
   }
 #else
   var fileActions = _make_posix_spawn_file_actions_t()
-  if swift_posix_spawn_file_actions_init(&fileActions) != 0 {
-    preconditionFailure("swift_posix_spawn_file_actions_init() failed")
+  if _stdlib_posix_spawn_file_actions_init(&fileActions) != 0 {
+    preconditionFailure("_stdlib_posix_spawn_file_actions_init() failed")
   }
 
   // Close the write end of the pipe on the child side.
-  if swift_posix_spawn_file_actions_addclose(
+  if _stdlib_posix_spawn_file_actions_addclose(
     &fileActions, childStdin.writeFD) != 0 {
-    preconditionFailure("swift_posix_spawn_file_actions_addclose() failed")
+    preconditionFailure("_stdlib_posix_spawn_file_actions_addclose() failed")
   }
 
   // Remap child's stdin.
-  if swift_posix_spawn_file_actions_adddup2(
+  if _stdlib_posix_spawn_file_actions_adddup2(
     &fileActions, childStdin.readFD, STDIN_FILENO) != 0 {
-    preconditionFailure("swift_posix_spawn_file_actions_adddup2() failed")
+    preconditionFailure("_stdlib_posix_spawn_file_actions_adddup2() failed")
   }
 
   // Close the read end of the pipe on the child side.
-  if swift_posix_spawn_file_actions_addclose(
+  if _stdlib_posix_spawn_file_actions_addclose(
     &fileActions, childStdout.readFD) != 0 {
-    preconditionFailure("swift_posix_spawn_file_actions_addclose() failed")
+    preconditionFailure("_stdlib_posix_spawn_file_actions_addclose() failed")
   }
 
   // Remap child's stdout.
-  if swift_posix_spawn_file_actions_adddup2(
+  if _stdlib_posix_spawn_file_actions_adddup2(
     &fileActions, childStdout.writeFD, STDOUT_FILENO) != 0 {
-    preconditionFailure("swift_posix_spawn_file_actions_adddup2() failed")
+    preconditionFailure("_stdlib_posix_spawn_file_actions_adddup2() failed")
   }
 
   // Close the read end of the pipe on the child side.
-  if swift_posix_spawn_file_actions_addclose(
+  if _stdlib_posix_spawn_file_actions_addclose(
     &fileActions, childStderr.readFD) != 0 {
-    preconditionFailure("swift_posix_spawn_file_actions_addclose() failed")
+    preconditionFailure("_stdlib_posix_spawn_file_actions_addclose() failed")
   }
 
   // Remap child's stderr.
-  if swift_posix_spawn_file_actions_adddup2(
+  if _stdlib_posix_spawn_file_actions_adddup2(
     &fileActions, childStderr.writeFD, STDERR_FILENO) != 0 {
-    preconditionFailure("swift_posix_spawn_file_actions_adddup2() failed")
+    preconditionFailure("_stdlib_posix_spawn_file_actions_adddup2() failed")
   }
 
   var pid: pid_t = -1
@@ -192,16 +192,16 @@ public func spawnChild(_ args: [String])
     }
   }
   let spawnResult = withArrayOfCStrings(childArgs) {
-    swift_posix_spawn(
-      &pid, childArgs[0], &fileActions, nil, $0, _getEnviron())
+    _stdlib_posix_spawn(
+      &pid, childArgs[0], &fileActions, nil, $0, environ)
   }
   if spawnResult != 0 {
     print(String(cString: strerror(spawnResult)))
-    preconditionFailure("swift_posix_spawn() failed")
+    preconditionFailure("_stdlib_posix_spawn() failed")
   }
 
-  if swift_posix_spawn_file_actions_destroy(&fileActions) != 0 {
-    preconditionFailure("swift_posix_spawn_file_actions_destroy() failed")
+  if _stdlib_posix_spawn_file_actions_destroy(&fileActions) != 0 {
+    preconditionFailure("_stdlib_posix_spawn_file_actions_destroy() failed")
   }
 #endif
 
@@ -226,12 +226,12 @@ public func spawnChild(_ args: [String])
 #if !os(Android) && !os(Haiku)
 #if os(Linux)
 internal func _make_posix_spawn_file_actions_t()
-  -> swift_posix_spawn_file_actions_t {
+  -> _stdlib_posix_spawn_file_actions_t {
   return posix_spawn_file_actions_t()
 }
 #else
 internal func _make_posix_spawn_file_actions_t()
-  -> swift_posix_spawn_file_actions_t {
+  -> _stdlib_posix_spawn_file_actions_t {
   return nil
 }
 #endif
@@ -292,27 +292,6 @@ public func posixWaitpid(_ pid: pid_t) -> ProcessTerminationStatus {
   preconditionFailure("did not understand what happened to child process")
 }
 
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
-@_silgen_name("swift_SwiftPrivateLibcExtras_NSGetEnviron")
-func _NSGetEnviron() -> UnsafeMutablePointer<UnsafeMutablePointer<UnsafeMutablePointer<CChar>?>>
-#endif
-
-internal func _getEnviron() -> UnsafeMutablePointer<UnsafeMutablePointer<CChar>?> {
-#if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
-  return _NSGetEnviron().pointee
-#elseif os(FreeBSD)
-  return environ
-#elseif os(PS4)
-  return environ
-#elseif os(Android)
-  return environ
-#elseif os(Cygwin)
-  return environ
-#elseif os(Haiku)
-  return environ
-#else
-  return __environ
-#endif
-}
+// !os(Windows)
 #endif
 

stdlib/public/Platform/CMakeLists.txt

@@ -2,7 +2,6 @@ set(swift_platform_name)
 set(swift_platform_flags)
 set(swift_platform_sources
     Platform.swift
-    Misc.c
     TiocConstants.swift
     tgmath.swift.gyb)