---

yaml
---
r: 39242
b: refs/heads/incoming
c: 55aa498
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: b60a0be424c9e3ef6266ef4da17397ea90db9694
+refs/heads/incoming: 55aa49882d43f338da48ec870ddfbe99b74ca11e
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/driver/session.rs

@@ -246,7 +246,10 @@ 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 {
-        self.debugging_opt(no_monomorphic_collapse)
+        // 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
     }
 
     fn str_of(id: ast::ident) -> ~str {