Merge pull request #32020 from owenv/line-and-col-fixes

Fix comparisons between presumed and buffer line numbers

Author: owenv

lib/Parse/ParseStmt.cpp

@@ -771,8 +771,8 @@ ParserResult<Stmt> Parser::parseStmtReturn(SourceLoc tryLoc) {
 
     // Issue a warning when the returned expression is on a different line than
     // the return keyword, but both have the same indentation.
-    if (SourceMgr.getPresumedLineAndColumnForLoc(ReturnLoc).second ==
-        SourceMgr.getPresumedLineAndColumnForLoc(ExprLoc).second) {
+    if (SourceMgr.getLineAndColumnInBuffer(ReturnLoc).second ==
+        SourceMgr.getLineAndColumnInBuffer(ExprLoc).second) {
       diagnose(ExprLoc, diag::unindented_code_after_return);
       diagnose(ExprLoc, diag::indent_expression_to_silence);
     }

lib/Sema/MiscDiagnostics.cpp

@@ -3163,7 +3163,7 @@ static void checkSwitch(ASTContext &ctx, const SwitchStmt *stmt) {
         continue;
 
       auto &SM = ctx.SourceMgr;
-      auto prevLineCol = SM.getPresumedLineAndColumnForLoc(prevLoc);
+      auto prevLineCol = SM.getLineAndColumnInBuffer(prevLoc);
       if (SM.getLineAndColumnInBuffer(thisLoc).first != prevLineCol.first)
         continue;