librustc: Update debuginfo.

2014-07-07 14:41:18 -07:00 · 2014-07-07 14:41:18 -07:00 · fa8da9d6b3
commit fa8da9d6b3
parent e9e5ea2f90
1 changed files with 5 additions and 1 deletions
--- a/src/librustc/middle/trans/debuginfo.rs
+++ b/src/librustc/middle/trans/debuginfo.rs
@ -2152,8 +2152,12 @@ fn create_member_descriptions(&self, cx: &CrateContext) -> Vec<MemberDescription
                let null_variant_index = (1 - nndiscr) as uint;
                let null_variant_ident = self.variants.get(null_variant_index).name;
                let null_variant_name = token::get_ident(null_variant_ident);
+                let discrfield = match ptrfield {
+                    adt::ThinPointer(field) => format!("{}", field),
+                    adt::FatPointer(field, pair) => format!("{}${}", field, pair)
+                };
                let union_member_name = format!("RUST$ENCODED$ENUM${}${}",
-                                                ptrfield,
+                                                discrfield,
                                                null_variant_name);

                // Create the (singleton) list of descriptions of union members.