Replace explicit 'delete' calls with std::unique_ptr in AST (#19366)

Author: jrose-apple

include/swift/AST/Module.h

@@ -890,8 +890,6 @@ class SourceFile final : public FileUnit {
 
   friend ASTContext;
   friend Impl;
-
-  ~SourceFile();
 public:
   /// The list of top-level declarations in the source file.
   std::vector<Decl*> Decls;
@@ -1164,7 +1162,7 @@ class SourceFile final : public FileUnit {
   /// If not None, the underlying vector should contain tokens of this source file.
   Optional<std::vector<Token>> AllCorrectedTokens;
 
-  SourceFileSyntaxInfo &SyntaxInfo;
+  std::unique_ptr<SourceFileSyntaxInfo> SyntaxInfo;
 };
 
 

include/swift/AST/TypeCheckerDebugConsumer.h

@@ -37,11 +37,10 @@ class StderrTypeCheckerDebugConsumer : public TypeCheckerDebugConsumer {
 
 /// \brief A base class for a custom consumer of type checker debug output.
 class CapturingTypeCheckerDebugConsumer : public TypeCheckerDebugConsumer {
-  raw_ostream *Log;
+  std::unique_ptr<raw_ostream> Log;
 
 public:
   CapturingTypeCheckerDebugConsumer();
-  ~CapturingTypeCheckerDebugConsumer();
 
   raw_ostream &getStream() override {
     return *Log;

lib/AST/ASTContext.cpp

@@ -4306,10 +4306,6 @@ CapturingTypeCheckerDebugConsumer::CapturingTypeCheckerDebugConsumer()
   Log->SetUnbuffered();
 }
 
-CapturingTypeCheckerDebugConsumer::~CapturingTypeCheckerDebugConsumer() {
-  delete Log;
-}
-
 void SubstitutionMap::Storage::Profile(
                                llvm::FoldingSetNodeID &id,
                                GenericSignature *genericSig,

lib/AST/Module.cpp

@@ -774,16 +774,16 @@ struct SourceFile::SourceFileSyntaxInfo {
 };
 
 bool SourceFile::hasSyntaxRoot() const {
-  return SyntaxInfo.SyntaxRoot.hasValue();
+  return SyntaxInfo->SyntaxRoot.hasValue();
 }
 
 syntax::SourceFileSyntax SourceFile::getSyntaxRoot() const {
   assert(hasSyntaxRoot() && "no syntax root is set.");
-  return *SyntaxInfo.SyntaxRoot;
+  return *SyntaxInfo->SyntaxRoot;
 }
 
 void SourceFile::setSyntaxRoot(syntax::SourceFileSyntax &&Root) {
-  SyntaxInfo.SyntaxRoot.emplace(Root);
+  SyntaxInfo->SyntaxRoot.emplace(Root);
 }
 
 template<typename OP_DECL>
@@ -1431,7 +1431,7 @@ SourceFile::SourceFile(ModuleDecl &M, SourceFileKind K,
                        bool KeepParsedTokens, bool BuildSyntaxTree)
   : FileUnit(FileUnitKind::Source, M),
     BufferID(bufferID ? *bufferID : -1),
-    Kind(K), SyntaxInfo(*new SourceFileSyntaxInfo(BuildSyntaxTree)) {
+    Kind(K), SyntaxInfo(new SourceFileSyntaxInfo(BuildSyntaxTree)) {
   M.getASTContext().addDestructorCleanup(*this);
   performAutoImport(*this, ModImpKind);
 
@@ -1445,8 +1445,6 @@ SourceFile::SourceFile(ModuleDecl &M, SourceFileKind K,
   }
 }
 
-SourceFile::~SourceFile() { delete &SyntaxInfo; }
-
 std::vector<Token> &SourceFile::getTokenVector() {
   assert(shouldCollectToken() && "Disabled");
   return *AllCorrectedTokens;
@@ -1475,7 +1473,7 @@ bool SourceFile::shouldBuildSyntaxTree() const {
   case SourceFileKind::Library:
   case SourceFileKind::Main:
   case SourceFileKind::Interface:
-    return SyntaxInfo.Enable;
+    return SyntaxInfo->Enable;
   case SourceFileKind::REPL:
   case SourceFileKind::SIL:
     return false;