[cfe-commits] r149759 - /cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Fri Feb  3 21:26:16 2012
New Revision: 149759

URL: http://llvm.org/viewvc/llvm-project?rev=149759&view=rev
Log:
Fix ASTMerge tests that I broke in my previous commit.

Modified:
    cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp

Modified: cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp?rev=149759&r1=149758&r2=149759&view=diff
==============================================================================
--- cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp (original)
+++ cfe/trunk/lib/FrontendTool/ExecuteCompilerInvocation.cpp Fri Feb  3 21:26:16 2012
@@ -114,7 +114,7 @@
   // If there are any AST files to merge, create a frontend action
   // adaptor to perform the merge.
   if (!FEOpts.ASTMergeFiles.empty())
-    Act = new ASTMergeAction(Act, FEOpts.ASTMergeFiles[0]);
+    Act = new ASTMergeAction(Act, FEOpts.ASTMergeFiles);
 
   return Act;
 }