Use LifetimeDependenceInfo while computing FunctionType's id

Author: meg-gupta

include/swift/AST/ExtInfo.h

@@ -174,14 +174,16 @@ class LifetimeDependenceInfo {
         borrowLifetimeParamIndices(borrowLifetimeParamIndices),
         mutateLifetimeParamIndices(mutateLifetimeParamIndices) {}
 
-  operator bool() const { return empty(); }
+  operator bool() const { return !empty(); }
 
   bool empty() const {
     return inheritLifetimeParamIndices == nullptr &&
            borrowLifetimeParamIndices == nullptr &&
            mutateLifetimeParamIndices == nullptr;
   }
   std::string getString() const;
+
+  void Profile(llvm::FoldingSetNodeID &ID) const;
 };
 
 // MARK: - UnexpectedClangTypeError
@@ -690,20 +692,21 @@ class ASTExtInfoBuilder {
              lifetimeDependenceInfo);
   }
 
+  void Profile(llvm::FoldingSetNodeID &ID) const {
+    ID.AddInteger(bits);
+    ID.AddPointer(clangTypeInfo.getType());
+    ID.AddPointer(globalActor.getPointer());
+    ID.AddPointer(thrownError.getPointer());
+    lifetimeDependenceInfo.Profile(ID);
+  }
+
   bool isEqualTo(ASTExtInfoBuilder other, bool useClangTypes) const {
     return bits == other.bits &&
            (useClangTypes ? (clangTypeInfo == other.clangTypeInfo) : true) &&
            globalActor.getPointer() == other.globalActor.getPointer() &&
            thrownError.getPointer() == other.thrownError.getPointer() &&
            lifetimeDependenceInfo == other.lifetimeDependenceInfo;
   }
-
-  constexpr std::tuple<unsigned, const void *, const void *, const void *>
-  getFuncAttrKey() const {
-    return std::make_tuple(
-        bits, clangTypeInfo.getType(), globalActor.getPointer(),
-        thrownError.getPointer());
-  }
 }; // end ASTExtInfoBuilder
 
 // MARK: - ASTExtInfo
@@ -850,14 +853,11 @@ class ASTExtInfo {
     return builder.withLifetimeDependenceInfo(lifetimeDependenceInfo).build();
   }
 
+  void Profile(llvm::FoldingSetNodeID &ID) const { builder.Profile(ID); }
+
   bool isEqualTo(ASTExtInfo other, bool useClangTypes) const {
     return builder.isEqualTo(other.builder, useClangTypes);
   }
-
-  constexpr std::tuple<unsigned, const void *, const void *, const void *>
-  getFuncAttrKey() const {
-    return builder.getFuncAttrKey();
-  }
 }; // end ASTExtInfo
 
 // MARK: - SILFunctionLanguage
@@ -1122,14 +1122,16 @@ class SILExtInfoBuilder {
     return SILExtInfoBuilder(bits, clangTypeInfo, lifetimeDependenceInfo);
   }
 
+  void Profile(llvm::FoldingSetNodeID &ID) const {
+    ID.AddInteger(bits);
+    ID.AddPointer(clangTypeInfo.getType());
+    lifetimeDependenceInfo.Profile(ID);
+  }
+
   bool isEqualTo(SILExtInfoBuilder other, bool useClangTypes) const {
     return bits == other.bits &&
            (useClangTypes ? (clangTypeInfo == other.clangTypeInfo) : true);
   }
-
-  constexpr std::pair<unsigned, const void *> getFuncAttrKey() const {
-    return std::make_pair(bits, clangTypeInfo.getType());
-  }
 }; // end SILExtInfoBuilder
 
 // MARK: - SILExtInfo
@@ -1243,14 +1245,12 @@ class SILExtInfo {
     return builder.withUnimplementable(isUnimplementable).build();
   }
 
+  void Profile(llvm::FoldingSetNodeID &ID) const { builder.Profile(ID); }
+
   bool isEqualTo(SILExtInfo other, bool useClangTypes) const {
     return builder.isEqualTo(other.builder, useClangTypes);
   }
 
-  constexpr std::pair<unsigned, const void *> getFuncAttrKey() const {
-    return builder.getFuncAttrKey();
-  }
-
   llvm::Optional<UnexpectedClangTypeError> checkClangType() const;
 };
 

include/swift/AST/LifetimeDependence.h

@@ -93,6 +93,7 @@ class LifetimeDependenceSpecifier {
     assert(specifierKind == SpecifierKind::Ordered);
     return value.Ordered.index;
   }
+
   std::string getParamString() const {
     switch (specifierKind) {
     case SpecifierKind::Named:

lib/AST/ASTContext.cpp

@@ -4177,11 +4177,7 @@ void FunctionType::Profile(llvm::FoldingSetNodeID &ID,
   profileParams(ID, params);
   ID.AddPointer(result.getPointer());
   if (info.has_value()) {
-    auto infoKey = info.value().getFuncAttrKey();
-    ID.AddInteger(std::get<0>(infoKey));
-    ID.AddPointer(std::get<1>(infoKey));
-    ID.AddPointer(std::get<2>(infoKey));
-    ID.AddPointer(std::get<3>(infoKey));
+    info->Profile(ID);
   }
 }
 
@@ -4306,11 +4302,7 @@ void GenericFunctionType::Profile(llvm::FoldingSetNodeID &ID,
   profileParams(ID, params);
   ID.AddPointer(result.getPointer());
   if (info.has_value()) {
-    auto infoKey = info.value().getFuncAttrKey();
-    ID.AddInteger(std::get<0>(infoKey));
-    ID.AddPointer(std::get<1>(infoKey));
-    ID.AddPointer(std::get<2>(infoKey));
-    ID.AddPointer(std::get<3>(infoKey));
+    info->Profile(ID);
   }
 }
 
@@ -4446,9 +4438,7 @@ void SILFunctionType::Profile(
     ProtocolConformanceRef conformance, SubstitutionMap patternSubs,
     SubstitutionMap invocationSubs) {
   id.AddPointer(genericParams.getPointer());
-  auto infoKey = info.getFuncAttrKey();
-  id.AddInteger(infoKey.first);
-  id.AddPointer(infoKey.second);
+  info.Profile(id);
   id.AddInteger(unsigned(coroutineKind));
   id.AddInteger(unsigned(calleeConvention));
   id.AddInteger(params.size());

lib/AST/ExtInfo.cpp

@@ -89,6 +89,18 @@ std::string LifetimeDependenceInfo::getString() const {
   return lifetimeDependenceString;
 }
 
+void LifetimeDependenceInfo::Profile(llvm::FoldingSetNodeID &ID) const {
+  if (inheritLifetimeParamIndices) {
+    inheritLifetimeParamIndices->Profile(ID);
+  }
+  if (borrowLifetimeParamIndices) {
+    borrowLifetimeParamIndices->Profile(ID);
+  }
+  if (mutateLifetimeParamIndices) {
+    mutateLifetimeParamIndices->Profile(ID);
+  }
+}
+
 // MARK: - UnexpectedClangTypeError
 
 llvm::Optional<UnexpectedClangTypeError>