Commit af450eab authored by Reid Kleckner's avatar Reid Kleckner
Browse files

Avoid including FileSystem.h from MemoryBuffer.h 

Lots of headers pass around MemoryBuffer objects, but very few open
them. Let those that do include FileSystem.h.

Saves ~250 includes of Chrono.h & FileSystem.h:

$ diff -u thedeps-before.txt thedeps-after.txt | grep '^[-+] ' | sort | uniq -c | sort -nr
    254 -    ../llvm/include/llvm/Support/FileSystem.h
    253 -    ../llvm/include/llvm/Support/Chrono.h
    237 -    ../llvm/include/llvm/Support/NativeFormatting.h
    237 -    ../llvm/include/llvm/Support/FormatProviders.h
    192 -    ../llvm/include/llvm/ADT/StringSwitch.h
    190 -    ../llvm/include/llvm/Support/FormatVariadicDetails.h
...

This requires duplicating the file_t typedef, which is unfortunate. I
sunk the choice of mapping mode down into the cpp file using variable
template specializations instead of class members in headers.
parent 798e6615

clang/lib/Frontend/SerializedDiagnosticPrinter.cpp

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "llvm/ADT/StringRef.h"

#include "llvm/Bitstream/BitCodes.h"

#include "llvm/Bitstream/BitstreamReader.h"

#include "llvm/Support/FileSystem.h"

#include "llvm/Support/raw_ostream.h"

#include <utility>

clang/lib/Lex/DependencyDirectivesSourceMinimizer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "clang/Basic/CharInfo.h"

#include "clang/Basic/Diagnostic.h"

#include "clang/Lex/LexDiagnostic.h"

#include "llvm/ADT/StringMap.h"

#include "llvm/ADT/StringSwitch.h"

#include "llvm/Support/MemoryBuffer.h"

clang/tools/libclang/CIndexer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "clang/Driver/Driver.h"

#include "llvm/ADT/STLExtras.h"

#include "llvm/ADT/SmallString.h"

#include "llvm/Support/FileSystem.h"

#include "llvm/Support/MD5.h"

#include "llvm/Support/Path.h"

#include "llvm/Support/Program.h"

clang/utils/TableGen/ClangDiagnosticsEmitter.cpp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "llvm/ADT/SmallString.h"

#include "llvm/ADT/SmallVector.h"

#include "llvm/ADT/StringMap.h"

#include "llvm/ADT/StringSwitch.h"

#include "llvm/ADT/Twine.h"

#include "llvm/Support/Casting.h"

#include "llvm/TableGen/Error.h"

clang/utils/TableGen/MveEmitter.cpp

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 


#include "llvm/ADT/APInt.h"

#include "llvm/ADT/StringRef.h"

#include "llvm/ADT/StringSwitch.h"

#include "llvm/Support/Casting.h"

#include "llvm/Support/raw_ostream.h"

#include "llvm/TableGen/Error.h"