Merge pull request #41513 from apple/rokhinip/89236911-compare-exchange-weak

Account for the fact that compare_exchange_weak can fail sometimes.

Author: rokhinip

stdlib/public/Concurrency/Actor.cpp

@@ -1031,6 +1031,8 @@ static Job *
 preprocessQueue(JobRef unprocessedStart, JobRef unprocessedEnd, Job *existingProcessedJobsToMergeInto)
 {
   assert(existingProcessedJobsToMergeInto != NULL);
+  assert(unprocessedStart.needsPreprocessing());
+  assert(unprocessedStart.getAsJob() != unprocessedEnd.getAsJob());
 
   // Build up a list of jobs we need to preprocess
   using ListMerger = swift::ListMerger<Job*, JobQueueTraits>;
@@ -1423,6 +1425,11 @@ Job * DefaultActorImpl::drainOne() {
       return firstJob;
     }
 
+    // We failed the weak cmpxchg spuriously, go through loop again.
+    if (oldState.getFirstJob().getAsJob() == jobToPreprocessFrom.getAsJob()) {
+      continue;
+    }
+
     // There were new items concurrently added to the queue. We need to
     // preprocess the newly added unprocessed items and merge them to the already
     // preprocessed list.