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

auto merge of #9176 : brson/rust/issue-9129, r=catamorphism

Browse Source 
Servo is hitting this problem, so this is a workaround for lack of a real solution.

No tests because I couldn't actually reproduce the problem with either of the testcases in #9129
This commit is contained in:
bors 2013-09-13 21:06:02 -07:00
commit 52b9688f92
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libsyntax/fold.rs
View File

@ -690,11 +690,19 @@ pub fn noop_fold_expr(e: &Expr_, fld: @ast_fold) -> Expr_ {
ExprBreak(ref opt_ident) => {
// FIXME #6993: add fold_name to fold.... then cut out the
// bogus Name->Ident->Name conversion.
ExprBreak(opt_ident.map_move(|x| fld.fold_ident(Ident::new(x)).name))
ExprBreak(opt_ident.map_move(|x| {
// FIXME #9129: Assigning the new ident to a temporary to work around codegen bug
let newx = Ident::new(x);
fld.fold_ident(newx).name
}))
}
ExprAgain(ref opt_ident) => {
// FIXME #6993: add fold_name to fold....
ExprAgain(opt_ident.map_move(|x| fld.fold_ident(Ident::new(x)).name))
ExprAgain(opt_ident.map_move(|x| {
// FIXME #9129: Assigning the new ident to a temporary to work around codegen bug
let newx = Ident::new(x);
fld.fold_ident(newx).name
}))
}
ExprRet(ref e) => {
ExprRet(e.map_move(|x| fld.fold_expr(x)))