---

yaml
---
r: 56269
b: refs/heads/auto
c: 0b0ca59
h: refs/heads/master
i:
  56267: b76fc42
v: v3

Author: pcwalton

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: ca8e99fd78ab9b56c5bdc61027b032ad52c2ec8b
+refs/heads/auto: 0b0ca597bf25d13e4493c72843389cc9e47425b6
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/middle/trans/closure.rs

@@ -409,6 +409,15 @@ pub fn trans_expr_fn(bcx: block,
                                                  ~"expr_fn");
     let llfn = decl_internal_cdecl_fn(ccx.llmod, s, llfnty);
 
+    // Always mark inline if this is a loop body. This is important for
+    // performance on many programs with tight loops.
+    if is_loop_body.is_some() {
+        set_always_inline(llfn);
+    } else {
+        // Can't hurt.
+        set_inline_hint(llfn);
+    }
+
     let Result {bcx: bcx, val: closure} = match sigil {
         ast::BorrowedSigil | ast::ManagedSigil | ast::OwnedSigil => {
             let cap_vars = *ccx.maps.capture_map.get(&user_id);