Frontend tool cleanup

include/swift/AST/DiagnosticsFrontend.def

@@ -76,8 +76,6 @@ ERROR(error_unknown_arg,none,
       "unknown argument: '%0'", (StringRef))
 ERROR(error_invalid_arg_value,none,
       "invalid value '%1' in '%0'", (StringRef, StringRef))
-WARNING(warning_type_fingerprints_require_fine_grained_dependencies,none,
-      "Type fingerprints require fine-grained dependencies", ())
 WARNING(warning_cannot_multithread_batch_mode,none,
       "ignoring -num-threads argument; cannot multithread batch mode", ())
 ERROR(error_unsupported_option_argument,none,

include/swift/Basic/LangOptions.h

@@ -331,10 +331,6 @@ namespace swift {
     /// Whether to verify the parsed syntax tree and emit related diagnostics.
     bool VerifySyntaxTree = false;
 
-    /// Emit the newer, finer-grained swiftdeps file. Eventually will support
-    /// faster rebuilds.
-    bool EnableFineGrainedDependencies = true;
-
     /// Instead of hashing tokens inside of NominalType and ExtensionBodies into
     /// the interface hash, hash them into per-iterable-decl-context
     /// fingerprints. Fine-grained dependency types won't dirty every provides

include/swift/Driver/Compilation.h

@@ -275,10 +275,6 @@ class Compilation {
   const bool OnlyOneDependencyFile;
 
 private:
-  /// Scaffolding to permit experimentation with finer-grained dependencies and
-  /// faster rebuilds.
-  const bool EnableFineGrainedDependencies;
-
   /// Is the parser recording token hashes for each type body?
   const bool EnableTypeFingerprints;
 
@@ -331,8 +327,6 @@ class Compilation {
               bool ShowDriverTimeCompilation = false,
               std::unique_ptr<UnifiedStatsReporter> Stats = nullptr,
               bool OnlyOneDependencyFile = false,
-              bool EnableFineGrainedDependencies
-                = LangOptions().EnableFineGrainedDependencies,
               bool EnableTypeFingerprints =
                 LangOptions().EnableTypeFingerprints,
               bool VerifyFineGrainedDependencyGraphAfterEveryImport = false,
@@ -399,10 +393,6 @@ class Compilation {
   }
   void disableIncrementalBuild(Twine why);
 
-  bool getEnableFineGrainedDependencies() const {
-    return EnableFineGrainedDependencies;
-  }
-
   bool getEnableTypeFingerprints() const { return EnableTypeFingerprints; }
 
   bool getVerifyFineGrainedDependencyGraphAfterEveryImport() const {

include/swift/Driver/FineGrainedDependencyDriverGraph.h

@@ -17,7 +17,6 @@
 #include "swift/Basic/Debug.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/OptionSet.h"
-#include "swift/Driver/CoarseGrainedDependencyGraph.h"
 #include "swift/Driver/Job.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
@@ -38,6 +37,9 @@
 // driver.
 
 namespace swift {
+
+class UnifiedStatsReporter;
+
 namespace fine_grained_dependencies {
 
 //==============================================================================