---

yaml
---
r: 40682
b: refs/heads/dist-snap
c: 791f976
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: cf3972e95af2ec4c142b3593d697292259741e53
+refs/heads/dist-snap: 791f976e8ca95b00febbaf32b653d12cccb6132d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/driver/session.rs

@@ -246,10 +246,7 @@ impl Session {
     fn borrowck_note_pure() -> bool { self.debugging_opt(borrowck_note_pure) }
     fn borrowck_note_loan() -> bool { self.debugging_opt(borrowck_note_loan) }
     fn no_monomorphic_collapse() -> bool {
-        // FIXME #4127: Type use is causing mysterious bustage on 32-bit archs
-        let type_use_unreliable = self.targ_cfg.arch == arch_x86;
-
-        self.debugging_opt(no_monomorphic_collapse) || type_use_unreliable
+        self.debugging_opt(no_monomorphic_collapse)
     }
 
     fn str_of(id: ast::ident) -> ~str {