Remove Ranges File Type

Author: CodaFi

include/swift/AST/DiagnosticsDriver.def

@@ -155,13 +155,9 @@ 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))
+        "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",

include/swift/AST/DiagnosticsFrontend.def

@@ -109,10 +109,8 @@ 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", ())
+      "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 +130,9 @@ 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)", ())
+        "ignoring -emit-reference-dependencies (requires -primary-file)", ())
 WARNING(emit_compiled_source_without_primary_file,none,
-"ignoring -emit-compiled-source (requires -primary-file)", ())
+        "ignoring -emit-compiled-source (requires -primary-file)", ())
 
 ERROR(error_bad_module_name,none,
       "module name \"%0\" is not a valid identifier"
@@ -336,12 +332,8 @@ 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))
+      "unable to write compiled source file: '$0': %1", (StringRef, StringRef))
 
 
 ERROR(invalid_vfs_overlay_file,none,

include/swift/AST/IncrementalRanges.h

@@ -62,7 +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", "")

include/swift/Basic/FileTypes.def

@@ -69,7 +69,7 @@ static inline void forAllTypes(llvm::function_ref<void(file_types::ID)> fn) {
 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_SwiftDeps,
       file_types::TY_CompiledSource};
   for (auto type : incrementalOutputTypes)
     fn(type);

include/swift/Basic/FileTypes.h

@@ -83,18 +83,6 @@ struct SupplementaryOutputPaths {
   /// \sa DependencyGraph
   std::string ReferenceDependenciesFilePath;
 
-  /// The path to which we should output a Swift "unparsed ranges" file.
-  /// It is valid whenever there are any inputs.
-  ///
-  /// "Unparsed ranges" track source ranges in non-primary files whose parsing
-  /// was skipped
-  /// (a.k.a. "delayed).\
-  /// These files are consumed by the Swift driver (or will be someday) to
-  /// decide whether a source file needs to be recompiled during a build.
-  ///
-  /// \sa swift::emitSwiftRanges
-  std::string SwiftRangesFilePath;
-
   /// The path to which we should save the source code of a primary source file
   /// to be compiled. Used to diff sources of primary inputs.
   std::string CompiledSourceFilePath;
@@ -186,8 +174,6 @@ struct SupplementaryOutputPaths {
       fn(DependenciesFilePath); 
     if (!ReferenceDependenciesFilePath.empty())
       fn(ReferenceDependenciesFilePath); 
-    if (!SwiftRangesFilePath.empty())
-      fn(SwiftRangesFilePath); 
     if (!CompiledSourceFilePath.empty())
       fn(CompiledSourceFilePath); 
     if (!SerializedDiagnosticsPath.empty())

include/swift/Basic/SupplementaryOutputPaths.h

@@ -362,7 +362,6 @@ class CompilerInvocation {
   std::string getModuleOutputPathForAtMostOnePrimary() const;
   std::string
   getReferenceDependenciesFilePathForPrimary(StringRef filename) const;
-  std::string getSwiftRangesFilePathForPrimary(StringRef filename) const;
   std::string getCompiledSourceFilePathForPrimary(StringRef filename) const;
   std::string getSerializedDiagnosticsPathForAtMostOnePrimary() const;
 
@@ -652,11 +651,6 @@ class CompilerInstance {
   const PrimarySpecificPaths &
   getPrimarySpecificPathsForSourceFile(const SourceFile &SF) const;
 
-  /// Write out the unparsed (delayed) source ranges
-  /// Return true for error
-  bool emitSwiftRanges(DiagnosticEngine &diags, SourceFile *primaryFile,
-                       StringRef outputPath) const;
-
   /// Return true for error
   bool emitCompiledSource(DiagnosticEngine &diags,
                           const SourceFile *primaryFile,