maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename local variable CCCPrintActions -> CCCPrintPhases. 

To match the '-ccc-print-phases' command-line flag.
Also make two more 'for' loops range-based. NFC

llvm-svn: 240680
This commit is contained in:
Douglas Katzman 2015-06-25 19:37:41 +00:00
parent e6c34b49d3
commit b7e8ef005f
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
clang/lib/Driver/Driver.cpp
View File

@ -309,7 +309,7 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
// FIXME: What are we going to do with -V and -b? // 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 CCCPrintActions; bool CCCPrintPhases;
InputArgList Args = ParseArgStrings(ArgList.slice(1)); InputArgList Args = ParseArgStrings(ArgList.slice(1));
@ -325,7 +325,7 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
// should be outside in the client; the parts that aren't should have proper // 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 // options, either by introducing new ones or by overloading gcc ones like -V
// or -b. // or -b.
CCCPrintActions = Args.hasArg(options::OPT_ccc_print_phases); CCCPrintPhases = Args.hasArg(options::OPT_ccc_print_phases);
CCCPrintBindings = Args.hasArg(options::OPT_ccc_print_bindings); CCCPrintBindings = Args.hasArg(options::OPT_ccc_print_bindings);
if (const Arg *A = Args.getLastArg(options::OPT_ccc_gcc_name)) if (const Arg *A = Args.getLastArg(options::OPT_ccc_gcc_name))
CCCGenericGCCName = A->getValue(); CCCGenericGCCName = A->getValue();
@ -393,7 +393,7 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
BuildActions(C->getDefaultToolChain(), C->getArgs(), Inputs, BuildActions(C->getDefaultToolChain(), C->getArgs(), Inputs,
C->getActions()); C->getActions());
if (CCCPrintActions) { if (CCCPrintPhases) {
PrintActions(*C); PrintActions(*C);
return C; return C;
} }
@ -828,15 +828,13 @@ static unsigned PrintActions1(const Compilation &C, Action *A,
if (InputAction *IA = dyn_cast<InputAction>(A)) { if (InputAction *IA = dyn_cast<InputAction>(A)) {
os << "\"" << IA->getInputArg().getValue() << "\""; os << "\"" << IA->getInputArg().getValue() << "\"";
} else if (BindArchAction *BIA = dyn_cast<BindArchAction>(A)) { } else if (BindArchAction *BIA = dyn_cast<BindArchAction>(A)) {
os << '"' << BIA->getArchName() << '"' os << '"' << BIA->getArchName() << '"' << ", {"
<< ", {" << PrintActions1(C, *BIA->begin(), Ids) << "}"; << PrintActions1(C, *BIA->begin(), Ids) << "}";
} else { } else {
os << "{"; const char *Prefix = "{";
for (Action::iterator it = A->begin(), ie = A->end(); it != ie;) { for (Action *PreRequisite : *A) {
os << PrintActions1(C, *it, Ids); os << Prefix << PrintActions1(C, PreRequisite, Ids);
++it; Prefix = ", ";
if (it != ie)
os << ", ";
} }
os << "}"; os << "}";
} }
@ -852,10 +850,9 @@ static unsigned PrintActions1(const Compilation &C, Action *A,
// Print the action graphs in a compilation C. // Print the action graphs in a compilation C.
// For example "clang -c file1.c file2.c" is composed of two subgraphs. // For example "clang -c file1.c file2.c" is composed of two subgraphs.
void Driver::PrintActions(const Compilation &C) const { void Driver::PrintActions(const Compilation &C) const {
std::map<Action*, unsigned> Ids; std::map<Action *, unsigned> Ids;
for (ActionList::const_iterator it = C.getActions().begin(), for (Action *A : C.getActions())
ie = C.getActions().end(); it != ie; ++it) PrintActions1(C, A, Ids);
PrintActions1(C, *it, Ids);
} }
/// \brief Check whether the given input tree contains any compilation or /// \brief Check whether the given input tree contains any compilation or