Merge pull request #19614 from mikeash/no-internal-export

[Stdlib] Change SWIFT_RUNTIME_STDLIB_INTERNAL to not export the symbol.

Author: mikeash

include/swift/Runtime/Metadata.h

@@ -810,7 +810,7 @@ void swift_registerTypeMetadataRecords(const TypeMetadataRecord *begin,
 /// Return the superclass, if any.  The result is nullptr for root
 /// classes and class protocol types.
 SWIFT_CC(swift)
-SWIFT_RUNTIME_STDLIB_API
+SWIFT_RUNTIME_STDLIB_INTERNAL
 const Metadata *_swift_class_getSuperclass(const Metadata *theClass);
 
 #if !NDEBUG

stdlib/private/SwiftPrivate/IO.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftShims
+import SwiftOverlayShims
 
 public struct _FDInputStream {
   public let fd: CInt
@@ -55,7 +56,7 @@ public struct _FDInputStream {
       (_buffer) in
       let addr = _buffer.baseAddress! + self._bufferUsed
       let size = bufferFree
-      return _stdlib_read(fd, addr, size)
+      return _swift_stdlib_read(fd, addr, size)
     }
     if readResult == 0 {
       isEOF = true
@@ -71,7 +72,7 @@ public struct _FDInputStream {
     if isClosed {
       return
     }
-    let result = _stdlib_close(fd)
+    let result = _swift_stdlib_close(fd)
     if result < 0 {
       fatalError("close() returned an error")
     }
@@ -104,7 +105,7 @@ public struct _FDOutputStream : TextOutputStream {
       var writtenBytes = 0
       let bufferSize = utf8CStr.count - 1
       while writtenBytes != bufferSize {
-        let result = _stdlib_write(
+        let result = _swift_stdlib_write(
           self.fd, UnsafeRawPointer(utf8CStr.baseAddress! + Int(writtenBytes)),
           bufferSize - writtenBytes)
         if result < 0 {
@@ -119,7 +120,7 @@ public struct _FDOutputStream : TextOutputStream {
     if isClosed {
       return
     }
-    let result = _stdlib_close(fd)
+    let result = _swift_stdlib_close(fd)
     if result < 0 {
       fatalError("close() returned an error")
     }

stdlib/public/Platform/Platform.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftShims
+import SwiftOverlayShims
 
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 //===----------------------------------------------------------------------===//
@@ -80,10 +81,10 @@ func _convertDarwinBooleanToBool(_ x: DarwinBoolean) -> Bool {
 
 public var errno : Int32 {
   get {
-    return _stdlib_getErrno()
+    return _swift_stdlib_getErrno()
   }
   set(val) {
-    return _stdlib_setErrno(val)
+    return _swift_stdlib_setErrno(val)
   }
 }
 
@@ -142,7 +143,7 @@ public func open(
   _ path: UnsafePointer<CChar>,
   _ oflag: Int32
 ) -> Int32 {
-  return _stdlib_open(path, oflag, 0)
+  return _swift_stdlib_open(path, oflag, 0)
 }
 
 #if os(Windows)
@@ -151,23 +152,23 @@ public func open(
   _ oflag: Int32,
   _ mode: Int32
 ) -> Int32 {
-  return _stdlib_open(path, oflag, mode)
+  return _swift_stdlib_open(path, oflag, mode)
 }
 #else
 public func open(
   _ path: UnsafePointer<CChar>,
   _ oflag: Int32,
   _ mode: mode_t
 ) -> Int32 {
-  return _stdlib_open(path, oflag, mode)
+  return _swift_stdlib_open(path, oflag, mode)
 }
 
 public func openat(
   _ fd: Int32,
   _ path: UnsafePointer<CChar>,
   _ oflag: Int32
 ) -> Int32 {
-  return _stdlib_openat(fd, path, oflag, 0)
+  return _swift_stdlib_openat(fd, path, oflag, 0)
 }
 
 public func openat(
@@ -176,30 +177,30 @@ public func openat(
   _ oflag: Int32,
   _ mode: mode_t
 ) -> Int32 {
-  return _stdlib_openat(fd, path, oflag, mode)
+  return _swift_stdlib_openat(fd, path, oflag, mode)
 }
 
 public func fcntl(
   _ fd: Int32,
   _ cmd: Int32
 ) -> Int32 {
-  return _stdlib_fcntl(fd, cmd, 0)
+  return _swift_stdlib_fcntl(fd, cmd, 0)
 }
 
 public func fcntl(
   _ fd: Int32,
   _ cmd: Int32,
   _ value: Int32
 ) -> Int32 {
-  return _stdlib_fcntl(fd, cmd, value)
+  return _swift_stdlib_fcntl(fd, cmd, value)
 }
 
 public func fcntl(
   _ fd: Int32,
   _ cmd: Int32,
   _ ptr: UnsafeMutableRawPointer
 ) -> Int32 {
-  return _stdlib_fcntlPtr(fd, cmd, ptr)
+  return _swift_stdlib_fcntlPtr(fd, cmd, ptr)
 }
 
 // !os(Windows)
@@ -267,22 +268,22 @@ public func ioctl(
   _ request: UInt,
   _ value: CInt
 ) -> CInt {
-  return _stdlib_ioctl(fd, request, value)
+  return _swift_stdlib_ioctl(fd, request, value)
 }
 
 public func ioctl(
   _ fd: CInt,
   _ request: UInt,
   _ ptr: UnsafeMutableRawPointer
 ) -> CInt {
-  return _stdlib_ioctlPtr(fd, request, ptr)
+  return _swift_stdlib_ioctlPtr(fd, request, ptr)
 }
 
 public func ioctl(
   _ fd: CInt,
   _ request: UInt
 ) -> CInt {
-  return _stdlib_ioctl(fd, request, 0)
+  return _swift_stdlib_ioctl(fd, request, 0)
 }
 
 // !os(Windows)
@@ -374,7 +375,6 @@ public func sem_open(
   _ oflag: Int32
 ) -> UnsafeMutablePointer<sem_t>? {
   return _stdlib_sem_open2(name, oflag)
-    .assumingMemoryBound(to: sem_t.self)
 }
 
 public func sem_open(
@@ -384,7 +384,6 @@ public func sem_open(
   _ value: CUnsignedInt
 ) -> UnsafeMutablePointer<sem_t>? {
   return _stdlib_sem_open4(name, oflag, mode, value)
-    .assumingMemoryBound(to: sem_t.self)
 }
 #endif
 
@@ -395,7 +394,7 @@ public func sem_open(
 // Some platforms don't have `extern char** environ` imported from C.
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(FreeBSD) || os(PS4)
 public var environ: UnsafeMutablePointer<UnsafeMutablePointer<CChar>?> {
-  return _stdlib_getEnviron()
+  return _swift_stdlib_getEnviron()
 }
 #elseif os(Linux)
 public var environ: UnsafeMutablePointer<UnsafeMutablePointer<CChar>?> {

stdlib/public/SwiftShims/CMakeLists.txt

@@ -5,7 +5,9 @@ set(sources
   GlobalObjects.h
   HeapObject.h
   KeyPath.h
+  LibcOverlayShims.h
   LibcShims.h
+  Random.h
   RefCount.h
   RuntimeShims.h
   RuntimeStubs.h

stdlib/public/SwiftShims/LibcOverlayShims.h

@@ -0,0 +1,147 @@
+//===--- LibcOverlayShims.h - Static inline shims for POSIX functions. --*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+//  Provide small wrappers for POSIX functionality that can't be used
+//  directly from Swift due to varargs or other issues.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_STDLIB_SHIMS_LIBCOVERLAYSHIMS_H
+#define SWIFT_STDLIB_SHIMS_LIBCOVERLAYSHIMS_H
+
+#include "Visibility.h"
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <io.h>
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+typedef int mode_t;
+#else
+#include <semaphore.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <unistd.h>
+#endif
+
+#include <errno.h>
+#include <fcntl.h>
+
+#if __has_feature(nullability)
+#pragma clang assume_nonnull begin
+#endif
+
+// File control <fcntl.h>
+#if !defined(_WIN32) || defined(__CYGWIN__)
+static inline int _swift_stdlib_fcntl(int fd, int cmd, int value) {
+  return fcntl(fd, cmd, value);
+}
+
+static inline int _swift_stdlib_fcntlPtr(int fd, int cmd, void* ptr) {
+  return fcntl(fd, cmd, ptr);
+}
+#endif
+
+// Environment
+#if defined(__FreeBSD__)
+static inline char * _Nullable * _Null_unspecified _swift_stdlib_getEnviron() {
+  extern char **environ;
+  return environ;
+}
+#elif defined(__APPLE__)
+static inline char * _Nullable *_swift_stdlib_getEnviron() {
+  extern char * _Nullable **_NSGetEnviron(void);
+  return *_NSGetEnviron();
+}
+#endif
+
+// System error numbers <errno.h>
+static inline int _swift_stdlib_getErrno() {
+  return errno;
+}
+
+static inline void _swift_stdlib_setErrno(int value) {
+  errno = value;
+}
+
+// Semaphores <semaphore.h>
+#if !defined(_WIN32) || defined(__CYGWIN__)
+static inline sem_t *_stdlib_sem_open2(const char *name, int oflag) {
+  return sem_open(name, oflag);
+}
+
+static inline sem_t *_stdlib_sem_open4(const char *name, int oflag,
+                                       mode_t mode, unsigned int value) {
+  return sem_open(name, oflag, mode, value);
+}
+
+#endif // !(defined(_WIN32) && !defined(__CYGWIN__))
+
+// I/O control <ioctl.h>
+#if !defined(_WIN32) || defined(__CYGWIN__)
+static inline int _swift_stdlib_ioctl(int fd, unsigned long int request, int value) {
+  return ioctl(fd, request, value);
+}
+
+static inline int _swift_stdlib_ioctlPtr(int fd, unsigned long int request, void* ptr) {
+  return ioctl(fd, request, ptr);
+}
+#endif
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+// Windows
+static inline int _swift_stdlib_open(const char *path, int oflag, mode_t mode) {
+  return _open(path, oflag, static_cast<int>(mode));
+}
+
+#else
+// not Windows
+int static inline _swift_stdlib_open(const char *path, int oflag, mode_t mode) {
+  return open(path, oflag, mode);
+}
+
+int static inline _swift_stdlib_openat(int fd, const char *path, int oflag,
+                                       mode_t mode) {
+  return openat(fd, path, oflag, mode);
+}
+#endif
+
+static inline ssize_t
+_swift_stdlib_read(int fd, void *buf, size_t nbyte) {
+#if defined(_WIN32)
+  return _read(fd, buf, nbyte);
+#else
+  return read(fd, buf, nbyte);
+#endif
+}
+
+static inline ssize_t
+_swift_stdlib_write(int fd, const void *buf, size_t nbyte) {
+#if defined(_WIN32)
+  return _write(fd, buf, nbyte);
+#else
+  return write(fd, buf, nbyte);
+#endif
+}
+
+static inline int _swift_stdlib_close(int fd) {
+#if defined(_WIN32)
+  return _close(fd);
+#else
+  return close(fd);
+#endif
+}
+
+#if __has_feature(nullability)
+#pragma clang assume_nonnull end
+#endif
+
+#endif // SWIFT_STDLIB_SHIMS_LIBCOVERLAYSHIMS_H