From c8dc6fcb4cd29e5fb6c509149871b869b951295d Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 30 Mar 2012 18:37:30 -0700 Subject: Revert "rt: Remove lock_held_by_current_thread" Adds back the ability to make assertions about locks, but only under the --enable-debug configuration This reverts commit b247de64583e2ab527088813ba9192824554e801. Conflicts: src/rt/rust_sched_loop.cpp --- src/rt/rust_task.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/rt/rust_task.cpp') diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index d276b5c904b..4ab1f4680eb 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -212,6 +212,7 @@ rust_task::must_fail_from_being_killed() { bool rust_task::must_fail_from_being_killed_unlocked() { + kill_lock.must_have_lock(); return killed && !reentered_rust_stack; } -- cgit 1.4.1-3-g733a5