Skip to content

Commit d737805

Browse files
committed
---
yaml --- r: 80769 b: refs/heads/try c: 4ac10f8 h: refs/heads/master i: 80767: 3493960 v: v3
1 parent 88b9497 commit d737805

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
5-
refs/heads/try: 0af2bd829e6aaab4faf2cc135bd8b01db728417b
5+
refs/heads/try: 4ac10f8f6e8e07c70fadb676170c5402442e2243
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/fold.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,11 +690,19 @@ pub fn noop_fold_expr(e: &Expr_, fld: @ast_fold) -> Expr_ {
690690
ExprBreak(ref opt_ident) => {
691691
// FIXME #6993: add fold_name to fold.... then cut out the
692692
// bogus Name->Ident->Name conversion.
693-
ExprBreak(opt_ident.map_move(|x| fld.fold_ident(Ident::new(x)).name))
693+
ExprBreak(opt_ident.map_move(|x| {
694+
// FIXME #9129: Assigning the new ident to a temporary to work around codegen bug
695+
let newx = Ident::new(x);
696+
fld.fold_ident(newx).name
697+
}))
694698
}
695699
ExprAgain(ref opt_ident) => {
696700
// FIXME #6993: add fold_name to fold....
697-
ExprAgain(opt_ident.map_move(|x| fld.fold_ident(Ident::new(x)).name))
701+
ExprAgain(opt_ident.map_move(|x| {
702+
// FIXME #9129: Assigning the new ident to a temporary to work around codegen bug
703+
let newx = Ident::new(x);
704+
fld.fold_ident(newx).name
705+
}))
698706
}
699707
ExprRet(ref e) => {
700708
ExprRet(e.map_move(|x| fld.fold_expr(x)))

0 commit comments

Comments
 (0)