Revert "address comments: return optional<SourceRange>; update region only when needed"

This reverts commit 0eeb0d3e392b1ea1ae47bc8c977eb709cd1c264c.

Author: whentojump

clang/lib/CodeGen/CoverageMappingGen.cpp

@@ -295,20 +295,22 @@ class CoverageMappingBuilder {
   }
 
   /// Find out where a macro is expanded. If the immediate result is a
-  /// <scratch space>, keep looking until the result isn't. Return the source
-  /// range of the found result, or std::nullopt if the while loop didn't get
-  /// executed, which means the location wasn't changed.
-  std::optional<SourceRange> getNonScratchExpansion(SourceLocation Loc) {
+  /// <scratch space>, keep looking until the result isn't. Return a pair of
+  /// \c SourceLocation. The first object is always the begin sloc of found
+  /// result. The second should be checked by the caller: if it has value, it's
+  /// the end sloc of the found result. Otherwise the while loop didn't get
+  /// executed, which means the location wasn't changed and the caller has to
+  /// learn the end sloc from somewhere else.
+  std::pair<SourceLocation, std::optional<SourceLocation>>
+  getNonScratchExpansionLoc(SourceLocation Loc) {
     std::optional<SourceLocation> EndLoc = std::nullopt;
     while (Loc.isMacroID() &&
            SM.isWrittenInScratchSpace(SM.getSpellingLoc(Loc))) {
       auto ExpansionRange = SM.getImmediateExpansionRange(Loc);
       Loc = ExpansionRange.getBegin();
       EndLoc = ExpansionRange.getEnd();
     }
-    if (EndLoc.has_value())
-      return SourceRange(Loc, EndLoc.value());
-    return std::nullopt;
+    return std::make_pair(Loc, EndLoc);
   }
 
   /// Find out where the current file is included or macro is expanded. If
@@ -321,9 +323,7 @@ class CoverageMappingBuilder {
     Loc = SM.getImmediateExpansionRange(Loc).getBegin();
     if (AcceptScratch)
       return Loc;
-    auto NonScratchExpansion = getNonScratchExpansion(Loc);
-    return NonScratchExpansion.has_value() ? NonScratchExpansion->getBegin()
-                                           : Loc;
+    return getNonScratchExpansionLoc(Loc).first;
   }
 
   /// Return true if \c Loc is a location in a built-in macro.
@@ -371,12 +371,12 @@ class CoverageMappingBuilder {
       SourceLocation Loc = Region.getBeginLoc();
 
       // Replace Region with its definition if it is in <scratch space>.
-      auto NonScratchExpansion = getNonScratchExpansion(Loc);
-      if (NonScratchExpansion.has_value()) {
-        Loc = NonScratchExpansion->getBegin();
-        Region.setStartLoc(Loc);
-        Region.setEndLoc(NonScratchExpansion->getEnd());
-      }
+      auto NonScratchExpansionLoc = getNonScratchExpansionLoc(Loc);
+      Loc = NonScratchExpansionLoc.first;
+      auto EndLoc = NonScratchExpansionLoc.second;
+      Region.setStartLoc(Loc);
+      Region.setEndLoc(EndLoc.has_value() ? EndLoc.value()
+                                          : Region.getEndLoc());
 
       // Replace Loc with FileLoc if it is expanded with system headers.
       if (!SystemHeadersCoverage && SM.isInSystemMacro(Loc)) {