ASTScope: Use CharSourceRanges for lookup

Author: slavapestov

lib/AST/ASTScopeLookup.cpp

@@ -83,11 +83,11 @@ bool ASTScopeImpl::checkSourceRangeOfThisASTNode() const {
 /// If the \p loc is in a new buffer but \p range is not, consider the location
 /// is at the start of replaced range. Otherwise, returns \p loc as is.
 static SourceLoc translateLocForReplacedRange(SourceManager &sourceMgr,
-                                              SourceRange range,
+                                              CharSourceRange range,
                                               SourceLoc loc) {
   if (const auto &replacedRange = sourceMgr.getReplacedRange()) {
     if (sourceMgr.rangeContainsTokenLoc(replacedRange.New, loc) &&
-        !sourceMgr.rangeContains(replacedRange.New, range)) {
+        !sourceMgr.rangeContainsTokenLoc(replacedRange.New, range.getStart())) {
       return replacedRange.Original.Start;
     }
   }
@@ -101,17 +101,19 @@ ASTScopeImpl::findChildContaining(SourceLoc loc,
   auto *const *child = llvm::lower_bound(
       getChildren(), loc,
       [&sourceMgr](const ASTScopeImpl *scope, SourceLoc loc) {
-        ASTScopeAssert(scope->checkSourceRangeOfThisASTNode(), "Bad range.");
-        auto rangeOfScope = scope->getSourceRangeOfScope();
+        auto rangeOfScope = scope->getCharSourceRangeOfScope(sourceMgr);
+        ASTScopeAssert(!sourceMgr.isBeforeInBuffer(rangeOfScope.getEnd(),
+                                                   rangeOfScope.getStart()),
+                       "Source range is backwards");
         loc = translateLocForReplacedRange(sourceMgr, rangeOfScope, loc);
-        return -1 == ASTScopeImpl::compare(rangeOfScope, loc, sourceMgr,
-                                           /*ensureDisjoint=*/false);
+        return (rangeOfScope.getEnd() == loc ||
+                sourceMgr.isBeforeInBuffer(rangeOfScope.getEnd(), loc));
       });
 
   if (child != getChildren().end()) {
-    auto rangeOfScope = (*child)->getSourceRangeOfScope();
+    auto rangeOfScope = (*child)->getCharSourceRangeOfScope(sourceMgr);
     loc = translateLocForReplacedRange(sourceMgr, rangeOfScope, loc);
-    if (sourceMgr.rangeContainsTokenLoc(rangeOfScope, loc))
+    if (rangeOfScope.contains(loc))
       return *child;
   }