Clean up the debug dump for a Module, so the local->global maps are

clearly called out, and add the missing local -> global selector map
output.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136903 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 19 insertions, 8 deletions

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 2606676b69..e6f63e911f 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -5621,26 +5621,37 @@ void Module::dump() {
   // Remapping tables.
   llvm::errs() << "  Base source location offset: " << SLocEntryBaseOffset 
                << '\n';
-  dumpLocalRemap("Source location offset map", SLocRemap);
+  dumpLocalRemap("Source location offset local -> global map", SLocRemap);
+  
   llvm::errs() << "  Base identifier ID: " << BaseIdentifierID << '\n'
                << "  Number of identifiers: " << LocalNumIdentifiers << '\n';
-  dumpLocalRemap("Identifier ID map", IdentifierRemap);
+  dumpLocalRemap("Identifier ID local -> global map", IdentifierRemap);
+  
+  llvm::errs() << "  Base selector ID: " << BaseSelectorID << '\n'
+               << "  Number of selectors: " << LocalNumSelectors << '\n';
+  dumpLocalRemap("Selector ID local -> global map", SelectorRemap);
+  
   llvm::errs() << "  Base preprocessed entity ID: " << BasePreprocessedEntityID
                << '\n'  
                << "Number of preprocessed entities: " 
                << NumPreallocatedPreprocessingEntities << '\n';
-  dumpLocalRemap("Preprocessed entity ID map", PreprocessedEntityRemap);
-  llvm::errs() << "  Base type index: " << BaseTypeIndex << '\n'
-               << "  Number of types: " << LocalNumTypes << '\n';
-  dumpLocalRemap("Type index map", TypeRemap);
+  dumpLocalRemap("Preprocessed entity ID local -> global map", 
+                 PreprocessedEntityRemap);
+  
   llvm::errs() << "  Base macro definition ID: " << BaseMacroDefinitionID 
                << '\n'
                << "  Number of macro definitions: " << LocalNumMacroDefinitions
                << '\n';
-  dumpLocalRemap("Macro definition ID map", MacroDefinitionRemap);
+  dumpLocalRemap("Macro definition ID local -> global map", 
+                 MacroDefinitionRemap);
+
+  llvm::errs() << "  Base type index: " << BaseTypeIndex << '\n'
+               << "  Number of types: " << LocalNumTypes << '\n';
+  dumpLocalRemap("Type index local -> global map", TypeRemap);
+    
   llvm::errs() << "  Base decl ID: " << BaseDeclID << '\n'
                << "  Number of decls: " << LocalNumDecls << '\n';
-  dumpLocalRemap("Decl ID map", DeclRemap);
+  dumpLocalRemap("Decl ID local -> global map", DeclRemap);
 }
 
 Module *ModuleManager::lookup(StringRef Name) {