Merge pull request swiftlang#34700 from CodaFi/time-extended!

Unconditionally Record Type Body Fingerprints

Author: CodaFi

include/swift/AST/DeclContext.h

@@ -873,8 +873,6 @@ class IterableDeclContext {
   /// available.
   Optional<std::string> getBodyFingerprint() const;
 
-  bool areTokensHashedForThisBodyInsteadOfInterfaceHash() const;
-
 private:
   /// Add a member to the list for iteration purposes, but do not notify the
   /// subclass that we have done so.

lib/AST/DeclContext.cpp

@@ -1022,16 +1022,6 @@ Optional<std::string> IterableDeclContext::getBodyFingerprint() const {
       .fingerprint;
 }
 
-bool IterableDeclContext::areTokensHashedForThisBodyInsteadOfInterfaceHash()
-    const {
-  // Do not keep separate hashes for extension bodies because the dependencies
-  // can miss the addition of a member in an extension because there is nothing
-  // corresponding to the fingerprinted nominal dependency node.
-  if (isa<ExtensionDecl>(this))
-    return false;
-  return true;
-}
-
 /// Return the DeclContext to compare when checking private access in
 /// Swift 4 mode. The context returned is the type declaration if the context
 /// and the type declaration are in the same file, otherwise it is the types

lib/Parse/ParseDecl.cpp

@@ -4765,12 +4765,9 @@ Parser::parseDeclList(SourceLoc LBLoc, SourceLoc &RBLoc, Diag<> ErrorDiag,
 
   // If we're hashing the type body separately, record the curly braces but
   // nothing inside for the interface hash.
-  Optional<llvm::SaveAndRestore<Optional<llvm::MD5>>> MemberHashingScope;
-  if (IDC->areTokensHashedForThisBodyInsteadOfInterfaceHash()) {
-    recordTokenHash("{");
-    recordTokenHash("}");
-    MemberHashingScope.emplace(CurrentTokenHash, llvm::MD5());
-  }
+  llvm::SaveAndRestore<Optional<llvm::MD5>> MemberHashingScope{CurrentTokenHash, llvm::MD5()};
+  recordTokenHash("{");
+  recordTokenHash("}");
 
   std::vector<Decl *> decls;
   ParserStatus Status;
@@ -4802,8 +4799,7 @@ Parser::parseDeclList(SourceLoc LBLoc, SourceLoc &RBLoc, Diag<> ErrorDiag,
     hadError = true;
 
   llvm::MD5::MD5Result result;
-  auto declListHash = MemberHashingScope ? *CurrentTokenHash : llvm::MD5();
-  declListHash.final(result);
+  CurrentTokenHash->final(result);
   llvm::SmallString<32> tokenHashString;
   llvm::MD5::stringifyResult(result, tokenHashString);
   return std::make_pair(decls, tokenHashString.str().str());

test/Incremental/Fingerprints/Inputs/extension-adds-member/definesAB-after.swift

@@ -3,7 +3,7 @@ struct A {
 struct B {
 }
 extension A {
-  var x: Int {17}
+  init(_ x: String = "") {}
 }
 extension B {
 }