[embedded] Don't allow ResultTypeInfoTaskOptionRecord parsing outside embedded Swift

Author: kubamracek

include/swift/ABI/TaskOptions.h

@@ -141,6 +141,7 @@ class AsyncLetWithBufferTaskOptionRecord : public TaskOptionRecord {
   }
 };
 
+#if SWIFT_CONCURRENCY_EMBEDDED
 class ResultTypeInfoTaskOptionRecord : public TaskOptionRecord {
  public:
   size_t size;
@@ -153,6 +154,7 @@ class ResultTypeInfoTaskOptionRecord : public TaskOptionRecord {
     return record->getKind() == TaskOptionRecordKind::ResultTypeInfo;
   }
 };
+#endif
 
 class RunInlineTaskOptionRecord : public TaskOptionRecord {
   void *allocation;

stdlib/public/Concurrency/Task.cpp

@@ -691,17 +691,19 @@ static AsyncTaskAndContext swift_task_create_commonImpl(
       break;
     }
     case TaskOptionRecordKind::ResultTypeInfo: {
-      auto *typeInfo = cast<ResultTypeInfoTaskOptionRecord>(option);
 #if SWIFT_CONCURRENCY_EMBEDDED
+      auto *typeInfo = cast<ResultTypeInfoTaskOptionRecord>(option);
       futureResultType = {
           .size = typeInfo->size,
           .alignMask = typeInfo->alignMask,
           .initializeWithCopy = typeInfo->initializeWithCopy,
           .storeEnumTagSinglePayload = typeInfo->storeEnumTagSinglePayload,
           .destroy = typeInfo->destroy,
       };
-#endif
       break;
+#else
+      swift_unreachable("ResultTypeInfo in non-embedded");
+#endif
     }
     }
   }

stdlib/public/Concurrency/TaskGroup.cpp

@@ -959,12 +959,9 @@ SWIFT_CC(swift)
 static void swift_taskGroup_initializeWithFlagsImpl(size_t rawGroupFlags,
                                                     TaskGroup *group, const Metadata *T) {
 
+#if !SWIFT_CONCURRENCY_EMBEDDED
   ResultTypeInfo resultType;
-  #if !SWIFT_CONCURRENCY_EMBEDDED
   resultType.metadata = T;
-  #else
-  swift_unreachable("task groups not supported yet in embedded Swift");
-  #endif
 
   TaskGroupFlags groupFlags(rawGroupFlags);
   SWIFT_TASK_GROUP_DEBUG_LOG_0(group, "create group, from task:%p; flags: isDiscardingResults=%d",
@@ -990,6 +987,9 @@ static void swift_taskGroup_initializeWithFlagsImpl(size_t rawGroupFlags,
     }
     return true;
   });
+#else
+  swift_unreachable("task groups not supported yet in embedded Swift");
+#endif
 }
 
 // =============================================================================