Sema: Remove ConformanceChecker::SuppressDiagnostics

Author: slavapestov

lib/Sema/TypeCheckProtocol.cpp

@@ -1853,7 +1853,6 @@ class swift::MultiConformanceChecker {
       if (checker.AlreadyComplained)
         continue;
 
-      checker.SuppressDiagnostics = false; // no need to restore to prev value
       checker.emitDelayedDiags();
     }
   }
@@ -2116,8 +2115,7 @@ checkIndividualConformance(NormalProtocolConformance *conformance,
         // conformance is invalid for other reasons, so emit diagnosis now.
         if (revivedMissingWitnesses.empty()) {
           // Emit any delayed diagnostics.
-          ConformanceChecker(getASTContext(), conformance, MissingWitnesses,
-                             false)
+          ConformanceChecker(getASTContext(), conformance, MissingWitnesses)
               .emitDelayedDiags();
         }
       }
@@ -2908,14 +2906,12 @@ diagnoseMatch(ModuleDecl *module, NormalProtocolConformance *conformance,
 
 ConformanceChecker::ConformanceChecker(
     ASTContext &ctx, NormalProtocolConformance *conformance,
-    llvm::SetVector<MissingWitness> &GlobalMissingWitnesses,
-    bool suppressDiagnostics)
+    llvm::SetVector<MissingWitness> &GlobalMissingWitnesses)
     : WitnessChecker(ctx, conformance->getProtocol(), conformance->getType(),
                      conformance->getDeclContext()),
       Conformance(conformance), Loc(conformance->getLoc()),
       GlobalMissingWitnesses(GlobalMissingWitnesses),
-      LocalMissingWitnessesStartIndex(GlobalMissingWitnesses.size()),
-      SuppressDiagnostics(suppressDiagnostics) {}
+      LocalMissingWitnessesStartIndex(GlobalMissingWitnesses.size()) {}
 
 ConformanceChecker::~ConformanceChecker() {}
 
@@ -5485,9 +5481,6 @@ void ConformanceChecker::checkConformance(MissingWitnessDiagnosisKind Kind) {
   FrontendStatsTracer statsTracer(getASTContext().Stats,
                                   "check-conformance", Conformance);
 
-  llvm::SaveAndRestore<bool> restoreSuppressDiagnostics(SuppressDiagnostics);
-  SuppressDiagnostics = false;
-
   // FIXME: Caller checks that this type conforms to all of the
   // inherited protocols.
 
@@ -5503,12 +5496,12 @@ void ConformanceChecker::checkConformance(MissingWitnessDiagnosisKind Kind) {
   // Resolve all of the type witnesses.
   resolveTypeWitnesses();
 
-  // Check the requirements from the requirement signature.
-  ensureRequirementsAreSatisfied();
-
   // Diagnose missing type witnesses for now.
   diagnoseMissingWitnesses(Kind, /*Delayed=*/false);
 
+  // Check the requirements from the requirement signature.
+  ensureRequirementsAreSatisfied();
+
   // Check non-type requirements.
   resolveValueWitnesses();
 
@@ -5539,10 +5532,6 @@ void ConformanceChecker::checkConformance(MissingWitnessDiagnosisKind Kind) {
       }
     }
   }
-
-  if (Conformance->isInvalid()) {
-    return;
-  }
 }
 
 /// Retrieve the Objective-C method key from the given function.
@@ -5725,29 +5714,17 @@ void ConformanceChecker::diagnoseOrDefer(
   if (isError)
     Conformance->setInvalid();
 
-  if (SuppressDiagnostics) {
-    // Stash this in the ASTContext for later emission.
-    auto conformance = Conformance;
-
-    getASTContext().addDelayedConformanceDiag(
-        conformance,
-        {requirement, [conformance, fn] { fn(conformance); }, isError});
-    return;
-  }
-
-  // Complain that the type does not conform, once.
-  if (isError && !AlreadyComplained) {
-    diagnoseConformanceFailure(Adoptee, Proto, DC, Loc);
-    AlreadyComplained = true;
-  }
+  // Stash this in the ASTContext for later emission.
+  auto conformance = Conformance;
 
-  fn(Conformance);
+  getASTContext().addDelayedConformanceDiag(
+      conformance,
+      {requirement, [conformance, fn] { fn(conformance); }, isError});
 }
 
 void ConformanceChecker::emitDelayedDiags() {
   auto diags = getASTContext().takeDelayedConformanceDiags(Conformance);
 
-  assert(!SuppressDiagnostics && "Should not be suppressing diagnostics now");
   for (const auto &diag: diags) {
     // Complain that the type does not conform, once.
     if (diag.IsError && !AlreadyComplained) {

lib/Sema/TypeCheckProtocol.h

@@ -787,11 +787,6 @@ class ConformanceChecker : public WitnessChecker {
   /// this protocol under checking.
   unsigned LocalMissingWitnessesStartIndex;
 
-  /// True if we shouldn't complain about problems with this conformance
-  /// right now, i.e. if methods are being called outside
-  /// checkConformance().
-  bool SuppressDiagnostics;
-
   /// Whether we've already complained about problems with this conformance.
   bool AlreadyComplained = false;
 
@@ -896,8 +891,7 @@ class ConformanceChecker : public WitnessChecker {
   void emitDelayedDiags();
 
   ConformanceChecker(ASTContext &ctx, NormalProtocolConformance *conformance,
-                     llvm::SetVector<MissingWitness> &GlobalMissingWitnesses,
-                     bool suppressDiagnostics = true);
+                     llvm::SetVector<MissingWitness> &GlobalMissingWitnesses);
 
   ~ConformanceChecker();