[NFC] DiagnosticVerifier: Move 'getColumnNumber' into SourceManager

Author: AnthonyLatsis

include/swift/Basic/SourceManager.h

@@ -247,6 +247,9 @@ class SourceManager {
     return LLVMSourceMgr.getLineAndColumn(Loc.Value, BufferID);
   }
 
+  /// Returns the column for the given source location in the given buffer.
+  unsigned getColumnInBuffer(SourceLoc Loc, unsigned BufferID) const;
+
   StringRef getEntireTextForBuffer(unsigned BufferID) const;
 
   StringRef extractText(CharSourceRange Range,

include/swift/Frontend/DiagnosticVerifier.h

@@ -101,11 +101,11 @@ class DiagnosticVerifier : public DiagnosticConsumer {
   Result verifyFile(unsigned BufferID);
 
   bool checkForFixIt(const ExpectedFixIt &Expected,
-                     const CapturedDiagnosticInfo &D, StringRef buffer);
+                     const CapturedDiagnosticInfo &D, unsigned BufferID) const;
 
   // Render the verifier syntax for a given set of fix-its.
   std::string renderFixits(ArrayRef<DiagnosticInfo::FixIt> fixits,
-                           StringRef InputFile);
+                           unsigned BufferID) const;
 
   void printRemainingDiagnostics() const;
 };

lib/Basic/SourceLoc.cpp

@@ -220,6 +220,23 @@ unsigned SourceManager::getByteDistance(SourceLoc Start, SourceLoc End) const {
   return End.Value.getPointer() - Start.Value.getPointer();
 }
 
+unsigned SourceManager::getColumnInBuffer(SourceLoc Loc,
+                                          unsigned BufferID) const {
+  assert(Loc.isValid());
+
+  const StringRef Buffer = getEntireTextForBuffer(BufferID);
+  const char *Ptr = static_cast<const char *>(Loc.getOpaquePointerValue());
+
+  StringRef UpToLoc = Buffer.slice(0, Ptr - Buffer.data());
+
+  size_t ColumnNo = UpToLoc.size();
+  size_t NewlinePos = UpToLoc.find_last_of("\r\n");
+  if (NewlinePos != StringRef::npos)
+    ColumnNo -= NewlinePos;
+
+  return static_cast<unsigned>(ColumnNo);
+}
+
 StringRef SourceManager::getEntireTextForBuffer(unsigned BufferID) const {
   return LLVMSourceMgr.getMemoryBuffer(BufferID)->getBuffer();
 }

lib/Frontend/DiagnosticVerifier.cpp

@@ -237,34 +237,19 @@ verifyUnknown(SourceManager &SM,
 }
 } // end anonymous namespace
 
-static unsigned getColumnNumber(StringRef buffer, llvm::SMLoc loc) {
-  assert(loc.getPointer() >= buffer.data());
-  assert((size_t)(loc.getPointer() - buffer.data()) <= buffer.size());
-
-  StringRef UpToLoc = buffer.slice(0, loc.getPointer() - buffer.data());
-
-  size_t ColumnNo = UpToLoc.size();
-  size_t NewlinePos = UpToLoc.find_last_of("\r\n");
-  if (NewlinePos != StringRef::npos)
-    ColumnNo -= NewlinePos;
-
-  return static_cast<unsigned>(ColumnNo);
-}
-
 /// Return true if the given \p ExpectedFixIt is in the fix-its emitted by
 /// diagnostic \p D.
 bool DiagnosticVerifier::checkForFixIt(const ExpectedFixIt &Expected,
                                        const CapturedDiagnosticInfo &D,
-                                       StringRef buffer) {
+                                       unsigned BufferID) const {
   for (auto &ActualFixIt : D.FixIts) {
     if (ActualFixIt.getText() != Expected.Text)
       continue;
 
     CharSourceRange Range = ActualFixIt.getRange();
-    if (getColumnNumber(buffer, getRawLoc(Range.getStart())) !=
-        Expected.StartCol)
+    if (SM.getColumnInBuffer(Range.getStart(), BufferID) != Expected.StartCol)
       continue;
-    if (getColumnNumber(buffer, getRawLoc(Range.getEnd())) != Expected.EndCol)
+    if (SM.getColumnInBuffer(Range.getEnd(), BufferID) != Expected.EndCol)
       continue;
 
     return true;
@@ -275,17 +260,17 @@ bool DiagnosticVerifier::checkForFixIt(const ExpectedFixIt &Expected,
 
 std::string
 DiagnosticVerifier::renderFixits(ArrayRef<DiagnosticInfo::FixIt> fixits,
-                                 StringRef InputFile) {
+                                 unsigned BufferID) const {
   std::string Result;
   llvm::raw_string_ostream OS(Result);
   interleave(fixits,
              [&](const DiagnosticInfo::FixIt &ActualFixIt) {
                CharSourceRange Range = ActualFixIt.getRange();
 
                OS << "{{"
-                  << getColumnNumber(InputFile, getRawLoc(Range.getStart()))
+                  << SM.getColumnInBuffer(Range.getStart(), BufferID)
                   << '-'
-                  << getColumnNumber(InputFile, getRawLoc(Range.getEnd()))
+                  << SM.getColumnInBuffer(Range.getEnd(), BufferID)
                   << '=';
 
                for (auto C : ActualFixIt.getText()) {
@@ -627,7 +612,7 @@ DiagnosticVerifier::Result DiagnosticVerifier::verifyFile(unsigned BufferID) {
     // Verify that any expected fix-its are present in the diagnostic.
     for (auto fixit : expected.Fixits) {
       // If we found it, we're ok.
-      if (!checkForFixIt(fixit, FoundDiagnostic, InputFile)) {
+      if (!checkForFixIt(fixit, FoundDiagnostic, BufferID)) {
         missedFixitLoc = fixit.StartLoc;
         break;
       }
@@ -644,7 +629,7 @@ DiagnosticVerifier::Result DiagnosticVerifier::verifyFile(unsigned BufferID) {
     auto makeActualFixitsPhrase =
         [&](ArrayRef<DiagnosticInfo::FixIt> actualFixits)
         -> ActualFixitsPhrase {
-      std::string actualFixitsStr = renderFixits(actualFixits, InputFile);
+      std::string actualFixitsStr = renderFixits(actualFixits, BufferID);
 
       return ActualFixitsPhrase{(Twine("actual fix-it") +
                                  (actualFixits.size() >= 2 ? "s" : "") +