Add type info for unique_ptr

Author: CodaFi

include/swift/AST/SILGenRequests.h

@@ -76,7 +76,7 @@ struct SILGenDescriptor {
 
 class GenerateSILRequest :
     public SimpleRequest<GenerateSILRequest,
-                         SILModule *(SILGenDescriptor),
+                         std::unique_ptr<SILModule>(SILGenDescriptor),
                          CacheKind::Uncached> {
 public:
   using SimpleRequest::SimpleRequest;
@@ -85,7 +85,7 @@ class GenerateSILRequest :
   friend SimpleRequest;
 
   // Evaluation.
-  llvm::Expected<SILModule *>
+  llvm::Expected<std::unique_ptr<SILModule>>
   evaluate(Evaluator &evaluator, SILGenDescriptor desc) const;
 
 public:

include/swift/AST/SILGenTypeIDZone.def

@@ -15,5 +15,5 @@
 //===----------------------------------------------------------------------===//
 
 SWIFT_REQUEST(SILGen, GenerateSILRequest,
-              SILModule *(SILGenDescriptor),
+              std::unique_ptr<SILModule>(SILGenDescriptor),
               Uncached, NoLocationInfo)

include/swift/Basic/CTypeIDZone.def

@@ -36,6 +36,7 @@ SWIFT_TYPEID_NAMED(std::string, String)
 
 // C++ standard library types.
 SWIFT_TYPEID_TEMPLATE1_NAMED(std::vector, Vector, typename T, T)
+SWIFT_TYPEID_TEMPLATE1_NAMED(std::unique_ptr, UniquePtr, typename T, T)
 
 // LLVM ADT types.
 SWIFT_TYPEID_TEMPLATE1_NAMED(llvm::TinyPtrVector, TinyPtrVector, typename T, T)

lib/SILGen/SILGen.cpp

@@ -1755,29 +1755,23 @@ std::unique_ptr<SILModule>
 swift::performSILGeneration(ModuleDecl *mod, Lowering::TypeConverter &tc,
                             const SILOptions &options) {
   auto desc = SILGenDescriptor::forWholeModule(mod, tc, options);
-  return std::unique_ptr<SILModule>(
-             evaluateOrDefault(mod->getASTContext().evaluator,
-                               GenerateSILRequest{desc},
-                               nullptr));
+  return llvm::cantFail(mod->getASTContext().evaluator(GenerateSILRequest{desc}));
 }
 
 std::unique_ptr<SILModule>
 swift::performSILGeneration(FileUnit &sf, Lowering::TypeConverter &tc,
                             const SILOptions &options) {
   auto desc = SILGenDescriptor::forFile(sf, tc, options);
-  return std::unique_ptr<SILModule>(
-             evaluateOrDefault(sf.getASTContext().evaluator,
-                               GenerateSILRequest{desc},
-                               nullptr));
+  return llvm::cantFail(sf.getASTContext().evaluator(GenerateSILRequest{desc}));
 }
 
-llvm::Expected<SILModule *>
+llvm::Expected<std::unique_ptr<SILModule>>
 GenerateSILRequest::evaluate(Evaluator &evaluator, SILGenDescriptor sgd) const {
   if (auto *MD = sgd.context.dyn_cast<ModuleDecl *>()) {
-    return SILModule::constructSIL(MD, sgd.conv, sgd.opts, nullptr).release();
+    return SILModule::constructSIL(MD, sgd.conv, sgd.opts, nullptr);
   } else {
     auto *SF = sgd.context.get<FileUnit *>();
     return SILModule::constructSIL(SF->getParentModule(),
-                                   sgd.conv, sgd.opts, SF).release();
+                                   sgd.conv, sgd.opts, SF);
   }
 }

lib/SILGen/SILGenRequests.cpp

@@ -1,4 +1,4 @@
-//===--- Condition.cpp - Implements the SILGen Condition class ------------===//
+//===--- SILGenRequests.cpp - Requests for SIL Generation  ----------------===//
 //
 // This source file is part of the Swift.org open source project
 //