averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

SerializeLoc: remove NameLoc entry in the serialized format

Browse Source 
Having both Loc and NameLoc fields seems to be redundant.
This commit is contained in:
Xi Ge
2019-10-07 15:27:29 -07:00
parent 8293bdc9e9
commit c9647bb02e
3 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/swift/AST/RawComment.h
View File

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

5
lib/Serialization/ModuleFile.cpp
View File

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

10
lib/Serialization/SerializeDoc.cpp
View File

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