Merge remote-tracking branch 'upstream/master' into reduce-diff

chrisseaton · chrisseaton · commit ef2d53f1da24 · 2022-08-04T12:29:38.000Z
diff --git a/thread_sync.c b/thread_sync.c
@@ -1277,7 +1277,13 @@ rb_szqueue_push(int argc, VALUE *argv, VALUE self)
             ccan_list_add_tail(pushq, &queue_waiter.w.node);
             sq->num_waiting_push++;
 
-            rb_ensure(queue_sleep, self, szqueue_sleep_done, (VALUE)&queue_waiter);
+            struct queue_sleep_arg queue_sleep_arg = {
+                .self = self,
+                .timeout = Qnil,
+                .end = 0
+            };
+
+            rb_ensure(queue_sleep, (VALUE)&queue_sleep_arg, szqueue_sleep_done, (VALUE)&queue_waiter);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1277,7 +1277,13 @@ rb_szqueue_push(int argc, VALUE *argv, VALUE self)`
`1277`	`1277`	`ccan_list_add_tail(pushq, &queue_waiter.w.node);`
`1278`	`1278`	`sq->num_waiting_push++;`
`1279`	`1279`
`1280`		`- rb_ensure(queue_sleep, self, szqueue_sleep_done, (VALUE)&queue_waiter);`
	`1280`	`+ struct queue_sleep_arg queue_sleep_arg = {`
	`1281`	`+ .self = self,`
	`1282`	`+ .timeout = Qnil,`
	`1283`	`+ .end = 0`
	`1284`	`+ };`
	`1285`	`+`
	`1286`	`+ rb_ensure(queue_sleep, (VALUE)&queue_sleep_arg, szqueue_sleep_done, (VALUE)&queue_waiter);`
`1281`	`1287`	`}`
`1282`	`1288`	`}`
`1283`	`1289`