diff --git a/clang/Driver/ASTConsumers.h b/clang/Driver/ASTConsumers.h
index 4265672b95066..90b4f9735a820 100644
--- a/clang/Driver/ASTConsumers.h
+++ b/clang/Driver/ASTConsumers.h
@@ -27,6 +27,7 @@ ASTConsumer *CreateLiveVarAnalyzer();
 ASTConsumer *CreateDeadStoreChecker(Diagnostic &Diags);
 ASTConsumer *CreateUnitValsChecker(Diagnostic &Diags);
 ASTConsumer *CreateLLVMEmitter(Diagnostic &Diags);
+ASTConsumer *CreateCodeRewriterTest();
 
 } // end clang namespace
 
diff --git a/clang/Driver/RewriteTest.cpp b/clang/Driver/RewriteTest.cpp
new file mode 100644
index 0000000000000..ef1a9b082232c
--- /dev/null
+++ b/clang/Driver/RewriteTest.cpp
@@ -0,0 +1,43 @@
+//===--- RewriteTest.cpp - Playground for the code rewriter ---------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file was developed by Chris Lattner and is distributed under the
+// University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Hacks and fun related to the code rewriter.
+//
+//===----------------------------------------------------------------------===//
+
+#include "ASTConsumers.h"
+#include "clang/AST/AST.h"
+#include "clang/AST/ASTConsumer.h"
+
+using namespace clang;
+
+
+namespace {
+  class ASTViewer : public ASTConsumer {
+    SourceManager *SM;
+  public:
+    void Initialize(ASTContext &Context, unsigned MainFileID) {
+      SM = &Context.SourceMgr;
+    }
+    
+    virtual void HandleTopLevelDecl(Decl *D);
+  };
+}
+
+ASTConsumer *clang::CreateCodeRewriterTest() { return new ASTViewer(); }
+
+
+
+
+void ASTViewer::HandleTopLevelDecl(Decl *D) {
+  if (NamedDecl *ND = dyn_cast<NamedDecl>(D))
+    if (ND->getName())
+      printf("%s\n", ND->getName());
+  
+}
diff --git a/clang/Driver/clang.cpp b/clang/Driver/clang.cpp
index 9d8f71288f5aa..6d9b6b0e4662f 100644
--- a/clang/Driver/clang.cpp
+++ b/clang/Driver/clang.cpp
@@ -49,6 +49,7 @@ static llvm::cl::opt<bool>
 Stats("stats", llvm::cl::desc("Print performance metrics and statistics"));
 
 enum ProgActions {
+  RewriteTest,                  // Rewriter testing stuff.
   EmitLLVM,                     // Emit a .ll file.
   ASTPrint,                     // Parse ASTs and print them.
   ASTDump,                      // Parse ASTs and dump them.
@@ -101,6 +102,8 @@ ProgAction(llvm::cl::desc("Choose output type:"), llvm::cl::ZeroOrMore,
                         "Flag warnings of uses of unitialized variables."),
              clEnumValN(EmitLLVM, "emit-llvm",
                         "Build ASTs then convert to LLVM, emit .ll file"),
+             clEnumValN(RewriteTest, "rewrite-test",
+                        "Playground for the code rewriter"),
              clEnumValEnd));
 
 static llvm::cl::opt<bool>
@@ -796,6 +799,10 @@ static void ProcessInputFile(Preprocessor &PP, unsigned MainFileID,
   case EmitLLVM:
     Consumer = CreateLLVMEmitter(PP.getDiagnostics());
     break;
+    
+  case RewriteTest:
+    Consumer = CreateCodeRewriterTest();
+    break;
   }
   
   if (Consumer) {