From fbd94a6ed77d69a316fc507ec05f8b817e284d8d Mon Sep 17 00:00:00 2001
From: Konrad 'ktoso' Malawski <ktoso@apple.com>
Date: Sat, 1 Mar 2025 08:04:10 +0900
Subject: [PATCH] [Concurrency] Fix swift-inspect and remote mirror build

---
 include/swift/RemoteInspection/ReflectionContext.h              | 1 +
 include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h        | 1 +
 stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp           | 1 +
 .../Sources/swift-inspect/Operations/DumpConcurrency.swift      | 2 --
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/swift/RemoteInspection/ReflectionContext.h b/include/swift/RemoteInspection/ReflectionContext.h
index 25b90f7883509..e2e0030f443e8 100644
--- a/include/swift/RemoteInspection/ReflectionContext.h
+++ b/include/swift/RemoteInspection/ReflectionContext.h
@@ -184,6 +184,7 @@ class ReflectionContext
     bool IsFuture;
     bool IsGroupChildTask;
     bool IsAsyncLetTask;
+    bool IsSynchronousStartTask;
 
     // Task flags.
     unsigned MaxPriority;
diff --git a/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h b/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h
index 3fa7e3c4145c7..ae52d80b5db44 100644
--- a/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h
+++ b/include/swift/SwiftRemoteMirror/SwiftRemoteMirrorTypes.h
@@ -243,6 +243,7 @@ typedef struct swift_async_task_info {
   bool IsFuture;
   bool IsGroupChildTask;
   bool IsAsyncLetTask;
+  bool IsSynchronousStartTask;
 
   unsigned MaxPriority;
   bool IsCancelled;
diff --git a/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp b/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
index 64911bd4217cd..d17a2860358bb 100644
--- a/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
+++ b/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
@@ -1013,6 +1013,7 @@ swift_reflection_asyncTaskInfo(SwiftReflectionContextRef ContextRef,
     Result.IsFuture = TaskInfo.IsFuture;
     Result.IsGroupChildTask = TaskInfo.IsGroupChildTask;
     Result.IsAsyncLetTask = TaskInfo.IsAsyncLetTask;
+    Result.IsSynchronousStartTask = TaskInfo.IsSynchronousStartTask;
 
     Result.MaxPriority = TaskInfo.MaxPriority;
     Result.IsCancelled = TaskInfo.IsCancelled;
diff --git a/tools/swift-inspect/Sources/swift-inspect/Operations/DumpConcurrency.swift b/tools/swift-inspect/Sources/swift-inspect/Operations/DumpConcurrency.swift
index 058912da4f7de..99988c396d636 100644
--- a/tools/swift-inspect/Sources/swift-inspect/Operations/DumpConcurrency.swift
+++ b/tools/swift-inspect/Sources/swift-inspect/Operations/DumpConcurrency.swift
@@ -55,7 +55,6 @@ fileprivate class ConcurrencyDumper {
     var isStatusRecordLocked: Bool
     var isEscalated: Bool
     var hasIsRunning: Bool
-    var isSynchronousStartTask: Bool
     var isRunning: Bool
     var isEnqueued: Bool
     var threadPort: UInt32?
@@ -276,7 +275,6 @@ fileprivate class ConcurrencyDumper {
     if info.isEscalated { flags.append("escalated") }
     if info.hasIsRunning && info.isRunning { flags.append("running") }
     if info.isEnqueued { flags.append("enqueued") }
-    if info.isSynchronousStart { flags.append("isSynchronousStartTask") }
 
     let flagsStr = flags.isEmpty ? "0" : flags.joined(separator: "|")
     return flagsStr