[Hexagon] Fix some Clang-tidy modernize-use-using and Include What You Use warnings; other minor fixes (NFC).
llvm-svn: 309469
diff --git a/llvm/lib/Target/Hexagon/HexagonGenMux.cpp b/llvm/lib/Target/Hexagon/HexagonGenMux.cpp
index 5abbcbb..dc1cdc8 100644
--- a/llvm/lib/Target/Hexagon/HexagonGenMux.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonGenMux.cpp
@@ -1,4 +1,4 @@
-//===--- HexagonGenMux.cpp ------------------------------------------------===//
+//===- HexagonGenMux.cpp --------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
@@ -26,6 +26,7 @@
#include "HexagonRegisterInfo.h"
#include "HexagonSubtarget.h"
#include "llvm/ADT/BitVector.h"
+#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/CodeGen/LivePhysRegs.h"
@@ -41,6 +42,7 @@
#include "llvm/Pass.h"
#include "llvm/Support/MathExtras.h"
#include <algorithm>
+#include <cassert>
#include <iterator>
#include <limits>
#include <utility>
@@ -109,9 +111,9 @@
Def2(&D2) {}
};
- typedef DenseMap<MachineInstr*,unsigned> InstrIndexMap;
- typedef DenseMap<unsigned,DefUseInfo> DefUseInfoMap;
- typedef SmallVector<MuxInfo,4> MuxInfoList;
+ using InstrIndexMap = DenseMap<MachineInstr *, unsigned>;
+ using DefUseInfoMap = DenseMap<unsigned, DefUseInfo>;
+ using MuxInfoList = SmallVector<MuxInfo, 4>;
bool isRegPair(unsigned Reg) const {
return Hexagon::DoubleRegsRegClass.contains(Reg);
@@ -129,10 +131,10 @@
bool genMuxInBlock(MachineBasicBlock &B);
};
- char HexagonGenMux::ID = 0;
-
} // end anonymous namespace
+char HexagonGenMux::ID = 0;
+
INITIALIZE_PASS(HexagonGenMux, "hexagon-gen-mux",
"Hexagon generate mux instructions", false, false)
@@ -220,7 +222,8 @@
DefUseInfoMap DUM;
buildMaps(B, I2X, DUM);
- typedef DenseMap<unsigned,CondsetInfo> CondsetMap;
+ using CondsetMap = DenseMap<unsigned, CondsetInfo>;
+
CondsetMap CM;
MuxInfoList ML;