Import LLVM 6.0.1 release including clang, lld and lldb.

"where is the kaboom?" deraadt@

1 files changed, 9 insertions, 8 deletions

diff --git a/gnu/llvm/lib/CodeGen/AsmPrinter/DwarfStringPool.h b/gnu/llvm/lib/CodeGen/AsmPrinter/DwarfStringPool.h
index 93a168485a5..1cac3b7c843 100644
--- a/gnu/llvm/lib/CodeGen/AsmPrinter/DwarfStringPool.h
+++ b/gnu/llvm/lib/CodeGen/AsmPrinter/DwarfStringPool.h
@@ -1,4 +1,4 @@
-//===-- llvm/CodeGen/DwarfStringPool.h - Dwarf Debug Framework -*- C++ -*--===//
+//===- llvm/CodeGen/DwarfStringPool.h - Dwarf Debug Framework ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,29 +11,28 @@
 #define LLVM_LIB_CODEGEN_ASMPRINTER_DWARFSTRINGPOOL_H
 
 #include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/CodeGen/DwarfStringPoolEntry.h"
 #include "llvm/Support/Allocator.h"
-#include <utility>
 
 namespace llvm {
 
 class AsmPrinter;
-class MCSymbol;
 class MCSection;
-class StringRef;
 
 // Collection of strings for this unit and assorted symbols.
 // A String->Symbol mapping of strings used by indirect
 // references.
 class DwarfStringPool {
-  typedef DwarfStringPoolEntry EntryTy;
+  using EntryTy = DwarfStringPoolEntry;
+
   StringMap<EntryTy, BumpPtrAllocator &> Pool;
   StringRef Prefix;
   unsigned NumBytes = 0;
   bool ShouldCreateSymbols;
 
 public:
-  typedef DwarfStringPoolEntryRef EntryRef;
+  using EntryRef = DwarfStringPoolEntryRef;
 
   DwarfStringPool(BumpPtrAllocator &A, AsmPrinter &Asm, StringRef Prefix);
 
@@ -45,5 +44,7 @@ public:
   /// Get a reference to an entry in the string pool.
   EntryRef getEntry(AsmPrinter &Asm, StringRef Str);
 };
-}
-#endif
+
+} // end namespace llvm
+
+#endif // LLVM_LIB_CODEGEN_ASMPRINTER_DWARFSTRINGPOOL_H