diff options
author | Douglas Gregor <dgregor@apple.com> | 2011-09-15 19:48:59 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2011-09-15 19:48:59 +0000 |
commit | 7489889dd4e0fb5cd4b4176c59283da3b217f14e (patch) | |
tree | 46ebfcf4c31764072161088c16e4d1615a9a9b35 | |
parent | 531dcce3e5f5d5234520df7593e285d7dd007456 (diff) |
Eliminate the list of modules from the preprocessor options. This was
used back when we had an -import-module command-line option, but it's
no longer used (or useful).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@139829 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/clang/Frontend/PreprocessorOptions.h | 2 | ||||
-rw-r--r-- | lib/Frontend/FrontendAction.cpp | 24 |
2 files changed, 0 insertions, 26 deletions
diff --git a/include/clang/Frontend/PreprocessorOptions.h b/include/clang/Frontend/PreprocessorOptions.h index 4065ae6ff6..c95efec99f 100644 --- a/include/clang/Frontend/PreprocessorOptions.h +++ b/include/clang/Frontend/PreprocessorOptions.h @@ -41,7 +41,6 @@ class PreprocessorOptions { public: std::vector<std::pair<std::string, bool/*isUndef*/> > Macros; std::vector<std::string> Includes; - std::vector<std::string> Modules; std::vector<std::string> MacroIncludes; unsigned UsePredefines : 1; /// Initialize the preprocessor with the compiler @@ -196,7 +195,6 @@ public: void resetNonModularOptions() { Macros.clear(); Includes.clear(); - Modules.clear(); MacroIncludes.clear(); ChainedIncludes.clear(); DumpDeserializedPCHDecls = false; diff --git a/lib/Frontend/FrontendAction.cpp b/lib/Frontend/FrontendAction.cpp index b92f75ba43..1bbceddee5 100644 --- a/lib/Frontend/FrontendAction.cpp +++ b/lib/Frontend/FrontendAction.cpp @@ -240,30 +240,6 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI, DeserialListener); if (!CI.getASTContext().getExternalSource()) goto failure; - } else if (!CI.getPreprocessorOpts().Modules.empty()) { - // Use PCH. - assert(hasPCHSupport() && "This action does not have PCH support!"); - ASTDeserializationListener *DeserialListener = - Consumer->GetASTDeserializationListener(); - if (CI.getPreprocessorOpts().DumpDeserializedPCHDecls) - DeserialListener = new DeserializedDeclsDumper(DeserialListener); - if (!CI.getPreprocessorOpts().DeserializedPCHDeclsToErrorOn.empty()) - DeserialListener = new DeserializedDeclsChecker(CI.getASTContext(), - CI.getPreprocessorOpts().DeserializedPCHDeclsToErrorOn, - DeserialListener); - - CI.createPCHExternalASTSource(CI.getPreprocessorOpts().Modules[0], - true, true, DeserialListener); - - for (unsigned I = 1, E = CI.getPreprocessorOpts().Modules.size(); I != E; - ++I) { - - ASTReader *ModMgr = CI.getModuleManager(); - ModMgr->ReadAST(CI.getPreprocessorOpts().Modules[I], - serialization::MK_Module); - } - if (!CI.getASTContext().getExternalSource()) - goto failure; } CI.setASTConsumer(Consumer.take()); |