[clang][deps][cas] Remove DependencyScanningConsumerBase

The separation between DependencyConsumer and
DependencyScanningConsumerBase was causing spurious merge issues. There
is no type safety provided by having an empty base class, so just use
the main consumer and make all the base callbacks error.

Author: benlangmuir

clang/include/clang/Tooling/DependencyScanning/DependencyScanningWorker.h

@@ -34,13 +34,10 @@ namespace dependencies {
 
 class DependencyScanningWorkerFilesystem;
 
-class DependencyScanningConsumerBase {
+class DependencyConsumer {
 public:
-  virtual ~DependencyScanningConsumerBase() {}
-};
+  virtual ~DependencyConsumer() {}
 
-class DependencyConsumer : public DependencyScanningConsumerBase {
-public:
   virtual void
   handleDependencyOutputOpts(const DependencyOutputOptions &Opts) = 0;
 
@@ -55,14 +52,31 @@ class DependencyConsumer : public DependencyScanningConsumerBase {
 
 // FIXME: This may need to merge with \p DependencyConsumer in order to support
 // clang modules for the include-tree.
-class PPIncludeActionsConsumer : public DependencyScanningConsumerBase {
+class PPIncludeActionsConsumer : public DependencyConsumer {
 public:
   virtual void enteredInclude(Preprocessor &PP, FileID FID) = 0;
 
   virtual void exitedInclude(Preprocessor &PP, FileID IncludedBy,
                              FileID Include, SourceLocation ExitLoc) = 0;
 
   virtual void handleHasIncludeCheck(Preprocessor &PP, bool Result) = 0;
+
+protected:
+  void handleDependencyOutputOpts(const DependencyOutputOptions &Opts) override {
+    llvm::report_fatal_error("unexpected callback for include-tree");
+  }
+  void handleFileDependency(StringRef Filename) override {
+    llvm::report_fatal_error("unexpected callback for include-tree");
+  }
+  void handlePrebuiltModuleDependency(PrebuiltModuleDep PMD) override {
+    llvm::report_fatal_error("unexpected callback for include-tree");
+  }
+  void handleModuleDependency(ModuleDeps MD) override {
+    llvm::report_fatal_error("unexpected callback for include-tree");
+  }
+  void handleContextHash(std::string Hash) override {
+    llvm::report_fatal_error("unexpected callback for include-tree");
+  }
 };
 
 /// An individual dependency scanning worker that is able to run on its own
@@ -85,7 +99,7 @@ class DependencyScanningWorker {
   /// occurred, success otherwise.
   llvm::Error computeDependencies(StringRef WorkingDirectory,
                                   const std::vector<std::string> &CommandLine,
-                                  DependencyScanningConsumerBase &Consumer,
+                                  DependencyConsumer &Consumer,
                                   llvm::Optional<StringRef> ModuleName = None);
 
   /// Scan from a compiler invocation.
@@ -95,7 +109,7 @@ class DependencyScanningWorker {
   /// \p DiagOpts.DiagnosticSerializationFile setting is set for the invocation.
   void computeDependenciesFromCompilerInvocation(
       std::shared_ptr<CompilerInvocation> Invocation,
-      StringRef WorkingDirectory, DependencyScanningConsumerBase &Consumer,
+      StringRef WorkingDirectory, DependencyConsumer &Consumer,
       DiagnosticConsumer &DiagsConsumer, raw_ostream *VerboseOS,
       bool DiagGenerationAsCompilation);
 

clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp

@@ -195,7 +195,7 @@ class IncludeTreeCollector : public DependencyFileGenerator {
 class DependencyScanningAction : public tooling::ToolAction {
 public:
   DependencyScanningAction(
-      StringRef WorkingDirectory, DependencyScanningConsumerBase &Consumer,
+      StringRef WorkingDirectory, DependencyConsumer &Consumer,
       const CASOptions &CASOpts,
       llvm::IntrusiveRefCntPtr<DependencyScanningWorkerFilesystem> DepFS,
       llvm::IntrusiveRefCntPtr<DependencyScanningCASFilesystem> DepCASFS,
@@ -315,8 +315,7 @@ class DependencyScanningAction : public tooling::ToolAction {
     case ScanningOutputFormat::Tree:
       ScanInstance.addDependencyCollector(
           std::make_shared<DependencyConsumerForwarder>(
-              std::move(Opts), WorkingDirectory,
-              static_cast<DependencyConsumer &>(Consumer), EmitDependencyFile));
+              std::move(Opts), WorkingDirectory, Consumer, EmitDependencyFile));
       break;
     case ScanningOutputFormat::IncludeTree: {
       ScanInstance.addDependencyCollector(
@@ -328,8 +327,7 @@ class DependencyScanningAction : public tooling::ToolAction {
     case ScanningOutputFormat::Full:
     case ScanningOutputFormat::FullTree:
       ScanInstance.addDependencyCollector(std::make_shared<ModuleDepCollector>(
-          std::move(Opts), ScanInstance,
-          static_cast<DependencyConsumer &>(Consumer),
+          std::move(Opts), ScanInstance, Consumer,
           std::move(OriginalInvocation), OptimizeArgs));
       break;
     }
@@ -372,7 +370,7 @@ class DependencyScanningAction : public tooling::ToolAction {
 
 private:
   StringRef WorkingDirectory;
-  DependencyScanningConsumerBase &Consumer;
+  DependencyConsumer &Consumer;
   const CASOptions &CASOpts;
   llvm::IntrusiveRefCntPtr<DependencyScanningWorkerFilesystem> DepFS;
   llvm::IntrusiveRefCntPtr<DependencyScanningCASFilesystem> DepCASFS;
@@ -452,8 +450,7 @@ runWithDiags(DiagnosticOptions *DiagOpts,
 
 llvm::Error DependencyScanningWorker::computeDependencies(
     StringRef WorkingDirectory, const std::vector<std::string> &CommandLine,
-    DependencyScanningConsumerBase &Consumer,
-    llvm::Optional<StringRef> ModuleName) {
+    DependencyConsumer &Consumer, llvm::Optional<StringRef> ModuleName) {
   // Reset what might have been modified in the previous worker invocation.
   RealFS->setCurrentWorkingDirectory(WorkingDirectory);
   if (Files)
@@ -503,9 +500,8 @@ llvm::Error DependencyScanningWorker::computeDependencies(
 
 void DependencyScanningWorker::computeDependenciesFromCompilerInvocation(
     std::shared_ptr<CompilerInvocation> Invocation, StringRef WorkingDirectory,
-    DependencyScanningConsumerBase &DepsConsumer,
-    DiagnosticConsumer &DiagsConsumer, raw_ostream *VerboseOS,
-    bool DiagGenerationAsCompilation) {
+    DependencyConsumer &DepsConsumer, DiagnosticConsumer &DiagsConsumer,
+    raw_ostream *VerboseOS, bool DiagGenerationAsCompilation) {
   RealFS->setCurrentWorkingDirectory(WorkingDirectory);
 
   // Adjust the invocation.