---

yaml
---
r: 62714
b: refs/heads/snap-stage3
c: 2c2346e
h: refs/heads/master
v: v3

Author: James Miller

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 510d0f221c5a9ca7671149fe7e7bb802592edc06
+refs/heads/snap-stage3: 2c2346e3d4f999b95a56444d978c3ea792828263
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/base.rs

@@ -1694,7 +1694,20 @@ pub fn create_llargs_for_fn_args(cx: fn_ctxt,
     vec::from_fn(args.len(), |i| {
         unsafe {
             let arg_n = first_real_arg + i;
-            llvm::LLVMGetParam(cx.llfn, arg_n as c_uint)
+            let arg = &args[i];
+            let llarg = llvm::LLVMGetParam(cx.llfn, arg_n as c_uint);
+
+            // Mark `&mut T` as no-alias, as the borrowck pass ensures it's true
+            match arg.ty.node {
+                ast::ty_rptr(_, mt) => {
+                    if mt.mutbl == ast::m_mutbl  {
+                        llvm::LLVMAddAttribute(llarg, lib::llvm::NoAliasAttribute as c_uint);
+                    }
+                }
+                _ => {}
+            }
+
+            llarg
         }
     })
 }

branches/snap-stage3/src/libstd/os.rs

@@ -675,11 +675,6 @@ pub fn mkdir_recursive(p: &Path, mode: c_int) -> bool {
 /// Lists the contents of a directory
 #[allow(non_implicitly_copyable_typarams)]
 pub fn list_dir(p: &Path) -> ~[~str] {
-    if p.components.is_empty() && !p.is_absolute() {
-        // Not sure what the right behavior is here, but this
-        // prevents a bounds check failure later
-        return ~[];
-    }
     unsafe {
         #[cfg(target_os = "linux")]
         #[cfg(target_os = "android")]
@@ -1601,26 +1596,6 @@ mod tests {
         }
     }
 
-    #[test]
-    fn list_dir_empty_path() {
-        let dirs = os::list_dir(&Path(""));
-        assert!(dirs.is_empty());
-    }
-
-    #[test]
-    #[cfg(not(windows))]
-    fn list_dir_root() {
-        let dirs = os::list_dir(&Path("/"));
-        assert!(dirs.len() > 1);
-    }
-    #[test]
-    #[cfg(windows)]
-    fn list_dir_root() {
-        let dirs = os::list_dir(&Path("C:\\"));
-        assert!(dirs.len() > 1);
-    }
-
-
     #[test]
     fn path_is_dir() {
         assert!((os::path_is_dir(&Path("."))));