Merge pull request #154 from apple/tscclibc-implementation-only

Use @_implementationOnly import for TSCclibc

Author: abertelrud

Package.swift

@@ -3,7 +3,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2019 Apple Inc. and the Swift project authors
+ Copyright (c) 2019 - 2020 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See http://swift.org/LICENSE.txt for license information
@@ -45,15 +45,15 @@ let package = Package(
         .target(
             /** Cross-platform access to bare `libc` functionality. */
             name: "TSCLibc",
-            dependencies: ["TSCclibc"]),
+            dependencies: []),
         .target(
             /** TSCBasic support library */
             name: "TSCBasic",
-            dependencies: ["TSCLibc"]),
+            dependencies: ["TSCLibc", "TSCclibc"]),
         .target(
             /** Abstractions for common operations, should migrate to TSCBasic */
             name: "TSCUtility",
-            dependencies: ["TSCBasic"]),
+            dependencies: ["TSCBasic", "TSCclibc"]),
 
         // MARK: Additional Test Dependencies
 
@@ -71,7 +71,7 @@ let package = Package(
 
         .testTarget(
             name: "TSCBasicTests",
-            dependencies: ["TSCTestSupport", "TSCTestSupportExecutable"]),
+            dependencies: ["TSCTestSupport", "TSCTestSupportExecutable", "TSCclibc"]),
         .testTarget(
             name: "TSCBasicPerformanceTests",
             dependencies: ["TSCBasic", "TSCTestSupport"]),

Sources/TSCBasic/CMakeLists.txt

@@ -57,6 +57,8 @@ target_compile_options(TSCBasic PUBLIC
   "$<$<PLATFORM_ID:Windows>:SHELL:-Xcc -D_CRT_SECURE_NO_WARNINGS>")
 target_link_libraries(TSCBasic PUBLIC
   TSCLibc)
+target_link_libraries(TSCBasic PRIVATE
+   TSCclibc)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
   if(Foundation_FOUND)
     target_link_libraries(TSCBasic PUBLIC

Sources/TSCBasic/Process.swift

@@ -14,6 +14,7 @@ import class Foundation.ProcessInfo
 import Foundation
 #endif
 
+@_implementationOnly import TSCclibc
 import TSCLibc
 import Dispatch
 

Sources/TSCLibc/CMakeLists.txt

@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See http://swift.org/LICENSE.txt for license information
@@ -13,8 +13,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
   target_compile_options(TSCLibc PRIVATE
     -autolink-force-load)
 endif()
-target_link_libraries(TSCLibc PUBLIC
-  TSCclibc)
 # NOTE(compnerd) workaround for CMake not setting up include flags yet
 set_target_properties(TSCLibc PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})

Sources/TSCLibc/libc.swift

@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+ Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See http://swift.org/LICENSE.txt for license information
@@ -17,8 +17,6 @@
 @_exported import Darwin.C
 #endif
 
-@_exported import TSCclibc
-
 #if os(Windows)
 private func __randname(_ buffer: UnsafeMutablePointer<CChar>) {
   let alpha = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"

Sources/TSCUtility/CMakeLists.txt

@@ -1,6 +1,6 @@
 # This source file is part of the Swift.org open source project
 #
-# Copyright (c) 2014 - 2019 Apple Inc. and the Swift project authors
+# Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
 # Licensed under Apache License v2.0 with Runtime Library Exception
 #
 # See http://swift.org/LICENSE.txt for license information
@@ -45,6 +45,8 @@ add_library(TSCUtility
 )
 target_link_libraries(TSCUtility PUBLIC
   TSCBasic)
+target_link_libraries(TSCUtility PRIVATE
+  TSCclibc)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
   target_link_libraries(TSCUtility PRIVATE
     SQLite::SQLite3)

Sources/TSCUtility/IndexStore.swift

@@ -1,15 +1,15 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2019 Apple Inc. and the Swift project authors
+ Copyright (c) 2019 - 2020 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See http://swift.org/LICENSE.txt for license information
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
  */
 
 import TSCBasic
-import TSCclibc
+@_implementationOnly import TSCclibc
 
 public final class IndexStore {
 
@@ -19,22 +19,52 @@ public final class IndexStore {
         public var methods: [String]
     }
 
-    let api: IndexStoreAPI
+    fileprivate var impl: IndexStoreImpl { _impl as! IndexStoreImpl }
+    private let _impl: Any
 
-    var fn: indexstore_functions_t {
-        return api.fn
+    fileprivate init(_ impl: IndexStoreImpl) {
+        self._impl = impl
     }
 
+    static public func open(store path: AbsolutePath, api: IndexStoreAPI) throws -> IndexStore {
+        let impl = try IndexStoreImpl.open(store: path, api: api.impl)
+        return IndexStore(impl)
+    }
+
+    public func listTests(inObjectFile object: AbsolutePath) throws -> [TestCaseClass] {
+        return try impl.listTests(inObjectFile: object)
+    }
+}
+
+public final class IndexStoreAPI {
+    fileprivate var impl: IndexStoreAPIImpl {
+        _impl as! IndexStoreAPIImpl
+    }
+    private let _impl: Any
+
+    public init(dylib path: AbsolutePath) throws {
+        self._impl = try IndexStoreAPIImpl(dylib: path)
+    }
+}
+
+private final class IndexStoreImpl {
+
+    typealias TestCaseClass = IndexStore.TestCaseClass
+
+    let api: IndexStoreAPIImpl
+
+    var fn: indexstore_functions_t { api.fn }
+
     let store: indexstore_t
 
-    private init(store: indexstore_t, api: IndexStoreAPI) {
+    private init(store: indexstore_t, api: IndexStoreAPIImpl) {
         self.store = store
         self.api = api
     }
 
-    static public func open(store path: AbsolutePath, api: IndexStoreAPI) throws -> IndexStore {
+    static public func open(store path: AbsolutePath, api: IndexStoreAPIImpl) throws -> IndexStoreImpl {
         if let store = try api.call({ api.fn.store_create(path.pathString, &$0) }) {
-            return IndexStore(store: store, api: api)
+            return IndexStoreImpl(store: store, api: api)
         }
         throw StringError("Unable to open store at \(path)")
     }
@@ -156,15 +186,15 @@ public final class IndexStore {
 }
 
 private class Ref<T> {
-    let api: IndexStoreAPI
+    let api: IndexStoreAPIImpl
     var instance: T
-    init(_ instance: T, api: IndexStoreAPI) {
+    init(_ instance: T, api: IndexStoreAPIImpl) {
         self.instance = instance
         self.api = api
     }
 }
 
-public final class IndexStoreAPI {
+private final class IndexStoreAPIImpl {
 
     /// The path of the index store dylib.
     private let path: AbsolutePath

Sources/TSCUtility/Versioning.swift

@@ -1,14 +1,14 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+ Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See http://swift.org/LICENSE.txt for license information
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-import TSCclibc
+@_implementationOnly import TSCclibc
 
 /// A Swift version number.
 ///

Tests/TSCBasicTests/ProcessTests.swift

@@ -10,8 +10,9 @@
 
 import TSCTestSupport
 import XCTest
-import TSCLibc
 
+@_implementationOnly import TSCclibc
+import TSCLibc
 import TSCBasic
 
 typealias ProcessID = TSCBasic.Process.ProcessID