AST: Fix an assertion in UnqualifiedLookup to use CharSourceRanges

Author: slavapestov

lib/AST/UnqualifiedLookup.cpp

@@ -27,6 +27,7 @@
 #include "swift/Basic/STLExtras.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Basic/Statistic.h"
+#include "swift/Parse/Lexer.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/TinyPtrVector.h"
 #include "llvm/Support/Debug.h"
@@ -147,7 +148,7 @@ namespace {
 
 #pragma mark context-based lookup declarations
 
-    bool isOutsideBodyOfFunction(const AbstractFunctionDecl *const AFD) const;
+    bool isInsideBodyOfFunction(const AbstractFunctionDecl *const AFD) const;
 
     /// For diagnostic purposes, move aside the unavailables, and put
     /// them back as a last-ditch effort.
@@ -319,11 +320,11 @@ void UnqualifiedLookupFactory::lookUpTopLevelNamesInModuleScopeContext(
 
 #pragma mark context-based lookup definitions
 
-bool UnqualifiedLookupFactory::isOutsideBodyOfFunction(
+bool UnqualifiedLookupFactory::isInsideBodyOfFunction(
     const AbstractFunctionDecl *const AFD) const {
-  return !AFD->isImplicit() && Loc.isValid() &&
-         AFD->getBodySourceRange().isValid() &&
-         !SM.rangeContainsTokenLoc(AFD->getBodySourceRange(), Loc);
+  auto range = Lexer::getCharSourceRangeFromSourceRange(
+      SM, AFD->getBodySourceRange());
+  return range.contains(Loc);
 }
 
 void UnqualifiedLookupFactory::ResultFinderForTypeContext::findResults(
@@ -635,7 +636,7 @@ bool ASTScopeDeclConsumerForUnqualifiedLookup::lookInMembers(
     NominalTypeDecl *const nominal) {
   if (candidateSelfDC) {
     if (auto *afd = dyn_cast<AbstractFunctionDecl>(candidateSelfDC)) {
-      assert(!factory.isOutsideBodyOfFunction(afd) && "Should be inside");
+      assert(factory.isInsideBodyOfFunction(afd) && "Should be inside");
     }
   }