Have TBDGenDescriptor take ownership of TBDGenOptions

This is necessary for caching TBD requests.

Author: hamishknight

include/swift/AST/TBDGenRequests.h

@@ -19,6 +19,7 @@
 
 #include "swift/AST/ASTTypeIDs.h"
 #include "swift/AST/SimpleRequest.h"
+#include "swift/TBDGen/TBDGen.h"
 
 namespace llvm {
 
@@ -37,12 +38,11 @@ namespace swift {
 
 class FileUnit;
 class ModuleDecl;
-struct TBDGenOptions;
 
 class TBDGenDescriptor final {
   using FileOrModule = llvm::PointerUnion<FileUnit *, ModuleDecl *>;
   FileOrModule Input;
-  const TBDGenOptions &Opts;
+  TBDGenOptions Opts;
 
   TBDGenDescriptor(FileOrModule input, const TBDGenOptions &opts)
       : Input(input), Opts(opts) {
@@ -62,6 +62,7 @@ class TBDGenDescriptor final {
 
   /// Returns the TBDGen options.
   const TBDGenOptions &getOptions() const { return Opts; }
+  TBDGenOptions &getOptions() { return Opts; }
 
   const llvm::DataLayout &getDataLayout() const;
   const llvm::Triple &getTarget() const;

include/swift/TBDGen/TBDGen.h

@@ -14,7 +14,6 @@
 
 #include "llvm/ADT/Hashing.h"
 #include "llvm/ADT/StringSet.h"
-#include "swift/AST/TBDGenRequests.h"
 #include "swift/Basic/Version.h"
 #include <vector>
 
@@ -25,6 +24,7 @@ class raw_ostream;
 namespace swift {
 class FileUnit;
 class ModuleDecl;
+class TBDGenDescriptor;
 
 /// Options for controlling the exact set of symbols included in the TBD
 /// output.

lib/FrontendTool/FrontendTool.cpp

@@ -35,6 +35,7 @@
 #include "swift/AST/IRGenRequests.h"
 #include "swift/AST/NameLookup.h"
 #include "swift/AST/ASTMangler.h"
+#include "swift/AST/TBDGenRequests.h"
 #include "swift/AST/TypeRefinementContext.h"
 #include "swift/Basic/Dwarf.h"
 #include "swift/Basic/Edit.h"

lib/FrontendTool/TBD.cpp

@@ -17,6 +17,7 @@
 #include "swift/AST/DiagnosticsFrontend.h"
 #include "swift/AST/FileUnit.h"
 #include "swift/AST/Module.h"
+#include "swift/AST/TBDGenRequests.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Demangling/Demangle.h"
 #include "swift/Frontend/FrontendOptions.h"

lib/IRGen/IRGenRequests.cpp

@@ -16,8 +16,8 @@
 #include "swift/AST/Module.h"
 #include "swift/AST/SourceFile.h"
 #include "swift/SIL/SILModule.h"
+#include "swift/AST/TBDGenRequests.h"
 #include "swift/Subsystems.h"
-#include "swift/TBDGen/TBDGen.h"
 #include "llvm/IR/Module.h"
 #include "llvm/ExecutionEngine/Orc/ThreadSafeModule.h"
 

lib/TBDGen/TBDGen.cpp

@@ -61,7 +61,7 @@ static bool isGlobalOrStaticVar(VarDecl *VD) {
   return VD->isStatic() || VD->getDeclContext()->isModuleScopeContext();
 }
 
-TBDGenVisitor::TBDGenVisitor(TBDGenDescriptor desc,
+TBDGenVisitor::TBDGenVisitor(const TBDGenDescriptor &desc,
                              SymbolCallbackFn symbolCallback)
     : TBDGenVisitor(desc.getTarget(), desc.getDataLayout(),
                     desc.getParentModule(), desc.getOptions(),

lib/TBDGen/TBDGenVisitor.h

@@ -150,7 +150,7 @@ class TBDGenVisitor : public ASTVisitor<TBDGenVisitor> {
 
   /// Create a new visitor using the target and layout information from a
   /// TBDGenDescriptor.
-  TBDGenVisitor(TBDGenDescriptor desc, SymbolCallbackFn symbolCallback);
+  TBDGenVisitor(const TBDGenDescriptor &desc, SymbolCallbackFn symbolCallback);
 
   ~TBDGenVisitor() { assert(DeclStack.empty()); }
   void addMainIfNecessary(FileUnit *file) {