IDE: Add CodeCompleteInitsInPostfixExpr to completion cache key

This fixes a source of non-determinism. The IDE/complete_constructor
test would sometimes fail depending on the order in which prior tests
ran, since those prior tests might populate the code completion cache.

Author: slavapestov

include/swift/IDE/CodeCompletionCache.h

@@ -39,13 +39,15 @@ class CodeCompletionCache {
     std::vector<std::string> AccessPath;
     bool ResultsHaveLeadingDot;
     bool ForTestableLookup;
+    bool CodeCompleteInitsInPostfixExpr;
 
     friend bool operator==(const Key &LHS, const Key &RHS) {
       return LHS.ModuleFilename == RHS.ModuleFilename &&
-      LHS.ModuleName == RHS.ModuleName &&
-      LHS.AccessPath == RHS.AccessPath &&
-      LHS.ResultsHaveLeadingDot == RHS.ResultsHaveLeadingDot &&
-      LHS.ForTestableLookup == RHS.ForTestableLookup;
+        LHS.ModuleName == RHS.ModuleName &&
+        LHS.AccessPath == RHS.AccessPath &&
+        LHS.ResultsHaveLeadingDot == RHS.ResultsHaveLeadingDot &&
+        LHS.ForTestableLookup == RHS.ForTestableLookup &&
+        LHS.CodeCompleteInitsInPostfixExpr == RHS.CodeCompleteInitsInPostfixExpr;
     }
   };
 
@@ -101,10 +103,10 @@ template<>
 struct DenseMapInfo<swift::ide::CodeCompletionCache::Key> {
   using KeyTy = swift::ide::CodeCompletionCache::Key;
   static inline KeyTy getEmptyKey() {
-    return KeyTy{"", "", {}, false, false};
+    return KeyTy{"", "", {}, false, false, false};
   }
   static inline KeyTy getTombstoneKey() {
-    return KeyTy{"", "", {}, true, false};
+    return KeyTy{"", "", {}, true, false, false};
   }
   static unsigned getHashValue(const KeyTy &Val) {
     size_t H = 0;

lib/IDE/CodeCompletion.cpp

@@ -5377,9 +5377,11 @@ void CodeCompletionCallbacksImpl::doneParsing() {
       // ModuleFilename can be empty if something strange happened during
       // module loading, for example, the module file is corrupted.
       if (!ModuleFilename.empty()) {
+        auto &Ctx = TheModule->getASTContext();
         CodeCompletionCache::Key K{ModuleFilename, TheModule->getName().str(),
                                    AccessPath, Request.NeedLeadingDot,
-                                   SF.hasTestableImport(TheModule)};
+                                   SF.hasTestableImport(TheModule),
+                                   Ctx.LangOpts.CodeCompleteInitsInPostfixExpr};
         std::pair<decltype(ImportsSeen)::iterator, bool>
         Result = ImportsSeen.insert(K);
         if (!Result.second)

lib/IDE/CodeCompletionCache.cpp

@@ -88,7 +88,7 @@ CodeCompletionCache::~CodeCompletionCache() {}
 ///
 /// This should be incremented any time we commit a change to the format of the
 /// cached results. This isn't expected to change very often.
-static constexpr uint32_t onDiskCompletionCacheVersion = 0;
+static constexpr uint32_t onDiskCompletionCacheVersion = 1;
 
 static StringRef copyString(llvm::BumpPtrAllocator &Allocator, StringRef Str) {
   char *Mem = Allocator.Allocate<char>(Str.size());
@@ -297,6 +297,7 @@ static void writeCachedModule(llvm::raw_ostream &out,
       OSS << p << "\0";
     OSSLE.write(K.ResultsHaveLeadingDot);
     OSSLE.write(K.ForTestableLookup);
+    OSSLE.write(K.CodeCompleteInitsInPostfixExpr);
     LE.write(static_cast<uint32_t>(OSS.tell()));   // Size of debug info
     out.write(OSS.str().data(), OSS.str().size()); // Debug info blob
   }
@@ -404,9 +405,10 @@ static std::string getName(StringRef cacheDirectory,
   llvm::sys::path::append(name, K.ModuleName);
   llvm::raw_svector_ostream OSS(name);
 
-  // name[-dot][-testable]
+  // name[-dot][-testable][-inits]
   OSS << (K.ResultsHaveLeadingDot ? "-dot" : "")
-      << (K.ForTestableLookup ? "-testable" : "");
+      << (K.ForTestableLookup ? "-testable" : "")
+      << (K.CodeCompleteInitsInPostfixExpr ? "-inits" : "");
 
   // name[-access-path-components]
   for (StringRef component : K.AccessPath)
@@ -471,7 +473,7 @@ OnDiskCodeCompletionCache::getFromFile(StringRef filename) {
     return None;
 
   // Make up a key for readCachedModule.
-  CodeCompletionCache::Key K{filename, "<module-name>", {}, false, false};
+  CodeCompletionCache::Key K{filename, "<module-name>", {}, false, false, false};
 
   // Read the cached results.
   auto V = CodeCompletionCache::createValue();