mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librustc: De-@mut FunctionContext::llself

Browse Source
This commit is contained in:
Patrick Walton 2013-12-20 20:45:05 -08:00
parent bd6a2236e1
commit cd5168b7cd
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustc/middle/trans/base.rs
View File

@ -1689,7 +1689,7 @@ pub fn new_fn_ctxt_w_id(ccx: @CrateContext,
entry_bcx: None,
alloca_insert_pt: Cell::new(None),
llreturn: Cell::new(None),
llself: None,
llself: Cell::new(None),
personality: None,
caller_expects_out_pointer: uses_outptr,
llargs: RefCell::new(HashMap::new()),
@ -1760,11 +1760,11 @@ pub fn create_llargs_for_fn_args(cx: @mut FunctionContext,
match self_arg {
impl_self(tt, self_mode) => {
cx.llself = Some(ValSelfData {
cx.llself.set(Some(ValSelfData {
v: cx.llenv.get(),
t: tt,
is_copy: self_mode == ty::ByCopy
});
}));
}
no_self => ()
}
@ -1788,7 +1788,7 @@ pub fn copy_args_to_allocas(fcx: @mut FunctionContext,
let _icx = push_ctxt("copy_args_to_allocas");
let mut bcx = bcx;
match fcx.llself {
match fcx.llself.get() {
Some(slf) => {
let self_val = if slf.is_copy
&& datum::appropriate_mode(bcx.ccx(), slf.t).is_by_value() {
@ -1800,7 +1800,7 @@ pub fn copy_args_to_allocas(fcx: @mut FunctionContext,
PointerCast(bcx, slf.v, type_of(bcx.ccx(), slf.t).ptr_to())
};
fcx.llself = Some(ValSelfData {v: self_val, ..slf});
fcx.llself.set(Some(ValSelfData {v: self_val, ..slf}));
add_clean(bcx, self_val, slf.t);
if fcx.ccx.sess.opts.extra_debuginfo {

2
src/librustc/middle/trans/common.rs
View File

@ -229,7 +229,7 @@ pub struct FunctionContext {
// NB: This is the type of the self *variable*, not the self *type*. The
// self type is set only for default methods, while the self variable is
// set for all methods.
llself: Option<ValSelfData>,
llself: Cell<Option<ValSelfData>>,
// The a value alloca'd for calls to upcalls.rust_personality. Used when
// outputting the resume instruction.
personality: Option<ValueRef>,

4
src/librustc/middle/trans/expr.rs
View File

@ -1108,8 +1108,8 @@ pub fn trans_local_var(bcx: @Block, def: ast::Def) -> Datum {
take_local(bcx, lllocals.get(), nid)
}
ast::DefSelf(nid, _) => {
let self_info: ValSelfData = match bcx.fcx.llself {
Some(ref self_info) => *self_info,
let self_info: ValSelfData = match bcx.fcx.llself.get() {
Some(self_info) => self_info,
None => {
bcx.sess().bug(format!(
"trans_local_var: reference to self \