Sema: During MemberImportVisibility migration, only warn about missing imports.

Author: tshortli

lib/Sema/TypeCheckNameLookup.cpp

@@ -905,21 +905,31 @@ class MissingImportFixItCache {
   }
 };
 
-static void
+static bool
 diagnoseMissingImportsForMember(const ValueDecl *decl,
                                 SmallVectorImpl<ModuleDecl *> &modulesToImport,
                                 SourceFile *sf, SourceLoc loc) {
   auto &ctx = sf->getASTContext();
   auto count = modulesToImport.size();
   ASSERT(count > 0);
 
+  bool isMigrating =
+      ctx.LangOpts.getFeatureState(Feature::MemberImportVisibility)
+          .isEnabledForMigration();
+
   if (count > 1) {
-    ctx.Diags.diagnose(loc, diag::member_from_missing_imports_2_or_more, decl,
-                       bool(count > 2), modulesToImport[0], modulesToImport[1]);
+    ctx.Diags
+        .diagnose(loc, diag::member_from_missing_imports_2_or_more, decl,
+                  bool(count > 2), modulesToImport[0], modulesToImport[1])
+        .limitBehaviorIf(isMigrating, DiagnosticBehavior::Warning);
   } else {
-    ctx.Diags.diagnose(loc, diag::member_from_missing_import, decl,
-                       modulesToImport.front());
+    ctx.Diags
+        .diagnose(loc, diag::member_from_missing_import, decl,
+                  modulesToImport.front())
+        .limitBehaviorIf(isMigrating, DiagnosticBehavior::Warning);
   }
+
+  return !isMigrating;
 }
 
 static void emitMissingImportFixIt(SourceLoc loc,
@@ -1023,8 +1033,7 @@ bool swift::maybeDiagnoseMissingImportForMember(const ValueDecl *decl,
     if (modulesToImport.empty())
       return false;
 
-    diagnoseMissingImportsForMember(decl, modulesToImport, sf, loc);
-    return true;
+    return diagnoseMissingImportsForMember(decl, modulesToImport, sf, loc);
   }
 
   sf->addDelayedMissingImportForMemberDiagnostic(decl, loc);

test/NameLookup/member_import_visibility.swift

@@ -5,7 +5,6 @@
 // RUN: %target-swift-frontend -typecheck %s -I %t -verify -swift-version 5 -package-name TestPackage -verify-additional-prefix ambiguity-
 // RUN: %target-swift-frontend -typecheck %s -I %t -verify -swift-version 6 -package-name TestPackage -verify-additional-prefix ambiguity-
 // RUN: %target-swift-frontend -typecheck %s -I %t -verify -swift-version 5 -package-name TestPackage -enable-upcoming-feature MemberImportVisibility -verify-additional-prefix member-visibility-
-// RUN: %target-swift-frontend -typecheck %s -I %t -verify -swift-version 5 -package-name TestPackage -enable-upcoming-feature MemberImportVisibility:migrate -verify-additional-prefix member-visibility-
 
 // REQUIRES: swift_feature_MemberImportVisibility
 

test/NameLookup/member_import_visibility_migrate.swift

@@ -0,0 +1,25 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/MemberImportVisibility/members_A.swift
+// RUN: %target-swift-frontend -emit-module -I %t -o %t -package-name TestPackage %S/Inputs/MemberImportVisibility/members_B.swift
+// RUN: %target-swift-frontend -emit-module -I %t -o %t %S/Inputs/MemberImportVisibility/members_C.swift
+// RUN: %target-swift-frontend -typecheck %s -I %t -verify -swift-version 5 -enable-upcoming-feature MemberImportVisibility:migrate
+
+// REQUIRES: swift_feature_MemberImportVisibility
+
+import members_C
+// expected-note 3 {{add import of module 'members_B'}}{{1-1=internal import members_B\n}}
+
+
+func testMigration(x: X, y: Y<Z>) {
+  x.XinA()
+  y.YinA()
+
+  x.XinB() // expected-warning {{instance method 'XinB()' is not available due to missing import of defining module 'members_B'}}
+  y.YinB() // expected-warning{{instance method 'YinB()' is not available due to missing import of defining module 'members_B'}}
+
+  x.XinC()
+  y.YinC()
+
+  _ = X(true)
+  _ = X(1) // expected-warning {{initializer 'init(_:)' is not available due to missing import of defining module 'members_B'}}
+}