nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-23 12:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fold context into CalleeTranslationVisitor.

Browse Source
This commit is contained in:
Felix S. Klock II 2013-09-25 10:59:06 +02:00
parent 2ceebf1070
commit 9d0727736b
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/librustc/middle/trans/callee.rs
View File

@ -570,18 +570,20 @@ pub fn trans_lang_call_with_type_params(bcx: @mut Block,
}
struct CalleeTranslationVisitor;
struct CalleeTranslationVisitor {
flag: bool,
}
impl Visitor<@mut bool> for CalleeTranslationVisitor {
impl Visitor<()> for CalleeTranslationVisitor {
fn visit_item(&mut self, _:@ast::item, _:@mut bool) { }
fn visit_item(&mut self, _:@ast::item, _:()) { }
fn visit_expr(&mut self, e:@ast::Expr, cx:@mut bool) {
fn visit_expr(&mut self, e:@ast::Expr, _:()) {
if !*cx {
if !self.flag {
match e.node {
ast::ExprRet(_) => *cx = true,
_ => visit::walk_expr(self, e, cx),
ast::ExprRet(_) => self.flag = true,
_ => visit::walk_expr(self, e, ()),
}
}
}
@ -589,10 +591,9 @@ impl Visitor<@mut bool> for CalleeTranslationVisitor {
}
pub fn body_contains_ret(body: &ast::Block) -> bool {
let cx = @mut false;
let mut v = CalleeTranslationVisitor;
visit::walk_block(&mut v, body, cx);
*cx
let mut v = CalleeTranslationVisitor{ flag: false };
visit::walk_block(&mut v, body, ());
v.flag
}
pub fn trans_call_inner(in_cx: @mut Block,