1 files changed, 13 insertions, 9 deletions
diff --git a/llvm/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.h b/llvm/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.h
index 16d2d7fd7e9..5d039f951b3 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DbgValueHistoryCalculator.h
@@ -1,4 +1,4 @@
-//===-- llvm/CodeGen/AsmPrinter/DbgValueHistoryCalculator.h ----*- C++ -*--===//
+//===- llvm/CodeGen/AsmPrinter/DbgValueHistoryCalculator.h ------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,10 +12,12 @@
 
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/SmallVector.h"
-#include "llvm/IR/DebugInfoMetadata.h"
+#include <utility>
 
 namespace llvm {
 
+class DILocalVariable;
+class DILocation;
 class MachineFunction;
 class MachineInstr;
 class TargetRegisterInfo;
@@ -29,11 +31,11 @@ class DbgValueHistoryMap {
   // instruction of the next instruction range, or until the end of the
   // function.
 public:
-  typedef std::pair<const MachineInstr *, const MachineInstr *> InstrRange;
-  typedef SmallVector<InstrRange, 4> InstrRanges;
-  typedef std::pair<const DILocalVariable *, const DILocation *>
-      InlinedVariable;
-  typedef MapVector<InlinedVariable, InstrRanges> InstrRangesMap;
+  using InstrRange = std::pair<const MachineInstr *, const MachineInstr *>;
+  using InstrRanges = SmallVector<InstrRange, 4>;
+  using InlinedVariable =
+      std::pair<const DILocalVariable *, const DILocation *>;
+  using InstrRangesMap = MapVector<InlinedVariable, InstrRanges>;
 
 private:
   InstrRangesMap VarInstrRanges;
@@ -41,6 +43,7 @@ private:
 public:
   void startInstrRange(InlinedVariable Var, const MachineInstr &MI);
   void endInstrRange(InlinedVariable Var, const MachineInstr &MI);
+
   // Returns register currently describing @Var. If @Var is currently
   // unaccessible or is not described by a register, returns 0.
   unsigned getRegisterForVar(InlinedVariable Var) const;
@@ -54,6 +57,7 @@ public:
 void calculateDbgValueHistory(const MachineFunction *MF,
                               const TargetRegisterInfo *TRI,
                               DbgValueHistoryMap &Result);
-}
 
-#endif
+} // end namespace llvm
+
+#endif // LLVM_LIB_CODEGEN_ASMPRINTER_DBGVALUEHISTORYCALCULATOR_H