---

yaml
---
r: 29839
b: refs/heads/incoming
c: a63f85c
h: refs/heads/master
i:
  29837: 8340e2d
  29835: 7c8c579
  29831: 7e81c4a
  29823: 8ff89c0
v: v3

Author: bblum

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 6d68658b9a9705d2e4c517d12705a2f64f20e378
+refs/heads/incoming: a63f85ce8c48a819c341f247ef451eb2160b30b1
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/unsafe.rs

@@ -105,6 +105,7 @@ unsafe fn shared_mutable_state<T: send>(+data: T) -> SharedMutableState<T> {
     }
 }
 
+#[inline(always)]
 unsafe fn get_shared_mutable_state<T: send>(rc: &SharedMutableState<T>)
         -> &mut T {
     unsafe {
@@ -116,6 +117,7 @@ unsafe fn get_shared_mutable_state<T: send>(rc: &SharedMutableState<T>)
         return r;
     }
 }
+#[inline(always)]
 unsafe fn get_shared_immutable_state<T: send>(rc: &SharedMutableState<T>)
         -> &T {
     unsafe {
@@ -169,6 +171,7 @@ class LittleLock {
 }
 
 impl LittleLock {
+    #[inline(always)]
     unsafe fn lock<T>(f: fn() -> T) -> T {
         class Unlock {
             let l: rust_little_lock;
@@ -209,6 +212,7 @@ impl<T: send> Exclusive<T> {
     // Currently, scheduling operations (i.e., yielding, receiving on a pipe,
     // accessing the provided condition variable) are prohibited while inside
     // the exclusive. Supporting that is a work in progress.
+    #[inline(always)]
     unsafe fn with<U>(f: fn(x: &mut T) -> U) -> U {
         let rec = unsafe { get_shared_mutable_state(&self.x) };
         do rec.lock.lock {