about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2017-08-09 22:32:13 -0700
committerRalf Jung <post@ralfj.de>2017-08-09 22:32:13 -0700
commit8e8c9c862c50f7f29e99f9a80bdeb67d99393969 (patch)
treec7933e9cb901001718bcfe452b538502bbaac472
parent34685044f9d6c01a87a05fde9778586079965958 (diff)
downloadrust-8e8c9c862c50f7f29e99f9a80bdeb67d99393969.tar.gz
rust-8e8c9c862c50f7f29e99f9a80bdeb67d99393969.zip
turns out we can enable this sanity check now
-rw-r--r--src/librustc_mir/interpret/memory.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc_mir/interpret/memory.rs b/src/librustc_mir/interpret/memory.rs
index 468b2d71fae..75acdbe778c 100644
--- a/src/librustc_mir/interpret/memory.rs
+++ b/src/librustc_mir/interpret/memory.rs
@@ -547,9 +547,7 @@ impl<'a, 'tcx, M: Machine<'tcx>> Memory<'a, 'tcx, M> {
                 None => {
                     // Make sure we did not try to release someone else's lock.
                     if !is_our_lock && lock.active != NoLock {
-                        // FIXME: For the same reason that we have to live with suspensions already existing,
-                        // we also cannot be sure here if things really are going wrong.  So accept this for now.
-                        //return err!(InvalidMemoryLockRelease { ptr, len, frame: cur_frame, lock: lock.active.clone() });
+                        return err!(InvalidMemoryLockRelease { ptr, len, frame: cur_frame, lock: lock.active.clone() });
                     }
                 }
             }