wip

Author: ktoso

stdlib/public/Concurrency/TaskGroup.cpp

@@ -1040,7 +1040,7 @@ static void fillGroupNextResult(TaskFutureWaitAsyncContext *context,
 
   case PollStatus::Error: {
     auto error = reinterpret_cast<SwiftError *>(result.storage);
-    fillGroupNextErrorResult(context, error); // FIXME: this specifically retains the error, but likely should not!??!!?
+    fillGroupNextErrorResult(context, error);
     return;
   }
 
@@ -1384,13 +1384,12 @@ void TaskGroupBase::resumeWaitingTask(
         auto before = completedTask;
         _swift_taskGroup_detachChild(asAbstract(this), completedTask);
         SWIFT_TASK_GROUP_DEBUG_LOG(this, "completedTask %p; AFTER DETACH (count:%d)", completedTask, swift_retainCount(completedTask));
-        if (hadErrorResult) {
+        if (isDiscardingResults() && hadErrorResult) {
           SWIFT_TASK_GROUP_DEBUG_LOG(this, "BEFORE RELEASE error task=%p (count:%d)\n",
                   completedTask,
                   swift_retainCount(completedTask));
-          // We only used the task to keep the error in the future fragment around
+//           We only used the task to keep the error in the future fragment around
           // so now that we emitted the error and detached the task, we are free to release the task immediately.
-          auto error = reinterpret_cast<SwiftError *>(result.storage);
           swift_release(completedTask); // we need to do this if the error is a class
         }
 

stdlib/public/runtime/HeapObject.cpp

@@ -525,15 +525,13 @@ void (*SWIFT_RT_DECLARE_ENTRY _swift_release)(HeapObject *object) =
     _swift_release_;
 
 void swift::swift_nonatomic_release(HeapObject *object) {
-  fprintf(stderr, "[%s:%d](%s) swift_nonatomic_release %p\n", __FILE_NAME__, __LINE__, __FUNCTION__, object);
   SWIFT_RT_TRACK_INVOCATION(object, swift_nonatomic_release);
   if (isValidPointerForNativeRetain(object))
     object->refCounts.decrementAndMaybeDeinitNonAtomic(1);
 }
 
 SWIFT_ALWAYS_INLINE
 static void _swift_release_n_(HeapObject *object, uint32_t n) {
-fprintf(stderr, "[%s:%d](%s) _swift_release_n_ %p (n=%d)\n", __FILE_NAME__, __LINE__, __FUNCTION__, object, n);
   SWIFT_RT_TRACK_INVOCATION(object, swift_release_n);
   if (isValidPointerForNativeRetain(object))
     object->refCounts.decrementAndMaybeDeinit(n);
@@ -797,8 +795,11 @@ void swift::swift_unownedCheck(HeapObject *object) {
 }
 
 void _swift_release_dealloc(HeapObject *object) {
-  fprintf(stderr, "[%s:%d](%s) _swift_release_dealloc %p (count before: %d)\n", __FILE_NAME__, __LINE__, __FUNCTION__, object,
-          swift_retainCount(object));
+//  assert(object);
+//  if (!object->metadata) {
+    fprintf(stderr, "[%s:%d](%s) object: %p\n", __FILE_NAME__, __LINE__, __FUNCTION__, object);
+//  }
+//  assert(object->metadata);
   asFullMetadata(object->metadata)->destroy(object);
 }