[llvm] 1de43bd - Revert "PDBExtras.h - remove unnecessary raw_ostream forward declaration. NFCI."

[Raphael Isemann via llvm-commits]

Author: Raphael Isemann
Date: 2020-08-06T15:15:43+02:00
New Revision: 1de43bd6df74fb4cd8c25020afa1dd14ecf08527

URL: https://github.com/llvm/llvm-project/commit/1de43bd6df74fb4cd8c25020afa1dd14ecf08527
DIFF: https://github.com/llvm/llvm-project/commit/1de43bd6df74fb4cd8c25020afa1dd14ecf08527.diff

LOG: Revert "PDBExtras.h - remove unnecessary raw_ostream forward declaration. NFCI."

This reverts commit 87c5437afd273e909e0fed3389de7531d5452ea5.

The commit includes several headers in the middle of a function, which
breaks pretty much everything.

Added: 
    

Modified: 
    llvm/include/llvm/DebugInfo/PDB/PDBExtras.h
    llvm/lib/DebugInfo/PDB/PDBExtras.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/DebugInfo/PDB/PDBExtras.h b/llvm/include/llvm/DebugInfo/PDB/PDBExtras.h
index 802d18a069ee..97a92aa544ae 100644
--- a/llvm/include/llvm/DebugInfo/PDB/PDBExtras.h
+++ b/llvm/include/llvm/DebugInfo/PDB/PDBExtras.h
@@ -9,7 +9,6 @@
 #ifndef LLVM_DEBUGINFO_PDB_PDBEXTRAS_H
 #define LLVM_DEBUGINFO_PDB_PDBEXTRAS_H
 
-#include "llvm/ADT/StringRef.h"
 #include "llvm/DebugInfo/CodeView/CodeView.h"
 #include "llvm/DebugInfo/PDB/PDBTypes.h"
 #include "llvm/Support/raw_ostream.h"
@@ -18,6 +17,8 @@
 
 namespace llvm {
 
+class raw_ostream;
+
 namespace pdb {
 
 using TagStats = std::unordered_map<PDB_SymType, int>;
@@ -50,6 +51,7 @@ void dumpSymbolField(raw_ostream &OS, StringRef Name, T Value, int Indent) {
   OS << Name << ": " << Value;
 }
 
+
 } // end namespace pdb
 
 } // end namespace llvm

diff  --git a/llvm/lib/DebugInfo/PDB/PDBExtras.cpp b/llvm/lib/DebugInfo/PDB/PDBExtras.cpp
index 8057e861f331..354a99476c4b 100644
--- a/llvm/lib/DebugInfo/PDB/PDBExtras.cpp
+++ b/llvm/lib/DebugInfo/PDB/PDBExtras.cpp
@@ -7,6 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/DebugInfo/PDB/PDBExtras.h"
+#include "llvm/ADT/ArrayRef.h"
+#include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
 using namespace llvm::pdb;
@@ -138,10 +140,6 @@ raw_ostream &llvm::pdb::operator<<(raw_ostream &OS,
     OS << #name;                                                               \
     return OS;
 #include "llvm/DebugInfo/CodeView/CodeViewRegisters.def"
-#include "llvm/DebugInfo/CodeView/CodeView.h"             // for RegisterId, ThunkOrdinal, CPURegister, CPUType, CPUType::ARM64, ThunkOrdinal::BranchIsland, ThunkOrdinal::Pcode, ThunkOrdinal::Standard, ThunkOrdinal::ThisAdjustor, ThunkOrdinal::TrampIncremental, ThunkOrdinal::UnknownLoad, ThunkOrdinal::Vcall
-#include "llvm/DebugInfo/PDB/PDBTypes.h"                  // for PDB_SymType, PDB_CallingConv, PDB_VariantType, PDB_BuiltinType, PDB_Machine, PDB_Lang, Variant, PDB_LocType, Variant::(anonymous), PDB_DataKind, PDB_Checksum, PDB_SourceCompression, PDB_UdtType, PDB_MemberAccess, VersionInfo, PDB_VariantType::Bool, PDB_VariantType::Double, PDB_VariantType::Int16, PDB_VariantType::Int32, PDB_VariantType::Int64, PDB_VariantType::Int8, PDB_VariantType::Single, PDB_VariantType::UInt16, PDB_VariantType::UInt32, PDB_VariantType::UInt64, PDB_VariantType::UInt8, PDB_BuiltinType::BCD, PDB_BuiltinType::BSTR, PDB_BuiltinType::Bitfield, PDB_BuiltinType::Bool, PDB_BuiltinType::Char, PDB_BuiltinType::Char16, PDB_BuiltinType::Char32, PDB_BuiltinType::Complex, PDB_BuiltinType::Currency, PDB_BuiltinType::Date, PDB_BuiltinType::Float, PDB_BuiltinType::HResult, PDB_BuiltinType::Int, PDB_BuiltinType::Long, PDB_BuiltinType::None, PDB_BuiltinType::UInt, PDB_BuiltinType::ULong, PDB_BuiltinType::Variant, PDB_BuiltinType::Void, PDB_...
-#include "llvm/Support/raw_ostream.h"                     // for raw_ostream
-#include "stdint.h"                                       // for uint32_t
 #undef CV_REGISTER
 #undef CV_REGISTERS_X86