consumerAndRangeForLocation -> subconsumerForLocation

Author: davidungar

include/swift/AST/DiagnosticConsumer.h

@@ -251,7 +251,7 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
   /// This allows diagnostics to be emitted before files are actually opened,
   /// as long as they don't have source locations.
   ///
-  /// \see #consumerAndRangeForLocation
+  /// \see #subconsumerForLocation
   SmallVector<ConsumerAndRange, 4> ConsumersOrderedByRange;
 
   /// Indicates which consumer to send Note diagnostics too.
@@ -261,7 +261,7 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
   ///
   /// If None, Note diagnostics are sent to every consumer.
   /// If null, diagnostics are suppressed.
-  Optional<ConsumerAndRange *> ConsumerSpecificInfoForSubsequentNotes = None;
+  Optional<Subconsumer *> SubconsumerForSubsequentNotes = None;
 
   bool HasAnErrorBeenConsumed = false;
 
@@ -293,8 +293,8 @@ class FileSpecificDiagnosticConsumer : public DiagnosticConsumer {
   /// Returns nullptr if diagnostic is to be suppressed,
   /// None if diagnostic is to be distributed to every consumer,
   /// a particular consumer if diagnostic goes there.
-  Optional<ConsumerAndRange *> consumerAndRangeForLocation(SourceManager &SM,
-                                                           SourceLoc loc) const;
+  Optional<FileSpecificDiagnosticConsumer::Subconsumer *>
+  subconsumerForLocation(SourceManager &SM, SourceLoc loc);
 };
 
 } // end namespace swift

lib/AST/DiagnosticConsumer.cpp

@@ -111,9 +111,9 @@ void FileSpecificDiagnosticConsumer::computeConsumersOrderedByRange(
          "overlapping ranges despite having distinct files");
 }
 
-Optional<FileSpecificDiagnosticConsumer::ConsumerAndRange *>
-FileSpecificDiagnosticConsumer::consumerAndRangeForLocation(
-    SourceManager &SM, SourceLoc loc) const {
+Optional<FileSpecificDiagnosticConsumer::Subconsumer *>
+FileSpecificDiagnosticConsumer::subconsumerForLocation(SourceManager &SM,
+                                                       SourceLoc loc) {
   // Diagnostics with invalid locations always go to every consumer.
   if (loc.isInvalid())
     return None;
@@ -154,7 +154,9 @@ FileSpecificDiagnosticConsumer::consumerAndRangeForLocation(
 
   if (possiblyContainingRangeIter != ConsumersOrderedByRange.end() &&
       possiblyContainingRangeIter->contains(loc)) {
-    return const_cast<ConsumerAndRange *>(possiblyContainingRangeIter);
+    auto *consumerAndRangeForLocation =
+        const_cast<ConsumerAndRange *>(possiblyContainingRangeIter);
+    return &(*this)[*consumerAndRangeForLocation];
   }
 
   return None;
@@ -167,21 +169,21 @@ void FileSpecificDiagnosticConsumer::handleDiagnostic(
 
   HasAnErrorBeenConsumed |= Kind == DiagnosticKind::Error;
 
-  Optional<ConsumerAndRange *> consumerAndRange;
+  Optional<FileSpecificDiagnosticConsumer::Subconsumer *> subconsumer;
   switch (Kind) {
   case DiagnosticKind::Error:
   case DiagnosticKind::Warning:
   case DiagnosticKind::Remark:
-    consumerAndRange = consumerAndRangeForLocation(SM, Loc);
-    ConsumerSpecificInfoForSubsequentNotes = consumerAndRange;
+    subconsumer = subconsumerForLocation(SM, Loc);
+    SubconsumerForSubsequentNotes = subconsumer;
     break;
   case DiagnosticKind::Note:
-    consumerAndRange = ConsumerSpecificInfoForSubsequentNotes;
+    subconsumer = SubconsumerForSubsequentNotes;
     break;
   }
-  if (consumerAndRange.hasValue()) {
-    (*this)[*consumerAndRange.getValue()].handleDiagnostic(
-        SM, Loc, Kind, FormatString, FormatArgs, Info);
+  if (subconsumer.hasValue()) {
+    subconsumer.getValue()->handleDiagnostic(SM, Loc, Kind, FormatString,
+                                             FormatArgs, Info);
     return;
   }
   for (auto &subconsumer : Subconsumers)