Merge pull request #61197 from bnbarham/skip-invalid-locations

[Index] Always skip invalid locations outside of modules

Author: bnbarham

include/swift/Index/IndexSymbol.h

@@ -65,7 +65,6 @@ struct IndexSymbol : IndexRelation {
   SmallVector<IndexRelation, 3> Relations;
   unsigned line = 0;
   unsigned column = 0;
-  Optional<unsigned> offset;
 
   IndexSymbol() = default;
 

lib/Index/Index.cpp

@@ -834,7 +834,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
       return true;
 
     IndexSymbol Info;
-    std::tie(Info.line, Info.column, Info.offset) = getLineColAndOffset(Loc);
+    std::tie(Info.line, Info.column) = getLineCol(Loc);
     Info.roles |= (unsigned)SymbolRole::Reference;
     Info.symInfo = getSymbolInfoForModule(Mod);
     getModuleNameAndUSR(Mod, Info.name, Info.USR);
@@ -949,13 +949,10 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
 
   bool indexComment(const Decl *D);
 
-  std::tuple<unsigned, unsigned, Optional<unsigned>>
-  getLineColAndOffset(SourceLoc Loc) {
+  std::pair<unsigned, unsigned> getLineCol(SourceLoc Loc) {
     if (Loc.isInvalid())
-      return std::make_tuple(0, 0, None);
-    auto lineAndColumn = SrcMgr.getLineAndColumnInBuffer(Loc, BufferID);
-    unsigned offset = SrcMgr.getLocOffsetInBuffer(Loc, BufferID);
-    return std::make_tuple(lineAndColumn.first, lineAndColumn.second, offset);
+      return std::make_pair(0, 0);
+    return SrcMgr.getLineAndColumnInBuffer(Loc, BufferID);
   }
 
   bool shouldIndex(ValueDecl *D, bool IsRef) const {
@@ -1604,8 +1601,13 @@ bool IndexSwiftASTWalker::reportImplicitConformance(ValueDecl *witness, ValueDec
 bool IndexSwiftASTWalker::initIndexSymbol(ValueDecl *D, SourceLoc Loc,
                                           bool IsRef, IndexSymbol &Info) {
   assert(D);
+
+  if (Loc.isInvalid() && !IsModuleFile)
+    return true;
+
   if (Loc.isValid() && SrcMgr.findBufferContainingLoc(Loc) != BufferID)
     return true;
+
   if (auto *VD = dyn_cast<VarDecl>(D)) {
     // Always base the symbol information on the canonical VarDecl
     D = VD->getCanonicalVarDecl();
@@ -1618,23 +1620,21 @@ bool IndexSwiftASTWalker::initIndexSymbol(ValueDecl *D, SourceLoc Loc,
 
   // Cannot be extension, which is not a ValueDecl.
 
+  if (getNameAndUSR(D, /*ExtD=*/nullptr, Info.name, Info.USR))
+    return true;
+  std::tie(Info.line, Info.column) = getLineCol(Loc);
+
   if (IsRef) {
     Info.roles |= (unsigned)SymbolRole::Reference;
     addContainedByRelationIfContained(Info);
   } else {
     Info.roles |= (unsigned)SymbolRole::Definition;
     if (D->isImplicit())
       Info.roles |= (unsigned)SymbolRole::Implicit;
-  }
-
-  if (getNameAndUSR(D, /*ExtD=*/nullptr, Info.name, Info.USR))
-    return true;
-
-  std::tie(Info.line, Info.column, Info.offset) = getLineColAndOffset(Loc);
-  if (!IsRef) {
     if (auto Group = D->getGroupName())
       Info.group = Group.getValue();
   }
+
   return false;
 }
 
@@ -1651,7 +1651,7 @@ bool IndexSwiftASTWalker::initIndexSymbol(ExtensionDecl *ExtD, ValueDecl *Extend
   if (getNameAndUSR(ExtendedD, ExtD, Info.name, Info.USR))
     return true;
 
-  std::tie(Info.line, Info.column, Info.offset) = getLineColAndOffset(Loc);
+  std::tie(Info.line, Info.column) = getLineCol(Loc);
   if (auto Group = ExtD->getGroupName())
     Info.group = Group.getValue();
   return false;
@@ -1786,7 +1786,7 @@ bool IndexSwiftASTWalker::indexComment(const Decl *D) {
       OS << "t:" << tagName;
       Info.USR = stringStorage.copyString(OS.str());
     }
-    std::tie(Info.line, Info.column, Info.offset) = getLineColAndOffset(loc);
+    std::tie(Info.line, Info.column) = getLineCol(loc);
     if (!IdxConsumer.startSourceEntity(Info) || !IdxConsumer.finishSourceEntity(Info.symInfo, Info.roles)) {
       Cancelled = true;
       break;