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 | 900d4bf80ad52674e7d779142ec5aadf637aafaf (patch) | |
tree | 4903d25071bc94b46584a104fd5adeaaee7e4ef4 | |
parent | 4cbe06e7f8ec8c953e856e1d2c060dfbe0a51298 (diff) | |
download | bcm5719-llvm-900d4bf80ad52674e7d779142ec5aadf637aafaf.tar.gz bcm5719-llvm-900d4bf80ad52674e7d779142ec5aadf637aafaf.zip |
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).
llvm-svn: 139829
-rw-r--r-- | clang/include/clang/Frontend/PreprocessorOptions.h | 2 | ||||
-rw-r--r-- | clang/lib/Frontend/FrontendAction.cpp | 24 |
2 files changed, 0 insertions, 26 deletions
diff --git a/clang/include/clang/Frontend/PreprocessorOptions.h b/clang/include/clang/Frontend/PreprocessorOptions.h index 4065ae6ff61..c95efec99fa 100644 --- a/clang/include/clang/Frontend/PreprocessorOptions.h +++ b/clang/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/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp index b92f75ba43e..1bbceddee5a 100644 --- a/clang/lib/Frontend/FrontendAction.cpp +++ b/clang/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()); |