---

yaml
---
r: 66507
b: refs/heads/master
c: 0d7799d
h: refs/heads/master
i:
  66505: 2d24912
  66503: f5143d1
v: v3

Author: thestinger

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b731d96b4f2a8d5733e79a863c40632425456520
+refs/heads/master: 0d7799d3048eea4039d59c0cca98449e1c52a561
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libstd/rt/global_heap.rs

@@ -18,6 +18,7 @@ extern {
     fn abort();
 }
 
+#[inline]
 fn get_box_size(body_size: uint, body_align: uint) -> uint {
     let header_size = size_of::<BoxHeaderRepr>();
     // FIXME (#2699): This alignment calculation is suspicious. Is it right?
@@ -27,6 +28,7 @@ fn get_box_size(body_size: uint, body_align: uint) -> uint {
 
 // Rounds |size| to the nearest |alignment|. Invariant: |alignment| is a power
 // of two.
+#[inline]
 fn align_to(size: uint, align: uint) -> uint {
     assert!(align != 0);
     (size + align - 1) & !(align - 1)