Group debugging info representation and serialization code.

Summary: Moved the classes related to representing and serializing DWARF entities into a single header, DebugData.h. (cherry picked from FBD3153279)
llvm · Apr 7, 2016 · ad344c4 · ad344c4
1 parent f6c8929
commit ad344c4
Show file tree

Hide file tree

Showing 20 changed files with 668 additions and 925 deletions.
diff --git a/bolt/AddressRangesDWARFObject.h b/bolt/AddressRangesDWARFObject.h
diff --git a/bolt/BasicBlockOffsetRanges.cpp b/bolt/BasicBlockOffsetRanges.cpp
diff --git a/bolt/BasicBlockOffsetRanges.h b/bolt/BasicBlockOffsetRanges.h
diff --git a/bolt/BinaryContext.h b/bolt/BinaryContext.h
@@ -14,8 +14,7 @@
 #ifndef LLVM_TOOLS_LLVM_BOLT_BINARY_CONTEXT_H
 #define LLVM_TOOLS_LLVM_BOLT_BINARY_CONTEXT_H
 
-#include "AddressRangesDWARFObject.h"
-#include "LocationList.h"
+#include "DebugData.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
@@ -75,14 +74,14 @@ class BinaryContext {
   /// Maps DWARF CUID to offset of stmt_list attribute in .debug_info.
   std::map<unsigned, uint32_t> LineTableOffsetCUMap;
 
+  /// List of DWARF location lists in .debug_loc.
+  std::vector<LocationList> LocationLists;
+
   /// List of DWARF entries in .debug_info that have address ranges to be
   /// updated. These include lexical blocks (DW_TAG_lexical_block) and concrete
   /// instances of inlined subroutines (DW_TAG_inlined_subroutine).
   std::vector<AddressRangesDWARFObject> AddressRangesObjects;
 
-  /// List of DWARF location lists in .debug_loc.
-  std::vector<LocationList> LocationLists;
-
   using DIECompileUnitVector =
     std::vector<std::pair<const DWARFDebugInfoEntryMinimal *,
                           const DWARFCompileUnit *>> ;

diff --git a/bolt/BinaryFunction.cpp b/bolt/BinaryFunction.cpp
@@ -13,7 +13,6 @@
 #include "BinaryBasicBlock.h"
 #include "BinaryFunction.h"
 #include "DataReader.h"
-#include "DebugLineTableRowRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
 #include "llvm/MC/MCAsmInfo.h"

diff --git a/bolt/BinaryFunction.h b/bolt/BinaryFunction.h
@@ -19,7 +19,7 @@
 
 #include "BinaryBasicBlock.h"
 #include "BinaryContext.h"
-#include "DebugRangesSectionsWriter.h"
+#include "DebugData.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/ilist.h"
 #include "llvm/MC/MCCodeEmitter.h"

diff --git a/bolt/BinaryPatcher.cpp b/bolt/BinaryPatcher.cpp