auto merge of #10000 : cmr/rust/snapshot, r=alexcrichton

3 files changed, 8 insertions, 28 deletions

diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
index c9e1b5b3b00..68fdfd73013 100644
--- a/src/libstd/unstable/intrinsics.rs
+++ b/src/libstd/unstable/intrinsics.rs
@@ -330,9 +330,6 @@ extern "rust-intrinsic" {
 
     pub fn visit_tydesc(td: *TyDesc, tv: &mut TyVisitor);
 
-    #[cfg(not(stage0))]
-    pub fn frame_address(f: &fn(*u8));
-
     /// Get the address of the `__morestack` stack growth function.
     pub fn morestack_addr() -> *();
 
diff --git a/src/snapshots.txt b/src/snapshots.txt
index 627546f0907..ec97f5fdf9e 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2013-10-21 6e6981c
+  freebsd-x86_64 7f630581d0e881483272140e84bc2f494daf6204
+  linux-i386 5c754455610013bbe448e8f6ef8ba1a05b167919
+  linux-x86_64 d993920210413add241f7b235dec0e4d72164be5
+  macos-i386 8b48d8598f4d503e6bbc40bff52457c659d6de2b
+  macos-x86_64 e84bcd0b08af6a0ff602dca7a5bec21a001c5eb8
+  winnt-i386 3f4441509f89a794ec9b53e38756e6124df78df0
+
 S 2013-10-16 6c08cc2
   freebsd-x86_64 03caf882078eff9b4e04d116732b41a3cdfc260f
   linux-i386 ce30bb90434e9eb9920028a5408e1f986ba2ad5d
diff --git a/src/test/run-pass/intrinsic-frame-address.rs b/src/test/run-pass/intrinsic-frame-address.rs
deleted file mode 100644
index c7b23790ded..00000000000
--- a/src/test/run-pass/intrinsic-frame-address.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// xfail-fast
-
-mod rusti {
-    extern "rust-intrinsic" {
-        pub fn frame_address(f: &fn(*u8));
-    }
-}
-
-pub fn main() {
-    unsafe {
-        do rusti::frame_address |addr| {
-            assert!(addr.is_not_null());
-        }
-    }
-}