---

yaml
---
r: 80866
b: refs/heads/try
c: 22b6f74
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
-refs/heads/try: b2eb1c01a45cbb7bfc40f24073b60de61e3fad47
+refs/heads/try: 22b6f7481f592babf2b4e230120597c47750dae1
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/trans/callee.rs

@@ -706,12 +706,15 @@ pub fn trans_call_inner(in_cx: @mut Block,
                 _ => {}
             }
 
-            // Invoke the actual rust fn and update bcx/llresult.
+            // A function pointer is called without the declaration available, so we have to apply
+            // any attributes with ABI implications directly to the call instruction. Right now, the
+            // only attribute we need to worry about is `sret`.
             let mut attrs = ~[];
             if type_of::return_uses_outptr(in_cx.tcx(), ret_ty) {
                 attrs.push((1, StructRetAttribute));
             }
 
+            // The `noalias` attribute on the return value is useful to a function ptr caller.
             match ty::get(ret_ty).sty {
                 // `~` pointer return values never alias because ownership is transferred
                 ty::ty_uniq(*) |
@@ -721,6 +724,7 @@ pub fn trans_call_inner(in_cx: @mut Block,
                 _ => ()
             }
 
+            // Invoke the actual rust fn and update bcx/llresult.
             let (llret, b) = base::invoke(bcx, llfn, llargs, attrs);
             bcx = b;
             llresult = llret;

branches/try/src/librustc/middle/trans/foreign.rs

@@ -264,6 +264,9 @@ pub fn trans_native_call(bcx: @mut Block,
         }
     };
 
+    // A function pointer is called without the declaration available, so we have to apply
+    // any attributes with ABI implications directly to the call instruction. Right now, the
+    // only attribute we need to worry about is `sret`.
     let attrs;
     if fn_type.sret {
         attrs = &[(1, StructRetAttribute)];