<div dir="ltr">In the past the LLVM Project's generally avoided mass cleanup (even whitespace - which is a bit easier to workaround) due to the issues it has with version history and churn.<br><br>I believe I've mentioned/suggested this in the past - but this sort of cleanup is probably worth an llvm-dev discussion to figure out what the right path is for it in general. (in that conversation I'd point out that without tool integration to /maintain/ these invariants/stylistic rules, it's off less/little value to do the cleanup as it'll regress relatively quickly)<br><br>Please start an llvm-dev thread and get some kind of closure on the best strategy before continuing with these sort of changes.</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Feb 27, 2017 at 3:55 PM Eugene Zelenko via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: eugenezelenko<br class="gmail_msg">
Date: Mon Feb 27 17:43:14 2017<br class="gmail_msg">
New Revision: 296413<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=296413&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=296413&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
[DebugInfo] Fix some Clang-tidy modernize and Include What You Use warnings; other minor fixes (NFC).<br class="gmail_msg">
<br class="gmail_msg">
Modified:<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DIContext.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAttribute.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDie.h<br class="gmail_msg">
    llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFFormValue.h<br class="gmail_msg">
    llvm/trunk/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp<br class="gmail_msg">
    llvm/trunk/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp<br class="gmail_msg">
    llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp<br class="gmail_msg">
    llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp<br class="gmail_msg">
    llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp<br class="gmail_msg">
    llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp<br class="gmail_msg">
    llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLine.cpp<br class="gmail_msg">
    llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp<br class="gmail_msg">
    llvm/trunk/lib/DebugInfo/DWARF/DWARFFormValue.cpp<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DIContext.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DIContext.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DIContext.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DIContext.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DIContext.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DIContext.h ---------------------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DIContext.h ----------------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -32,16 +32,14 @@ class raw_ostream;<br class="gmail_msg">
 struct DILineInfo {<br class="gmail_msg">
   std::string FileName;<br class="gmail_msg">
   std::string FunctionName;<br class="gmail_msg">
-  uint32_t Line;<br class="gmail_msg">
-  uint32_t Column;<br class="gmail_msg">
-  uint32_t StartLine;<br class="gmail_msg">
+  uint32_t Line = 0;<br class="gmail_msg">
+  uint32_t Column = 0;<br class="gmail_msg">
+  uint32_t StartLine = 0;<br class="gmail_msg">
<br class="gmail_msg">
   // DWARF-specific.<br class="gmail_msg">
-  uint32_t Discriminator;<br class="gmail_msg">
+  uint32_t Discriminator = 0;<br class="gmail_msg">
<br class="gmail_msg">
-  DILineInfo()<br class="gmail_msg">
-      : FileName("<invalid>"), FunctionName("<invalid>"), Line(0), Column(0),<br class="gmail_msg">
-        StartLine(0), Discriminator(0) {}<br class="gmail_msg">
+  DILineInfo() : FileName("<invalid>"), FunctionName("<invalid>") {}<br class="gmail_msg">
<br class="gmail_msg">
   bool operator==(const DILineInfo &RHS) const {<br class="gmail_msg">
     return Line == RHS.Line && Column == RHS.Column &&<br class="gmail_msg">
@@ -90,10 +88,10 @@ public:<br class="gmail_msg">
 /// DIGlobal - container for description of a global variable.<br class="gmail_msg">
 struct DIGlobal {<br class="gmail_msg">
   std::string Name;<br class="gmail_msg">
-  uint64_t Start;<br class="gmail_msg">
-  uint64_t Size;<br class="gmail_msg">
+  uint64_t Start = 0;<br class="gmail_msg">
+  uint64_t Size = 0;<br class="gmail_msg">
<br class="gmail_msg">
-  DIGlobal() : Name("<invalid>"), Start(0), Size(0) {}<br class="gmail_msg">
+  DIGlobal() : Name("<invalid>") {}<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
 /// A DINameKind is passed to name search methods to specify a<br class="gmail_msg">
@@ -179,8 +177,8 @@ private:<br class="gmail_msg">
 /// on the fly.<br class="gmail_msg">
 class LoadedObjectInfo {<br class="gmail_msg">
 protected:<br class="gmail_msg">
-  LoadedObjectInfo(const LoadedObjectInfo &) = default;<br class="gmail_msg">
   LoadedObjectInfo() = default;<br class="gmail_msg">
+  LoadedObjectInfo(const LoadedObjectInfo &) = default;<br class="gmail_msg">
<br class="gmail_msg">
 public:<br class="gmail_msg">
   virtual ~LoadedObjectInfo() = default;<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFAbbreviationDeclaration.h --------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFAbbreviationDeclaration.h ---------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,17 +7,22 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFABBREVIATIONDECLARATION_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFABBREVIATIONDECLARATION_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFABBREVIATIONDECLARATION_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFABBREVIATIONDECLARATION_H<br class="gmail_msg">
<br class="gmail_msg">
+#include "llvm/ADT/iterator_range.h"<br class="gmail_msg">
 #include "llvm/ADT/Optional.h"<br class="gmail_msg">
 #include "llvm/ADT/SmallVector.h"<br class="gmail_msg">
 #include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
 #include "llvm/Support/Dwarf.h"<br class="gmail_msg">
+#include <cassert><br class="gmail_msg">
+#include <cstddef><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
+<br class="gmail_msg">
 namespace llvm {<br class="gmail_msg">
<br class="gmail_msg">
-class DWARFUnit;<br class="gmail_msg">
 class DWARFFormValue;<br class="gmail_msg">
+class DWARFUnit;<br class="gmail_msg">
 class raw_ostream;<br class="gmail_msg">
<br class="gmail_msg">
 class DWARFAbbreviationDeclaration {<br class="gmail_msg">
@@ -25,6 +30,7 @@ public:<br class="gmail_msg">
   struct AttributeSpec {<br class="gmail_msg">
     AttributeSpec(dwarf::Attribute A, dwarf::Form F, Optional<int64_t> V)<br class="gmail_msg">
         : Attr(A), Form(F), ByteSizeOrValue(V) {}<br class="gmail_msg">
+<br class="gmail_msg">
     dwarf::Attribute Attr;<br class="gmail_msg">
     dwarf::Form Form;<br class="gmail_msg">
     /// The following field is used for ByteSize for non-implicit_const<br class="gmail_msg">
@@ -41,9 +47,11 @@ public:<br class="gmail_msg">
     /// * Form == DW_FORM_implicit_const:<br class="gmail_msg">
     ///     ByteSizeOrValue contains value for the implicit_const attribute.<br class="gmail_msg">
     Optional<int64_t> ByteSizeOrValue;<br class="gmail_msg">
+<br class="gmail_msg">
     bool isImplicitConst() const {<br class="gmail_msg">
       return Form == dwarf::DW_FORM_implicit_const;<br class="gmail_msg">
     }<br class="gmail_msg">
+<br class="gmail_msg">
     /// Get the fixed byte size of this Form if possible. This function might<br class="gmail_msg">
     /// use the DWARFUnit to calculate the size of the Form, like for<br class="gmail_msg">
     /// DW_AT_address and DW_AT_ref_addr, so this isn't just an accessor for<br class="gmail_msg">
@@ -118,16 +126,16 @@ private:<br class="gmail_msg">
   /// abbreviation declaration.<br class="gmail_msg">
   struct FixedSizeInfo {<br class="gmail_msg">
     /// The fixed byte size for fixed size forms.<br class="gmail_msg">
-    uint16_t NumBytes;<br class="gmail_msg">
+    uint16_t NumBytes = 0;<br class="gmail_msg">
     /// Number of DW_FORM_address forms in this abbrevation declaration.<br class="gmail_msg">
-    uint8_t NumAddrs;<br class="gmail_msg">
+    uint8_t NumAddrs = 0;<br class="gmail_msg">
     /// Number of DW_FORM_ref_addr forms in this abbrevation declaration.<br class="gmail_msg">
-    uint8_t NumRefAddrs;<br class="gmail_msg">
+    uint8_t NumRefAddrs = 0;<br class="gmail_msg">
     /// Number of 4 byte in DWARF32 and 8 byte in DWARF64 forms.<br class="gmail_msg">
-    uint8_t NumDwarfOffsets;<br class="gmail_msg">
-    /// Constructor<br class="gmail_msg">
-    FixedSizeInfo()<br class="gmail_msg">
-        : NumBytes(0), NumAddrs(0), NumRefAddrs(0), NumDwarfOffsets(0) {}<br class="gmail_msg">
+    uint8_t NumDwarfOffsets = 0;<br class="gmail_msg">
+<br class="gmail_msg">
+    FixedSizeInfo() = default;<br class="gmail_msg">
+<br class="gmail_msg">
     /// Calculate the fixed size in bytes given a DWARFUnit.<br class="gmail_msg">
     ///<br class="gmail_msg">
     /// \param U the DWARFUnit to use when determing the byte size.<br class="gmail_msg">
@@ -147,6 +155,6 @@ private:<br class="gmail_msg">
   Optional<FixedSizeInfo> FixedAttributeSize;<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-}<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFABBREVIATIONDECLARATION_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===--- DWARFAcceleratorTable.h --------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFAcceleratorTable.h ----------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,19 +7,21 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFACCELERATORTABLE_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFACCELERATORTABLE_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFACCELERATORTABLE_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFACCELERATORTABLE_H<br class="gmail_msg">
<br class="gmail_msg">
 #include "llvm/ADT/SmallVector.h"<br class="gmail_msg">
-#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"<br class="gmail_msg">
+#include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
 #include "llvm/Support/Dwarf.h"<br class="gmail_msg">
 #include <cstdint><br class="gmail_msg">
+#include <utility><br class="gmail_msg">
<br class="gmail_msg">
 namespace llvm {<br class="gmail_msg">
<br class="gmail_msg">
-class DWARFAcceleratorTable {<br class="gmail_msg">
+class raw_ostream;<br class="gmail_msg">
<br class="gmail_msg">
+class DWARFAcceleratorTable {<br class="gmail_msg">
   struct Header {<br class="gmail_msg">
     uint32_t Magic;<br class="gmail_msg">
     uint16_t Version;<br class="gmail_msg">
@@ -41,6 +43,7 @@ class DWARFAcceleratorTable {<br class="gmail_msg">
   DataExtractor AccelSection;<br class="gmail_msg">
   DataExtractor StringSection;<br class="gmail_msg">
   const RelocAddrMap& Relocs;<br class="gmail_msg">
+<br class="gmail_msg">
 public:<br class="gmail_msg">
   DWARFAcceleratorTable(DataExtractor AccelSection, DataExtractor StringSection,<br class="gmail_msg">
                         const RelocAddrMap &Relocs)<br class="gmail_msg">
@@ -50,6 +53,6 @@ public:<br class="gmail_msg">
   void dump(raw_ostream &OS) const;<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-}<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFACCELERATORTABLE_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAttribute.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAttribute.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAttribute.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAttribute.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFAttribute.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFAttribute.h ----------------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFAttribute.h -----------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,11 +7,12 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFATTRIBUTE_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFATTRIBUTE_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFATTRIBUTE_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFATTRIBUTE_H<br class="gmail_msg">
<br class="gmail_msg">
-#include "llvm/Support/Dwarf.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"<br class="gmail_msg">
+#include "llvm/Support/Dwarf.h"<br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
<br class="gmail_msg">
 namespace llvm {<br class="gmail_msg">
<br class="gmail_msg">
@@ -23,17 +24,16 @@ namespace llvm {<br class="gmail_msg">
 /// attributes in a DWARFDie.<br class="gmail_msg">
 struct DWARFAttribute {<br class="gmail_msg">
   /// The debug info/types offset for this attribute.<br class="gmail_msg">
-  uint32_t Offset;<br class="gmail_msg">
+  uint32_t Offset = 0;<br class="gmail_msg">
   /// The debug info/types section byte size of the data for this attribute.<br class="gmail_msg">
-  uint32_t ByteSize;<br class="gmail_msg">
+  uint32_t ByteSize = 0;<br class="gmail_msg">
   /// The attribute enumeration of this attribute.<br class="gmail_msg">
   dwarf::Attribute Attr;<br class="gmail_msg">
   /// The form and value for this attribute.<br class="gmail_msg">
   DWARFFormValue Value;<br class="gmail_msg">
<br class="gmail_msg">
   DWARFAttribute(uint32_t O, dwarf::Attribute A = dwarf::Attribute(0),<br class="gmail_msg">
-                 dwarf::Form F = dwarf::Form(0)) :<br class="gmail_msg">
-      Offset(0), ByteSize(0), Attr(A), Value(F) {}<br class="gmail_msg">
+                 dwarf::Form F = dwarf::Form(0)) : Attr(A), Value(F) {}<br class="gmail_msg">
<br class="gmail_msg">
   bool isValid() const {<br class="gmail_msg">
     return Offset != 0 && Attr != dwarf::Attribute(0);<br class="gmail_msg">
@@ -51,6 +51,6 @@ struct DWARFAttribute {<br class="gmail_msg">
   }<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-}<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFATTRIBUTE_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFCompileUnit.h --------------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFCompileUnit.h ---------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,10 +7,11 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFCOMPILEUNIT_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFCOMPILEUNIT_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFCOMPILEUNIT_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFCOMPILEUNIT_H<br class="gmail_msg">
<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFUnit.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFUnitIndex.h"<br class="gmail_msg">
<br class="gmail_msg">
 namespace llvm {<br class="gmail_msg">
<br class="gmail_msg">
@@ -23,12 +24,15 @@ public:<br class="gmail_msg">
                    const DWARFUnitIndex::Entry *Entry)<br class="gmail_msg">
       : DWARFUnit(Context, Section, DA, RS, SS, SOS, AOS, LS, LE, IsDWO,<br class="gmail_msg">
                   UnitSection, Entry) {}<br class="gmail_msg">
-  void dump(raw_ostream &OS);<br class="gmail_msg">
-  static const DWARFSectionKind Section = DW_SECT_INFO;<br class="gmail_msg">
+<br class="gmail_msg">
   // VTable anchor.<br class="gmail_msg">
   ~DWARFCompileUnit() override;<br class="gmail_msg">
+<br class="gmail_msg">
+  void dump(raw_ostream &OS);<br class="gmail_msg">
+<br class="gmail_msg">
+  static const DWARFSectionKind Section = DW_SECT_INFO;<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-}<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFCOMPILEUNIT_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugAbbrev.h --------------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFDebugAbbrev.h ---------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,10 +7,12 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFDEBUGABBREV_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFDEBUGABBREV_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFDEBUGABBREV_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFDEBUGABBREV_H<br class="gmail_msg">
<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"<br class="gmail_msg">
+#include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
 #include <map><br class="gmail_msg">
 #include <vector><br class="gmail_msg">
<br class="gmail_msg">
@@ -76,6 +78,6 @@ private:<br class="gmail_msg">
   void clear();<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-}<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFDEBUGABBREV_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugArangeSet.h -----------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFDebugArangeSet.h ------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,11 +7,12 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFDEBUGARANGESET_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFDEBUGARANGESET_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFDEBUGARANGESET_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFDEBUGARANGESET_H<br class="gmail_msg">
<br class="gmail_msg">
 #include "llvm/ADT/iterator_range.h"<br class="gmail_msg">
 #include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
 #include <vector><br class="gmail_msg">
<br class="gmail_msg">
 namespace llvm {<br class="gmail_msg">
@@ -40,6 +41,7 @@ public:<br class="gmail_msg">
   struct Descriptor {<br class="gmail_msg">
     uint64_t Address;<br class="gmail_msg">
     uint64_t Length;<br class="gmail_msg">
+<br class="gmail_msg">
     uint64_t getEndAddress() const { return Address + Length; }<br class="gmail_msg">
   };<br class="gmail_msg">
<br class="gmail_msg">
@@ -53,6 +55,7 @@ private:<br class="gmail_msg">
<br class="gmail_msg">
 public:<br class="gmail_msg">
   DWARFDebugArangeSet() { clear(); }<br class="gmail_msg">
+<br class="gmail_msg">
   void clear();<br class="gmail_msg">
   bool extract(DataExtractor data, uint32_t *offset_ptr);<br class="gmail_msg">
   void dump(raw_ostream &OS) const;<br class="gmail_msg">
@@ -67,6 +70,6 @@ public:<br class="gmail_msg">
   }<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-}<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFDEBUGARANGESET_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugAranges.h -------------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFDebugAranges.h --------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,11 +7,12 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFDEBUGARANGES_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFDEBUGARANGES_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFDEBUGARANGES_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFDEBUGARANGES_H<br class="gmail_msg">
<br class="gmail_msg">
 #include "llvm/ADT/DenseSet.h"<br class="gmail_msg">
 #include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
 #include <vector><br class="gmail_msg">
<br class="gmail_msg">
 namespace llvm {<br class="gmail_msg">
@@ -42,6 +43,7 @@ private:<br class="gmail_msg">
       else<br class="gmail_msg">
         Length = HighPC - LowPC;<br class="gmail_msg">
     }<br class="gmail_msg">
+<br class="gmail_msg">
     uint64_t HighPC() const {<br class="gmail_msg">
       if (Length)<br class="gmail_msg">
         return LowPC + Length;<br class="gmail_msg">
@@ -51,6 +53,7 @@ private:<br class="gmail_msg">
     bool containsAddress(uint64_t Address) const {<br class="gmail_msg">
       return LowPC <= Address && Address < HighPC();<br class="gmail_msg">
     }<br class="gmail_msg">
+<br class="gmail_msg">
     bool operator<(const Range &other) const {<br class="gmail_msg">
       return LowPC < other.LowPC;<br class="gmail_msg">
     }<br class="gmail_msg">
@@ -73,7 +76,6 @@ private:<br class="gmail_msg">
     }<br class="gmail_msg">
   };<br class="gmail_msg">
<br class="gmail_msg">
-<br class="gmail_msg">
   typedef std::vector<Range>              RangeColl;<br class="gmail_msg">
   typedef RangeColl::const_iterator       RangeCollIterator;<br class="gmail_msg">
<br class="gmail_msg">
@@ -82,6 +84,6 @@ private:<br class="gmail_msg">
   DenseSet<uint32_t> ParsedCUOffsets;<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-}<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFDEBUGARANGES_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugInfoEntry.h -----------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFDebugInfoEntry.h ------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,43 +7,37 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFDEBUGINFOENTRY_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFDEBUGINFOENTRY_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFDEBUGINFOENTRY_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFDEBUGINFOENTRY_H<br class="gmail_msg">
<br class="gmail_msg">
-#include "llvm/ADT/SmallVector.h"<br class="gmail_msg">
-#include "llvm/DebugInfo/DIContext.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"<br class="gmail_msg">
-#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"<br class="gmail_msg">
-#include "llvm/Support/DataTypes.h"<br class="gmail_msg">
 #include "llvm/Support/Dwarf.h"<br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
<br class="gmail_msg">
 namespace llvm {<br class="gmail_msg">
<br class="gmail_msg">
-class DWARFDebugAranges;<br class="gmail_msg">
-class DWARFCompileUnit;<br class="gmail_msg">
+class DataExtractor;<br class="gmail_msg">
 class DWARFUnit;<br class="gmail_msg">
-class DWARFContext;<br class="gmail_msg">
-class DWARFFormValue;<br class="gmail_msg">
-struct DWARFDebugInfoEntryInlinedChain;<br class="gmail_msg">
<br class="gmail_msg">
 /// DWARFDebugInfoEntry - A DIE with only the minimum required data.<br class="gmail_msg">
 class DWARFDebugInfoEntry {<br class="gmail_msg">
   /// Offset within the .debug_info of the start of this entry.<br class="gmail_msg">
-  uint32_t Offset;<br class="gmail_msg">
+  uint32_t Offset = 0;<br class="gmail_msg">
<br class="gmail_msg">
   /// The integer depth of this DIE within the compile unit DIEs where the<br class="gmail_msg">
   /// compile/type unit DIE has a depth of zero.<br class="gmail_msg">
-  uint32_t Depth;<br class="gmail_msg">
+  uint32_t Depth = 0;<br class="gmail_msg">
+<br class="gmail_msg">
+  const DWARFAbbreviationDeclaration *AbbrevDecl = nullptr;<br class="gmail_msg">
<br class="gmail_msg">
-  const DWARFAbbreviationDeclaration *AbbrevDecl;<br class="gmail_msg">
 public:<br class="gmail_msg">
-  DWARFDebugInfoEntry()<br class="gmail_msg">
-    : Offset(0), Depth(0), AbbrevDecl(nullptr) {}<br class="gmail_msg">
+  DWARFDebugInfoEntry() = default;<br class="gmail_msg">
<br class="gmail_msg">
   /// Extracts a debug info entry, which is a child of a given unit,<br class="gmail_msg">
   /// starting at a given offset. If DIE can't be extracted, returns false and<br class="gmail_msg">
   /// doesn't change OffsetPtr.<br class="gmail_msg">
   bool extractFast(const DWARFUnit &U, uint32_t *OffsetPtr);<br class="gmail_msg">
+<br class="gmail_msg">
   /// High performance extraction should use this call.<br class="gmail_msg">
   bool extractFast(const DWARFUnit &U, uint32_t *OffsetPtr,<br class="gmail_msg">
                    const DataExtractor &DebugInfoData,<br class="gmail_msg">
@@ -52,15 +46,18 @@ public:<br class="gmail_msg">
<br class="gmail_msg">
   uint32_t getOffset() const { return Offset; }<br class="gmail_msg">
   uint32_t getDepth() const { return Depth; }<br class="gmail_msg">
+<br class="gmail_msg">
   dwarf::Tag getTag() const {<br class="gmail_msg">
     return AbbrevDecl ? AbbrevDecl->getTag() : dwarf::DW_TAG_null;<br class="gmail_msg">
   }<br class="gmail_msg">
+<br class="gmail_msg">
   bool hasChildren() const { return AbbrevDecl && AbbrevDecl->hasChildren(); }<br class="gmail_msg">
+<br class="gmail_msg">
   const DWARFAbbreviationDeclaration *getAbbreviationDeclarationPtr() const {<br class="gmail_msg">
     return AbbrevDecl;<br class="gmail_msg">
   }<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-}<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFDEBUGINFOENTRY_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugLine.h ----------------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFDebugLine.h -----------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,12 +7,13 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFDEBUGLINE_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFDEBUGLINE_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFDEBUGLINE_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFDEBUGLINE_H<br class="gmail_msg">
<br class="gmail_msg">
 #include "llvm/DebugInfo/DIContext.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"<br class="gmail_msg">
 #include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
 #include <map><br class="gmail_msg">
 #include <string><br class="gmail_msg">
 #include <vector><br class="gmail_msg">
@@ -24,13 +25,14 @@ class raw_ostream;<br class="gmail_msg">
 class DWARFDebugLine {<br class="gmail_msg">
 public:<br class="gmail_msg">
   DWARFDebugLine(const RelocAddrMap* LineInfoRelocMap) : RelocMap(LineInfoRelocMap) {}<br class="gmail_msg">
+<br class="gmail_msg">
   struct FileNameEntry {<br class="gmail_msg">
-    FileNameEntry() : Name(nullptr), DirIdx(0), ModTime(0), Length(0) {}<br class="gmail_msg">
+    FileNameEntry() = default;<br class="gmail_msg">
<br class="gmail_msg">
-    const char *Name;<br class="gmail_msg">
-    uint64_t DirIdx;<br class="gmail_msg">
-    uint64_t ModTime;<br class="gmail_msg">
-    uint64_t Length;<br class="gmail_msg">
+    const char *Name = nullptr;<br class="gmail_msg">
+    uint64_t DirIdx = 0;<br class="gmail_msg">
+    uint64_t ModTime = 0;<br class="gmail_msg">
+    uint64_t Length = 0;<br class="gmail_msg">
   };<br class="gmail_msg">
<br class="gmail_msg">
   struct Prologue {<br class="gmail_msg">
@@ -64,9 +66,11 @@ public:<br class="gmail_msg">
     std::vector<FileNameEntry> FileNames;<br class="gmail_msg">
<br class="gmail_msg">
     bool IsDWARF64;<br class="gmail_msg">
+<br class="gmail_msg">
     uint32_t sizeofTotalLength() const {<br class="gmail_msg">
       return IsDWARF64 ? 12 : 4;<br class="gmail_msg">
     }<br class="gmail_msg">
+<br class="gmail_msg">
     uint32_t sizeofPrologueLength() const {<br class="gmail_msg">
       return IsDWARF64 ? 8 : 4;<br class="gmail_msg">
     }<br class="gmail_msg">
@@ -76,10 +80,12 @@ public:<br class="gmail_msg">
       return PrologueLength + sizeofTotalLength() + sizeof(Version) +<br class="gmail_msg">
              sizeofPrologueLength();<br class="gmail_msg">
     }<br class="gmail_msg">
+<br class="gmail_msg">
     // Length of the line table data in bytes (not including the prologue).<br class="gmail_msg">
     uint32_t getStatementTableLength() const {<br class="gmail_msg">
       return TotalLength + sizeofTotalLength() - getLength();<br class="gmail_msg">
     }<br class="gmail_msg">
+<br class="gmail_msg">
     int32_t getMaxLineIncrementForSpecialOpcode() const {<br class="gmail_msg">
       return LineBase + (int8_t)LineRange - 1;<br class="gmail_msg">
     }<br class="gmail_msg">
@@ -146,6 +152,8 @@ public:<br class="gmail_msg">
   // compilation unit may consist of multiple sequences, which are not<br class="gmail_msg">
   // guaranteed to be in the order of ascending instruction address.<br class="gmail_msg">
   struct Sequence {<br class="gmail_msg">
+    Sequence();<br class="gmail_msg">
+<br class="gmail_msg">
     // Sequence describes instructions at address range [LowPC, HighPC)<br class="gmail_msg">
     // and is described by line table rows [FirstRowIndex, LastRowIndex).<br class="gmail_msg">
     uint64_t LowPC;<br class="gmail_msg">
@@ -154,15 +162,16 @@ public:<br class="gmail_msg">
     unsigned LastRowIndex;<br class="gmail_msg">
     bool Empty;<br class="gmail_msg">
<br class="gmail_msg">
-    Sequence();<br class="gmail_msg">
     void reset();<br class="gmail_msg">
<br class="gmail_msg">
     static bool orderByLowPC(const Sequence& LHS, const Sequence& RHS) {<br class="gmail_msg">
       return LHS.LowPC < RHS.LowPC;<br class="gmail_msg">
     }<br class="gmail_msg">
+<br class="gmail_msg">
     bool isValid() const {<br class="gmail_msg">
       return !Empty && (LowPC < HighPC) && (FirstRowIndex < LastRowIndex);<br class="gmail_msg">
     }<br class="gmail_msg">
+<br class="gmail_msg">
     bool containsPC(uint64_t pc) const {<br class="gmail_msg">
       return (LowPC <= pc && pc < HighPC);<br class="gmail_msg">
     }<br class="gmail_msg">
@@ -177,6 +186,7 @@ public:<br class="gmail_msg">
     void appendRow(const DWARFDebugLine::Row &R) {<br class="gmail_msg">
       Rows.push_back(R);<br class="gmail_msg">
     }<br class="gmail_msg">
+<br class="gmail_msg">
     void appendSequence(const DWARFDebugLine::Sequence &S) {<br class="gmail_msg">
       Sequences.push_back(S);<br class="gmail_msg">
     }<br class="gmail_msg">
@@ -249,6 +259,7 @@ private:<br class="gmail_msg">
   const RelocAddrMap *RelocMap;<br class="gmail_msg">
   LineTableMapTy LineTableMap;<br class="gmail_msg">
 };<br class="gmail_msg">
-}<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
+<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFDEBUGLINE_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDie.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDie.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDie.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDie.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFDie.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDie.h --------------------------------------------------------===//<br class="gmail_msg">
+//===- DWARFDie.h -----------------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,20 +7,25 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#ifndef LLVM_LIB_DEBUGINFO_DWARFDIE_H<br class="gmail_msg">
-#define LLVM_LIB_DEBUGINFO_DWARFDIE_H<br class="gmail_msg">
+#ifndef LLVM_DEBUGINFO_DWARFDIE_H<br class="gmail_msg">
+#define LLVM_DEBUGINFO_DWARFDIE_H<br class="gmail_msg">
<br class="gmail_msg">
 #include "llvm/ADT/ArrayRef.h"<br class="gmail_msg">
 #include "llvm/ADT/iterator.h"<br class="gmail_msg">
 #include "llvm/ADT/iterator_range.h"<br class="gmail_msg">
 #include "llvm/ADT/Optional.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DIContext.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFAttribute.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"<br class="gmail_msg">
+#include "llvm/Support/Dwarf.h"<br class="gmail_msg">
+#include <cassert><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
+#include <iterator><br class="gmail_msg">
<br class="gmail_msg">
 namespace llvm {<br class="gmail_msg">
<br class="gmail_msg">
 class DWARFUnit;<br class="gmail_msg">
-class DWARFDebugInfoEntry;<br class="gmail_msg">
 class raw_ostream;<br class="gmail_msg">
<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
@@ -36,10 +41,11 @@ class raw_ostream;<br class="gmail_msg">
 /// also simplifies the attribute extraction calls by not having to specify the<br class="gmail_msg">
 /// DWARFUnit for each call.<br class="gmail_msg">
 class DWARFDie {<br class="gmail_msg">
-  DWARFUnit *U;<br class="gmail_msg">
-  const DWARFDebugInfoEntry *Die;<br class="gmail_msg">
+  DWARFUnit *U = nullptr;<br class="gmail_msg">
+  const DWARFDebugInfoEntry *Die = nullptr;<br class="gmail_msg">
+<br class="gmail_msg">
 public:<br class="gmail_msg">
-  DWARFDie() : U(nullptr), Die(nullptr) {}<br class="gmail_msg">
+  DWARFDie() = default;<br class="gmail_msg">
   DWARFDie(DWARFUnit *Unit, const DWARFDebugInfoEntry * D) : U(Unit), Die(D) {}<br class="gmail_msg">
<br class="gmail_msg">
   bool isValid() const { return U && Die; }<br class="gmail_msg">
@@ -47,7 +53,6 @@ public:<br class="gmail_msg">
   const DWARFDebugInfoEntry *getDebugInfoEntry() const { return Die; }<br class="gmail_msg">
   DWARFUnit *getDwarfUnit() const { return U; }<br class="gmail_msg">
<br class="gmail_msg">
-<br class="gmail_msg">
   /// Get the abbreviation declaration for this DIE.<br class="gmail_msg">
   ///<br class="gmail_msg">
   /// \returns the abbreviation declaration or NULL for null tags.<br class="gmail_msg">
@@ -80,6 +85,7 @@ public:<br class="gmail_msg">
   bool isNULL() const {<br class="gmail_msg">
     return getAbbreviationDeclarationPtr() == nullptr;<br class="gmail_msg">
   }<br class="gmail_msg">
+<br class="gmail_msg">
   /// Returns true if DIE represents a subprogram (not inlined).<br class="gmail_msg">
   bool isSubprogramDIE() const;<br class="gmail_msg">
<br class="gmail_msg">
@@ -289,16 +295,17 @@ class DWARFDie::attribute_iterator :<br class="gmail_msg">
   /// error will be set if the Err member variable is non-NULL and the iterator<br class="gmail_msg">
   /// will be set to the end value so iteration stops.<br class="gmail_msg">
   void updateForIndex(const DWARFAbbreviationDeclaration &AbbrDecl, uint32_t I);<br class="gmail_msg">
+<br class="gmail_msg">
 public:<br class="gmail_msg">
   attribute_iterator() = delete;<br class="gmail_msg">
   explicit attribute_iterator(DWARFDie D, bool End);<br class="gmail_msg">
+<br class="gmail_msg">
   attribute_iterator &operator++();<br class="gmail_msg">
   explicit operator bool() const { return AttrValue.isValid(); }<br class="gmail_msg">
   const DWARFAttribute &operator*() const { return AttrValue; }<br class="gmail_msg">
   bool operator==(const attribute_iterator &X) const { return Index == X.Index; }<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
-<br class="gmail_msg">
 inline bool operator==(const DWARFDie &LHS, const DWARFDie &RHS) {<br class="gmail_msg">
   return LHS.getDebugInfoEntry() == RHS.getDebugInfoEntry() &&<br class="gmail_msg">
       LHS.getDwarfUnit() == RHS.getDwarfUnit();<br class="gmail_msg">
@@ -318,16 +325,19 @@ class DWARFDie::iterator : public iterat<br class="gmail_msg">
   }<br class="gmail_msg">
 public:<br class="gmail_msg">
   iterator() = default;<br class="gmail_msg">
+<br class="gmail_msg">
   explicit iterator(DWARFDie D) : Die(D) {<br class="gmail_msg">
     // If we start out with only a Null DIE then invalidate.<br class="gmail_msg">
     skipNull();<br class="gmail_msg">
   }<br class="gmail_msg">
+<br class="gmail_msg">
   iterator &operator++() {<br class="gmail_msg">
     Die = Die.getSibling();<br class="gmail_msg">
     // Don't include the NULL die when iterating.<br class="gmail_msg">
     skipNull();<br class="gmail_msg">
     return *this;<br class="gmail_msg">
   }<br class="gmail_msg">
+<br class="gmail_msg">
   explicit operator bool() const { return Die.isValid(); }<br class="gmail_msg">
   const DWARFDie &operator*() const { return Die; }<br class="gmail_msg">
   bool operator==(const iterator &X) const { return Die == X.Die; }<br class="gmail_msg">
@@ -349,4 +359,4 @@ inline iterator_range<DWARFDie::iterator<br class="gmail_msg">
<br class="gmail_msg">
 } // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif  // LLVM_LIB_DEBUGINFO_DWARFDIE_H<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFDIE_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFFormValue.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFFormValue.h?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFFormValue.h?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFFormValue.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/DebugInfo/DWARF/DWARFFormValue.h Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFFormValue.h ----------------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFFormValue.h -----------------------------------------*- C++ -*-===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -11,13 +11,14 @@<br class="gmail_msg">
 #define LLVM_DEBUGINFO_DWARFFORMVALUE_H<br class="gmail_msg">
<br class="gmail_msg">
 #include "llvm/ADT/ArrayRef.h"<br class="gmail_msg">
+#include "llvm/ADT/None.h"<br class="gmail_msg">
 #include "llvm/ADT/Optional.h"<br class="gmail_msg">
 #include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
 #include "llvm/Support/Dwarf.h"<br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
<br class="gmail_msg">
 namespace llvm {<br class="gmail_msg">
<br class="gmail_msg">
-template <typename T> class ArrayRef;<br class="gmail_msg">
 class DWARFUnit;<br class="gmail_msg">
 class raw_ostream;<br class="gmail_msg">
<br class="gmail_msg">
@@ -38,7 +39,7 @@ public:<br class="gmail_msg">
<br class="gmail_msg">
 private:<br class="gmail_msg">
   struct ValueType {<br class="gmail_msg">
-    ValueType() : data(nullptr) {<br class="gmail_msg">
+    ValueType() {<br class="gmail_msg">
       uval = 0;<br class="gmail_msg">
     }<br class="gmail_msg">
<br class="gmail_msg">
@@ -47,24 +48,27 @@ private:<br class="gmail_msg">
       int64_t sval;<br class="gmail_msg">
       const char* cstr;<br class="gmail_msg">
     };<br class="gmail_msg">
-    const uint8_t* data;<br class="gmail_msg">
+    const uint8_t* data = nullptr;<br class="gmail_msg">
   };<br class="gmail_msg">
<br class="gmail_msg">
   dwarf::Form Form; // Form for this value.<br class="gmail_msg">
   ValueType Value; // Contains all data for the form.<br class="gmail_msg">
-  const DWARFUnit *U; // Remember the DWARFUnit at extract time.<br class="gmail_msg">
+  const DWARFUnit *U = nullptr; // Remember the DWARFUnit at extract time.<br class="gmail_msg">
<br class="gmail_msg">
 public:<br class="gmail_msg">
-  DWARFFormValue(dwarf::Form F = dwarf::Form(0)) : Form(F), U(nullptr) {}<br class="gmail_msg">
+  DWARFFormValue(dwarf::Form F = dwarf::Form(0)) : Form(F) {}<br class="gmail_msg">
+<br class="gmail_msg">
   dwarf::Form getForm() const { return Form; }<br class="gmail_msg">
   void setForm(dwarf::Form F) { Form = F; }<br class="gmail_msg">
   void setUValue(uint64_t V) { Value.uval = V; }<br class="gmail_msg">
   void setSValue(int64_t V) { Value.sval = V; }<br class="gmail_msg">
   void setPValue(const char *V) { Value.cstr = V; }<br class="gmail_msg">
+<br class="gmail_msg">
   void setBlockValue(const ArrayRef<uint8_t> &Data) {<br class="gmail_msg">
     Value.data = Data.data();<br class="gmail_msg">
     setUValue(Data.size());<br class="gmail_msg">
   }<br class="gmail_msg">
+<br class="gmail_msg">
   bool isFormClass(FormClass FC) const;<br class="gmail_msg">
   const DWARFUnit *getUnit() const { return U; }<br class="gmail_msg">
   void dump(raw_ostream &OS) const;<br class="gmail_msg">
@@ -77,6 +81,7 @@ public:<br class="gmail_msg">
   /// \returns whether the extraction succeeded.<br class="gmail_msg">
   bool extractValue(const DataExtractor &Data, uint32_t *OffsetPtr,<br class="gmail_msg">
                     const DWARFUnit *U);<br class="gmail_msg">
+<br class="gmail_msg">
   bool isInlinedCStr() const {<br class="gmail_msg">
     return Value.data != nullptr && Value.data == (const uint8_t*)Value.cstr;<br class="gmail_msg">
   }<br class="gmail_msg">
@@ -92,6 +97,7 @@ public:<br class="gmail_msg">
   Optional<ArrayRef<uint8_t>> getAsBlock() const;<br class="gmail_msg">
   Optional<uint64_t> getAsCStringOffset() const;<br class="gmail_msg">
   Optional<uint64_t> getAsReferenceUVal() const;<br class="gmail_msg">
+<br class="gmail_msg">
   /// Get the fixed byte size for a given form.<br class="gmail_msg">
   ///<br class="gmail_msg">
   /// If the form always has a fixed valid byte size that doesn't depend on a<br class="gmail_msg">
@@ -110,6 +116,7 @@ public:<br class="gmail_msg">
   /// and was needed to calculate the byte size.<br class="gmail_msg">
   static Optional<uint8_t> getFixedByteSize(dwarf::Form Form,<br class="gmail_msg">
                                             const DWARFUnit *U = nullptr);<br class="gmail_msg">
+<br class="gmail_msg">
   /// Get the fixed byte size for a given form.<br class="gmail_msg">
   ///<br class="gmail_msg">
   /// If the form has a fixed byte size given a valid DWARF version and address<br class="gmail_msg">
@@ -138,6 +145,7 @@ public:<br class="gmail_msg">
   /// \returns true on success, false if the form was not skipped.<br class="gmail_msg">
   bool skipValue(DataExtractor debug_info_data, uint32_t *offset_ptr,<br class="gmail_msg">
                  const DWARFUnit *U) const;<br class="gmail_msg">
+<br class="gmail_msg">
   /// Skip a form in \p debug_info_data at offset specified by \p offset_ptr.<br class="gmail_msg">
   ///<br class="gmail_msg">
   /// Skips the bytes for this form in the debug info and updates the offset.<br class="gmail_msg">
@@ -150,6 +158,7 @@ public:<br class="gmail_msg">
   /// \returns true on success, false if the form was not skipped.<br class="gmail_msg">
   static bool skipValue(dwarf::Form form, DataExtractor debug_info_data,<br class="gmail_msg">
                         uint32_t *offset_ptr, const DWARFUnit *U);<br class="gmail_msg">
+<br class="gmail_msg">
   /// Skip a form in \p debug_info_data at offset specified by \p offset_ptr.<br class="gmail_msg">
   ///<br class="gmail_msg">
   /// Skips the bytes for this form in the debug info and updates the offset.<br class="gmail_msg">
@@ -170,6 +179,7 @@ private:<br class="gmail_msg">
 };<br class="gmail_msg">
<br class="gmail_msg">
 namespace dwarf {<br class="gmail_msg">
+<br class="gmail_msg">
   /// Take an optional DWARFFormValue and try to extract a string value from it.<br class="gmail_msg">
   ///<br class="gmail_msg">
   /// \param V and optional DWARFFormValue to attempt to extract the value from.<br class="gmail_msg">
@@ -316,6 +326,6 @@ namespace dwarf {<br class="gmail_msg">
<br class="gmail_msg">
 } // end namespace dwarf<br class="gmail_msg">
<br class="gmail_msg">
-}<br class="gmail_msg">
+} // end namespace llvm<br class="gmail_msg">
<br class="gmail_msg">
-#endif<br class="gmail_msg">
+#endif // LLVM_DEBUGINFO_DWARFFORMVALUE_H<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFAbbreviationDeclaration.cpp ----------------------------------===//<br class="gmail_msg">
+//===- DWARFAbbreviationDeclaration.cpp -----------------------------------===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,12 +7,18 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
+#include "llvm/ADT/None.h"<br class="gmail_msg">
+#include "llvm/ADT/Optional.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFUnit.h"<br class="gmail_msg">
+#include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
 #include "llvm/Support/Dwarf.h"<br class="gmail_msg">
 #include "llvm/Support/Format.h"<br class="gmail_msg">
 #include "llvm/Support/raw_ostream.h"<br class="gmail_msg">
+#include <cstddef><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
+<br class="gmail_msg">
 using namespace llvm;<br class="gmail_msg">
 using namespace dwarf;<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===--- DWARFAcceleratorTable.cpp ----------------------------------------===//<br class="gmail_msg">
+//===- DWARFAcceleratorTable.cpp ------------------------------------------===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,12 +7,19 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
+#include "llvm/ADT/SmallVector.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFFormValue.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"<br class="gmail_msg">
 #include "llvm/Support/Dwarf.h"<br class="gmail_msg">
+#include "llvm/Support/Compiler.h"<br class="gmail_msg">
 #include "llvm/Support/Format.h"<br class="gmail_msg">
 #include "llvm/Support/raw_ostream.h"<br class="gmail_msg">
+#include <cstddef><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
+#include <utility><br class="gmail_msg">
<br class="gmail_msg">
-namespace llvm {<br class="gmail_msg">
+using namespace llvm;<br class="gmail_msg">
<br class="gmail_msg">
 bool DWARFAcceleratorTable::extract() {<br class="gmail_msg">
   uint32_t Offset = 0;<br class="gmail_msg">
@@ -131,4 +138,3 @@ LLVM_DUMP_METHOD void DWARFAcceleratorTa<br class="gmail_msg">
     }<br class="gmail_msg">
   }<br class="gmail_msg">
 }<br class="gmail_msg">
-}<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugAbbrev.cpp ----------------------------------------------===//<br class="gmail_msg">
+//===- DWARFDebugAbbrev.cpp -----------------------------------------------===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -10,6 +10,10 @@<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h"<br class="gmail_msg">
 #include "llvm/Support/Format.h"<br class="gmail_msg">
 #include "llvm/Support/raw_ostream.h"<br class="gmail_msg">
+#include <algorithm><br class="gmail_msg">
+#include <cinttypes><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
+<br class="gmail_msg">
 using namespace llvm;<br class="gmail_msg">
<br class="gmail_msg">
 DWARFAbbreviationDeclarationSet::DWARFAbbreviationDeclarationSet() {<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugArangeSet.cpp Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugArangeSet.cpp -------------------------------------------===//<br class="gmail_msg">
+//===- DWARFDebugArangeSet.cpp --------------------------------------------===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -10,8 +10,11 @@<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h"<br class="gmail_msg">
 #include "llvm/Support/Format.h"<br class="gmail_msg">
 #include "llvm/Support/raw_ostream.h"<br class="gmail_msg">
-#include <algorithm><br class="gmail_msg">
 #include <cassert><br class="gmail_msg">
+#include <cinttypes><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
+#include <cstring><br class="gmail_msg">
+<br class="gmail_msg">
 using namespace llvm;<br class="gmail_msg">
<br class="gmail_msg">
 void DWARFDebugArangeSet::clear() {<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugAranges.cpp Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugAranges.cpp -----------------------------------*- C++ -*-===//<br class="gmail_msg">
+//===- DWARFDebugAranges.cpp ----------------------------------------------===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -11,11 +11,13 @@<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h"<br class="gmail_msg">
-#include "llvm/Support/Format.h"<br class="gmail_msg">
-#include "llvm/Support/raw_ostream.h"<br class="gmail_msg">
+#include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
 #include <algorithm><br class="gmail_msg">
 #include <cassert><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
 #include <set><br class="gmail_msg">
+#include <vector><br class="gmail_msg">
+<br class="gmail_msg">
 using namespace llvm;<br class="gmail_msg">
<br class="gmail_msg">
 void DWARFDebugAranges::extract(DataExtractor DebugArangesData) {<br class="gmail_msg">
@@ -81,7 +83,7 @@ void DWARFDebugAranges::construct() {<br class="gmail_msg">
   std::sort(Endpoints.begin(), Endpoints.end());<br class="gmail_msg">
   uint64_t PrevAddress = -1ULL;<br class="gmail_msg">
   for (const auto &E : Endpoints) {<br class="gmail_msg">
-    if (PrevAddress < E.Address && ValidCUs.size() > 0) {<br class="gmail_msg">
+    if (PrevAddress < E.Address && !ValidCUs.empty()) {<br class="gmail_msg">
       // If the address range between two endpoints is described by some<br class="gmail_msg">
       // CU, first try to extend the last range in Aranges. If we can't<br class="gmail_msg">
       // do it, start a new range.<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugInfoEntry.cpp Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugInfoEntry.cpp -------------------------------------------===//<br class="gmail_msg">
+//===- DWARFDebugInfoEntry.cpp --------------------------------------------===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,20 +7,17 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#include "SyntaxHighlighting.h"<br class="gmail_msg">
-#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"<br class="gmail_msg">
-#include "llvm/DebugInfo/DWARF/DWARFContext.h"<br class="gmail_msg">
+#include "llvm/ADT/Optional.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"<br class="gmail_msg">
-#include "llvm/Support/DataTypes.h"<br class="gmail_msg">
-#include "llvm/Support/Debug.h"<br class="gmail_msg">
-#include "llvm/Support/Dwarf.h"<br class="gmail_msg">
-#include "llvm/Support/Format.h"<br class="gmail_msg">
-#include "llvm/Support/raw_ostream.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFUnit.h"<br class="gmail_msg">
+#include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
+#include <cstddef><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
+<br class="gmail_msg">
 using namespace llvm;<br class="gmail_msg">
 using namespace dwarf;<br class="gmail_msg">
-using namespace syntax;<br class="gmail_msg">
<br class="gmail_msg">
 bool DWARFDebugInfoEntry::extractFast(const DWARFUnit &U,<br class="gmail_msg">
                                              uint32_t *OffsetPtr) {<br class="gmail_msg">
@@ -28,6 +25,7 @@ bool DWARFDebugInfoEntry::extractFast(co<br class="gmail_msg">
   const uint32_t UEndOffset = U.getNextUnitOffset();<br class="gmail_msg">
   return extractFast(U, OffsetPtr, DebugInfoData, UEndOffset, 0);<br class="gmail_msg">
 }<br class="gmail_msg">
+<br class="gmail_msg">
 bool DWARFDebugInfoEntry::extractFast(const DWARFUnit &U, uint32_t *OffsetPtr,<br class="gmail_msg">
                                       const DataExtractor &DebugInfoData,<br class="gmail_msg">
                                       uint32_t UEndOffset, uint32_t D) {<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLine.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLine.cpp?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLine.cpp?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLine.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDebugLine.cpp Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDebugLine.cpp ------------------------------------------------===//<br class="gmail_msg">
+//===- DWARFDebugLine.cpp -------------------------------------------------===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,14 +7,23 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
+#include "llvm/ADT/SmallString.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"<br class="gmail_msg">
 #include "llvm/Support/Dwarf.h"<br class="gmail_msg">
 #include "llvm/Support/Format.h"<br class="gmail_msg">
 #include "llvm/Support/Path.h"<br class="gmail_msg">
 #include "llvm/Support/raw_ostream.h"<br class="gmail_msg">
 #include <algorithm><br class="gmail_msg">
+#include <cassert><br class="gmail_msg">
+#include <cinttypes><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
+#include <cstdio><br class="gmail_msg">
+#include <utility><br class="gmail_msg">
+<br class="gmail_msg">
 using namespace llvm;<br class="gmail_msg">
 using namespace dwarf;<br class="gmail_msg">
+<br class="gmail_msg">
 typedef DILineInfoSpecifier::FileLineInfoKind FileLineInfoKind;<br class="gmail_msg">
<br class="gmail_msg">
 DWARFDebugLine::Prologue::Prologue() { clear(); }<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFDie.cpp Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFDie.cpp ------------------------------------------------------===//<br class="gmail_msg">
+//===- DWARFDie.cpp -------------------------------------------------------===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -7,25 +7,33 @@<br class="gmail_msg">
 //<br class="gmail_msg">
 //===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
-#include "llvm/DebugInfo/DWARF/DWARFDie.h"<br class="gmail_msg">
 #include "SyntaxHighlighting.h"<br class="gmail_msg">
-#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"<br class="gmail_msg">
+#include "llvm/ADT/None.h"<br class="gmail_msg">
+#include "llvm/ADT/Optional.h"<br class="gmail_msg">
+#include "llvm/ADT/StringRef.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"<br class="gmail_msg">
-#include "llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h"<br class="gmail_msg">
-#include "llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFDie.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"<br class="gmail_msg">
-#include "llvm/Support/DataTypes.h"<br class="gmail_msg">
-#include "llvm/Support/Debug.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFUnit.h"<br class="gmail_msg">
+#include "llvm/Support/DataExtractor.h"<br class="gmail_msg">
 #include "llvm/Support/Dwarf.h"<br class="gmail_msg">
 #include "llvm/Support/Format.h"<br class="gmail_msg">
+#include "llvm/Support/MathExtras.h"<br class="gmail_msg">
 #include "llvm/Support/raw_ostream.h"<br class="gmail_msg">
+#include <algorithm><br class="gmail_msg">
+#include <cassert><br class="gmail_msg">
+#include <cinttypes><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
+#include <string><br class="gmail_msg">
+#include <utility><br class="gmail_msg">
<br class="gmail_msg">
 using namespace llvm;<br class="gmail_msg">
 using namespace dwarf;<br class="gmail_msg">
 using namespace syntax;<br class="gmail_msg">
<br class="gmail_msg">
-namespace {<br class="gmail_msg">
- static void dumpApplePropertyAttribute(raw_ostream &OS, uint64_t Val) {<br class="gmail_msg">
+static void dumpApplePropertyAttribute(raw_ostream &OS, uint64_t Val) {<br class="gmail_msg">
   OS << " (";<br class="gmail_msg">
   do {<br class="gmail_msg">
     uint64_t Shift = countTrailingZeros(Val);<br class="gmail_msg">
@@ -122,8 +130,6 @@ static void dumpAttribute(raw_ostream &O<br class="gmail_msg">
   OS << ")\n";<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-} // end anonymous namespace<br class="gmail_msg">
-<br class="gmail_msg">
 bool DWARFDie::isSubprogramDIE() const {<br class="gmail_msg">
   return getTag() == DW_TAG_subprogram;<br class="gmail_msg">
 }<br class="gmail_msg">
@@ -356,7 +362,6 @@ void DWARFDie::dump(raw_ostream &OS, uns<br class="gmail_msg">
   }<br class="gmail_msg">
 }<br class="gmail_msg">
<br class="gmail_msg">
-<br class="gmail_msg">
 void DWARFDie::getInlinedChainForAddress(<br class="gmail_msg">
     const uint64_t Address, SmallVectorImpl<DWARFDie> &InlinedChain) const {<br class="gmail_msg">
   if (isNULL())<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/lib/DebugInfo/DWARF/DWARFFormValue.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFFormValue.cpp?rev=296413&r1=296412&r2=296413&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/DWARF/DWARFFormValue.cpp?rev=296413&r1=296412&r2=296413&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/lib/DebugInfo/DWARF/DWARFFormValue.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/lib/DebugInfo/DWARF/DWARFFormValue.cpp Mon Feb 27 17:43:14 2017<br class="gmail_msg">
@@ -1,4 +1,4 @@<br class="gmail_msg">
-//===-- DWARFFormValue.cpp ------------------------------------------------===//<br class="gmail_msg">
+//===- DWARFFormValue.cpp -------------------------------------------------===//<br class="gmail_msg">
 //<br class="gmail_msg">
 //                     The LLVM Compiler Infrastructure<br class="gmail_msg">
 //<br class="gmail_msg">
@@ -9,16 +9,21 @@<br class="gmail_msg">
<br class="gmail_msg">
 #include "SyntaxHighlighting.h"<br class="gmail_msg">
 #include "llvm/ADT/ArrayRef.h"<br class="gmail_msg">
+#include "llvm/ADT/None.h"<br class="gmail_msg">
+#include "llvm/ADT/Optional.h"<br class="gmail_msg">
 #include "llvm/ADT/StringRef.h"<br class="gmail_msg">
-#include "llvm/DebugInfo/DWARF/DWARFCompileUnit.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"<br class="gmail_msg">
 #include "llvm/DebugInfo/DWARF/DWARFFormValue.h"<br class="gmail_msg">
-#include "llvm/Support/Debug.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFRelocMap.h"<br class="gmail_msg">
+#include "llvm/DebugInfo/DWARF/DWARFUnit.h"<br class="gmail_msg">
 #include "llvm/Support/Dwarf.h"<br class="gmail_msg">
+#include "llvm/Support/ErrorHandling.h"<br class="gmail_msg">
 #include "llvm/Support/Format.h"<br class="gmail_msg">
 #include "llvm/Support/raw_ostream.h"<br class="gmail_msg">
-#include <cassert><br class="gmail_msg">
+#include <cinttypes><br class="gmail_msg">
+#include <cstdint><br class="gmail_msg">
 #include <limits><br class="gmail_msg">
+<br class="gmail_msg">
 using namespace llvm;<br class="gmail_msg">
 using namespace dwarf;<br class="gmail_msg">
 using namespace syntax;<br class="gmail_msg">
@@ -66,13 +71,16 @@ class FormSizeHelper {<br class="gmail_msg">
<br class="gmail_msg">
 public:<br class="gmail_msg">
   FormSizeHelper(uint16_t V, uint8_t A, llvm::dwarf::DwarfFormat F)<br class="gmail_msg">
-  : Version(V), AddrSize(A), Format(F) {}<br class="gmail_msg">
+      : Version(V), AddrSize(A), Format(F) {}<br class="gmail_msg">
+<br class="gmail_msg">
   uint8_t getAddressByteSize() const { return AddrSize; }<br class="gmail_msg">
+<br class="gmail_msg">
   uint8_t getRefAddrByteSize() const {<br class="gmail_msg">
     if (Version == 2)<br class="gmail_msg">
       return AddrSize;<br class="gmail_msg">
     return getDwarfOffsetByteSize();<br class="gmail_msg">
   }<br class="gmail_msg">
+<br class="gmail_msg">
   uint8_t getDwarfOffsetByteSize() const {<br class="gmail_msg">
     switch (Format) {<br class="gmail_msg">
       case dwarf::DwarfFormat::DWARF32:<br class="gmail_msg">
@@ -497,21 +505,18 @@ DWARFFormValue::dump(raw_ostream &OS) co<br class="gmail_msg">
<br class="gmail_msg">
   case DW_FORM_sdata:     OS << Value.sval; break;<br class="gmail_msg">
   case DW_FORM_udata:     OS << Value.uval; break;<br class="gmail_msg">
-  case DW_FORM_strp: {<br class="gmail_msg">
+  case DW_FORM_strp:<br class="gmail_msg">
     OS << format(" .debug_str[0x%8.8x] = ", (uint32_t)uvalue);<br class="gmail_msg">
     dumpString(OS);<br class="gmail_msg">
     break;<br class="gmail_msg">
-  }<br class="gmail_msg">
-  case DW_FORM_GNU_str_index: {<br class="gmail_msg">
+  case DW_FORM_GNU_str_index:<br class="gmail_msg">
     OS << format(" indexed (%8.8x) string = ", (uint32_t)uvalue);<br class="gmail_msg">
     dumpString(OS);<br class="gmail_msg">
     break;<br class="gmail_msg">
-  }<br class="gmail_msg">
-  case DW_FORM_GNU_strp_alt: {<br class="gmail_msg">
+  case DW_FORM_GNU_strp_alt:<br class="gmail_msg">
     OS << format("alt indirect string, offset: 0x%" PRIx64 "", uvalue);<br class="gmail_msg">
     dumpString(OS);<br class="gmail_msg">
     break;<br class="gmail_msg">
-  }<br class="gmail_msg">
   case DW_FORM_ref_addr:<br class="gmail_msg">
     OS << format("0x%016" PRIx64, uvalue);<br class="gmail_msg">
     break;<br class="gmail_msg">
@@ -676,4 +681,3 @@ Optional<uint64_t> DWARFFormValue::getAs<br class="gmail_msg">
     return None;<br class="gmail_msg">
   return Value.uval;<br class="gmail_msg">
 }<br class="gmail_msg">
-<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
llvm-commits mailing list<br class="gmail_msg">
<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
</blockquote></div>