---

yaml
---
r: 128739
b: refs/heads/try
c: 5aedcb1
h: refs/heads/master
i:
  128737: 4b9d9bd
  128735: 2d714e8
v: v3

Author: luqmana

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 07d86b46a949a94223da714e35b343243e4ecce4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a86d9ad15e339ab343a12513f9c90556f677b9ca
-refs/heads/try: 9dac85f92daa094f94f124fd06cfeb5339d48772
+refs/heads/try: 5aedcb1e916711bfeb65c26b5c6210a3fb5d72bf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/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;
 

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

@@ -765,9 +765,11 @@ pub fn trans_call_inner<'a>(
             assert!(abi == synabi::RustIntrinsic);
             assert!(dest.is_some());
 
+            let call_info = call_info.expect("no call info for intrinsic call?");
             return intrinsic::trans_intrinsic_call(bcx, node, callee_ty,
                                                    arg_cleanup_scope, args,
-                                                   dest.unwrap(), substs);
+                                                   dest.unwrap(), substs,
+                                                   call_info);
         }
         NamedTupleConstructor(substs, disr) => {
             assert!(dest.is_some());

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

@@ -126,7 +126,7 @@ pub fn check_intrinsics(ccx: &CrateContext) {
 pub fn trans_intrinsic_call<'a>(mut bcx: &'a Block<'a>, node: ast::NodeId,
                                 callee_ty: ty::t, cleanup_scope: cleanup::CustomScopeIndex,
                                 args: callee::CallArgs, dest: expr::Dest,
-                                substs: subst::Substs) -> Result<'a> {
+                                substs: subst::Substs, call_info: NodeInfo) -> Result<'a> {
 
     let fcx = bcx.fcx;
     let ccx = fcx.ccx;
@@ -426,9 +426,14 @@ pub fn trans_intrinsic_call<'a>(mut bcx: &'a Block<'a>, node: ast::NodeId,
                                     *llargs.get(0), *llargs.get(1)),
 
         (_, "return_address") => {
-            PointerCast(bcx,
-                        bcx.fcx.llretptr.get().unwrap(),
-                        Type::i8p(bcx.ccx()))
+            if !fcx.caller_expects_out_pointer {
+                tcx.sess.span_err(call_info.span,
+                                  "invalid use of `return_address` intrinsic: function \
+                                   does not use out pointer");
+                C_null(Type::i8p(ccx))
+            } else {
+                PointerCast(bcx, llvm::get_param(fcx.llfn, 0), Type::i8p(ccx))
+            }
         }
 
         // This requires that atomic intrinsics follow a specific naming pattern:

branches/try/src/test/compile-fail/intrinsic-return-address.rs

@@ -0,0 +1,31 @@
+// Copyright 2014 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.
+
+#![allow(warnings)]
+#![feature(intrinsics)]
+
+extern "rust-intrinsic" {
+    fn return_address() -> *const u8;
+}
+
+unsafe fn f() {
+    let _ = return_address();
+    //~^ ERROR invalid use of `return_address` intrinsic: function does not use out pointer
+}
+
+unsafe fn g() -> int {
+    let _ = return_address();
+    //~^ ERROR invalid use of `return_address` intrinsic: function does not use out pointer
+    0
+}
+
+fn main() {}
+
+

branches/try/src/test/run-pass/intrinsic-return-address.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(intrinsics)];
+#![feature(intrinsics)]
 
 use std::ptr;