[Bitcode] Fix some Clang-tidy modernize-use-using and Include What You Use warnings; other minor fixes (NFC).

llvm-svn: 312760

Author: EugeneZelenko

llvm/include/llvm/Bitcode/BitcodeReader.h

@@ -1,4 +1,4 @@
-//===-- llvm/Bitcode/BitcodeReader.h - Bitcode reader ----*- C++ -*-===//
+//===- llvm/Bitcode/BitcodeReader.h - Bitcode reader ------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,18 +14,23 @@
 #ifndef LLVM_BITCODE_BITCODEREADER_H
 #define LLVM_BITCODE_BITCODEREADER_H
 
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/StringRef.h"
 #include "llvm/Bitcode/BitCodes.h"
-#include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/ModuleSummaryIndex.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/ErrorOr.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include <cstdint>
 #include <memory>
-
+#include <string>
+#include <system_error>
+#include <vector>
 namespace llvm {
-  class LLVMContext;
-  class Module;
+
+class LLVMContext;
+class Module;
 
   // These functions are for converting Expected/Error values to
   // ErrorOr/std::error_code for compatibility with legacy clients. FIXME:
@@ -81,6 +86,7 @@ namespace llvm {
     StringRef getBuffer() const {
       return StringRef((const char *)Buffer.begin(), Buffer.size());
     }
+
     StringRef getStrtab() const { return Strtab; }
 
     StringRef getModuleIdentifier() const { return ModuleIdentifier; }
@@ -182,7 +188,6 @@ namespace llvm {
 
   /// isBitcodeWrapper - Return true if the given bytes are the magic bytes
   /// for an LLVM IR bitcode wrapper.
-  ///
   inline bool isBitcodeWrapper(const unsigned char *BufPtr,
                                const unsigned char *BufEnd) {
     // See if you can find the hidden message in the magic bytes :-).
@@ -196,7 +201,6 @@ namespace llvm {
 
   /// isRawBitcode - Return true if the given bytes are the magic bytes for
   /// raw LLVM IR bitcode (without a wrapper).
-  ///
   inline bool isRawBitcode(const unsigned char *BufPtr,
                            const unsigned char *BufEnd) {
     // These bytes sort of have a hidden message, but it's not in
@@ -210,7 +214,6 @@ namespace llvm {
 
   /// isBitcode - Return true if the given bytes are the magic bytes for
   /// LLVM IR bitcode, either with or without a wrapper.
-  ///
   inline bool isBitcode(const unsigned char *BufPtr,
                         const unsigned char *BufEnd) {
     return isBitcodeWrapper(BufPtr, BufEnd) ||
@@ -258,10 +261,12 @@ namespace llvm {
     return std::error_code(static_cast<int>(E), BitcodeErrorCategory());
   }
 
-} // End llvm namespace
+} // end namespace llvm
 
 namespace std {
+
 template <> struct is_error_code_enum<llvm::BitcodeError> : std::true_type {};
-}
 
-#endif
+} // end namespace std
+
+#endif // LLVM_BITCODE_BITCODEREADER_H

llvm/include/llvm/Bitcode/BitcodeWriter.h

@@ -1,4 +1,4 @@
-//===-- llvm/Bitcode/BitcodeWriter.h - Bitcode writers ----*- C++ -*-===//
+//===- llvm/Bitcode/BitcodeWriter.h - Bitcode writers -----------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,14 +14,20 @@
 #ifndef LLVM_BITCODE_BITCODEWRITER_H
 #define LLVM_BITCODE_BITCODEWRITER_H
 
+#include "llvm/ADT/StringRef.h"
 #include "llvm/IR/ModuleSummaryIndex.h"
 #include "llvm/MC/StringTableBuilder.h"
+#include "llvm/Support/Allocator.h"
+#include <map>
+#include <memory>
 #include <string>
+#include <vector>
 
 namespace llvm {
-  class BitstreamWriter;
-  class Module;
-  class raw_ostream;
+
+class BitstreamWriter;
+class Module;
+class raw_ostream;
 
   class BitcodeWriter {
     SmallVectorImpl<char> &Buffer;
@@ -39,7 +45,7 @@ namespace llvm {
 
     std::vector<Module *> Mods;
 
-   public:
+  public:
     /// Create a BitcodeWriter that writes to Buffer.
     BitcodeWriter(SmallVectorImpl<char> &Buffer);
 
@@ -145,6 +151,7 @@ namespace llvm {
   void WriteIndexToFile(const ModuleSummaryIndex &Index, raw_ostream &Out,
                         const std::map<std::string, GVSummaryMapTy>
                             *ModuleToSummariesForIndex = nullptr);
-} // End llvm namespace
 
-#endif
+} // end namespace llvm
+
+#endif // LLVM_BITCODE_BITCODEWRITER_H

llvm/include/llvm/Bitcode/BitstreamReader.h

@@ -43,7 +43,7 @@ class BitstreamBlockInfo {
     unsigned BlockID;
     std::vector<std::shared_ptr<BitCodeAbbrev>> Abbrevs;
     std::string Name;
-    std::vector<std::pair<unsigned, std::string> > RecordNames;
+    std::vector<std::pair<unsigned, std::string>> RecordNames;
   };
 
 private:
@@ -88,7 +88,7 @@ class SimpleBitstreamCursor {
   /// follow the word size of the host machine for efficiency. We use word_t in
   /// places that are aware of this to make it perfectly explicit what is going
   /// on.
-  typedef size_t word_t;
+  using word_t = size_t;
 
 private:
   word_t CurWord = 0;