Merge pull request #78107 from ktoso/pick-mpokhylets-isolated-deinit-version

Author: ktoso

include/swift/ABI/MetadataValues.h

@@ -1704,6 +1704,9 @@ namespace SpecialPointerAuthDiscriminators {
   const uint16_t RelativeProtocolWitnessTable = 0xb830; // = 47152
 
   const uint16_t TypeLayoutString = 0x8b65; // = 35685
+
+  /// Isolated deinit body function pointer
+  const uint16_t DeinitWorkFunction = 0x8438; // = 33848
 }
 
 /// The number of arguments that will be passed directly to a generic

include/swift/AST/DiagnosticsSIL.def

@@ -790,6 +790,11 @@ NOTE(box_to_stack_cannot_promote_box_to_stack_due_to_escape_location, none,
 
 WARNING(semantic_function_improper_nesting, none, "'@_semantics' function calls non-'@_semantics' function with nested '@_semantics' calls", ())
 
+// SDK mismatch diagnostics
+ERROR(missing_deinit_on_executor_function, none,
+      "Missing 'swift_task_deinitOnExecutor' function! "
+      "This is likely due to an outdated/incompatible SDK.", ())
+
 // Capture promotion diagnostics
 WARNING(capturepromotion_concurrentcapture_mutation, none,
         "'%0' mutated after capture by sendable closure", (StringRef))

include/swift/AST/DiagnosticsSema.def

@@ -5963,6 +5963,9 @@ ERROR(isolated_deinit_no_isolation,none,
 ERROR(isolated_deinit_on_value_type,none,
       "only classes and actors can have isolated deinit",
       ())
+ERROR(isolated_deinit_unavailable,none,
+      "isolated deinit is only available in %0 %1 or newer",
+      (StringRef, llvm::VersionTuple))
 ERROR(isolated_deinit_experimental,none,
       "'isolated' deinit requires frontend flag -enable-experimental-feature IsolatedDeinit "
       "to enable the usage of this language feature", ())

include/swift/AST/FeatureAvailability.def

@@ -76,6 +76,7 @@ FEATURE(InitRawStructMetadata,                          (6, 0))
 
 FEATURE(LayoutStringValueWitnesses,                     (6, 1))
 FEATURE(CreateTaskWithConsumedFunction,                 (6, 1))
+FEATURE(IsolatedDeinit,                                 (6, 1))
 
 FEATURE(TaskExecutor,                                   FUTURE)
 FEATURE(Differentiation,                                FUTURE)

include/swift/Basic/Features.def

@@ -410,7 +410,7 @@ EXPERIMENTAL_FEATURE(SafeInterop, true)
 EXPERIMENTAL_FEATURE(AssumeResilientCxxTypes, true)
 
 // Isolated deinit
-SUPPRESSIBLE_EXPERIMENTAL_FEATURE(IsolatedDeinit, true)
+SUPPRESSIBLE_EXPERIMENTAL_FEATURE(IsolatedDeinit, false)
 
 // Enable values in generic signatures, e.g. <let N: Int>
 EXPERIMENTAL_FEATURE(ValueGenerics, true)

include/swift/Runtime/Config.h

@@ -324,6 +324,9 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #define __ptrauth_swift_type_layout_string                                     \
   __ptrauth(ptrauth_key_process_independent_data, 1,                           \
             SpecialPointerAuthDiscriminators::TypeLayoutString)
+#define __ptrauth_swift_deinit_work_function                                   \
+  __ptrauth(ptrauth_key_function_pointer, 1,                                   \
+            SpecialPointerAuthDiscriminators::DeinitWorkFunction)
 
 #if __has_attribute(ptrauth_struct)
 #define swift_ptrauth_struct(key, discriminator)                               \
@@ -364,6 +367,7 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
 #define swift_ptrauth_sign_opaque_read_resume_function(__fn, __buffer) (__fn)
 #define swift_ptrauth_sign_opaque_modify_resume_function(__fn, __buffer) (__fn)
 #define __ptrauth_swift_type_layout_string
+#define __ptrauth_swift_deinit_work_function
 #define swift_ptrauth_struct(key, discriminator)
 #define swift_ptrauth_struct_derived(from)
 #endif
@@ -542,6 +546,17 @@ swift_auth_code(T value, unsigned extra) {
 #endif
 }
 
+template <typename T>
+SWIFT_RUNTIME_ATTRIBUTE_ALWAYS_INLINE static inline T
+swift_auth_code_function(T value, unsigned extra) {
+#if SWIFT_PTRAUTH
+  return (T)ptrauth_auth_function((void *)value,
+                                  ptrauth_key_function_pointer, extra);
+#else
+  return value;
+#endif
+}
+
 /// Does this platform support backtrace-on-crash?
 #ifdef __APPLE__
 #  include <TargetConditionals.h>

lib/SILGen/SILGenDestructor.cpp

@@ -17,6 +17,7 @@
 #include "SwitchEnumBuilder.h"
 #include "swift/AST/ConformanceLookup.h"
 #include "swift/AST/Decl.h"
+#include "swift/AST/DiagnosticsSIL.h"
 #include "swift/AST/GenericSignature.h"
 #include "swift/AST/SubstitutionMap.h"
 #include "swift/Basic/Assertions.h"
@@ -373,8 +374,10 @@ void SILGenFunction::emitIsolatingDestructor(DestructorDecl *dd) {
 
     // Get deinitOnExecutor
     FuncDecl *swiftDeinitOnExecutorDecl = SGM.getDeinitOnExecutor();
-    assert(swiftDeinitOnExecutorDecl &&
-           "Failed to find swift_task_deinitOnExecutor function decl");
+    if (!swiftDeinitOnExecutorDecl) {
+      dd->diagnose(diag::missing_deinit_on_executor_function);
+      return;
+    }
     SILFunction *swiftDeinitOnExecutorSILFunc = SGM.getFunction(
         SILDeclRef(swiftDeinitOnExecutorDecl, SILDeclRef::Kind::Func),
         NotForDefinition);

lib/Sema/TypeCheckAttr.cpp

@@ -127,6 +127,14 @@ class AttributeChecker : public AttributeVisitor<AttributeChecker> {
           return;
         }
       }
+
+      TypeChecker::checkAvailability(
+          attr->getRange(), C.getIsolatedDeinitAvailability(),
+          D->getDeclContext(),
+          [&](StringRef platformName, llvm::VersionTuple version) {
+            return diagnoseAndRemoveAttr(
+                attr, diag::isolated_deinit_unavailable, platformName, version);
+          });
     }
   }
 

stdlib/public/Concurrency/Actor.cpp

@@ -18,6 +18,7 @@
 #include "swift/Runtime/Concurrency.h"
 #include <atomic>
 #include <new>
+#include <ptrauth.h>
 
 #include "../CompatibilityOverride/CompatibilityOverride.h"
 #include "swift/ABI/Actor.h"
@@ -2322,7 +2323,7 @@ namespace {
 class IsolatedDeinitJob : public Job {
 private:
   void *Object;
-  DeinitWorkFunction *Work;
+  DeinitWorkFunction *__ptrauth_swift_deinit_work_function Work;
 
 public:
   IsolatedDeinitJob(JobPriority priority, void *object,
@@ -2351,6 +2352,9 @@ static void swift_task_deinitOnExecutorImpl(void *object,
                                             DeinitWorkFunction *work,
                                             SerialExecutorRef newExecutor,
                                             size_t rawFlags) {
+  // Sign the function pointer
+  work = swift_auth_code_function(
+      work, SpecialPointerAuthDiscriminators::DeinitWorkFunction);
   // If the current executor is compatible with running the new executor,
   // we can just immediately continue running with the resume function
   // we were passed in.

stdlib/public/Concurrency/Executor.swift

@@ -541,7 +541,7 @@ internal final class DispatchQueueShim: @unchecked Sendable, SerialExecutor {
 #endif // SWIFT_CONCURRENCY_USES_DISPATCH
 
 
-@available(SwiftStdlib 5.6, *) // TODO: Clarify version
+@available(SwiftStdlib 6.1, *)
 @_silgen_name("swift_task_deinitOnExecutor")
 @usableFromInline
 internal func _deinitOnExecutor(_ object: __owned AnyObject,