---

yaml
---
r: 343166
b: refs/heads/master-rebranch
c: 89f89ab
h: refs/heads/master

Author: mwyman

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 39e43d70d79c63e34bd8cd1cf328fef0c1c76547
+refs/heads/master-rebranch: 89f89ab3e06038653ea6d38da855ce975c93cf08
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/include/swift/Index/IndexSymbol.h

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

branches/master-rebranch/lib/Index/Index.cpp

@@ -474,8 +474,7 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
 
     IndexSymbol Info;
     std::tie(Info.line, Info.column) = getLineCol(Loc);
-    std::tie(Info.startOffset, Info.endOffset) =
-        getRangeStartAndEndOffset(Range);
+    Info.offset = getOffsetInBuffer(Loc);
     Info.roles |= (unsigned)SymbolRole::Reference;
     Info.symInfo = getSymbolInfoForModule(Mod);
     getModuleNameAndUSR(Mod, Info.name, Info.USR);
@@ -593,19 +592,10 @@ class IndexSwiftASTWalker : public SourceEntityWalker {
     return SrcMgr.getLineAndColumn(Loc, BufferID);
   }
 
-  std::pair<unsigned, unsigned> getRangeStartAndEndOffset(CharSourceRange Range) {
-    if (Range.isInvalid())
-      return std::make_pair(0, 0);
-    unsigned offset = SrcMgr.getLocOffsetInBuffer(Range.getStart(), BufferID);
-    unsigned length = SrcMgr.getByteDistance(Range.getStart(), Range.getEnd());
-    return std::make_pair(offset, offset + length);
-  }
-
-  std::pair<unsigned, unsigned> getLocStartAndEndOffset(SourceLoc Loc) {
+  unsigned getOffsetInBuffer(SourceLoc Loc) {
     if (Loc.isInvalid())
-      return std::make_pair(0, 0);
-    return getRangeStartAndEndOffset(
-        Lexer::getCharSourceRangeFromSourceRange(SrcMgr, SourceRange(Loc)));
+      return 0;
+    return SrcMgr.getLocOffsetInBuffer(Loc, BufferID);
   }
 
   bool shouldIndex(ValueDecl *D, bool IsRef) const {
@@ -1243,7 +1233,7 @@ bool IndexSwiftASTWalker::initIndexSymbol(ValueDecl *D, SourceLoc Loc,
     return true;
 
   std::tie(Info.line, Info.column) = getLineCol(Loc);
-  std::tie(Info.startOffset, Info.endOffset) = getLocStartAndEndOffset(Loc);
+  Info.offset = getOffsetInBuffer(Loc);
   if (!IsRef) {
     if (auto Group = D->getGroupName())
       Info.group = Group.getValue();
@@ -1265,7 +1255,7 @@ bool IndexSwiftASTWalker::initIndexSymbol(ExtensionDecl *ExtD, ValueDecl *Extend
     return true;
 
   std::tie(Info.line, Info.column) = getLineCol(Loc);
-  std::tie(Info.startOffset, Info.endOffset) = getLocStartAndEndOffset(Loc);
+  Info.offset = getOffsetInBuffer(Loc);
   if (auto Group = ExtD->getGroupName())
     Info.group = Group.getValue();
   return false;
@@ -1473,7 +1463,7 @@ bool IndexSwiftASTWalker::indexComment(const Decl *D) {
       Info.USR = stringStorage.copyString(OS.str());
     }
     std::tie(Info.line, Info.column) = getLineCol(loc);
-    std::tie(Info.startOffset, Info.endOffset) = getLocStartAndEndOffset(loc);
+    Info.offset = getOffsetInBuffer(loc);
     if (!IdxConsumer.startSourceEntity(Info) || !IdxConsumer.finishSourceEntity(Info.symInfo, Info.roles)) {
       Cancelled = true;
       break;