commit f861cf7d6edf0d8674131b70e0a66ce704d60eb7
Author: David Blaikie <dblaikie@gmail.com>
Date:   Thu Jun 7 15:58:43 2012 -0700

    Use -frewrite-includes for crash reports.

diff --git include/clang/Driver/Compilation.h include/clang/Driver/Compilation.h
index 6f1a221..7a10d56 100644
--- include/clang/Driver/Compilation.h
+++ include/clang/Driver/Compilation.h
@@ -76,6 +76,8 @@ public:
 
   const DerivedArgList &getArgs() const { return *TranslatedArgs; }
 
+  DerivedArgList &getArgs() { return *TranslatedArgs; }
+
   ActionList &getActions() { return Actions; }
   const ActionList &getActions() const { return Actions; }
 
diff --git lib/Driver/Driver.cpp lib/Driver/Driver.cpp
index 9a73da6..104a054 100644
--- lib/Driver/Driver.cpp
+++ lib/Driver/Driver.cpp
@@ -392,6 +392,7 @@ void Driver::generateCompilationDiagnostics(Compilation &C,
   // Suppress driver output and emit preprocessor output to temp file.
   CCCIsCPP = true;
   CCGenDiagnostics = true;
+  C.getArgs().AddFlagArg(0, Opts->getOption(options::OPT_frewrite_includes));
 
   // Save the original job command(s).
   std::string Cmd;