Address review feedback

Author: CodaFi

include/swift/Frontend/DiagnosticVerifier.h

@@ -21,6 +21,7 @@
 #include "swift/Basic/LLVM.h"
 
 namespace swift {
+  class DependencyTracker;
   class FileUnit;
   class SourceManager;
   class SourceFile;
@@ -37,8 +38,10 @@ namespace swift {
   bool verifyDiagnostics(SourceManager &SM, ArrayRef<unsigned> BufferIDs,
                          bool autoApplyFixes, bool ignoreUnknown);
 
-  bool verifyDependencies(SourceManager &SM, ArrayRef<FileUnit *> SFs);
-  bool verifyDependencies(SourceManager &SM, ArrayRef<SourceFile *> SFs);
+  bool verifyDependencies(SourceManager &SM, const DependencyTracker &DT,
+                          ArrayRef<FileUnit *> SFs);
+  bool verifyDependencies(SourceManager &SM, const DependencyTracker &DT,
+                          ArrayRef<SourceFile *> SFs);
 }
 
 #endif

include/swift/Frontend/FrontendOptions.h

@@ -264,7 +264,7 @@ class FrontendOptions {
   bool DisableInterfaceFileLock = false;
 
   /// Should we enable the dependency verifier for all primary files known to this frontend?
-  bool VerifyDependencies = false;
+  bool EnableIncrementalDependencyVerifier = false;
 
   /// The different modes for validating TBD against the LLVM IR.
   enum class TBDValidationMode {

lib/Driver/Driver.cpp

@@ -179,8 +179,8 @@ static void validateDebugInfoArgs(DiagnosticEngine &diags,
       diags.diagnose(SourceLoc(), diag::error_invalid_debug_prefix_map, A);
 }
 
-static void validateVerifyIncrementalArgs(DiagnosticEngine &diags,
-                                          const ArgList &args) {
+static void validateVerifyIncrementalDependencyArgs(DiagnosticEngine &diags,
+                                                    const ArgList &args) {
   // No option? No problem!
   if (!args.hasArg(options::OPT_verify_incremental_dependencies)) {
     return;
@@ -257,7 +257,7 @@ static void validateArgs(DiagnosticEngine &diags, const ArgList &args,
   validateCompilationConditionArgs(diags, args);
   validateSearchPathArgs(diags, args);
   validateAutolinkingArgs(diags, args, T);
-  validateVerifyIncrementalArgs(diags, args);
+  validateVerifyIncrementalDependencyArgs(diags, args);
 }
 
 std::unique_ptr<ToolChain>

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -176,7 +176,7 @@ bool ArgsToFrontendOptionsConverter::convert(
 
   Opts.EnableSourceImport |= Args.hasArg(OPT_enable_source_import);
   Opts.ImportUnderlyingModule |= Args.hasArg(OPT_import_underlying_module);
-  Opts.VerifyDependencies |= Args.hasArg(OPT_verify_incremental_dependencies);
+  Opts.EnableIncrementalDependencyVerifier |= Args.hasArg(OPT_verify_incremental_dependencies);
 
   computeImportObjCHeaderOptions();
   computeImplicitImportModuleNames();