Merge pull request #2502 from swiftwasm/main

[pull] swiftwasm from main

Author: pull[bot]

include/swift/AST/DiagnosticsDriver.def

@@ -151,27 +151,10 @@ WARNING(warn_ignoring_batch_mode,none,
 WARNING(warn_ignoring_wmo, none,
         "ignoring '-wmo' because '-dump-ast' was also specified", ())
 
-WARNING(warn_ignoring_source_range_dependencies,none,
-"ignoring '-enable-source-range-dependencies' because '%0' was also specified", (StringRef))
-
-WARNING(warn_bad_swift_ranges_header,none,
-"ignoring '-enable-source-range-dependencies' because of bad header in '%0'", (StringRef))
-
-WARNING(warn_bad_swift_ranges_format,none,
-"ignoring '-enable-source-range-dependencies' because of bad format '%1' in '%0'", (StringRef, StringRef))
-
 WARNING(warn_use_filelists_deprecated, none,
         "the option '-driver-use-filelists' is deprecated; use "
         "'-driver-filelist-threshold=0' instead", ())
 
-WARNING(warn_unable_to_load_swift_ranges, none,
-"unable to load swift ranges file \"%0\", %1",
-(StringRef, StringRef))
-
-WARNING(warn_unable_to_load_compiled_swift, none,
-"unable to load previously compiled swift file \"%0\", %1",
-(StringRef, StringRef))
-
 WARNING(warn_unable_to_load_primary, none,
 "unable to load primary swift file \"%0\", %1",
 (StringRef, StringRef))

include/swift/AST/DiagnosticsFrontend.def

@@ -109,10 +109,6 @@ ERROR(error_mode_cannot_emit_dependencies,none,
       "this mode does not support emitting dependency files", ())
 ERROR(error_mode_cannot_emit_reference_dependencies,none,
       "this mode does not support emitting reference dependency files", ())
-ERROR(error_mode_cannot_emit_swift_ranges,none,
-"this mode does not support emitting unparsed ranges files", ())
-ERROR(error_mode_cannot_emit_compiled_source,none,
-"this mode does not support emitting compiled source files", ())
 ERROR(error_mode_cannot_emit_header,none,
       "this mode does not support emitting Objective-C headers", ())
 ERROR(error_mode_cannot_emit_loaded_module_trace,none,
@@ -132,11 +128,7 @@ ERROR(cannot_emit_ir_skipping_function_bodies,none,
       "emitting IR", ())
 
 WARNING(emit_reference_dependencies_without_primary_file,none,
-  "ignoring -emit-reference-dependencies (requires -primary-file)", ())
-WARNING(emit_swift_ranges_without_primary_file,none,
-"ignoring -emit-swift-ranges (requires -primary-file)", ())
-WARNING(emit_compiled_source_without_primary_file,none,
-"ignoring -emit-compiled-source (requires -primary-file)", ())
+        "ignoring -emit-reference-dependencies (requires -primary-file)", ())
 
 ERROR(error_bad_module_name,none,
       "module name \"%0\" is not a valid identifier"
@@ -336,14 +328,6 @@ ERROR(error_invalid_coverage_prefix_map, none,
       "values for '-coverage-prefix-map' must be in the format "
       "'original=remapped', but '%0' was provided", (StringRef))
 
-
-ERROR(error_unable_to_write_swift_ranges_file, none,
-"unable to write unparsed ranges file '$0': %1", (StringRef, StringRef))
-
-ERROR(error_unable_to_write_compiled_source_file, none,
-"unable to write compiled source file: '$0': %1", (StringRef, StringRef))
-
-
 ERROR(invalid_vfs_overlay_file,none,
       "invalid virtual overlay file '%0'", (StringRef))
 

include/swift/AST/IncrementalRanges.h

@@ -62,8 +62,6 @@ TYPE("diagnostics",         SerializedDiagnostics,     "dia",             "")
 TYPE("objc-header",         ObjCHeader,                "h",               "")
 TYPE("swift-dependencies",  SwiftDeps,                 "swiftdeps",       "")
 TYPE("external-swift-dependencies", ExternalSwiftDeps,  "swiftdeps.external",  "")
-TYPE("swift-ranges",        SwiftRanges,               "swiftranges",     "")
-TYPE("compiled-source",     CompiledSource,            "compiledsource",  "")
 TYPE("remap",               Remapping,                 "remap",           "")
 TYPE("imported-modules",    ImportedModules,           "importedmodules", "")
 TYPE("tbd",                 TBD,                       "tbd",             "")

include/swift/Basic/FileTypes.def

@@ -68,11 +68,7 @@ static inline void forAllTypes(llvm::function_ref<void(file_types::ID)> fn) {
 /// such file type.
 static inline void
 forEachIncrementalOutputType(llvm::function_ref<void(file_types::ID)> fn) {
-  static const std::vector<file_types::ID> incrementalOutputTypes = {
-      file_types::TY_SwiftDeps, file_types::TY_SwiftRanges,
-      file_types::TY_CompiledSource};
-  for (auto type : incrementalOutputTypes)
-    fn(type);
+  fn(file_types::TY_SwiftDeps);
 }
 
 } // end namespace file_types