about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-12 18:16:33 +0000
committerbors <bors@rust-lang.org>2014-08-12 18:16:33 +0000
commite2273d945640442224a09e532865e4a58257a851 (patch)
treea972d7a068f7b2df789f29617501440394aa2fdf /src/libcore
parentc7d0b5259d95ab4ef821bdf93a434538c3a84dad (diff)
parent71e19d528633a470d2d93580651a922e21d7a512 (diff)
downloadrust-e2273d945640442224a09e532865e4a58257a851.tar.gz
rust-e2273d945640442224a09e532865e4a58257a851.zip
auto merge of #16081 : luqmana/rust/nr, r=pcwalton
Fixes #15763
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/intrinsics.rs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs
index 002babf7df9..1dd3d6ce9db 100644
--- a/src/libcore/intrinsics.rs
+++ b/src/libcore/intrinsics.rs
@@ -310,6 +310,13 @@ extern "rust-intrinsic" {
     /// ```
     pub fn transmute<T,U>(e: T) -> U;
 
+    /// Gives the address for the return value of the enclosing function.
+    ///
+    /// Using this instrinsic in a function that does not use an out pointer
+    /// will trigger a compiler error.
+    #[cfg(not(stage0))]
+    pub fn return_address() -> *const u8;
+
     /// Returns `true` if a type requires drop glue.
     pub fn needs_drop<T>() -> bool;