Skip to content

Commit

Permalink
librustc: Add an intrinsic to retrieve the return pointer of a function.
Browse files Browse the repository at this point in the history
This is needed for some GC stuff in Servo.
  • Loading branch information
pcwalton authored and luqmana committed Aug 12, 2014
1 parent d302813 commit 9dac85f
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/librustc/middle/trans/intrinsic.rs
Expand Up @@ -425,6 +425,12 @@ pub fn trans_intrinsic_call<'a>(mut bcx: &'a Block<'a>, node: ast::NodeId,
with_overflow_intrinsic(bcx, "llvm.umul.with.overflow.i64", ret_ty,
*llargs.get(0), *llargs.get(1)),

(_, "return_address") => {
PointerCast(bcx,
bcx.fcx.llretptr.get().unwrap(),
Type::i8p(bcx.ccx()))
}

// This requires that atomic intrinsics follow a specific naming pattern:
// "atomic_<operation>[_<ordering>]", and no ordering means SeqCst
(_, name) if name.starts_with("atomic_") => {
Expand Down
2 changes: 2 additions & 0 deletions src/librustc/middle/typeck/check/mod.rs
Expand Up @@ -4986,6 +4986,8 @@ pub fn check_intrinsic_type(ccx: &CrateCtxt, it: &ast::ForeignItem) {
(0, vec!(ty::mk_u64(), ty::mk_u64()),
ty::mk_tup(tcx, vec!(ty::mk_u64(), ty::mk_bool()))),

"return_address" => (0, vec![], ty::mk_imm_ptr(tcx, ty::mk_u8())),

ref other => {
span_err!(tcx.sess, it.span, E0093,
"unrecognized intrinsic function: `{}`", *other);
Expand Down
43 changes: 43 additions & 0 deletions src/test/run-pass/intrinsic-return-address.rs
@@ -0,0 +1,43 @@
// Copyright 2012-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.

#![feature(intrinsics)];

use std::ptr;

struct Point {
x: f32,
y: f32,
z: f32,
}

extern "rust-intrinsic" {
fn return_address() -> *const u8;
}

fn f(result: &mut uint) -> Point {
unsafe {
*result = return_address() as uint;
Point {
x: 1.0,
y: 2.0,
z: 3.0,
}
}

}

fn main() {
let mut intrinsic_reported_address = 0;
let pt = f(&mut intrinsic_reported_address);
let actual_address = &pt as *const Point as uint;
assert_eq!(intrinsic_reported_address, actual_address);
}

0 comments on commit 9dac85f

Please sign in to comment.