---

yaml
---
r: 64908
b: refs/heads/snap-stage3
c: 9e85745
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6a69d27a0f0c9510b982e7bec5f8a72fd1da3296
+refs/heads/snap-stage3: 9e857458d6ccf236361cefe33c313bc3c31d9428
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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

@@ -2258,13 +2258,15 @@ pub fn register_fn_full(ccx: @mut CrateContext,
                         node_type: ty::t)
                      -> ValueRef {
     let llfty = type_of_fn_from_ty(ccx, node_type);
-    register_fn_fuller(ccx, sp, sym, node_id, lib::llvm::CCallConv, llfty)
+    register_fn_fuller(ccx, sp, sym, node_id, node_type,
+                       lib::llvm::CCallConv, llfty)
 }
 
 pub fn register_fn_fuller(ccx: @mut CrateContext,
                           sp: span,
                           sym: ~str,
                           node_id: ast::NodeId,
+                          _node_type: ty::t,
                           cc: lib::llvm::CallConv,
                           fn_ty: Type)
                           -> ValueRef {

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

@@ -1154,10 +1154,17 @@ pub fn register_foreign_fn(ccx: @mut CrateContext,
                            -> ValueRef {
     let _icx = push_ctxt("foreign::register_foreign_fn");
 
+    let t = ty::node_id_to_type(ccx.tcx, node_id);
     let sym = Cell::new(sym);
 
     let tys = shim_types(ccx, node_id);
     do tys.fn_ty.decl_fn |fnty| {
-        register_fn_fuller(ccx, sp, sym.take(), node_id, lib::llvm::CCallConv, fnty)
+        register_fn_fuller(ccx,
+                           sp,
+                           sym.take(),
+                           node_id,
+                           t,
+                           lib::llvm::CCallConv,
+                           fnty)
     }
 }

branches/snap-stage3/src/rt/rust_builtin.cpp

@@ -932,12 +932,12 @@ static lock_and_signal change_dir_lock;
 
 extern "C" CDECL void
 rust_take_change_dir_lock() {
-    global_args_lock.lock();
+    change_dir_lock.lock();
 }
 
 extern "C" CDECL void
 rust_drop_change_dir_lock() {
-    global_args_lock.unlock();
+    change_dir_lock.unlock();
 }
 
 //

branches/snap-stage3/src/rt/rust_test_helpers.cpp

@@ -176,3 +176,8 @@ rust_dbg_next_port(uintptr_t base_port) {
   next_offset += 1;
   return this_port;
 }
+
+extern "C" CDECL intptr_t
+rust_get_test_int() {
+  return 1;
+}

branches/snap-stage3/src/rt/rustrt.def.in

@@ -265,3 +265,4 @@ rust_set_exit_status_newrt
 rust_get_exit_status_newrt
 rust_take_change_dir_lock
 rust_drop_change_dir_lock
+rust_get_test_int

branches/snap-stage3/src/test/auxiliary/anon-extern-mod-cross-crate-1.rs

@@ -18,5 +18,5 @@
 use std::libc;
 
 extern {
-    pub fn rust_get_argc() -> libc::c_int;
+    pub fn rust_get_test_int() -> libc::intptr_t;
 }

branches/snap-stage3/src/test/auxiliary/foreign_lib.rs

@@ -14,6 +14,6 @@ pub mod rustrt {
     use std::libc;
 
     extern {
-        pub fn rust_get_argc() -> libc::c_int;
+        fn rust_get_test_int() -> libc::intptr_t;
     }
 }

branches/snap-stage3/src/test/run-pass/anon-extern-mod-cross-crate-2.rs

@@ -16,6 +16,6 @@ use anonexternmod::*;
 
 pub fn main() {
     unsafe {
-        rust_get_argc();
+        rust_get_test_int();
     }
 }

branches/snap-stage3/src/test/run-pass/anon-extern-mod.rs

@@ -13,11 +13,11 @@ use std::libc;
 #[abi = "cdecl"]
 #[link_name = "rustrt"]
 extern {
-    fn rust_get_argc() -> libc::c_int;
+    fn rust_get_test_int() -> libc::intptr_t;
 }
 
 pub fn main() {
     unsafe {
-        let _ = rust_get_argc();
+        let _ = rust_get_test_int();
     }
 }

branches/snap-stage3/src/test/run-pass/foreign-dupe.rs

@@ -17,7 +17,7 @@ mod rustrt1 {
     #[abi = "cdecl"]
     #[link_name = "rustrt"]
     extern {
-        pub fn rust_get_argc() -> libc::c_int;
+        fn rust_get_test_int() -> libc::intptr_t;
     }
 }
 
@@ -27,13 +27,13 @@ mod rustrt2 {
     #[abi = "cdecl"]
     #[link_name = "rustrt"]
     extern {
-        pub fn rust_get_argc() -> libc::c_int;
+        fn rust_get_test_int() -> libc::intptr_t;
     }
 }
 
 pub fn main() {
     unsafe {
-        rustrt1::rust_get_argc();
-        rustrt2::rust_get_argc();
+        rustrt1::rust_get_test_int();
+        rustrt2::rust_get_test_int();
     }
 }

branches/snap-stage3/src/test/run-pass/foreign-no-abi.rs

@@ -14,12 +14,12 @@ mod rustrt {
     use std::libc;
 
     extern {
-        pub fn get_task_id() -> libc::intptr_t;
+        fn rust_get_test_int() -> libc::intptr_t;
     }
 }
 
 pub fn main() {
     unsafe {
-        rustrt::get_task_id();
+        rustrt::rust_get_test_int();
     }
 }

branches/snap-stage3/src/test/run-pass/invoke-external-foreign.rs

@@ -19,6 +19,6 @@ extern mod foreign_lib;
 
 pub fn main() {
     unsafe {
-        let foo = foreign_lib::rustrt::rust_get_argc();
+        let foo = foreign_lib::rustrt::rust_get_test_int();
     }
 }