AST/Sema: Remove code adding @_spi to suggested import fix-its.

The was never invoked because inaccessibility due to SPI protection level is
always diagnosed before missing imports are diagnosed. The functionality could
therefore not be tested and should be removed.

Author: tshortli

lib/AST/DiagnosticEngine.cpp

@@ -361,17 +361,6 @@ InFlightDiagnostic &InFlightDiagnostic::fixItAddImport(StringRef ModuleName) {
 
   if (bestLoc.isValid()) {
     llvm::SmallString<64> importText;
-
-    // @_spi imports.
-    if (Member->isSPI()) {
-      auto spiGroups = Member->getSPIGroups();
-      if (!spiGroups.empty()) {
-        importText += "@_spi(";
-        importText += spiGroups[0].str();
-        importText += ") ";
-      }
-    }
-
     importText += "import ";
     importText += ModuleName;
     importText += "\n";

lib/Sema/TypeCheckNameLookup.cpp

@@ -940,8 +940,7 @@ diagnoseMissingImportsForMember(const ValueDecl *decl,
 
 static void emitMissingImportFixIt(SourceLoc loc,
                                    const MissingImportFixItInfo &fixItInfo,
-                                   const ValueDecl *decl) {
-  ASTContext &ctx = decl->getASTContext();
+                                   ASTContext &ctx) {
   llvm::SmallString<64> importText;
 
   // Add flags that must be used consistently on every import in every file.
@@ -962,16 +961,6 @@ static void emitMissingImportFixIt(SourceLoc loc,
       importText += "@_spiOnly ";
   }
 
-  // Add @_spi groups if needed for the declaration.
-  if (decl->isSPI()) {
-    auto spiGroups = decl->getSPIGroups();
-    if (!spiGroups.empty()) {
-      importText += "@_spi(";
-      importText += spiGroups[0].str();
-      importText += ") ";
-    }
-  }
-
   if (explicitAccessLevel) {
     importText += getAccessLevelSpelling(*explicitAccessLevel);
     importText += " ";
@@ -1006,7 +995,7 @@ diagnoseAndFixMissingImportForMember(const ValueDecl *decl, SourceFile *sf,
     return;
 
   for (auto &fixItInfo : fixItInfos) {
-    emitMissingImportFixIt(bestLoc, fixItInfo, decl);
+    emitMissingImportFixIt(bestLoc, fixItInfo, ctx);
   }
 }
 

test/NameLookup/Inputs/MemberImportVisibility/members_A.swift

@@ -17,6 +17,9 @@ infix operator <>
 extension X {
   public func XinA() { }
 
+  @_spi(A)
+  public func XinA_spi() { }
+
   public var propXinA: Bool { return true }
 
   public static func <<<(a: Self, b: Self) -> Self { a }

test/NameLookup/Inputs/MemberImportVisibility/members_B.swift

@@ -5,6 +5,9 @@ extension X {
   public func XinB() { }
   package func XinB_package() { }
 
+  @_spi(B)
+  public func XinB_spi() { }
+
   public var propXinB: Bool { return true }
   package var propXinB_package: Bool { return true }
 

test/NameLookup/Inputs/MemberImportVisibility/members_C.swift

@@ -5,6 +5,9 @@ import members_B
 extension X {
   public func XinC() { }
 
+  @_spi(C)
+  public func XinC_spi() { }
+
   public var propXinC: Bool { return true }
 
   public static func <>(a: Self, b: Self) -> Self { a }

test/NameLookup/member_import_visibility.swift

@@ -14,13 +14,16 @@ import members_C
 
 func testExtensionMembers(x: X, y: Y<Z>) {
   x.XinA()
+  x.XinA_spi() // expected-error{{'XinA_spi' is inaccessible due to '@_spi' protection level}}
   y.YinA()
 
   x.XinB() // expected-member-visibility-error{{instance method 'XinB()' is not available due to missing import of defining module 'members_B'}}
   x.XinB_package() // expected-member-visibility-error{{instance method 'XinB_package()' is not available due to missing import of defining module 'members_B'}}
+  x.XinB_spi() // expected-error{{'XinB_spi' is inaccessible due to '@_spi' protection level}}
   y.YinB() // expected-member-visibility-error{{instance method 'YinB()' is not available due to missing import of defining module 'members_B'}}
 
   x.XinC()
+  x.XinC_spi() // expected-error{{'XinC_spi' is inaccessible due to '@_spi' protection level}}
   y.YinC()
 
   _ = X(true)