Update diag_deprecated_string_interpolation to use column offsets in -verify mode instead of FileCheck

Author: owenv

lib/Frontend/DiagnosticVerifier.cpp

@@ -565,12 +565,14 @@ bool DiagnosticVerifier::verifyFile(unsigned BufferID,
 
       llvm::SMFixIt fixIt(llvm::SMRange{StartLoc, EndLoc}, I->getMessage());
       addError(expected.MessageRange.begin(), "incorrect message found", fixIt);
-    } else {
+    } else if (I->getColumnNo() + 1 != (int)*expected.ColumnNo) {
       // The difference must be only in the column
       addError(expected.MessageRange.begin(),
                llvm::formatv("message found at column {0} but was expected to "
                              "appear at column {1}",
                              I->getColumnNo() + 1, *expected.ColumnNo));
+    } else {
+      llvm_unreachable("unhandled difference from expected diagnostic");
     }
     CapturedDiagnostics.erase(I);
     ExpectedDiagnostics.erase(ExpectedDiagnostics.begin()+i);

test/Sema/diag_deprecated_string_interpolation.swift

@@ -1,24 +1,21 @@
-// RUN: %target-swift-frontend -swift-version 5 -typecheck %s 2>&1 | %FileCheck %s
+// RUN: %target-typecheck-verify-swift -swift-version 5
 
 extension DefaultStringInterpolation {
     @available(*, deprecated) func appendInterpolation(deprecated: Int) {}
 }
 
 // Make sure diagnostics emitted via string interpolations have a reasonable source location
 
-_ = "\(deprecated: 42)"
-// CHECK: [[@LINE-1]]:7: warning: 'appendInterpolation(deprecated:)' is deprecated
+_ = "\(deprecated: 42)" // expected-warning@:7 {{'appendInterpolation(deprecated:)' is deprecated}}
 
-_ = "hello, world\(deprecated: 42)!!!"
-// CHECK: [[@LINE-1]]:19: warning: 'appendInterpolation(deprecated:)' is deprecated
+_ = "hello, world\(deprecated: 42)!!!" // expected-warning@:19 {{'appendInterpolation(deprecated:)' is deprecated}}
 
 _ = "\(42)\(deprecated: 42)test\(deprecated: 42)"
-// CHECK: [[@LINE-1]]:12: warning: 'appendInterpolation(deprecated:)' is deprecated
-// CHECK: [[@LINE-2]]:33: warning: 'appendInterpolation(deprecated:)' is deprecated
-
+// expected-warning@-1:12 {{'appendInterpolation(deprecated:)' is deprecated}}
+// expected-warning@-2:33 {{'appendInterpolation(deprecated:)' is deprecated}}
 _ = """
 This is a multiline literal with a deprecated interpolation:
 
 \(deprecated: 42)
 """
-// CHECK: [[@LINE-2]]:2: warning: 'appendInterpolation(deprecated:)' is deprecated
+// expected-warning@-2:2 {{'appendInterpolation(deprecated:)' is deprecated}}