Merge pull request #71566 from meg-gupta/fixhash

Fix Lifetime dependence function type hash

Author: meg-gupta

lib/Sema/LifetimeDependence.cpp

@@ -49,9 +49,15 @@ std::string LifetimeDependenceInfo::getString() const {
 
 void LifetimeDependenceInfo::Profile(llvm::FoldingSetNodeID &ID) const {
   if (inheritLifetimeParamIndices) {
+    // Copy and Consume are the same, can be unified if we converge on dependsOn
+    // syntax
+    ID.AddInteger((uint8_t)LifetimeDependenceKind::Copy);
     inheritLifetimeParamIndices->Profile(ID);
   }
   if (scopeLifetimeParamIndices) {
+    // Borrow and Mutate are the same, can be unified if we converge on
+    // dependsOn syntax
+    ID.AddInteger((uint8_t)LifetimeDependenceKind::Borrow);
     scopeLifetimeParamIndices->Profile(ID);
   }
 }

test/SIL/explicit_lifetime_dependence_specifiers.swift

@@ -102,3 +102,21 @@ struct Wrapper : ~Escapable {
     return view
   }
 }
+
+struct Container {
+ let ptr: UnsafeRawBufferPointer
+ init(_ ptr: UnsafeRawBufferPointer) {
+   self.ptr = ptr
+ }
+}
+
+// CHECK-LABEL: sil hidden @$s39explicit_lifetime_dependence_specifiers16getConsumingViewyAA06BufferG0VAA9ContainerVnF : $@convention(thin) (Container) -> _inherit(1) @owned BufferView {
+func getConsumingView(_ x: consuming Container) -> _consume(x) BufferView {
+  return BufferView(x.ptr)
+}
+
+// CHECK: sil hidden @$s39explicit_lifetime_dependence_specifiers16getBorrowingViewyAA06BufferG0VAA9ContainerVF : $@convention(thin) (Container) -> _scope(1) @owned BufferView {
+func getBorrowingView(_ x: borrowing Container) -> _borrow(x) BufferView {
+  return BufferView(x.ptr)
+}
+

test/SILOptimizer/lifetime_dependence_diagnostics.swift

@@ -20,7 +20,7 @@ func bv_copy(_ bv: borrowing BV) -> _copy(bv) BV {
 
 // Diagnostics resolves mark_dependence [nonescaping].
 //
-// CHECK-LABEL: sil hidden @$s4test14bv_borrow_copy0B0AA2BVVAE_tF : $@convention(thin) (@guaranteed BV) -> _inherit(1) @owned BV {
+// CHECK-LABEL: sil hidden @$s4test14bv_borrow_copy0B0AA2BVVAE_tF : $@convention(thin) (@guaranteed BV) -> _scope(1) @owned BV {
 // CHECK: bb0(%0 : @noImplicitCopy $BV):
 // CHECK:   [[R:%.*]] = apply %{{.*}}(%0) : $@convention(thin) (@guaranteed BV) -> _inherit(1) @owned BV
 // CHECK:   [[MD:%.*]] = mark_dependence [nonescaping] [[R]] : $BV on %0 : $BV