SerializeLoc: use decl_locs_block consistently. NFC

Author: nkcsgexi

lib/Serialization/ModuleFile.cpp

@@ -1293,13 +1293,13 @@ bool ModuleFile::readDeclLocsBlock(llvm::BitstreamCursor &cursor) {
       unsigned kind = cursor.readRecord(entry.ID, scratch, &blobData);
 
       switch (kind) {
-      case sourceinfo_block::BASIC_DECL_LOCS:
+      case decl_locs_block::BASIC_DECL_LOCS:
         BasicDeclLocsData = blobData;
         break;
-      case sourceinfo_block::TEXT_DATA:
+      case decl_locs_block::TEXT_DATA:
         SourceLocsTextData = blobData;
         break;
-      case sourceinfo_block::DECL_USRS:
+      case decl_locs_block::DECL_USRS:
         DeclUSRsTable = readDeclUSRsTable(scratch, blobData);
         break;
       default:

lib/Serialization/SerializeDoc.cpp

@@ -565,7 +565,7 @@ class DeclUSRsTableWriter {
     return None;
   }
   void emitUSRsRecord(llvm::BitstreamWriter &out) {
-    sourceinfo_block::DeclUSRSLayout USRsList(out);
+    decl_locs_block::DeclUSRSLayout USRsList(out);
     SmallVector<uint64_t, 8> scratch;
     llvm::SmallString<32> hashTableBlob;
     uint32_t tableOffset;
@@ -593,7 +593,7 @@ class StringWriter {
   }
 
   void emitSourceFilesRecord(llvm::BitstreamWriter &Out) {
-    sourceinfo_block::TextDataLayout TextBlob(Out);
+    decl_locs_block::TextDataLayout TextBlob(Out);
     SmallVector<uint64_t, 8> scratch;
     TextBlob.emit(scratch, Buffer);
   }
@@ -625,7 +625,7 @@ writer.write<uint32_t>(data.X.Column);
 #undef WRITE_LINE_COLUMN
   }
 
-  Optional<uint32_t> calculateUSRId(Decl *D) {
+  Optional<uint32_t> calculateNewUSRId(Decl *D) {
     llvm::SmallString<512> Buffer;
     llvm::raw_svector_ostream OS(Buffer);
     if (ide::printDeclUSR(D, OS))
@@ -698,10 +698,15 @@ Result.X.Column = Locs->X.Column;
       return false;
     if (!shouldSerializeSourceLoc(D))
       return true;
-    auto USR = calculateUSRId(D);
+    // If we cannot get loc data for D, don't proceed.
     auto LocData = getLocData(D);
-    if (!USR.hasValue() || !LocData.hasValue())
+    if (!LocData.hasValue())
       return true;
+    // If we have handled this USR before, don't proceed.
+    auto USR = calculateNewUSRId(D);
+    if (!USR.hasValue())
+      return true;
+    // OK, we get a new USR, now append the associated source location data.
     assert(*USR * sizeof(DeclLocationsTableData) == Buffer.size() &&
            "USR id is used as an index to access basic location array");
     appendToBuffer(*LocData);
@@ -713,7 +718,7 @@ static void emitBasicLocsRecord(llvm::BitstreamWriter &Out,
                                 ModuleOrSourceFile MSF, DeclUSRsTableWriter &USRWriter,
                                 StringWriter &FWriter) {
   assert(MSF);
-  const sourceinfo_block::BasicDeclLocsLayout DeclLocsList(Out);
+  const decl_locs_block::BasicDeclLocsLayout DeclLocsList(Out);
   BasicDeclLocsTableWriter Writer(USRWriter, FWriter);
   if (auto *SF = MSF.dyn_cast<SourceFile*>()) {
     SF->walk(Writer);
@@ -749,9 +754,9 @@ class SourceInfoSerializer : public SerializerBase {
     BLOCK_RECORD(control_block, TARGET);
 
     BLOCK(DECL_LOCS_BLOCK);
-    BLOCK_RECORD(sourceinfo_block, BASIC_DECL_LOCS);
-    BLOCK_RECORD(sourceinfo_block, DECL_USRS);
-    BLOCK_RECORD(sourceinfo_block, TEXT_DATA);
+    BLOCK_RECORD(decl_locs_block, BASIC_DECL_LOCS);
+    BLOCK_RECORD(decl_locs_block, DECL_USRS);
+    BLOCK_RECORD(decl_locs_block, TEXT_DATA);
 
 #undef BLOCK
 #undef BLOCK_RECORD

lib/Serialization/SourceInfoFormat.h

@@ -63,7 +63,7 @@ const uint32_t SWIFTSOURCEINFO_HASH_SEED = 5387;
 /// to make backwards-compatible changes using the LLVM bitcode format.
 ///
 /// \sa DECL_LOCS_BLOCK_ID
-namespace sourceinfo_block {
+namespace decl_locs_block {
   enum RecordKind {
     BASIC_DECL_LOCS = 1,
     DECL_USRS,