Merge pull request #20392 from vinivendra/ast-dump-to-files

jrose-apple · web-flow · commit d3547fd1328e · 2018-11-14T13:23:12.000-08:00
Add option to dump AST to files
diff --git a/include/swift/Basic/FileTypes.def b/include/swift/Basic/FileTypes.def
@@ -41,6 +41,7 @@ TYPE("sil",                 SIL,                       "sil",             "")
 TYPE("sib",                 SIB,                       "sib",             "")
 
 // Output types
+TYPE("ast-dump",            ASTDump,                   "ast",             "")
 TYPE("image",               Image,                     "out",             "")
 TYPE("object",              Object,                    "o",               "")
 TYPE("dSYM",                dSYM,                      "dSYM",            "")
diff --git a/include/swift/Basic/PrimarySpecificPaths.h b/include/swift/Basic/PrimarySpecificPaths.h
@@ -27,8 +27,9 @@ namespace swift {
 class PrimarySpecificPaths {
 public:
   /// The name of the main output file,
-  /// that is, the .o file for this input. If there is no such file, contains an
-  /// empty string. If the output is to be written to stdout, contains "-".
+  /// that is, the .o file for this input (or a file specified by -o).
+  /// If there is no such file, contains an empty string. If the output
+  /// is to be written to stdout, contains "-".
   std::string OutputFilename;
 
   SupplementaryOutputPaths SupplementaryOutputs;
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
@@ -85,8 +85,7 @@ namespace {
     PrintWithColorRAII(raw_ostream &os, TerminalColor color)
     : OS(os), ShowColors(false)
     {
-      if (&os == &llvm::errs() || &os == &llvm::outs())
-        ShowColors = llvm::errs().has_colors() && llvm::outs().has_colors();
+      ShowColors = os.has_colors();
 
       if (ShowColors)
         OS.changeColor(color.Color, color.Bold);
@@ -417,13 +416,9 @@ namespace {
   public:
     raw_ostream &OS;
     unsigned Indent;
-    bool ShowColors;
 
     explicit PrintPattern(raw_ostream &os, unsigned indent = 0)
-      : OS(os), Indent(indent), ShowColors(false) {
-      if (&os == &llvm::errs() || &os == &llvm::outs())
-        ShowColors = llvm::errs().has_colors() && llvm::outs().has_colors();
-    }
+      : OS(os), Indent(indent) { }
 
     void printRec(Decl *D) { D->dump(OS, Indent + 2); }
     void printRec(Expr *E) { E->dump(OS, Indent + 2); }
@@ -545,13 +540,9 @@ namespace {
   public:
     raw_ostream &OS;
     unsigned Indent;
-    bool ShowColors;
 
     explicit PrintDecl(raw_ostream &os, unsigned indent = 0)
-      : OS(os), Indent(indent), ShowColors(false) {
-      if (&os == &llvm::errs() || &os == &llvm::outs())
-        ShowColors = llvm::errs().has_colors() && llvm::outs().has_colors();
-    }
+      : OS(os), Indent(indent) { }
     
     void printRec(Decl *D) { PrintDecl(OS, Indent + 2).visit(D); }
     void printRec(Expr *E) { E->dump(OS, Indent+2); }
@@ -2713,13 +2704,9 @@ class PrintTypeRepr : public TypeReprVisitor<PrintTypeRepr> {
 public:
   raw_ostream &OS;
   unsigned Indent;
-  bool ShowColors;
 
   PrintTypeRepr(raw_ostream &os, unsigned indent)
-    : OS(os), Indent(indent), ShowColors(false) {
-    if (&os == &llvm::errs() || &os == &llvm::outs())
-      ShowColors = llvm::errs().has_colors() && llvm::outs().has_colors();
-  }
+    : OS(os), Indent(indent) { }
 
   void printRec(Decl *D) { D->dump(OS, Indent + 2); }
   void printRec(Expr *E) { E->dump(OS, Indent + 2); }
diff --git a/lib/Basic/FileTypes.cpp b/lib/Basic/FileTypes.cpp
@@ -70,6 +70,7 @@ bool file_types::isTextual(ID Id) {
   case file_types::TY_SIL:
   case file_types::TY_Dependencies:
   case file_types::TY_Assembly:
+  case file_types::TY_ASTDump:
   case file_types::TY_RawSIL:
   case file_types::TY_LLVM_IR:
   case file_types::TY_ObjCHeader:
@@ -117,6 +118,7 @@ bool file_types::isAfterLLVM(ID Id) {
   case file_types::TY_TBD:
   case file_types::TY_SIL:
   case file_types::TY_Dependencies:
+  case file_types::TY_ASTDump:
   case file_types::TY_RawSIL:
   case file_types::TY_ObjCHeader:
   case file_types::TY_AutolinkFile:
@@ -171,6 +173,7 @@ bool file_types::isPartOfSwiftCompilation(ID Id) {
   case file_types::TY_ClangModuleFile:
   case file_types::TY_SwiftDeps:
   case file_types::TY_Nothing:
+  case file_types::TY_ASTDump:
   case file_types::TY_Remapping:
   case file_types::TY_IndexData:
   case file_types::TY_ModuleTrace:
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
@@ -1389,6 +1389,10 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
       OI.CompilerOutputType = file_types::TY_LLVM_BC;
       break;
 
+    case options::OPT_dump_ast:
+      OI.CompilerOutputType = file_types::TY_ASTDump;
+      break;
+
     case options::OPT_emit_pch:
       OI.CompilerMode = OutputInfo::Mode::SingleCompile;
       OI.CompilerOutputType = file_types::TY_PCH;
@@ -1411,11 +1415,11 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
       OI.CompilerOutputType = file_types::TY_Remapping;
       OI.LinkAction = LinkKind::None;
       break;
+
     case options::OPT_parse:
     case options::OPT_resolve_imports:
     case options::OPT_typecheck:
     case options::OPT_dump_parse:
-    case options::OPT_dump_ast:
     case options::OPT_emit_syntax:
     case options::OPT_print_ast:
     case options::OPT_dump_type_refinement_contexts:
@@ -1764,6 +1768,7 @@ void Driver::buildActions(SmallVectorImpl<const Action *> &TopLevelActions,
           break;
         }
         LLVM_FALLTHROUGH;
+      case file_types::TY_ASTDump:
       case file_types::TY_Image:
       case file_types::TY_dSYM:
       case file_types::TY_Dependencies:
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
@@ -397,6 +397,8 @@ const char *ToolChain::JobContext::computeFrontendModeForCompile() const {
     return "-c";
   case file_types::TY_PCH:
     return "-emit-pch";
+  case file_types::TY_ASTDump:
+    return "-dump-ast";
   case file_types::TY_RawSIL:
     return "-emit-silgen";
   case file_types::TY_SIL:
@@ -652,6 +654,7 @@ ToolChain::constructInvocation(const BackendJobAction &job,
     case file_types::TY_ImportedModules:
     case file_types::TY_TBD:
     case file_types::TY_SwiftModuleFile:
+    case file_types::TY_ASTDump:
     case file_types::TY_RawSIL:
     case file_types::TY_RawSIB:
     case file_types::TY_SIL:
diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
@@ -685,6 +685,29 @@ static SourceFile *getPrimaryOrMainSourceFile(CompilerInvocation &Invocation,
   return SF;
 }
 
+/// Dumps the AST of all available primary source files. If corresponding output
+/// files were specified, use them; otherwise, dump the AST to stdout.
+static void dumpAST(CompilerInvocation &Invocation,
+                    CompilerInstance &Instance) {
+  // FIXME: WMO doesn't use the notion of primary files, so this doesn't do the
+  // right thing. Perhaps it'd be best to ignore WMO when dumping the AST, just
+  // like WMO ignores `-incremental`.
+
+  auto primaryFiles = Instance.getPrimarySourceFiles();
+  if (!primaryFiles.empty()) {
+    for (SourceFile *sourceFile: primaryFiles) {
+      auto PSPs = Instance.getPrimarySpecificPathsForSourceFile(*sourceFile);
+      auto OutputFilename = PSPs.OutputFilename;
+      auto OS = getFileOutputStream(OutputFilename, Instance.getASTContext());
+      sourceFile->dump(*OS);
+    }
+  } else {
+    // Some invocations don't have primary files. In that case, we default to
+    // looking for the main file and dumping it to `stdout`.
+    getPrimaryOrMainSourceFile(Invocation, Instance)->dump(llvm::outs());
+  }
+}
+
 /// We may have been told to dump the AST (either after parsing or
 /// type-checking, which is already differentiated in
 /// CompilerInstance::performSema()), so dump or print the main source file and
@@ -728,7 +751,7 @@ static Optional<bool> dumpASTIfNeeded(CompilerInvocation &Invocation,
 
   case FrontendOptions::ActionType::DumpParse:
   case FrontendOptions::ActionType::DumpAST:
-    getPrimaryOrMainSourceFile(Invocation, Instance)->dump();
+    dumpAST(Invocation, Instance);
     break;
 
   case FrontendOptions::ActionType::EmitImportedModules:
diff --git a/test/Driver/actions.swift b/test/Driver/actions.swift
@@ -11,6 +11,10 @@
 // BASICC: 0: input, "{{.*}}actions.swift", swift
 // BASICC: 1: compile, {0}, object
 
+// RUN: %swiftc_driver -driver-print-actions -dump-ast %s 2>&1 | %FileCheck %s -check-prefix=BASICAST
+// BASICAST: 0: input, "{{.*}}actions.swift", swift
+// BASICAST: 1: compile, {0}, ast-dump
+
 // RUN: %swiftc_driver -driver-print-actions -emit-sil %s 2>&1 | %FileCheck %s -check-prefix=BASICSIL
 // BASICSIL: 0: input, "{{.*}}actions.swift", swift
 // BASICSIL: 1: compile, {0}, sil
diff --git a/test/Driver/driver-compile.swift b/test/Driver/driver-compile.swift
@@ -7,6 +7,14 @@
 // RUN: %FileCheck %s < %t.complex.txt
 // RUN: %FileCheck -check-prefix COMPLEX %s < %t.complex.txt
 
+// RUN: %swiftc_driver -driver-print-jobs -dump-ast -target x86_64-apple-macosx10.9 %s 2>&1 > %t.ast.txt
+// RUN: %FileCheck %s < %t.ast.txt
+// RUN: %FileCheck -check-prefix AST-STDOUT %s < %t.ast.txt
+
+// RUN: %swiftc_driver -driver-print-jobs -dump-ast -target x86_64-apple-macosx10.9 %s -o output.ast > %t.ast.txt
+// RUN: %FileCheck %s < %t.ast.txt
+// RUN: %FileCheck -check-prefix AST-O %s < %t.ast.txt
+
 // RUN: %swiftc_driver -driver-print-jobs -emit-silgen -target x86_64-apple-macosx10.9 %s 2>&1 > %t.silgen.txt
 // RUN: %FileCheck %s < %t.silgen.txt
 // RUN: %FileCheck -check-prefix SILGEN %s < %t.silgen.txt
@@ -74,6 +82,14 @@
 // COMPLEX: -o {{.+}}.o
 
 
+// AST-STDOUT: bin/swift
+// AST-STDOUT: -dump-ast
+// AST-STDOUT: -o -
+
+// AST-O: bin/swift
+// AST-O: -dump-ast
+// AST-O: -o output.ast
+
 // SILGEN: bin/swift
 // SILGEN: -emit-silgen
 // SILGEN: -o -
@@ -102,14 +118,14 @@
 // DUPLICATE-NAME: note: filenames are used to distinguish private declarations with the same name
 
 // FILELIST: bin/swift
-// FILELIST: -filelist [[SOURCES:(["][^"]+|[^ ]+)sources([^"]+["]|[^ ]+)]]
-// FILELIST: -primary-filelist  [[PRIMARY_FILELIST:(["][^"]+|[^ ]+)primaryInputs([^"]+["]|[^ ]+)]]
-// FILELIST: -supplementary-output-file-map [[SUPPLEMENTARY_OUTPUT_FILEMAP:(["][^"]+|[^ ]+)supplementaryOutputs([^"]+["]|[^ ]+)]]
+// FILELIST: -filelist [[SOURCES:(["][^"]+sources[^"]+["]|[^ ]+sources[^ ]+)]]
+// FILELIST: -primary-filelist  {{(["][^"]+primaryInputs[^"]+["]|[^ ]+primaryInputs[^ ]+)}}
+// FILELIST: -supplementary-output-file-map {{(["][^"]+supplementaryOutputs[^"]+["]|[^ ]+supplementaryOutputs[^ ]+)}}
 // FILELIST: -output-filelist {{[^-]}}
 // FILELIST-NEXT: bin/swift
 // FILELIST: -filelist [[SOURCES]]
-// FILELIST: -primary-filelist  {{(["][^"]+|[^ ]+)primaryInputs([^"]+["]|[^ ]+)}}
-// FILELIST: -supplementary-output-file-map {{(["][^"]+|[^ ]+)supplementaryOutputs([^"]+["]|[^ ]+)}}
+// FILELIST: -primary-filelist  {{(["][^"]+primaryInputs[^"]+["]|[^ ]+primaryInputs[^ ]+)}}
+// FILELIST: -supplementary-output-file-map {{(["][^"]+supplementaryOutputs[^"]+["]|[^ ]+supplementaryOutputs[^ ]+)}}
 // FILELIST: -output-filelist {{[^-]}}
 
 // UPDATE-CODE: DISTINCTIVE-PATH/usr/bin/swift
diff --git a/test/Driver/filelists.swift b/test/Driver/filelists.swift
@@ -6,16 +6,16 @@
 // CHECK-NOT: Handled
 // CHECK: Handled a.swift
 // CHECK-NEXT: Supplementary "./a.swift":
-// CHECK-NEXT: Supplementary swiftdoc: "./a.swiftdoc"
 // CHECK-NEXT: Supplementary swiftmodule: "./a.swiftmodule"
+// CHECK-NEXT: Supplementary swiftdoc: "./a.swiftdoc"
 // CHECK-NEXT: Handled b.swift
 // CHECK-NEXT: Supplementary "./b.swift":
-// CHECK-NEXT: Supplementary swiftdoc: "./b.swiftdoc"
 // CHECK-NEXT: Supplementary swiftmodule: "./b.swiftmodule"
+// CHECK-NEXT: Supplementary swiftdoc: "./b.swiftdoc"
 // CHECK-NEXT: Handled c.swift
 // CHECK-NEXT: Supplementary "./c.swift":
-// CHECK-NEXT: Supplementary swiftdoc: "./c.swiftdoc"
 // CHECK-NEXT: Supplementary swiftmodule: "./c.swiftmodule"
+// CHECK-NEXT: Supplementary swiftdoc: "./c.swiftdoc"
 // CHECK-NEXT: Handled modules
 // CHECK-NOT: Handled
 
diff --git a/test/Frontend/ast-dump.swift b/test/Frontend/ast-dump.swift
@@ -0,0 +1,53 @@
+// RUN: %empty-directory(%t)
+// RUN: echo 'public func a() { }' >%t/a.swift
+// RUN: echo 'public func b() { }' >%t/b.swift
+// RUN: echo 'public func main() {a(); b()}' >%t/main.swift
+
+// Test printing to stdout
+// RUN: %target-swift-frontend -dump-ast -primary-file %t/a.swift %t/b.swift %t/main.swift -module-name main -o - 2>&1 | %FileCheck -check-prefix A-AST %s
+// RUN: %target-swift-frontend -dump-ast %t/a.swift -primary-file %t/b.swift %t/main.swift -module-name main -o - 2>&1 | %FileCheck -check-prefix B-AST %s
+// RUN: %target-swift-frontend -dump-ast %t/a.swift %t/b.swift -primary-file %t/main.swift -module-name main -o - 2>&1 | %FileCheck -check-prefix MAIN-AST %s
+
+// Test printing to files
+// RUN: %target-swift-frontend -dump-ast -primary-file %t/a.swift %t/b.swift %t/main.swift -module-name main -o %t/a.ast
+// RUN: %FileCheck -check-prefix A-AST %s < %t/a.ast
+// RUN: %target-swift-frontend -dump-ast %t/a.swift -primary-file %t/b.swift %t/main.swift -module-name main -o %t/b.ast
+// RUN: %FileCheck -check-prefix B-AST %s < %t/b.ast
+// RUN: %target-swift-frontend -dump-ast %t/a.swift %t/b.swift -primary-file %t/main.swift -module-name main -o %t/main.ast
+// RUN: %FileCheck -check-prefix MAIN-AST %s < %t/main.ast
+
+// Test batch mode
+// RUN: %target-swift-frontend -dump-ast -primary-file %t/a.swift -primary-file %t/b.swift -primary-file %t/main.swift -module-name main -o %t/a_batch.ast -o %t/b_batch.ast -o %t/main_batch.ast
+// RUN: %FileCheck -check-prefix A-AST %s < %t/a_batch.ast
+// RUN: %FileCheck -check-prefix B-AST %s < %t/b_batch.ast
+// RUN: %FileCheck -check-prefix MAIN-AST %s < %t/main_batch.ast
+
+
+// Check a.swift's AST
+// A-AST: (source_file
+// A-AST-SAME: a.swift
+
+// A-AST-NEXT: (func_decl
+// A-AST-SAME: a()
+
+
+// Check b.swift's AST
+// B-AST: (source_file
+// B-AST-SAME: b.swift
+
+// B-AST-NEXT: (func_decl
+// B-AST-SAME: b()
+
+
+// Check main.swift's AST
+// MAIN-AST: (source_file
+// MAIN-AST-SAME: main.swift
+
+// MAIN-AST: (func_decl
+// MAIN-AST-SAME: main()
+
+// MAIN-AST: (call_expr
+// MAIN-AST-NEXT: a()
+
+// MAIN-AST: (call_expr
+// MAIN-AST-NEXT: b()
diff --git a/test/Frontend/dump-parse.swift b/test/Frontend/dump-parse.swift
@@ -1,5 +1,5 @@
 // RUN: not %target-swift-frontend -dump-parse %s 2>&1 | %FileCheck %s
-// RUN: not %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck %s -check-prefix=CHECK-AST
+// RUN: not %target-swift-frontend -dump-ast %s | %FileCheck %s -check-prefix=CHECK-AST
 
 // CHECK-LABEL: (func_decl{{.*}}"foo(_:)"
 // CHECK-AST-LABEL: (func_decl{{.*}}"foo(_:)"
@@ -73,4 +73,4 @@ func nonescaping(_: (Int) -> Int) {}
 nonescaping({ $0 })
 // CHECK-AST:        (declref_expr type='((Int) -> Int) -> ()'
 // CHECK-AST-NEXT:        (paren_expr
-// CHECK-AST-NEXT:          (closure_expr type='(Int) -> Int' {{.*}} discriminator=1 single-expression
+// CHECK-AST-NEXT:          (closure_expr type='(Int) -> Int' {{.*}} discriminator=1 single-expression
diff --git a/test/NameBinding/import-resolution-overload.swift b/test/NameBinding/import-resolution-overload.swift
@@ -4,7 +4,7 @@
 // RUN: %target-swift-frontend -emit-module -o %t %S/Inputs/overload_vars.swift
 // RUN: %target-swift-frontend -typecheck %s -I %t -sdk "" -verify
 
-// RUN: not %target-swift-frontend -dump-ast %s -I %t -sdk "" > %t.astdump 2>&1
+// RUN: not %target-swift-frontend -dump-ast %s -I %t -sdk "" > %t.astdump
 // RUN: %FileCheck %s < %t.astdump
 
 import overload_intFunctions
diff --git a/test/Parse/if_expr.swift b/test/Parse/if_expr.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -dump-ast %s | %FileCheck %s
 
 // CHECK: (func_decl{{.*}}"r13756261(_:_:)"
 func r13756261(_ x: Bool, _ y: Int) -> Int {
diff --git a/test/Parse/multiline_normalize_newline.swift b/test/Parse/multiline_normalize_newline.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -dump-parse %s 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -dump-parse %s | %FileCheck %s
 
 // CR
 _ = """"""
diff --git a/test/Parse/multiline_string.swift b/test/Parse/multiline_string.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -dump-ast %s | %FileCheck %s
 
 import Swift
 
diff --git a/test/Parse/raw_string.swift b/test/Parse/raw_string.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -dump-ast %s 2>&1 | %FileCheck --strict-whitespace %s
+// RUN: %target-swift-frontend -dump-ast %s | %FileCheck --strict-whitespace %s
 
 import Swift
 
diff --git a/test/attr/attr_fixed_layout.swift b/test/attr/attr_fixed_layout.swift
@@ -1,7 +1,7 @@
-// RUN: %target-swift-frontend -typecheck -swift-version 4.2 -verify -dump-ast -enable-resilience %s 2>&1 | %FileCheck --check-prefix=RESILIENCE-ON %s
-// RUN: %target-swift-frontend -typecheck -swift-version 4.2 -verify -dump-ast -enable-resilience -enable-testing %s 2>&1 | %FileCheck --check-prefix=RESILIENCE-ON %s
-// RUN: not %target-swift-frontend -typecheck -swift-version 4.2 -dump-ast %s 2>&1 | %FileCheck --check-prefix=RESILIENCE-OFF %s
-// RUN: not %target-swift-frontend -typecheck -swift-version 4.2 -dump-ast %s -enable-testing 2>&1 | %FileCheck --check-prefix=RESILIENCE-OFF %s
+// RUN: %target-swift-frontend -typecheck -swift-version 4.2 -verify -dump-ast -enable-resilience %s | %FileCheck --check-prefix=RESILIENCE-ON %s
+// RUN: %target-swift-frontend -typecheck -swift-version 4.2 -verify -dump-ast -enable-resilience -enable-testing %s | %FileCheck --check-prefix=RESILIENCE-ON %s
+// RUN: not %target-swift-frontend -typecheck -swift-version 4.2 -dump-ast %s | %FileCheck --check-prefix=RESILIENCE-OFF %s
+// RUN: not %target-swift-frontend -typecheck -swift-version 4.2 -dump-ast %s -enable-testing | %FileCheck --check-prefix=RESILIENCE-OFF %s
 
 //
 // Public types with @_fixed_layout are always fixed layout
diff --git a/test/attr/attr_native_dynamic.swift b/test/attr/attr_native_dynamic.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -swift-version 5 -typecheck -dump-ast %s 2>&1 | %FileCheck  %s
+// RUN: %target-swift-frontend -swift-version 5 -typecheck -dump-ast %s | %FileCheck  %s
 
 struct Strukt {
   // CHECK: (struct_decl {{.*}} "Strukt"
diff --git a/test/attr/attr_objc.swift b/test/attr/attr_objc.swift
@@ -1,7 +1,7 @@
 // RUN: %target-swift-frontend -disable-objc-attr-requires-foundation-module -typecheck -verify %s -swift-version 4 -enable-source-import -I %S/Inputs -enable-swift3-objc-inference
 // RUN: %target-swift-ide-test -skip-deinit=false -print-ast-typechecked -source-filename %s -function-definitions=true -prefer-type-repr=false -print-implicit-attrs=true -explode-pattern-binding-decls=true -disable-objc-attr-requires-foundation-module -swift-version 4 -enable-source-import -I %S/Inputs -enable-swift3-objc-inference | %FileCheck %s
-// RUN: not %target-swift-frontend -typecheck -dump-ast -disable-objc-attr-requires-foundation-module %s -swift-version 4 -enable-source-import -I %S/Inputs -enable-swift3-objc-inference 2> %t.dump
-// RUN: %FileCheck -check-prefix CHECK-DUMP %s < %t.dump
+// RUN: not %target-swift-frontend -typecheck -dump-ast -disable-objc-attr-requires-foundation-module %s -swift-version 4 -enable-source-import -I %S/Inputs -enable-swift3-objc-inference > %t.ast
+// RUN: %FileCheck -check-prefix CHECK-DUMP %s < %t.ast
 // REQUIRES: objc_interop
 
 import Foundation
diff --git a/test/decl/protocol/associated_type_overrides.swift b/test/decl/protocol/associated_type_overrides.swift
diff --git a/test/decl/protocol/conforms/nscoding.swift b/test/decl/protocol/conforms/nscoding.swift
diff --git a/test/decl/protocol/conforms/nscoding_availability_osx.swift b/test/decl/protocol/conforms/nscoding_availability_osx.swift
diff --git a/test/decl/protocol/override.swift b/test/decl/protocol/override.swift
diff --git a/test/expr/capture/dynamic_self.swift b/test/expr/capture/dynamic_self.swift
diff --git a/test/expr/capture/generic_params.swift b/test/expr/capture/generic_params.swift
diff --git a/test/expr/capture/nested.swift b/test/expr/capture/nested.swift
diff --git a/test/expr/capture/top-level-guard.swift b/test/expr/capture/top-level-guard.swift
diff --git a/test/expr/cast/array_downcast_Foundation.swift b/test/expr/cast/array_downcast_Foundation.swift
diff --git a/test/expr/primary/literal/collection_upcast_opt.swift b/test/expr/primary/literal/collection_upcast_opt.swift

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -dump-ast %s 2>&1 \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-frontend -dump-ast %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// CHECK: (func_decl{{.*}}"r13756261(_:_:)"`
`4`	`4`	`func r13756261(_ x: Bool, _ y: Int) -> Int {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -dump-parse %s 2>&1 \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-frontend -dump-parse %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// CR`
`4`	`4`	`_ = """"""`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-frontend -swift-version 5 -typecheck -dump-ast %s 2>&1 \| %FileCheck %s`
	`1`	`+// RUN: %target-swift-frontend -swift-version 5 -typecheck -dump-ast %s \| %FileCheck %s`
`2`	`2`
`3`	`3`	`struct Strukt {`
`4`	`4`	`// CHECK: (struct_decl {{.*}} "Strukt"`