Merge pull request #81074 from mikeash/fix-reflect-task-crash

[RemoteMirror] Only look through Task wait adapters when there's a dependency record.

Author: mikeash

include/swift/RemoteInspection/ReflectionContext.h

@@ -1929,12 +1929,17 @@ class ReflectionContext
                 Fptr == target_task_wait_throwing_resume_adapter) ||
                (target_task_future_wait_resume_adapter &&
                 Fptr == target_task_future_wait_resume_adapter)) {
-      auto ContextBytes = getReader().readBytes(RemoteAddress(ResumeContextPtr),
-                                                sizeof(AsyncContext<Runtime>));
-      if (ContextBytes) {
-        auto ContextPtr =
-            reinterpret_cast<const AsyncContext<Runtime> *>(ContextBytes.get());
-        return stripSignedPointer(ContextPtr->ResumeParent);
+      // It's only safe to look through these adapters when there's a dependency
+      // record. If there isn't a dependency record, then the task was resumed
+      // and the pointers are potentially stale.
+      if (AsyncTaskObj->PrivateStorage.DependencyRecord) {
+        auto ContextBytes = getReader().readBytes(
+            RemoteAddress(ResumeContextPtr), sizeof(AsyncContext<Runtime>));
+        if (ContextBytes) {
+          auto ContextPtr = reinterpret_cast<const AsyncContext<Runtime> *>(
+              ContextBytes.get());
+          return stripSignedPointer(ContextPtr->ResumeParent);
+        }
       }
     }
 

include/swift/RemoteInspection/RuntimeInternals.h

@@ -82,8 +82,7 @@ template <typename Runtime>
 struct StackAllocator {
   typename Runtime::StoredPointer LastAllocation;
   typename Runtime::StoredPointer FirstSlab;
-  int32_t NumAllocatedSlabs;
-  bool FirstSlabIsPreallocated;
+  int32_t NumAllocatedSlabsAndFirstSlabIsPreallocated;
 
   struct Slab {
     typename Runtime::StoredPointer Metadata;
@@ -123,7 +122,8 @@ struct AsyncTaskPrivateStorage {
   StackAllocator<Runtime> Allocator;
   typename Runtime::StoredPointer Local;
   uint32_t Id;
-  uint32_t BasePriority;
+  typename Runtime::StoredSize BasePriority;
+  typename Runtime::StoredPointer DependencyRecord;
 };
 
 template <typename Runtime, typename ActiveTaskStatus>