Return Optional<> offset from getLineColAndOffset.

Author: mwyman

include/swift/Index/IndexSymbol.h

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

lib/Index/Index.cpp

@@ -585,9 +585,10 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
 
   bool indexComment(const Decl *D);
 
-  std::tuple<unsigned, unsigned, unsigned> getLineColAndOffset(SourceLoc Loc) {
+  std::tuple<unsigned, unsigned, Optional<unsigned>>
+  getLineColAndOffset(SourceLoc Loc) {
     if (Loc.isInvalid())
-      return std::make_tuple(0, 0, 0);
+      return std::make_tuple(0, 0, None);
     auto lineAndColumn = SrcMgr.getLineAndColumn(Loc, BufferID);
     unsigned offset = SrcMgr.getLocOffsetInBuffer(Loc, BufferID);
     return std::make_tuple(lineAndColumn.first, lineAndColumn.second, offset);