Merge pull request #34652 from CodaFi/a-mirror-into-the-soul-of-the-compiler

Exempt Swift Interface Files From Whole-Module ObjC Errors

Author: CodaFi

lib/Sema/TypeCheckDeclObjC.cpp

@@ -2402,6 +2402,7 @@ bool swift::diagnoseObjCUnsatisfiedOptReqConflicts(SourceFile &sf) {
         break;
       }
     }
+    assert(req != bestConflict && "requirement conflicts with itself?");
 
     // Diagnose the conflict.
     auto reqDiagInfo = getObjCMethodDiagInfo(unsatisfied.second);

lib/Sema/TypeChecker.cpp

@@ -344,9 +344,19 @@ void swift::performWholeModuleTypeChecking(SourceFile &SF) {
   auto &Ctx = SF.getASTContext();
   FrontendStatsTracer tracer(Ctx.Stats,
                              "perform-whole-module-type-checking");
-  diagnoseObjCMethodConflicts(SF);
-  diagnoseObjCUnsatisfiedOptReqConflicts(SF);
-  diagnoseUnintendedObjCMethodOverrides(SF);
+  switch (SF.Kind) {
+  case SourceFileKind::Library:
+  case SourceFileKind::Main:
+    diagnoseObjCMethodConflicts(SF);
+    diagnoseObjCUnsatisfiedOptReqConflicts(SF);
+    diagnoseUnintendedObjCMethodOverrides(SF);
+    return;
+  case SourceFileKind::SIL:
+  case SourceFileKind::Interface:
+    // SIL modules and .swiftinterface files don't benefit from whole-module
+    // ObjC checking - skip it.
+    return;
+  }
 }
 
 bool swift::isAdditiveArithmeticConformanceDerivationEnabled(SourceFile &SF) {

test/ClangImporter/Inputs/requirement-conflict/CoreFeatures.framework/CoreFeatures

@@ -0,0 +1 @@
+Versions/Current/CoreFeatures

test/ClangImporter/Inputs/requirement-conflict/CoreFeatures.framework/Headers

@@ -0,0 +1 @@
+Versions/Current/Headers

test/ClangImporter/Inputs/requirement-conflict/CoreFeatures.framework/Modules

@@ -0,0 +1 @@
+Versions/Current/Modules