[llvm-commits] [llvm] r60665 - /llvm/trunk/tools/llvmc/driver/CompilationGraph.cpp

[Mikhail Glushenkov]

Author: foldr
Date: Sun Dec  7 10:45:37 2008
New Revision: 60665

URL: http://llvm.org/viewvc/llvm-project?rev=60665&view=rev
Log:
Join tools couldn't be used in the middle of the toolchain.

Modified:
    llvm/trunk/tools/llvmc/driver/CompilationGraph.cpp

Modified: llvm/trunk/tools/llvmc/driver/CompilationGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/driver/CompilationGraph.cpp?rev=60665&r1=60664&r2=60665&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc/driver/CompilationGraph.cpp (original)
+++ llvm/trunk/tools/llvmc/driver/CompilationGraph.cpp Sun Dec  7 10:45:37 2008
@@ -308,7 +308,6 @@
   for (std::vector<const Node*>::iterator B = JTV.begin(), E = JTV.end();
        B != E; ++B) {
 
-    sys::Path Out;
     const Node* CurNode = *B;
     JoinTool* JT = &dynamic_cast<JoinTool&>(*CurNode->ToolPtr.getPtr());
 
@@ -325,10 +324,10 @@
     if (CurAction.StopCompilation())
       return 0;
 
-    const Node* NextNode =
-      &getNode(ChooseEdge(CurNode->OutEdges, InLangs,
-                          CurNode->Name())->ToolName());
-      PassThroughGraph(Out, NextNode, InLangs, TempDir, LangMap);
+    const Node* NextNode = &getNode(ChooseEdge(CurNode->OutEdges, InLangs,
+                                               CurNode->Name())->ToolName());
+    PassThroughGraph(sys::Path(CurAction.OutFile()), NextNode,
+                     InLangs, TempDir, LangMap);
   }
 
   return 0;