From 831c6313dfa36f297094cd593a9dd3cb60649362 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Sat, 27 Aug 2011 00:03:05 +0000 Subject: [PATCH] Remove the -import-module option. It's no longer useful git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138681 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/CC1Options.td | 3 --- include/clang/Frontend/FrontendOptions.h | 3 --- lib/Frontend/CompilerInvocation.cpp | 15 --------------- 3 files changed, 21 deletions(-) diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td index 258c725376..32de34c82f 100644 --- a/include/clang/Driver/CC1Options.td +++ b/include/clang/Driver/CC1Options.td @@ -404,9 +404,6 @@ def arcmt_migrate_report_output : Separate<"-arcmt-migrate-report-output">, def arcmt_migrate_emit_arc_errors : Flag<"-arcmt-migrate-emit-errors">, HelpText<"Emit ARC errors even if the migrator can fix them">; -def import_module : Separate<"-import-module">, - HelpText<"Import a module definition file">; - def working_directory : JoinedOrSeparate<"-working-directory">, HelpText<"Resolve file paths relative to the specified directory">; def working_directory_EQ : Joined<"-working-directory=">, diff --git a/include/clang/Frontend/FrontendOptions.h b/include/clang/Frontend/FrontendOptions.h index ec75b59c4e..4876ceb73f 100644 --- a/include/clang/Frontend/FrontendOptions.h +++ b/include/clang/Frontend/FrontendOptions.h @@ -119,9 +119,6 @@ public: /// \brief The list of AST files to merge. std::vector ASTMergeFiles; - /// \brief The list of modules to import. - std::vector Modules; - /// \brief A list of arguments to forward to LLVM's option processing; this /// should only be used for debugging and experimental features. std::vector LLVMArgs; diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 64b5e83207..426db56587 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -498,10 +498,6 @@ static void FrontendOptsToArgs(const FrontendOptions &Opts, Res.push_back("-ast-merge"); Res.push_back(Opts.ASTMergeFiles[i]); } - for (unsigned i = 0, e = Opts.Modules.size(); i != e; ++i) { - Res.push_back("-import-module"); - Res.push_back(Opts.Modules[i]); - } for (unsigned i = 0, e = Opts.LLVMArgs.size(); i != e; ++i) { Res.push_back("-mllvm"); Res.push_back(Opts.LLVMArgs[i]); @@ -776,10 +772,6 @@ static void PreprocessorOptsToArgs(const PreprocessorOptions &Opts, Res.push_back("-include"); Res.push_back(Opts.Includes[i]); } - for (unsigned i = 0, e = Opts.Modules.size(); i != e; ++i) { - Res.push_back("-import_module"); - Res.push_back(Opts.Modules[i]); - } for (unsigned i = 0, e = Opts.MacroIncludes.size(); i != e; ++i) { Res.push_back("-imacros"); Res.push_back(Opts.MacroIncludes[i]); @@ -1284,7 +1276,6 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args, Opts.ASTMergeFiles = Args.getAllArgValues(OPT_ast_merge); Opts.LLVMArgs = Args.getAllArgValues(OPT_mllvm); Opts.FixWhatYouCan = Args.hasArg(OPT_fix_what_you_can); - Opts.Modules = Args.getAllArgValues(OPT_import_module); Opts.ARCMTAction = FrontendOptions::ARCMT_None; if (const Arg *A = Args.getLastArg(OPT_arcmt_check, @@ -1815,12 +1806,6 @@ static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args, Opts.ChainedIncludes.push_back(A->getValue(Args)); } - for (arg_iterator it = Args.filtered_begin(OPT_import_module), - ie = Args.filtered_end(); it != ie; ++it) { - const Arg *A = *it; - Opts.Modules.push_back(A->getValue(Args)); - } - // Include 'altivec.h' if -faltivec option present if (Args.hasArg(OPT_faltivec)) Opts.Includes.push_back("altivec.h"); -- 2.40.0