[ImportResolution] Remove redundant "Swift" module import

Import resolution now adds the Swift module to the list of imports, so
we no longer need to add it manually.

Author: hnrklssn

lib/Sema/ImportResolution.cpp

@@ -334,12 +334,6 @@ void swift::performImportResolutionForClangMacroBuffer(SourceFile &SF) {
   // `getWrapperForModule` has already declared all the implicit clang module
   // imports we need
   ImportResolver resolver(SF);
-
-  // FIXME: This is a hack that we shouldn't need, but be sure that we can
-  // see the Swift standard library.
-  if (auto stdlib = SF.getASTContext().getStdlibModule())
-    resolver.addImplicitImport(stdlib);
-
   SF.setImports(resolver.getFinishedImports());
   SF.setImportedUnderlyingModule(resolver.getUnderlyingClangModule());
 

test/Interop/C/swiftify-import/clang-includes-aliasing-imports.swift

@@ -85,7 +85,6 @@ aliasing1_t a1(void * _Nonnull __sized_by(size), aliasing2_t size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/Aliasing1.h
 #pragma once
@@ -132,6 +131,5 @@ aliasing3_t a2(void * _Nonnull __sized_by(size), aliasing4_t size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 // DUMP-NOT: imports

test/Interop/C/swiftify-import/clang-includes-indirect-explicit-modules.swift

@@ -90,7 +90,6 @@ d1_t b1d(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 // DUMP-NEXT: imports for A1.b1c:
 // DUMP-NEXT: imports for @__swiftmacro_So3b1c15_SwiftifyImportfMp_.swift:
@@ -104,7 +103,6 @@ d1_t b1d(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 // DUMP-NEXT: imports for A1.b1d:
 // DUMP-NEXT: imports for @__swiftmacro_So3b1d15_SwiftifyImportfMp_.swift:
@@ -118,7 +116,6 @@ d1_t b1d(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/C1.h
 #pragma once
@@ -164,7 +161,6 @@ d1_t b2d(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 // DUMP-NEXT: imports for A2.b2c:
 // DUMP-NEXT: imports for @__swiftmacro_So3b2c15_SwiftifyImportfMp_.swift:
@@ -180,7 +176,6 @@ d1_t b2d(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 // DUMP-NEXT: imports for A2.b2d:
 // DUMP-NEXT: imports for @__swiftmacro_So3b2d15_SwiftifyImportfMp_.swift:
@@ -196,6 +191,5 @@ d1_t b2d(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 // DUMP-NOT: imports

test/Interop/C/swiftify-import/clang-includes-redundant-imports.swift

@@ -138,7 +138,6 @@ f1_t  a1(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/B1.h
 #pragma once
@@ -164,7 +163,6 @@ c1_t  b1(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/C1.h
 #pragma once
@@ -188,7 +186,6 @@ f1_t  c1(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/D1.h
 #pragma once
@@ -211,7 +208,6 @@ f1_t d1(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/E1.h
 #pragma once
@@ -241,7 +237,6 @@ g1_t e1_2(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 // DUMP-NEXT: imports for A1.e1_2:
 // DUMP-NEXT: imports for @__swiftmacro_So4e1_215_SwiftifyImportfMp_.swift:
@@ -255,7 +250,6 @@ g1_t e1_2(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/F1.h
 #pragma once
@@ -303,7 +297,6 @@ c2_t b2_2(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 // DUMP-NEXT: imports for A2.b2_2:
 // DUMP-NEXT: imports for @__swiftmacro_So4b2_215_SwiftifyImportfMp_.swift:
@@ -319,7 +312,6 @@ c2_t b2_2(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/C2.h
 #pragma once
@@ -348,7 +340,6 @@ e2_t c2(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/D2.h
 #pragma once
@@ -373,7 +364,6 @@ e2_t d2(void * _Nonnull __sized_by(size), int size);
 // DUMP-NEXT:   _SwiftConcurrencyShims
 // DUMP-NEXT:   _Concurrency
 // DUMP-NEXT:   SwiftOnoneSupport
-// DUMP-NEXT:   Swift
 
 //--- Inputs/E2.h
 #pragma once