Skip to content

Avoid cloning the stack on every push_ctxt call in trans #9723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 5, 2013
Merged

Avoid cloning the stack on every push_ctxt call in trans #9723

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/librustc/middle/trans/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,17 +92,19 @@ use syntax::visit::Visitor;

pub use middle::trans::context::task_llcx;

local_data_key!(task_local_insn_key: @~[&'static str])
local_data_key!(task_local_insn_key: ~[&'static str])

pub fn with_insn_ctxt(blk: &fn(&[&'static str])) {
let opt = local_data::get(task_local_insn_key, |k| k.map_move(|k| *k));
if opt.is_some() {
blk(*opt.unwrap());
do local_data::get(task_local_insn_key) |c| {
match c {
Some(ctx) => blk(*ctx),
None => ()
}
}
}

pub fn init_insn_ctxt() {
local_data::set(task_local_insn_key, @~[]);
local_data::set(task_local_insn_key, ~[]);
}

pub struct _InsnCtxt { _x: () }
Expand All @@ -111,10 +113,9 @@ pub struct _InsnCtxt { _x: () }
impl Drop for _InsnCtxt {
fn drop(&mut self) {
do local_data::modify(task_local_insn_key) |c| {
do c.map_move |ctx| {
let mut ctx = (*ctx).clone();
do c.map_move |mut ctx| {
ctx.pop();
@ctx
ctx
}
}
}
Expand All @@ -123,10 +124,9 @@ impl Drop for _InsnCtxt {
pub fn push_ctxt(s: &'static str) -> _InsnCtxt {
debug2!("new InsnCtxt: {}", s);
do local_data::modify(task_local_insn_key) |c| {
do c.map_move |ctx| {
let mut ctx = (*ctx).clone();
do c.map_move |mut ctx| {
ctx.push(s);
@ctx
ctx
}
}
_InsnCtxt { _x: () }
Expand Down