Serialization: Auto-linking recursively walks modules imported from -sil-serialize-all modules

include/swift/Serialization/SerializedModuleLoader.h

@@ -106,6 +106,9 @@ class SerializedASTFile final : public LoadedFile {
   SerializedASTFile(Module &M, ModuleFile &file, bool isSIB = false)
     : LoadedFile(FileUnitKind::SerializedAST, M), File(file), IsSIB(isSIB) {}
 
+  void
+  collectLinkLibrariesFromImports(Module::LinkLibraryCallback callback) const;
+
 public:
   bool isSIB() const { return IsSIB; }
 

lib/Serialization/SerializedModuleLoader.cpp

@@ -423,15 +423,24 @@ void SerializedASTFile::getImportedModules(
   File.getImportedModules(imports, filter);
 }
 
+void SerializedASTFile::collectLinkLibrariesFromImports(
+    Module::LinkLibraryCallback callback) const {
+  llvm::SmallVector<Module::ImportedModule, 8> Imports;
+  File.getImportedModules(Imports, Module::ImportFilter::All);
+
+  for (auto Import : Imports)
+    Import.second->collectLinkLibraries(callback);
+}
+
 void SerializedASTFile::collectLinkLibraries(
     Module::LinkLibraryCallback callback) const {
   if (isSIB()) {
-    llvm::SmallVector<Module::ImportedModule, 8> Imports;
+    collectLinkLibrariesFromImports(callback);
-    File.getImportedModules(Imports, Module::ImportFilter::All);
-
-    for (auto Import : Imports)
-      Import.second->collectLinkLibraries(callback);
   } else {
+    if (File.getAssociatedModule()->getResilienceStrategy()
+        == ResilienceStrategy::Fragile) {
+      collectLinkLibrariesFromImports(callback);
+    }
     File.collectLinkLibraries(callback);
   }
 }

stdlib/private/StdlibCollectionUnittest/StdlibCollectionUnittest.swift

@@ -12,10 +12,3 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif

stdlib/private/StdlibUnittestFoundationExtras/CMakeLists.txt

@@ -3,12 +3,6 @@ add_swift_library(swiftStdlibUnittestFoundationExtras SHARED IS_STDLIB
   # filename.
   StdlibUnittestFoundationExtras.swift
 
-  # Cannot serialize StdlibUnittestFoundationExtras because of:
-  # <rdar://problem/18917405> Compiling StdlibUnittest with -sil-serialize-all
-  # crashes in SIL serializer
-  #
-  # SWIFT_COMPILE_FLAGS ${STDLIB_SIL_SERIALIZE_ALL}
-
   SWIFT_MODULE_DEPENDS Foundation
   INSTALL_IN_COMPONENT stdlib-experimental)
 

test/1_stdlib/ArrayTraps.swift.gyb

@@ -10,13 +10,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 %{
 # We test for bounds-checking traps for both reading and writing

test/1_stdlib/ArrayTrapsObjC.swift.gyb

@@ -11,13 +11,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 

test/1_stdlib/BoolBridge.swift

@@ -5,13 +5,6 @@
 import Foundation
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let BoolTests = TestSuite("Bool")
 

test/1_stdlib/Builtins.swift

@@ -21,13 +21,6 @@ import Swift
 import SwiftShims
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 #if _runtime(_ObjC)
 import Foundation

test/1_stdlib/CastTraps.swift.gyb

@@ -12,13 +12,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 

test/1_stdlib/Casts.swift

@@ -18,12 +18,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let CastsTests = TestSuite("Casts")
 

test/1_stdlib/Character.swift

@@ -7,12 +7,6 @@ import StdlibUnittest
 import Swift
 import SwiftPrivate
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 //===---
 // Utilities.

test/1_stdlib/CharacterTraps.swift

@@ -9,14 +9,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
-
 
 var CharacterTraps = TestSuite("CharacterTraps")
 

test/1_stdlib/Collection.swift

@@ -6,12 +6,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var CollectionTests = TestSuite("CollectionTests")
 

test/1_stdlib/DarwinAPI.swift

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 

test/1_stdlib/DictionaryLiteral.swift

@@ -18,13 +18,6 @@ import SwiftExperimental
 import Foundation
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 // Check that the generic parameters are called 'Key' and 'Value'.
 protocol TestProtocol1 {}

test/1_stdlib/DictionaryTraps.swift

@@ -23,13 +23,6 @@ public extension _ObjectiveCBridgeable {
   }
 }
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 struct NotBridgedKeyTy : Equatable, Hashable {
   init(_ value: Int) {

test/1_stdlib/DictionaryUnchecked.swift

@@ -6,13 +6,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var DictionaryUnchecked = TestSuite("DictionaryUnchecked")
 

test/1_stdlib/Dispatch.swift

@@ -7,13 +7,6 @@ import Dispatch
 import Foundation
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 defer { runAllTests() }
 

test/1_stdlib/ErrorHandling.swift

@@ -7,13 +7,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var NoisyCount = 0
 

test/1_stdlib/ErrorProtocol.swift

@@ -3,13 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var ErrorProtocolTests = TestSuite("ErrorProtocol")
 

test/1_stdlib/ErrorProtocolBridging.swift

@@ -4,13 +4,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 import CoreLocation

test/1_stdlib/Experimental.swift

@@ -4,13 +4,6 @@
 import SwiftExperimental
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var ExperimentalTestSuite = TestSuite("Experimental")
 

test/1_stdlib/Filter.swift

@@ -14,13 +14,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let FilterTests = TestSuite("Filter")
 

test/1_stdlib/FloatingPoint.swift.gyb

@@ -8,13 +8,6 @@
 import Swift
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 #if arch(i386) || arch(x86_64)
 

test/1_stdlib/ImplicitlyUnwrappedOptional.swift

@@ -38,13 +38,6 @@ if c === nil {
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Swift
 

test/1_stdlib/InputStream.swift.gyb

@@ -20,13 +20,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Swift
 

test/1_stdlib/Interval.swift

@@ -16,13 +16,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 // Check that the generic parameter is called 'Bound'.
 protocol TestProtocol1 {}

test/1_stdlib/IntervalTraps.swift

@@ -20,13 +20,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var IntervalTraps = TestSuite("IntervalTraps")
 

test/1_stdlib/ManagedBuffer.swift

@@ -17,13 +17,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 

test/1_stdlib/Mirror.swift

@@ -21,13 +21,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var mirrors = TestSuite("Mirrors")
 

test/1_stdlib/NSArrayAPI.swift

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 

test/1_stdlib/NSDictionary.swift

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 

test/1_stdlib/NSEnumeratorAPI.swift

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 

test/1_stdlib/NSSetAPI.swift

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 

test/1_stdlib/NSStringAPI.swift

@@ -12,13 +12,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 import StdlibUnittestFoundationExtras

test/1_stdlib/NSValueBridging.swift

@@ -17,13 +17,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 

test/1_stdlib/NumericParsing.swift.gyb

@@ -49,13 +49,6 @@ number_of_values = 23
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var tests = TestSuite("NumericParsing")
 

test/1_stdlib/OptionSetTest.swift

@@ -30,13 +30,6 @@ struct PackagingOptions : OptionSet {
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var tests = TestSuite("OptionSet")
 

test/1_stdlib/Optional.swift

@@ -4,13 +4,6 @@
 import StdlibUnittest
 import Swift
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let OptionalTests = TestSuite("Optional")
 

test/1_stdlib/OptionalTraps.swift

@@ -11,13 +11,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 func returnNil() -> AnyObject? {
   return _opaqueIdentity(nil as AnyObject?)

test/1_stdlib/POSIX.swift

@@ -8,13 +8,6 @@ import StdlibUnittest
   import Darwin
 #endif
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var POSIXTests = TestSuite("POSIXTests")
 

test/1_stdlib/Print.swift

@@ -7,12 +7,6 @@
 import StdlibUnittest
 import PrintTestTypes
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("Print")
 PrintTests.test("Metatype") {

test/1_stdlib/PrintArray.swift

@@ -7,12 +7,6 @@
 import StdlibUnittest
 import PrintTestTypes
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintArray")
 

test/1_stdlib/PrintBoolean.swift

@@ -3,12 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintBoolean")
 

test/1_stdlib/PrintClass.swift

@@ -7,12 +7,6 @@
 import StdlibUnittest
 import PrintTestTypes
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintClass")
 

test/1_stdlib/PrintDictionary.swift

@@ -3,12 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintDictionary")
 

test/1_stdlib/PrintFloat.swift

@@ -10,12 +10,6 @@ import StdlibUnittest
 import Darwin
 import PrintTestTypes
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintFloat")
 

test/1_stdlib/PrintInteger.swift

@@ -3,12 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintInteger")
 PrintTests.test("CustomStringConvertible") {

test/1_stdlib/PrintPointer.swift

@@ -3,12 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintPointer")
 PrintTests.test("Printable") {

test/1_stdlib/PrintSet.swift

@@ -3,12 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintSet")
 PrintTests.test("Printable") {

test/1_stdlib/PrintString.swift

@@ -7,12 +7,6 @@
 import StdlibUnittest
 import PrintTestTypes
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintString")
 PrintTests.test("Printable") {

test/1_stdlib/PrintStruct.swift

@@ -7,12 +7,6 @@
 import StdlibUnittest
 import PrintTestTypes
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintStruct")
 

test/1_stdlib/PrintTuple.swift

@@ -7,12 +7,6 @@
 import StdlibUnittest
 import PrintTestTypes
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let PrintTests = TestSuite("PrintTuple")
 PrintTests.test("Printable") {

test/1_stdlib/Range.swift

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 // Check that the generic parameter is called 'Element'.
 protocol TestProtocol1 {}

test/1_stdlib/RangeTraps.swift

@@ -20,13 +20,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var RangeTraps = TestSuite("RangeTraps")
 

test/1_stdlib/ReflectionHashing.swift

@@ -11,13 +11,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var Reflection = TestSuite("Reflection")
 

test/1_stdlib/Repeat.swift

@@ -4,13 +4,6 @@
 import StdlibUnittest
 import Swift
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 let RepeatTests = TestSuite("Repeat")
 RepeatTests.test("Attributes") {

test/1_stdlib/Runtime.swift

@@ -8,12 +8,6 @@ import Swift
 import StdlibUnittest
 import SwiftShims
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 
 var swiftObjectCanaryCount = 0

test/1_stdlib/RuntimeObjC.swift

@@ -9,13 +9,6 @@
 import Swift
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import Foundation
 import CoreGraphics

test/1_stdlib/SceneKit.swift

@@ -6,13 +6,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import SceneKit
 

test/1_stdlib/SetTraps.swift

@@ -9,13 +9,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var SetTraps = TestSuite("SetTraps")
 

test/1_stdlib/SetTrapsObjC.swift

@@ -11,13 +11,6 @@
 import StdlibUnittest
 import Foundation
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 // FIXME: Should go into the standard library.
 public extension _ObjectiveCBridgeable {

test/1_stdlib/StaticString.swift

@@ -3,13 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var StaticStringTestSuite = TestSuite("StaticString")
 

test/1_stdlib/Strideable.swift

@@ -16,13 +16,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 // Check that the generic parameter is called 'Element'.
 protocol TestProtocol1 {}

test/1_stdlib/StringAPI.swift

@@ -10,16 +10,11 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
 #if _runtime(_ObjC)
-import ObjectiveC
 import Foundation
-import StdlibUnittestFoundationExtras
 #endif
 
+
 var StringTests = TestSuite("StringTests")
 
 struct ComparisonTest {

test/1_stdlib/StringOrderRelation.swift

@@ -3,13 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var StringOrderRelationTestSuite = TestSuite("StringOrderRelation")
 

test/1_stdlib/StringTraps.swift

@@ -9,13 +9,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var StringTraps = TestSuite("StringTraps")
 

test/1_stdlib/Tuple.swift.gyb

@@ -7,12 +7,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var TupleTestSuite = TestSuite("Tuple")
 

test/1_stdlib/Unicode.swift

@@ -15,13 +15,6 @@
 import Swift
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var UnicodeInternals = TestSuite("UnicodeInternals")
 

test/1_stdlib/Unmanaged.swift

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 // Check that the generic parameter is called 'Instance'.
 protocol TestProtocol1 {}

test/1_stdlib/UnsafePointer.swift.gyb

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 protocol TestProtocol1 {}
 

test/1_stdlib/simd.swift.gyb

@@ -11,13 +11,6 @@
 import simd
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 % scalar_types = ['Float', 'Double', 'Int32', 'UInt32']
 % float_types = ['Float', 'Double']

test/1_stdlib/tgmath_optimized.swift

@@ -10,13 +10,6 @@
 #endif
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var TGMathTestSuite = TestSuite("tgmath")
 

test/Interpreter/FunctionConversion.swift

@@ -17,13 +17,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var FunctionConversionTestSuite = TestSuite("FunctionConversion")
 

test/Interpreter/SDK/Foundation_test.swift

@@ -7,13 +7,6 @@
 import Foundation
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 // rdar://problem/18884272
 // Make sure that NSObject conforms to NSObjectProtocol. This

test/Interpreter/availability_weak_linking.swift

@@ -20,13 +20,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import FakeUnavailableObjCFramework
 import Foundation

test/Interpreter/c_bitfields.swift

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import ctypes
 

test/Interpreter/c_unions.swift

@@ -5,13 +5,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import ctypes
 

test/Interpreter/class_resilience.swift

@@ -14,13 +14,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import resilient_class
 import resilient_struct

test/Interpreter/enum_ErrorProtocol.swift

@@ -3,13 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 enum ClericalErrorDomain: ErrorProtocol {
   case MisplacedDocument(name: String)

test/Interpreter/enum_resilience.swift

@@ -13,13 +13,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import resilient_enum
 import resilient_struct

test/Interpreter/errors.swift

@@ -7,13 +7,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 enum Excuse : ErrorProtocol { case CatAteHomework(LifetimeTracked) }
 

test/Interpreter/failable_initializers.swift

@@ -3,13 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var FailableInitTestSuite = TestSuite("FailableInit")
 

test/Interpreter/global_resilience.swift

@@ -9,13 +9,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import resilient_global
 import resilient_struct

test/Interpreter/protocol_resilience.swift

@@ -16,13 +16,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import resilient_protocol
 

test/Interpreter/struct_resilience.swift

@@ -7,13 +7,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 import resilient_struct
 

test/Interpreter/throwing_initializers.swift

@@ -3,13 +3,6 @@
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var ThrowingInitTestSuite = TestSuite("ThrowingInit")
 

test/Prototypes/CollectionTransformers.swift

@@ -1302,13 +1302,6 @@ public func transform<C : Collection>(c: C)
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var t = TestSuite("t")
 

test/Prototypes/CollectionsMoveIndices.swift

@@ -1930,13 +1930,6 @@ extension MyBinaryTree : MyBidirectionalCollectionType {
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var NewCollection = TestSuite("NewCollection")
 

test/Prototypes/FloatingPoint.swift

@@ -1118,13 +1118,6 @@ public func ==(lhs: FloatingPointClassification, rhs: FloatingPointClassificatio
 //===--- tests ------------------------------------------------------------===//
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var tests = TestSuite("Floating Point")
 

test/Prototypes/Integers.swift.gyb

@@ -1284,13 +1284,6 @@ typealias UDWord = UInt${word_bits*2}
 
 import StdlibUnittest
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 func expectEqual<T : FixedWidthInteger>(
   expected: T, _ actual: T,

validation-test/Evolution/test_class_add_property.swift

@@ -5,14 +5,6 @@
 import StdlibUnittest
 import class_add_property
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-import SwiftPrivatePthreadExtras
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var ClassAddPropertyTest = TestSuite("ClassAddProperty")
 

validation-test/Evolution/test_class_change_size.swift

@@ -5,14 +5,6 @@
 import StdlibUnittest
 import class_change_size
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-import SwiftPrivatePthreadExtras
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var ClassChangeSizeTest = TestSuite("ClassChangeSize")
 

validation-test/Evolution/test_class_change_stored_to_computed.swift

@@ -4,14 +4,6 @@
 import StdlibUnittest
 import class_change_stored_to_computed
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-import SwiftPrivatePthreadExtras
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var ChangeStoredToComputedTest = TestSuite("ChangeStoredToComputed")
 

validation-test/Evolution/test_class_remove_property.swift

@@ -4,14 +4,6 @@
 import StdlibUnittest
 import class_remove_property
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-import SwiftPrivatePthreadExtras
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var ClassRemovePropertyTest = TestSuite("ClassRemoveProperty")
 

validation-test/Evolution/test_enum_add_cases.swift

@@ -4,14 +4,6 @@
 import StdlibUnittest
 import enum_add_cases
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-import SwiftPrivatePthreadExtras
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var EnumAddCasesTest = TestSuite("EnumAddCases")
 

validation-test/Evolution/test_enum_change_size.swift

@@ -4,14 +4,6 @@
 import StdlibUnittest
 import enum_change_size
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-import SwiftPrivatePthreadExtras
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var EnumChangeSizeTest = TestSuite("EnumChangeSize")
 

validation-test/Evolution/test_function_change_transparent_body.swift

@@ -7,14 +7,6 @@
 import StdlibUnittest
 import function_change_transparent_body
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-import SwiftPrivatePthreadExtras
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var ChangeTransparentBodyTest = TestSuite("ChangeTransparentBody")
 

validation-test/Evolution/test_global_change_size.swift

@@ -4,14 +4,6 @@
 import StdlibUnittest
 import global_change_size
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-import SwiftPrivatePthreadExtras
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var GlobalChangeSizeTest = TestSuite("GlobalChangeSize")
 

validation-test/Evolution/test_global_stored_to_computed.swift

@@ -4,14 +4,6 @@
 import StdlibUnittest
 import global_stored_to_computed
 
-// Also import modules which are used by StdlibUnittest internally. This
-// workaround is needed to link all required libraries in case we compile
-// StdlibUnittest with -sil-serialize-all.
-import SwiftPrivate
-import SwiftPrivatePthreadExtras
-#if _runtime(_ObjC)
-import ObjectiveC
-#endif
 
 var GlobalStoredToComputed = TestSuite("GlobalStoredToComputed")