[SourceKit] Compute type relations for global code completion items from the cache

include/swift/IDE/CodeCompletionCache.h

@@ -32,6 +32,9 @@ class OnDiskCodeCompletionCache;
 class CodeCompletionCache {
   std::unique_ptr<CodeCompletionCacheImpl> Impl;
   OnDiskCodeCompletionCache *nextCache;
+  /// The arena in which the types for the completion results cached by this
+  /// \c CodeCompletionCache are stored.
+  CodeCompletionResultTypeArenaRef ResultTypeArena;
 
 public:
   /// Cache key.
@@ -58,18 +61,31 @@ class CodeCompletionCache {
   };
 
   struct Value : public llvm::ThreadSafeRefCountedBase<Value> {
+    using AllocatorPtr = std::shared_ptr<llvm::BumpPtrAllocator>;
+
+    /// The allocator used to allocate the results stored in this cache.
+    AllocatorPtr Allocator;
+
     llvm::sys::TimePoint<> ModuleModificationTime;
-    CodeCompletionResultSink Sink;
+
+    std::vector<ContextFreeCodeCompletionResult *> Results;
+
+    Value() : Allocator(std::make_shared<llvm::BumpPtrAllocator>()) {}
   };
   using ValueRefCntPtr = llvm::IntrusiveRefCntPtr<Value>;
 
-  CodeCompletionCache(OnDiskCodeCompletionCache *nextCache = nullptr);
+  CodeCompletionCache(const CodeCompletionResultTypeArenaRef &ResultTypeArena,
+                      OnDiskCodeCompletionCache *nextCache = nullptr);
   ~CodeCompletionCache();
 
   static ValueRefCntPtr createValue();
   Optional<ValueRefCntPtr> get(const Key &K);
   void set(const Key &K, ValueRefCntPtr V) { setImpl(K, V, /*setChain*/ true); }
 
+  const CodeCompletionResultTypeArenaRef &getResultTypeArena() const {
+    return ResultTypeArena;
+  }
+
 private:
   void setImpl(const Key &K, ValueRefCntPtr V, bool setChain);
 };
@@ -89,10 +105,13 @@ class OnDiskCodeCompletionCache {
   OnDiskCodeCompletionCache(Twine cacheDirectory);
   ~OnDiskCodeCompletionCache();
 
-  Optional<ValueRefCntPtr> get(const Key &K);
+  Optional<ValueRefCntPtr>
+  get(const Key &K, const CodeCompletionResultTypeArenaRef &ResultTypeArena);
   std::error_code set(const Key &K, ValueRefCntPtr V);
 
-  static Optional<ValueRefCntPtr> getFromFile(StringRef filename);
+  static Optional<ValueRefCntPtr>
+  getFromFile(StringRef filename,
+              const CodeCompletionResultTypeArenaRef &ResultTypeArena);
 };
 
 struct RequestedCachedModule {

include/swift/IDE/REPLCodeCompletion.h

@@ -74,7 +74,7 @@ class REPLCompletions {
 
 public:
   /// Create an invalid completion set.
-  REPLCompletions();
+  REPLCompletions(const ide::CodeCompletionResultTypeArenaRef &ResultTypeArena);
 
   /// Create completion results for the given string.
   void populate(SourceFile &SF, StringRef EnteredCode);