Split the Build function into two parts.

llvm-svn: 50736

llvm/tools/llvmc2/CompilationGraph.cpp

@@ -109,17 +109,14 @@ void CompilationGraph::insertEdge(const std::string& A, Edge* E) {
   }
 }
 
-// TOFIX: support more interesting graph topologies. We will need to
-// do topological sorting to process multiple Join nodes correctly.
-int CompilationGraph::Build (const sys::Path& tempDir) const {
-  PathVector JoinList;
-  const Tool* JoinTool = 0;
-  sys::Path In, Out;
-
-  // For each input file
-  for (cl::list<std::string>::const_iterator B = InputFilenames.begin(),
-        E = InputFilenames.end(); B != E; ++B) {
-    In = sys::Path(*B);
+// Pass input file through the chain until we bump into a Join node or
+// a node that says that it is the last.
+const Tool* CompilationGraph::PassThroughGraph (sys::Path& In,
+                                                sys::Path Out,
+                                                const sys::Path& TempDir,
+                                                PathVector& JoinList) const {
+  bool Last = false;
+  const Tool* ret = 0;
 
   // Get to the head of the toolchain.
   const tools_vector_type& TV = getToolsVector(getLanguage(In));
@@ -127,15 +124,12 @@ int CompilationGraph::Build (const sys::Path& tempDir) const {
     throw std::runtime_error("Tool names vector is empty!");
   const Node* N = &getNode(*TV.begin());
 
-    // Pass file through the chain until we bump into a Join node or a
-    // node that says that it is the last.
-    bool Last = false;
   while(!Last) {
     const Tool* CurTool = N->ToolPtr.getPtr();
 
     if (CurTool->IsJoin()) {
       JoinList.push_back(In);
-        JoinTool = CurTool;
+      ret = CurTool;
       break;
     }
 
@@ -150,7 +144,7 @@ int CompilationGraph::Build (const sys::Path& tempDir) const {
       Last = true;
     }
     else {
-        Out = tempDir;
+      Out = TempDir;
       Out.appendComponent(In.getBasename());
       Out.appendSuffix(CurTool->OutputSuffix());
       Out.makeUnique(true, NULL);
@@ -163,6 +157,28 @@ int CompilationGraph::Build (const sys::Path& tempDir) const {
     N = &getNode(N->ChooseEdge()->ToolName());
     In = Out; Out.clear();
   }
+
+  return ret;
+}
+
+// TOFIX: support more interesting graph topologies. We will need to
+// do topological sorting to process multiple Join nodes correctly.
+int CompilationGraph::Build (const sys::Path& TempDir) const {
+  PathVector JoinList;
+  const Tool* JoinTool = 0;
+  sys::Path In, Out;
+
+  // For each input file
+  for (cl::list<std::string>::const_iterator B = InputFilenames.begin(),
+        E = InputFilenames.end(); B != E; ++B) {
+    In = sys::Path(*B);
+
+    const Tool* NewJoin = PassThroughGraph(In, Out, TempDir, JoinList);
+    if (JoinTool && NewJoin && JoinTool != NewJoin)
+      throw std::runtime_error("Graphs with multiple Join nodes"
+                               "are not yet supported!");
+    else if (NewJoin)
+      JoinTool = NewJoin;
   }
 
   if (JoinTool) {

llvm/tools/llvmc2/CompilationGraph.h

@@ -141,6 +141,12 @@ namespace llvmcc {
     // Return a reference to the list of tool names corresponding to
     // the given language name. Throws std::runtime_error.
     const tools_vector_type& getToolsVector(const std::string& LangName) const;
+
+    // Pass the input file through the toolchain.
+    const Tool* PassThroughGraph (llvm::sys::Path& In, llvm::sys::Path Out,
+                                  const llvm::sys::Path& TempDir,
+                                  PathVector& JoinList) const;
+
   };
 
   /// GraphTraits support code.