Skip to content

Commit bb7e48a

Browse files
committed
---
yaml --- r: 41681 b: refs/heads/master c: ad2fc50 h: refs/heads/master i: 41679: 9c41b1c v: v3
1 parent 1abb9cb commit bb7e48a

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: c6fe93d9b5ac40cfacc8d8e8e55261d284de4829
2+
refs/heads/master: ad2fc50ca1d8fecdc54306203f226d87a365ce36
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
55
refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libcore/task/mod.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -971,15 +971,17 @@ fn test_spawn_sched_blocking() {
971971
let lock = testrt::rust_dbg_lock_create();
972972

973973
do spawn_sched(SingleThreaded) {
974-
testrt::rust_dbg_lock_lock(lock);
974+
unsafe {
975+
testrt::rust_dbg_lock_lock(lock);
975976

976-
oldcomm::send(start_ch, ());
977+
oldcomm::send(start_ch, ());
977978

978-
// Block the scheduler thread
979-
testrt::rust_dbg_lock_wait(lock);
980-
testrt::rust_dbg_lock_unlock(lock);
979+
// Block the scheduler thread
980+
testrt::rust_dbg_lock_wait(lock);
981+
testrt::rust_dbg_lock_unlock(lock);
981982

982-
oldcomm::send(fin_ch, ());
983+
oldcomm::send(fin_ch, ());
984+
}
983985
};
984986

985987
// Wait until the other task has its lock

0 commit comments

Comments
 (0)