Merge pull request #28036 from davidungar/astscope-boundary-condition

David Ungar · web-flow · commit 17d5d10ea12c · 2019-11-02T13:13:16.000-07:00
[NameLookup, ASTScope] Fix boundary condition test in scope search.
diff --git a/lib/AST/ASTScopeLookup.cpp b/lib/AST/ASTScopeLookup.cpp
@@ -157,8 +157,8 @@ ASTScopeImpl::findChildContaining(SourceLoc loc,
     }
     bool operator()(SourceLoc loc, const ASTScopeImpl *scope) {
       ASTScopeAssert(scope->checkSourceRangeOfThisASTNode(), "Bad range.");
-      return sourceMgr.isBeforeInBuffer(loc,
-                                        scope->getSourceRangeOfScope().End);
+      return !sourceMgr.isBeforeInBuffer(scope->getSourceRangeOfScope().End,
+                                         loc);
     }
   };
   auto *const *child = std::lower_bound(

Original file line number	Diff line number	Diff line change
`@@ -157,8 +157,8 @@ ASTScopeImpl::findChildContaining(SourceLoc loc,`
`157`	`157`	`}`
`158`	`158`	`bool operator()(SourceLoc loc, const ASTScopeImpl *scope) {`
`159`	`159`	`ASTScopeAssert(scope->checkSourceRangeOfThisASTNode(), "Bad range.");`
`160`		`- return sourceMgr.isBeforeInBuffer(loc,`
`161`		`- scope->getSourceRangeOfScope().End);`
	`160`	`+ return !sourceMgr.isBeforeInBuffer(scope->getSourceRangeOfScope().End,`
	`161`	`+ loc);`
`162`	`162`	`}`
`163`	`163`	`};`
`164`	`164`	`auto const child = std::lower_bound(`