1 files changed, 28 insertions, 2 deletions
diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp
index a636e2dbac..949bbe7d6b 100644
--- a/lib/Driver/Compilation.cpp
+++ b/lib/Driver/Compilation.cpp
@@ -8,12 +8,38 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Driver/Compilation.h"
+
+#include "clang/Driver/ArgList.h"
+#include "clang/Driver/ToolChain.h"
+
 using namespace clang::driver;
 
-Compilation::Compilation() {
+Compilation::Compilation(ToolChain &_DefaultToolChain,
+                         ArgList *_Args) 
+  : DefaultToolChain(_DefaultToolChain), Args(_Args) {
+}
+
+Compilation::~Compilation() {  
+  delete Args;
+  
+  // Free any derived arg lists.
+  for (llvm::DenseMap<const ToolChain*, ArgList*>::iterator 
+         it = TCArgs.begin(), ie = TCArgs.end(); it != ie; ++it) {
+    ArgList *A = it->second;
+    if (A != Args)
+      delete Args;
+  }
 }
 
-Compilation::~Compilation() {
+const ArgList &Compilation::getArgsForToolChain(const ToolChain *TC) {
+  if (!TC)
+    TC = &DefaultToolChain;
+
+  ArgList *&Args = TCArgs[TC];
+  if (!Args)
+    Args = TC->TranslateArgs(*Args);
+
+  return *Args;
 }
 
 int Compilation::Execute() const {