File tree 1 file changed +5
-2
lines changed
src/librustc/middle/trans
1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -1012,7 +1012,7 @@ fn struct_metadata(cx: &mut CrateContext,
1012
1012
1013
1013
let field_llvm_types = do fields. map |field| { type_of:: type_of ( cx, field. mt . ty ) } ;
1014
1014
let field_names = do fields. map |field| {
1015
- if field. ident == special_idents:: unnamed_field {
1015
+ if field. ident . name == special_idents:: unnamed_field. name {
1016
1016
~""
1017
1017
} else {
1018
1018
cx. sess . str_of ( field. ident ) . to_owned ( )
@@ -1875,9 +1875,12 @@ fn populate_scope_map(cx: &mut CrateContext,
1875
1875
// }
1876
1876
1877
1877
// Is there already a binding with that name?
1878
+ // N.B.: this comparison must be UNhygienic... because
1879
+ // gdb knows nothing about the context, so any two
1880
+ // variables with the same name will cause the problem.
1878
1881
let need_new_scope = scope_stack
1879
1882
. iter ( )
1880
- . any ( |entry| entry. ident . iter ( ) . any ( |i| * i == ident) ) ;
1883
+ . any ( |entry| entry. ident . iter ( ) . any ( |i| i . name == ident. name ) ) ;
1881
1884
1882
1885
if need_new_scope {
1883
1886
// Create a new lexical scope and push it onto the stack
You can’t perform that action at this time.
0 commit comments