Merge pull request #4565 from swiftwasm/release/5.7

[pull] swiftwasm-release/5.7 from release/5.7

Author: kateinoigakukun

stdlib/public/Concurrency/Deque.swift

@@ -417,7 +417,7 @@ struct _Deque<Element> {
 internal func _internalInvariant(
   _ condition: @autoclosure () -> Bool,
   _ message: @autoclosure () -> String = String(),
-  file: StaticString = #file, line: UInt = #line
+  file: StaticString = #fileID, line: UInt = #line
 ) {
   #if INTERNAL_CHECKS_ENABLED
   assert(condition(), message(), file: file, line: line)

stdlib/public/Concurrency/TaskLocal.swift

@@ -136,7 +136,7 @@ public final class TaskLocal<Value: Sendable>: Sendable, CustomStringConvertible
   /// the operation closure.
   @discardableResult
   public func withValue<R>(_ valueDuringOperation: Value, operation: () async throws -> R,
-                           file: String = #file, line: UInt = #line) async rethrows -> R {
+                           file: String = #fileID, line: UInt = #line) async rethrows -> R {
     // check if we're not trying to bind a value from an illegal context; this may crash
     _checkIllegalTaskLocalBindingWithinWithTaskGroup(file: file, line: line)
 
@@ -161,7 +161,7 @@ public final class TaskLocal<Value: Sendable>: Sendable, CustomStringConvertible
   /// the operation closure.
   @discardableResult
   public func withValue<R>(_ valueDuringOperation: Value, operation: () throws -> R,
-                           file: String = #file, line: UInt = #line) rethrows -> R {
+                           file: String = #fileID, line: UInt = #line) rethrows -> R {
     // check if we're not trying to bind a value from an illegal context; this may crash
     _checkIllegalTaskLocalBindingWithinWithTaskGroup(file: file, line: line)
 

stdlib/public/runtime/Heap.cpp

@@ -124,7 +124,7 @@ void *swift::swift_slowAlloc(size_t size, size_t alignMask) {
 // i.e. 0 < alignment <= _minAllocationAlignment:
 //   The runtime may use either `free` or AlignedFree as long as it is
 //   consistent with allocation with the same alignment.
-void swift::swift_slowDealloc(void *ptr, size_t bytes, size_t alignMask) {
+static void swift_slowDeallocImpl(void *ptr, size_t alignMask) {
   if (alignMask <= MALLOC_ALIGN_MASK) {
 #if defined(__APPLE__) && SWIFT_STDLIB_HAS_DARWIN_LIBMALLOC
     malloc_zone_free(DEFAULT_ZONE(), ptr);
@@ -135,3 +135,34 @@ void swift::swift_slowDealloc(void *ptr, size_t bytes, size_t alignMask) {
     AlignedFree(ptr);
   }
 }
+
+void swift::swift_slowDealloc(void *ptr, size_t bytes, size_t alignMask) {
+  swift_slowDeallocImpl(ptr, alignMask);
+}
+
+#if defined(__APPLE__) && defined(__MACH__) && SWIFT_STDLIB_HAS_DARWIN_LIBMALLOC
+// On Darwin, define our own, hidden operator new/delete implementations. We
+// don't want to pick up any overrides that come from other code, but we also
+// don't want to expose our overrides to any other code. We can't do this
+// directly in C++, as the compiler has an implicit prototype with default
+// visibility. However, if we implement them as C functions using the C++
+// mangled names, the compiler accepts them without complaint, and the linker
+// still links all internal uses with these overrides.
+
+__attribute__((visibility(("hidden")))) extern "C" void *_Znwm(size_t size) {
+  return swift_slowAlloc(size, MALLOC_ALIGN_MASK);
+}
+
+__attribute__((visibility(("hidden")))) extern "C" void _ZdlPv(void *ptr) {
+  swift_slowDeallocImpl(ptr, MALLOC_ALIGN_MASK);
+}
+
+__attribute__((visibility(("hidden")))) extern "C" void *_Znam(size_t size) {
+  return swift_slowAlloc(size, MALLOC_ALIGN_MASK);
+}
+
+__attribute__((visibility(("hidden")))) extern "C" void _ZdaPv(void *ptr) {
+  swift_slowDeallocImpl(ptr, MALLOC_ALIGN_MASK);
+}
+
+#endif

test/Interpreter/convenience_init_peer_delegation.swift

@@ -28,6 +28,9 @@
 // REQUIRES: objc_interop
 // XFAIL: CPU=arm64e
 
+// rdar://92102119
+// REQUIRES: swift_test_mode_optimize_none
+
 import Darwin
 
 class Base {