Merge pull request #77857 from swiftlang/egorzhdan/cxxstdlib-build-cr…

…ash-windows [cxx-interop] Workaround a compiler crash for CxxStdlib on Windows
swiftlang · Nov 28, 2024 · c690fef · c690fef
2 parents b13544e + 7473eae
commit c690fef
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/stdlib/public/Cxx/std/String.swift b/stdlib/public/Cxx/std/String.swift
@@ -198,7 +198,11 @@ extension std.string: Hashable {
   @_alwaysEmitIntoClient
   public func hash(into hasher: inout Hasher) {
     // Call std::hash<std::string>::operator()
+#if os(Windows) // FIXME: https://github.com/swiftlang/swift/issues/77856
+    let cxxHash = __swift_interopHashOfString().callAsFunction(self)
+#else
     let cxxHash = __swift_interopComputeHashOfString(self)
+#endif
     hasher.combine(cxxHash)
   }
 }
@@ -207,7 +211,11 @@ extension std.u16string: Hashable {
   @_alwaysEmitIntoClient
   public func hash(into hasher: inout Hasher) {
     // Call std::hash<std::u16string>::operator()
+#if os(Windows) // FIXME: https://github.com/swiftlang/swift/issues/77856
+    let cxxHash = __swift_interopHashOfU16String().callAsFunction(self)
+#else
     let cxxHash = __swift_interopComputeHashOfU16String(self)
+#endif
     hasher.combine(cxxHash)
   }
 }
@@ -216,7 +224,11 @@ extension std.u32string: Hashable {
   @_alwaysEmitIntoClient
   public func hash(into hasher: inout Hasher) {
     // Call std::hash<std::u32string>::operator()
+#if os(Windows) // FIXME: https://github.com/swiftlang/swift/issues/77856
+    let cxxHash = __swift_interopHashOfU32String().callAsFunction(self)
+#else
     let cxxHash = __swift_interopComputeHashOfU32String(self)
+#endif
     hasher.combine(cxxHash)
   }
 }