---

yaml
---
r: 348965
b: refs/heads/master
c: c9647bb
h: refs/heads/master
i:
  348963: 2419c2e

Author: nkcsgexi

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8293bdc9e97dfacae2d5cfed8b8e45f33306cbff
+refs/heads/master: c9647bb02ecb503cfa59e63fd262702786590fcc
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/RawComment.h

@@ -87,7 +87,6 @@ struct LineColumn {
 struct BasicDeclLocs {
   StringRef SourceFilePath;
   LineColumn Loc;
-  LineColumn NameLoc;
   LineColumn StartLoc;
   LineColumn EndLoc;
 };

trunk/lib/Serialization/ModuleFile.cpp

@@ -2387,8 +2387,8 @@ Optional<BasicDeclLocs> ModuleFile::getBasicDeclLocsForDecl(const Decl *D) const
   auto UsrId = *It;
   uint32_t NumSize = 4;
   // Size of BasicDeclLocs in the buffer.
-  // FilePathOffset + 4 * LineColumn
-  uint32_t LineColumnCount = 4;
+  // FilePathOffset + LocNum * LineColumn
+  uint32_t LineColumnCount = 3;
   uint32_t RecordSize = NumSize + NumSize * 2 * LineColumnCount;
   uint32_t RecordOffset = RecordSize * UsrId;
   assert(RecordOffset < BasicDeclLocsData.size());
@@ -2408,7 +2408,6 @@ Optional<BasicDeclLocs> ModuleFile::getBasicDeclLocsForDecl(const Decl *D) const
 Result.X.Line = ReadNext();                                                                       \
 Result.X.Column = ReadNext();
   READ_FIELD(Loc)
-  READ_FIELD(NameLoc)
   READ_FIELD(StartLoc)
   READ_FIELD(EndLoc)
 #undef READ_FIELD

trunk/lib/Serialization/SerializeDoc.cpp

@@ -513,7 +513,6 @@ namespace {
 struct DeclLocationsTableData {
   uint32_t SourceFileOffset;
   LineColumn Loc;
-  LineColumn NameLoc;
   LineColumn StartLoc;
   LineColumn EndLoc;
 };
@@ -621,7 +620,6 @@ struct BasicDeclLocsTableWriter : public ASTWalker {
 writer.write<uint32_t>(data.X.Line);                                                              \
 writer.write<uint32_t>(data.X.Column);
     WRITE_LINE_COLUMN(Loc)
-    WRITE_LINE_COLUMN(NameLoc);
     WRITE_LINE_COLUMN(StartLoc);
     WRITE_LINE_COLUMN(EndLoc);
 #undef WRITE_LINE_COLUMN
@@ -657,13 +655,6 @@ writer.write<uint32_t>(data.X.Column);
     llvm::sys::fs::make_absolute(SourceFilePath);
     Result.SourceFileOffset = FWriter.getTextOffset(SourceFilePath);
     Result.Loc = getLineColumn(SM, D->getLoc());
-    if (auto *VD = dyn_cast<ValueDecl>(D)) {
-      Result.NameLoc = getLineColumn(SM, VD->getNameLoc());
-    } else if(auto *OD = dyn_cast<OperatorDecl>(D)) {
-      Result.NameLoc = getLineColumn(SM, OD->getNameLoc());
-    } else if(auto *PD = dyn_cast<PrecedenceGroupDecl>(D)) {
-      Result.NameLoc = getLineColumn(SM, PD->getNameLoc());
-    }
     Result.StartLoc = getLineColumn(SM, D->getStartLoc());
     Result.EndLoc = getLineColumn(SM, D->getEndLoc());
     return Result;
@@ -685,7 +676,6 @@ writer.write<uint32_t>(data.X.Column);
 Result.X.Line = Locs->X.Line;                                                                     \
 Result.X.Column = Locs->X.Column;
       COPY_LINE_COLUMN(Loc)
-      COPY_LINE_COLUMN(NameLoc)
       COPY_LINE_COLUMN(StartLoc)
       COPY_LINE_COLUMN(EndLoc)
 #undef COPY_LINE_COLUMN