---

pcwalton · pcwalton · commit 5b61d07b42e3 · 2013-12-26T13:01:26.000-08:00
yaml --- r: 147536 b: refs/heads/try2 c: d2bcd14 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: ddf3c6de74e2ec991fa10ed627343bb1e865ed9c
+refs/heads/try2: d2bcd1462fa515ead889ecc49c70b00513798f43
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustc/lib/llvm.rs b/branches/try2/src/librustc/lib/llvm.rs
@@ -1804,20 +1804,17 @@ pub fn SetFunctionAttribute(Fn: ValueRef, attr: Attribute) {
 /* Memory-managed object interface to type handles. */
 
 pub struct TypeNames {
-    type_names: HashMap<TypeRef, ~str>,
     named_types: HashMap<~str, TypeRef>
 }
 
 impl TypeNames {
     pub fn new() -> TypeNames {
         TypeNames {
-            type_names: HashMap::new(),
             named_types: HashMap::new()
         }
     }
 
     pub fn associate_type(&mut self, s: &str, t: &Type) {
-        assert!(self.type_names.insert(t.to_ref(), s.to_owned()));
         assert!(self.named_types.insert(s.to_owned(), t.to_ref()));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1804,20 +1804,17 @@ pub fn SetFunctionAttribute(Fn: ValueRef, attr: Attribute) {`
`1804`	`1804`	`/* Memory-managed object interface to type handles. */`
`1805`	`1805`
`1806`	`1806`	`pub struct TypeNames {`
`1807`		`- type_names: HashMap<TypeRef, ~str>,`
`1808`	`1807`	`named_types: HashMap<~str, TypeRef>`
`1809`	`1808`	`}`
`1810`	`1809`
`1811`	`1810`	`impl TypeNames {`
`1812`	`1811`	`pub fn new() -> TypeNames {`
`1813`	`1812`	`TypeNames {`
`1814`		`- type_names: HashMap::new(),`
`1815`	`1813`	`named_types: HashMap::new()`
`1816`	`1814`	`}`
`1817`	`1815`	`}`
`1818`	`1816`
`1819`	`1817`	`pub fn associate_type(&mut self, s: &str, t: &Type) {`
`1820`		`- assert!(self.type_names.insert(t.to_ref(), s.to_owned()));`
`1821`	`1818`	`assert!(self.named_types.insert(s.to_owned(), t.to_ref()));`
`1822`	`1819`	`}`
`1823`	`1820`