// For all join nodes in topological order:
for (std::vector<const Node*>::iterator B = JTV.begin(), E = JTV.end();
B != E; ++B) {
+ // TOFIX: more testing, merge some parts with PassThroughGraph.
+ sys::Path Out;
+ const Node* CurNode = *B;
+ JoinTool* JT = &dynamic_cast<JoinTool&>(*CurNode->ToolPtr.getPtr());
+ bool IsLast = false;
+
+ if (JT->JoinListEmpty())
+ continue;
+
+ if (!CurNode->HasChildren() || JT->IsLast()) {
+ if (OutputFilename.empty()) {
+ Out.set("a");
+ Out.appendSuffix(JT->OutputSuffix());
+ }
+ else
+ Out.set(OutputFilename);
+ IsLast = true;
+ }
+ else {
+ Out = TempDir;
+ Out.appendComponent("tmp");
+ Out.appendSuffix(JT->OutputSuffix());
+ Out.makeUnique(true, NULL);
+ Out.eraseFromDisk();
+ }
+
+ if (JT->GenerateAction(Out).Execute() != 0)
+ throw std::runtime_error("Tool returned error code!");
+
+ if (!IsLast) {
+ const Node* NextNode = &getNode(ChooseEdge(CurNode->OutEdges,
+ CurNode->Name())->ToolName());
+ PassThroughGraph(Out, NextNode, TempDir);
+ }
}
return 0;
std::ofstream O("CompilationGraph.dot");
if (O.good()) {
- llvm::WriteGraph(this, "CompilationGraph");
+ llvm::WriteGraph(this, "compilation-graph");
O.close();
}
else {
// Join tools have an input file list associated with them.
class JoinTool : public Tool {
public:
- void AddToJoinList(const llvm::sys::Path& P) { JoinList.push_back(P); }
- void ClearJoinList() { JoinList.clear(); }
+ void AddToJoinList(const llvm::sys::Path& P) { JoinList_.push_back(P); }
+ void ClearJoinList() { JoinList_.clear(); }
+ bool JoinListEmpty() const { return JoinList_.empty(); }
Action GenerateAction(const llvm::sys::Path& outFile) const
- { return GenerateAction(JoinList, outFile); }
- // We shouldn't shadow GenerateAction from the base class.
+ { return GenerateAction(JoinList_, outFile); }
+ // We shouldn't shadow base class's version of GenerateAction.
using Tool::GenerateAction;
private:
- PathVector JoinList;
+ PathVector JoinList_;
};
}
cl::opt<bool> VerboseMode("v",
cl::desc("Enable verbose mode"));
cl::opt<bool> WriteGraph("write-graph",
- cl::desc("Write CompilationGraph.dot file"),
+ cl::desc("Write compilation-graph.dot file"),
cl::Hidden);
cl::opt<bool> ViewGraph("view-graph",
cl::desc("Show compilation graph in GhostView"),
if (WriteGraph) {
graph.writeGraph();
- return 0;
+ if (!ViewGraph)
+ return 0;
}
if (ViewGraph) {
return 0;
}
-
if (InputFilenames.empty()) {
std::cerr << "No input files.\n";
return 1;