diff options
Diffstat (limited to 'lib/Driver/Driver.cpp')
| -rw-r--r-- | lib/Driver/Driver.cpp | 580 |
1 files changed, 283 insertions, 297 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 1b0b5615dfbc..b4693f2ac986 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -37,22 +37,34 @@ using namespace clang::driver; using namespace clang; +// Used to set values for "production" clang, for releases. +// #define USE_PRODUCTION_CLANG + Driver::Driver(const char *_Name, const char *_Dir, const char *_DefaultHostTriple, const char *_DefaultImageName, - Diagnostic &_Diags) - : Opts(new OptTable()), Diags(_Diags), + bool IsProduction, Diagnostic &_Diags) + : Opts(new OptTable()), Diags(_Diags), Name(_Name), Dir(_Dir), DefaultHostTriple(_DefaultHostTriple), DefaultImageName(_DefaultImageName), Host(0), CCCIsCXX(false), CCCEcho(false), CCCPrintBindings(false), - CCCGenericGCCName("gcc"), CCCUseClang(true), CCCUseClangCXX(false), - CCCUseClangCPP(true), CCCUsePCH(true), - SuppressMissingInputWarning(false) -{ - // Only use clang on i386 and x86_64 by default. - CCCClangArchs.insert("i386"); - CCCClangArchs.insert("x86_64"); + CCCGenericGCCName("gcc"), CCCUseClang(true), + CCCUseClangCXX(true), CCCUseClangCPP(true), CCCUsePCH(true), + SuppressMissingInputWarning(false) { + if (IsProduction) { + // In a "production" build, only use clang on architectures we expect to + // work, and don't use clang C++. + // + // During development its more convenient to always have the driver use + // clang, but we don't want users to be confused when things don't work, or + // to file bugs for things we don't support. + CCCClangArchs.insert(llvm::Triple::x86); + CCCClangArchs.insert(llvm::Triple::x86_64); + CCCClangArchs.insert(llvm::Triple::arm); + + CCCUseClangCXX = false; + } } Driver::~Driver() { @@ -60,20 +72,20 @@ Driver::~Driver() { delete Host; } -InputArgList *Driver::ParseArgStrings(const char **ArgBegin, +InputArgList *Driver::ParseArgStrings(const char **ArgBegin, const char **ArgEnd) { llvm::PrettyStackTraceString CrashInfo("Command line argument parsing"); InputArgList *Args = new InputArgList(ArgBegin, ArgEnd); - + // FIXME: Handle '@' args (or at least error on them). unsigned Index = 0, End = ArgEnd - ArgBegin; while (Index < End) { - // gcc's handling of empty arguments doesn't make - // sense, but this is not a common use case. :) + // gcc's handling of empty arguments doesn't make sense, but this is not a + // common use case. :) // - // We just ignore them here (note that other things may - // still take them as arguments). + // We just ignore them here (note that other things may still take them as + // arguments). if (Args->getArgString(Index)[0] == '\0') { ++Index; continue; @@ -105,28 +117,27 @@ InputArgList *Driver::ParseArgStrings(const char **ArgBegin, Compilation *Driver::BuildCompilation(int argc, const char **argv) { llvm::PrettyStackTraceString CrashInfo("Compilation construction"); - // FIXME: Handle environment options which effect driver behavior, - // somewhere (client?). GCC_EXEC_PREFIX, COMPILER_PATH, - // LIBRARY_PATH, LPATH, CC_PRINT_OPTIONS, QA_OVERRIDE_GCC3_OPTIONS. + // FIXME: Handle environment options which effect driver behavior, somewhere + // (client?). GCC_EXEC_PREFIX, COMPILER_PATH, LIBRARY_PATH, LPATH, + // CC_PRINT_OPTIONS. // FIXME: What are we going to do with -V and -b? - // FIXME: This stuff needs to go into the Compilation, not the - // driver. + // FIXME: This stuff needs to go into the Compilation, not the driver. bool CCCPrintOptions = false, CCCPrintActions = false; const char **Start = argv + 1, **End = argv + argc; const char *HostTriple = DefaultHostTriple.c_str(); - // Read -ccc args. + // Read -ccc args. // - // FIXME: We need to figure out where this behavior should - // live. Most of it should be outside in the client; the parts that - // aren't should have proper options, either by introducing new ones - // or by overloading gcc ones like -V or -b. + // FIXME: We need to figure out where this behavior should live. Most of it + // should be outside in the client; the parts that aren't should have proper + // options, either by introducing new ones or by overloading gcc ones like -V + // or -b. for (; Start != End && memcmp(*Start, "-ccc-", 5) == 0; ++Start) { const char *Opt = *Start + 5; - + if (!strcmp(Opt, "print-options")) { CCCPrintOptions = true; } else if (!strcmp(Opt, "print-phases")) { @@ -137,13 +148,15 @@ Compilation *Driver::BuildCompilation(int argc, const char **argv) { CCCIsCXX = true; } else if (!strcmp(Opt, "echo")) { CCCEcho = true; - + } else if (!strcmp(Opt, "gcc-name")) { assert(Start+1 < End && "FIXME: -ccc- argument handling."); CCCGenericGCCName = *++Start; } else if (!strcmp(Opt, "clang-cxx")) { CCCUseClangCXX = true; + } else if (!strcmp(Opt, "no-clang-cxx")) { + CCCUseClangCXX = false; } else if (!strcmp(Opt, "pch-is-pch")) { CCCUsePCH = true; } else if (!strcmp(Opt, "pch-is-pth")) { @@ -154,27 +167,35 @@ Compilation *Driver::BuildCompilation(int argc, const char **argv) { CCCUseClangCPP = false; } else if (!strcmp(Opt, "clang-archs")) { assert(Start+1 < End && "FIXME: -ccc- argument handling."); - const char *Cur = *++Start; - + llvm::StringRef Cur = *++Start; + CCCClangArchs.clear(); - for (;;) { - const char *Next = strchr(Cur, ','); + while (!Cur.empty()) { + std::pair<llvm::StringRef, llvm::StringRef> Split = Cur.split(','); - if (Next) { - if (Cur != Next) - CCCClangArchs.insert(std::string(Cur, Next)); - Cur = Next + 1; - } else { - if (*Cur != '\0') - CCCClangArchs.insert(std::string(Cur)); - break; + if (!Split.first.empty()) { + llvm::Triple::ArchType Arch = + llvm::Triple(Split.first, "", "").getArch(); + + if (Arch == llvm::Triple::UnknownArch) { + // FIXME: Error handling. + llvm::errs() << "invalid arch name: " << Split.first << "\n"; + exit(1); + } + + CCCClangArchs.insert(Arch); } - } + Cur = Split.second; + } } else if (!strcmp(Opt, "host-triple")) { assert(Start+1 < End && "FIXME: -ccc- argument handling."); HostTriple = *++Start; + } else if (!strcmp(Opt, "install-dir")) { + assert(Start+1 < End && "FIXME: -ccc- argument handling."); + Dir = *++Start; + } else { // FIXME: Error handling. llvm::errs() << "invalid option: " << *Start << "\n"; @@ -187,7 +208,7 @@ Compilation *Driver::BuildCompilation(int argc, const char **argv) { Host = GetHostInfo(HostTriple); // The compilation takes ownership of Args. - Compilation *C = new Compilation(*this, *Host->getToolChain(*Args), Args); + Compilation *C = new Compilation(*this, *Host->CreateToolChain(*Args), Args); // FIXME: This behavior shouldn't be here. if (CCCPrintOptions) { @@ -198,10 +219,10 @@ Compilation *Driver::BuildCompilation(int argc, const char **argv) { if (!HandleImmediateArgs(*C)) return C; - // Construct the list of abstract actions to perform for this - // compilation. We avoid passing a Compilation here simply to - // enforce the abstraction that pipelining is not host or toolchain - // dependent (other than the driver driver test). + // Construct the list of abstract actions to perform for this compilation. We + // avoid passing a Compilation here simply to enforce the abstraction that + // pipelining is not host or toolchain dependent (other than the driver driver + // test). if (Host->useDriverDriver()) BuildUniversalActions(C->getArgs(), C->getActions()); else @@ -230,7 +251,7 @@ int Driver::ExecuteCompilation(const Compilation &C) const { const Command *FailingCommand = 0; int Res = C.ExecuteJob(C.getJobs(), FailingCommand); - + // Remove temp files. C.CleanupFileList(C.getTempFiles()); @@ -254,10 +275,10 @@ int Driver::ExecuteCompilation(const Compilation &C) const { if (!IsFriendlyTool || Res != 1) { // FIXME: See FIXME above regarding result code interpretation. if (Res < 0) - Diag(clang::diag::err_drv_command_signalled) + Diag(clang::diag::err_drv_command_signalled) << Source.getClassName() << -Res; else - Diag(clang::diag::err_drv_command_failed) + Diag(clang::diag::err_drv_command_failed) << Source.getClassName() << Res; } } @@ -267,7 +288,7 @@ int Driver::ExecuteCompilation(const Compilation &C) const { void Driver::PrintOptions(const ArgList &Args) const { unsigned i = 0; - for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); + for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); it != ie; ++it, ++i) { Arg *A = *it; llvm::errs() << "Option " << i << " - " @@ -284,10 +305,10 @@ void Driver::PrintOptions(const ArgList &Args) const { static std::string getOptionHelpName(const OptTable &Opts, options::ID Id) { std::string Name = Opts.getOptionName(Id); - + // Add metavar, if used. switch (Opts.getOptionKind(Id)) { - case Option::GroupClass: case Option::InputClass: case Option::UnknownClass: + case Option::GroupClass: case Option::InputClass: case Option::UnknownClass: assert(0 && "Invalid option with help text."); case Option::MultiArgClass: case Option::JoinedAndSeparateClass: @@ -333,11 +354,13 @@ void Driver::PrintHelp(bool ShowHidden) const { OptionHelp.push_back(std::make_pair("-ccc-gcc-name", "Name for native GCC compiler")); OptionHelp.push_back(std::make_pair("-ccc-clang-cxx", - "Use the clang compiler for C++")); + "Enable the clang compiler for C++")); + OptionHelp.push_back(std::make_pair("-ccc-no-clang-cxx", + "Disable the clang compiler for C++")); OptionHelp.push_back(std::make_pair("-ccc-no-clang", - "Never use the clang compiler")); + "Disable the clang compiler")); OptionHelp.push_back(std::make_pair("-ccc-no-clang-cpp", - "Never use the clang preprocessor")); + "Disable the clang preprocessor")); OptionHelp.push_back(std::make_pair("-ccc-clang-archs", "Comma separate list of architectures " "to use the clang compiler for")); @@ -348,7 +371,9 @@ void Driver::PrintHelp(bool ShowHidden) const { OptionHelp.push_back(std::make_pair("\nDEBUG/DEVELOPMENT OPTIONS:","")); OptionHelp.push_back(std::make_pair("-ccc-host-triple", - "Simulate running on the given target")); + "Simulate running on the given target")); + OptionHelp.push_back(std::make_pair("-ccc-install-dir", + "Simulate installation in the given directory")); OptionHelp.push_back(std::make_pair("-ccc-print-options", "Dump parsed command line arguments")); OptionHelp.push_back(std::make_pair("-ccc-print-phases", @@ -360,15 +385,14 @@ void Driver::PrintHelp(bool ShowHidden) const { "arguments to prepend to the command line")); } - // Find the maximum option length. + // Find the maximum option length. unsigned OptionFieldWidth = 0; for (unsigned i = 0, e = OptionHelp.size(); i != e; ++i) { // Skip titles. if (!OptionHelp[i].second) continue; - // Limit the amount of padding we are willing to give up for - // alignment. + // Limit the amount of padding we are willing to give up for alignment. unsigned Length = OptionHelp[i].first.size(); if (Length <= 23) OptionFieldWidth = std::max(OptionFieldWidth, Length); @@ -385,60 +409,51 @@ void Driver::PrintHelp(bool ShowHidden) const { OS.flush(); } -void Driver::PrintVersion(const Compilation &C) const { - static char buf[] = "$URL: https://ed@llvm.org/svn/llvm-project/cfe/trunk/lib/Driver/Driver.cpp $"; - char *zap = strstr(buf, "/lib/Driver"); - if (zap) - *zap = 0; - zap = strstr(buf, "/clang/tools/clang"); - if (zap) - *zap = 0; - const char *vers = buf+6; - // FIXME: Add cmake support and remove #ifdef -#ifdef SVN_REVISION - const char *revision = SVN_REVISION; -#else - const char *revision = ""; +void Driver::PrintVersion(const Compilation &C, llvm::raw_ostream &OS) const { + // FIXME: The following handlers should use a callback mechanism, we don't + // know what the client would like to do. +#ifdef CLANG_VENDOR + OS << CLANG_VENDOR; #endif - // FIXME: The following handlers should use a callback mechanism, we - // don't know what the client would like to do. - - llvm::errs() << "clang version " CLANG_VERSION_STRING " (" - << vers << " " << revision << ")" << '\n'; + OS << "clang version " CLANG_VERSION_STRING " (" + << getClangSubversionPath(); + if (unsigned Revision = getClangSubversionRevision()) + OS << " " << Revision; + OS << ")" << '\n'; const ToolChain &TC = C.getDefaultToolChain(); - llvm::errs() << "Target: " << TC.getTripleString() << '\n'; + OS << "Target: " << TC.getTripleString() << '\n'; // Print the threading model. // // FIXME: Implement correctly. - llvm::errs() << "Thread model: " << "posix" << '\n'; + OS << "Thread model: " << "posix" << '\n'; } bool Driver::HandleImmediateArgs(const Compilation &C) { - // The order these options are handled in in gcc is all over the - // place, but we don't expect inconsistencies w.r.t. that to matter - // in practice. + // The order these options are handled in in gcc is all over the place, but we + // don't expect inconsistencies w.r.t. that to matter in practice. if (C.getArgs().hasArg(options::OPT_dumpversion)) { llvm::outs() << CLANG_VERSION_STRING "\n"; return false; } - if (C.getArgs().hasArg(options::OPT__help) || + if (C.getArgs().hasArg(options::OPT__help) || C.getArgs().hasArg(options::OPT__help_hidden)) { PrintHelp(C.getArgs().hasArg(options::OPT__help_hidden)); return false; } if (C.getArgs().hasArg(options::OPT__version)) { - PrintVersion(C); + // Follow gcc behavior and use stdout for --version and stderr for -v. + PrintVersion(C, llvm::outs()); return false; } - if (C.getArgs().hasArg(options::OPT_v) || + if (C.getArgs().hasArg(options::OPT_v) || C.getArgs().hasArg(options::OPT__HASH_HASH_HASH)) { - PrintVersion(C); + PrintVersion(C, llvm::errs()); SuppressMissingInputWarning = true; } @@ -453,7 +468,7 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { } llvm::outs() << "\n"; llvm::outs() << "libraries: ="; - for (ToolChain::path_list::const_iterator it = TC.getFilePaths().begin(), + for (ToolChain::path_list::const_iterator it = TC.getFilePaths().begin(), ie = TC.getFilePaths().end(); it != ie; ++it) { if (it != TC.getFilePaths().begin()) llvm::outs() << ':'; @@ -463,22 +478,20 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { return false; } - // FIXME: The following handlers should use a callback mechanism, we - // don't know what the client would like to do. + // FIXME: The following handlers should use a callback mechanism, we don't + // know what the client would like to do. if (Arg *A = C.getArgs().getLastArg(options::OPT_print_file_name_EQ)) { - llvm::outs() << GetFilePath(A->getValue(C.getArgs()), TC).toString() - << "\n"; + llvm::outs() << GetFilePath(A->getValue(C.getArgs()), TC) << "\n"; return false; } if (Arg *A = C.getArgs().getLastArg(options::OPT_print_prog_name_EQ)) { - llvm::outs() << GetProgramPath(A->getValue(C.getArgs()), TC).toString() - << "\n"; + llvm::outs() << GetProgramPath(A->getValue(C.getArgs()), TC) << "\n"; return false; } if (C.getArgs().hasArg(options::OPT_print_libgcc_file_name)) { - llvm::outs() << GetFilePath("libgcc.a", TC).toString() << "\n"; + llvm::outs() << GetFilePath("libgcc.a", TC) << "\n"; return false; } @@ -489,7 +502,7 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { switch (C.getDefaultToolChain().getTriple().getArch()) { default: break; - + case llvm::Triple::x86_64: llvm::outs() << "x86_64;@m64" << "\n"; break; @@ -511,7 +524,7 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { case llvm::Triple::ppc: llvm::outs() << "." << "\n"; break; - + case llvm::Triple::x86_64: llvm::outs() << "x86_64" << "\n"; break; @@ -526,20 +539,19 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { return true; } -static unsigned PrintActions1(const Compilation &C, - Action *A, +static unsigned PrintActions1(const Compilation &C, Action *A, std::map<Action*, unsigned> &Ids) { if (Ids.count(A)) return Ids[A]; - + std::string str; llvm::raw_string_ostream os(str); - + os << Action::getClassName(A->getKind()) << ", "; - if (InputAction *IA = dyn_cast<InputAction>(A)) { + if (InputAction *IA = dyn_cast<InputAction>(A)) { os << "\"" << IA->getInputArg().getValue(C.getArgs()) << "\""; } else if (BindArchAction *BIA = dyn_cast<BindArchAction>(A)) { - os << '"' << (BIA->getArchName() ? BIA->getArchName() : + os << '"' << (BIA->getArchName() ? BIA->getArchName() : C.getDefaultToolChain().getArchName()) << '"' << ", {" << PrintActions1(C, *BIA->begin(), Ids) << "}"; } else { @@ -555,7 +567,7 @@ static unsigned PrintActions1(const Compilation &C, unsigned Id = Ids.size(); Ids[A] = Id; - llvm::errs() << Id << ": " << os.str() << ", " + llvm::errs() << Id << ": " << os.str() << ", " << types::getTypeName(A->getType()) << "\n"; return Id; @@ -563,65 +575,66 @@ static unsigned PrintActions1(const Compilation &C, void Driver::PrintActions(const Compilation &C) const { std::map<Action*, unsigned> Ids; - for (ActionList::const_iterator it = C.getActions().begin(), + for (ActionList::const_iterator it = C.getActions().begin(), ie = C.getActions().end(); it != ie; ++it) PrintActions1(C, *it, Ids); } -void Driver::BuildUniversalActions(const ArgList &Args, +void Driver::BuildUniversalActions(const ArgList &Args, ActionList &Actions) const { - llvm::PrettyStackTraceString CrashInfo("Building actions for universal build"); - // Collect the list of architectures. Duplicates are allowed, but - // should only be handled once (in the order seen). + llvm::PrettyStackTraceString CrashInfo("Building universal build actions"); + // Collect the list of architectures. Duplicates are allowed, but should only + // be handled once (in the order seen). llvm::StringSet<> ArchNames; llvm::SmallVector<const char *, 4> Archs; - for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); + for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); it != ie; ++it) { Arg *A = *it; if (A->getOption().getId() == options::OPT_arch) { - const char *Name = A->getValue(Args); - - // FIXME: We need to handle canonicalization of the specified - // arch? + // Validate the option here; we don't save the type here because its + // particular spelling may participate in other driver choices. + llvm::Triple::ArchType Arch = + llvm::Triple::getArchTypeForDarwinArchName(A->getValue(Args)); + if (Arch == llvm::Triple::UnknownArch) { + Diag(clang::diag::err_drv_invalid_arch_name) + << A->getAsString(Args); + continue; + } A->claim(); - if (ArchNames.insert(Name)) - Archs.push_back(Name); + if (ArchNames.insert(A->getValue(Args))) + Archs.push_back(A->getValue(Args)); } } - // When there is no explicit arch for this platform, make sure we - // still bind the architecture (to the default) so that -Xarch_ is - // handled correctly. + // When there is no explicit arch for this platform, make sure we still bind + // the architecture (to the default) so that -Xarch_ is handled correctly. if (!Archs.size()) Archs.push_back(0); - // FIXME: We killed off some others but these aren't yet detected in - // a functional manner. If we added information to jobs about which - // "auxiliary" files they wrote then we could detect the conflict - // these cause downstream. + // FIXME: We killed off some others but these aren't yet detected in a + // functional manner. If we added information to jobs about which "auxiliary" + // files they wrote then we could detect the conflict these cause downstream. if (Archs.size() > 1) { // No recovery needed, the point of this is just to prevent // overwriting the same files. if (const Arg *A = Args.getLastArg(options::OPT_save_temps)) - Diag(clang::diag::err_drv_invalid_opt_with_multiple_archs) + Diag(clang::diag::err_drv_invalid_opt_with_multiple_archs) << A->getAsString(Args); } ActionList SingleActions; BuildActions(Args, SingleActions); - // Add in arch binding and lipo (if necessary) for every top level - // action. + // Add in arch binding and lipo (if necessary) for every top level action. for (unsigned i = 0, e = SingleActions.size(); i != e; ++i) { Action *Act = SingleActions[i]; - // Make sure we can lipo this kind of output. If not (and it is an - // actual output) then we disallow, since we can't create an - // output file with the right name without overwriting it. We - // could remove this oddity by just changing the output names to - // include the arch, which would also fix + // Make sure we can lipo this kind of output. If not (and it is an actual + // output) then we disallow, since we can't create an output file with the + // right name without overwriting it. We could remove this oddity by just + // changing the output names to include the arch, which would also fix // -save-temps. Compatibility wins for now. if (Archs.size() > 1 && !types::canLipoType(Act->getType())) @@ -632,8 +645,8 @@ void Driver::BuildUniversalActions(const ArgList &Args, for (unsigned i = 0, e = Archs.size(); i != e; ++i) Inputs.push_back(new BindArchAction(Act, Archs[i])); - // Lipo if necessary, We do it this way because we need to set the - // arch flag so that -Xarch_ gets overwritten. + // Lipo if necessary, we do it this way because we need to set the arch flag + // so that -Xarch_ gets overwritten. if (Inputs.size() == 1 || Act->getType() == types::TY_Nothing) Actions.append(Inputs.begin(), Inputs.end()); else @@ -645,15 +658,14 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const { llvm::PrettyStackTraceString CrashInfo("Building compilation actions"); // Start by constructing the list of inputs and their types. - // Track the current user specified (-x) input. We also explicitly - // track the argument used to set the type; we only want to claim - // the type when we actually use it, so we warn about unused -x - // arguments. + // Track the current user specified (-x) input. We also explicitly track the + // argument used to set the type; we only want to claim the type when we + // actually use it, so we warn about unused -x arguments. types::ID InputType = types::TY_Nothing; Arg *InputTypeArg = 0; llvm::SmallVector<std::pair<types::ID, const Arg*>, 16> Inputs; - for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); + for (ArgList::const_iterator it = Args.begin(), ie = Args.end(); it != ie; ++it) { Arg *A = *it; @@ -669,19 +681,18 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const { // stdin must be handled specially. if (memcmp(Value, "-", 2) == 0) { - // If running with -E, treat as a C input (this changes the - // builtin macros, for example). This may be overridden by - // -ObjC below. + // If running with -E, treat as a C input (this changes the builtin + // macros, for example). This may be overridden by -ObjC below. // - // Otherwise emit an error but still use a valid type to - // avoid spurious errors (e.g., no inputs). + // Otherwise emit an error but still use a valid type to avoid + // spurious errors (e.g., no inputs). if (!Args.hasArg(options::OPT_E, false)) Diag(clang::diag::err_drv_unknown_stdin_type); Ty = types::TY_C; } else { - // Otherwise lookup by extension, and fallback to ObjectType - // if not found. We use a host hook here because Darwin at - // least has its own idea of what .s is. + // Otherwise lookup by extension, and fallback to ObjectType if not + // found. We use a host hook here because Darwin at least has its own + // idea of what .s is. if (const char *Ext = strrchr(Value, '.')) Ty = Host->lookupTypeForExtension(Ext + 1); @@ -692,7 +703,7 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const { // -ObjC and -ObjC++ override the default language, but only for "source // files". We just treat everything that isn't a linker input as a // source file. - // + // // FIXME: Clean this up if we move the phase sequence into the type. if (Ty != types::TY_Object) { if (Args.hasArg(options::OPT_ObjC)) @@ -706,28 +717,26 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const { Ty = InputType; } - // Check that the file exists. It isn't clear this is worth - // doing, since the tool presumably does this anyway, and this - // just adds an extra stat to the equation, but this is gcc - // compatible. + // Check that the file exists. It isn't clear this is worth doing, since + // the tool presumably does this anyway, and this just adds an extra stat + // to the equation, but this is gcc compatible. if (memcmp(Value, "-", 2) != 0 && !llvm::sys::Path(Value).exists()) Diag(clang::diag::err_drv_no_such_file) << A->getValue(Args); else Inputs.push_back(std::make_pair(Ty, A)); } else if (A->getOption().isLinkerInput()) { - // Just treat as object type, we could make a special type for - // this if necessary. + // Just treat as object type, we could make a special type for this if + // necessary. Inputs.push_back(std::make_pair(types::TY_Object, A)); } else if (A->getOption().getId() == options::OPT_x) { - InputTypeArg = A; + InputTypeArg = A; InputType = types::lookupTypeForTypeSpecifier(A->getValue(Args)); // Follow gcc behavior and treat as linker input for invalid -x - // options. Its not clear why we shouldn't just revert to - // unknown; but this isn't very important, we might as well be - // bug comatible. + // options. Its not clear why we shouldn't just revert to unknown; but + // this isn't very important, we might as well be bug comatible. if (!InputType) { Diag(clang::diag::err_drv_unknown_language) << A->getValue(Args); InputType = types::TY_Object; @@ -740,9 +749,9 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const { return; } - // Determine which compilation mode we are in. We look for options - // which affect the phase, starting with the earliest phases, and - // record which option we used to determine the final phase. + // Determine which compilation mode we are in. We look for options which + // affect the phase, starting with the earliest phases, and record which + // option we used to determine the final phase. Arg *FinalPhaseArg = 0; phases::ID FinalPhase; @@ -751,24 +760,25 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const { (FinalPhaseArg = Args.getLastArg(options::OPT_M)) || (FinalPhaseArg = Args.getLastArg(options::OPT_MM))) { FinalPhase = phases::Preprocess; - - // -{fsyntax-only,-analyze,emit-llvm,S} only run up to the compiler. + + // -{fsyntax-only,-analyze,emit-ast,S} only run up to the compiler. } else if ((FinalPhaseArg = Args.getLastArg(options::OPT_fsyntax_only)) || (FinalPhaseArg = Args.getLastArg(options::OPT__analyze, options::OPT__analyze_auto)) || + (FinalPhaseArg = Args.getLastArg(options::OPT_emit_ast)) || (FinalPhaseArg = Args.getLastArg(options::OPT_S))) { FinalPhase = phases::Compile; // -c only runs up to the assembler. } else if ((FinalPhaseArg = Args.getLastArg(options::OPT_c))) { FinalPhase = phases::Assemble; - + // Otherwise do everything. } else FinalPhase = phases::Link; - // Reject -Z* at the top level, these options should never have been - // exposed by gcc. + // Reject -Z* at the top level, these options should never have been exposed + // by gcc. if (Arg *A = Args.getLastArg(options::OPT_Z_Joined)) Diag(clang::diag::err_drv_use_of_Z_option) << A->getAsString(Args); @@ -781,19 +791,28 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const { unsigned NumSteps = types::getNumCompilationPhases(InputType); assert(NumSteps && "Invalid number of steps!"); - // If the first step comes after the final phase we are doing as - // part of this compilation, warn the user about it. + // If the first step comes after the final phase we are doing as part of + // this compilation, warn the user about it. phases::ID InitialPhase = types::getCompilationPhase(InputType, 0); if (InitialPhase > FinalPhase) { // Claim here to avoid the more general unused warning. InputArg->claim(); - Diag(clang::diag::warn_drv_input_file_unused) - << InputArg->getAsString(Args) - << getPhaseName(InitialPhase) - << FinalPhaseArg->getOption().getName(); + + // Special case '-E' warning on a previously preprocessed file to make + // more sense. + if (InitialPhase == phases::Compile && FinalPhase == phases::Preprocess && + getPreprocessedType(InputType) == types::TY_INVALID) + Diag(clang::diag::warn_drv_preprocessed_input_file_unused) + << InputArg->getAsString(Args) + << FinalPhaseArg->getOption().getName(); + else + Diag(clang::diag::warn_drv_input_file_unused) + << InputArg->getAsString(Args) + << getPhaseName(InitialPhase) + << FinalPhaseArg->getOption().getName(); continue; } - + // Build the pipeline for this file. Action *Current = new InputAction(*InputArg, InputType); for (unsigned i = 0; i != NumSteps; ++i) { @@ -811,9 +830,9 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const { break; } - // Some types skip the assembler phase (e.g., llvm-bc), but we - // can't encode this in the steps because the intermediate type - // depends on arguments. Just special case here. + // Some types skip the assembler phase (e.g., llvm-bc), but we can't + // encode this in the steps because the intermediate type depends on + // arguments. Just special case here. if (Phase == phases::Assemble && Current->getType() != types::TY_PP_Asm) continue; @@ -852,16 +871,18 @@ Action *Driver::ConstructPhaseAction(const ArgList &Args, phases::ID Phase, return new PreprocessJobAction(Input, OutputTy); } case phases::Precompile: - return new PrecompileJobAction(Input, types::TY_PCH); + return new PrecompileJobAction(Input, types::TY_PCH); case phases::Compile: { if (Args.hasArg(options::OPT_fsyntax_only)) { return new CompileJobAction(Input, types::TY_Nothing); } else if (Args.hasArg(options::OPT__analyze, options::OPT__analyze_auto)) { return new AnalyzeJobAction(Input, types::TY_Plist); + } else if (Args.hasArg(options::OPT_emit_ast)) { + return new CompileJobAction(Input, types::TY_AST); } else if (Args.hasArg(options::OPT_emit_llvm) || Args.hasArg(options::OPT_flto) || Args.hasArg(options::OPT_O4)) { - types::ID Output = + types::ID Output = Args.hasArg(options::OPT_S) ? types::TY_LLVMAsm : types::TY_LLVMBC; return new CompileJobAction(Input, Output); } else { @@ -881,11 +902,10 @@ void Driver::BuildJobs(Compilation &C) const { bool SaveTemps = C.getArgs().hasArg(options::OPT_save_temps); bool UsePipes = C.getArgs().hasArg(options::OPT_pipe); - // FIXME: Pipes are forcibly disabled until we support executing - // them. + // FIXME: Pipes are forcibly disabled until we support executing them. if (!CCCPrintBindings) UsePipes = false; - + // -save-temps inhibits pipes. if (SaveTemps && UsePipes) { Diag(clang::diag::warn_drv_pipe_ignored_with_save_temps); @@ -894,32 +914,31 @@ void Driver::BuildJobs(Compilation &C) const { Arg *FinalOutput = C.getArgs().getLastArg(options::OPT_o); - // It is an error to provide a -o option if we are making multiple - // output files. + // It is an error to provide a -o option if we are making multiple output + // files. if (FinalOutput) { unsigned NumOutputs = 0; - for (ActionList::const_iterator it = C.getActions().begin(), + for (ActionList::const_iterator it = C.getActions().begin(), ie = C.getActions().end(); it != ie; ++it) if ((*it)->getType() != types::TY_Nothing) ++NumOutputs; - + if (NumOutputs > 1) { Diag(clang::diag::err_drv_output_argument_with_multiple_files); FinalOutput = 0; } } - for (ActionList::const_iterator it = C.getActions().begin(), + for (ActionList::const_iterator it = C.getActions().begin(), ie = C.getActions().end(); it != ie; ++it) { Action *A = *it; - // If we are linking an image for multiple archs then the linker - // wants -arch_multiple and -final_output <final image - // name>. Unfortunately, this doesn't fit in cleanly because we - // have to pass this information down. + // If we are linking an image for multiple archs then the linker wants + // -arch_multiple and -final_output <final image name>. Unfortunately, this + // doesn't fit in cleanly because we have to pass this information down. // - // FIXME: This is a hack; find a cleaner way to integrate this - // into the process. + // FIXME: This is a hack; find a cleaner way to integrate this into the + // process. const char *LinkingOutput = 0; if (isa<LipoJobAction>(A)) { if (FinalOutput) @@ -929,41 +948,41 @@ void Driver::BuildJobs(Compilation &C) const { } InputInfo II; - BuildJobsForAction(C, A, &C.getDefaultToolChain(), + BuildJobsForAction(C, A, &C.getDefaultToolChain(), + /*BoundArch*/0, /*CanAcceptPipe*/ true, /*AtTopLevel*/ true, /*LinkingOutput*/ LinkingOutput, II); } - // If the user passed -Qunused-arguments or there were errors, don't - // warn about any unused arguments. - if (Diags.getNumErrors() || + // If the user passed -Qunused-arguments or there were errors, don't warn + // about any unused arguments. + if (Diags.getNumErrors() || C.getArgs().hasArg(options::OPT_Qunused_arguments)) return; // Claim -### here. (void) C.getArgs().hasArg(options::OPT__HASH_HASH_HASH); - + for (ArgList::const_iterator it = C.getArgs().begin(), ie = C.getArgs().end(); it != ie; ++it) { Arg *A = *it; - + // FIXME: It would be nice to be able to send the argument to the - // Diagnostic, so that extra values, position, and so on could be - // printed. + // Diagnostic, so that extra values, position, and so on could be printed. if (!A->isClaimed()) { if (A->getOption().hasNoArgumentUnused()) continue; - // Suppress the warning automatically if this is just a flag, - // and it is an instance of an argument we already claimed. + // Suppress the warning automatically if this is just a flag, and it is an + // instance of an argument we already claimed. const Option &Opt = A->getOption(); if (isa<FlagOption>(Opt)) { bool DuplicateClaimed = false; // FIXME: Use iterator. - for (ArgList::const_iterator it = C.getArgs().begin(), + for (ArgList::const_iterator it = C.getArgs().begin(), ie = C.getArgs().end(); it != ie; ++it) { if ((*it)->isClaimed() && (*it)->getOption().matches(Opt.getId())) { DuplicateClaimed = true; @@ -975,7 +994,7 @@ void Driver::BuildJobs(Compilation &C) const { continue; } - Diag(clang::diag::warn_drv_unused_argument) + Diag(clang::diag::warn_drv_unused_argument) << A->getAsString(C.getArgs()); } } @@ -984,21 +1003,21 @@ void Driver::BuildJobs(Compilation &C) const { void Driver::BuildJobsForAction(Compilation &C, const Action *A, const ToolChain *TC, + const char *BoundArch, bool CanAcceptPipe, bool AtTopLevel, const char *LinkingOutput, InputInfo &Result) const { - llvm::PrettyStackTraceString CrashInfo("Building compilation jobs for action"); + llvm::PrettyStackTraceString CrashInfo("Building compilation jobs"); bool UsePipes = C.getArgs().hasArg(options::OPT_pipe); - // FIXME: Pipes are forcibly disabled until we support executing - // them. + // FIXME: Pipes are forcibly disabled until we support executing them. if (!CCCPrintBindings) UsePipes = false; if (const InputAction *IA = dyn_cast<InputAction>(A)) { - // FIXME: It would be nice to not claim this here; maybe the old - // scheme of just using Args was better? + // FIXME: It would be nice to not claim this here; maybe the old scheme of + // just using Args was better? const Arg &Input = IA->getInputArg(); Input.claim(); if (isa<PositionalArg>(Input)) { @@ -1010,28 +1029,23 @@ void Driver::BuildJobsForAction(Compilation &C, } if (const BindArchAction *BAA = dyn_cast<BindArchAction>(A)) { - const char *ArchName = BAA->getArchName(); + const ToolChain *TC = &C.getDefaultToolChain(); + std::string Arch; - if (!ArchName) { - Arch = C.getDefaultToolChain().getArchName(); - ArchName = Arch.c_str(); - } - BuildJobsForAction(C, - *BAA->begin(), - Host->getToolChain(C.getArgs(), ArchName), - CanAcceptPipe, - AtTopLevel, - LinkingOutput, - Result); + if (BAA->getArchName()) + TC = Host->CreateToolChain(C.getArgs(), BAA->getArchName()); + + BuildJobsForAction(C, *BAA->begin(), TC, BAA->getArchName(), + CanAcceptPipe, AtTopLevel, LinkingOutput, Result); return; } const JobAction *JA = cast<JobAction>(A); const Tool &T = TC->SelectTool(C, *JA); - - // See if we should use an integrated preprocessor. We do so when we - // have exactly one input, since this is the only use case we care - // about (irrelevant since we don't support combine yet). + + // See if we should use an integrated preprocessor. We do so when we have + // exactly one input, since this is the only use case we care about + // (irrelevant since we don't support combine yet). bool UseIntegratedCPP = false; const ActionList *Inputs = &A->getInputs(); if (Inputs->size() == 1 && isa<PreprocessJobAction>(*Inputs->begin())) { @@ -1050,18 +1064,16 @@ void Driver::BuildJobsForAction(Compilation &C, for (ActionList::const_iterator it = Inputs->begin(), ie = Inputs->end(); it != ie; ++it) { InputInfo II; - BuildJobsForAction(C, *it, TC, TryToUsePipeInput, - /*AtTopLevel*/false, - LinkingOutput, - II); + BuildJobsForAction(C, *it, TC, BoundArch, TryToUsePipeInput, + /*AtTopLevel*/false, LinkingOutput, II); InputInfos.push_back(II); } // Determine if we should output to a pipe. bool OutputToPipe = false; if (CanAcceptPipe && T.canPipeOutput()) { - // Some actions default to writing to a pipe if they are the top - // level phase and there was no user override. + // Some actions default to writing to a pipe if they are the top level phase + // and there was no user override. // // FIXME: Is there a better way to handle this? if (AtTopLevel) { @@ -1082,8 +1094,8 @@ void Driver::BuildJobsForAction(Compilation &C, // Always use the first input as the base input. const char *BaseInput = InputInfos[0].getBaseInput(); - // Determine the place to write output to (nothing, pipe, or - // filename) and where to put the new job. + // Determine the place to write output to (nothing, pipe, or filename) and + // where to put the new job. if (JA->getType() == types::TY_Nothing) { Result = InputInfo(A->getType(), BaseInput); } else if (OutputToPipe) { @@ -1091,8 +1103,8 @@ void Driver::BuildJobsForAction(Compilation &C, PipedJob *PJ = dyn_cast<PipedJob>(Dest); if (!PJ) { PJ = new PipedJob(); - // FIXME: Temporary hack so that -ccc-print-bindings work until - // we have pipe support. Please remove later. + // FIXME: Temporary hack so that -ccc-print-bindings work until we have + // pipe support. Please remove later. if (!CCCPrintBindings) cast<JobList>(Dest)->addJob(PJ); Dest = PJ; @@ -1113,12 +1125,12 @@ void Driver::BuildJobsForAction(Compilation &C, } llvm::errs() << "], output: " << Result.getAsString() << "\n"; } else { - T.ConstructJob(C, *JA, *Dest, Result, InputInfos, - C.getArgsForToolChain(TC), LinkingOutput); + T.ConstructJob(C, *JA, *Dest, Result, InputInfos, + C.getArgsForToolChain(TC, BoundArch), LinkingOutput); } } -const char *Driver::GetNamedOutputPath(Compilation &C, +const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA, const char *BaseInput, bool AtTopLevel) const { @@ -1131,7 +1143,7 @@ const char *Driver::GetNamedOutputPath(Compilation &C, // Output to a temporary file? if (!AtTopLevel && !C.getArgs().hasArg(options::OPT_save_temps)) { - std::string TmpName = + std::string TmpName = GetTemporaryPath(types::getTypeTempSuffix(JA.getType())); return C.addTempFile(C.getArgs().MakeArgString(TmpName.c_str())); } @@ -1156,8 +1168,7 @@ const char *Driver::GetNamedOutputPath(Compilation &C, NamedOutput = C.getArgs().MakeArgString(Suffixed.c_str()); } - // As an annoying special case, PCH generation doesn't strip the - // pathname. + // As an annoying special case, PCH generation doesn't strip the pathname. if (JA.getType() == types::TY_PCH) { BasePath.eraseComponent(); if (BasePath.isEmpty()) @@ -1170,43 +1181,41 @@ const char *Driver::GetNamedOutputPath(Compilation &C, } } -llvm::sys::Path Driver::GetFilePath(const char *Name, - const ToolChain &TC) const { +std::string Driver::GetFilePath(const char *Name, const ToolChain &TC) const { const ToolChain::path_list &List = TC.getFilePaths(); - for (ToolChain::path_list::const_iterator + for (ToolChain::path_list::const_iterator it = List.begin(), ie = List.end(); it != ie; ++it) { llvm::sys::Path P(*it); P.appendComponent(Name); if (P.exists()) - return P; + return P.str(); } - return llvm::sys::Path(Name); + return Name; } -llvm::sys::Path Driver::GetProgramPath(const char *Name, - const ToolChain &TC, - bool WantFile) const { +std::string Driver::GetProgramPath(const char *Name, const ToolChain &TC, + bool WantFile) const { const ToolChain::path_list &List = TC.getProgramPaths(); - for (ToolChain::path_list::const_iterator + for (ToolChain::path_list::const_iterator it = List.begin(), ie = List.end(); it != ie; ++it) { llvm::sys::Path P(*it); P.appendComponent(Name); if (WantFile ? P.exists() : P.canExecute()) - return P; + return P.str(); } // If all else failed, search the path. llvm::sys::Path P(llvm::sys::Program::FindProgramByName(Name)); if (!P.empty()) - return P; + return P.str(); - return llvm::sys::Path(Name); + return Name; } std::string Driver::GetTemporaryPath(const char *Suffix) const { - // FIXME: This is lame; sys::Path should provide this function (in - // particular, it should know how to find the temporary files dir). + // FIXME: This is lame; sys::Path should provide this function (in particular, + // it should know how to find the temporary files dir). std::string Error; const char *TmpDir = ::getenv("TMPDIR"); if (!TmpDir) @@ -1222,33 +1231,20 @@ std::string Driver::GetTemporaryPath(const char *Suffix) const { return ""; } - // FIXME: Grumble, makeUnique sometimes leaves the file around!? - // PR3837. + // FIXME: Grumble, makeUnique sometimes leaves the file around!? PR3837. P.eraseFromDisk(false, 0); P.appendSuffix(Suffix); - return P.toString(); + return P.str(); } const HostInfo *Driver::GetHostInfo(const char *TripleStr) const { llvm::PrettyStackTraceString CrashInfo("Constructing host"); llvm::Triple Triple(TripleStr); - // Normalize Arch a bit. - // - // FIXME: We shouldn't need to do this once everything goes through the triple - // interface. - if (Triple.getArchName() == "i686") - Triple.setArchName("i386"); - else if (Triple.getArchName() == "amd64") - Triple.setArchName("x86_64"); - else if (Triple.getArchName() == "ppc" || - Triple.getArchName() == "Power Macintosh") - Triple.setArchName("powerpc"); - else if (Triple.getArchName() == "ppc64") - Triple.setArchName("powerpc64"); - switch (Triple.getOS()) { + case llvm::Triple::AuroraUX: + return createAuroraUXHostInfo(*this, Triple); case llvm::Triple::Darwin: return createDarwinHostInfo(*this, Triple); case llvm::Triple::DragonFly: @@ -1265,17 +1261,10 @@ const HostInfo *Driver::GetHostInfo(const char *TripleStr) const { } bool Driver::ShouldUseClangCompiler(const Compilation &C, const JobAction &JA, - const std::string &ArchNameStr) const { - // FIXME: Remove this hack. - const char *ArchName = ArchNameStr.c_str(); - if (ArchNameStr == "powerpc") - ArchName = "ppc"; - else if (ArchNameStr == "powerpc64") - ArchName = "ppc64"; - - // Check if user requested no clang, or clang doesn't understand - // this type (we only handle single inputs for now). - if (!CCCUseClang || JA.size() != 1 || + const llvm::Triple &Triple) const { + // Check if user requested no clang, or clang doesn't understand this type (we + // only handle single inputs for now). + if (!CCCUseClang || JA.size() != 1 || !types::isAcceptedByClang((*JA.begin())->getType())) return false; @@ -1294,35 +1283,32 @@ bool Driver::ShouldUseClangCompiler(const Compilation &C, const JobAction &JA, return false; } - // Always use clang for precompiling, regardless of archs. PTH is - // platform independent, and this allows the use of the static - // analyzer on platforms we don't have full IRgen support for. - if (isa<PrecompileJobAction>(JA)) + // Always use clang for precompiling and AST generation, regardless of archs. + if (isa<PrecompileJobAction>(JA) || JA.getType() == types::TY_AST) return true; - // Finally, don't use clang if this isn't one of the user specified - // archs to build. - if (!CCCClangArchs.empty() && !CCCClangArchs.count(ArchName)) { - Diag(clang::diag::warn_drv_not_using_clang_arch) << ArchName; + // Finally, don't use clang if this isn't one of the user specified archs to + // build. + if (!CCCClangArchs.empty() && !CCCClangArchs.count(Triple.getArch())) { + Diag(clang::diag::warn_drv_not_using_clang_arch) << Triple.getArchName(); return false; } return true; } -/// GetReleaseVersion - Parse (([0-9]+)(.([0-9]+)(.([0-9]+)?))?)? and -/// return the grouped values as integers. Numbers which are not -/// provided are set to 0. +/// GetReleaseVersion - Parse (([0-9]+)(.([0-9]+)(.([0-9]+)?))?)? and return the +/// grouped values as integers. Numbers which are not provided are set to 0. /// -/// \return True if the entire string was parsed (9.2), or all groups -/// were parsed (10.3.5extrastuff). -bool Driver::GetReleaseVersion(const char *Str, unsigned &Major, +/// \return True if the entire string was parsed (9.2), or all groups were +/// parsed (10.3.5extrastuff). +bool Driver::GetReleaseVersion(const char *Str, unsigned &Major, unsigned &Minor, unsigned &Micro, bool &HadExtra) { HadExtra = false; Major = Minor = Micro = 0; - if (*Str == '\0') + if (*Str == '\0') return true; char *End; @@ -1331,7 +1317,7 @@ bool Driver::GetReleaseVersion(const char *Str, unsigned &Major, return true; if (*End != '.') return false; - + Str = End+1; Minor = (unsigned) strtol(Str, &End, 10); if (*Str != '\0' && *End == '\0') |