Commit 8bef5cd4 authored by Duncan P. N. Exon Smith's avatar Duncan P. N. Exon Smith
Browse files

Modules: Rename MemoryBufferCache to InMemoryModuleCache 

Change MemoryBufferCache to InMemoryModuleCache, moving it from Basic to
Serialization.  Another patch will start using it to manage module build
more explicitly, but this is split out because it's mostly mechanical.

Because of the move to Serialization we can no longer abuse the
Preprocessor to forward it to the ASTReader.  Besides the rename and
file move, that means Preprocessor::Preprocessor has one fewer parameter
and ASTReader::ASTReader has one more.

llvm-svn: 355777
parent 506c1aba

clang/include/clang/Frontend/ASTUnit.h

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class FileManager; 
class FrontendAction;

class HeaderSearch;

class InputKind;

class MemoryBufferCache;

class InMemoryModuleCache;

class PCHContainerOperations;

class PCHContainerReader;

class Preprocessor;
@@ -107,7 +107,7 @@ private: 
  IntrusiveRefCntPtr<DiagnosticsEngine>   Diagnostics;

  IntrusiveRefCntPtr<FileManager>         FileMgr;

  IntrusiveRefCntPtr<SourceManager>       SourceMgr;

  IntrusiveRefCntPtr<MemoryBufferCache>   PCMCache;

  IntrusiveRefCntPtr<InMemoryModuleCache> ModuleCache;

  std::unique_ptr<HeaderSearch>           HeaderInfo;

  IntrusiveRefCntPtr<TargetInfo>          Target;

  std::shared_ptr<Preprocessor>           PP;

clang/include/clang/Frontend/CompilerInstance.h

+6 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ class ExternalASTSource; 
class FileEntry;

class FileManager;

class FrontendAction;

class MemoryBufferCache;

class InMemoryModuleCache;

class Module;

class Preprocessor;

class Sema;
@@ -92,7 +92,7 @@ class CompilerInstance : public ModuleLoader { 
  IntrusiveRefCntPtr<SourceManager> SourceMgr;



  /// The cache of PCM files.

  IntrusiveRefCntPtr<MemoryBufferCache> PCMCache;

  IntrusiveRefCntPtr<InMemoryModuleCache> ModuleCache;



  /// The preprocessor.

  std::shared_ptr<Preprocessor> PP;
@@ -192,7 +192,7 @@ public: 
  explicit CompilerInstance(

      std::shared_ptr<PCHContainerOperations> PCHContainerOps =

          std::make_shared<PCHContainerOperations>(),

      MemoryBufferCache *SharedPCMCache = nullptr);

      InMemoryModuleCache *SharedModuleCache = nullptr);

  ~CompilerInstance() override;



  /// @name High-Level Operations
@@ -671,7 +671,8 @@ public: 
  /// \return - The new object on success, or null on failure.

  static IntrusiveRefCntPtr<ASTReader> createPCHExternalASTSource(

      StringRef Path, StringRef Sysroot, bool DisablePCHValidation,

      bool AllowPCHWithCompilerErrors, Preprocessor &PP, ASTContext &Context,

      bool AllowPCHWithCompilerErrors, Preprocessor &PP,

      InMemoryModuleCache &ModuleCache, ASTContext &Context,

      const PCHContainerReader &PCHContainerRdr,

      ArrayRef<std::shared_ptr<ModuleFileExtension>> Extensions,

      DependencyFileGenerator *DependencyFile,
@@ -813,7 +814,7 @@ public: 


  void setExternalSemaSource(IntrusiveRefCntPtr<ExternalSemaSource> ESS);



  MemoryBufferCache &getPCMCache() const { return *PCMCache; }

  InMemoryModuleCache &getModuleCache() const { return *ModuleCache; }

};



} // end namespace clang

clang/include/clang/Lex/Preprocessor.h

+0 −4
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ class FileEntry; 
class FileManager;

class HeaderSearch;

class MacroArgs;

class MemoryBufferCache;

class PragmaHandler;

class PragmaNamespace;

class PreprocessingRecord;
@@ -132,7 +131,6 @@ class Preprocessor { 
  const TargetInfo *AuxTarget = nullptr;

  FileManager       &FileMgr;

  SourceManager     &SourceMgr;

  MemoryBufferCache &PCMCache;

  std::unique_ptr<ScratchBuffer> ScratchBuf;

  HeaderSearch      &HeaderInfo;

  ModuleLoader      &TheModuleLoader;
@@ -779,7 +777,6 @@ private: 
public:

  Preprocessor(std::shared_ptr<PreprocessorOptions> PPOpts,

               DiagnosticsEngine &diags, LangOptions &opts, SourceManager &SM,

               MemoryBufferCache &PCMCache,

               HeaderSearch &Headers, ModuleLoader &TheModuleLoader,

               IdentifierInfoLookup *IILookup = nullptr,

               bool OwnsHeaderSearch = false,
@@ -819,7 +816,6 @@ public: 
  const TargetInfo *getAuxTargetInfo() const { return AuxTarget; }

  FileManager &getFileManager() const { return FileMgr; }

  SourceManager &getSourceManager() const { return SourceMgr; }

  MemoryBufferCache &getPCMCache() const { return PCMCache; }

  HeaderSearch &getHeaderSearchInfo() const { return HeaderInfo; }



  IdentifierTable &getIdentifierTable() { return Identifiers; }

clang/include/clang/Serialization/ASTReader.h

+3 −6
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ class HeaderSearchOptions; 
class LangOptions;

class LazyASTUnresolvedSet;

class MacroInfo;

class MemoryBufferCache;

class InMemoryModuleCache;

class NamedDecl;

class NamespaceDecl;

class ObjCCategoryDecl;
@@ -440,9 +440,6 @@ private: 
  /// The module manager which manages modules and their dependencies

  ModuleManager ModuleMgr;



  /// The cache that manages memory buffers for PCM files.

  MemoryBufferCache &PCMCache;



  /// A dummy identifier resolver used to merge TU-scope declarations in

  /// C, for the cases where we don't have a Sema object to provide a real

  /// identifier resolver.
@@ -1481,8 +1478,8 @@ public: 
  ///

  /// \param ReadTimer If non-null, a timer used to track the time spent

  /// deserializing.

  ASTReader(Preprocessor &PP, ASTContext *Context,

            const PCHContainerReader &PCHContainerRdr,

  ASTReader(Preprocessor &PP, InMemoryModuleCache &ModuleCache,

            ASTContext *Context, const PCHContainerReader &PCHContainerRdr,

            ArrayRef<std::shared_ptr<ModuleFileExtension>> Extensions,

            StringRef isysroot = "", bool DisableValidation = false,

            bool AllowASTWithCompilerErrors = false,

clang/include/clang/Serialization/ASTWriter.h

+5 −4
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ class IdentifierResolver; 
class LangOptions;

class MacroDefinitionRecord;

class MacroInfo;

class MemoryBufferCache;

class Module;

class InMemoryModuleCache;

class ModuleFileExtension;

class ModuleFileExtensionWriter;

class NamedDecl;
@@ -132,7 +132,7 @@ private: 
  const SmallVectorImpl<char> &Buffer;



  /// The PCM manager which manages memory buffers for pcm files.

  MemoryBufferCache &PCMCache;

  InMemoryModuleCache &ModuleCache;



  /// The ASTContext we're writing.

  ASTContext *Context = nullptr;
@@ -542,7 +542,7 @@ public: 
  /// Create a new precompiled header writer that outputs to

  /// the given bitstream.

  ASTWriter(llvm::BitstreamWriter &Stream, SmallVectorImpl<char> &Buffer,

            MemoryBufferCache &PCMCache,

            InMemoryModuleCache &ModuleCache,

            ArrayRef<std::shared_ptr<ModuleFileExtension>> Extensions,

            bool IncludeTimestamps = true);

  ~ASTWriter() override;
@@ -981,7 +981,8 @@ protected: 
  SmallVectorImpl<char> &getPCH() const { return Buffer->Data; }



public:

  PCHGenerator(const Preprocessor &PP, StringRef OutputFile, StringRef isysroot,

  PCHGenerator(const Preprocessor &PP, InMemoryModuleCache &ModuleCache,

               StringRef OutputFile, StringRef isysroot,

               std::shared_ptr<PCHBuffer> Buffer,

               ArrayRef<std::shared_ptr<ModuleFileExtension>> Extensions,

               bool AllowASTWithErrors = false, bool IncludeTimestamps = true);