---

yaml
---
r: 346878
b: refs/heads/master
c: 384e492
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b8de9eac986930dfa162c89f6a3718617dfe7c52
+refs/heads/master: 384e49282a0cd7c6dc711f863587580f06a4d464
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/ASTNode.h

@@ -20,6 +20,10 @@
 #include "llvm/ADT/PointerUnion.h"
 #include "swift/AST/TypeAlignments.h"
 
+namespace llvm {
+  class raw_ostream;
+}
+
 namespace swift {
   class Expr;
   class Stmt;
@@ -57,6 +61,11 @@ namespace swift {
     FUNC(Expr)
     FUNC(Decl)
 #undef FUNC
+    
+    LLVM_ATTRIBUTE_DEPRECATED(
+        void dump() const LLVM_ATTRIBUTE_USED,
+        "only for use within the debugger");
+    void dump(llvm::raw_ostream &OS, unsigned Indent = 0) const;
 
     /// Whether the AST node is implicit.
     bool isImplicit() const;

trunk/lib/AST/ASTNode.cpp

@@ -77,6 +77,21 @@ void ASTNode::walk(ASTWalker &Walker) {
     llvm_unreachable("unsupported AST node");
 }
 
+void ASTNode::dump(raw_ostream &OS, unsigned Indent) const {
+  if (auto S = dyn_cast<Stmt*>())
+    S->dump(OS, /*context=*/nullptr, Indent);
+  else if (auto E = dyn_cast<Expr*>())
+    E->dump(OS, Indent);
+  else if (auto D = dyn_cast<Decl*>())
+    D->dump(OS, Indent);
+  else
+    OS << "<null>";
+}
+
+void ASTNode::dump() const {
+  dump(llvm::errs());
+}
+
 #define FUNC(T)                                                               \
 bool ASTNode::is##T(T##Kind Kind) const {                                     \
   if (!is<T*>())                                                              \