Merge pull request #11829 from nkcsgexi/unique-ptr-to-optional

Author: swift-ci

include/swift/AST/Module.h

@@ -1073,22 +1073,22 @@ class SourceFile final : public FileUnit {
   }
 
   std::vector<Token> &getTokenVector() {
-    assert(pAllCorrectedTokens && "Disabled");
-    return *pAllCorrectedTokens;
+    assert(shouldKeepTokens() && "Disabled");
+    return *AllCorrectedTokens;
   }
 
   ArrayRef<Token> getAllTokens() const {
-    assert(pAllCorrectedTokens && "Disabled");
-    return *pAllCorrectedTokens;
+    assert(shouldKeepTokens() && "Disabled");
+    return *AllCorrectedTokens;
   }
 
   bool shouldKeepTokens() const {
-    return (bool)pAllCorrectedTokens;
+    return (bool)AllCorrectedTokens;
   }
 
 private:
-  /// If not null, the pointee vector should contain tokens of this source file.
-  std::unique_ptr<std::vector<Token>> pAllCorrectedTokens;
+  /// If not None, the underlying vector should contain tokens of this source file.
+  Optional<std::vector<Token>> AllCorrectedTokens;
 };
 
 

lib/AST/Module.cpp

@@ -1335,7 +1335,7 @@ SourceFile::SourceFile(ModuleDecl &M, SourceFileKind K,
     (void)problem;
   }
   if (KeepTokens) {
-    pAllCorrectedTokens.reset(new std::vector<Token>());
+    AllCorrectedTokens = std::vector<Token>();
   }
 }