about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuqman Aden <me@luqman.ca>2014-07-07 14:41:18 -0700
committerLuqman Aden <me@luqman.ca>2014-07-07 14:57:51 -0700
commitfa8da9d6b317f39402f1127575e2bd08db33c508 (patch)
tree83f9132c0edab03b31b521b61ef7d5f9c08d261f
parente9e5ea2f903ed780e0bbbe5f5662a5ee2054c4a2 (diff)
downloadrust-fa8da9d6b317f39402f1127575e2bd08db33c508.tar.gz
rust-fa8da9d6b317f39402f1127575e2bd08db33c508.zip
librustc: Update debuginfo.
-rw-r--r--src/librustc/middle/trans/debuginfo.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/librustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs
index eaa4ce23f1a..d48f8bcf908 100644
--- a/src/librustc/middle/trans/debuginfo.rs
+++ b/src/librustc/middle/trans/debuginfo.rs
@@ -2152,8 +2152,12 @@ impl EnumMemberDescriptionFactory {
                 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.